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

Merge pull request #3 from teyrana/fix_java11_3d

Browse Source 
[fix] Restores 3d Views to PR #556 -- Java 11 upgrade
This commit is contained in:
Neil 2020-03-03 11:21:17 -08:00 committed by GitHub
commit c0203b9267
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 97 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.idea/artifacts/openrocket_jar.xml generated
View File

@ -34,6 +34,17 @@
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib-extra/RXTXcomm.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib-extra/RXTXcomm.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/guice-multibindings-3.0.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/guice-multibindings-3.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/OrangeExtensions-1.2.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/OrangeExtensions-1.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-linux-i586.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-windows-amd64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-windows-i586.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-linux-amd64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-linux-i586.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-macosx-universal.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-windows-amd64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-windows-i586.jar" path-in-jar="/" />
</root> </root>
</artifact> </artifact>
</component> </component>

19
swing/OpenRocket Swing.iml
View File

@ -34,15 +34,6 @@
</content> </content>
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="module-library">
<library name="jogl-all.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jogl/jogl-all.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="iText-5.0.2.jar"> <library name="iText-5.0.2.jar">
<CLASSES> <CLASSES>
@ -79,15 +70,6 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library">
<library name="gluegen-rt.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jogl/gluegen-rt.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module" module-name="OpenRocket Core" /> <orderEntry type="module" module-name="OpenRocket Core" />
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="slf4j-api-1.7.5.jar"> <library name="slf4j-api-1.7.5.jar">
@ -279,5 +261,6 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="library" name="jogl" level="project" />
</component> </component>
</module> </module>

BIN
swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar
View File

Binary file not shown.

BIN
swing/lib/jogl/gluegen-rt-natives-linux-i586.jar
View File

Binary file not shown.

BIN
swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar
View File

Binary file not shown.

BIN
swing/lib/jogl/gluegen-rt-natives-windows-amd64.jar
View File

Binary file not shown.

BIN
swing/lib/jogl/gluegen-rt-natives-windows-i586.jar
View File

Binary file not shown.

BIN
swing/lib/jogl/gluegen-rt.jar
View File

Binary file not shown.

BIN
swing/lib/jogl/gluegen.jar Normal file
View File

Binary file not shown.

BIN
swing/lib/jogl/jogl-all-natives-linux-amd64.jar
View File

Binary file not shown.

BIN
swing/lib/jogl/jogl-all-natives-linux-i586.jar
View File

Binary file not shown.

BIN
swing/lib/jogl/jogl-all-natives-macosx-universal.jar
View File

Binary file not shown.

BIN
swing/lib/jogl/jogl-all-natives-windows-amd64.jar
View File

Binary file not shown.

BIN
swing/lib/jogl/jogl-all-natives-windows-i586.jar
View File

Binary file not shown.

BIN
swing/lib/jogl/jogl-all.jar
View File

Binary file not shown.

10
swing/src/net/sf/openrocket/gui/figure3d/FigureRenderer.java
View File

@ -2,11 +2,11 @@ package net.sf.openrocket.gui.figure3d;
import java.util.HashMap; import java.util.HashMap;
import javax.media.opengl.GL; import com.jogamp.opengl.GL;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import javax.media.opengl.GL2ES1; import com.jogamp.opengl.GL2ES1;
import javax.media.opengl.GLAutoDrawable; import com.jogamp.opengl.GLAutoDrawable;
import javax.media.opengl.fixedfunc.GLLightingFunc; import com.jogamp.opengl.fixedfunc.GLLightingFunc;
import net.sf.openrocket.gui.figure3d.geometry.Geometry; import net.sf.openrocket.gui.figure3d.geometry.Geometry;
import net.sf.openrocket.gui.figure3d.geometry.Geometry.Surface; import net.sf.openrocket.gui.figure3d.geometry.Geometry.Surface;

12
swing/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java
View File

