Line Draw tool works with events
This commit is contained in:
parent
eac8610456
commit
a53fd7c1dd
2 changed files with 47 additions and 41 deletions
|
|
@ -26,25 +26,10 @@ void LineDrawTool::gui_toolbox() {
|
|||
t.gui.pop_id();
|
||||
}
|
||||
|
||||
void LineDrawTool::erase_component(CanvasComponentContainer::ObjInfo* erasedComp) {
|
||||
if(objInfoBeingEdited == erasedComp)
|
||||
objInfoBeingEdited = nullptr;
|
||||
}
|
||||
|
||||
bool LineDrawTool::right_click_popup_gui(Vector2f popupPos) {
|
||||
Toolbar& t = drawP.world.main.toolbar;
|
||||
t.paint_popup(popupPos);
|
||||
return true;
|
||||
}
|
||||
|
||||
void LineDrawTool::switch_tool(DrawingProgramToolType newTool) {
|
||||
commit();
|
||||
}
|
||||
|
||||
void LineDrawTool::tool_update() {
|
||||
void LineDrawTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
||||
if(button.button == InputManager::MouseButtonCallbackArgs::Button::LEFT) {
|
||||
auto& toolConfig = drawP.world.main.toolConfig;
|
||||
if(!objInfoBeingEdited) {
|
||||
if(drawP.controls.leftClick && drawP.layerMan.is_a_layer_being_edited()) {
|
||||
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited) {
|
||||
auto relativeWidthResult = drawP.world.main.toolConfig.get_relative_width_stroke_size(drawP, drawP.world.drawData.cam.c.inverseScale);
|
||||
if(!relativeWidthResult.first.has_value()) {
|
||||
if(drawP.controls.leftClick)
|
||||
|
|
@ -67,11 +52,15 @@ void LineDrawTool::tool_update() {
|
|||
newBrushStrokeContainer->coords = drawP.world.drawData.cam.c;
|
||||
objInfoBeingEdited = drawP.layerMan.add_component_to_layer_being_edited(newBrushStrokeContainer);
|
||||
}
|
||||
else if(!button.down && objInfoBeingEdited)
|
||||
commit();
|
||||
}
|
||||
else {
|
||||
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj;
|
||||
}
|
||||
|
||||
void LineDrawTool::input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion) {
|
||||
if(objInfoBeingEdited) {
|
||||
constexpr float SNAP_DIVISION_COUNT = 12.0f;
|
||||
if(drawP.controls.leftClickHeld) {
|
||||
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj;
|
||||
BrushStrokeCanvasComponent& brushStroke = static_cast<BrushStrokeCanvasComponent&>(containerPtr->get_comp());
|
||||
Vector2f newPos = containerPtr->coords.get_mouse_pos(drawP.world);
|
||||
Vector2f oldPos = brushStroke.d.points->front().pos;
|
||||
|
|
@ -88,9 +77,24 @@ void LineDrawTool::tool_update() {
|
|||
containerPtr->send_comp_update(drawP, false);
|
||||
containerPtr->commit_update(drawP);
|
||||
}
|
||||
else
|
||||
}
|
||||
|
||||
void LineDrawTool::erase_component(CanvasComponentContainer::ObjInfo* erasedComp) {
|
||||
if(objInfoBeingEdited == erasedComp)
|
||||
objInfoBeingEdited = nullptr;
|
||||
}
|
||||
|
||||
bool LineDrawTool::right_click_popup_gui(Vector2f popupPos) {
|
||||
Toolbar& t = drawP.world.main.toolbar;
|
||||
t.paint_popup(popupPos);
|
||||
return true;
|
||||
}
|
||||
|
||||
void LineDrawTool::switch_tool(DrawingProgramToolType newTool) {
|
||||
commit();
|
||||
}
|
||||
}
|
||||
|
||||
void LineDrawTool::tool_update() {
|
||||
}
|
||||
|
||||
bool LineDrawTool::prevent_undo_or_redo() {
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ class LineDrawTool : public DrawingProgramToolBase {
|
|||
virtual void switch_tool(DrawingProgramToolType newTool) override;
|
||||
virtual void draw(SkCanvas* canvas, const DrawData& drawData) override;
|
||||
virtual bool prevent_undo_or_redo() 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;
|
||||
private:
|
||||
void commit();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue