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

Merge pull request #41315 from clayjohn/Polygon2D-crash 

Check arrays before generating Polygon2D AABBs
This commit is contained in:
Rémi Verschelde 2020-08-17 08:46:50 +02:00 committed by GitHub
parent 5acc78ac81 8571f7b041
commit a10ae31c0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
servers/visual/rasterizer.h
View File

@ -971,6 +971,7 @@ public:
} }
if (skeleton != RID()) { if (skeleton != RID()) {
// calculate bone AABBs // calculate bone AABBs
int bone_count = RasterizerStorage::base_singleton->skeleton_get_bone_count(skeleton); int bone_count = RasterizerStorage::base_singleton->skeleton_get_bone_count(skeleton);
@ -981,39 +982,41 @@ public:
for (int j = 0; j < bone_count; j++) { for (int j = 0; j < bone_count; j++) {
bptr[j].size = Vector2(-1, -1); //negative means unused bptr[j].size = Vector2(-1, -1); //negative means unused
} }
if (l && polygon->bones.size() == l * 4 && polygon->weights.size() == polygon->bones.size()) {
for (int j = 0; j < l; j++) { for (int j = 0; j < l; j++) {
Point2 p = pp[j]; Point2 p = pp[j];
for (int k = 0; k < 4; k++) { for (int k = 0; k < 4; k++) {
int idx = polygon->bones[j * 4 + k]; int idx = polygon->bones[j * 4 + k];
float w = polygon->weights[j * 4 + k]; float w = polygon->weights[j * 4 + k];
if (w == 0) if (w == 0)
continue; continue;
if (bptr[idx].size.x < 0) { if (bptr[idx].size.x < 0) {
//first //first
bptr[idx] = Rect2(p, Vector2(0.00001, 0.00001)); bptr[idx] = Rect2(p, Vector2(0.00001, 0.00001));
} else { } else {
bptr[idx].expand_to(p); bptr[idx].expand_to(p);
}
} }
} }
}
Rect2 aabb; Rect2 aabb;
bool first_bone = true; bool first_bone = true;
for (int j = 0; j < bone_count; j++) { for (int j = 0; j < bone_count; j++) {
Transform2D mtx = RasterizerStorage::base_singleton->skeleton_bone_get_transform_2d(skeleton, j); Transform2D mtx = RasterizerStorage::base_singleton->skeleton_bone_get_transform_2d(skeleton, j);
Rect2 baabb = mtx.xform(bone_aabbs[j]); Rect2 baabb = mtx.xform(bone_aabbs[j]);
if (first_bone) { if (first_bone) {
aabb = baabb; aabb = baabb;
first_bone = false; first_bone = false;
} else { } else {
aabb = aabb.merge(baabb); aabb = aabb.merge(baabb);
}
} }
}
r = r.merge(aabb); r = r.merge(aabb);
}
} }
} break; } break;