@ -1,11 +1,11 @@
package net.sf.openrocket.gui.figure3d; package net.sf.openrocket.gui.figure3d;
import javax.media.opengl.GL; import com.jogamp.opengl.GL;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import javax.media.opengl.GL2ES1; import com.jogamp.opengl.GL2ES1;
import javax.media.opengl.GLAutoDrawable; import com.jogamp.opengl.GLAutoDrawable;
import javax.media.opengl.fixedfunc.GLLightingFunc; import com.jogamp.opengl.fixedfunc.GLLightingFunc;
import javax.media.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
import net.sf.openrocket.appearance.Appearance; import net.sf.openrocket.appearance.Appearance;
import net.sf.openrocket.appearance.Decal; import net.sf.openrocket.appearance.Decal;

24
swing/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
View File

@ -16,18 +16,18 @@ import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import javax.media.opengl.GL; import com.jogamp.opengl.GL;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import javax.media.opengl.GLAutoDrawable; import com.jogamp.opengl.GLAutoDrawable;
import javax.media.opengl.GLCapabilities; import com.jogamp.opengl.GLCapabilities;
import javax.media.opengl.GLEventListener; import com.jogamp.opengl.GLEventListener;
import javax.media.opengl.GLProfile; import com.jogamp.opengl.GLProfile;
import javax.media.opengl.GLRunnable; import com.jogamp.opengl.GLRunnable;
import javax.media.opengl.awt.GLCanvas; import com.jogamp.opengl.awt.GLCanvas;
import javax.media.opengl.awt.GLJPanel; import com.jogamp.opengl.awt.GLJPanel;
import javax.media.opengl.fixedfunc.GLLightingFunc; import com.jogamp.opengl.fixedfunc.GLLightingFunc;
import javax.media.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
import javax.media.opengl.glu.GLU; import com.jogamp.opengl.glu.GLU;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JPopupMenu; import javax.swing.JPopupMenu;

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

@ -8,11 +8,11 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Vector; import java.util.Vector;
import javax.media.opengl.GL; import com.jogamp.opengl.GL;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import javax.media.opengl.GL2GL3; import com.jogamp.opengl.GL2GL3;
import javax.media.opengl.GLAutoDrawable; import com.jogamp.opengl.GLAutoDrawable;
import javax.media.opengl.fixedfunc.GLLightingFunc; import com.jogamp.opengl.fixedfunc.GLLightingFunc;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

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

@ -5,9 +5,9 @@ import java.net.URL;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.media.opengl.GL; import com.jogamp.opengl.GL;
import javax.media.opengl.GLAutoDrawable; import com.jogamp.opengl.GLAutoDrawable;
import javax.media.opengl.GLProfile; import com.jogamp.opengl.GLProfile;
import net.sf.openrocket.appearance.Decal; import net.sf.openrocket.appearance.Decal;

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

@ -1,11 +1,11 @@
package net.sf.openrocket.gui.figure3d.geometry; package net.sf.openrocket.gui.figure3d.geometry;
import javax.media.opengl.GL; import com.jogamp.opengl.GL;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import javax.media.opengl.GLAutoDrawable; import com.jogamp.opengl.GLAutoDrawable;
import javax.media.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
import javax.media.opengl.glu.GLU; import com.jogamp.opengl.glu.GLU;
import javax.media.opengl.glu.GLUquadric; import com.jogamp.opengl.glu.GLUquadric;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

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

@ -3,8 +3,8 @@ package net.sf.openrocket.gui.figure3d.geometry;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import javax.media.opengl.GLAutoDrawable; import com.jogamp.opengl.GLAutoDrawable;
import net.sf.openrocket.gui.figure3d.geometry.Geometry.Surface; import net.sf.openrocket.gui.figure3d.geometry.Geometry.Surface;
import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.RocketComponent;

16
swing/src/net/sf/openrocket/gui/figure3d/geometry/FinRenderer.java
View File

