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

Merge pull request #27602 from YeldhamDev/tileset_emptypoly_crash_fix

Browse source 
Fix crash when using the Tileset Editor when the given shape has no points
This commit is contained in:
Rémi Verschelde 2019-04-06 20:51:38 +02:00 committed by GitHub
commit f1dc158ebd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
editor/plugins/tile_set_editor_plugin.cpp
View file

@ -2417,11 +2417,11 @@ void TileSetEditor::draw_polygon_shapes() {
colors.push_back(c_bg);
}
}
if (polygon.size() == 0)
if (polygon.size() < 3)
continue;
if (polygon.size() > 2) {
workspace->draw_polygon(polygon, colors);
}
workspace->draw_polygon(polygon, colors);
if (coord == edited_shape_coord || tileset->tile_get_tile_mode(get_current_tile()) == TileSet::SINGLE_TILE) {
if (!creating_shape) {

2
scene/resources/convex_polygon_shape.cpp
View file

@ -83,6 +83,4 @@ void ConvexPolygonShape::_bind_methods() {
ConvexPolygonShape::ConvexPolygonShape() :
Shape(PhysicsServer::get_singleton()->shape_create(PhysicsServer::SHAPE_CONVEX_POLYGON)) {
//set_points(Vector3(1,1,1));
}

6
scene/resources/convex_polygon_shape_2d.cpp
View file

@ -99,10 +99,4 @@ Rect2 ConvexPolygonShape2D::get_rect() const {
ConvexPolygonShape2D::ConvexPolygonShape2D() :
Shape2D(Physics2DServer::get_singleton()->convex_polygon_shape_create()) {
int pcount = 3;
for (int i = 0; i < pcount; i++)
points.push_back(Vector2(Math::sin(i * Math_PI * 2 / pcount), -Math::cos(i * Math_PI * 2 / pcount)) * 10);
_update_shape();
}