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

Prevent non-smoothed face normals to participate to smoothed face normals

Browse Source 
(cherry picked from commit ec2984f7c7)
This commit is contained in:
MythTitans 2022-03-11 18:55:44 +01:00 committed by Rémi Verschelde
parent c731cda3d8
commit c96336449e
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/csg/csg_shape.cpp
View File

@ -296,17 +296,19 @@ void CSGShape::_update_shape() {
ERR_CONTINUE(mat < -1 || mat >= face_count.size()); ERR_CONTINUE(mat < -1 || mat >= face_count.size());
int idx = mat == -1 ? face_count.size() - 1 : mat; int idx = mat == -1 ? face_count.size() - 1 : mat;
Plane p(n->faces[i].vertices[0], n->faces[i].vertices[1], n->faces[i].vertices[2]); if (n->faces[i].smooth) {
Plane p(n->faces[i].vertices[0], n->faces[i].vertices[1], n->faces[i].vertices[2]);
for (int j = 0; j < 3; j++) { for (int j = 0; j < 3; j++) {
Vector3 v = n->faces[i].vertices[j]; Vector3 v = n->faces[i].vertices[j];
Vector3 add; Vector3 add;
if (vec_map.lookup(v, add)) { if (vec_map.lookup(v, add)) {
add += p.normal; add += p.normal;
} else { } else {
add = p.normal; add = p.normal;
}
vec_map.set(v, add);
} }
vec_map.set(v, add);
} }
face_count.write[idx]++; face_count.write[idx]++;