diff options
author | Sven Gothel <[email protected]> | 2023-08-07 22:05:13 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2023-08-07 22:05:13 +0200 |
commit | d8e086e0321ef1021f4a7810d7bfd2306c4ac725 (patch) | |
tree | ff74e27acac48a842b3d1bbc7d933ae097bc7e97 /src | |
parent | 5b2236c39d1aa751658f3d30101752a145af7187 (diff) |
Untangle joal from build requirements as introduced via new jogl-demos
To enjoy the UISceneDemo20 demo, joal shall exist at its usual location.
However, pass build if not available.
Also drop ant + junit from demos.
- Rename jogl-demo-android.{jar,apk} -> jogl-demos-android.{jar,apk}
- New demo classpath
- Add non-joal demo classpath
- Add joal demo classpath.
- Drop junit + ant from both
- Remove joal from junit compile path.
- Build test: demo compilation (Java + Android)
- Drop joal dependencies if not available
Diffstat (limited to 'src')
-rw-r--r-- | src/demos/com/jogamp/opengl/demos/av/MovieCube.java | 3 | ||||
-rw-r--r-- | src/demos/com/jogamp/opengl/demos/av/MovieSBSStereo.java | 4 | ||||
-rw-r--r-- | src/demos/com/jogamp/opengl/demos/av/MovieSimple.java | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/demos/com/jogamp/opengl/demos/av/MovieCube.java b/src/demos/com/jogamp/opengl/demos/av/MovieCube.java index 4cd6b09b6..a08423b62 100644 --- a/src/demos/com/jogamp/opengl/demos/av/MovieCube.java +++ b/src/demos/com/jogamp/opengl/demos/av/MovieCube.java @@ -47,7 +47,6 @@ import com.jogamp.graph.curve.opengl.GLRegion; import com.jogamp.graph.curve.opengl.RegionRenderer; import com.jogamp.graph.font.Font; import com.jogamp.graph.font.FontScale; -import com.jogamp.junit.util.JunitTracer; import com.jogamp.newt.Window; import com.jogamp.newt.event.KeyAdapter; import com.jogamp.newt.event.KeyEvent; @@ -392,7 +391,7 @@ public class MovieCube implements GLEventListener { cube = new TextureSequenceCubeES2(mPlayer, false, zoom0, rotx, roty); if(waitForKey) { - JunitTracer.waitForKey("Init>"); + MiscUtils.waitForKey("Init>"); } try { diff --git a/src/demos/com/jogamp/opengl/demos/av/MovieSBSStereo.java b/src/demos/com/jogamp/opengl/demos/av/MovieSBSStereo.java index 49a6b6fbb..0700ca5bc 100644 --- a/src/demos/com/jogamp/opengl/demos/av/MovieSBSStereo.java +++ b/src/demos/com/jogamp/opengl/demos/av/MovieSBSStereo.java @@ -48,7 +48,6 @@ import com.jogamp.graph.curve.opengl.GLRegion; import com.jogamp.graph.curve.opengl.RegionRenderer; import com.jogamp.graph.font.Font; import com.jogamp.graph.font.FontScale; -import com.jogamp.junit.util.JunitTracer; import com.jogamp.newt.Window; import com.jogamp.newt.event.KeyAdapter; import com.jogamp.newt.event.KeyEvent; @@ -61,6 +60,7 @@ import com.jogamp.opengl.GLExtensions; import com.jogamp.opengl.GLProfile; import com.jogamp.opengl.JoglVersion; import com.jogamp.opengl.demos.graph.TextRendererGLELBase; +import com.jogamp.opengl.demos.util.MiscUtils; import com.jogamp.opengl.math.Matrix4f; import com.jogamp.opengl.math.Quaternion; import com.jogamp.opengl.math.Recti; @@ -422,7 +422,7 @@ public class MovieSBSStereo implements StereoGLEventListener { ", "+drawable.getClass().getName()+", "+drawable); if(waitForKey) { - JunitTracer.waitForKey("Init>"); + MiscUtils.waitForKey("Init>"); } final Texture tex; try { diff --git a/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java b/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java index 643d4c49f..2bbb9de05 100644 --- a/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java +++ b/src/demos/com/jogamp/opengl/demos/av/MovieSimple.java @@ -40,7 +40,6 @@ import com.jogamp.graph.curve.opengl.GLRegion; import com.jogamp.graph.curve.opengl.RegionRenderer; import com.jogamp.graph.font.Font; import com.jogamp.graph.font.FontScale; -import com.jogamp.junit.util.JunitTracer; import com.jogamp.newt.Window; import com.jogamp.newt.event.KeyAdapter; import com.jogamp.newt.event.KeyEvent; @@ -457,7 +456,7 @@ public class MovieSimple implements GLEventListener { screen.setUseOriginalScale(useOriginalScale); if(waitForKey) { - JunitTracer.waitForKey("Init>"); + MiscUtils.waitForKey("Init>"); } try { |