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

Add thickness to a few components.

Browse Source 
Add an ALL surface
This commit is contained in:
bkuker 2013-03-04 15:12:48 -05:00
parent 8b633bcd95
commit 701aa4b151
4 changed files with 101 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/net/sf/openrocket/gui/figure3d/FigureRenderer.java
View File

@ -120,7 +120,7 @@ public class FigureRenderer extends RocketRenderer {
gl.glMaterialfv(GL.GL_BACK, GLLightingFunc.GL_DIFFUSE, color, 0);
gl.glMaterialfv(GL.GL_BACK, GLLightingFunc.GL_AMBIENT, color, 0);
cr.getGeometry(c, Surface.OUTSIDE).render(gl);
cr.getGeometry(c, Surface.ALL).render(gl);
}
@Override

12
core/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java
View File

@ -75,10 +75,10 @@ public abstract class RocketRenderer {
if (isDrawnTransparent(c)) {
gl.glEnable(GL.GL_CULL_FACE);
gl.glCullFace(GL.GL_FRONT);
cr.getGeometry(c, Surface.OUTSIDE).render(gl);
cr.getGeometry(c, Surface.ALL).render(gl);
gl.glDisable(GL.GL_CULL_FACE);
} else {
cr.getGeometry(c, Surface.OUTSIDE).render(gl);
cr.getGeometry(c, Surface.ALL).render(gl);
}
}
@ -117,14 +117,14 @@ public abstract class RocketRenderer {
// Draw as lines, set Z to nearest
gl.glPolygonMode(GL.GL_FRONT_AND_BACK, GL2GL3.GL_LINE);
gl.glDepthRange(0, 0);
cr.getGeometry(c, Surface.OUTSIDE).render(gl);
cr.getGeometry(c, Surface.ALL).render(gl);
// Draw polygons, always passing depth test,
// setting Z to farthest
gl.glPolygonMode(GL.GL_FRONT_AND_BACK, GL2GL3.GL_FILL);
gl.glDepthRange(1, 1);
gl.glDepthFunc(GL.GL_ALWAYS);
cr.getGeometry(c, Surface.OUTSIDE).render(gl);
cr.getGeometry(c, Surface.ALL).render(gl);
gl.glDepthFunc(GL.GL_LESS);
gl.glDepthRange(0, 1);
}
@ -133,6 +133,7 @@ public abstract class RocketRenderer {
gl.glMaterialfv(GL.GL_FRONT_AND_BACK, GLLightingFunc.GL_EMISSION, colorBlack, 0);
} // done with selection outline
gl.glEnable(GL.GL_CULL_FACE);
// Draw all inner components
for (RocketComponent c : configuration) {
if (isDrawn(c)) {
@ -141,6 +142,7 @@ public abstract class RocketRenderer {
}
}
}
gl.glDisable(GL.GL_CULL_FACE);
renderMotors(gl, configuration);
@ -195,7 +197,7 @@ public abstract class RocketRenderer {
}
protected void renderMotor(GL2 gl, Motor motor) {
cr.getGeometry(motor, Surface.OUTSIDE).render(gl);
cr.getGeometry(motor, Surface.ALL).render(gl);
}
}

148
core/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java
View File