@ -1,13 +1,13 @@
package net.sf.openrocket.gui.figure3d.geometry; package net.sf.openrocket.gui.figure3d.geometry;
import javax.media.opengl.GL; import com.jogamp.opengl.GL;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import javax.media.opengl.fixedfunc.GLLightingFunc; import com.jogamp.opengl.fixedfunc.GLLightingFunc;
import javax.media.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
import javax.media.opengl.glu.GLU; import com.jogamp.opengl.glu.GLU;
import javax.media.opengl.glu.GLUtessellator; import com.jogamp.opengl.glu.GLUtessellator;
import javax.media.opengl.glu.GLUtessellatorCallback; import com.jogamp.opengl.glu.GLUtessellatorCallback;
import javax.media.opengl.glu.GLUtessellatorCallbackAdapter; import com.jogamp.opengl.glu.GLUtessellatorCallbackAdapter;
import net.sf.openrocket.rocketcomponent.EllipticalFinSet; import net.sf.openrocket.rocketcomponent.EllipticalFinSet;
import net.sf.openrocket.rocketcomponent.FinSet; import net.sf.openrocket.rocketcomponent.FinSet;

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

@ -6,7 +6,7 @@ import net.sf.openrocket.rocketcomponent.Rocket;
import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.util.Transformation; import net.sf.openrocket.util.Transformation;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
/* /*

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

@ -114,8 +114,8 @@
*/ */
package net.sf.openrocket.gui.figure3d.geometry; package net.sf.openrocket.gui.figure3d.geometry;
import javax.media.opengl.GL; import com.jogamp.opengl.GL;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import net.sf.openrocket.rocketcomponent.MassObject; import net.sf.openrocket.rocketcomponent.MassObject;

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

@ -114,7 +114,7 @@
*/ */
package net.sf.openrocket.gui.figure3d.geometry; package net.sf.openrocket.gui.figure3d.geometry;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import net.sf.openrocket.rocketcomponent.Transition; import net.sf.openrocket.rocketcomponent.Transition;

26
swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoPanel.java
View File

