summaryrefslogtreecommitdiffstats
path: root/src/net/java/games/jogl
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2005-02-03 23:15:59 +0000
committerKenneth Russel <[email protected]>2005-02-03 23:15:59 +0000
commitdfbee835b5a50b1c6219bd53e15823ea83d73dd6 (patch)
tree3f857c82ce898123273d8f37e6b993a29211b6f2 /src/net/java/games/jogl
parentc8e814e48b4a46c1cb99636cbf15859dd6029b8a (diff)
Fixed build problems after integration of GKW's Java port of GLU
mipmap code git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@208 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'src/net/java/games/jogl')
-rw-r--r--src/net/java/games/jogl/impl/error/Error.java14
-rw-r--r--src/net/java/games/jogl/impl/mipmap/Extract8888.java2
-rw-r--r--src/net/java/games/jogl/impl/mipmap/Extract8888rev.java2
-rw-r--r--src/net/java/games/jogl/impl/mipmap/Image.java16
-rw-r--r--src/net/java/games/jogl/impl/registry/Registry.java4
5 files changed, 20 insertions, 18 deletions
diff --git a/src/net/java/games/jogl/impl/error/Error.java b/src/net/java/games/jogl/impl/error/Error.java
index 1cae9ef87..a9b4c48f1 100644
--- a/src/net/java/games/jogl/impl/error/Error.java
+++ b/src/net/java/games/jogl/impl/error/Error.java
@@ -35,6 +35,8 @@
package net.java.games.jogl.impl.error;
import net.java.games.jogl.GL;
+import net.java.games.jogl.GLU;
+import net.java.games.jogl.impl.GLUImpl;
/**
*
@@ -73,14 +75,14 @@ public class Error {
if( errorCode == GL.GL_TABLE_TOO_LARGE ) {
return( "table too large" );
}
- if( (errorCode >= GLU.GLU.GLU_INVALID_ENUM) && (errorCode <= GLU.GLU.GLU_INVALID_OPERATION) ) {
- return( gluErrorStrings[ errorCode - GLU.GLU.GLU_INVALID_ENUM ] );
+ if( (errorCode >= GLUImpl.GLU_INVALID_ENUM) && (errorCode <= GLUImpl.GLU_INVALID_OPERATION) ) {
+ return( gluErrorStrings[ errorCode - GLUImpl.GLU_INVALID_ENUM ] );
}
- if( (errorCode >= GLU.GLU.GLU_NURBS_ERROR1) && (errorCode <= GLU.GLU.GLU_NURBS_ERROR37) ) {
- return( gluErrorStrings[ errorCode - (GLU.GLU.GLU_NURBS_ERROR1 - 1) ] );
+ if( (errorCode >= GLUImpl.GLU_NURBS_ERROR1) && (errorCode <= GLUImpl.GLU_NURBS_ERROR37) ) {
+ return( gluErrorStrings[ errorCode - (GLUImpl.GLU_NURBS_ERROR1 - 1) ] );
}
- if( (errorCode >= GLU.GLU.GLU_TESS_ERROR1) && (errorCode <= GLU.GLU.GLU_TESS_ERROR8) ) {
- return( gluErrorStrings[ errorCode - (GLU.GLU.GLU_TESS_ERROR1 - 1) ] );
+ if( (errorCode >= GLUImpl.GLU_TESS_ERROR1) && (errorCode <= GLUImpl.GLU_TESS_ERROR8) ) {
+ return( gluErrorStrings[ errorCode - (GLUImpl.GLU_TESS_ERROR1 - 1) ] );
}
return( null );
}
diff --git a/src/net/java/games/jogl/impl/mipmap/Extract8888.java b/src/net/java/games/jogl/impl/mipmap/Extract8888.java
index 453d8505b..c013fae28 100644
--- a/src/net/java/games/jogl/impl/mipmap/Extract8888.java
+++ b/src/net/java/games/jogl/impl/mipmap/Extract8888.java
@@ -32,7 +32,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package GLU.mipmap;
+package net.java.games.jogl.impl.mipmap;
import java.nio.*;
diff --git a/src/net/java/games/jogl/impl/mipmap/Extract8888rev.java b/src/net/java/games/jogl/impl/mipmap/Extract8888rev.java
index 53d94f6c0..9104ed7b1 100644
--- a/src/net/java/games/jogl/impl/mipmap/Extract8888rev.java
+++ b/src/net/java/games/jogl/impl/mipmap/Extract8888rev.java
@@ -32,7 +32,7 @@
* compliant with the OpenGL(R) version 1.2.1 Specification.
*/
-package GLU.mipmap;
+package net.java.games.jogl.impl.mipmap;
import java.nio.*;
diff --git a/src/net/java/games/jogl/impl/mipmap/Image.java b/src/net/java/games/jogl/impl/mipmap/Image.java
index 173603aeb..b0d54bfc0 100644
--- a/src/net/java/games/jogl/impl/mipmap/Image.java
+++ b/src/net/java/games/jogl/impl/mipmap/Image.java
@@ -130,7 +130,7 @@ public class Image {
}
myswap_bytes = psm.getUnpackSwapBytes();
- components = GLU.mipmap.Mipmap.elements_per_group( format, type );
+ components = Mipmap.elements_per_group( format, type );
if( psm.getUnpackRowLength() > 0 ) {
groups_per_line = psm.getUnpackRowLength();
} else {
@@ -184,7 +184,7 @@ public class Image {
start += rowsize;
}
} else {
- element_size = GLU.mipmap.Mipmap.bytes_per_element( type );
+ element_size = Mipmap.bytes_per_element( type );
group_size = element_size * components;
if( element_size == 1 ) {
myswap_bytes = false;
@@ -355,10 +355,10 @@ public class Image {
} // for i
// iterators should be one byte past end
- if( !GLU.mipmap.Mipmap.isTypePackedPixel( type ) ) {
+ if( !Mipmap.isTypePackedPixel( type ) ) {
assert( iter2 == ( width * height * components ) );
} else {
- assert( iter2 == ( width * height * GLU.mipmap.Mipmap.elements_per_group( format, 0 ) ) );
+ assert( iter2 == ( width * height * Mipmap.elements_per_group( format, 0 ) ) );
}
assert( iter == ( rowsize * height + psm.getUnpackSkipRows() * rowsize + psm.getUnpackSkipPixels() * group_size ) );
}
@@ -428,7 +428,7 @@ public class Image {
}
myswap_bytes = psm.getPackSwapBytes();
- components = GLU.mipmap.Mipmap.elements_per_group( format, type );
+ components = Mipmap.elements_per_group( format, type );
if( psm.getPackRowLength() > 0 ) {
groups_per_line = psm.getPackRowLength();
} else {
@@ -490,7 +490,7 @@ public class Image {
} else {
float shoveComponents[] = new float[4];
- element_size = GLU.mipmap.Mipmap.bytes_per_element( type );
+ element_size = Mipmap.bytes_per_element( type );
group_size = element_size * components;
if( element_size == 1 ) {
myswap_bytes = false;
@@ -780,10 +780,10 @@ public class Image {
iter = start;
} // for i
// iterators should be one byte past end
- if( !GLU.mipmap.Mipmap.isTypePackedPixel( type ) ) {
+ if( !Mipmap.isTypePackedPixel( type ) ) {
assert( iter2 == width * height * components );
} else {
- assert( iter2 == width * height * GLU.mipmap.Mipmap.elements_per_group( format, 0 ) );
+ assert( iter2 == width * height * Mipmap.elements_per_group( format, 0 ) );
}
assert( iter == rowsize * height + psm.getPackSkipRows() * rowsize + psm.getPackSkipPixels() * group_size );
}
diff --git a/src/net/java/games/jogl/impl/registry/Registry.java b/src/net/java/games/jogl/impl/registry/Registry.java
index 5e9e2f53b..ef9f868f3 100644
--- a/src/net/java/games/jogl/impl/registry/Registry.java
+++ b/src/net/java/games/jogl/impl/registry/Registry.java
@@ -48,9 +48,9 @@ public class Registry {
}
public static String gluGetString(int name) {
- if( name == GLU.GLU.GLU_VERSION ) {
+ if( name == GLU.GLU_VERSION ) {
return( "1.3" );
- } else if( name == GLU.GLU.GLU_EXTENSIONS ) {
+ } else if( name == GLU.GLU_EXTENSIONS ) {
return( "GLU_EXT_nurbs_tessellator GLU_EXT_object_space_tess " );
}
return( null );