Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-23 12:43:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #58208 from MythTitans/fix-sphere-and-cylinder-shapes-normals-seam

Browse Source
This commit is contained in:
Rémi Verschelde 2022-03-07 08:37:29 +01:00 committed by GitHub
commit 1177bd635f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/csg/csg_shape.cpp
View File

@ -955,6 +955,10 @@ CSGBrush *CSGSphere3D::_build_brush() {
double u0 = double(j) / radial_segments; double u0 = double(j) / radial_segments;
double longitude1 = longitude_step * (j + 1); double longitude1 = longitude_step * (j + 1);
if (j == radial_segments - 1) {
longitude1 = 0;
}
double x1 = Math::sin(longitude1); double x1 = Math::sin(longitude1);
double z1 = Math::cos(longitude1); double z1 = Math::cos(longitude1);
double u1 = double(j + 1) / radial_segments; double u1 = double(j + 1) / radial_segments;
@ -1271,6 +1275,9 @@ CSGBrush *CSGCylinder3D::_build_brush() {
for (int i = 0; i < sides; i++) { for (int i = 0; i < sides; i++) {
float inc = float(i) / sides; float inc = float(i) / sides;
float inc_n = float((i + 1)) / sides; float inc_n = float((i + 1)) / sides;
if (i == sides - 1) {
inc_n = 0;
}
float ang = inc * Math_TAU; float ang = inc * Math_TAU;
float ang_n = inc_n * Math_TAU; float ang_n = inc_n * Math_TAU;