diff options
-rw-r--r-- | maven/trivial-test/README.txt | 11 | ||||
-rw-r--r-- | maven/trivial-test/pom.xml | 8 | ||||
-rw-r--r-- | maven/trivial-test/src/test/java/com/io7m/example/jogl_mvn_test_2/TestJOGL.java | 24 |
3 files changed, 30 insertions, 13 deletions
diff --git a/maven/trivial-test/README.txt b/maven/trivial-test/README.txt index fdc4b3f..3914c5c 100644 --- a/maven/trivial-test/README.txt +++ b/maven/trivial-test/README.txt @@ -1,5 +1,8 @@ +Note: This sub-project's pom.xml file already includes the +below general setting for 'jogamp-remote'. + First, because the project isn't in the Central Repository yet, Maven -needs to be told to look at http://www.jogamp.org. Edit ~/.m2/settings.xml: +needs to be told to look at https://www.jogamp.org. Edit ~/.m2/settings.xml: <settings> <profiles> @@ -13,7 +16,7 @@ needs to be told to look at http://www.jogamp.org. Edit ~/.m2/settings.xml: <repository> <id>jogamp-remote</id> <name>jogamp test mirror</name> - <url>http://www.jogamp.org/deployment/maven/</url> + <url>https://www.jogamp.org/deployment/maven/</url> <layout>default</layout> </repository> </repositories> @@ -23,9 +26,11 @@ needs to be told to look at http://www.jogamp.org. Edit ~/.m2/settings.xml: Then, run: - $ mvn clean test + $ mvn -U clean test It should download all of the required packages (which may be quite a few if you've not run Maven before) and then compile and run the included test program. +The '-U' option somewhat was required to force an update. + diff --git a/maven/trivial-test/pom.xml b/maven/trivial-test/pom.xml index 95ee947..aa055de 100644 --- a/maven/trivial-test/pom.xml +++ b/maven/trivial-test/pom.xml @@ -8,7 +8,7 @@ <packaging>jar</packaging> <name>jogl-mvn-test</name> - <url>http://maven.apache.org</url> + <url>https://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -24,19 +24,19 @@ <dependency> <groupId>org.jogamp.gluegen</groupId> <artifactId>gluegen-rt-main</artifactId> - <version>2.4.0</version> + <version>2.5.0-rc-20230521</version> </dependency> <dependency> <groupId>org.jogamp.jogl</groupId> <artifactId>jogl-all-main</artifactId> - <version>2.4.0</version> + <version>2.5.0-rc-20230521</version> </dependency> </dependencies> <repositories> <repository> <id>jogamp-remote</id> <name>jogamp mirror</name> - <url>http://www.jogamp.org/deployment/maven/</url> + <url>https://www.jogamp.org/deployment/maven/</url> </repository> </repositories> diff --git a/maven/trivial-test/src/test/java/com/io7m/example/jogl_mvn_test_2/TestJOGL.java b/maven/trivial-test/src/test/java/com/io7m/example/jogl_mvn_test_2/TestJOGL.java index 6c0754e..66e543e 100644 --- a/maven/trivial-test/src/test/java/com/io7m/example/jogl_mvn_test_2/TestJOGL.java +++ b/maven/trivial-test/src/test/java/com/io7m/example/jogl_mvn_test_2/TestJOGL.java @@ -2,14 +2,18 @@ package com.io7m.example.jogl_mvn_test_2; import com.jogamp.opengl.GL; import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GL2ES3; import com.jogamp.opengl.GLAutoDrawable; import com.jogamp.opengl.GLCapabilities; import com.jogamp.opengl.GLEventListener; import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.JoglVersion; import com.jogamp.opengl.fixedfunc.GLMatrixFunc; import org.junit.Test; +import com.jogamp.common.GlueGenVersion; +import com.jogamp.common.util.VersionUtil; import com.jogamp.newt.event.WindowAdapter; import com.jogamp.newt.event.WindowEvent; import com.jogamp.newt.opengl.GLWindow; @@ -20,6 +24,10 @@ public class TestJOGL private static GLWindow makeWindow( final String name) { + System.err.println(VersionUtil.getPlatformInfo()); + System.err.println(GlueGenVersion.getInstance()); + System.err.println(JoglVersion.getInstance()); + final GLProfile pro = GLProfile.getDefault(); final GLCapabilities caps = new GLCapabilities(pro); final GLWindow window = GLWindow.create(caps); @@ -38,7 +46,8 @@ public class TestJOGL int quad_x = (int) (Math.random() * 640); int quad_y = (int) (Math.random() * 480); - public void display( + @Override + public void display( final GLAutoDrawable drawable) { System.out.println("thread " @@ -59,7 +68,7 @@ public class TestJOGL g2.glLoadIdentity(); g2.glTranslated(0, 0, -1); - g2.glBegin(GL2.GL_QUADS); + g2.glBegin(GL2ES3.GL_QUADS); { g2.glVertex2d(this.quad_x, this.quad_y + 10); g2.glVertex2d(this.quad_x, this.quad_y); @@ -69,19 +78,22 @@ public class TestJOGL g2.glEnd(); } - public void dispose( + @Override + public void dispose( final GLAutoDrawable arg0) { // TODO Auto-generated method stub } - public void init( + @Override + public void init( final GLAutoDrawable arg0) { - // TODO Auto-generated method stub + System.err.println(JoglVersion.getGLInfo(arg0.getGL(), null)); } - public void reshape( + @Override + public void reshape( final GLAutoDrawable arg0, final int arg1, final int arg2, |