summaryrefslogtreecommitdiffstats
path: root/src/demos/proceduralTexturePhysics
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-03-28 01:52:29 +0100
committerSven Gothel <[email protected]>2010-03-28 01:52:29 +0100
commitd3e818ea8b7c3f45ed4cfac7b0e7d3bd24f956e5 (patch)
tree6ce99febee12fb7c32967d46310e43faaa0d820c /src/demos/proceduralTexturePhysics
parentf9e14975725cd3df3f792260bad9197a08d4a67f (diff)
parent0d46fa3091e40271ba2247f6c4236cb2358f5151 (diff)
Merge branch 'master' of github.com:mbien/jogl-demos
Diffstat (limited to 'src/demos/proceduralTexturePhysics')
-rw-r--r--src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java2
-rw-r--r--src/demos/proceduralTexturePhysics/Water.java10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java b/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
index a813906..d0e73ae 100644
--- a/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
+++ b/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
@@ -57,7 +57,7 @@ import javax.media.opengl.GLAutoDrawable;
import javax.media.opengl.GLException;
import javax.media.opengl.awt.AWTGLAutoDrawable;
import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
import javax.swing.JOptionPane;
/**
diff --git a/src/demos/proceduralTexturePhysics/Water.java b/src/demos/proceduralTexturePhysics/Water.java
index 3a5d1a8..fdf4224 100644
--- a/src/demos/proceduralTexturePhysics/Water.java
+++ b/src/demos/proceduralTexturePhysics/Water.java
@@ -33,10 +33,10 @@
package demos.proceduralTexturePhysics;
-import com.sun.opengl.util.FileUtil;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.FileUtil;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
import demos.util.Cubemap;
import gleem.linalg.Mat4f;
import gleem.linalg.Rotf;
@@ -56,7 +56,7 @@ import javax.media.opengl.GLEventListener;
import javax.media.opengl.GLException;
import javax.media.opengl.GLPbuffer;
import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.BufferUtil;