asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2808 from Ovnuniarchos/ShapeLine2DXPolygonEditor

Browse source 
2D shapes editor update
This commit is contained in:
Juan Linietsky 2015-11-18 18:19:50 -03:00
commit 5360e34c82
4 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scene/resources/concave_polygon_shape_2d.cpp
View file

@ -34,6 +34,7 @@
void ConcavePolygonShape2D::set_segments(const DVector<Vector2>& p_segments) {
Physics2DServer::get_singleton()->shape_set_data(get_rid(),p_segments);
emit_changed();
}
DVector<Vector2> ConcavePolygonShape2D::get_segments() const {

3
scene/resources/convex_polygon_shape_2d.cpp
View file

@ -33,6 +33,7 @@
void ConvexPolygonShape2D::_update_shape() {
Physics2DServer::get_singleton()->shape_set_data(get_rid(),points);
emit_changed();
}
@ -62,7 +63,7 @@ void ConvexPolygonShape2D::_bind_methods() {
ADD_PROPERTY( PropertyInfo(Variant::VECTOR2,"points"),_SCS("set_points"),_SCS("get_points") );
ADD_PROPERTY( PropertyInfo(Variant::VECTOR2_ARRAY,"points"),_SCS("set_points"),_SCS("get_points") );
}

1
scene/resources/shape_line_2d.cpp
View file

@ -35,6 +35,7 @@ void LineShape2D::_update_shape() {
arr.push_back(normal);
arr.push_back(d);
Physics2DServer::get_singleton()->shape_set_data(get_rid(),arr);
emit_changed();
}

33
tools/editor/plugins/collision_shape_2d_editor_plugin.cpp
View file

@ -115,6 +115,18 @@ void CollisionShape2DEditor::set_handle(int idx, Point2& p_point) {
} break;
case LINE_SHAPE: {
if (idx<2) {
Ref<LineShape2D> line = node->get_shape();
if (idx==0){
line->set_d(p_point.length());
}else{
line->set_normal(p_point/30.0);
}
canvas_item_editor->get_viewport_control()->update();
}
} break;
@ -200,6 +212,19 @@ void CollisionShape2DEditor::commit_handle(int idx, Variant& p_org) {
} break;
case LINE_SHAPE: {
Ref<LineShape2D> line = node->get_shape();
if (idx==0) {
undo_redo->add_do_method(line.ptr(),"set_d",line->get_d());
undo_redo->add_do_method(c,"update");
undo_redo->add_undo_method(line.ptr(),"set_d",p_org);
undo_redo->add_undo_method(c,"update");
} else {
undo_redo->add_do_method(line.ptr(),"set_normal",line->get_normal());
undo_redo->add_do_method(c,"update");
undo_redo->add_undo_method(line.ptr(),"set_normal",p_org);
undo_redo->add_undo_method(c,"update");
}
} break;
@ -418,6 +443,14 @@ void CollisionShape2DEditor::_canvas_draw() {
} break;
case LINE_SHAPE: {
Ref<LineShape2D> shape = node->get_shape();
handles.resize(2);
handles[0] = shape->get_normal() * shape->get_d();
handles[1] = shape->get_normal() * (shape->get_d() + 30.0);
c->draw_texture(h,gt.xform(handles[0])-size);
c->draw_texture(h,gt.xform(handles[1])-size);
} break;