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/GLInfo.java | 4 +- src/demos/GLNewtRun.java | 4 +- src/demos/applets/GearsApplet.java | 4 +- src/demos/applets/GearsJOALApplet.java | 6 +- src/demos/cg/runtime_ogl/cgGL_vertex_example.java | 6 +- .../runtime_ogl_vertex_fragment.java | 6 +- src/demos/common/Demo.java | 2 +- src/demos/context/DualContext.java | 26 ++--- src/demos/cubefbo/CubeObject.java | 6 +- src/demos/cubefbo/FBCubes.java | 8 +- src/demos/cubefbo/Main.java | 6 +- src/demos/dualDepthPeeling/DualDepthPeeling.java | 10 +- src/demos/dualDepthPeeling/GLHelper.java | 2 +- 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 +- src/demos/es2/RawGL2ES2demo.java | 12 +-- src/demos/es2/RedSquare.java | 8 +- src/demos/es2/perftst/PerfModule.java | 8 +- src/demos/es2/perftst/PerfTextLoad.java | 2 +- src/demos/es2/perftst/PerfUniLoad.java | 2 +- src/demos/es2/perftst/PerfVBOLoad.java | 2 +- src/demos/es2/perftst/Perftst.java | 20 ++-- .../perftst/shader/scripts/nvidia-apx/glslc-ff.bat | 2 +- .../es2/shader/scripts/nvidia-apx/glslc-ff.bat | 2 +- src/demos/fullscreen/FullscreenWorkaround.java | 2 +- src/demos/fullscreen/GearsFullscreen.java | 2 +- src/demos/fullscreen/GearsFullscreen2.java | 2 +- src/demos/fullscreen/JGearsFullscreen.java | 2 +- src/demos/gamma/TestGamma.java | 6 +- src/demos/gears/Gears.java | 16 +-- src/demos/hdr/ARBFPPipeline.java | 6 +- src/demos/hdr/CgPipeline.java | 2 +- src/demos/hdr/HDR.java | 26 ++--- src/demos/hdr/HDRTexture.java | 2 +- src/demos/hdr/Pipeline.java | 4 +- .../hwShadowmapsSimple/HWShadowmapsSimple.java | 26 ++--- .../InfiniteShadowVolumes.java | 12 +-- src/demos/j2d/CustomText.java | 12 +-- src/demos/j2d/FlyingText.java | 10 +- src/demos/j2d/TestOverlay.java | 10 +- src/demos/j2d/TestTextRenderer.java | 10 +- src/demos/j2d/TestTextureRenderer.java | 12 +-- src/demos/j2d/TextCube.java | 12 +-- src/demos/j2d/TextFlow.java | 10 +- src/demos/jgears/JGears.java | 6 +- src/demos/jrefract/JRefract.java | 6 +- src/demos/misc/GLCapsTableDemo.java | 16 +-- src/demos/misc/Picking.java | 6 +- src/demos/misc/VersionInfo.java | 2 +- src/demos/multisample/Multisample.java | 22 ++-- src/demos/newt/NEWTTest1.java | 2 +- src/demos/newt/TaskManagerTest1.java | 2 +- src/demos/newt/TaskManagerTest2.java | 2 +- src/demos/nurbs/curveapp/CurveApp.java | 2 +- src/demos/nurbs/curveapp/GLListener.java | 16 +-- src/demos/nurbs/surfaceapp/GLListener.java | 20 ++-- src/demos/nurbs/surfaceapp/SurfaceApp.java | 2 +- .../nurbs/surfaceapp/SurfaceMouseListener.java | 4 +- src/demos/particles/engine/Engine.java | 2 +- src/demos/particles/engine/GLComponent.java | 111 +++++++++++---------- src/demos/particles/engine/Particle.java | 2 +- src/demos/printext/PrintExt.java | 8 +- .../ProceduralTexturePhysics.java | 14 +-- src/demos/proceduralTexturePhysics/Water.java | 20 ++-- src/demos/readbuffer/Main.java | 4 +- src/demos/readbuffer/ReadBuffer2File.java | 4 +- src/demos/readbuffer/ReadBuffer2Screen.java | 6 +- src/demos/readbuffer/ReadBufferBase.java | 6 +- src/demos/readbuffer/ReadBufferUtil.java | 4 +- src/demos/readbuffer/Surface2File.java | 4 +- src/demos/swt/Snippet209.java | 10 +- src/demos/tennis/Tennis.java | 22 ++-- src/demos/tess/Tess.java | 16 +-- .../TestContextDestruction.java | 10 +- .../testContextSharing/TestContextSharing.java | 10 +- src/demos/texture/TestSubImage.java | 14 +-- src/demos/texture/TestTexture.java | 16 +-- src/demos/texture/TextureConvert.java | 10 +- src/demos/util/Bunny.java | 2 +- src/demos/util/Cubemap.java | 6 +- src/demos/util/FPSCounter.java | 4 +- src/demos/util/Triceratops.java | 6 +- src/demos/vertexArrayRange/VertexArrayRange.java | 12 +-- .../vertexBufferObject/VertexBufferObject.java | 18 ++-- src/demos/vertexProgRefract/VertexProgRefract.java | 4 +- src/demos/vertexProgWarp/VertexProgWarp.java | 16 +-- src/demos/xtrans/XTBasicTransition.java | 6 +- src/demos/xtrans/XTDesktopManager.java | 14 +-- src/demos/xtrans/XTDesktopPane.java | 16 +-- src/demos/xtrans/XTTransition.java | 2 +- src/gleem/ExaminerViewer.java | 10 +- src/gleem/HandleBoxManip.java | 2 +- src/gleem/Manip.java | 2 +- src/gleem/ManipManager.java | 4 +- src/gleem/ManipPart.java | 2 +- src/gleem/ManipPartGroup.java | 2 +- src/gleem/ManipPartLineSeg.java | 2 +- src/gleem/ManipPartTriBased.java | 2 +- src/gleem/TestExaminerViewer.java | 16 +-- src/gleem/TestHandleBox.java | 16 +-- src/gleem/TestMultiWin.java | 16 +-- src/gleem/TestTranslate1.java | 16 +-- src/gleem/TestTranslate2.java | 16 +-- src/gleem/Translate1Manip.java | 2 +- src/gleem/Translate2Manip.java | 2 +- src/gleem/WindowUpdateListener.java | 2 +- .../demos/genericjoint/GenericJointDemo.java | 2 +- .../javabullet/demos/opengl/DemoApplication.java | 4 +- .../javabullet/demos/opengl/FontRender.java-nope | 4 +- src/jbullet/src/javabullet/demos/opengl/GLSRT.java | 8 +- .../src/javabullet/demos/opengl/GLShapeDrawer.java | 4 +- src/jbullet/src/javabullet/demos/opengl/JOGL.java | 8 +- .../javabullet/demos/vehicle/VehicleDemo.java-nope | 2 +- src/redbook/src/glredbook10/GLSkeleton.java | 2 +- src/redbook/src/glredbook10/README.txt | 2 +- src/redbook/src/glredbook10/accanti.java | 4 +- src/redbook/src/glredbook10/accnot.java | 2 +- src/redbook/src/glredbook10/accpersp.java | 4 +- src/redbook/src/glredbook10/accum.java | 4 +- src/redbook/src/glredbook10/aim.java | 6 +- src/redbook/src/glredbook10/alpha.java | 6 +- src/redbook/src/glredbook10/alpha3D.java | 4 +- src/redbook/src/glredbook10/anti.java | 6 +- src/redbook/src/glredbook10/antipoint.java | 4 +- src/redbook/src/glredbook10/antipoly.java | 6 +- src/redbook/src/glredbook10/bezcurve.java | 4 +- src/redbook/src/glredbook10/bezmesh.java | 4 +- src/redbook/src/glredbook10/bezsurf.java | 4 +- src/redbook/src/glredbook10/checker.java | 6 +- src/redbook/src/glredbook10/checker2.java | 6 +- src/redbook/src/glredbook10/chess.java | 6 +- src/redbook/src/glredbook10/clip.java | 6 +- src/redbook/src/glredbook10/colormat.java | 4 +- src/redbook/src/glredbook10/cone.java | 2 +- src/redbook/src/glredbook10/cube.java | 6 +- src/redbook/src/glredbook10/depthcue.java | 6 +- src/redbook/src/glredbook10/disk.java | 8 +- src/redbook/src/glredbook10/dof.java | 4 +- src/redbook/src/glredbook10/dofnot.java | 6 +- src/redbook/src/glredbook10/doublebuf.java | 4 +- src/redbook/src/glredbook10/drawf.java | 4 +- src/redbook/src/glredbook10/feedback.java | 4 +- src/redbook/src/glredbook10/fog.java | 4 +- src/redbook/src/glredbook10/font.java | 4 +- src/redbook/src/glredbook10/jfont.java | 14 +-- src/redbook/src/glredbook10/light.java | 4 +- src/redbook/src/glredbook10/linelist.java | 4 +- src/redbook/src/glredbook10/lines.java | 6 +- src/redbook/src/glredbook10/list.java | 4 +- src/redbook/src/glredbook10/list2.java | 4 +- src/redbook/src/glredbook10/maplight.java | 2 +- src/redbook/src/glredbook10/material.java | 4 +- src/redbook/src/glredbook10/mipmap.java | 6 +- src/redbook/src/glredbook10/model.java | 4 +- src/redbook/src/glredbook10/movelight.java | 6 +- src/redbook/src/glredbook10/pickdepth.java | 6 +- src/redbook/src/glredbook10/pickline.java | 6 +- src/redbook/src/glredbook10/picksquare.java | 6 +- src/redbook/src/glredbook10/plane.java | 4 +- src/redbook/src/glredbook10/planet.java | 6 +- src/redbook/src/glredbook10/planetup.java | 6 +- src/redbook/src/glredbook10/polys.java | 6 +- src/redbook/src/glredbook10/robot.java | 6 +- src/redbook/src/glredbook10/sccolorlight.java | 4 +- src/redbook/src/glredbook10/scene.java | 4 +- src/redbook/src/glredbook10/scenebamb.java | 4 +- src/redbook/src/glredbook10/sceneflat.java | 4 +- src/redbook/src/glredbook10/select.java | 6 +- src/redbook/src/glredbook10/simple.java | 4 +- src/redbook/src/glredbook10/smooth.java | 6 +- src/redbook/src/glredbook10/sphere.java | 6 +- src/redbook/src/glredbook10/stencil.java | 6 +- src/redbook/src/glredbook10/stroke.java | 6 +- src/redbook/src/glredbook10/tea.java | 4 +- src/redbook/src/glredbook10/teaambient.java | 2 +- src/redbook/src/glredbook10/teapots.java | 2 +- src/redbook/src/glredbook10/texgen.java | 2 +- src/redbook/src/glredbook10/texturesurf.java | 4 +- src/redbook/src/glredbook11/README.txt | 2 +- src/redbook/src/glredbook11/aargb.java | 6 +- src/redbook/src/glredbook11/hello.java | 6 +- src/redbook/src/glredbook11/image.java | 6 +- src/redbook/src/glredbook11/polyoff.java | 6 +- src/redbook/src/glredbook11/tess.java | 10 +- src/redbook/src/glredbook11/tesswind.java | 10 +- src/redbook/src/glredbook11/texbind.java | 6 +- src/redbook/src/glredbook11/texgen.java | 4 +- src/redbook/src/glredbook11/texprox.java | 2 +- src/redbook/src/glredbook11/texsub.java | 6 +- src/redbook/src/glredbook11/torus.java | 6 +- src/redbook/src/glredbook11/unproject.java | 6 +- src/redbook/src/glredbook11/varray.java | 6 +- src/redbook/src/glredbook11/wrap.java | 6 +- src/redbook/src/glredbook12x/blendeqn.java | 2 +- src/redbook/src/glredbook12x/colormatrix.java | 4 +- src/redbook/src/glredbook12x/colortable.java | 4 +- src/redbook/src/glredbook12x/convolution.java | 4 +- src/redbook/src/glredbook12x/histogram.java | 4 +- src/redbook/src/glredbook12x/minmax.java | 4 +- src/redbook/src/glredbook12x/multitex.java | 6 +- src/redbook/src/glredbook12x/quadric.java | 8 +- src/redbook/src/glredbook12x/texture3d.java | 6 +- src/redbook/src/glredbook1314/combiner.java | 6 +- src/redbook/src/glredbook1314/cubemap.java | 6 +- src/redbook/src/glredbook1314/fogcoord.java | 6 +- src/redbook/src/glredbook1314/multisamp.java | 4 +- src/redbook/src/glredbook1314/mvarray.java | 14 +-- src/redbook/src/glredbook1314/pointp.java | 6 +- src/redbook/src/glredbook1314/shadowmap.java | 4 +- 217 files changed, 776 insertions(+), 773 deletions(-) diff --git a/src/demos/GLInfo.java b/src/demos/GLInfo.java index 1af0354..9900430 100755 --- a/src/demos/GLInfo.java +++ b/src/demos/GLInfo.java @@ -1,7 +1,7 @@ package demos; -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/GLNewtRun.java b/src/demos/GLNewtRun.java index 264d504..687a59f 100755 --- a/src/demos/GLNewtRun.java +++ b/src/demos/GLNewtRun.java @@ -2,8 +2,8 @@ package demos; import java.lang.reflect.*; -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.*; diff --git a/src/demos/applets/GearsApplet.java b/src/demos/applets/GearsApplet.java index 6fd737d..9e94712 100755 --- a/src/demos/applets/GearsApplet.java +++ b/src/demos/applets/GearsApplet.java @@ -3,9 +3,9 @@ package demos.applets; import java.applet.*; import java.awt.*; import demos.gears.Gears; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.awt.GLCanvas; import com.jogamp.opengl.util.FPSAnimator; -import javax.media.opengl.GLAnimatorControl; +import com.jogamp.opengl.GLAnimatorControl; /** Shows how to deploy an applet using JOGL. This demo must be referenced from a web page via an <applet> tag. */ diff --git a/src/demos/applets/GearsJOALApplet.java b/src/demos/applets/GearsJOALApplet.java index 582f0f3..16f3e66 100755 --- a/src/demos/applets/GearsJOALApplet.java +++ b/src/demos/applets/GearsJOALApplet.java @@ -4,13 +4,13 @@ import demos.gears.Gears; import java.applet.Applet; import java.awt.EventQueue; import java.awt.GridLayout; -import javax.media.opengl.GLProfile; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.awt.GLCanvas; import com.jogamp.opengl.util.FPSAnimator; import javax.swing.JPanel; import com.jogamp.openal.util.ALut; import demos.joal.SingleStaticSource; -import javax.media.opengl.GLAnimatorControl; +import com.jogamp.opengl.GLAnimatorControl; /** Shows how to deploy an applet using both JOGL and JOAL. This demo must be referenced from a web page via an <applet> tag. */ diff --git a/src/demos/cg/runtime_ogl/cgGL_vertex_example.java b/src/demos/cg/runtime_ogl/cgGL_vertex_example.java index cb3c36f..7c65398 100644 --- a/src/demos/cg/runtime_ogl/cgGL_vertex_example.java +++ b/src/demos/cg/runtime_ogl/cgGL_vertex_example.java @@ -34,9 +34,9 @@ package demos.cg.runtime_ogl; import com.jogamp.opengl.cg.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.*; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.*; +import com.jogamp.opengl.glu.*; import java.awt.*; import java.awt.event.*; diff --git a/src/demos/cg/runtime_ogl_vertex_fragment/runtime_ogl_vertex_fragment.java b/src/demos/cg/runtime_ogl_vertex_fragment/runtime_ogl_vertex_fragment.java index 983cab8..be7230a 100644 --- a/src/demos/cg/runtime_ogl_vertex_fragment/runtime_ogl_vertex_fragment.java +++ b/src/demos/cg/runtime_ogl_vertex_fragment/runtime_ogl_vertex_fragment.java @@ -34,9 +34,9 @@ package demos.cg.runtime_ogl_vertex_fragment; import com.jogamp.opengl.cg.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.*; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.*; +import com.jogamp.opengl.glu.*; import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.*; diff --git a/src/demos/common/Demo.java b/src/demos/common/Demo.java index 00f5956..859cebb 100755 --- a/src/demos/common/Demo.java +++ b/src/demos/common/Demo.java @@ -39,7 +39,7 @@ package demos.common; -import javax.media.opengl.*; +import com.jogamp.opengl.*; public abstract class Demo implements GLEventListener { protected DemoListener demoListener; diff --git a/src/demos/context/DualContext.java b/src/demos/context/DualContext.java index 5df79fd..779eaa5 100755 --- a/src/demos/context/DualContext.java +++ b/src/demos/context/DualContext.java @@ -46,19 +46,19 @@ import java.awt.GraphicsConfiguration; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import javax.media.nativewindow.GraphicsConfigurationFactory; -import javax.media.nativewindow.NativeWindow; -import javax.media.nativewindow.NativeWindowFactory; -import javax.media.nativewindow.VisualIDHolder; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLContext; -import javax.media.opengl.GLDrawable; -import javax.media.opengl.GLDrawableFactory; -import javax.media.opengl.GLProfile; -import javax.media.opengl.glu.GLU; +import com.jogamp.nativewindow.GraphicsConfigurationFactory; +import com.jogamp.nativewindow.NativeWindow; +import com.jogamp.nativewindow.NativeWindowFactory; +import com.jogamp.nativewindow.VisualIDHolder; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLContext; +import com.jogamp.opengl.GLDrawable; +import com.jogamp.opengl.GLDrawableFactory; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.glu.GLU; import javax.swing.JButton; import javax.swing.JFrame; diff --git a/src/demos/cubefbo/CubeObject.java b/src/demos/cubefbo/CubeObject.java index 7abb8cd..6e37c16 100755 --- a/src/demos/cubefbo/CubeObject.java +++ b/src/demos/cubefbo/CubeObject.java @@ -36,9 +36,9 @@ package demos.cubefbo; import com.jogamp.common.nio.Buffers; import java.nio.ByteBuffer; import java.nio.ShortBuffer; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; class CubeObject { diff --git a/src/demos/cubefbo/FBCubes.java b/src/demos/cubefbo/FBCubes.java index 54d3802..8a7be47 100755 --- a/src/demos/cubefbo/FBCubes.java +++ b/src/demos/cubefbo/FBCubes.java @@ -37,10 +37,10 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; import com.jogamp.opengl.FBObject; import com.jogamp.opengl.FBObject.Attachment; diff --git a/src/demos/cubefbo/Main.java b/src/demos/cubefbo/Main.java index a3cebb2..a5a9f5e 100755 --- a/src/demos/cubefbo/Main.java +++ b/src/demos/cubefbo/Main.java @@ -36,10 +36,10 @@ package demos.cubefbo; import java.awt.Frame; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.awt.GLCanvas; import com.jogamp.opengl.util.FPSAnimator; -import javax.media.opengl.GLAnimatorControl; +import com.jogamp.opengl.GLAnimatorControl; public class Main { diff --git a/src/demos/dualDepthPeeling/DualDepthPeeling.java b/src/demos/dualDepthPeeling/DualDepthPeeling.java index 41d50d0..67206e2 100644 --- a/src/demos/dualDepthPeeling/DualDepthPeeling.java +++ b/src/demos/dualDepthPeeling/DualDepthPeeling.java @@ -10,12 +10,12 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.nio.FloatBuffer; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLEventListener; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLEventListener; import com.jogamp.common.nio.Buffers; import com.jogamp.opengl.util.*; diff --git a/src/demos/dualDepthPeeling/GLHelper.java b/src/demos/dualDepthPeeling/GLHelper.java index cf1cccc..acfd9ae 100644 --- a/src/demos/dualDepthPeeling/GLHelper.java +++ b/src/demos/dualDepthPeeling/GLHelper.java @@ -10,7 +10,7 @@ package demos.dualDepthPeeling; // // Copyright (c) NVIDIA Corporation. All rights reserved. //////////////////////////////////////////////////////////////////////////////// -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2; public class GLHelper { 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.*; diff --git a/src/demos/es2/RawGL2ES2demo.java b/src/demos/es2/RawGL2ES2demo.java index 2d99490..cece546 100644 --- a/src/demos/es2/RawGL2ES2demo.java +++ b/src/demos/es2/RawGL2ES2demo.java @@ -28,12 +28,12 @@ package demos.es2; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.GLProfile; -import javax.media.opengl.GLCapabilities; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.GLCapabilities; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.util.*; diff --git a/src/demos/es2/RedSquare.java b/src/demos/es2/RedSquare.java index a1b1250..4347148 100755 --- a/src/demos/es2/RedSquare.java +++ b/src/demos/es2/RedSquare.java @@ -2,8 +2,8 @@ package demos.es2; import java.nio.*; import java.util.*; -import javax.media.opengl.*; -import javax.media.nativewindow.*; +import com.jogamp.opengl.*; +import com.jogamp.nativewindow.*; import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.glsl.*; @@ -199,10 +199,10 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo if(debuggl) { try { // Debug .. - gl = (GL2ES2) gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Debug", GL2ES2.class, gl, null) ); + gl = (GL2ES2) gl.getContext().setGL( GLPipelineFactory.create("com.jogamp.opengl.Debug", GL2ES2.class, gl, null) ); // Trace .. - gl = (GL2ES2) gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Trace", GL2ES2.class, gl, new Object[] { System.err } ) ); + gl = (GL2ES2) gl.getContext().setGL( GLPipelineFactory.create("com.jogamp.opengl.Trace", GL2ES2.class, gl, new Object[] { System.err } ) ); } catch (Exception e) {e.printStackTrace();} } diff --git a/src/demos/es2/perftst/PerfModule.java b/src/demos/es2/perftst/PerfModule.java index 1418038..7da3c0e 100644 --- a/src/demos/es2/perftst/PerfModule.java +++ b/src/demos/es2/perftst/PerfModule.java @@ -6,10 +6,10 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; import java.nio.ShortBuffer; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLException; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLException; import com.jogamp.opengl.math.FixedPoint; import com.jogamp.opengl.util.glsl.ShaderCode; diff --git a/src/demos/es2/perftst/PerfTextLoad.java b/src/demos/es2/perftst/PerfTextLoad.java index 429e833..4b7aadf 100755 --- a/src/demos/es2/perftst/PerfTextLoad.java +++ b/src/demos/es2/perftst/PerfTextLoad.java @@ -5,7 +5,7 @@ import com.jogamp.common.util.IOUtil; import java.nio.*; import java.io.*; import java.net.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.glsl.ShaderState; import com.jogamp.opengl.util.texture.*; diff --git a/src/demos/es2/perftst/PerfUniLoad.java b/src/demos/es2/perftst/PerfUniLoad.java index d553d64..ae5e98a 100755 --- a/src/demos/es2/perftst/PerfUniLoad.java +++ b/src/demos/es2/perftst/PerfUniLoad.java @@ -2,7 +2,7 @@ package demos.es2.perftst; import com.jogamp.common.nio.Buffers; import java.nio.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.glsl.ShaderState; diff --git a/src/demos/es2/perftst/PerfVBOLoad.java b/src/demos/es2/perftst/PerfVBOLoad.java index 597d8d1..325b9a6 100755 --- a/src/demos/es2/perftst/PerfVBOLoad.java +++ b/src/demos/es2/perftst/PerfVBOLoad.java @@ -1,7 +1,7 @@ package demos.es2.perftst; import java.nio.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.glsl.ShaderState; diff --git a/src/demos/es2/perftst/Perftst.java b/src/demos/es2/perftst/Perftst.java index a423564..715ea86 100755 --- a/src/demos/es2/perftst/Perftst.java +++ b/src/demos/es2/perftst/Perftst.java @@ -1,15 +1,15 @@ package demos.es2.perftst; -import javax.media.nativewindow.NativeWindowFactory; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.GLException; -import javax.media.opengl.GLProfile; -import javax.media.opengl.GLUniformData; -import javax.media.opengl.fixedfunc.GLMatrixFunc; +import com.jogamp.nativewindow.NativeWindowFactory; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.GLException; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.GLUniformData; +import com.jogamp.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.newt.Display; import com.jogamp.newt.NewtFactory; diff --git a/src/demos/es2/perftst/shader/scripts/nvidia-apx/glslc-ff.bat b/src/demos/es2/perftst/shader/scripts/nvidia-apx/glslc-ff.bat index bf184f9..692f67f 100755 --- a/src/demos/es2/perftst/shader/scripts/nvidia-apx/glslc-ff.bat +++ b/src/demos/es2/perftst/shader/scripts/nvidia-apx/glslc-ff.bat @@ -6,4 +6,4 @@ IF !"%JOGLDIR%"==""! GOTO YESPATH set JOGLDIR=..\lib :YESPATH -java -cp %JOGLDIR%\jogl.core.jar;%JOGLDIR%\jogl.gles2.jar;%JOGLDIR%\jogl.fixed.jar;%JOGLDIR%\jogl.sdk.jar javax.media.opengl.sdk.glsl.CompileShaderNVidia fcolor.fp vbo-vert-col.vp uni-vert-col.vp ftext.fp vbo-vert-text.vp +java -cp %JOGLDIR%\jogl.core.jar;%JOGLDIR%\jogl.gles2.jar;%JOGLDIR%\jogl.fixed.jar;%JOGLDIR%\jogl.sdk.jar com.jogamp.opengl.sdk.glsl.CompileShaderNVidia fcolor.fp vbo-vert-col.vp uni-vert-col.vp ftext.fp vbo-vert-text.vp diff --git a/src/demos/es2/shader/scripts/nvidia-apx/glslc-ff.bat b/src/demos/es2/shader/scripts/nvidia-apx/glslc-ff.bat index 024e469..4dc1590 100755 --- a/src/demos/es2/shader/scripts/nvidia-apx/glslc-ff.bat +++ b/src/demos/es2/shader/scripts/nvidia-apx/glslc-ff.bat @@ -6,4 +6,4 @@ IF !"%JOGLDIR%"==""! GOTO YESPATH set JOGLDIR=..\lib :YESPATH -java -cp %JOGLDIR%\jogl.core.jar;%JOGLDIR%\jogl.gles2.jar;%JOGLDIR%\jogl.fixed.jar;%JOGLDIR%\jogl.sdk.jar javax.media.opengl.sdk.glsl.CompileShaderNVidia redsquare.vp redsquare.fp +java -cp %JOGLDIR%\jogl.core.jar;%JOGLDIR%\jogl.gles2.jar;%JOGLDIR%\jogl.fixed.jar;%JOGLDIR%\jogl.sdk.jar com.jogamp.opengl.sdk.glsl.CompileShaderNVidia redsquare.vp redsquare.fp diff --git a/src/demos/fullscreen/FullscreenWorkaround.java b/src/demos/fullscreen/FullscreenWorkaround.java index b337db7..5b9d44e 100755 --- a/src/demos/fullscreen/FullscreenWorkaround.java +++ b/src/demos/fullscreen/FullscreenWorkaround.java @@ -42,7 +42,7 @@ package demos.fullscreen; import java.awt.*; import javax.swing.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** Class which implements workaround for full-screen bugs on Windows when -Dsun.java2d.noddraw=true is specified as well diff --git a/src/demos/fullscreen/GearsFullscreen.java b/src/demos/fullscreen/GearsFullscreen.java index 0dac67f..f1c9b80 100755 --- a/src/demos/fullscreen/GearsFullscreen.java +++ b/src/demos/fullscreen/GearsFullscreen.java @@ -5,7 +5,7 @@ import java.awt.event.*; import demos.gears.Gears; import demos.util.*; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.awt.GLCanvas; import com.jogamp.opengl.util.Animator; /** diff --git a/src/demos/fullscreen/GearsFullscreen2.java b/src/demos/fullscreen/GearsFullscreen2.java index 38911a4..8b2bf41 100755 --- a/src/demos/fullscreen/GearsFullscreen2.java +++ b/src/demos/fullscreen/GearsFullscreen2.java @@ -10,7 +10,7 @@ import java.awt.GraphicsDevice; import java.awt.GraphicsEnvironment; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.awt.GLCanvas; import com.jogamp.opengl.util.Animator; import javax.swing.JButton; import javax.swing.JFrame; diff --git a/src/demos/fullscreen/JGearsFullscreen.java b/src/demos/fullscreen/JGearsFullscreen.java index f540a12..0fcc065 100755 --- a/src/demos/fullscreen/JGearsFullscreen.java +++ b/src/demos/fullscreen/JGearsFullscreen.java @@ -10,7 +10,7 @@ import java.awt.GraphicsDevice; import java.awt.GraphicsEnvironment; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.awt.GLJPanel; import com.jogamp.opengl.util.Animator; import javax.swing.JButton; import javax.swing.JFrame; diff --git a/src/demos/gamma/TestGamma.java b/src/demos/gamma/TestGamma.java index e5c9243..e9286bb 100755 --- a/src/demos/gamma/TestGamma.java +++ b/src/demos/gamma/TestGamma.java @@ -43,9 +43,9 @@ import java.awt.Frame; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.GLCanvas; import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.util.Gamma; diff --git a/src/demos/gears/Gears.java b/src/demos/gears/Gears.java index 51c118d..73ab76a 100644 --- a/src/demos/gears/Gears.java +++ b/src/demos/gears/Gears.java @@ -1,11 +1,11 @@ package demos.gears; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.GLProfile; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.awt.GLCanvas; import com.jogamp.newt.Window; import com.jogamp.newt.event.KeyAdapter; @@ -219,9 +219,9 @@ public void display(GLAutoDrawable drawable) { // Special handling for the case where the GLJPanel is translucent // and wants to be composited with other Java 2D content if (GLProfile.isAWTAvailable() && - (drawable instanceof javax.media.opengl.awt.GLJPanel) && - !((javax.media.opengl.awt.GLJPanel) drawable).isOpaque() && - ((javax.media.opengl.awt.GLJPanel) drawable).shouldPreserveColorBufferIfTranslucent()) { + (drawable instanceof com.jogamp.opengl.awt.GLJPanel) && + !((com.jogamp.opengl.awt.GLJPanel) drawable).isOpaque() && + ((com.jogamp.opengl.awt.GLJPanel) drawable).shouldPreserveColorBufferIfTranslucent()) { gl.glClear(GL2.GL_DEPTH_BUFFER_BIT); } else { gl.glClear(GL2.GL_COLOR_BUFFER_BIT | GL2.GL_DEPTH_BUFFER_BIT); diff --git a/src/demos/hdr/ARBFPPipeline.java b/src/demos/hdr/ARBFPPipeline.java index 04ae00b..a27d4ce 100755 --- a/src/demos/hdr/ARBFPPipeline.java +++ b/src/demos/hdr/ARBFPPipeline.java @@ -4,9 +4,9 @@ import demos.util.FileUtils; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLException; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLException; public class ARBFPPipeline implements Pipeline { diff --git a/src/demos/hdr/CgPipeline.java b/src/demos/hdr/CgPipeline.java index f46c693..a83e5ad 100755 --- a/src/demos/hdr/CgPipeline.java +++ b/src/demos/hdr/CgPipeline.java @@ -3,7 +3,7 @@ package demos.hdr; import java.io.*; import java.util.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.cg.*; import demos.util.*; diff --git a/src/demos/hdr/HDR.java b/src/demos/hdr/HDR.java index 430fbd0..5283f38 100755 --- a/src/demos/hdr/HDR.java +++ b/src/demos/hdr/HDR.java @@ -20,19 +20,19 @@ import java.io.InputStream; import java.nio.FloatBuffer; import java.nio.IntBuffer; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLContext; -import javax.media.opengl.GLDrawableFactory; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.GLException; -import javax.media.opengl.GLOffscreenAutoDrawable; -import javax.media.opengl.GLProfile; -import javax.media.opengl.awt.AWTGLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLContext; +import com.jogamp.opengl.GLDrawableFactory; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.GLException; +import com.jogamp.opengl.GLOffscreenAutoDrawable; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; import javax.swing.JOptionPane; import com.jogamp.opengl.util.Animator; diff --git a/src/demos/hdr/HDRTexture.java b/src/demos/hdr/HDRTexture.java index e21c898..fab0804 100755 --- a/src/demos/hdr/HDRTexture.java +++ b/src/demos/hdr/HDRTexture.java @@ -3,7 +3,7 @@ package demos.hdr; import java.io.*; import java.nio.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; public class HDRTexture { private RGBE.Header header; diff --git a/src/demos/hdr/Pipeline.java b/src/demos/hdr/Pipeline.java index 5307f3c..a172752 100755 --- a/src/demos/hdr/Pipeline.java +++ b/src/demos/hdr/Pipeline.java @@ -1,8 +1,8 @@ package demos.hdr; import java.io.IOException; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; public interface Pipeline { diff --git a/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java b/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java index 890d906..aa3ce44 100644 --- a/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java +++ b/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java @@ -52,17 +52,17 @@ import java.awt.event.WindowEvent; import java.io.IOException; import java.util.ArrayList; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLDrawableFactory; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.GLException; -import javax.media.opengl.GLOffscreenAutoDrawable; -import javax.media.opengl.GLProfile; -import javax.media.opengl.awt.AWTGLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLDrawableFactory; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.GLException; +import com.jogamp.opengl.GLOffscreenAutoDrawable; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; import javax.swing.JOptionPane; import com.jogamp.opengl.util.gl2.GLUT; @@ -214,9 +214,9 @@ public void init(GLAutoDrawable drawable) { /** GL _gl = drawable.getGL(); // Debug .. - _gl = _gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Debug", GL2.class, _gl, null) ); + _gl = _gl.getContext().setGL( GLPipelineFactory.create("com.jogamp.opengl.Debug", GL2.class, _gl, null) ); // Trace .. - _gl = _gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Trace", GL2.class, _gl, new Object[] { System.err } ) ); + _gl = _gl.getContext().setGL( GLPipelineFactory.create("com.jogamp.opengl.Trace", GL2.class, _gl, new Object[] { System.err } ) ); */ GL2 gl = drawable.getGL().getGL2(); diff --git a/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java b/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java index ce51b88..0239db2 100644 --- a/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java +++ b/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java @@ -53,12 +53,12 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.IOException; import java.nio.FloatBuffer; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.awt.AWTGLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; diff --git a/src/demos/j2d/CustomText.java b/src/demos/j2d/CustomText.java index d324a0e..98bc265 100755 --- a/src/demos/j2d/CustomText.java +++ b/src/demos/j2d/CustomText.java @@ -62,12 +62,12 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JPanel; diff --git a/src/demos/j2d/FlyingText.java b/src/demos/j2d/FlyingText.java index de4df71..e793b50 100755 --- a/src/demos/j2d/FlyingText.java +++ b/src/demos/j2d/FlyingText.java @@ -58,11 +58,11 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JPanel; diff --git a/src/demos/j2d/TestOverlay.java b/src/demos/j2d/TestOverlay.java index bc2bcef..8650b64 100755 --- a/src/demos/j2d/TestOverlay.java +++ b/src/demos/j2d/TestOverlay.java @@ -53,11 +53,11 @@ import java.awt.font.FontRenderContext; import java.awt.font.GlyphVector; import java.text.DecimalFormat; -import javax.media.opengl.GL; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.GLCanvas; import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.util.awt.Overlay; diff --git a/src/demos/j2d/TestTextRenderer.java b/src/demos/j2d/TestTextRenderer.java index 0898ceb..3df41f1 100755 --- a/src/demos/j2d/TestTextRenderer.java +++ b/src/demos/j2d/TestTextRenderer.java @@ -47,11 +47,11 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.geom.Rectangle2D; -import javax.media.opengl.GL; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.GLCanvas; import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.util.awt.TextRenderer; diff --git a/src/demos/j2d/TestTextureRenderer.java b/src/demos/j2d/TestTextureRenderer.java index ccf3dbf..cfbaa92 100755 --- a/src/demos/j2d/TestTextureRenderer.java +++ b/src/demos/j2d/TestTextureRenderer.java @@ -53,12 +53,12 @@ import java.awt.font.FontRenderContext; import java.awt.font.GlyphVector; import java.text.DecimalFormat; -import javax.media.opengl.GL; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.GLProfile; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.awt.GLCanvas; import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.util.awt.TextureRenderer; diff --git a/src/demos/j2d/TextCube.java b/src/demos/j2d/TextCube.java index 6b72259..8e08d40 100755 --- a/src/demos/j2d/TextCube.java +++ b/src/demos/j2d/TextCube.java @@ -50,12 +50,12 @@ import java.awt.Frame; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.geom.Rectangle2D; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLProfile; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; import com.jogamp.opengl.util.Animator; diff --git a/src/demos/j2d/TextFlow.java b/src/demos/j2d/TextFlow.java index 39283b3..3347379 100755 --- a/src/demos/j2d/TextFlow.java +++ b/src/demos/j2d/TextFlow.java @@ -54,11 +54,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.media.opengl.GL; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLProfile; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.awt.GLCanvas; import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.util.awt.TextRenderer; diff --git a/src/demos/jgears/JGears.java b/src/demos/jgears/JGears.java index db466e3..15464ad 100644 --- a/src/demos/jgears/JGears.java +++ b/src/demos/jgears/JGears.java @@ -18,9 +18,9 @@ import java.io.InputStream; import java.text.DecimalFormat; import javax.imageio.ImageIO; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLProfile; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.awt.GLJPanel; import javax.swing.JCheckBox; import javax.swing.JFrame; import javax.swing.JPanel; diff --git a/src/demos/jrefract/JRefract.java b/src/demos/jrefract/JRefract.java index 5bb5a84..62ecdee 100755 --- a/src/demos/jrefract/JRefract.java +++ b/src/demos/jrefract/JRefract.java @@ -55,9 +55,9 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLProfile; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.awt.GLJPanel; import com.jogamp.opengl.util.FPSAnimator; import javax.swing.JCheckBox; import javax.swing.JDesktopPane; diff --git a/src/demos/misc/GLCapsTableDemo.java b/src/demos/misc/GLCapsTableDemo.java index f59de04..87bf4fc 100755 --- a/src/demos/misc/GLCapsTableDemo.java +++ b/src/demos/misc/GLCapsTableDemo.java @@ -11,12 +11,12 @@ import java.awt.event.ActionListener; import java.util.ArrayList; import java.util.List; -import javax.media.nativewindow.CapabilitiesImmutable; -import javax.media.opengl.DefaultGLCapabilitiesChooser; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLCapabilitiesChooser; -import javax.media.opengl.GLCapabilitiesImmutable; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.nativewindow.CapabilitiesImmutable; +import com.jogamp.opengl.DefaultGLCapabilitiesChooser; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLCapabilitiesChooser; +import com.jogamp.opengl.GLCapabilitiesImmutable; +import com.jogamp.opengl.awt.GLCanvas; import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JFrame; @@ -130,8 +130,8 @@ public class GLCapsTableDemo /** * (non-Javadoc) * - * @see javax.media.opengl.GLCapabilitiesChooser#chooseCapabilities(javax.media.nativewindow.Capabilities, - * javax.media.nativewindow.Capabilities[], int) + * @see com.jogamp.opengl.GLCapabilitiesChooser#chooseCapabilities(com.jogamp.nativewindow.Capabilities, + * com.jogamp.nativewindow.Capabilities[], int) */ @Override public int chooseCapabilities(CapabilitiesImmutable desired, diff --git a/src/demos/misc/Picking.java b/src/demos/misc/Picking.java index 641b86f..dd1f4a0 100755 --- a/src/demos/misc/Picking.java +++ b/src/demos/misc/Picking.java @@ -14,9 +14,9 @@ import com.jogamp.common.nio.Buffers; import java.awt.*; import java.awt.event.*; import java.nio.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.*; import com.jogamp.opengl.util.Animator; public class Picking diff --git a/src/demos/misc/VersionInfo.java b/src/demos/misc/VersionInfo.java index 589d899..2b3f64f 100644 --- a/src/demos/misc/VersionInfo.java +++ b/src/demos/misc/VersionInfo.java @@ -14,7 +14,7 @@ package demos.misc; public class VersionInfo { public VersionInfo() { ClassLoader classLoader = getClass().getClassLoader(); - pkgInfo(classLoader, "javax.media.opengl", "GL"); + pkgInfo(classLoader, "com.jogamp.opengl", "GL"); } static void pkgInfo(ClassLoader classLoader, diff --git a/src/demos/multisample/Multisample.java b/src/demos/multisample/Multisample.java index 9796d87..b0cc57d 100755 --- a/src/demos/multisample/Multisample.java +++ b/src/demos/multisample/Multisample.java @@ -45,17 +45,17 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.util.List; -import javax.media.nativewindow.CapabilitiesImmutable; -import javax.media.opengl.DefaultGLCapabilitiesChooser; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLCapabilitiesChooser; -import javax.media.opengl.GLCapabilitiesImmutable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.nativewindow.CapabilitiesImmutable; +import com.jogamp.opengl.DefaultGLCapabilitiesChooser; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLCapabilitiesChooser; +import com.jogamp.opengl.GLCapabilitiesImmutable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.GLCanvas; public class Multisample { private GLCanvas canvas; diff --git a/src/demos/newt/NEWTTest1.java b/src/demos/newt/NEWTTest1.java index e28ec5a..06d9d67 100644 --- a/src/demos/newt/NEWTTest1.java +++ b/src/demos/newt/NEWTTest1.java @@ -1,6 +1,6 @@ package demos.newt; -import javax.media.nativewindow.*; +import com.jogamp.nativewindow.*; import com.jogamp.newt.*; import com.jogamp.newt.event.*; diff --git a/src/demos/newt/TaskManagerTest1.java b/src/demos/newt/TaskManagerTest1.java index 2f9f432..cfba58f 100644 --- a/src/demos/newt/TaskManagerTest1.java +++ b/src/demos/newt/TaskManagerTest1.java @@ -1,6 +1,6 @@ package demos.newt; -import javax.media.nativewindow.*; +import com.jogamp.nativewindow.*; import com.jogamp.newt.*; import com.jogamp.newt.event.*; import demos.newt.util.TaskManager; diff --git a/src/demos/newt/TaskManagerTest2.java b/src/demos/newt/TaskManagerTest2.java index 125a282..5227fb4 100644 --- a/src/demos/newt/TaskManagerTest2.java +++ b/src/demos/newt/TaskManagerTest2.java @@ -1,6 +1,6 @@ package demos.newt; -import javax.media.nativewindow.*; +import com.jogamp.nativewindow.*; import com.jogamp.newt.*; import com.jogamp.newt.event.*; import demos.newt.util.TaskToolWM; diff --git a/src/demos/nurbs/curveapp/CurveApp.java b/src/demos/nurbs/curveapp/CurveApp.java index 5834e88..764f129 100755 --- a/src/demos/nurbs/curveapp/CurveApp.java +++ b/src/demos/nurbs/curveapp/CurveApp.java @@ -9,7 +9,7 @@ import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.awt.GLCanvas; import javax.swing.ButtonGroup; import javax.swing.JButton; import javax.swing.JFrame; diff --git a/src/demos/nurbs/curveapp/GLListener.java b/src/demos/nurbs/curveapp/GLListener.java index 473b4ed..ae8cb26 100755 --- a/src/demos/nurbs/curveapp/GLListener.java +++ b/src/demos/nurbs/curveapp/GLListener.java @@ -1,9 +1,9 @@ package demos.nurbs.curveapp; -import javax.media.opengl.GL; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.glu.*; import com.jogamp.opengl.util.GLUT; @@ -41,7 +41,7 @@ public class GLListener implements GLEventListener { /* (non-Javadoc) - * @see javax.media.opengl.GLEventListener#init(javax.media.opengl.GLAutoDrawable) + * @see com.jogamp.opengl.GLEventListener#init(com.jogamp.opengl.GLAutoDrawable) */ public void init(GLAutoDrawable drawable) { this.gl = drawable.getGL(); @@ -60,7 +60,7 @@ public class GLListener implements GLEventListener { } /* (non-Javadoc) - * @see javax.media.opengl.GLEventListener#display(javax.media.opengl.GLAutoDrawable) + * @see com.jogamp.opengl.GLEventListener#display(com.jogamp.opengl.GLAutoDrawable) */ public void display(GLAutoDrawable drawable) { @@ -128,7 +128,7 @@ public class GLListener implements GLEventListener { } /* (non-Javadoc) - * @see javax.media.opengl.GLEventListener#reshape(javax.media.opengl.GLAutoDrawable, int, int, int, int) + * @see com.jogamp.opengl.GLEventListener#reshape(com.jogamp.opengl.GLAutoDrawable, int, int, int, int) */ public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { @@ -141,7 +141,7 @@ public class GLListener implements GLEventListener { } /* (non-Javadoc) - * @see javax.media.opengl.GLEventListener#displayChanged(javax.media.opengl.GLAutoDrawable, boolean, boolean) + * @see com.jogamp.opengl.GLEventListener#displayChanged(com.jogamp.opengl.GLAutoDrawable, boolean, boolean) */ public void displayChanged(GLAutoDrawable arg0, boolean arg1, boolean arg2) { } diff --git a/src/demos/nurbs/surfaceapp/GLListener.java b/src/demos/nurbs/surfaceapp/GLListener.java index 54e7c9d..d312db4 100755 --- a/src/demos/nurbs/surfaceapp/GLListener.java +++ b/src/demos/nurbs/surfaceapp/GLListener.java @@ -1,13 +1,13 @@ package demos.nurbs.surfaceapp; -import javax.media.opengl.GL; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.glu.*; import com.jogamp.opengl.util.glut.gl2.GLUTgl2; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; /** * Listener reacting to events occuring on OpenGL canvas @@ -111,7 +111,7 @@ public class GLListener implements GLEventListener { } /* (non-Javadoc) - * @see javax.media.opengl.GLEventListener#init(javax.media.opengl.GLAutoDrawable) + * @see com.jogamp.opengl.GLEventListener#init(com.jogamp.opengl.GLAutoDrawable) */ public void init(GLAutoDrawable drawable) { this.gl = drawable.getGL().getGL2(); @@ -136,7 +136,7 @@ public class GLListener implements GLEventListener { } /* (non-Javadoc) - * @see javax.media.opengl.GLEventListener#display(javax.media.opengl.GLAutoDrawable) + * @see com.jogamp.opengl.GLEventListener#display(com.jogamp.opengl.GLAutoDrawable) */ public void display(GLAutoDrawable drawable) { @@ -287,7 +287,7 @@ public class GLListener implements GLEventListener { } /* (non-Javadoc) - * @see javax.media.opengl.GLEventListener#reshape(javax.media.opengl.GLAutoDrawable, int, int, int, int) + * @see com.jogamp.opengl.GLEventListener#reshape(com.jogamp.opengl.GLAutoDrawable, int, int, int, int) */ public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { @@ -301,7 +301,7 @@ public class GLListener implements GLEventListener { } /* (non-Javadoc) - * @see javax.media.opengl.GLEventListener#displayChanged(javax.media.opengl.GLAutoDrawable, boolean, boolean) + * @see com.jogamp.opengl.GLEventListener#displayChanged(com.jogamp.opengl.GLAutoDrawable, boolean, boolean) */ public void displayChanged(GLAutoDrawable arg0, boolean arg1, boolean arg2) { } diff --git a/src/demos/nurbs/surfaceapp/SurfaceApp.java b/src/demos/nurbs/surfaceapp/SurfaceApp.java index 01b2012..25aeeeb 100755 --- a/src/demos/nurbs/surfaceapp/SurfaceApp.java +++ b/src/demos/nurbs/surfaceapp/SurfaceApp.java @@ -31,7 +31,7 @@ import javax.swing.ToolTipManager; import demos.nurbs.icons.*; import demos.nurbs.knotslidercomponent.JKnotSlider; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.awt.GLCanvas; /** * Main class for application demostrating capabilitues of JOGL library extend by NURBS surface functionalities diff --git a/src/demos/nurbs/surfaceapp/SurfaceMouseListener.java b/src/demos/nurbs/surfaceapp/SurfaceMouseListener.java index 834ae46..5e8da06 100755 --- a/src/demos/nurbs/surfaceapp/SurfaceMouseListener.java +++ b/src/demos/nurbs/surfaceapp/SurfaceMouseListener.java @@ -5,8 +5,8 @@ import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; import java.util.Vector; -import javax.media.opengl.GL; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.glu.GLU; /** * Třída zpracovávající události myši (implementuje rozhraní zpracovávající stisk tlačítek i pohyb a tažení myší) diff --git a/src/demos/particles/engine/Engine.java b/src/demos/particles/engine/Engine.java index d443ac2..8d780d3 100755 --- a/src/demos/particles/engine/Engine.java +++ b/src/demos/particles/engine/Engine.java @@ -36,7 +36,7 @@ package demos.particles.engine; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.util.texture.*; import java.net.*; diff --git a/src/demos/particles/engine/GLComponent.java b/src/demos/particles/engine/GLComponent.java index 46a0940..8cc319e 100755 --- a/src/demos/particles/engine/GLComponent.java +++ b/src/demos/particles/engine/GLComponent.java @@ -1,21 +1,21 @@ /* * Copyright (c) 2006 Ben Chappell (bwchappell@gmail.com) All Rights Reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: - * + * * - Redistribution of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistribution in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * The names of Ben Chappell, Sun Microsystems, Inc. or the names of * contributors may not be used to endorse or promote products derived from * this software without specific prior written permission. - * + * * This software is provided "AS IS," without a warranty of any kind. ALL * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A @@ -23,12 +23,12 @@ * SUN MICROSYSTEMS, INC. ("SUN"), AND SUN'S LICENSORS SHALL NOT BE LIABLE FOR * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL BEN - * CHAPPELL, SUN, OR SUN'S LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT + * CHAPPELL, SUN, OR SUN'S LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT * OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF BEN * CHAPPELL OR SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - * + * * You acknowledge that this software is not designed or intended for use * in the design, construction, operation or maintenance of any nuclear * facility. @@ -36,105 +36,108 @@ package demos.particles.engine; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; -import javax.media.opengl.awt.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.fixedfunc.GLLightingFunc; +import com.jogamp.opengl.fixedfunc.GLMatrixFunc; +import com.jogamp.opengl.glu.*; +import com.jogamp.opengl.awt.*; +import com.jogamp.opengl.math.FloatUtil; import com.jogamp.opengl.util.FPSAnimator; public class GLComponent extends GLCanvas implements GLEventListener { - - private GLU glu; + + private final GLU glu; private FPSAnimator animator; - private RGBA background; - private RGBA ambient; + private final RGBA background; + private final RGBA ambient; private Engine engine; - - public GLComponent(int fps, RGBA ambient, RGBA background, Engine engine) { + + public GLComponent(final int fps, final RGBA ambient, final RGBA background, final Engine engine) { super(getCapabilities()); addGLEventListener(this); glu = new GLU(); - + this.background=background; - this.ambient=ambient; + this.ambient=ambient; this.engine=engine; - + animator = new FPSAnimator(this, fps); } - + private static GLCapabilities getCapabilities() { - GLCapabilities caps = new GLCapabilities(null); + final GLCapabilities caps = new GLCapabilities(null); caps.setDoubleBuffered(true); caps.setHardwareAccelerated(true); return caps; } - - public void dispose(GLAutoDrawable drawable) { + + public void dispose(final GLAutoDrawable drawable) { this.engine=null; } - public void display(GLAutoDrawable drawable) { + public void display(final GLAutoDrawable drawable) { final GL2 gl = drawable.getGL().getGL2(); engine.draw(gl); } - - - - public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) { - + + + + public void displayChanged(final GLAutoDrawable drawable, final boolean modeChanged, final boolean deviceChanged) { + } - - public void init(GLAutoDrawable drawable) { - final GL2 gl = drawable.getGL().getGL2(); - gl.glShadeModel(GL2ES1.GL_SMOOTH); + public void init(final GLAutoDrawable drawable) { + final GL2 gl = drawable.getGL().getGL2(); + + gl.glShadeModel(GLLightingFunc.GL_SMOOTH); // Set the background / clear color. gl.glClearColor(background.r, background.g, background.b, background.a); // Clear the depth gl.glClearDepth(1.0); // Disable depth testing. - gl.glDisable(GL.GL_DEPTH_TEST); + gl.glDisable(GL.GL_DEPTH_TEST); // Enable blending and specify blening function. gl.glEnable(GL.GL_BLEND); gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE); - // Get nice perspective calculations. - gl.glHint(GL2.GL_PERSPECTIVE_CORRECTION_HINT, GL2.GL_NICEST); + // Get nice perspective calculations. + gl.glHint(GL2ES1.GL_PERSPECTIVE_CORRECTION_HINT, GL.GL_NICEST); // Nice point smoothing. - gl.glHint(GL2.GL_POINT_SMOOTH_HINT, GL2.GL_NICEST); + gl.glHint(GL2ES1.GL_POINT_SMOOTH_HINT, GL.GL_NICEST); // Enable texture mapping. gl.glEnable(GL.GL_TEXTURE_2D); - + animator.start(); - + engine.init(gl); - - } - - public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { - GL2 gl = drawable.getGL().getGL2(); + + } + + public void reshape(final GLAutoDrawable drawable, final int x, final int y, final int width, final int height) { + final GL2 gl = drawable.getGL().getGL2(); // the size of openGL gl.glViewport(0,0, width, height); - + // perspective view (smaller for further behind) - gl.glMatrixMode(GL2ES1.GL_PROJECTION); + gl.glMatrixMode(GLMatrixFunc.GL_PROJECTION); gl.glLoadIdentity(); - + // perspective - double ratio = (double)width/(double)height; + final double ratio = (double)width/(double)height; // angle, ratio, nearest, farthest - glu.gluPerspective(45.0, ratio, 0.0, 1.0); - + glu.gluPerspective(45.0, ratio, FloatUtil.EPSILON, 1.0); + // draw into the model matrix now - gl.glMatrixMode(GL2ES1.GL_MODELVIEW); + gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW); gl.glLoadIdentity(); } - - public void setFPS(int fps) { + + public void setFPS(final int fps) { animator.stop(); animator = new FPSAnimator(this, fps); animator.start(); } - + public void kill() { animator.stop(); } diff --git a/src/demos/particles/engine/Particle.java b/src/demos/particles/engine/Particle.java index 81fbe25..36e2d7c 100755 --- a/src/demos/particles/engine/Particle.java +++ b/src/demos/particles/engine/Particle.java @@ -38,7 +38,7 @@ package demos.particles.engine; import com.jogamp.opengl.util.texture.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; public class Particle { private XYZ currentPos; diff --git a/src/demos/printext/PrintExt.java b/src/demos/printext/PrintExt.java index d2abe17..7cb07f8 100755 --- a/src/demos/printext/PrintExt.java +++ b/src/demos/printext/PrintExt.java @@ -6,10 +6,10 @@ package demos.printext; import java.awt.Frame; -import javax.media.opengl.GL; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.GLCanvas; diff --git a/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java b/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java index c39dddb..c1627b0 100644 --- a/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java +++ b/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java @@ -49,13 +49,13 @@ import java.awt.event.MouseMotionAdapter; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLException; -import javax.media.opengl.awt.AWTGLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLException; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; import javax.swing.JOptionPane; import com.jogamp.opengl.util.Animator; diff --git a/src/demos/proceduralTexturePhysics/Water.java b/src/demos/proceduralTexturePhysics/Water.java index dfb72de..f75ce15 100644 --- a/src/demos/proceduralTexturePhysics/Water.java +++ b/src/demos/proceduralTexturePhysics/Water.java @@ -41,16 +41,16 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLDrawableFactory; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.GLException; -import javax.media.opengl.GLOffscreenAutoDrawable; -import javax.media.opengl.GLProfile; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLDrawableFactory; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.GLException; +import com.jogamp.opengl.GLOffscreenAutoDrawable; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.glu.GLU; import com.jogamp.common.util.IOUtil; import com.jogamp.opengl.util.texture.Texture; diff --git a/src/demos/readbuffer/Main.java b/src/demos/readbuffer/Main.java index d0ce55b..6b6ad9f 100755 --- a/src/demos/readbuffer/Main.java +++ b/src/demos/readbuffer/Main.java @@ -1,8 +1,8 @@ package demos.readbuffer; import java.lang.reflect.*; -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/readbuffer/ReadBuffer2File.java b/src/demos/readbuffer/ReadBuffer2File.java index 9e0edf9..ff8c3cd 100755 --- a/src/demos/readbuffer/ReadBuffer2File.java +++ b/src/demos/readbuffer/ReadBuffer2File.java @@ -34,14 +34,14 @@ package demos.readbuffer; import java.nio.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.util.texture.TextureData; import com.jogamp.opengl.util.texture.TextureIO; import java.io.File; import java.io.IOException; -import javax.media.nativewindow.*; +import com.jogamp.nativewindow.*; public class ReadBuffer2File extends ReadBufferBase { diff --git a/src/demos/readbuffer/ReadBuffer2Screen.java b/src/demos/readbuffer/ReadBuffer2Screen.java index fd7f5b5..d304599 100755 --- a/src/demos/readbuffer/ReadBuffer2Screen.java +++ b/src/demos/readbuffer/ReadBuffer2Screen.java @@ -34,12 +34,12 @@ package demos.readbuffer; import java.nio.*; -import javax.media.opengl.*; -import javax.media.opengl.fixedfunc.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.fixedfunc.*; import com.jogamp.opengl.util.*; -import javax.media.opengl.fixedfunc.GLPointerFunc; +import com.jogamp.opengl.fixedfunc.GLPointerFunc; import com.jogamp.opengl.util.texture.TextureCoords; import com.jogamp.opengl.util.GLArrayDataClient; import com.jogamp.opengl.util.GLArrayDataServer; diff --git a/src/demos/readbuffer/ReadBufferBase.java b/src/demos/readbuffer/ReadBufferBase.java index d392d1c..139aec2 100755 --- a/src/demos/readbuffer/ReadBufferBase.java +++ b/src/demos/readbuffer/ReadBufferBase.java @@ -33,7 +33,7 @@ package demos.readbuffer; -import javax.media.opengl.*; +import com.jogamp.opengl.*; public class ReadBufferBase implements GLEventListener { @@ -55,13 +55,13 @@ public class ReadBufferBase 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/readbuffer/ReadBufferUtil.java b/src/demos/readbuffer/ReadBufferUtil.java index 6af4ba4..f82a2b2 100755 --- a/src/demos/readbuffer/ReadBufferUtil.java +++ b/src/demos/readbuffer/ReadBufferUtil.java @@ -35,8 +35,8 @@ package demos.readbuffer; import java.nio.Buffer; -import javax.media.opengl.GL; -import javax.media.opengl.GLDrawable; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GLDrawable; import com.jogamp.opengl.util.GLBuffers; import com.jogamp.opengl.util.texture.Texture; diff --git a/src/demos/readbuffer/Surface2File.java b/src/demos/readbuffer/Surface2File.java index 051094c..cb4dfa7 100755 --- a/src/demos/readbuffer/Surface2File.java +++ b/src/demos/readbuffer/Surface2File.java @@ -33,14 +33,14 @@ package demos.readbuffer; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.util.texture.TextureIO; import java.io.File; import java.io.IOException; -import javax.media.nativewindow.*; +import com.jogamp.nativewindow.*; public class Surface2File implements SurfaceUpdatedListener { diff --git a/src/demos/swt/Snippet209.java b/src/demos/swt/Snippet209.java index f75d59d..5afa43d 100644 --- a/src/demos/swt/Snippet209.java +++ b/src/demos/swt/Snippet209.java @@ -27,11 +27,11 @@ import org.eclipse.swt.graphics.*; import org.eclipse.swt.opengl.GLCanvas; import org.eclipse.swt.opengl.GLData; -import javax.media.opengl.GLProfile; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; -import javax.media.opengl.GLDrawableFactory; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; +import com.jogamp.opengl.GLDrawableFactory; +import com.jogamp.opengl.glu.GLU; public class Snippet209 { static void drawTorus(GL2 gl, float r, float R, int nsides, int rings) { diff --git a/src/demos/tennis/Tennis.java b/src/demos/tennis/Tennis.java index 7cbd9a0..a9219c7 100644 --- a/src/demos/tennis/Tennis.java +++ b/src/demos/tennis/Tennis.java @@ -1,18 +1,18 @@ package demos.tennis; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.GLException; -import javax.media.opengl.GLProfile; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.GLException; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.awt.GLCanvas; import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.util.texture.Texture; import com.jogamp.opengl.util.texture.TextureCoords; import com.jogamp.opengl.util.texture.TextureIO; -import javax.media.opengl.GL; -//import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +//import com.jogamp.opengl.glu.GLU; import javax.swing.JOptionPane; //import java.io.BufferedReader; @@ -304,9 +304,9 @@ private final float view_rotz = 0.0f; // Special handling for the case where the GLJPanel is translucent // and wants to be composited with other Java 2D content if (GLProfile.isAWTAvailable() && - (drawable instanceof javax.media.opengl.awt.GLJPanel) && - !((javax.media.opengl.awt.GLJPanel) drawable).isOpaque() && - ((javax.media.opengl.awt.GLJPanel) drawable).shouldPreserveColorBufferIfTranslucent()) { + (drawable instanceof com.jogamp.opengl.awt.GLJPanel) && + !((com.jogamp.opengl.awt.GLJPanel) drawable).isOpaque() && + ((com.jogamp.opengl.awt.GLJPanel) drawable).shouldPreserveColorBufferIfTranslucent()) { gl.glClear(GL2.GL_DEPTH_BUFFER_BIT); } else { gl.glClear(GL2.GL_COLOR_BUFFER_BIT | GL2.GL_DEPTH_BUFFER_BIT); diff --git a/src/demos/tess/Tess.java b/src/demos/tess/Tess.java index 8de045e..ede71d3 100644 --- a/src/demos/tess/Tess.java +++ b/src/demos/tess/Tess.java @@ -45,13 +45,13 @@ package demos.tess; import java.awt.Frame; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.DebugGL2; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; -import javax.media.opengl.glu.GLUtessellator; +import com.jogamp.opengl.DebugGL2; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; +import com.jogamp.opengl.glu.GLUtessellator; /** * tess.java @@ -200,7 +200,7 @@ public class Tess { }//end TessRenderer - public static class TessCallback extends javax.media.opengl.glu.GLUtessellatorCallbackAdapter { + public static class TessCallback extends com.jogamp.opengl.glu.GLUtessellatorCallbackAdapter { GL2 gl; GLU glu; diff --git a/src/demos/testContextDestruction/TestContextDestruction.java b/src/demos/testContextDestruction/TestContextDestruction.java index 4d5c2ff..39c7a70 100755 --- a/src/demos/testContextDestruction/TestContextDestruction.java +++ b/src/demos/testContextDestruction/TestContextDestruction.java @@ -51,11 +51,11 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; -import javax.media.opengl.DebugGL2; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.DebugGL2; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.GLCanvas; import javax.swing.JButton; import javax.swing.JFrame; diff --git a/src/demos/testContextSharing/TestContextSharing.java b/src/demos/testContextSharing/TestContextSharing.java index 55df5e7..bf586b5 100644 --- a/src/demos/testContextSharing/TestContextSharing.java +++ b/src/demos/testContextSharing/TestContextSharing.java @@ -42,11 +42,11 @@ package demos.testContextSharing; import java.awt.BorderLayout; import java.awt.Frame; -import javax.media.opengl.DebugGL2; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.DebugGL2; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.GLCanvas; /** A simple demonstration of sharing of display lists between drawables. */ diff --git a/src/demos/texture/TestSubImage.java b/src/demos/texture/TestSubImage.java index 137b536..c42339a 100755 --- a/src/demos/texture/TestSubImage.java +++ b/src/demos/texture/TestSubImage.java @@ -60,13 +60,13 @@ import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; import javax.swing.JCheckBoxMenuItem; import javax.swing.JFrame; import javax.swing.JMenu; diff --git a/src/demos/texture/TestTexture.java b/src/demos/texture/TestTexture.java index f53327a..1edafa5 100755 --- a/src/demos/texture/TestTexture.java +++ b/src/demos/texture/TestTexture.java @@ -50,14 +50,14 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.PrintStream; -import javax.media.opengl.DebugGL2; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.DebugGL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; import javax.swing.JFileChooser; import javax.swing.JFrame; import javax.swing.JMenu; diff --git a/src/demos/texture/TextureConvert.java b/src/demos/texture/TextureConvert.java index a507bce..547c6c7 100755 --- a/src/demos/texture/TextureConvert.java +++ b/src/demos/texture/TextureConvert.java @@ -42,11 +42,11 @@ package demos.texture; import java.io.File; import java.io.IOException; -import javax.media.opengl.GL; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLDrawableFactory; -import javax.media.opengl.GLOffscreenAutoDrawable; -import javax.media.opengl.GLProfile; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLDrawableFactory; +import com.jogamp.opengl.GLOffscreenAutoDrawable; +import com.jogamp.opengl.GLProfile; import com.jogamp.common.util.IOUtil; import com.jogamp.opengl.util.texture.Texture; diff --git a/src/demos/util/Bunny.java b/src/demos/util/Bunny.java index c4afd0c..357e02e 100644 --- a/src/demos/util/Bunny.java +++ b/src/demos/util/Bunny.java @@ -41,7 +41,7 @@ package demos.util; import java.io.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** Renders a bunny. diff --git a/src/demos/util/Cubemap.java b/src/demos/util/Cubemap.java index abca371..b635228 100755 --- a/src/demos/util/Cubemap.java +++ b/src/demos/util/Cubemap.java @@ -44,9 +44,9 @@ import com.jogamp.opengl.util.texture.Texture; import com.jogamp.opengl.util.texture.TextureData; import com.jogamp.opengl.util.texture.TextureIO; import java.io.IOException; -import javax.media.opengl.GL; -import javax.media.opengl.GLException; -import javax.media.opengl.GLContext; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GLException; +import com.jogamp.opengl.GLContext; diff --git a/src/demos/util/FPSCounter.java b/src/demos/util/FPSCounter.java index b0721d2..988bc0a 100755 --- a/src/demos/util/FPSCounter.java +++ b/src/demos/util/FPSCounter.java @@ -43,8 +43,8 @@ import java.awt.Font; import java.awt.geom.Rectangle2D; import java.text.DecimalFormat; -import javax.media.opengl.GLDrawable; -import javax.media.opengl.GLException; +import com.jogamp.opengl.GLDrawable; +import com.jogamp.opengl.GLException; import com.jogamp.opengl.util.awt.TextRenderer; import com.jogamp.opengl.util.texture.Texture; diff --git a/src/demos/util/Triceratops.java b/src/demos/util/Triceratops.java index ca0221d..77884c6 100644 --- a/src/demos/util/Triceratops.java +++ b/src/demos/util/Triceratops.java @@ -44,9 +44,9 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; import java.io.StreamTokenizer; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; diff --git a/src/demos/vertexArrayRange/VertexArrayRange.java b/src/demos/vertexArrayRange/VertexArrayRange.java index b9ee76e..37268af 100644 --- a/src/demos/vertexArrayRange/VertexArrayRange.java +++ b/src/demos/vertexArrayRange/VertexArrayRange.java @@ -45,12 +45,12 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.FloatBuffer; import java.nio.IntBuffer; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; import com.jogamp.opengl.util.Animator; import javax.swing.JOptionPane; diff --git a/src/demos/vertexBufferObject/VertexBufferObject.java b/src/demos/vertexBufferObject/VertexBufferObject.java index 6f057dd..8b6e803 100644 --- a/src/demos/vertexBufferObject/VertexBufferObject.java +++ b/src/demos/vertexBufferObject/VertexBufferObject.java @@ -49,15 +49,15 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; import java.util.Arrays; -import javax.media.opengl.GLProfile; -import javax.media.opengl.GL; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.awt.AWTGLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; import com.jogamp.opengl.util.Animator; import javax.swing.JOptionPane; diff --git a/src/demos/vertexProgRefract/VertexProgRefract.java b/src/demos/vertexProgRefract/VertexProgRefract.java index 9b4b358..6e75a69 100644 --- a/src/demos/vertexProgRefract/VertexProgRefract.java +++ b/src/demos/vertexProgRefract/VertexProgRefract.java @@ -54,8 +54,8 @@ import java.awt.event.KeyEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.IOException; -import javax.media.opengl.*; -import javax.media.opengl.awt.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.*; import com.jogamp.opengl.util.Animator; import javax.swing.JOptionPane; diff --git a/src/demos/vertexProgWarp/VertexProgWarp.java b/src/demos/vertexProgWarp/VertexProgWarp.java index 8d45095..7dae55b 100644 --- a/src/demos/vertexProgWarp/VertexProgWarp.java +++ b/src/demos/vertexProgWarp/VertexProgWarp.java @@ -51,14 +51,14 @@ import java.awt.event.KeyEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.IOException; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.awt.AWTGLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; -import javax.media.opengl.glu.GLUquadric; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; +import com.jogamp.opengl.glu.GLUquadric; import com.jogamp.opengl.util.Animator; import javax.swing.JOptionPane; diff --git a/src/demos/xtrans/XTBasicTransition.java b/src/demos/xtrans/XTBasicTransition.java index 0239b26..59ad7ad 100755 --- a/src/demos/xtrans/XTBasicTransition.java +++ b/src/demos/xtrans/XTBasicTransition.java @@ -40,9 +40,9 @@ package demos.xtrans; import gleem.linalg.Vec3f; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; /** A basic transition supporting animated translation, rotation about diff --git a/src/demos/xtrans/XTDesktopManager.java b/src/demos/xtrans/XTDesktopManager.java index 8374a5f..c203be1 100755 --- a/src/demos/xtrans/XTDesktopManager.java +++ b/src/demos/xtrans/XTDesktopManager.java @@ -45,13 +45,13 @@ import java.awt.Graphics; import java.awt.Image; import java.awt.Rectangle; import java.awt.geom.Rectangle2D; -import javax.media.opengl.DebugGL2; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; -import javax.media.opengl.GLDrawableFactory; -import javax.media.opengl.GLProfile; +import com.jogamp.opengl.DebugGL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; +import com.jogamp.opengl.GLDrawableFactory; +import com.jogamp.opengl.GLProfile; import javax.swing.JDesktopPane; diff --git a/src/demos/xtrans/XTDesktopPane.java b/src/demos/xtrans/XTDesktopPane.java index 789600e..c94a414 100755 --- a/src/demos/xtrans/XTDesktopPane.java +++ b/src/demos/xtrans/XTDesktopPane.java @@ -47,14 +47,14 @@ import java.awt.Rectangle; import java.awt.geom.Rectangle2D; import java.util.ArrayList; import java.util.Iterator; -import javax.media.opengl.DebugGL2; -import javax.media.opengl.GL; -import javax.media.opengl.GLProfile; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLContext; -import javax.media.opengl.GLDrawableFactory; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.DebugGL2; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GLProfile; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLContext; +import com.jogamp.opengl.GLDrawableFactory; +import com.jogamp.opengl.glu.GLU; diff --git a/src/demos/xtrans/XTTransition.java b/src/demos/xtrans/XTTransition.java index 1f683ac..2459f2d 100755 --- a/src/demos/xtrans/XTTransition.java +++ b/src/demos/xtrans/XTTransition.java @@ -39,7 +39,7 @@ package demos.xtrans; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** Specifies the interface by which a transition is updated and drawn * by the XTDesktopPane. diff --git a/src/gleem/ExaminerViewer.java b/src/gleem/ExaminerViewer.java index e88ecf7..460607e 100644 --- a/src/gleem/ExaminerViewer.java +++ b/src/gleem/ExaminerViewer.java @@ -48,11 +48,11 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; -import javax.media.opengl.GL2; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; /**

This is an application-level class, not part of the manipulator hierarchy. It is an example of how you might integrate diff --git a/src/gleem/HandleBoxManip.java b/src/gleem/HandleBoxManip.java index a0e55d7..e1387a8 100644 --- a/src/gleem/HandleBoxManip.java +++ b/src/gleem/HandleBoxManip.java @@ -42,7 +42,7 @@ package gleem; import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** Patterned after Inventor's HandleBoxManip (by Paul Isaacs and David Mott) and TransformerManip (by Paul Isaacs). Center box diff --git a/src/gleem/Manip.java b/src/gleem/Manip.java index d498534..5c13841 100644 --- a/src/gleem/Manip.java +++ b/src/gleem/Manip.java @@ -42,7 +42,7 @@ package gleem; import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** The base class for all manipulators. Fundamentally a manipulator must support a ray cast operation with itself and logic to diff --git a/src/gleem/ManipManager.java b/src/gleem/ManipManager.java index 2fabd1e..bc4c68d 100644 --- a/src/gleem/ManipManager.java +++ b/src/gleem/ManipManager.java @@ -44,8 +44,8 @@ import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.*; /** The ManipManager handles making manipulators visible in a window. */ diff --git a/src/gleem/ManipPart.java b/src/gleem/ManipPart.java index 936f755..5931964 100644 --- a/src/gleem/ManipPart.java +++ b/src/gleem/ManipPart.java @@ -42,7 +42,7 @@ package gleem; import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** A ManipPart is a visible or invisible sub-part of a manipulator. ManipParts are organized into trees. */ diff --git a/src/gleem/ManipPartGroup.java b/src/gleem/ManipPartGroup.java index 5cf8f71..3681b1d 100644 --- a/src/gleem/ManipPartGroup.java +++ b/src/gleem/ManipPartGroup.java @@ -42,7 +42,7 @@ package gleem; import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** This class groups a set of ManipParts. Makes a set of ManipParts look like one. */ diff --git a/src/gleem/ManipPartLineSeg.java b/src/gleem/ManipPartLineSeg.java index e243c62..f0cca34 100644 --- a/src/gleem/ManipPartLineSeg.java +++ b/src/gleem/ManipPartLineSeg.java @@ -42,7 +42,7 @@ package gleem; import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** A line segment from (-1, 0, 0) to (1, 0, 0). */ diff --git a/src/gleem/ManipPartTriBased.java b/src/gleem/ManipPartTriBased.java index 195f613..ec88319 100644 --- a/src/gleem/ManipPartTriBased.java +++ b/src/gleem/ManipPartTriBased.java @@ -42,7 +42,7 @@ package gleem; import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** Triangle-based manipulator part. This is the base class for most of the ManipParts that GLEEM uses internally. You can feel free to diff --git a/src/gleem/TestExaminerViewer.java b/src/gleem/TestExaminerViewer.java index 03042ed..673b907 100644 --- a/src/gleem/TestExaminerViewer.java +++ b/src/gleem/TestExaminerViewer.java @@ -44,14 +44,14 @@ import java.awt.BorderLayout; import java.awt.Frame; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.AWTGLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; diff --git a/src/gleem/TestHandleBox.java b/src/gleem/TestHandleBox.java index 13d0e74..554db68 100644 --- a/src/gleem/TestHandleBox.java +++ b/src/gleem/TestHandleBox.java @@ -44,14 +44,14 @@ import java.awt.BorderLayout; import java.awt.Frame; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.AWTGLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; /** Tests the HandleBox Manip. */ diff --git a/src/gleem/TestMultiWin.java b/src/gleem/TestMultiWin.java index 39fee6b..de9a7da 100644 --- a/src/gleem/TestMultiWin.java +++ b/src/gleem/TestMultiWin.java @@ -45,14 +45,14 @@ import java.awt.Frame; import java.awt.Point; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.AWTGLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; diff --git a/src/gleem/TestTranslate1.java b/src/gleem/TestTranslate1.java index fae4366..6bcf452 100644 --- a/src/gleem/TestTranslate1.java +++ b/src/gleem/TestTranslate1.java @@ -44,14 +44,14 @@ import java.awt.BorderLayout; import java.awt.Frame; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.AWTGLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; diff --git a/src/gleem/TestTranslate2.java b/src/gleem/TestTranslate2.java index ea1ae0e..402cbb1 100644 --- a/src/gleem/TestTranslate2.java +++ b/src/gleem/TestTranslate2.java @@ -44,14 +44,14 @@ import java.awt.BorderLayout; import java.awt.Frame; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.media.opengl.GL; -import javax.media.opengl.GL2ES1; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.AWTGLAutoDrawable; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2ES1; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; diff --git a/src/gleem/Translate1Manip.java b/src/gleem/Translate1Manip.java index 15af612..70db475 100644 --- a/src/gleem/Translate1Manip.java +++ b/src/gleem/Translate1Manip.java @@ -42,7 +42,7 @@ package gleem; import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** A Translate1Manip is a Manip which translates in only one dimension and whose default representation is a two-way arrow. */ diff --git a/src/gleem/Translate2Manip.java b/src/gleem/Translate2Manip.java index fc2011c..d5ce14a 100644 --- a/src/gleem/Translate2Manip.java +++ b/src/gleem/Translate2Manip.java @@ -42,7 +42,7 @@ package gleem; import java.util.*; import gleem.linalg.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** A Translate2Manip is a Manip which translates in two dimensions and whose default representation is two arrows. */ diff --git a/src/gleem/WindowUpdateListener.java b/src/gleem/WindowUpdateListener.java index 8eff015..a9cba9e 100644 --- a/src/gleem/WindowUpdateListener.java +++ b/src/gleem/WindowUpdateListener.java @@ -39,7 +39,7 @@ package gleem; -import javax.media.opengl.awt.AWTGLAutoDrawable; +import com.jogamp.opengl.awt.AWTGLAutoDrawable; /** A WindowUpdateListener is used by the ManipManager to transmit diff --git a/src/jbullet/src/javabullet/demos/genericjoint/GenericJointDemo.java b/src/jbullet/src/javabullet/demos/genericjoint/GenericJointDemo.java index bf786c1..3e068f7 100644 --- a/src/jbullet/src/javabullet/demos/genericjoint/GenericJointDemo.java +++ b/src/jbullet/src/javabullet/demos/genericjoint/GenericJointDemo.java @@ -42,7 +42,7 @@ import javabullet.dynamics.constraintsolver.ConstraintSolver; import javabullet.dynamics.constraintsolver.SequentialImpulseConstraintSolver; import javabullet.linearmath.Transform; import javax.vecmath.Vector3f; -import javax.media.opengl.*; +import com.jogamp.opengl.*; /** * diff --git a/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java b/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java index ff1a417..29902f2 100644 --- a/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java +++ b/src/jbullet/src/javabullet/demos/opengl/DemoApplication.java @@ -44,8 +44,8 @@ import javax.vecmath.Color3f; import javax.vecmath.Matrix3f; import javax.vecmath.Quat4f; import javax.vecmath.Vector3f; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.glu.*; import java.nio.*; import com.jogamp.newt.*; diff --git a/src/jbullet/src/javabullet/demos/opengl/FontRender.java-nope b/src/jbullet/src/javabullet/demos/opengl/FontRender.java-nope index 33468c6..749a57d 100644 --- a/src/jbullet/src/javabullet/demos/opengl/FontRender.java-nope +++ b/src/jbullet/src/javabullet/demos/opengl/FontRender.java-nope @@ -32,8 +32,8 @@ import java.io.*; import java.nio.*; import java.util.Hashtable; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.glu.*; import com.sun.opengl.util.*; /** diff --git a/src/jbullet/src/javabullet/demos/opengl/GLSRT.java b/src/jbullet/src/javabullet/demos/opengl/GLSRT.java index a147202..125dcc6 100644 --- a/src/jbullet/src/javabullet/demos/opengl/GLSRT.java +++ b/src/jbullet/src/javabullet/demos/opengl/GLSRT.java @@ -30,10 +30,10 @@ import java.nio.ByteBuffer; import java.util.HashMap; import java.util.Map; // import javabullet.demos.opengl.FontRender.GLFont; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; -import javax.media.opengl.util.ImmModeSink; -import javax.media.opengl.util.BufferUtil; +import com.jogamp.opengl.*; +import com.jogamp.opengl.glu.*; +import com.jogamp.opengl.util.ImmModeSink; +import com.jogamp.opengl.util.BufferUtil; /** * diff --git a/src/jbullet/src/javabullet/demos/opengl/GLShapeDrawer.java b/src/jbullet/src/javabullet/demos/opengl/GLShapeDrawer.java index 76fb9b1..89fbd2f 100644 --- a/src/jbullet/src/javabullet/demos/opengl/GLShapeDrawer.java +++ b/src/jbullet/src/javabullet/demos/opengl/GLShapeDrawer.java @@ -39,8 +39,8 @@ import javabullet.linearmath.DebugDrawModes; import javabullet.linearmath.Transform; import javabullet.linearmath.VectorUtil; import javax.vecmath.Vector3f; -import javax.media.opengl.*; -import javax.media.opengl.util.ImmModeSink; +import com.jogamp.opengl.*; +import com.jogamp.opengl.util.ImmModeSink; /** * diff --git a/src/jbullet/src/javabullet/demos/opengl/JOGL.java b/src/jbullet/src/javabullet/demos/opengl/JOGL.java index 483c652..7aa8840 100644 --- a/src/jbullet/src/javabullet/demos/opengl/JOGL.java +++ b/src/jbullet/src/javabullet/demos/opengl/JOGL.java @@ -25,10 +25,10 @@ package javabullet.demos.opengl; import com.jogamp.newt.*; import com.jogamp.newt.event.*; -import javax.media.nativewindow.*; -import javax.media.opengl.*; -import javax.media.opengl.glu.*; -import javax.media.opengl.util.*; +import com.jogamp.nativewindow.*; +import com.jogamp.opengl.*; +import com.jogamp.opengl.glu.*; +import com.jogamp.opengl.util.*; import java.nio.*; /** diff --git a/src/jbullet/src/javabullet/demos/vehicle/VehicleDemo.java-nope b/src/jbullet/src/javabullet/demos/vehicle/VehicleDemo.java-nope index 7c9efbd..c3f6380 100644 --- a/src/jbullet/src/javabullet/demos/vehicle/VehicleDemo.java-nope +++ b/src/jbullet/src/javabullet/demos/vehicle/VehicleDemo.java-nope @@ -52,7 +52,7 @@ import javabullet.dynamics.vehicle.VehicleTuning; import javabullet.dynamics.vehicle.WheelInfo; import javabullet.linearmath.Transform; import javax.vecmath.Vector3f; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.event.*; /** diff --git a/src/redbook/src/glredbook10/GLSkeleton.java b/src/redbook/src/glredbook10/GLSkeleton.java index 6b147fa..39d93ae 100644 --- a/src/redbook/src/glredbook10/GLSkeleton.java +++ b/src/redbook/src/glredbook10/GLSkeleton.java @@ -2,7 +2,7 @@ package glredbook10; import com.jogamp.opengl.util.FPSAnimator; -import javax.media.opengl.*; +import com.jogamp.opengl.*; public abstract class GLSkeleton { diff --git a/src/redbook/src/glredbook10/README.txt b/src/redbook/src/glredbook10/README.txt index d3c409e..bdec6ff 100644 --- a/src/redbook/src/glredbook10/README.txt +++ b/src/redbook/src/glredbook10/README.txt @@ -15,7 +15,7 @@ and the system dependent jogl-natives-*.jar has an internal copy. - All examples extends from glskeleton.java -Note: Color Index examples are not support in javax.media.opengl (jogl), +Note: Color Index examples are not support in com.jogamp.opengl (jogl), so they are not ported. NURBS are also not ported for the same reason. LIST: - antiindex.c diff --git a/src/redbook/src/glredbook10/accanti.java b/src/redbook/src/glredbook10/accanti.java index 5aeeb70..3988df8 100644 --- a/src/redbook/src/glredbook10/accanti.java +++ b/src/redbook/src/glredbook10/accanti.java @@ -4,8 +4,8 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * Use the accumulation buffer to do full-scene antialiasing on a scene with diff --git a/src/redbook/src/glredbook10/accnot.java b/src/redbook/src/glredbook10/accnot.java index 8403bc7..65f7d06 100644 --- a/src/redbook/src/glredbook10/accnot.java +++ b/src/redbook/src/glredbook10/accnot.java @@ -4,7 +4,7 @@ import java.awt.event.*; import javax.swing.*; import com.jogamp.opengl.util.gl2.GLUT; -import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel; /** * @author Kiet Le (Java port) Ported to JOGL 2.x by Claudio Eduardo Goes diff --git a/src/redbook/src/glredbook10/accpersp.java b/src/redbook/src/glredbook10/accpersp.java index 4d8bfbe..d7c89c3 100644 --- a/src/redbook/src/glredbook10/accpersp.java +++ b/src/redbook/src/glredbook10/accpersp.java @@ -5,8 +5,8 @@ import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * Use the accumulation buffer to do full-scene antialiasing on a scene with diff --git a/src/redbook/src/glredbook10/accum.java b/src/redbook/src/glredbook10/accum.java index bbd040d..06d1071 100644 --- a/src/redbook/src/glredbook10/accum.java +++ b/src/redbook/src/glredbook10/accum.java @@ -6,8 +6,8 @@ import java.awt.event.KeyListener; import javax.swing.JFrame; import com.jogamp.opengl.util.gl2.GLUT; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * Do a sixteen pass diff --git a/src/redbook/src/glredbook10/aim.java b/src/redbook/src/glredbook10/aim.java index 2f6a009..ada98fd 100644 --- a/src/redbook/src/glredbook10/aim.java +++ b/src/redbook/src/glredbook10/aim.java @@ -4,9 +4,9 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program calculates the fovy (field of view angle in the y direction), by diff --git a/src/redbook/src/glredbook10/alpha.java b/src/redbook/src/glredbook10/alpha.java index 6385c11..93e007d 100644 --- a/src/redbook/src/glredbook10/alpha.java +++ b/src/redbook/src/glredbook10/alpha.java @@ -4,9 +4,9 @@ import javax.swing.*; import java.awt.event.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLCanvas; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLCanvas; +import com.jogamp.opengl.glu.GLU; /** diff --git a/src/redbook/src/glredbook10/alpha3D.java b/src/redbook/src/glredbook10/alpha3D.java index 06a592d..ebc5a69 100644 --- a/src/redbook/src/glredbook10/alpha3D.java +++ b/src/redbook/src/glredbook10/alpha3D.java @@ -5,8 +5,8 @@ import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** diff --git a/src/redbook/src/glredbook10/anti.java b/src/redbook/src/glredbook10/anti.java index a207fb6..2aae928 100644 --- a/src/redbook/src/glredbook10/anti.java +++ b/src/redbook/src/glredbook10/anti.java @@ -4,9 +4,9 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program draws antialiased lines in RGBA mode. diff --git a/src/redbook/src/glredbook10/antipoint.java b/src/redbook/src/glredbook10/antipoint.java index b53b608..67446cb 100644 --- a/src/redbook/src/glredbook10/antipoint.java +++ b/src/redbook/src/glredbook10/antipoint.java @@ -3,8 +3,8 @@ package glredbook10; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * The program draws antialiased points, in RGBA mode. diff --git a/src/redbook/src/glredbook10/antipoly.java b/src/redbook/src/glredbook10/antipoly.java index f69c24d..60c349f 100644 --- a/src/redbook/src/glredbook10/antipoly.java +++ b/src/redbook/src/glredbook10/antipoly.java @@ -5,9 +5,9 @@ import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program draws filled polygons with antialiased edges. The special diff --git a/src/redbook/src/glredbook10/bezcurve.java b/src/redbook/src/glredbook10/bezcurve.java index 7e9e67e..dfa00b1 100644 --- a/src/redbook/src/glredbook10/bezcurve.java +++ b/src/redbook/src/glredbook10/bezcurve.java @@ -4,12 +4,12 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.nio.FloatBuffer; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import com.jogamp.opengl.util.GLBuffers; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.awt.GLJPanel; /** * This program uses evaluators to draw a Bezier curve. diff --git a/src/redbook/src/glredbook10/bezmesh.java b/src/redbook/src/glredbook10/bezmesh.java index dea45c6..f750a7a 100644 --- a/src/redbook/src/glredbook10/bezmesh.java +++ b/src/redbook/src/glredbook10/bezmesh.java @@ -5,9 +5,9 @@ import javax.swing.*; import java.nio.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.common.nio.Buffers; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.awt.GLJPanel; /** * This program renders a wireframe (mesh) Bezier surface, using two-dimensional diff --git a/src/redbook/src/glredbook10/bezsurf.java b/src/redbook/src/glredbook10/bezsurf.java index 57fc12b..d47deab 100644 --- a/src/redbook/src/glredbook10/bezsurf.java +++ b/src/redbook/src/glredbook10/bezsurf.java @@ -5,9 +5,9 @@ import javax.swing.*; import java.nio.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.common.nio.Buffers; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.awt.GLJPanel; /** * This program renders a wireframe (mesh) Bezier surface, using two-dimensional diff --git a/src/redbook/src/glredbook10/checker.java b/src/redbook/src/glredbook10/checker.java index 5da7024..24a5370 100644 --- a/src/redbook/src/glredbook10/checker.java +++ b/src/redbook/src/glredbook10/checker.java @@ -5,10 +5,10 @@ import javax.swing.*; import java.nio.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.util.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program texture maps a checkerboard image onto two rectangles. This diff --git a/src/redbook/src/glredbook10/checker2.java b/src/redbook/src/glredbook10/checker2.java index 20a3dd5..9803186 100644 --- a/src/redbook/src/glredbook10/checker2.java +++ b/src/redbook/src/glredbook10/checker2.java @@ -5,10 +5,10 @@ import javax.swing.*; import java.nio.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.util.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program texture maps a checkerboard image onto two rectangles. This diff --git a/src/redbook/src/glredbook10/chess.java b/src/redbook/src/glredbook10/chess.java index beb9f7a..4f776fb 100644 --- a/src/redbook/src/glredbook10/chess.java +++ b/src/redbook/src/glredbook10/chess.java @@ -5,10 +5,10 @@ import javax.swing.*; import java.nio.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.util.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program texture maps a checkerboard image onto two rectangles. The diff --git a/src/redbook/src/glredbook10/clip.java b/src/redbook/src/glredbook10/clip.java index 6506311..82eda1b 100644 --- a/src/redbook/src/glredbook10/clip.java +++ b/src/redbook/src/glredbook10/clip.java @@ -4,9 +4,9 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program demonstrates arbitrary clipping planes. diff --git a/src/redbook/src/glredbook10/colormat.java b/src/redbook/src/glredbook10/colormat.java index 99f8117..520ae10 100644 --- a/src/redbook/src/glredbook10/colormat.java +++ b/src/redbook/src/glredbook10/colormat.java @@ -5,9 +5,9 @@ import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.awt.GLJPanel; /** * After initialization, the program will be in ColorMaterial mode. Pressing the diff --git a/src/redbook/src/glredbook10/cone.java b/src/redbook/src/glredbook10/cone.java index e5e9bfd..3c7fb45 100644 --- a/src/redbook/src/glredbook10/cone.java +++ b/src/redbook/src/glredbook10/cone.java @@ -4,7 +4,7 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*;import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*;import com.jogamp.opengl.awt.GLJPanel; /** * This program demonstrates the use of the GL lighting model. A sphere is drawn diff --git a/src/redbook/src/glredbook10/cube.java b/src/redbook/src/glredbook10/cube.java index f72afa2..1b0221f 100644 --- a/src/redbook/src/glredbook10/cube.java +++ b/src/redbook/src/glredbook10/cube.java @@ -3,12 +3,12 @@ package glredbook10; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import com.jogamp.opengl.util.gl2.GLUT; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program demonstrates a single modeling transformation, glScalef() and a diff --git a/src/redbook/src/glredbook10/depthcue.java b/src/redbook/src/glredbook10/depthcue.java index b25759a..5ee0584 100644 --- a/src/redbook/src/glredbook10/depthcue.java +++ b/src/redbook/src/glredbook10/depthcue.java @@ -5,9 +5,9 @@ import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program draws a wireframe model, which uses intensity (brightness) to * give clues to distance. Fog is used to achieve this effect. diff --git a/src/redbook/src/glredbook10/disk.java b/src/redbook/src/glredbook10/disk.java index f20264d..b2cbe39 100644 --- a/src/redbook/src/glredbook10/disk.java +++ b/src/redbook/src/glredbook10/disk.java @@ -4,10 +4,10 @@ import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; -import javax.media.opengl.glu.GLUquadric; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; +import com.jogamp.opengl.glu.GLUquadric; /** * This program demonstrates the use of the quadrics Utility Library routines to diff --git a/src/redbook/src/glredbook10/dof.java b/src/redbook/src/glredbook10/dof.java index 1f42f8d..f7a432f 100644 --- a/src/redbook/src/glredbook10/dof.java +++ b/src/redbook/src/glredbook10/dof.java @@ -4,8 +4,8 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * This program demonstrates use of the accumulation buffer to create an diff --git a/src/redbook/src/glredbook10/dofnot.java b/src/redbook/src/glredbook10/dofnot.java index 701bd62..bbb8f38 100644 --- a/src/redbook/src/glredbook10/dofnot.java +++ b/src/redbook/src/glredbook10/dofnot.java @@ -4,9 +4,9 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program demonstrates the same scene as dof.c, but without use of the diff --git a/src/redbook/src/glredbook10/doublebuf.java b/src/redbook/src/glredbook10/doublebuf.java index af353d3..1e751dc 100644 --- a/src/redbook/src/glredbook10/doublebuf.java +++ b/src/redbook/src/glredbook10/doublebuf.java @@ -5,8 +5,8 @@ import java.awt.event.*; import com.jogamp.opengl.util.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * This is a simple double buffered program. Pressing the left mouse button diff --git a/src/redbook/src/glredbook10/drawf.java b/src/redbook/src/glredbook10/drawf.java index ee953c0..4a7ec92 100644 --- a/src/redbook/src/glredbook10/drawf.java +++ b/src/redbook/src/glredbook10/drawf.java @@ -3,8 +3,8 @@ package glredbook10; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * Draws the bitmapped letter F on the screen (several times). This demonstrates diff --git a/src/redbook/src/glredbook10/feedback.java b/src/redbook/src/glredbook10/feedback.java index b824a55..5fb737e 100644 --- a/src/redbook/src/glredbook10/feedback.java +++ b/src/redbook/src/glredbook10/feedback.java @@ -5,9 +5,9 @@ import java.awt.event.*; import java.nio.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.util.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.awt.GLJPanel; /** * This program demonstrates use of OpenGL feedback. First, a lighting diff --git a/src/redbook/src/glredbook10/fog.java b/src/redbook/src/glredbook10/fog.java index 636aae1..5eabfc7 100644 --- a/src/redbook/src/glredbook10/fog.java +++ b/src/redbook/src/glredbook10/fog.java @@ -4,8 +4,8 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * This program draws 5 red teapots, each at a different z distance from the diff --git a/src/redbook/src/glredbook10/font.java b/src/redbook/src/glredbook10/font.java index accc262..062d2d4 100644 --- a/src/redbook/src/glredbook10/font.java +++ b/src/redbook/src/glredbook10/font.java @@ -5,9 +5,9 @@ import javax.swing.*; import java.nio.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.util.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.awt.GLJPanel; /** * Draws some text in a bitmapped font. Uses glBitmap() and other pixel diff --git a/src/redbook/src/glredbook10/jfont.java b/src/redbook/src/glredbook10/jfont.java index 11524ec..b848d52 100644 --- a/src/redbook/src/glredbook10/jfont.java +++ b/src/redbook/src/glredbook10/jfont.java @@ -16,12 +16,12 @@ import java.awt.event.KeyListener; import java.awt.font.GlyphVector; import java.awt.geom.PathIterator; -import javax.media.opengl.GL; -import javax.media.opengl.GL2; -import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLCapabilities; -import javax.media.opengl.GLEventListener; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.GL; +import com.jogamp.opengl.GL2; +import com.jogamp.opengl.GLAutoDrawable; +import com.jogamp.opengl.GLCapabilities; +import com.jogamp.opengl.GLEventListener; +import com.jogamp.opengl.awt.GLJPanel; import javax.swing.JFrame; public class jfont // @@ -85,7 +85,7 @@ public class jfont // gl.glTranslatef(-20, -20, 0); gl.glScalef(0.75f, 1, 0); gl.glColor3f(1, 0, 0); - drawString(gl, "javax.media.opengl", false); + drawString(gl, "com.jogamp.opengl", false); gl.glTranslatef(20, 40, 0); drawString(gl, "OpenGL Everywhere", false); diff --git a/src/redbook/src/glredbook10/light.java b/src/redbook/src/glredbook10/light.java index afd3579..3383e9e 100644 --- a/src/redbook/src/glredbook10/light.java +++ b/src/redbook/src/glredbook10/light.java @@ -4,8 +4,8 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * This program demonstrates the use of the OpenGL lighting model. A sphere diff --git a/src/redbook/src/glredbook10/linelist.java b/src/redbook/src/glredbook10/linelist.java index 02f033e..a0aaf77 100644 --- a/src/redbook/src/glredbook10/linelist.java +++ b/src/redbook/src/glredbook10/linelist.java @@ -3,8 +3,8 @@ package glredbook10; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * This program demonstrates using display lists to call different line diff --git a/src/redbook/src/glredbook10/lines.java b/src/redbook/src/glredbook10/lines.java index ecba228..48563bc 100644 --- a/src/redbook/src/glredbook10/lines.java +++ b/src/redbook/src/glredbook10/lines.java @@ -3,9 +3,9 @@ package glredbook10; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program demonstrates geometric primitives and their attributes. diff --git a/src/redbook/src/glredbook10/list.java b/src/redbook/src/glredbook10/list.java index f91b8ec..32d554c 100644 --- a/src/redbook/src/glredbook10/list.java +++ b/src/redbook/src/glredbook10/list.java @@ -2,8 +2,8 @@ package glredbook10; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** diff --git a/src/redbook/src/glredbook10/list2.java b/src/redbook/src/glredbook10/list2.java index 4203f95..8e2d701 100644 --- a/src/redbook/src/glredbook10/list2.java +++ b/src/redbook/src/glredbook10/list2.java @@ -3,8 +3,8 @@ package glredbook10; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** diff --git a/src/redbook/src/glredbook10/maplight.java b/src/redbook/src/glredbook10/maplight.java index ebd430d..29b4efc 100644 --- a/src/redbook/src/glredbook10/maplight.java +++ b/src/redbook/src/glredbook10/maplight.java @@ -4,7 +4,7 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*;import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*;import com.jogamp.opengl.awt.GLJPanel; /** * This program demonstrates the use of the GL lighting model. A sphere is drawn diff --git a/src/redbook/src/glredbook10/material.java b/src/redbook/src/glredbook10/material.java index 13c6aa8..a92a0e4 100644 --- a/src/redbook/src/glredbook10/material.java +++ b/src/redbook/src/glredbook10/material.java @@ -3,8 +3,8 @@ package glredbook10; import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * This program demonstrates the use of the GL lighting model. Several objects diff --git a/src/redbook/src/glredbook10/mipmap.java b/src/redbook/src/glredbook10/mipmap.java index e7e9d85..0ffb049 100644 --- a/src/redbook/src/glredbook10/mipmap.java +++ b/src/redbook/src/glredbook10/mipmap.java @@ -6,10 +6,10 @@ import javax.swing.*; import java.nio.*; import com.jogamp.common.nio.Buffers; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.util.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program demonstrates using mipmaps for texture maps. To overtly show the diff --git a/src/redbook/src/glredbook10/model.java b/src/redbook/src/glredbook10/model.java index 8ca110e..e8374ad 100644 --- a/src/redbook/src/glredbook10/model.java +++ b/src/redbook/src/glredbook10/model.java @@ -3,8 +3,8 @@ package glredbook10; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * This program demonstrates the use of OpenGL modeling transformations. Four diff --git a/src/redbook/src/glredbook10/movelight.java b/src/redbook/src/glredbook10/movelight.java index c20e2c2..20da816 100644 --- a/src/redbook/src/glredbook10/movelight.java +++ b/src/redbook/src/glredbook10/movelight.java @@ -5,12 +5,12 @@ import java.awt.event.KeyListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import com.jogamp.opengl.util.gl2.GLUT; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program demonstrates when to issue lighting and transformation commands diff --git a/src/redbook/src/glredbook10/pickdepth.java b/src/redbook/src/glredbook10/pickdepth.java index 2426702..f8fcb55 100644 --- a/src/redbook/src/glredbook10/pickdepth.java +++ b/src/redbook/src/glredbook10/pickdepth.java @@ -6,11 +6,11 @@ import javax.swing.*; import java.nio.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.util.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * Picking is demonstrated in this program. In rendering mode, three overlapping diff --git a/src/redbook/src/glredbook10/pickline.java b/src/redbook/src/glredbook10/pickline.java index bb6b5c7..64a4371 100644 --- a/src/redbook/src/glredbook10/pickline.java +++ b/src/redbook/src/glredbook10/pickline.java @@ -6,10 +6,10 @@ import javax.swing.*; import java.nio.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.util.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * Picking is demonstrated in this program. In rendering mode, three overlapping diff --git a/src/redbook/src/glredbook10/picksquare.java b/src/redbook/src/glredbook10/picksquare.java index 2d9ff14..36ebbe0 100644 --- a/src/redbook/src/glredbook10/picksquare.java +++ b/src/redbook/src/glredbook10/picksquare.java @@ -4,11 +4,11 @@ import javax.swing.*; import java.awt.*; import java.awt.event.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.util.*; import java.nio.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * Use of multiple names and picking are demonstrated. A 3x3 grid of squares is diff --git a/src/redbook/src/glredbook10/plane.java b/src/redbook/src/glredbook10/plane.java index b8a9f46..8e9eb80 100644 --- a/src/redbook/src/glredbook10/plane.java +++ b/src/redbook/src/glredbook10/plane.java @@ -3,8 +3,8 @@ package glredbook10; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * This program demonstrates the use of local versus infinite lighting on a flat diff --git a/src/redbook/src/glredbook10/planet.java b/src/redbook/src/glredbook10/planet.java index f7936f7..b26952e 100644 --- a/src/redbook/src/glredbook10/planet.java +++ b/src/redbook/src/glredbook10/planet.java @@ -4,9 +4,9 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program shows how to composite modeling transformations to draw diff --git a/src/redbook/src/glredbook10/planetup.java b/src/redbook/src/glredbook10/planetup.java index 3cc3dbd..d4b7a34 100644 --- a/src/redbook/src/glredbook10/planetup.java +++ b/src/redbook/src/glredbook10/planetup.java @@ -3,9 +3,9 @@ package glredbook10; import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * The planets (from planet.c) have been rotated so their polar regions are diff --git a/src/redbook/src/glredbook10/polys.java b/src/redbook/src/glredbook10/polys.java index 1bcd723..dc250f5 100644 --- a/src/redbook/src/glredbook10/polys.java +++ b/src/redbook/src/glredbook10/polys.java @@ -3,9 +3,9 @@ package glredbook10; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** diff --git a/src/redbook/src/glredbook10/robot.java b/src/redbook/src/glredbook10/robot.java index a244c0c..d5d368c 100644 --- a/src/redbook/src/glredbook10/robot.java +++ b/src/redbook/src/glredbook10/robot.java @@ -5,10 +5,10 @@ import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program shows how to composite modeling transformations to draw diff --git a/src/redbook/src/glredbook10/sccolorlight.java b/src/redbook/src/glredbook10/sccolorlight.java index 86e5a0d..530eb46 100644 --- a/src/redbook/src/glredbook10/sccolorlight.java +++ b/src/redbook/src/glredbook10/sccolorlight.java @@ -4,8 +4,8 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * This program demonstrates the use of a colored (magenta, in this example) diff --git a/src/redbook/src/glredbook10/scene.java b/src/redbook/src/glredbook10/scene.java index 800d8c0..acc6a9c 100644 --- a/src/redbook/src/glredbook10/scene.java +++ b/src/redbook/src/glredbook10/scene.java @@ -4,8 +4,8 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * This program demonstrates the use of the GL lighting model. Objects are drawn diff --git a/src/redbook/src/glredbook10/scenebamb.java b/src/redbook/src/glredbook10/scenebamb.java index e01e404..0d13202 100644 --- a/src/redbook/src/glredbook10/scenebamb.java +++ b/src/redbook/src/glredbook10/scenebamb.java @@ -4,8 +4,8 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * This program demonstrates use of a blue ambient light source. diff --git a/src/redbook/src/glredbook10/sceneflat.java b/src/redbook/src/glredbook10/sceneflat.java index 35cf950..330f23e 100644 --- a/src/redbook/src/glredbook10/sceneflat.java +++ b/src/redbook/src/glredbook10/sceneflat.java @@ -4,8 +4,8 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * This program draws lighted objects with flat shading. diff --git a/src/redbook/src/glredbook10/select.java b/src/redbook/src/glredbook10/select.java index 8943228..5dfba64 100644 --- a/src/redbook/src/glredbook10/select.java +++ b/src/redbook/src/glredbook10/select.java @@ -4,11 +4,11 @@ import javax.swing.*; import java.awt.event.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import com.jogamp.opengl.util.*; import java.nio.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This is an illustration of the selection mode and name stack, which detects diff --git a/src/redbook/src/glredbook10/simple.java b/src/redbook/src/glredbook10/simple.java index e9bd48d..0efbb26 100644 --- a/src/redbook/src/glredbook10/simple.java +++ b/src/redbook/src/glredbook10/simple.java @@ -3,8 +3,8 @@ package glredbook10; * This program draws a white rectangle on a black background. * @author Kiet Le (Java port) Ported to JOGL 2.x by Claudio Eduardo Goes */ -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; import javax.swing.*; diff --git a/src/redbook/src/glredbook10/smooth.java b/src/redbook/src/glredbook10/smooth.java index 65b6cf4..295bb17 100644 --- a/src/redbook/src/glredbook10/smooth.java +++ b/src/redbook/src/glredbook10/smooth.java @@ -3,9 +3,9 @@ package glredbook10; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program demonstrates smooth shading. A smooth shaded polygon is drawn in diff --git a/src/redbook/src/glredbook10/sphere.java b/src/redbook/src/glredbook10/sphere.java index ca5b739..aad5cb3 100644 --- a/src/redbook/src/glredbook10/sphere.java +++ b/src/redbook/src/glredbook10/sphere.java @@ -4,9 +4,9 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program draws a wire frame sphere. It uses glTranslatef() as a viewing diff --git a/src/redbook/src/glredbook10/stencil.java b/src/redbook/src/glredbook10/stencil.java index 7bb2e1e..820371a 100644 --- a/src/redbook/src/glredbook10/stencil.java +++ b/src/redbook/src/glredbook10/stencil.java @@ -5,9 +5,9 @@ import javax.swing.*; import java.awt.event.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program demonstrates use of the stencil buffer for masking diff --git a/src/redbook/src/glredbook10/stroke.java b/src/redbook/src/glredbook10/stroke.java index 081ba3d..ce95e34 100644 --- a/src/redbook/src/glredbook10/stroke.java +++ b/src/redbook/src/glredbook10/stroke.java @@ -15,9 +15,9 @@ import java.nio.*; import com.jogamp.opengl.util.*; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; public class stroke// extends GLSkeleton diff --git a/src/redbook/src/glredbook10/tea.java b/src/redbook/src/glredbook10/tea.java index a73d0de..aebf9dd 100644 --- a/src/redbook/src/glredbook10/tea.java +++ b/src/redbook/src/glredbook10/tea.java @@ -5,8 +5,8 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import javax.swing.JFrame; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * This program demonstrates two-sided lighting and compares it with one-sided diff --git a/src/redbook/src/glredbook10/teaambient.java b/src/redbook/src/glredbook10/teaambient.java index 02c7b74..30f3eec 100644 --- a/src/redbook/src/glredbook10/teaambient.java +++ b/src/redbook/src/glredbook10/teaambient.java @@ -4,7 +4,7 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel; /** * This program renders three lighted, shaded teapots, with different ambient diff --git a/src/redbook/src/glredbook10/teapots.java b/src/redbook/src/glredbook10/teapots.java index f49d882..f95d9fd 100644 --- a/src/redbook/src/glredbook10/teapots.java +++ b/src/redbook/src/glredbook10/teapots.java @@ -4,7 +4,7 @@ import com.jogamp.opengl.util.gl2.GLUT; import java.awt.event.*; import javax.swing.*; -import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel; /** * This program demonstrates lots of material properties. A single light source diff --git a/src/redbook/src/glredbook10/texgen.java b/src/redbook/src/glredbook10/texgen.java index 4255a63..cc0c527 100644 --- a/src/redbook/src/glredbook10/texgen.java +++ b/src/redbook/src/glredbook10/texgen.java @@ -7,7 +7,7 @@ import java.nio.*; import com.jogamp.common.nio.Buffers; import com.jogamp.opengl.util.gl2.GLUT; -import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel; /** * This program draws a texture mapped teapot with automatically generated diff --git a/src/redbook/src/glredbook10/texturesurf.java b/src/redbook/src/glredbook10/texturesurf.java index ec376f2..6a29ba8 100644 --- a/src/redbook/src/glredbook10/texturesurf.java +++ b/src/redbook/src/glredbook10/texturesurf.java @@ -7,8 +7,8 @@ import java.awt.event.*; import java.nio.*; import com.jogamp.common.nio.Buffers; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLJPanel; /** * This program uses evaluators to generate a curved surface and automatically diff --git a/src/redbook/src/glredbook11/README.txt b/src/redbook/src/glredbook11/README.txt index 8225c0b..5d67114 100644 --- a/src/redbook/src/glredbook11/README.txt +++ b/src/redbook/src/glredbook11/README.txt @@ -4,7 +4,7 @@ These are port of the examples programs which are featured in the OpenGL Programming Guide, 2nd Edition corresponding to OpenGL version 1.1. -- All examples requires JDK 1.4.2 and javax.media.opengl (jogl) +- All examples requires JDK 1.4.2 and com.jogamp.opengl (jogl) and a system dependent jogl-natives-*.jar to compile. - No ant build file is yet available. diff --git a/src/redbook/src/glredbook11/aargb.java b/src/redbook/src/glredbook11/aargb.java index 71ae3b8..ee54edc 100644 --- a/src/redbook/src/glredbook11/aargb.java +++ b/src/redbook/src/glredbook11/aargb.java @@ -4,9 +4,9 @@ import glredbook10.GLSkeleton; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; -import javax.media.opengl.*; - import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.*; + import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; import javax.swing.JFrame; /** diff --git a/src/redbook/src/glredbook11/hello.java b/src/redbook/src/glredbook11/hello.java index f7ddfb1..de7cc6d 100644 --- a/src/redbook/src/glredbook11/hello.java +++ b/src/redbook/src/glredbook11/hello.java @@ -3,15 +3,15 @@ package glredbook11; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; -import javax.media.opengl.*;import javax.swing.JFrame; +import com.jogamp.opengl.*;import javax.swing.JFrame; import glredbook10.GLSkeleton; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.awt.GLJPanel; /** * This is a simple, introductory OpenGL program in Java using the - * javax.media.opengl extension library. + * com.jogamp.opengl extension library. * * @author Kiet Le (Java port) Ported to JOGL 2.x by Claudio Eduardo Goes */ diff --git a/src/redbook/src/glredbook11/image.java b/src/redbook/src/glredbook11/image.java index 7c6d16b..dfddd4e 100644 --- a/src/redbook/src/glredbook11/image.java +++ b/src/redbook/src/glredbook11/image.java @@ -19,14 +19,14 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; import java.nio.ByteBuffer; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import com.jogamp.opengl.util.GLBuffers; import glredbook10.GLSkeleton; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** diff --git a/src/redbook/src/glredbook11/polyoff.java b/src/redbook/src/glredbook11/polyoff.java index 4b192fd..d8f164f 100644 --- a/src/redbook/src/glredbook11/polyoff.java +++ b/src/redbook/src/glredbook11/polyoff.java @@ -5,13 +5,13 @@ import java.awt.event.KeyListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import com.jogamp.opengl.util.gl2.GLUT; import glredbook10.GLSkeleton; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program demonstrates polygon offset to draw a shaded polygon and its diff --git a/src/redbook/src/glredbook11/tess.java b/src/redbook/src/glredbook11/tess.java index e2610fd..f855952 100644 --- a/src/redbook/src/glredbook11/tess.java +++ b/src/redbook/src/glredbook11/tess.java @@ -3,15 +3,15 @@ package glredbook11; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import glredbook10.GLSkeleton; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; -import javax.media.opengl.glu.GLUtessellator; -import javax.media.opengl.glu.GLUtessellatorCallback; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; +import com.jogamp.opengl.glu.GLUtessellator; +import com.jogamp.opengl.glu.GLUtessellatorCallback; /** * This program demonstrates polygon tessellation. Two tesselated objects are diff --git a/src/redbook/src/glredbook11/tesswind.java b/src/redbook/src/glredbook11/tesswind.java index 548f519..e65e547 100644 --- a/src/redbook/src/glredbook11/tesswind.java +++ b/src/redbook/src/glredbook11/tesswind.java @@ -3,14 +3,14 @@ package glredbook11; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import glredbook10.GLSkeleton; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; -import javax.media.opengl.glu.GLUtessellator; -import javax.media.opengl.glu.GLUtessellatorCallback; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; +import com.jogamp.opengl.glu.GLUtessellator; +import com.jogamp.opengl.glu.GLUtessellatorCallback; /** * This program demonstrates the winding rule polygon tessellation property. diff --git a/src/redbook/src/glredbook11/texbind.java b/src/redbook/src/glredbook11/texbind.java index ba29968..7334a70 100644 --- a/src/redbook/src/glredbook11/texbind.java +++ b/src/redbook/src/glredbook11/texbind.java @@ -6,12 +6,12 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.nio.ByteBuffer; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import com.jogamp.opengl.util.GLBuffers; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program demonstrates using glBindTexture() by creating and managing two diff --git a/src/redbook/src/glredbook11/texgen.java b/src/redbook/src/glredbook11/texgen.java index c944454..66cfc44 100644 --- a/src/redbook/src/glredbook11/texgen.java +++ b/src/redbook/src/glredbook11/texgen.java @@ -6,13 +6,13 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.nio.ByteBuffer; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import com.jogamp.common.nio.Buffers; import com.jogamp.opengl.util.gl2.GLUT; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.awt.GLJPanel; /** * This program draws a texture mapped teapot with automatically generated diff --git a/src/redbook/src/glredbook11/texprox.java b/src/redbook/src/glredbook11/texprox.java index 2004645..db2fdbf 100644 --- a/src/redbook/src/glredbook11/texprox.java +++ b/src/redbook/src/glredbook11/texprox.java @@ -5,7 +5,7 @@ import glredbook10.GLSkeleton; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; -import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel; import javax.swing.JFrame; /** diff --git a/src/redbook/src/glredbook11/texsub.java b/src/redbook/src/glredbook11/texsub.java index 645745d..09f31b9 100644 --- a/src/redbook/src/glredbook11/texsub.java +++ b/src/redbook/src/glredbook11/texsub.java @@ -6,12 +6,12 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.nio.ByteBuffer; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import com.jogamp.opengl.util.GLBuffers; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program texture maps a checkerboard image onto two rectangles. This diff --git a/src/redbook/src/glredbook11/torus.java b/src/redbook/src/glredbook11/torus.java index 414d1f5..cf16c76 100644 --- a/src/redbook/src/glredbook11/torus.java +++ b/src/redbook/src/glredbook11/torus.java @@ -3,10 +3,10 @@ package glredbook11; import glredbook10.GLSkeleton; import javax.swing.*; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import java.awt.event.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program demonstrates the creation of a display list. diff --git a/src/redbook/src/glredbook11/unproject.java b/src/redbook/src/glredbook11/unproject.java index 4f5514d..fcd7523 100644 --- a/src/redbook/src/glredbook11/unproject.java +++ b/src/redbook/src/glredbook11/unproject.java @@ -5,12 +5,12 @@ import java.awt.event.KeyListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import glredbook10.GLSkeleton; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** diff --git a/src/redbook/src/glredbook11/varray.java b/src/redbook/src/glredbook11/varray.java index d235296..d9abbbd 100644 --- a/src/redbook/src/glredbook11/varray.java +++ b/src/redbook/src/glredbook11/varray.java @@ -9,12 +9,12 @@ import java.awt.event.MouseListener; import java.nio.FloatBuffer; import java.nio.IntBuffer; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import com.jogamp.opengl.util.GLBuffers; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program demonstrates vertex arrays. diff --git a/src/redbook/src/glredbook11/wrap.java b/src/redbook/src/glredbook11/wrap.java index 47662a4..c5ee211 100644 --- a/src/redbook/src/glredbook11/wrap.java +++ b/src/redbook/src/glredbook11/wrap.java @@ -4,14 +4,14 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.nio.ByteBuffer; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import com.jogamp.opengl.util.GLBuffers; import glredbook10.GLSkeleton; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program texture maps a checkerboard image onto two rectangles. This diff --git a/src/redbook/src/glredbook12x/blendeqn.java b/src/redbook/src/glredbook12x/blendeqn.java index 7b979fc..92b8e88 100644 --- a/src/redbook/src/glredbook12x/blendeqn.java +++ b/src/redbook/src/glredbook12x/blendeqn.java @@ -8,7 +8,7 @@ import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; import java.awt.event.MouseWheelListener; -import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLJPanel; import javax.swing.JFrame; /** diff --git a/src/redbook/src/glredbook12x/colormatrix.java b/src/redbook/src/glredbook12x/colormatrix.java index 9f4748f..5fcf387 100644 --- a/src/redbook/src/glredbook12x/colormatrix.java +++ b/src/redbook/src/glredbook12x/colormatrix.java @@ -9,12 +9,12 @@ import java.awt.event.MouseWheelListener; import java.io.DataInputStream; import java.nio.ByteBuffer; -import javax.media.opengl.*;import javax.swing.JFrame; +import com.jogamp.opengl.*;import javax.swing.JFrame; import com.jogamp.opengl.util.GLBuffers; import glredbook10.GLSkeleton; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.awt.GLJPanel; /** diff --git a/src/redbook/src/glredbook12x/colortable.java b/src/redbook/src/glredbook12x/colortable.java index 0564b26..d7bb245 100644 --- a/src/redbook/src/glredbook12x/colortable.java +++ b/src/redbook/src/glredbook12x/colortable.java @@ -9,13 +9,13 @@ import java.awt.event.MouseWheelListener; import java.io.DataInputStream; import java.nio.ByteBuffer; -import javax.media.opengl.*;import javax.swing.JFrame; +import com.jogamp.opengl.*;import javax.swing.JFrame; import javax.swing.SwingUtilities; import com.jogamp.opengl.util.GLBuffers; import glredbook10.GLSkeleton; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.awt.GLJPanel; /** diff --git a/src/redbook/src/glredbook12x/convolution.java b/src/redbook/src/glredbook12x/convolution.java index 9e6d72e..8481f67 100644 --- a/src/redbook/src/glredbook12x/convolution.java +++ b/src/redbook/src/glredbook12x/convolution.java @@ -10,14 +10,14 @@ import java.io.DataInputStream; import java.nio.ByteBuffer; import java.nio.FloatBuffer; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import javax.swing.SwingUtilities; import com.jogamp.opengl.util.GLBuffers; import glredbook10.GLSkeleton; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.awt.GLJPanel; /** * Use various 2D convolutions filters to find edges in an image. diff --git a/src/redbook/src/glredbook12x/histogram.java b/src/redbook/src/glredbook12x/histogram.java index 2fabe52..60cc178 100644 --- a/src/redbook/src/glredbook12x/histogram.java +++ b/src/redbook/src/glredbook12x/histogram.java @@ -10,14 +10,14 @@ import java.io.DataInputStream; import java.nio.ByteBuffer; import java.nio.ShortBuffer; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import javax.swing.SwingUtilities; import com.jogamp.opengl.util.GLBuffers; import glredbook10.GLSkeleton; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.awt.GLJPanel; /** * Compute the histogram of the image. This program illustrates the use of the diff --git a/src/redbook/src/glredbook12x/minmax.java b/src/redbook/src/glredbook12x/minmax.java index 6f35328..2cf39f7 100644 --- a/src/redbook/src/glredbook12x/minmax.java +++ b/src/redbook/src/glredbook12x/minmax.java @@ -9,13 +9,13 @@ import java.awt.event.MouseWheelListener; import java.io.DataInputStream; import java.nio.ByteBuffer; -import javax.media.opengl.*;import javax.swing.JFrame; +import com.jogamp.opengl.*;import javax.swing.JFrame; import javax.swing.SwingUtilities; import com.jogamp.opengl.util.GLBuffers; import glredbook10.GLSkeleton; -import javax.media.opengl.awt.GLJPanel; +import com.jogamp.opengl.awt.GLJPanel; /** * Determine the minimum and maximum values of a group of pixels. This diff --git a/src/redbook/src/glredbook12x/multitex.java b/src/redbook/src/glredbook12x/multitex.java index f243739..9c57851 100644 --- a/src/redbook/src/glredbook12x/multitex.java +++ b/src/redbook/src/glredbook12x/multitex.java @@ -9,12 +9,12 @@ import java.awt.event.MouseMotionListener; import java.awt.event.MouseWheelListener; import java.nio.ByteBuffer; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import com.jogamp.opengl.util.GLBuffers; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * diff --git a/src/redbook/src/glredbook12x/quadric.java b/src/redbook/src/glredbook12x/quadric.java index 7c8e0e8..fc2653b 100644 --- a/src/redbook/src/glredbook12x/quadric.java +++ b/src/redbook/src/glredbook12x/quadric.java @@ -8,11 +8,11 @@ import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; import java.awt.event.MouseWheelListener; -import javax.media.opengl.*; +import com.jogamp.opengl.*; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; -import javax.media.opengl.glu.GLUquadric; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; +import com.jogamp.opengl.glu.GLUquadric; import javax.swing.JFrame; /** diff --git a/src/redbook/src/glredbook12x/texture3d.java b/src/redbook/src/glredbook12x/texture3d.java index 240ca0b..5512376 100644 --- a/src/redbook/src/glredbook12x/texture3d.java +++ b/src/redbook/src/glredbook12x/texture3d.java @@ -7,14 +7,14 @@ import java.awt.event.MouseMotionListener; import java.awt.event.MouseWheelListener; import java.nio.ByteBuffer; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import com.jogamp.opengl.util.GLBuffers; import glredbook10.GLSkeleton; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program demonstrates using a three-dimensional texture. It creates a 3D diff --git a/src/redbook/src/glredbook1314/combiner.java b/src/redbook/src/glredbook1314/combiner.java index bf34c23..41dc49d 100644 --- a/src/redbook/src/glredbook1314/combiner.java +++ b/src/redbook/src/glredbook1314/combiner.java @@ -4,14 +4,14 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.nio.ByteBuffer; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import com.jogamp.opengl.util.GLBuffers; import glredbook10.GLSkeleton; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program renders a variety of quads showing different effects of texture diff --git a/src/redbook/src/glredbook1314/cubemap.java b/src/redbook/src/glredbook1314/cubemap.java index 0b0c03a..af3529a 100644 --- a/src/redbook/src/glredbook1314/cubemap.java +++ b/src/redbook/src/glredbook1314/cubemap.java @@ -4,15 +4,15 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.nio.ByteBuffer; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import glredbook10.GLSkeleton; import com.jogamp.opengl.util.*; import com.jogamp.opengl.util.gl2.GLUT; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program demonstrates cube map textures. Six different colored checker diff --git a/src/redbook/src/glredbook1314/fogcoord.java b/src/redbook/src/glredbook1314/fogcoord.java index a72273e..ea897aa 100644 --- a/src/redbook/src/glredbook1314/fogcoord.java +++ b/src/redbook/src/glredbook1314/fogcoord.java @@ -3,13 +3,13 @@ package glredbook1314; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; -import javax.media.opengl.*; -import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.*; +import com.jogamp.opengl.awt.GLCanvas; import javax.swing.JFrame; import glredbook10.GLSkeleton; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.glu.GLU; /** diff --git a/src/redbook/src/glredbook1314/multisamp.java b/src/redbook/src/glredbook1314/multisamp.java index 16eb43c..0371982 100644 --- a/src/redbook/src/glredbook1314/multisamp.java +++ b/src/redbook/src/glredbook1314/multisamp.java @@ -3,12 +3,12 @@ package glredbook1314; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; -import javax.media.opengl.*; import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLCanvas; import javax.swing.JFrame; import glredbook10.GLSkeleton; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.glu.GLU; /** * This program draws shows how to use multisampling to draw anti-aliased diff --git a/src/redbook/src/glredbook1314/mvarray.java b/src/redbook/src/glredbook1314/mvarray.java index e97d2aa..dc011bb 100644 --- a/src/redbook/src/glredbook1314/mvarray.java +++ b/src/redbook/src/glredbook1314/mvarray.java @@ -8,13 +8,13 @@ import java.awt.event.KeyListener; import java.nio.ByteBuffer; import java.nio.IntBuffer; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import com.jogamp.common.nio.PointerBuffer; import com.jogamp.common.nio.Buffers; import com.jogamp.opengl.util.GLBuffers; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program demonstrates multiple vertex arrays, specifically the OpenGL @@ -81,7 +81,7 @@ public class mvarray // /* * (non-Javadoc) * - * @see javax.media.opengl.GLEventListener#display(javax.media.opengl.GLAutoDrawable) + * @see com.jogamp.opengl.GLEventListener#display(com.jogamp.opengl.GLAutoDrawable) */ public void display(GLAutoDrawable drawable) { final GL2 gl = drawable.getGL().getGL2(); @@ -104,7 +104,7 @@ public class mvarray // /* * (non-Javadoc) * - * @see javax.media.opengl.GLEventListener#displayChanged(javax.media.opengl.GLAutoDrawable, + * @see com.jogamp.opengl.GLEventListener#displayChanged(com.jogamp.opengl.GLAutoDrawable, * boolean, boolean) */ public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, @@ -114,7 +114,7 @@ public class mvarray // /* * (non-Javadoc) * - * @see javax.media.opengl.GLEventListener#init(javax.media.opengl.GLAutoDrawable) + * @see com.jogamp.opengl.GLEventListener#init(com.jogamp.opengl.GLAutoDrawable) */ public void init(GLAutoDrawable drawable) { final GL2 gl = drawable.getGL().getGL2(); @@ -132,7 +132,7 @@ public class mvarray // /* * (non-Javadoc) * - * @see javax.media.opengl.GLEventListener#reshape(javax.media.opengl.GLAutoDrawable, + * @see com.jogamp.opengl.GLEventListener#reshape(com.jogamp.opengl.GLAutoDrawable, * int, int, int, int) */ public void reshape(GLAutoDrawable drawable, int x, int y, // diff --git a/src/redbook/src/glredbook1314/pointp.java b/src/redbook/src/glredbook1314/pointp.java index dedfaf9..f9b6a08 100644 --- a/src/redbook/src/glredbook1314/pointp.java +++ b/src/redbook/src/glredbook1314/pointp.java @@ -3,12 +3,12 @@ package glredbook1314; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; -import javax.media.opengl.*; +import com.jogamp.opengl.*; import javax.swing.JFrame; import glredbook10.GLSkeleton; -import javax.media.opengl.awt.GLJPanel; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.awt.GLJPanel; +import com.jogamp.opengl.glu.GLU; /** * This program demonstrates point parameters and their effect on point diff --git a/src/redbook/src/glredbook1314/shadowmap.java b/src/redbook/src/glredbook1314/shadowmap.java index f20b9d2..28759d0 100644 --- a/src/redbook/src/glredbook1314/shadowmap.java +++ b/src/redbook/src/glredbook1314/shadowmap.java @@ -4,7 +4,7 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.nio.FloatBuffer; -import javax.media.opengl.*; import javax.media.opengl.awt.GLCanvas; +import com.jogamp.opengl.*; import com.jogamp.opengl.awt.GLCanvas; import javax.swing.JFrame; @@ -14,7 +14,7 @@ import com.jogamp.opengl.util.FPSAnimator; import com.jogamp.opengl.util.gl2.GLUT; import glredbook10.GLSkeleton; -import javax.media.opengl.glu.GLU; +import com.jogamp.opengl.glu.GLU; public class shadowmap // -- cgit v1.2.3