From 10bd864ef65e0dbc013c67c462dbbf18a797a616 Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Wed, 26 Oct 2016 18:39:10 -0500 Subject: [PATCH] Fix 3d rendering issues with AxialStage and ParallelStage. Renamed example to get rid of underscores. --- ...ing_Example.ork => Parallel Staging Example.ork} | Bin .../gui/figure3d/geometry/ComponentRenderer.java | 4 ++++ 2 files changed, 4 insertions(+) rename swing/resources/datafiles/examples/{Parallel_Staging_Example.ork => Parallel Staging Example.ork} (100%) diff --git a/swing/resources/datafiles/examples/Parallel_Staging_Example.ork b/swing/resources/datafiles/examples/Parallel Staging Example.ork similarity index 100% rename from swing/resources/datafiles/examples/Parallel_Staging_Example.ork rename to swing/resources/datafiles/examples/Parallel Staging Example.ork diff --git a/swing/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java index c2ae7b287..48e8cee37 100644 --- a/swing/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java +++ b/swing/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java @@ -12,10 +12,12 @@ import org.slf4j.LoggerFactory; import net.sf.openrocket.gui.figure3d.geometry.Geometry.Surface; import net.sf.openrocket.motor.Motor; +import net.sf.openrocket.rocketcomponent.AxialStage; import net.sf.openrocket.rocketcomponent.BodyTube; import net.sf.openrocket.rocketcomponent.FinSet; import net.sf.openrocket.rocketcomponent.LaunchLug; import net.sf.openrocket.rocketcomponent.MassObject; +import net.sf.openrocket.rocketcomponent.ParallelStage; import net.sf.openrocket.rocketcomponent.RailButton; import net.sf.openrocket.rocketcomponent.RingComponent; import net.sf.openrocket.rocketcomponent.RocketComponent; @@ -108,6 +110,8 @@ public class ComponentRenderer { fr.renderFinSet(gl, (FinSet) c); } else if (c instanceof TubeFinSet) { renderTubeFins( gl, (TubeFinSet) c, which); + } else if ( c instanceof AxialStage ) { + } else if ( c instanceof ParallelStage ) { } else { renderOther(gl, c); }