Line draw tool works again

This commit is contained in:
Yousef Khadadeh 2026-05-30 10:39:21 +03:00
parent 4c4c767eef
commit 09f29c6329
3 changed files with 73 additions and 46 deletions

View file

@ -88,10 +88,14 @@ void BrushTool::commit_data(bool final) {
containerPtr->normalize_object_coordinates(); containerPtr->normalize_object_coordinates();
} }
containerPtr->commit_update(drawP); containerPtr->commit_update(drawP);
drawP.world.netObjMan.send_multi_update_messsage([&]() { if(final) {
drawP.send_transforms_for({objInfoBeingEdited}); drawP.world.netObjMan.send_multi_update_messsage([&]() {
drawP.send_transforms_for({objInfoBeingEdited});
containerPtr->send_comp_update(drawP, final);
}, NetworkingObjects::NetObjManager::SendUpdateType::SEND_TO_ALL, nullptr);
}
else
containerPtr->send_comp_update(drawP, final); containerPtr->send_comp_update(drawP, final);
}, NetworkingObjects::NetObjManager::SendUpdateType::SEND_TO_ALL, nullptr);
} }
commitUpdate = false; commitUpdate = false;
} }

View file

@ -22,6 +22,7 @@
#include "../../DrawData.hpp" #include "../../DrawData.hpp"
#include "DrawingProgramToolBase.hpp" #include "DrawingProgramToolBase.hpp"
#include "../../CanvasComponents/CanvasComponentContainer.hpp" #include "../../CanvasComponents/CanvasComponentContainer.hpp"
#include "../../CanvasComponents/MeshCanvasComponent.hpp"
#include "Helpers/MathExtras.hpp" #include "Helpers/MathExtras.hpp"
#include "../../GUIStuff/ElementHelpers/TextLabelHelpers.hpp" #include "../../GUIStuff/ElementHelpers/TextLabelHelpers.hpp"
@ -47,6 +48,28 @@ void LineDrawTool::gui_toolbox(Toolbar& t) {
}); });
} }
void LineDrawTool::commit_data(bool final) {
if(objInfoBeingEdited) {
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj;
MeshCanvasComponent& newMesh = static_cast<MeshCanvasComponent&>(containerPtr->get_comp());
newMesh.d.meshPath = BrushComponentCode::brush_stroke_to_skpath(brushPoints, drawP.world.main.toolConfig.lineDraw.hasRoundCaps);
if(final) {
containerPtr->get_comp().simplify_paths();
containerPtr->normalize_object_coordinates();
}
containerPtr->commit_update(drawP);
if(final) {
drawP.world.netObjMan.send_multi_update_messsage([&]() {
drawP.send_transforms_for({objInfoBeingEdited});
containerPtr->send_comp_update(drawP, final);
}, NetworkingObjects::NetObjManager::SendUpdateType::SEND_TO_ALL, nullptr);
}
else
containerPtr->send_comp_update(drawP, final);
}
commitUpdate = false;
}
void LineDrawTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) { void LineDrawTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) {
using namespace GUIStuff; using namespace GUIStuff;
using namespace ElementHelpers; using namespace ElementHelpers;
@ -62,26 +85,29 @@ void LineDrawTool::input_mouse_button_on_canvas_callback(const InputManager::Mou
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()) {
//auto relativeWidthResult = drawP.world.main.toolConfig.get_relative_width_stroke_size(drawP, drawP.world.drawData.cam.c.inverseScale); auto relativeWidthResult = drawP.world.main.toolConfig.get_relative_width_stroke_size(drawP, drawP.world.drawData.cam.c.inverseScale);
//if(!relativeWidthResult.first.has_value()) { if(!relativeWidthResult.first.has_value()) {
// drawP.world.main.toolConfig.print_relative_width_fail_message(relativeWidthResult.second); drawP.world.main.toolConfig.print_relative_width_fail_message(relativeWidthResult.second);
// return; return;
//} }
//float width = relativeWidthResult.first.value(); float width = relativeWidthResult.first.value();
//CanvasComponentContainer* newBrushStrokeContainer = new CanvasComponentContainer(drawP.world.netObjMan, CanvasComponentType::BRUSHSTROKE); brushPoints.clear();
//BrushStrokeCanvasComponent& newBrushStroke = static_cast<BrushStrokeCanvasComponent&>(newBrushStrokeContainer->get_comp());
//BrushStrokeCanvasComponentPoint p; CanvasComponentContainer* newMeshContainer = new CanvasComponentContainer(drawP.world.netObjMan, CanvasComponentType::MESH);
//p.pos = drawP.world.main.input.mouse.pos; MeshCanvasComponent& newMesh = static_cast<MeshCanvasComponent&>(newMeshContainer->get_comp());
//p.width = width;
//newBrushStroke.d.points->emplace_back(p); newMesh.d.color = toolConfig.globalConf.foregroundColor;
//p.pos = ensure_points_have_distance(p.pos, p.pos, 1.0f); newMeshContainer->coords = drawP.world.drawData.cam.c;
//newBrushStroke.d.points->emplace_back(p);
//newBrushStroke.d.color = toolConfig.globalConf.foregroundColor; BrushComponentCode::BrushPoint p;
//newBrushStroke.d.hasRoundCaps = toolConfig.lineDraw.hasRoundCaps; p.pos = drawP.world.main.input.mouse.pos;
//newBrushStrokeContainer->coords = drawP.world.drawData.cam.c; p.width = width;
//objInfoBeingEdited = drawP.layerMan.add_component_to_layer_being_edited(newBrushStrokeContainer); brushPoints.emplace_back(p);
p.pos = ensure_points_have_distance(p.pos, p.pos, 1.0f);
brushPoints.emplace_back(p);
objInfoBeingEdited = drawP.layerMan.add_component_to_layer_being_edited(newMeshContainer);
commit_data(false);
} }
else if(!button.down && objInfoBeingEdited) else if(!button.down && objInfoBeingEdited)
commit(); commit();
@ -90,22 +116,20 @@ void LineDrawTool::input_mouse_button_on_canvas_callback(const InputManager::Mou
void LineDrawTool::input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion) { void LineDrawTool::input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion) {
if(objInfoBeingEdited) { if(objInfoBeingEdited) {
//constexpr float SNAP_DIVISION_COUNT = 12.0f; constexpr float SNAP_DIVISION_COUNT = 12.0f;
//NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj; Vector2f newPos = objInfoBeingEdited->obj->coords.from_cam_space_to_this(drawP.world, motion.pos);
//BrushStrokeCanvasComponent& brushStroke = static_cast<BrushStrokeCanvasComponent&>(containerPtr->get_comp()); Vector2f oldPos = brushPoints.front().pos;
//Vector2f newPos = containerPtr->coords.from_cam_space_to_this(drawP.world, motion.pos); if(drawP.world.main.input.key(InputManager::KEY_GENERIC_LSHIFT).held) {
//Vector2f oldPos = brushStroke.d.points->front().pos; Vector2f diff = (newPos - oldPos);
//if(drawP.world.main.input.key(InputManager::KEY_GENERIC_LSHIFT).held) { float diffLength = diff.norm();
// Vector2f diff = (newPos - oldPos); diff.normalize();
// float diffLength = diff.norm(); float angle = (std::atan2(diff.y(), diff.x()) / std::numbers::pi) * SNAP_DIVISION_COUNT;
// diff.normalize(); angle = std::round(angle);
// float angle = (std::atan2(diff.y(), diff.x()) / std::numbers::pi) * SNAP_DIVISION_COUNT; angle = (angle * std::numbers::pi) / SNAP_DIVISION_COUNT;
// angle = std::round(angle); newPos = oldPos + diffLength * Vector2f{cos(angle), sin(angle)};
// angle = (angle * std::numbers::pi) / SNAP_DIVISION_COUNT; }
// newPos = oldPos + diffLength * Vector2f{cos(angle), sin(angle)}; brushPoints.back().pos = ensure_points_have_distance(oldPos, newPos, 1.0f);
//} commitUpdate = true;
//brushStroke.d.points->back().pos = ensure_points_have_distance(oldPos, newPos, 1.0f);
//commitUpdate = true;
} }
} }
@ -125,12 +149,8 @@ void LineDrawTool::switch_tool(DrawingProgramToolType newTool) {
} }
void LineDrawTool::tool_update() { void LineDrawTool::tool_update() {
if(commitUpdate && objInfoBeingEdited) { if(commitUpdate && objInfoBeingEdited)
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj; commit_data(false);
containerPtr->commit_update(drawP);
containerPtr->send_comp_update(drawP, false);
commitUpdate = false;
}
} }
bool LineDrawTool::prevent_undo_or_redo() { bool LineDrawTool::prevent_undo_or_redo() {
@ -140,9 +160,7 @@ bool LineDrawTool::prevent_undo_or_redo() {
void LineDrawTool::commit() { void LineDrawTool::commit() {
if(objInfoBeingEdited) { if(objInfoBeingEdited) {
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj; NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj;
containerPtr->commit_update(drawP); commit_data(true);
containerPtr->send_comp_update(drawP, true);
commitUpdate = false;
if(containerPtr->get_world_bounds().has_value()) if(containerPtr->get_world_bounds().has_value())
drawP.layerMan.add_undo_place_component(objInfoBeingEdited); drawP.layerMan.add_undo_place_component(objInfoBeingEdited);
else { else {
@ -150,6 +168,7 @@ void LineDrawTool::commit() {
components->erase(components, containerPtr->objInfo); components->erase(components, containerPtr->objInfo);
} }
objInfoBeingEdited = nullptr; objInfoBeingEdited = nullptr;
brushPoints.clear();
} }
} }

View file

@ -20,6 +20,7 @@
#include "DrawingProgramToolBase.hpp" #include "DrawingProgramToolBase.hpp"
#include <Helpers/SCollision.hpp> #include <Helpers/SCollision.hpp>
#include "../../CanvasComponents/CanvasComponentContainer.hpp" #include "../../CanvasComponents/CanvasComponentContainer.hpp"
#include "../../CanvasComponents/BrushComponentCode.hpp"
class DrawingProgram; class DrawingProgram;
@ -38,8 +39,11 @@ class LineDrawTool : public DrawingProgramToolBase {
virtual void input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) override; virtual void input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) override;
virtual void input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion) override; virtual void input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion) override;
private: private:
void commit_data(bool final);
void commit(); void commit();
bool commitUpdate = false; bool commitUpdate = false;
std::vector<BrushComponentCode::BrushPoint> brushPoints;
CanvasComponentContainer::ObjInfo* objInfoBeingEdited = nullptr; CanvasComponentContainer::ObjInfo* objInfoBeingEdited = nullptr;
}; };