diff options
Diffstat (limited to 'src')
16 files changed, 33 insertions, 34 deletions
diff --git a/src/demos/com/jogamp/opengl/demos/es2/GearsES2.java b/src/demos/com/jogamp/opengl/demos/es2/GearsES2.java index 1f0bdacdd..235957c06 100644 --- a/src/demos/com/jogamp/opengl/demos/es2/GearsES2.java +++ b/src/demos/com/jogamp/opengl/demos/es2/GearsES2.java @@ -47,7 +47,7 @@ import com.jogamp.opengl.GLRendererQuirks; import com.jogamp.opengl.GLUniformData; import com.jogamp.opengl.JoglVersion; import com.jogamp.opengl.demos.GearsObject; -import com.jogamp.opengl.demos.graph.ui.util.GraphUIDemoArgs; +import com.jogamp.opengl.demos.util.CommandlineOptions; import com.jogamp.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.math.Matrix4f; import com.jogamp.opengl.math.Quaternion; @@ -698,7 +698,7 @@ public class GearsES2 implements StereoGLEventListener, TileRendererBase.TileRen } public static void main(final String[] args) { - final GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, 0); + final CommandlineOptions options = new CommandlineOptions(1280, 720, 0); System.err.println(options); System.err.println(VersionUtil.getPlatformInfo()); diff --git a/src/demos/com/jogamp/opengl/demos/es2/LandscapeES2.java b/src/demos/com/jogamp/opengl/demos/es2/LandscapeES2.java index c975b79b8..9514e7146 100644 --- a/src/demos/com/jogamp/opengl/demos/es2/LandscapeES2.java +++ b/src/demos/com/jogamp/opengl/demos/es2/LandscapeES2.java @@ -46,7 +46,7 @@ import com.jogamp.opengl.GLCapabilities; import com.jogamp.opengl.GLEventListener; import com.jogamp.opengl.GLProfile; import com.jogamp.opengl.GLUniformData; -import com.jogamp.opengl.demos.graph.ui.util.GraphUIDemoArgs; +import com.jogamp.opengl.demos.util.CommandlineOptions; /** * LandscapeES2 @@ -199,7 +199,7 @@ public class LandscapeES2 implements GLEventListener { } public static void main(final String[] args) { - final GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, 0); + final CommandlineOptions options = new CommandlineOptions(1280, 720, 0); System.err.println(options); System.err.println(VersionUtil.getPlatformInfo()); diff --git a/src/demos/com/jogamp/opengl/demos/es2/PointsDemoES2.java b/src/demos/com/jogamp/opengl/demos/es2/PointsDemoES2.java index 2dcebf91d..93cc16711 100644 --- a/src/demos/com/jogamp/opengl/demos/es2/PointsDemoES2.java +++ b/src/demos/com/jogamp/opengl/demos/es2/PointsDemoES2.java @@ -53,7 +53,7 @@ import com.jogamp.opengl.GLUniformData; import com.jogamp.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.demos.PointsDemo; -import com.jogamp.opengl.demos.graph.ui.util.GraphUIDemoArgs; +import com.jogamp.opengl.demos.util.CommandlineOptions; public class PointsDemoES2 extends PointsDemo { ShaderState st; @@ -222,7 +222,7 @@ public class PointsDemoES2 extends PointsDemo { } public static void main(final String[] args) { - final GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, 0); + final CommandlineOptions options = new CommandlineOptions(1280, 720, 0); System.err.println(options); System.err.println(VersionUtil.getPlatformInfo()); diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java index c927b8639..ddcd0c0fc 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java @@ -54,7 +54,7 @@ import com.jogamp.opengl.GLCapabilities; import com.jogamp.opengl.GLCapabilitiesImmutable; import com.jogamp.opengl.GLProfile; import com.jogamp.opengl.demos.graph.FontSetDemos; -import com.jogamp.opengl.demos.graph.ui.util.GraphUIDemoArgs; +import com.jogamp.opengl.demos.util.CommandlineOptions; import com.jogamp.opengl.demos.util.MiscUtils; import com.jogamp.opengl.math.geom.AABBox; import com.jogamp.opengl.util.Animator; @@ -64,7 +64,7 @@ import com.jogamp.opengl.util.Animator; */ public class FontView01 { private static float GlyphGridWidth = 2/3f; - static GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, Region.VBAA_RENDERING_BIT); + static CommandlineOptions options = new CommandlineOptions(1280, 720, Region.VBAA_RENDERING_BIT); public static void main(final String[] args) throws IOException { float mmPerCell = 8f; diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UILayoutBox01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UILayoutBox01.java index 905bb7d15..494c8396a 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UILayoutBox01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UILayoutBox01.java @@ -51,7 +51,7 @@ import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.GL; import com.jogamp.opengl.GLCapabilities; import com.jogamp.opengl.GLProfile; -import com.jogamp.opengl.demos.graph.ui.util.GraphUIDemoArgs; +import com.jogamp.opengl.demos.util.CommandlineOptions; import com.jogamp.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.math.FloatUtil; import com.jogamp.opengl.math.Recti; @@ -68,7 +68,7 @@ import com.jogamp.opengl.util.PMVMatrix; * </p> */ public class UILayoutBox01 { - static GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, Region.VBAA_RENDERING_BIT); + static CommandlineOptions options = new CommandlineOptions(1280, 720, Region.VBAA_RENDERING_BIT); /** * Our PMVMatrixSetup: diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UILayoutGrid01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UILayoutGrid01.java index 32cf213c6..00b41cda5 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UILayoutGrid01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UILayoutGrid01.java @@ -49,7 +49,7 @@ import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.GL; import com.jogamp.opengl.GLCapabilities; import com.jogamp.opengl.GLProfile; -import com.jogamp.opengl.demos.graph.ui.util.GraphUIDemoArgs; +import com.jogamp.opengl.demos.util.CommandlineOptions; import com.jogamp.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.math.FloatUtil; import com.jogamp.opengl.math.Recti; @@ -67,7 +67,7 @@ import com.jogamp.opengl.util.PMVMatrix; * </p> */ public class UILayoutGrid01 { - static GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, Region.VBAA_RENDERING_BIT); + static CommandlineOptions options = new CommandlineOptions(1280, 720, Region.VBAA_RENDERING_BIT); /** * Our PMVMatrixSetup: diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo00.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo00.java index ad038cada..51326d663 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo00.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo00.java @@ -43,7 +43,7 @@ import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.GL; import com.jogamp.opengl.GLCapabilities; import com.jogamp.opengl.GLProfile; -import com.jogamp.opengl.demos.graph.ui.util.GraphUIDemoArgs; +import com.jogamp.opengl.demos.util.CommandlineOptions; import com.jogamp.opengl.math.geom.AABBox; import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.util.PMVMatrix; @@ -59,7 +59,7 @@ import com.jogamp.opengl.util.PMVMatrix; * </p> */ public class UISceneDemo00 { - static GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, Region.VBAA_RENDERING_BIT); + static CommandlineOptions options = new CommandlineOptions(1280, 720, Region.VBAA_RENDERING_BIT); public static void main(final String[] args) throws IOException { if( 0 != args.length ) { diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java index 64c677d48..dbdc66b3b 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java @@ -46,7 +46,7 @@ import com.jogamp.opengl.GL; import com.jogamp.opengl.GLCapabilities; import com.jogamp.opengl.GLProfile; import com.jogamp.opengl.demos.es2.GearsES2; -import com.jogamp.opengl.demos.graph.ui.util.GraphUIDemoArgs; +import com.jogamp.opengl.demos.util.CommandlineOptions; import com.jogamp.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.math.Recti; import com.jogamp.opengl.math.geom.AABBox; @@ -65,7 +65,7 @@ import com.jogamp.opengl.util.PMVMatrix; * </p> */ public class UISceneDemo01 { - static GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, Region.VBAA_RENDERING_BIT); + static CommandlineOptions options = new CommandlineOptions(1280, 720, Region.VBAA_RENDERING_BIT); public static void main(final String[] args) throws IOException { if( 0 != args.length ) { diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java index 59e4ca4c3..f8b2f5757 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java @@ -46,7 +46,7 @@ import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.GL; import com.jogamp.opengl.GLCapabilities; import com.jogamp.opengl.GLProfile; -import com.jogamp.opengl.demos.graph.ui.util.GraphUIDemoArgs; +import com.jogamp.opengl.demos.util.CommandlineOptions; import com.jogamp.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.math.FloatUtil; import com.jogamp.opengl.math.Recti; @@ -66,7 +66,7 @@ import com.jogamp.opengl.util.PMVMatrix; * </p> */ public class UISceneDemo01b { - static GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, Region.VBAA_RENDERING_BIT); + static CommandlineOptions options = new CommandlineOptions(1280, 720, Region.VBAA_RENDERING_BIT); public static void main(final String[] args) throws IOException { if( 0 != args.length ) { diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java index 61cd4fc76..d10f10764 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java @@ -53,7 +53,7 @@ import com.jogamp.opengl.GL2ES2; import com.jogamp.opengl.GLCapabilities; import com.jogamp.opengl.GLProfile; import com.jogamp.opengl.demos.graph.FontSetDemos; -import com.jogamp.opengl.demos.graph.ui.util.GraphUIDemoArgs; +import com.jogamp.opengl.demos.util.CommandlineOptions; import com.jogamp.opengl.demos.util.MiscUtils; import com.jogamp.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.math.FloatUtil; @@ -84,7 +84,7 @@ public class UISceneDemo03 { " JogAmp, Java™ libraries for 3D & Media " }; - static GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, Region.VBAA_RENDERING_BIT); + static CommandlineOptions options = new CommandlineOptions(1280, 720, Region.VBAA_RENDERING_BIT); static float velocity = 30 / 1e3f; // [m]/[s] static float rot_step = velocity * 1; diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03b.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03b.java index 4a9f447b7..740ee98a8 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03b.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03b.java @@ -58,7 +58,7 @@ import com.jogamp.opengl.GLCapabilities; import com.jogamp.opengl.GLEventListener; import com.jogamp.opengl.GLProfile; import com.jogamp.opengl.demos.graph.FontSetDemos; -import com.jogamp.opengl.demos.graph.ui.util.GraphUIDemoArgs; +import com.jogamp.opengl.demos.util.CommandlineOptions; import com.jogamp.opengl.demos.util.MiscUtils; import com.jogamp.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.math.FloatUtil; @@ -89,7 +89,7 @@ public class UISceneDemo03b { " JogAmp, Java™ libraries for 3D & Media " }; - static GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, Region.VBAA_RENDERING_BIT); + static CommandlineOptions options = new CommandlineOptions(1280, 720, Region.VBAA_RENDERING_BIT); static float frame_velocity = 5f / 1e3f; // [m]/[s] static float velocity = 30 / 1e3f; // [m]/[s] static float rot_step = velocity * 1; diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo10.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo10.java index 12cb2cb1a..e65c9ce5f 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo10.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo10.java @@ -55,7 +55,7 @@ import com.jogamp.opengl.GLCapabilities; import com.jogamp.opengl.GLEventListener; import com.jogamp.opengl.GLProfile; import com.jogamp.opengl.demos.es2.GearsES2; -import com.jogamp.opengl.demos.graph.ui.util.GraphUIDemoArgs; +import com.jogamp.opengl.demos.util.CommandlineOptions; import com.jogamp.opengl.math.Recti; import com.jogamp.opengl.math.Vec3f; import com.jogamp.opengl.math.geom.AABBox; @@ -74,7 +74,7 @@ public class UISceneDemo10 { static final boolean DEBUG = false; static final boolean TRACE = false; - static GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, Region.VBAA_RENDERING_BIT); + static CommandlineOptions options = new CommandlineOptions(1280, 720, Region.VBAA_RENDERING_BIT); static private final String defaultMediaPath = "http://archive.org/download/BigBuckBunny_328/BigBuckBunny_512kb.mp4"; static private String filmPath = defaultMediaPath; diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo11.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo11.java index 6a6cfe4cb..474860532 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo11.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo11.java @@ -47,7 +47,7 @@ import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.GL; import com.jogamp.opengl.GLCapabilities; import com.jogamp.opengl.GLProfile; -import com.jogamp.opengl.demos.graph.ui.util.GraphUIDemoArgs; +import com.jogamp.opengl.demos.util.CommandlineOptions; import com.jogamp.opengl.math.geom.AABBox; import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.util.PMVMatrix; @@ -60,7 +60,7 @@ import com.jogamp.opengl.util.PMVMatrix; * </p> */ public class UISceneDemo11 { - static GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, Region.VBAA_RENDERING_BIT); + static CommandlineOptions options = new CommandlineOptions(1280, 720, Region.VBAA_RENDERING_BIT); public static void main(final String[] args) throws IOException { if( 0 != args.length ) { diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java index 102aa9193..6586f650c 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java @@ -85,7 +85,7 @@ import com.jogamp.opengl.JoglVersion; import com.jogamp.opengl.demos.es2.GearsES2; import com.jogamp.opengl.demos.graph.FontSetDemos; import com.jogamp.opengl.demos.graph.MSAATool; -import com.jogamp.opengl.demos.graph.ui.util.GraphUIDemoArgs; +import com.jogamp.opengl.demos.util.CommandlineOptions; import com.jogamp.opengl.demos.util.MiscUtils; import com.jogamp.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.math.FloatUtil; @@ -119,7 +119,7 @@ public class UISceneDemo20 implements GLEventListener { static final boolean DEBUG = false; static final boolean TRACE = false; - static GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, Region.VBAA_RENDERING_BIT); + static CommandlineOptions options = new CommandlineOptions(1280, 720, Region.VBAA_RENDERING_BIT); public static void main(final String[] args) { final float[] reqSurfacePixelScale = new float[] { ScalableSurface.AUTOMAX_PIXELSCALE, ScalableSurface.AUTOMAX_PIXELSCALE }; diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemoU01a.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemoU01a.java index 19db00cbe..2269a79aa 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemoU01a.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemoU01a.java @@ -49,7 +49,7 @@ import com.jogamp.opengl.GLCapabilities; import com.jogamp.opengl.GLEventListener; import com.jogamp.opengl.GLProfile; import com.jogamp.opengl.JoglVersion; -import com.jogamp.opengl.demos.graph.ui.util.GraphUIDemoArgs; +import com.jogamp.opengl.demos.util.CommandlineOptions; import com.jogamp.opengl.demos.util.MiscUtils; import com.jogamp.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.opengl.math.FloatUtil; @@ -91,7 +91,7 @@ import com.jogamp.opengl.util.PMVMatrix; * </p> */ public class UISceneDemoU01a { - static final GraphUIDemoArgs options = new GraphUIDemoArgs(1280, 720, Region.VBAA_RENDERING_BIT ); + static final CommandlineOptions options = new CommandlineOptions(1280, 720, Region.VBAA_RENDERING_BIT ); static final Vec4f text_color = new Vec4f( 0, 1, 0, 1 ); static Font font; static boolean projOrtho = true; diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/util/GraphUIDemoArgs.java b/src/demos/com/jogamp/opengl/demos/util/CommandlineOptions.java index fe716419a..81fbbac65 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/util/GraphUIDemoArgs.java +++ b/src/demos/com/jogamp/opengl/demos/util/CommandlineOptions.java @@ -25,13 +25,12 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.opengl.demos.graph.ui.util; +package com.jogamp.opengl.demos.util; import com.jogamp.graph.curve.Region; import com.jogamp.opengl.GLProfile; -import com.jogamp.opengl.demos.util.MiscUtils; -public class GraphUIDemoArgs { +public class CommandlineOptions { public int surface_width, surface_height; public String glProfileName = GLProfile.GL2ES2; public boolean wait_to_start = false; @@ -45,7 +44,7 @@ public class GraphUIDemoArgs { GLProfile.initSingleton(); // ensure JOGL is completely initialized } - public GraphUIDemoArgs(final int width, final int height, final int renderModes) { + public CommandlineOptions(final int width, final int height, final int renderModes) { this.surface_width = width; this.surface_height = height; this.renderModes = renderModes; |