hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2287 from SiboVG/issue-2286

Browse Source 
[#2286] Fix fin tab face culling
This commit is contained in:
Sibo Van Gool 2023-08-05 21:12:01 +02:00 committed by GitHub
commit 0cbbddbe52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
swing/src/net/sf/openrocket/gui/figure3d/geometry/FinRenderer.java
View File

@ -16,6 +16,8 @@ import net.sf.openrocket.util.BoundingBox;
import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.Coordinate;
import net.sf.openrocket.gui.figure3d.geometry.Geometry.Surface; import net.sf.openrocket.gui.figure3d.geometry.Geometry.Surface;
import java.util.Collections;
public class FinRenderer { public class FinRenderer {
private GLUtessellator tess = GLU.gluNewTess(); private GLUtessellator tess = GLU.gluNewTess();
@ -96,12 +98,11 @@ public class FinRenderer {
GLU.gluTessBeginPolygon(tess, null); GLU.gluTessBeginPolygon(tess, null);
GLU.gluTessBeginContour(tess); GLU.gluTessBeginContour(tess);
gl.glNormal3f(0, 0, 1); gl.glNormal3f(0, 0, 1);
for (int i = tabPoints.length - 1; i >= 0; i--) { for (Coordinate c : tabPoints) {
Coordinate c = tabPoints[i]; double[] p = new double[]{c.x, c.y + finSet.getBodyRadius(),
double[] p = new double[]{c.x, c.y + finSet.getBodyRadius(), c.z + finSet.getThickness() / 2.0};
c.z + finSet.getThickness() / 2.0}; GLU.gluTessVertex(tess, p, 0, p);
GLU.gluTessVertex(tess, p, 0, p); }
}
GLU.gluTessEndContour(tess); GLU.gluTessEndContour(tess);
GLU.gluTessEndPolygon(tess); GLU.gluTessEndPolygon(tess);
} }
@ -125,7 +126,8 @@ public class FinRenderer {
GLU.gluTessBeginPolygon(tess, null); GLU.gluTessBeginPolygon(tess, null);
GLU.gluTessBeginContour(tess); GLU.gluTessBeginContour(tess);
gl.glNormal3f(0, 0, -1); gl.glNormal3f(0, 0, -1);
for (Coordinate c : tabPoints) { for (int i = tabPoints.length - 1; i >= 0; i--) {
Coordinate c = tabPoints[i];
double[] p = new double[]{c.x, c.y + finSet.getBodyRadius(), double[] p = new double[]{c.x, c.y + finSet.getBodyRadius(),
c.z - finSet.getThickness() / 2.0}; c.z - finSet.getThickness() / 2.0};
GLU.gluTessVertex(tess, p, 0, p); GLU.gluTessVertex(tess, p, 0, p);
@ -163,7 +165,7 @@ public class FinRenderer {
if (!(finSet instanceof EllipticalFinSet)) if (!(finSet instanceof EllipticalFinSet))
gl.glShadeModel(GLLightingFunc.GL_FLAT); gl.glShadeModel(GLLightingFunc.GL_FLAT);
gl.glBegin(GL.GL_TRIANGLE_STRIP); gl.glBegin(GL.GL_TRIANGLE_STRIP);
for (int i = 0; i <= tabPoints.length; i++) { for (int i = tabPoints.length; i >= 0; i--) {
Coordinate c = tabPoints[i % tabPoints.length]; Coordinate c = tabPoints[i % tabPoints.length];
// if ( i > 1 ){ // if ( i > 1 ){
Coordinate c2 = tabPoints[(i - 1 + tabPoints.length) Coordinate c2 = tabPoints[(i - 1 + tabPoints.length)