@ -14,18 +14,18 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Vector; import java.util.Vector;
import javax.media.opengl.GL; import com.jogamp.opengl.GL;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import javax.media.opengl.GLAutoDrawable; import com.jogamp.opengl.GLAutoDrawable;
import javax.media.opengl.GLCapabilities; import com.jogamp.opengl.GLCapabilities;
import javax.media.opengl.GLEventListener; import com.jogamp.opengl.GLEventListener;
import javax.media.opengl.GLProfile; import com.jogamp.opengl.GLProfile;
import javax.media.opengl.GLRunnable; import com.jogamp.opengl.GLRunnable;
import javax.media.opengl.awt.GLCanvas; import com.jogamp.opengl.awt.GLCanvas;
import javax.media.opengl.awt.GLJPanel; import com.jogamp.opengl.awt.GLJPanel;
import javax.media.opengl.fixedfunc.GLLightingFunc; import com.jogamp.opengl.fixedfunc.GLLightingFunc;
import javax.media.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
import javax.media.opengl.glu.GLU; import com.jogamp.opengl.glu.GLU;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JPopupMenu; import javax.swing.JPopupMenu;
@ -266,7 +266,7 @@ public class PhotoPanel extends JPanel implements GLEventListener {
BufferedImage i = (new AWTGLReadBufferUtil( BufferedImage i = (new AWTGLReadBufferUtil(
GLProfile.get(GLProfile.GL2), false)) GLProfile.get(GLProfile.GL2), false))
.readPixelsToBufferedImage(drawable.getGL(), 0, 0, .readPixelsToBufferedImage(drawable.getGL(), 0, 0,
drawable.getWidth(), drawable.getHeight(), true); drawable.getSurfaceWidth(), drawable.getSurfaceHeight(), true);
final Vector<ImageCallback> cbs = new Vector<PhotoPanel.ImageCallback>( final Vector<ImageCallback> cbs = new Vector<PhotoPanel.ImageCallback>(
imageCallbacks); imageCallbacks);
imageCallbacks.clear(); imageCallbacks.clear();

12
swing/src/net/sf/openrocket/gui/figure3d/photo/exhaust/FlameRenderer.java
View File

@ -120,12 +120,12 @@ import java.nio.ByteBuffer;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.util.Random; import java.util.Random;
import javax.media.opengl.GL; import com.jogamp.opengl.GL;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import javax.media.opengl.GLProfile; import com.jogamp.opengl.GLProfile;
import javax.media.opengl.fixedfunc.GLLightingFunc; import com.jogamp.opengl.fixedfunc.GLLightingFunc;
import javax.media.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
import javax.media.opengl.glu.GLU; import com.jogamp.opengl.glu.GLU;
import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.Motor;
import net.sf.openrocket.util.Color; import net.sf.openrocket.util.Color;

2
swing/src/net/sf/openrocket/gui/figure3d/photo/sky/Sky.java
View File

@ -1,6 +1,6 @@
package net.sf.openrocket.gui.figure3d.photo.sky; package net.sf.openrocket.gui.figure3d.photo.sky;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import net.sf.openrocket.gui.figure3d.TextureCache; import net.sf.openrocket.gui.figure3d.TextureCache;

4
swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkyBox.java
View File

@ -5,8 +5,8 @@ import java.io.InputStream;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import javax.media.opengl.GL; import com.jogamp.opengl.GL;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import net.sf.openrocket.gui.figure3d.TextureCache; import net.sf.openrocket.gui.figure3d.TextureCache;

6
swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkyBoxCross.java
View File

@ -5,9 +5,9 @@ import java.io.IOException;
import java.net.URL; import java.net.URL;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.media.opengl.GL; import com.jogamp.opengl.GL;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import javax.media.opengl.GLProfile; import com.jogamp.opengl.GLProfile;
import net.sf.openrocket.gui.figure3d.TextureCache; import net.sf.openrocket.gui.figure3d.TextureCache;

6
swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkyPhoto.java
View File

@ -2,9 +2,9 @@ package net.sf.openrocket.gui.figure3d.photo.sky;
import java.net.URL; import java.net.URL;
import javax.media.opengl.GL; import com.jogamp.opengl.GL;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import javax.media.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
import net.sf.openrocket.gui.figure3d.TextureCache; import net.sf.openrocket.gui.figure3d.TextureCache;

8
swing/src/net/sf/openrocket/gui/figure3d/photo/sky/SkySphere.java
View File

@ -2,10 +2,10 @@ package net.sf.openrocket.gui.figure3d.photo.sky;
import java.net.URL; import java.net.URL;
import javax.media.opengl.GL; import com.jogamp.opengl.GL;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import javax.media.opengl.glu.GLU; import com.jogamp.opengl.glu.GLU;
import javax.media.opengl.glu.GLUquadric; import com.jogamp.opengl.glu.GLUquadric;
import net.sf.openrocket.gui.figure3d.TextureCache; import net.sf.openrocket.gui.figure3d.TextureCache;

2
swing/src/net/sf/openrocket/gui/figure3d/photo/sky/builtin/Lake.java
View File

@ -1,6 +1,6 @@
package net.sf.openrocket.gui.figure3d.photo.sky.builtin; package net.sf.openrocket.gui.figure3d.photo.sky.builtin;
import javax.media.opengl.GL2; import com.jogamp.opengl.GL2;
import net.sf.openrocket.gui.figure3d.TextureCache; import net.sf.openrocket.gui.figure3d.TextureCache;
import net.sf.openrocket.gui.figure3d.photo.sky.Sky.Credit; import net.sf.openrocket.gui.figure3d.photo.sky.Sky.Credit;