Slight changes to pen pressure smoothing
This commit is contained in:
parent
eaef736be5
commit
10079768de
8 changed files with 124 additions and 18 deletions
|
|
@ -1,3 +1,21 @@
|
||||||
|
/*
|
||||||
|
* InfiniPaint
|
||||||
|
* Copyright (C) 2025-2026 Yousef Khadadeh
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
package com.erroratline0.infinipaint;
|
package com.erroratline0.infinipaint;
|
||||||
|
|
||||||
import android.app.ForegroundServiceStartNotAllowedException;
|
import android.app.ForegroundServiceStartNotAllowedException;
|
||||||
|
|
|
||||||
|
|
@ -256,7 +256,7 @@ std::vector<BrushStrokeCanvasComponentPoint> BrushStrokeCanvasComponent::smooth_
|
||||||
std::vector<BrushStrokeCanvasComponentPoint> toRet;
|
std::vector<BrushStrokeCanvasComponentPoint> toRet;
|
||||||
|
|
||||||
BrushStrokeCanvasComponentPoint p0 = points[beginIndex];
|
BrushStrokeCanvasComponentPoint p0 = points[beginIndex];
|
||||||
p0.pos = p0.pos + p0.width * (p0.pos - points[beginIndex + 1].pos).normalized() * DRAW_MINIMUM_LIMIT;
|
p0.pos = p0.pos + p0.width * (p0.pos - points[beginIndex + 1].pos).normalized();
|
||||||
BrushStrokeCanvasComponentPoint p1 = points[beginIndex];
|
BrushStrokeCanvasComponentPoint p1 = points[beginIndex];
|
||||||
BrushStrokeCanvasComponentPoint p2 = points[beginIndex + 1];
|
BrushStrokeCanvasComponentPoint p2 = points[beginIndex + 1];
|
||||||
BrushStrokeCanvasComponentPoint p3;
|
BrushStrokeCanvasComponentPoint p3;
|
||||||
|
|
@ -265,7 +265,7 @@ std::vector<BrushStrokeCanvasComponentPoint> BrushStrokeCanvasComponent::smooth_
|
||||||
|
|
||||||
if(i == endIndex - 1) {
|
if(i == endIndex - 1) {
|
||||||
p3 = points[i + 1];
|
p3 = points[i + 1];
|
||||||
p3.pos = p3.pos + p3.width * (p3.pos - points[i].pos).normalized() * DRAW_MINIMUM_LIMIT;
|
p3.pos = p3.pos + p3.width * (p3.pos - points[i].pos).normalized();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
p3 = points[i + 2];
|
p3 = points[i + 2];
|
||||||
|
|
|
||||||
|
|
@ -33,8 +33,6 @@ struct BrushStrokeCanvasComponentPoint {
|
||||||
|
|
||||||
class BrushStrokeCanvasComponent : public CanvasComponent {
|
class BrushStrokeCanvasComponent : public CanvasComponent {
|
||||||
public:
|
public:
|
||||||
constexpr static float DRAW_MINIMUM_LIMIT = 1.0f;
|
|
||||||
|
|
||||||
virtual CanvasComponentType get_type() const override;
|
virtual CanvasComponentType get_type() const override;
|
||||||
virtual void save(cereal::PortableBinaryOutputArchive& a) const override;
|
virtual void save(cereal::PortableBinaryOutputArchive& a) const override;
|
||||||
virtual void load(cereal::PortableBinaryInputArchive& a) override;
|
virtual void load(cereal::PortableBinaryInputArchive& a) override;
|
||||||
|
|
|
||||||
|
|
@ -29,9 +29,9 @@
|
||||||
#include "../../GUIStuff/ElementHelpers/TextLabelHelpers.hpp"
|
#include "../../GUIStuff/ElementHelpers/TextLabelHelpers.hpp"
|
||||||
#include "../../GUIStuff/ElementHelpers/CheckBoxHelpers.hpp"
|
#include "../../GUIStuff/ElementHelpers/CheckBoxHelpers.hpp"
|
||||||
|
|
||||||
#define VEL_SMOOTH_MIN 0.6
|
|
||||||
#define VEL_SMOOTH_MAX 1.0
|
|
||||||
#define MINIMUM_DISTANCE_TO_NEXT_POINT 0.002f
|
#define MINIMUM_DISTANCE_TO_NEXT_POINT 0.002f
|
||||||
|
#define SMOOTH_FACTOR 0.707f
|
||||||
|
#define DRAW_MINIMUM_LIMIT 1.0f
|
||||||
|
|
||||||
BrushTool::BrushTool(DrawingProgram& initDrawP):
|
BrushTool::BrushTool(DrawingProgram& initDrawP):
|
||||||
DrawingProgramToolBase(initDrawP)
|
DrawingProgramToolBase(initDrawP)
|
||||||
|
|
@ -50,11 +50,39 @@ void BrushTool::erase_component(CanvasComponentContainer::ObjInfo* erasedComp) {
|
||||||
objInfoBeingEdited = nullptr;
|
objInfoBeingEdited = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void BrushTool::smooth_out_points(float smoothFactor) {
|
||||||
|
if(objInfoBeingEdited) {
|
||||||
|
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj;
|
||||||
|
BrushStrokeCanvasComponent& brushStroke = static_cast<BrushStrokeCanvasComponent&>(containerPtr->get_comp());
|
||||||
|
auto& brushPoints = *brushStroke.d.points;
|
||||||
|
if(brushPoints.size() >= 2) {
|
||||||
|
brushPoints.back().width = std::max(brushPoints[brushPoints.size() - 1].width, brushPoints[brushPoints.size() - 2].width * smoothFactor);
|
||||||
|
for(size_t i = brushPoints.size() - 1; i > 0; i--) {
|
||||||
|
if(brushPoints[i].width * smoothFactor > brushPoints[i - 1].width)
|
||||||
|
brushPoints[i - 1].width = brushPoints[i].width * smoothFactor;
|
||||||
|
else
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void BrushTool::fix_tip() {
|
||||||
|
if(objInfoBeingEdited) {
|
||||||
|
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj;
|
||||||
|
BrushStrokeCanvasComponent& brushStroke = static_cast<BrushStrokeCanvasComponent&>(containerPtr->get_comp());
|
||||||
|
auto& brushPoints = *brushStroke.d.points;
|
||||||
|
if(brushPoints.size() >= 2) {
|
||||||
|
brushPoints[brushPoints.size() - 2].width = brushPoints[brushPoints.size() - 1].width = std::max(brushPoints[brushPoints.size() - 1].width, brushPoints[brushPoints.size() - 2].width);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void BrushTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
void BrushTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
||||||
if(button.button == InputManager::MouseButton::LEFT) {
|
if(button.button == InputManager::MouseButton::LEFT) {
|
||||||
auto& toolConfig = drawP.world.main.toolConfig;
|
auto& toolConfig = drawP.world.main.toolConfig;
|
||||||
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited && !drawP.world.main.g.gui.cursor_obstructed()) {
|
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited && !drawP.world.main.g.gui.cursor_obstructed()) {
|
||||||
if(drawP.world.main.input.pen.isDown) {
|
if(button.deviceType == InputManager::MouseDeviceType::PEN) {
|
||||||
penWidth = drawP.world.main.input.pen.pressure;
|
penWidth = drawP.world.main.input.pen.pressure;
|
||||||
if(penWidth != 0.0f) {
|
if(penWidth != 0.0f) {
|
||||||
float brushMinSize = drawP.world.main.conf.tabletOptions.brushMinimumSize;
|
float brushMinSize = drawP.world.main.conf.tabletOptions.brushMinimumSize;
|
||||||
|
|
@ -102,35 +130,48 @@ void BrushTool::input_mouse_motion_callback(const InputManager::MouseMotionCallb
|
||||||
p.pos = containerPtr->coords.from_cam_space_to_this(drawP.world, motion.pos);
|
p.pos = containerPtr->coords.from_cam_space_to_this(drawP.world, motion.pos);
|
||||||
p.width = width;
|
p.width = width;
|
||||||
|
|
||||||
|
// Temporary point is a point that follows the cursor until it is placed
|
||||||
if(!addedTemporaryPoint) {
|
if(!addedTemporaryPoint) {
|
||||||
|
// Temporary point is close enough to be placed
|
||||||
if(extensive_point_checking(brushStroke, p.pos)) {
|
if(extensive_point_checking(brushStroke, p.pos)) {
|
||||||
brushPoints.emplace_back(p);
|
brushPoints.emplace_back(p);
|
||||||
addedTemporaryPoint = true;
|
addedTemporaryPoint = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
// Temporary point not close enough yet, so change the width of the previous point based on the current pen width until it can be placed
|
||||||
brushPoints.back().width = std::max(brushPoints.back().width, p.width);
|
brushPoints.back().width = std::max(brushPoints.back().width, p.width);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(addedTemporaryPoint) {
|
if(addedTemporaryPoint) {
|
||||||
const BrushStrokeCanvasComponentPoint& prevP = brushPoints[brushPoints.size() - 2];
|
const BrushStrokeCanvasComponentPoint& prevP = brushPoints[brushPoints.size() - 2];
|
||||||
float distToPrev = (p.pos - prevP.pos).norm();
|
float distToPrev = (p.pos - prevP.pos).norm();
|
||||||
|
// If the cursor isnt too close to the previous points, move the temporary point to the cursor and change the width of the temporary point to the current pen width
|
||||||
if(extensive_point_checking_back(brushStroke, p.pos)) {
|
if(extensive_point_checking_back(brushStroke, p.pos)) {
|
||||||
brushPoints.back().pos = p.pos;
|
brushPoints.back().pos = p.pos;
|
||||||
brushPoints.back().width = std::max(brushPoints.back().width, p.width);
|
brushPoints.back().width = std::max(brushPoints.back().width, p.width);
|
||||||
brushPoints[brushPoints.size() - 2].width = std::max(brushPoints[brushPoints.size() - 2].width, p.width);
|
|
||||||
}
|
}
|
||||||
if((!drawingMinimumRelativeToSize && distToPrev >= 10.0) || (drawingMinimumRelativeToSize && distToPrev >= width * BrushStrokeCanvasComponent::DRAW_MINIMUM_LIMIT)) {
|
|
||||||
brushPoints.back() = p;
|
float maxWidthToCompareTo = std::max(brushPoints.back().width, p.width);
|
||||||
|
maxWidthToCompareTo = std::max(maxWidthToCompareTo, 5.0f);
|
||||||
|
if(brushPoints.size() >= 2)
|
||||||
|
maxWidthToCompareTo = std::max(brushPoints[brushPoints.size() - 2].width, maxWidthToCompareTo);
|
||||||
|
if(brushPoints.size() >= 3)
|
||||||
|
maxWidthToCompareTo = std::max(brushPoints[brushPoints.size() - 3].width, maxWidthToCompareTo);
|
||||||
|
|
||||||
|
// If the temporary point (cursor) is far enough from the point before it, make the temporary point permanent
|
||||||
|
if(distToPrev >= maxWidthToCompareTo * DRAW_MINIMUM_LIMIT) {
|
||||||
|
brushPoints.back().pos = p.pos;
|
||||||
|
brushPoints.back().width = std::max(brushPoints.back().width, p.width);
|
||||||
addedTemporaryPoint = false;
|
addedTemporaryPoint = false;
|
||||||
|
|
||||||
if(midwayInterpolation) {
|
// Midway interpolation moves the point before the last one to a position that leads to a smoother line
|
||||||
if(brushPoints.size() != 2) // Don't interpolate the first point
|
if(brushPoints.size() != 2) // Don't interpolate the first point
|
||||||
brushPoints[brushPoints.size() - 2].pos = (prevPointUnaltered + p.pos) * 0.5;
|
brushPoints[brushPoints.size() - 2].pos = (prevPointUnaltered + p.pos) * 0.5;
|
||||||
prevPointUnaltered = p.pos;
|
prevPointUnaltered = p.pos;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
smooth_out_points(SMOOTH_FACTOR);
|
||||||
containerPtr->send_comp_update(drawP, false);
|
containerPtr->send_comp_update(drawP, false);
|
||||||
containerPtr->commit_update(drawP);
|
containerPtr->commit_update(drawP);
|
||||||
}
|
}
|
||||||
|
|
@ -142,6 +183,17 @@ void BrushTool::input_pen_axis_callback(const InputManager::PenAxisCallbackArgs&
|
||||||
if(penWidth != 0.0f) {
|
if(penWidth != 0.0f) {
|
||||||
float brushMinSize = drawP.world.main.conf.tabletOptions.brushMinimumSize;
|
float brushMinSize = drawP.world.main.conf.tabletOptions.brushMinimumSize;
|
||||||
penWidth = brushMinSize + penWidth * (1.0f - brushMinSize);
|
penWidth = brushMinSize + penWidth * (1.0f - brushMinSize);
|
||||||
|
if(objInfoBeingEdited) {
|
||||||
|
auto& toolConfig = drawP.world.main.toolConfig;
|
||||||
|
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj;
|
||||||
|
BrushStrokeCanvasComponent& brushStroke = static_cast<BrushStrokeCanvasComponent&>(containerPtr->get_comp());
|
||||||
|
auto& brushPoints = *brushStroke.d.points;
|
||||||
|
float width = toolConfig.get_relative_width_stroke_size(drawP, containerPtr->coords.inverseScale).first.value() * penWidth;
|
||||||
|
brushPoints.back().width = std::max(brushPoints.back().width, width);
|
||||||
|
smooth_out_points(SMOOTH_FACTOR);
|
||||||
|
containerPtr->send_comp_update(drawP, false);
|
||||||
|
containerPtr->commit_update(drawP);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -176,6 +228,7 @@ void BrushTool::tool_update() {
|
||||||
void BrushTool::commit_stroke() {
|
void BrushTool::commit_stroke() {
|
||||||
if(objInfoBeingEdited) {
|
if(objInfoBeingEdited) {
|
||||||
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj;
|
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj;
|
||||||
|
fix_tip();
|
||||||
containerPtr->commit_update(drawP);
|
containerPtr->commit_update(drawP);
|
||||||
containerPtr->send_comp_update(drawP, true);
|
containerPtr->send_comp_update(drawP, true);
|
||||||
if(containerPtr->get_world_bounds().has_value())
|
if(containerPtr->get_world_bounds().has_value())
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,8 @@ class BrushTool : public DrawingProgramToolBase {
|
||||||
private:
|
private:
|
||||||
bool extensive_point_checking_back(const BrushStrokeCanvasComponent& brushStroke, const Vector2f& newPoint);
|
bool extensive_point_checking_back(const BrushStrokeCanvasComponent& brushStroke, const Vector2f& newPoint);
|
||||||
bool extensive_point_checking(const BrushStrokeCanvasComponent& brushStroke, const Vector2f& newPoint);
|
bool extensive_point_checking(const BrushStrokeCanvasComponent& brushStroke, const Vector2f& newPoint);
|
||||||
|
void smooth_out_points(float smoothFactor);
|
||||||
|
void fix_tip();
|
||||||
void commit_stroke();
|
void commit_stroke();
|
||||||
|
|
||||||
float penWidth = 1.0f;
|
float penWidth = 1.0f;
|
||||||
|
|
@ -55,7 +57,5 @@ class BrushTool : public DrawingProgramToolBase {
|
||||||
|
|
||||||
CanvasComponentContainer::ObjInfo* objInfoBeingEdited = nullptr;
|
CanvasComponentContainer::ObjInfo* objInfoBeingEdited = nullptr;
|
||||||
|
|
||||||
bool drawingMinimumRelativeToSize = true;
|
|
||||||
bool midwayInterpolation = true;
|
|
||||||
Vector2f prevPointUnaltered = {0, 0};
|
Vector2f prevPointUnaltered = {0, 0};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,21 @@
|
||||||
|
/*
|
||||||
|
* InfiniPaint
|
||||||
|
* Copyright (C) 2025-2026 Yousef Khadadeh
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
#include "NetThreadManager.hpp"
|
#include "NetThreadManager.hpp"
|
||||||
#include <Helpers/Networking/NetLibrary.hpp>
|
#include <Helpers/Networking/NetLibrary.hpp>
|
||||||
#include <Helpers/Logger.hpp>
|
#include <Helpers/Logger.hpp>
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,21 @@
|
||||||
|
/*
|
||||||
|
* InfiniPaint
|
||||||
|
* Copyright (C) 2025-2026 Yousef Khadadeh
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
|
|
|
||||||
|
|
@ -221,6 +221,7 @@ void initialize_sdl(MainStruct& mS, int wWidth, int wHeight) {
|
||||||
SDL_SetAppMetadataProperty(SDL_PROP_APP_METADATA_TYPE_STRING, "application");
|
SDL_SetAppMetadataProperty(SDL_PROP_APP_METADATA_TYPE_STRING, "application");
|
||||||
|
|
||||||
SDL_SetHint(SDL_HINT_APP_NAME, "InfiniPaint");
|
SDL_SetHint(SDL_HINT_APP_NAME, "InfiniPaint");
|
||||||
|
SDL_SetHint(SDL_HINT_PEN_TOUCH_EVENTS, "0");
|
||||||
SDL_SetHint(SDL_HINT_PEN_MOUSE_EVENTS, "0");
|
SDL_SetHint(SDL_HINT_PEN_MOUSE_EVENTS, "0");
|
||||||
SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "0");
|
SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "0");
|
||||||
SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0");
|
SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0");
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue