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

Fix 3d rendering issues with AxialStage and ParallelStage. Renamed

Browse Source 
example to get rid of underscores.
This commit is contained in:
Kevin Ruland 2016-10-26 18:39:10 -05:00
parent 25a249ee27
commit 10bd864ef6
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
swing/resources/datafiles/examples/Parallel_Staging_Example.ork → swing/resources/datafiles/examples/Parallel Staging Example.ork
View File

4
swing/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java
View File

@ -12,10 +12,12 @@ import org.slf4j.LoggerFactory;
import net.sf.openrocket.gui.figure3d.geometry.Geometry.Surface; import net.sf.openrocket.gui.figure3d.geometry.Geometry.Surface;
import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.Motor;
import net.sf.openrocket.rocketcomponent.AxialStage;
import net.sf.openrocket.rocketcomponent.BodyTube; import net.sf.openrocket.rocketcomponent.BodyTube;
import net.sf.openrocket.rocketcomponent.FinSet; import net.sf.openrocket.rocketcomponent.FinSet;
import net.sf.openrocket.rocketcomponent.LaunchLug; import net.sf.openrocket.rocketcomponent.LaunchLug;
import net.sf.openrocket.rocketcomponent.MassObject; import net.sf.openrocket.rocketcomponent.MassObject;
import net.sf.openrocket.rocketcomponent.ParallelStage;
import net.sf.openrocket.rocketcomponent.RailButton; import net.sf.openrocket.rocketcomponent.RailButton;
import net.sf.openrocket.rocketcomponent.RingComponent; import net.sf.openrocket.rocketcomponent.RingComponent;
import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.RocketComponent;
@ -108,6 +110,8 @@ public class ComponentRenderer {
fr.renderFinSet(gl, (FinSet) c); fr.renderFinSet(gl, (FinSet) c);
} else if (c instanceof TubeFinSet) { } else if (c instanceof TubeFinSet) {
renderTubeFins( gl, (TubeFinSet) c, which); renderTubeFins( gl, (TubeFinSet) c, which);
} else if ( c instanceof AxialStage ) {
} else if ( c instanceof ParallelStage ) {
} else { } else {
renderOther(gl, c); renderOther(gl, c);
} }