godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move point in Path2D edtitor now respect snap configure; Press Alt when

Browse Source 
moving point to activate view base snapping; Path2D editor inherits from
HBoxContainer now"
This commit is contained in:
marynate 2014-04-03 16:19:06 +08:00
parent 4c2183bf23
commit a2bd3a1f41
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/editor/plugins/path_2d_editor_plugin.cpp
View File

@ -92,9 +92,9 @@ bool Path2DEditor::forward_input_event(const InputEvent& p_event) {
Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
Vector2 gpoint = Point2(mb.x,mb.y); Vector2 gpoint = Point2(mb.x,mb.y);
Vector2 cpoint = xform.affine_inverse().xform(gpoint); Vector2 cpoint = !mb.mod.alt? snap_point(xform.affine_inverse().xform(gpoint))
: node->get_global_transform().affine_inverse().xform( snap_point(canvas_item_editor->get_canvas_transform().affine_inverse().xform(gpoint)) );
//first check if a point is to be added (segment split) //first check if a point is to be added (segment split)
real_t grab_treshold=EDITOR_DEF("poly_editor/point_grab_radius",8); real_t grab_treshold=EDITOR_DEF("poly_editor/point_grab_radius",8);
@ -176,6 +176,8 @@ bool Path2DEditor::forward_input_event(const InputEvent& p_event) {
moving_from=curve->get_point_pos(action_point); moving_from=curve->get_point_pos(action_point);
moving_screen_from=gpoint; moving_screen_from=gpoint;
canvas_item_editor->get_viewport_control()->update();
return true; return true;
} }
@ -191,7 +193,7 @@ bool Path2DEditor::forward_input_event(const InputEvent& p_event) {
undo_redo->create_action("Move Point in Curve"); undo_redo->create_action("Move Point in Curve");
undo_redo->add_do_method(curve.ptr(),"set_point_pos",action_point,new_pos); undo_redo->add_do_method(curve.ptr(),"set_point_pos",action_point,cpoint);
undo_redo->add_undo_method(curve.ptr(),"set_point_pos",action_point,moving_from); undo_redo->add_undo_method(curve.ptr(),"set_point_pos",action_point,moving_from);
undo_redo->add_do_method(canvas_item_editor,"update"); undo_redo->add_do_method(canvas_item_editor,"update");
undo_redo->add_undo_method(canvas_item_editor,"update"); undo_redo->add_undo_method(canvas_item_editor,"update");
@ -423,6 +425,8 @@ bool Path2DEditor::forward_input_event(const InputEvent& p_event) {
Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
Vector2 gpoint = Point2(mm.x,mm.y); Vector2 gpoint = Point2(mm.x,mm.y);
Vector2 cpoint = !mm.mod.alt? snap_point(xform.affine_inverse().xform(gpoint))
: node->get_global_transform().affine_inverse().xform( snap_point(canvas_item_editor->get_canvas_transform().affine_inverse().xform(gpoint)) );
Ref<Curve2D> curve = node->get_curve(); Ref<Curve2D> curve = node->get_curve();
@ -432,7 +436,7 @@ bool Path2DEditor::forward_input_event(const InputEvent& p_event) {
case ACTION_MOVING_POINT: { case ACTION_MOVING_POINT: {
curve->set_point_pos(action_point,new_pos); curve->set_point_pos(action_point,cpoint);
} break; } break;
case ACTION_MOVING_IN: { case ACTION_MOVING_IN: {
@ -493,18 +497,18 @@ void Path2DEditor::_canvas_draw() {
Vector2 point = xform.xform(curve->get_point_pos(i)); Vector2 point = xform.xform(curve->get_point_pos(i));
vpc->draw_texture_rect(handle,Rect2(point-handle->get_size()*0.5,handle_size),false,Color(1,1,1,1)); vpc->draw_texture_rect(handle,Rect2(point-handle_size*0.5,handle_size),false,Color(1,1,1,1));
if (i<len-1) { if (i<len-1) {
Vector2 pointout = xform.xform(curve->get_point_pos(i)+curve->get_point_out(i)); Vector2 pointout = xform.xform(curve->get_point_pos(i)+curve->get_point_out(i));
vpc->draw_line(point,pointout,Color(0.5,0.5,1.0,0.8),1.0); vpc->draw_line(point,pointout,Color(0.5,0.5,1.0,0.8),1.0);
vpc->draw_texture_rect(handle, Rect2(pointout-handle->get_size()*0.5,handle_size),false,Color(1,0.5,1,0.3)); vpc->draw_texture_rect(handle, Rect2(pointout-handle_size*0.5,handle_size),false,Color(1,0.5,1,0.3));
} }
if (i>0) { if (i>0) {
Vector2 pointin = xform.xform(curve->get_point_pos(i)+curve->get_point_in(i)); Vector2 pointin = xform.xform(curve->get_point_pos(i)+curve->get_point_in(i));
vpc->draw_line(point,pointin,Color(0.5,0.5,1.0,0.8),1.0); vpc->draw_line(point,pointin,Color(0.5,0.5,1.0,0.8),1.0);
vpc->draw_texture_rect(handle, Rect2(pointin-handle->get_size()*0.5,handle_size),false,Color(1,0.5,1,0.3)); vpc->draw_texture_rect(handle, Rect2(pointin-handle_size*0.5,handle_size),false,Color(1,0.5,1,0.3));
} }
} }
@ -600,18 +604,9 @@ Path2DEditorPlugin::Path2DEditorPlugin(EditorNode *p_node) {
editor=p_node; editor=p_node;
path2d_editor = memnew( Path2DEditor(p_node) ); path2d_editor = memnew( Path2DEditor(p_node) );
editor->get_viewport()->add_child(path2d_editor); CanvasItemEditor::get_singleton()->add_control_to_menu_panel(path2d_editor);
path2d_editor->set_margin(MARGIN_LEFT,200);
path2d_editor->set_margin(MARGIN_RIGHT,230);
path2d_editor->set_margin(MARGIN_TOP,0);
path2d_editor->set_margin(MARGIN_BOTTOM,10);
path2d_editor->hide(); path2d_editor->hide();
} }

4
tools/editor/plugins/path_2d_editor_plugin.h
View File

@ -40,9 +40,9 @@
*/ */
class CanvasItemEditor; class CanvasItemEditor;
class Path2DEditor : public ButtonGroup { class Path2DEditor : public HBoxContainer {
OBJ_TYPE(Path2DEditor, ButtonGroup); OBJ_TYPE(Path2DEditor, HBoxContainer);
UndoRedo *undo_redo; UndoRedo *undo_redo;