summaryrefslogtreecommitdiffstats
path: root/src/demos/proceduralTexturePhysics
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2006-01-13 07:29:40 +0000
committerKenneth Russel <[email protected]>2006-01-13 07:29:40 +0000
commit4da1dead29db175817053837d7a685f10c3212b4 (patch)
tree44e33aa492c443b0ccbfef17a9795ca269a66291 /src/demos/proceduralTexturePhysics
parenta30f6883a5a4bfb3bebd1e34697377ef56dd9241 (diff)
Renamed com.sun.opengl.utils to com.sun.opengl.util. Moved
TextureIO-related classes to com.sun.opengl.util.texture and TextureProvider, TextureWriter and format-specific readers to com.sun.opengl.util.texture.spi. Renamed BufferUtils to BufferUtil. Added ImageUtil and FileUtil. Cleaned up javadoc. Updated demos. Cleaned up some imports. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/trunk@165 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4
Diffstat (limited to 'src/demos/proceduralTexturePhysics')
-rw-r--r--src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java2
-rw-r--r--src/demos/proceduralTexturePhysics/Water.java9
2 files changed, 6 insertions, 5 deletions
diff --git a/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java b/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
index 6a7d116..e20d811 100644
--- a/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
+++ b/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
@@ -38,7 +38,7 @@ import java.awt.event.*;
import javax.swing.*;
import javax.media.opengl.*;
-import com.sun.opengl.utils.*;
+import com.sun.opengl.util.*;
import demos.common.*;
import demos.util.*;
import gleem.*;
diff --git a/src/demos/proceduralTexturePhysics/Water.java b/src/demos/proceduralTexturePhysics/Water.java
index 2fd0f0b..50be158 100644
--- a/src/demos/proceduralTexturePhysics/Water.java
+++ b/src/demos/proceduralTexturePhysics/Water.java
@@ -43,7 +43,8 @@ import java.util.*;
import gleem.linalg.*;
import javax.media.opengl.*;
import javax.media.opengl.glu.*;
-import com.sun.opengl.utils.*;
+import com.sun.opengl.util.*;
+import com.sun.opengl.util.texture.*;
import demos.util.*;
/**
@@ -479,7 +480,7 @@ public class Water {
try {
initialMapData = TextureIO.newTextureData(getClass().getClassLoader().getResourceAsStream(initialMapFilename),
false,
- TextureIO.getFileSuffix(initialMapFilename));
+ FileUtil.getFileSuffix(initialMapFilename));
} catch (IOException e) {
throw new GLException(e);
}
@@ -1020,9 +1021,9 @@ public class Water {
initialMapTex = TextureIO.newTexture(initialMapData);
spinTex = TextureIO.newTexture(getClass().getClassLoader().getResourceAsStream(spinFilename), false,
- TextureIO.getFileSuffix(spinFilename));
+ FileUtil.getFileSuffix(spinFilename));
dropletTex = TextureIO.newTexture(getClass().getClassLoader().getResourceAsStream(dropletFilename), false,
- TextureIO.getFileSuffix(dropletFilename));
+ FileUtil.getFileSuffix(dropletFilename));
// load the cubemap texture
cubemap = Cubemap.loadFromStreams(getClass().getClassLoader(),