From 10bd864ef65e0dbc013c67c462dbbf18a797a616 Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Wed, 26 Oct 2016 18:39:10 -0500 Subject: [PATCH 1/3] 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); } From f390d1f305828d0dcce1c005b636f86ddb07295c Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Wed, 26 Oct 2016 19:42:16 -0500 Subject: [PATCH 2/3] Fix PodSet Rendering. --- .../sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java | 2 ++ 1 file changed, 2 insertions(+) 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 48e8cee37..e1563217b 100644 --- a/swing/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java +++ b/swing/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java @@ -18,6 +18,7 @@ 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.PodSet; import net.sf.openrocket.rocketcomponent.RailButton; import net.sf.openrocket.rocketcomponent.RingComponent; import net.sf.openrocket.rocketcomponent.RocketComponent; @@ -112,6 +113,7 @@ public class ComponentRenderer { renderTubeFins( gl, (TubeFinSet) c, which); } else if ( c instanceof AxialStage ) { } else if ( c instanceof ParallelStage ) { + } else if ( c instanceof PodSet ) { } else { renderOther(gl, c); } From a082e8a24b8bc279be7c761f15f3370033872493 Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Wed, 26 Oct 2016 19:46:00 -0500 Subject: [PATCH 3/3] Resave the Pods Example to get rid of older attribute. --- .../datafiles/examples/Pods Example.ork | Bin 2415 -> 2452 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/swing/resources/datafiles/examples/Pods Example.ork b/swing/resources/datafiles/examples/Pods Example.ork index eb1bc0ebe964800d957ddc5ba65996845755d24c..08eac01ddda90550118bd8570369d46293d814e0 100644 GIT binary patch delta 2409 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 bomxo}dO>0i2><{AEt5M5E(S&k00000L{p!4 delta 2372 zcmV-K3A^@`6YmlZP)h>@6aWYa2mrWT8%L229eYe@bHXKy$%(x_f6W z&3A~V5hpA??%tKfVd1~~KD-NfM$?=}Uun^S4QshJP?S?#@O)?d0*FsF!g80UL+FDM z-hUw!)NJyiynn(;7SjfT#ECz`ZV-JcXrAI2Wt@oR z-5snVkl+a|SV9Ggcv@hVqJ+bCL_JG5N;#}RGo0gsqC?ITRGcWw5m4Y;NEG-;gH`+K zdLx7ic1&p={(w_PWAqz~V}=uP_e+X?WPim^<^E5opwBr@@g4nF$uiCa{qr%wEMCG& z!Kz!JUa#5`?C-#iCF}!)hw2d{JHy@*?AXLx9JZ#tSX*0r;XD3z5n0xL6FD2xH$4Lp zdcb8|?2IBWsj+Gn&gp@|F(O(#XEaRk6H7|?{Fr=KV@0`#y=6RwbBdZ@Qsw#EQGa(o z_&Mg7ppTg4Ao=!^dX#dlnx6{_XQM-+W?A%izz!9lLmybm#3@X9p5QoGHN!C`f&0uE zXoEcC&e)gnS1F}bu;O`VYn#3EECi8Se!yYyN(;In&B8zoLKZV zr9w!UX$7mEFb0Yf26<=vk>nxBcztk6-amaN2cxNm?U5rAPE-f28?Dz)3FRJ z!R~leYTwBT$K5`vT}@~@Cc<(WO}TpFoK1>UVm*6wjh569Av6r#9aK>utM$0%7*9NIcv{` zzwXup>3H`G%fBtG{ohBmh%_E6BFYdpQYca82OQCXPDvSfM)-+kqTm@yA&#Uvy=uz3 zEauPjK?XJY&w5+3R_m!c9vl~}CrmWs5&-6WBeQrIBJ3d&bkyI+)+2017ns# z{#wFT;rjc58rbQIQ-5Q%iXtZ`;+CYbtWC=|!uuGDf<;ii<^+A0!^a7-QIh--Su1OU zSo(+hQ@UG_`q$aibPl{)^i{5`Gq=wYP<{Jad)xD(;K}VdqkVhMXuUP-0x@+5TFVwk zu0PD>+jm?ee4k@RD5*^iedjb6@7MRPzjMvSUYSc?fCIViVSk)$X?%d>0DV?PxS;6{ zffQ>eP(n=2*)eUB(CM^_abW0E;#FOfbFsPKIr>-%Sn~}9Y1g(dM(Oo(lwUe-RpVb1 zw8u5;Acl|6B%5oA$_)nXCDs=g<1&p-!D>v^@eHnXOqw$A2b!O7daSYCXjT==ZQk1U zQ(9_TLLe+ksDB2+ztEh2q4H28vMRtFseq{GMbz@Qt`8q|ylrHy50+2%E>t+{gKJ_L zdn%wRqREzKrP$%mmSg|cb~&-e{|sW9>GC%jx7kChq+R+?1 z&e|QV1E@n+&V>+7WUG=4*(DlL6-*d*SZ$;FpXx|)Ob6{zd9VRR$8f7q$6QL8@gh3O zXlO2{PR^4;Y^N1cWLe8;*)#Xp&CVIcBZUOCHM2=KP+rFnFlRqec05(m^=Dsg=4Q4y zGoL8}K7R&j#y*DJKxbR`6$Dk7Ta9YbxRWz>^@{e=r;g@17xuqQ068St`KU8Aq+Bpj z>x_j4EA7?2pgkyG^QPXlzWtBjO~0@V$>+k)YOi|c^392X=*#N>6tuu;)D%;Y(u@gr zire6agWNUPlI6CS(a~zg!MwDJc~K=Zt7c>*)73MtS<}=~l`m0(N#_VM zeScON^vmm?VGVTfDaBitZ1#ls8^^(>N6hWka}TDwjiNI((5w#n!L}|`L9&wojeHT(cT}SU?#yHIlFMqWFH5ge`)xSZL1HqCquI#m0U_g<-2P;ak zGeCL-6oho{s_8)YNNcRi?IK`mpZ>c3+zwzj9sRDWRO6^2y~laZAHjKj=xDNj?dCfc z@Y!sz<(61E-tZc~D;vNKykDUXCOK~#!JNuaHPjHB3-405QQGbG;T1o5-&suuhjUkB-6imHxpVr1+x=uyJQAA@} zx42=#+=tl`~%08mQ@2x%*n+#=}+008|e q002-+0Rj{N6aWYa2mrWT8%Jp?l-%hE008|elVAxh1|bOm00000R*B~T