From b32c5de0d658a0e41eabe6590da20bc8300c0dae Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 3 Feb 2015 01:16:05 +0100 Subject: Bug 682 - Relocating javax.media.opengl.* -> com.jogamp.opengl.* (Part 1) --- src/demos/es1/Info.java | 4 ++-- src/demos/es1/RedSquare.java | 30 +++++++++++++++--------------- src/demos/es1/angeles/AngelesES1.java | 4 ++-- src/demos/es1/angeles/AngelesGL.java | 4 ++-- src/demos/es1/angeles/AngelesGLil.java | 4 ++-- src/demos/es1/angeles/Main.java | 4 ++-- src/demos/es1/cube/Cube.java | 10 +++++----- src/demos/es1/cube/CubeImmModeSink.java | 6 +++--- src/demos/es1/cubefbo/FBCubes.java | 10 +++++----- src/demos/es1/cubefbo/Main.java | 4 ++-- 10 files changed, 40 insertions(+), 40 deletions(-) (limited to 'src/demos/es1') diff --git a/src/demos/es1/Info.java b/src/demos/es1/Info.java index c8e0edb..9d9d18d 100755 --- a/src/demos/es1/Info.java +++ b/src/demos/es1/Info.java @@ -1,7 +1,7 @@ package demos.es1; -import javax.media.opengl.*; -import javax.media.nativewindow.*; +import com.jogamp.opengl.*; +import com.jogamp.nativewindow.*; import com.jogamp.newt.*; import com.jogamp.newt.opengl.*; diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java index d8a772d..ef2099d 100755 --- a/src/demos/es1/RedSquare.java +++ b/src/demos/es1/RedSquare.java @@ -5,17 +5,17 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import javax.media.nativewindow.NativeWindowFactory; -import javax.media.opengl.FPSCounter; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2ES2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.GLPipelineFactory; -import javax.media.opengl.GLProfile; -import javax.media.opengl.glu.GLU; +import com.jogamp.nativewindow.NativeWindowFactory; +import com.jogamp.opengl.FPSCounter; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2ES2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.GLPipelineFactory; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.glu.GLU; import com.jogamp.common.nio.Buffers; import com.jogamp.newt.Display; @@ -242,11 +242,11 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo if(glDebugEmu) { try { // Debug .. - _gl = _gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Debug", GL2ES2.class, _gl, null) ); + _gl = _gl.getContext().setGL( GLPipelineFactory.create("com.jogamp.opengl.Debug", GL2ES2.class, _gl, null) ); if(glTrace) { // Trace .. - _gl = _gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Trace", GL2ES2.class, _gl, new Object[] { System.err } ) ); + _gl = _gl.getContext().setGL( GLPipelineFactory.create("com.jogamp.opengl.Trace", GL2ES2.class, _gl, new Object[] { System.err } ) ); } } catch (Exception e) {e.printStackTrace();} glDebug = false; @@ -261,14 +261,14 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo if(glDebug) { try { // Debug .. - gl = (GL2ES1) gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Debug", GL2ES1.class, gl, null) ); + gl = (GL2ES1) gl.getContext().setGL( GLPipelineFactory.create("com.jogamp.opengl.Debug", GL2ES1.class, gl, null) ); } catch (Exception e) {e.printStackTrace();} } if(glTrace) { try { // Trace .. - gl = (GL2ES1) gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Trace", GL2ES1.class, gl, new Object[] { System.err } ) ); + gl = (GL2ES1) gl.getContext().setGL( GLPipelineFactory.create("com.jogamp.opengl.Trace", GL2ES1.class, gl, new Object[] { System.err } ) ); } catch (Exception e) {e.printStackTrace();} } diff --git a/src/demos/es1/angeles/AngelesES1.java b/src/demos/es1/angeles/AngelesES1.java index fbf74d3..9150857 100755 --- a/src/demos/es1/angeles/AngelesES1.java +++ b/src/demos/es1/angeles/AngelesES1.java @@ -25,8 +25,8 @@ package demos.es1.angeles; import com.jogamp.common.nio.Buffers; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.glu.*; import com.jogamp.opengl.math.FixedPoint; import com.jogamp.opengl.util.*; diff --git a/src/demos/es1/angeles/AngelesGL.java b/src/demos/es1/angeles/AngelesGL.java index ea0ca96..e81ad57 100755 --- a/src/demos/es1/angeles/AngelesGL.java +++ b/src/demos/es1/angeles/AngelesGL.java @@ -24,8 +24,8 @@ package demos.es1.angeles; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.glu.*; import com.jogamp.opengl.math.FixedPoint; import com.jogamp.opengl.util.*; diff --git a/src/demos/es1/angeles/AngelesGLil.java b/src/demos/es1/angeles/AngelesGLil.java index 7ba02d6..9ed2d7a 100755 --- a/src/demos/es1/angeles/AngelesGLil.java +++ b/src/demos/es1/angeles/AngelesGLil.java @@ -24,8 +24,8 @@ package demos.es1.angeles; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.glu.*; import com.jogamp.opengl.math.FixedPoint; import com.jogamp.opengl.util.*; diff --git a/src/demos/es1/angeles/Main.java b/src/demos/es1/angeles/Main.java index ad1a5b5..9f42ad8 100755 --- a/src/demos/es1/angeles/Main.java +++ b/src/demos/es1/angeles/Main.java @@ -1,7 +1,7 @@ package demos.es1.angeles; -import javax.media.opengl.*; -import javax.media.nativewindow.*; +import com.jogamp.opengl.*; +import com.jogamp.nativewindow.*; import com.jogamp.newt.*; import com.jogamp.newt.event.*; import com.jogamp.newt.opengl.*; diff --git a/src/demos/es1/cube/Cube.java b/src/demos/es1/cube/Cube.java index 49c9544..496712a 100644 --- a/src/demos/es1/cube/Cube.java +++ b/src/demos/es1/cube/Cube.java @@ -33,9 +33,9 @@ package demos.es1.cube; import com.jogamp.common.nio.Buffers; import java.nio.*; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; -import javax.media.nativewindow.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.glu.*; +import com.jogamp.nativewindow.*; import com.jogamp.opengl.util.glsl.fixedfunc.*; @@ -85,13 +85,13 @@ public class Cube implements GLEventListener { if(glDebug) { try { - _gl = _gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Debug", null, _gl, null) ); + _gl = _gl.getContext().setGL( GLPipelineFactory.create("com.jogamp.opengl.Debug", null, _gl, null) ); } catch (Exception e) {e.printStackTrace();} } if(glTrace) { try { - _gl = _gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Trace", null, _gl, new Object[] { System.err } ) ); + _gl = _gl.getContext().setGL( GLPipelineFactory.create("com.jogamp.opengl.Trace", null, _gl, new Object[] { System.err } ) ); } catch (Exception e) {e.printStackTrace();} } diff --git a/src/demos/es1/cube/CubeImmModeSink.java b/src/demos/es1/cube/CubeImmModeSink.java index 208ed36..f01f837 100644 --- a/src/demos/es1/cube/CubeImmModeSink.java +++ b/src/demos/es1/cube/CubeImmModeSink.java @@ -32,9 +32,9 @@ package demos.es1.cube; import com.jogamp.common.nio.Buffers; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; -import javax.media.nativewindow.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.glu.*; +import com.jogamp.nativewindow.*; import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.glsl.fixedfunc.*; import java.nio.*; diff --git a/src/demos/es1/cubefbo/FBCubes.java b/src/demos/es1/cubefbo/FBCubes.java index 3f12bd9..8fb9789 100755 --- a/src/demos/es1/cubefbo/FBCubes.java +++ b/src/demos/es1/cubefbo/FBCubes.java @@ -33,10 +33,10 @@ package demos.es1.cubefbo; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; import com.jogamp.opengl.FBObject; import com.jogamp.opengl.FBObject.Attachment; @@ -147,7 +147,7 @@ public class FBCubes implements GLEventListener { */ } - public void displayChanged(javax.media.opengl.GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) { + public void displayChanged(com.jogamp.opengl.GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) { } float time = 0.0f; diff --git a/src/demos/es1/cubefbo/Main.java b/src/demos/es1/cubefbo/Main.java index b2da7a5..8f7c744 100755 --- a/src/demos/es1/cubefbo/Main.java +++ b/src/demos/es1/cubefbo/Main.java @@ -1,7 +1,7 @@ package demos.es1.cubefbo; -import javax.media.opengl.*; -import javax.media.nativewindow.*; +import com.jogamp.opengl.*; +import com.jogamp.nativewindow.*; import com.jogamp.newt.*; import com.jogamp.newt.event.*; import com.jogamp.newt.opengl.*; -- cgit v1.2.3