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

Geometry active flag was also never false; eliminated it

Browse Source
This commit is contained in:
JoePfeiffer 2022-03-14 12:47:21 -06:00
parent 584353463b
commit 13fe3e1046
2 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
swing/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java
View File

@ -85,21 +85,19 @@ public abstract class RocketRenderer {
if (ignore != null && ignore.contains(comp)) if (ignore != null && ignore.contains(comp))
continue; continue;
if( geom.active ) { final int hashCode = comp.hashCode();
final int hashCode = comp.hashCode();
selectionMap.put(hashCode, comp); selectionMap.put(hashCode, comp);
gl.glColor4ub((byte) ((hashCode >> 24) & 0xFF), // red channel (LSB) gl.glColor4ub((byte) ((hashCode >> 24) & 0xFF), // red channel (LSB)
(byte) ((hashCode >> 16) & 0xFF), // green channel (byte) ((hashCode >> 16) & 0xFF), // green channel
(byte) ((hashCode >> 8) & 0xFF), // blue channel (byte) ((hashCode >> 8) & 0xFF), // blue channel
(byte) ((hashCode) & 0xFF)); // alpha channel (MSB) (byte) ((hashCode) & 0xFF)); // alpha channel (MSB)
if (isDrawnTransparent(comp)) { if (isDrawnTransparent(comp)) {
geom.render(gl, Surface.INSIDE); geom.render(gl, Surface.INSIDE);
} else { } else {
geom.render(gl, Surface.ALL); geom.render(gl, Surface.ALL);
}
} }
} }
@ -186,7 +184,6 @@ public abstract class RocketRenderer {
for(InstanceContext context: contextList ) { for(InstanceContext context: contextList ) {
Geometry instanceGeometry = cr.getComponentGeometry( comp, context.transform ); Geometry instanceGeometry = cr.getComponentGeometry( comp, context.transform );
instanceGeometry.active = true;
treeGeometry.add( instanceGeometry ); treeGeometry.add( instanceGeometry );
} }
} }
@ -196,19 +193,15 @@ public abstract class RocketRenderer {
private void renderTree( GL2 gl, final Collection<Geometry> geometryList){ private void renderTree( GL2 gl, final Collection<Geometry> geometryList){
//cycle through opaque components first, then transparent to preserve proper depth testing //cycle through opaque components first, then transparent to preserve proper depth testing
for(Geometry geom: geometryList ) { for(Geometry geom: geometryList ) {
if( geom.active ) { //if not transparent
//if not transparent if( !isDrawnTransparent( (RocketComponent)geom.obj) ){
if( !isDrawnTransparent( (RocketComponent)geom.obj) ){ renderComponent(gl, geom, 1.0f);
renderComponent(gl, geom, 1.0f);
}
} }
} }
for(Geometry geom: geometryList ) { for(Geometry geom: geometryList ) {
if( geom.active ) { if( isDrawnTransparent( (RocketComponent)geom.obj) ){
if( isDrawnTransparent( (RocketComponent)geom.obj) ){ // Draw T&T front faces blended, without depth test
// Draw T&T front faces blended, without depth test renderComponent(gl, geom, 0.2f);
renderComponent(gl, geom, 0.2f);
}
} }
} }
} }

2
swing/src/net/sf/openrocket/gui/figure3d/geometry/Geometry.java
View File

@ -25,8 +25,6 @@ public abstract class Geometry {
public final Object obj; public final Object obj;
public final Transformation transform; public final Transformation transform;
public boolean active;
public abstract void render(GL2 gl, Surface which ); public abstract void render(GL2 gl, Surface which );
private Geometry() { private Geometry() {