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

Merge pull request #302 from kruland2607/unstable

Browse Source 
rendering bugs and small problems in pods example
This commit is contained in:
kruland2607 2016-10-26 19:47:08 -05:00 committed by GitHub
commit 9da4a17a43
3 changed files with 6 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

BIN
swing/resources/datafiles/examples/Pods Example.ork
View File

Binary file not shown.

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

@ -12,10 +12,13 @@ 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.PodSet;
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 +111,9 @@ 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 if ( c instanceof PodSet ) {
} else { } else {
renderOther(gl, c); renderOther(gl, c);
} }