diff options
Diffstat (limited to 'src/graphui')
-rw-r--r-- | src/graphui/classes/com/jogamp/graph/ui/GraphShape.java (renamed from src/graphui/classes/com/jogamp/graph/ui/gl/GraphShape.java) | 2 | ||||
-rw-r--r-- | src/graphui/classes/com/jogamp/graph/ui/Scene.java (renamed from src/graphui/classes/com/jogamp/graph/ui/gl/Scene.java) | 2 | ||||
-rw-r--r-- | src/graphui/classes/com/jogamp/graph/ui/Shape.java (renamed from src/graphui/classes/com/jogamp/graph/ui/gl/Shape.java) | 18 | ||||
-rw-r--r-- | src/graphui/classes/com/jogamp/graph/ui/shapes/Button.java (renamed from src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Button.java) | 4 | ||||
-rw-r--r-- | src/graphui/classes/com/jogamp/graph/ui/shapes/CrossHair.java (renamed from src/graphui/classes/com/jogamp/graph/ui/gl/shapes/CrossHair.java) | 4 | ||||
-rw-r--r-- | src/graphui/classes/com/jogamp/graph/ui/shapes/GLButton.java (renamed from src/graphui/classes/com/jogamp/graph/ui/gl/shapes/GLButton.java) | 4 | ||||
-rw-r--r-- | src/graphui/classes/com/jogamp/graph/ui/shapes/GlyphShape.java (renamed from src/graphui/classes/com/jogamp/graph/ui/gl/shapes/GlyphShape.java) | 4 | ||||
-rw-r--r-- | src/graphui/classes/com/jogamp/graph/ui/shapes/ImageButton.java (renamed from src/graphui/classes/com/jogamp/graph/ui/gl/shapes/ImageButton.java) | 4 | ||||
-rw-r--r-- | src/graphui/classes/com/jogamp/graph/ui/shapes/Label.java (renamed from src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Label.java) | 5 | ||||
-rw-r--r-- | src/graphui/classes/com/jogamp/graph/ui/shapes/MediaButton.java (renamed from src/graphui/classes/com/jogamp/graph/ui/gl/shapes/MediaButton.java) | 4 | ||||
-rw-r--r-- | src/graphui/classes/com/jogamp/graph/ui/shapes/Rectangle.java (renamed from src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Rectangle.java) | 4 | ||||
-rw-r--r-- | src/graphui/classes/com/jogamp/graph/ui/shapes/RoundButton.java (renamed from src/graphui/classes/com/jogamp/graph/ui/gl/shapes/RoundButton.java) | 4 | ||||
-rw-r--r-- | src/graphui/classes/com/jogamp/graph/ui/shapes/TexSeqButton.java (renamed from src/graphui/classes/com/jogamp/graph/ui/gl/shapes/TexSeqButton.java) | 4 |
13 files changed, 31 insertions, 32 deletions
diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/GraphShape.java b/src/graphui/classes/com/jogamp/graph/ui/GraphShape.java index f2c60a12c..6efd7f5f4 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/gl/GraphShape.java +++ b/src/graphui/classes/com/jogamp/graph/ui/GraphShape.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.graph.ui.gl; +package com.jogamp.graph.ui; import java.util.ArrayList; import java.util.List; diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/Scene.java b/src/graphui/classes/com/jogamp/graph/ui/Scene.java index 3326f9e97..cf0f96b28 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/gl/Scene.java +++ b/src/graphui/classes/com/jogamp/graph/ui/Scene.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.graph.ui.gl; +package com.jogamp.graph.ui; import java.io.File; import java.nio.ByteBuffer; diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/Shape.java b/src/graphui/classes/com/jogamp/graph/ui/Shape.java index 7d6f139ba..e777dacff 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/gl/Shape.java +++ b/src/graphui/classes/com/jogamp/graph/ui/Shape.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.graph.ui.gl; +package com.jogamp.graph.ui; import java.util.ArrayList; @@ -498,7 +498,7 @@ public abstract class Shape { * @param viewport the int[4] viewport * @param surfaceSize int[2] target surface size * @return given int[2] {@code surfaceSize} for successful gluProject(..) operation, otherwise {@code null} - * @see #getSurfaceSize(com.jogamp.graph.ui.gl.Scene.PMVMatrixSetup, int[], PMVMatrix, int[]) + * @see #getSurfaceSize(com.jogamp.graph.ui.Scene.PMVMatrixSetup, int[], PMVMatrix, int[]) * @see #getSurfaceSize(Scene, PMVMatrix, int[]) */ public int[/*2*/] getSurfaceSize(final PMVMatrix pmv, final int[/*4*/] viewport, final int[/*2*/] surfaceSize) { @@ -554,7 +554,7 @@ public abstract class Shape { * @param surfaceSize int[2] target surface size * @return given int[2] {@code surfaceSize} for successful gluProject(..) operation, otherwise {@code null} * @see #getSurfaceSize(PMVMatrix, int[], int[]) - * @see #getSurfaceSize(com.jogamp.graph.ui.gl.Scene.PMVMatrixSetup, int[], PMVMatrix, int[]) + * @see #getSurfaceSize(com.jogamp.graph.ui.Scene.PMVMatrixSetup, int[], PMVMatrix, int[]) */ public int[/*2*/] getSurfaceSize(final Scene scene, final PMVMatrix pmv, final int[/*2*/] surfaceSize) { return getSurfaceSize(scene.getPMVMatrixSetup(), scene.getViewport(), pmv, surfaceSize); @@ -587,11 +587,11 @@ public abstract class Shape { /** * Retrieve pixel per scaled shape-coordinate unit, i.e. [px]/[obj]. - * @param shapeSizePx int[2] shape size in pixel as retrieved via e.g. {@link #getSurfaceSize(com.jogamp.graph.ui.gl.Scene.PMVMatrixSetup, int[], PMVMatrix, int[])} + * @param shapeSizePx int[2] shape size in pixel as retrieved via e.g. {@link #getSurfaceSize(com.jogamp.graph.ui.Scene.PMVMatrixSetup, int[], PMVMatrix, int[])} * @param pixPerShape float[2] pixel scaled per shape-coordinate unit result storage * @return given float[2] {@code pixPerShape} * @see #getPixelPerShapeUnit(Scene, PMVMatrix, float[]) - * @see #getSurfaceSize(com.jogamp.graph.ui.gl.Scene.PMVMatrixSetup, int[], PMVMatrix, int[]) + * @see #getSurfaceSize(com.jogamp.graph.ui.Scene.PMVMatrixSetup, int[], PMVMatrix, int[]) * @see #getScaledWidth() * @see #getScaledHeight() */ @@ -613,7 +613,7 @@ public abstract class Shape { * @param objPos float[3] object position relative to this shape's center * @param glWinPos int[2] target window position of objPos relative to this shape * @return given int[2] {@code glWinPos} for successful gluProject(..) operation, otherwise {@code null} - * @see #shapeToWinCoord(com.jogamp.graph.ui.gl.Scene.PMVMatrixSetup, int[], float[], PMVMatrix, int[]) + * @see #shapeToWinCoord(com.jogamp.graph.ui.Scene.PMVMatrixSetup, int[], float[], PMVMatrix, int[]) * @see #shapeToWinCoord(Scene, float[], PMVMatrix, int[]) */ public int[/*2*/] shapeToWinCoord(final PMVMatrix pmv, final int[/*4*/] viewport, final float[/*3*/] objPos, final int[/*2*/] glWinPos) { @@ -665,7 +665,7 @@ public abstract class Shape { * @param glWinPos int[2] target window position of objPos relative to this shape * @return given int[2] {@code glWinPos} for successful gluProject(..) operation, otherwise {@code null} * @see #shapeToWinCoord(PMVMatrix, int[], float[], int[]) - * @see #shapeToWinCoord(com.jogamp.graph.ui.gl.Scene.PMVMatrixSetup, int[], float[], PMVMatrix, int[]) + * @see #shapeToWinCoord(com.jogamp.graph.ui.Scene.PMVMatrixSetup, int[], float[], PMVMatrix, int[]) */ public int[/*2*/] shapeToWinCoord(final Scene scene, final float[/*3*/] objPos, final PMVMatrix pmv, final int[/*2*/] glWinPos) { return this.shapeToWinCoord(scene.getPMVMatrixSetup(), scene.getViewport(), objPos, pmv, glWinPos); @@ -684,7 +684,7 @@ public abstract class Shape { * @param glWinY in GL window coordinates, origin bottom-left * @param objPos float[3] target object position of glWinX/glWinY relative to this shape * @return given float[3] {@code objPos} for successful gluProject(..) and gluUnProject(..) operation, otherwise {@code null} - * @see #winToShapeCoord(com.jogamp.graph.ui.gl.Scene.PMVMatrixSetup, int[], int, int, PMVMatrix, float[]) + * @see #winToShapeCoord(com.jogamp.graph.ui.Scene.PMVMatrixSetup, int[], int, int, PMVMatrix, float[]) * @see #winToShapeCoord(Scene, int, int, PMVMatrix, float[]) */ public float[/*3*/] winToShapeCoord(final PMVMatrix pmv, final int[/*4*/] viewport, final int glWinX, final int glWinY, final float[/*3*/] objPos) { @@ -738,7 +738,7 @@ public abstract class Shape { * @param objPos float[3] target object position of glWinX/glWinY relative to this shape * @return given float[3] {@code objPos} for successful gluProject(..) and gluUnProject(..) operation, otherwise {@code null} * @see #winToShapeCoord(PMVMatrix, int[], int, int, float[]) - * @see #winToShapeCoord(com.jogamp.graph.ui.gl.Scene.PMVMatrixSetup, int[], int, int, PMVMatrix, float[]) + * @see #winToShapeCoord(com.jogamp.graph.ui.Scene.PMVMatrixSetup, int[], int, int, PMVMatrix, float[]) */ public float[/*3*/] winToShapeCoord(final Scene scene, final int glWinX, final int glWinY, final PMVMatrix pmv, final float[/*3*/] objPos) { return this.winToShapeCoord(scene.getPMVMatrixSetup(), scene.getViewport(), glWinX, glWinY, pmv, objPos); diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Button.java b/src/graphui/classes/com/jogamp/graph/ui/shapes/Button.java index 2f2e4c469..ca726e30f 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Button.java +++ b/src/graphui/classes/com/jogamp/graph/ui/shapes/Button.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.graph.ui.gl.shapes; +package com.jogamp.graph.ui.shapes; import com.jogamp.opengl.GL2ES2; @@ -34,7 +34,7 @@ import com.jogamp.graph.curve.Region; import com.jogamp.graph.curve.opengl.RegionRenderer; import com.jogamp.graph.font.Font; import com.jogamp.graph.geom.plane.AffineTransform; -import com.jogamp.graph.ui.gl.GraphShape; +import com.jogamp.graph.ui.GraphShape; import com.jogamp.opengl.math.geom.AABBox; import jogamp.graph.ui.shapes.Label0; diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/CrossHair.java b/src/graphui/classes/com/jogamp/graph/ui/shapes/CrossHair.java index 534e6fc7b..3e36422a4 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/CrossHair.java +++ b/src/graphui/classes/com/jogamp/graph/ui/shapes/CrossHair.java @@ -25,10 +25,10 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.graph.ui.gl.shapes; +package com.jogamp.graph.ui.shapes; import com.jogamp.graph.curve.OutlineShape; -import com.jogamp.graph.ui.gl.GraphShape; +import com.jogamp.graph.ui.GraphShape; /** * A GraphUI Crosshair {@link GraphShape} diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/GLButton.java b/src/graphui/classes/com/jogamp/graph/ui/shapes/GLButton.java index 5fdb7991b..f11475b84 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/GLButton.java +++ b/src/graphui/classes/com/jogamp/graph/ui/shapes/GLButton.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.graph.ui.gl.shapes; +package com.jogamp.graph.ui.shapes; import com.jogamp.opengl.GL; import com.jogamp.opengl.GL2ES2; @@ -37,7 +37,7 @@ import com.jogamp.opengl.GLDrawableFactory; import com.jogamp.opengl.GLEventListener; import com.jogamp.opengl.GLOffscreenAutoDrawable; import com.jogamp.graph.curve.opengl.RegionRenderer; -import com.jogamp.graph.ui.gl.GraphShape; +import com.jogamp.graph.ui.GraphShape; import com.jogamp.opengl.FBObject; import com.jogamp.opengl.util.texture.ImageSequence; import com.jogamp.opengl.util.texture.Texture; diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/GlyphShape.java b/src/graphui/classes/com/jogamp/graph/ui/shapes/GlyphShape.java index 07c8ae0de..568270073 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/GlyphShape.java +++ b/src/graphui/classes/com/jogamp/graph/ui/shapes/GlyphShape.java @@ -25,7 +25,7 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.graph.ui.gl.shapes; +package com.jogamp.graph.ui.shapes; import java.util.List; @@ -35,7 +35,7 @@ import com.jogamp.graph.curve.opengl.GLRegion; import com.jogamp.graph.font.Font; import com.jogamp.graph.font.Font.Glyph; import com.jogamp.graph.geom.plane.AffineTransform; -import com.jogamp.graph.ui.gl.GraphShape; +import com.jogamp.graph.ui.GraphShape; import com.jogamp.opengl.GLProfile; import com.jogamp.opengl.math.Vec3f; import com.jogamp.opengl.math.geom.AABBox; diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/ImageButton.java b/src/graphui/classes/com/jogamp/graph/ui/shapes/ImageButton.java index d5718d98a..63b0b3eaf 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/ImageButton.java +++ b/src/graphui/classes/com/jogamp/graph/ui/shapes/ImageButton.java @@ -25,11 +25,11 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.graph.ui.gl.shapes; +package com.jogamp.graph.ui.shapes; import com.jogamp.opengl.GL2ES2; import com.jogamp.graph.curve.opengl.RegionRenderer; -import com.jogamp.graph.ui.gl.GraphShape; +import com.jogamp.graph.ui.GraphShape; import com.jogamp.opengl.util.texture.ImageSequence; /** diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Label.java b/src/graphui/classes/com/jogamp/graph/ui/shapes/Label.java index cad8689ec..e7d89ade4 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Label.java +++ b/src/graphui/classes/com/jogamp/graph/ui/shapes/Label.java @@ -25,11 +25,10 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.graph.ui.gl.shapes; +package com.jogamp.graph.ui.shapes; import com.jogamp.opengl.GL2ES2; import com.jogamp.opengl.GLProfile; -import com.jogamp.opengl.math.FloatUtil; import com.jogamp.opengl.math.geom.AABBox; import com.jogamp.graph.curve.OutlineShape; import com.jogamp.graph.curve.opengl.GLRegion; @@ -37,7 +36,7 @@ import com.jogamp.graph.curve.opengl.RegionRenderer; import com.jogamp.graph.font.Font; import com.jogamp.graph.font.Font.Glyph; import com.jogamp.graph.geom.plane.AffineTransform; -import com.jogamp.graph.ui.gl.GraphShape; +import com.jogamp.graph.ui.GraphShape; /** * A GraphUI text label {@link GraphShape} diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/MediaButton.java b/src/graphui/classes/com/jogamp/graph/ui/shapes/MediaButton.java index 6b26c58b8..55a00aae4 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/MediaButton.java +++ b/src/graphui/classes/com/jogamp/graph/ui/shapes/MediaButton.java @@ -25,12 +25,12 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.graph.ui.gl.shapes; +package com.jogamp.graph.ui.shapes; import com.jogamp.opengl.GL2ES2; import com.jogamp.common.util.InterruptSource; import com.jogamp.graph.curve.opengl.RegionRenderer; -import com.jogamp.graph.ui.gl.GraphShape; +import com.jogamp.graph.ui.GraphShape; import com.jogamp.opengl.util.av.GLMediaPlayer; import com.jogamp.opengl.util.av.GLMediaPlayer.GLMediaEventListener; import com.jogamp.opengl.util.av.GLMediaPlayer.StreamException; diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Rectangle.java b/src/graphui/classes/com/jogamp/graph/ui/shapes/Rectangle.java index 4a8c29f2a..a75bd0bc3 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/Rectangle.java +++ b/src/graphui/classes/com/jogamp/graph/ui/shapes/Rectangle.java @@ -25,10 +25,10 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.graph.ui.gl.shapes; +package com.jogamp.graph.ui.shapes; import com.jogamp.graph.curve.OutlineShape; -import com.jogamp.graph.ui.gl.GraphShape; +import com.jogamp.graph.ui.GraphShape; /** * A GraphUI Rectangle {@link GraphShape} diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/RoundButton.java b/src/graphui/classes/com/jogamp/graph/ui/shapes/RoundButton.java index 93ba4f0dc..a2ab43ae1 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/RoundButton.java +++ b/src/graphui/classes/com/jogamp/graph/ui/shapes/RoundButton.java @@ -25,10 +25,10 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.graph.ui.gl.shapes; +package com.jogamp.graph.ui.shapes; import com.jogamp.graph.curve.OutlineShape; -import com.jogamp.graph.ui.gl.GraphShape; +import com.jogamp.graph.ui.GraphShape; /** * An abstract GraphUI round Button {@link GraphShape} diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/TexSeqButton.java b/src/graphui/classes/com/jogamp/graph/ui/shapes/TexSeqButton.java index 5ee164580..2f7d85198 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/gl/shapes/TexSeqButton.java +++ b/src/graphui/classes/com/jogamp/graph/ui/shapes/TexSeqButton.java @@ -25,13 +25,13 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of JogAmp Community. */ -package com.jogamp.graph.ui.gl.shapes; +package com.jogamp.graph.ui.shapes; import com.jogamp.opengl.GLProfile; import com.jogamp.graph.curve.OutlineShape; import com.jogamp.graph.curve.Region; import com.jogamp.graph.curve.opengl.GLRegion; -import com.jogamp.graph.ui.gl.GraphShape; +import com.jogamp.graph.ui.GraphShape; import com.jogamp.opengl.util.texture.TextureSequence; /** |