diff options
| author | Marcel Admiraal <madmiraal@users.noreply.github.com> | 2020-03-19 11:13:25 +0000 |
|---|---|---|
| committer | Marcel Admiraal <madmiraal@users.noreply.github.com> | 2020-03-19 11:13:35 +0000 |
| commit | 9bd305bfe22f55bb1f0ac61d240b4ab0fcbb65f5 (patch) | |
| tree | 6d0bdaad0684d40a39a8155b456cafcc70c5b334 | |
| parent | af0b7f90bcdf1fca334932be2888d30aaef7bb75 (diff) | |
| download | redot-engine-9bd305bfe22f55bb1f0ac61d240b4ab0fcbb65f5.tar.gz | |
Fix CSG vertex normal calculation.
| -rw-r--r-- | modules/csg/csg_shape.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp index 54635ae320..2524219934 100644 --- a/modules/csg/csg_shape.cpp +++ b/modules/csg/csg_shape.cpp @@ -296,20 +296,18 @@ void CSGShape::_update_shape() { int mat = n->faces[i].material; ERR_CONTINUE(mat < -1 || mat >= face_count.size()); int idx = mat == -1 ? face_count.size() - 1 : mat; - if (n->faces[i].smooth) { - Plane p(n->faces[i].vertices[0], n->faces[i].vertices[1], n->faces[i].vertices[2]); + Plane p(n->faces[i].vertices[0], n->faces[i].vertices[1], n->faces[i].vertices[2]); - for (int j = 0; j < 3; j++) { - Vector3 v = n->faces[i].vertices[j]; - Vector3 add; - if (vec_map.lookup(v, add)) { - add += p.normal; - } else { - add = p.normal; - } - vec_map.set(v, add); + for (int j = 0; j < 3; j++) { + Vector3 v = n->faces[i].vertices[j]; + Vector3 add; + if (vec_map.lookup(v, add)) { + add += p.normal; + } else { + add = p.normal; } + vec_map.set(v, add); } face_count.write[idx]++; |