@ -56,12 +56,16 @@ public class ComponentRenderer {
public Geometry getGeometry(final RocketComponent c, final Surface which) {
return new Geometry() {
@Override
public void render(GL2 gl) {
renderGeometry(gl, c, which);
if (which == Surface.ALL) {
renderGeometry(gl, c, Surface.INSIDE);
renderGeometry(gl, c, Surface.EDGES);
renderGeometry(gl, c, Surface.OUTSIDE);
} else {
renderGeometry(gl, c, which);
}
}
};
}
@ -90,15 +94,18 @@ public class ComponentRenderer {
if (c instanceof BodyTube) {
renderTube(gl, (BodyTube) c, which);
} else if (c instanceof LaunchLug) {
renderLug(gl, (LaunchLug) c);
renderLug(gl, (LaunchLug) c, which);
} else if (c instanceof RingComponent) {
renderRing(gl, (RingComponent) c);
if (which == Surface.OUTSIDE)
renderRing(gl, (RingComponent) c);
} else if (c instanceof Transition) {
renderTransition(gl, (Transition) c);
renderTransition(gl, (Transition) c, which);
} else if (c instanceof MassObject) {
renderMassObject(gl, (MassObject) c);
if (which == Surface.OUTSIDE)
renderMassObject(gl, (MassObject) c);
} else if (c instanceof FinSet) {
renderFinSet(gl, (FinSet) c);
if (which == Surface.OUTSIDE)
renderFinSet(gl, (FinSet) c);
} else {
renderOther(gl, c);
}
@ -118,57 +125,68 @@ public class ComponentRenderer {
gl.glEnd();
}
private void renderTransition(GL2 gl, Transition t) {
private void renderTransition(GL2 gl, Transition t, Surface which) {
//TODO take into account thickness.
if (which == Surface.INSIDE) {
gl.glFrontFace(GL.GL_CCW);
}
gl.glRotated(90, 0, 1.0, 0);
if (t.getType() == Transition.Shape.CONICAL) {
glu.gluCylinder(q, t.getForeRadius(), t.getAftRadius(),
t.getLength(), LOD, 1);
} else {
TransitionRenderer.drawTransition(gl, t, LOD, LOD);
if (which == Surface.OUTSIDE || which == Surface.INSIDE) {
if (t.getType() == Transition.Shape.CONICAL) {
glu.gluCylinder(q, t.getForeRadius(), t.getAftRadius(),
t.getLength(), LOD, 1);
} else {
TransitionRenderer.drawTransition(gl, t, LOD, LOD);
}
}
// Render AFT shoulder
gl.glPushMatrix();
gl.glTranslated(0, 0, t.getLength());
glu.gluCylinder(q, t.getAftShoulderRadius(), t.getAftShoulderRadius(),
t.getAftShoulderLength(), LOD, 1);
gl.glRotated(180, 0, 1.0, 0);
glu.gluDisk(q, t.getAftRadius(), t.getAftShoulderRadius(), LOD, 2);
gl.glTranslated(0, 0, -t.getAftShoulderLength());
if (t.isFilled() || t.isAftShoulderCapped()) {
glu.gluDisk(q, t.getAftShoulderRadius(), 0, LOD, 2);
if (which == Surface.EDGES || which == Surface.INSIDE) {
// Render AFT shoulder
gl.glPushMatrix();
gl.glTranslated(0, 0, t.getLength());
glu.gluCylinder(q, t.getAftShoulderRadius(), t.getAftShoulderRadius(),
t.getAftShoulderLength(), LOD, 1);
gl.glRotated(180, 0, 1.0, 0);
glu.gluDisk(q, t.getAftRadius(), t.getAftShoulderRadius(), LOD, 2);
gl.glTranslated(0, 0, -t.getAftShoulderLength());
if (t.isFilled() || t.isAftShoulderCapped()) {
glu.gluDisk(q, t.getAftShoulderRadius(), 0, LOD, 2);
}
gl.glPopMatrix();
// Render Fore Shoulder
gl.glPushMatrix();
gl.glRotated(180, 0, 1.0, 0);
glu.gluCylinder(q, t.getForeShoulderRadius(),
t.getForeShoulderRadius(), t.getForeShoulderLength(), LOD, 1);
gl.glRotated(180, 0, 1.0, 0);
glu.gluDisk(q, t.getForeRadius(), t.getForeShoulderRadius(), LOD, 2);
gl.glTranslated(0, 0, -t.getForeShoulderLength());
if (t.isFilled() || t.isForeShoulderCapped()) {
glu.gluDisk(q, t.getForeShoulderRadius(), 0, LOD, 2);
}
gl.glPopMatrix();
}
gl.glPopMatrix();
// Render Fore Shoulder
gl.glPushMatrix();
gl.glRotated(180, 0, 1.0, 0);
glu.gluCylinder(q, t.getForeShoulderRadius(),
t.getForeShoulderRadius(), t.getForeShoulderLength(), LOD, 1);
gl.glRotated(180, 0, 1.0, 0);
glu.gluDisk(q, t.getForeRadius(), t.getForeShoulderRadius(), LOD, 2);
gl.glTranslated(0, 0, -t.getForeShoulderLength());
if (t.isFilled() || t.isForeShoulderCapped()) {
glu.gluDisk(q, t.getForeShoulderRadius(), 0, LOD, 2);
if (which == Surface.INSIDE) {
gl.glFrontFace(GL.GL_CW);
}
gl.glPopMatrix();
}
private void renderTube(GL2 gl, BodyTube t, Surface which) {
//TODO REfactor without the extra transforms
//outside
gl.glRotated(90, 0, 1.0, 0);
if (which == Surface.OUTSIDE)
@ -187,14 +205,14 @@ public class ComponentRenderer {
//inside
gl.glTranslated(0, 0, -t.getLength());
if (which == Surface.INSIDE)
glu.gluCylinder(q, t.getInnerRadius(), t.getInnerRadius(),
t.getLength(), LOD, 1);
-t.getLength(), LOD, 1);
}
private void renderRing(GL2 gl, RingComponent r) {
gl.glRotated(90, 0, 1.0, 0);
glu.gluCylinder(q, r.getOuterRadius(), r.getOuterRadius(),
r.getLength(), LOD, 1);
@ -206,17 +224,33 @@ public class ComponentRenderer {
gl.glTranslated(0, 0, r.getLength());
glu.gluDisk(q, r.getInnerRadius(), r.getOuterRadius(), LOD, 2);
gl.glTranslated(0, 0, -r.getLength());
glu.gluCylinder(q, r.getInnerRadius(), r.getInnerRadius(),
r.getLength(), LOD, 1);
-r.getLength(), LOD, 1);
}
private void renderLug(GL2 gl, LaunchLug t) {
private void renderLug(GL2 gl, LaunchLug t, Surface which) {
//outside
gl.glRotated(90, 0, 1.0, 0);
glu.gluCylinder(q, t.getOuterRadius(), t.getOuterRadius(),
t.getLength(), LOD, 1);
if (which == Surface.OUTSIDE)
glu.gluCylinder(q, t.getOuterRadius(), t.getOuterRadius(),
t.getLength(), LOD, 1);
//edges
gl.glRotated(180, 0, 1.0, 0);
if (which == Surface.EDGES)
glu.gluDisk(q, t.getInnerRadius(), t.getOuterRadius(), LOD, 2);
gl.glRotated(180, 0, 1.0, 0);
gl.glTranslated(0, 0, t.getLength());
if (which == Surface.EDGES)
glu.gluDisk(q, t.getInnerRadius(), t.getOuterRadius(), LOD, 2);
//inside
if (which == Surface.INSIDE)
glu.gluCylinder(q, t.getInnerRadius(), t.getInnerRadius(),
-t.getLength(), LOD, 1);
}
private void renderMassObject(GL2 gl, MassObject o) {

4
core/src/net/sf/openrocket/gui/figure3d/geometry/Geometry.java
View File

@ -4,8 +4,8 @@ import javax.media.opengl.GL2;
public interface Geometry {
public static enum Surface {
OUTSIDE, INSIDE, EDGES;
ALL, OUTSIDE, INSIDE, EDGES;
}
public void render(GL2 gl);
}