Fixed Windows port after changes to GlueGen to include array offsets.

Ported all demos to new API. Temporarily added back in GLU entry
points taking primitive arrays as the underlying APIs (in particular,
glTexImage2D) do not yet support non-direct Buffers. Changed C code
generation to only add in array offset if array is non-null. Fixed bug
in GLU tesselator demo's vertex callback.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/branches/JSR-231@99 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4

3 files changed, 15 insertions, 15 deletions

diff --git a/src/demos/fullscreen/GearsFullscreen.java b/src/demos/fullscreen/GearsFullscreen.java
index d8971fb..6c48ef0 100755
--- a/src/demos/fullscreen/GearsFullscreen.java
+++ b/src/demos/fullscreen/GearsFullscreen.java
@@ -127,7 +127,7 @@ public class GearsFullscreen {
       float green[] = { 0.0f, 0.8f, 0.2f, 1.0f };
       float blue[] = { 0.2f, 0.2f, 1.0f, 1.0f };
 
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, pos);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, pos, 0);
       gl.glEnable(GL.GL_CULL_FACE);
       gl.glEnable(GL.GL_LIGHTING);
       gl.glEnable(GL.GL_LIGHT0);
@@ -136,19 +136,19 @@ public class GearsFullscreen {
       /* make the gears */
       gear1 = gl.glGenLists(1);
       gl.glNewList(gear1, GL.GL_COMPILE);
-      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, red);
+      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, red, 0);
       gear(gl, 1.0f, 4.0f, 1.0f, 20, 0.7f);
       gl.glEndList();
             
       gear2 = gl.glGenLists(1);
       gl.glNewList(gear2, GL.GL_COMPILE);
-      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, green);
+      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, green, 0);
       gear(gl, 0.5f, 2.0f, 2.0f, 10, 0.7f);
       gl.glEndList();
             
       gear3 = gl.glGenLists(1);
       gl.glNewList(gear3, GL.GL_COMPILE);
-      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, blue);
+      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, blue, 0);
       gear(gl, 1.3f, 2.0f, 0.5f, 10, 0.7f);
       gl.glEndList();
             
@@ -188,7 +188,7 @@ public class GearsFullscreen {
           0, 0, 1, 0,
           0, 0, 0, 1
         };
-        gl.glLoadTransposeMatrixfARB(identityTranspose);
+        gl.glLoadTransposeMatrixfARB(identityTranspose, 0);
       }
       gl.glFrustum(-1.0f, 1.0f, -h, h, 5.0f, 60.0f);
       gl.glMatrixMode(GL.GL_MODELVIEW);
diff --git a/src/demos/fullscreen/GearsFullscreen2.java b/src/demos/fullscreen/GearsFullscreen2.java
index 5ed02f8..d7502cf 100755
--- a/src/demos/fullscreen/GearsFullscreen2.java
+++ b/src/demos/fullscreen/GearsFullscreen2.java
@@ -149,7 +149,7 @@ public class GearsFullscreen2 {
       float green[] = { 0.0f, 0.8f, 0.2f, 1.0f };
       float blue[] = { 0.2f, 0.2f, 1.0f, 1.0f };
 
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, pos);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, pos, 0);
       gl.glEnable(GL.GL_CULL_FACE);
       gl.glEnable(GL.GL_LIGHTING);
       gl.glEnable(GL.GL_LIGHT0);
@@ -158,19 +158,19 @@ public class GearsFullscreen2 {
       /* make the gears */
       gear1 = gl.glGenLists(1);
       gl.glNewList(gear1, GL.GL_COMPILE);
-      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, red);
+      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, red, 0);
       gear(gl, 1.0f, 4.0f, 1.0f, 20, 0.7f);
       gl.glEndList();
             
       gear2 = gl.glGenLists(1);
       gl.glNewList(gear2, GL.GL_COMPILE);
-      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, green);
+      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, green, 0);
       gear(gl, 0.5f, 2.0f, 2.0f, 10, 0.7f);
       gl.glEndList();
             
       gear3 = gl.glGenLists(1);
       gl.glNewList(gear3, GL.GL_COMPILE);
-      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, blue);
+      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, blue, 0);
       gear(gl, 1.3f, 2.0f, 0.5f, 10, 0.7f);
       gl.glEndList();
             
@@ -210,7 +210,7 @@ public class GearsFullscreen2 {
           0, 0, 1, 0,
           0, 0, 0, 1
         };
-        gl.glLoadTransposeMatrixfARB(identityTranspose);
+        gl.glLoadTransposeMatrixfARB(identityTranspose, 0);
       }
       gl.glFrustum(-1.0f, 1.0f, -h, h, 5.0f, 60.0f);
       gl.glMatrixMode(GL.GL_MODELVIEW);
diff --git a/src/demos/fullscreen/JGearsFullscreen.java b/src/demos/fullscreen/JGearsFullscreen.java
index 84c79b7..6b68667 100755
--- a/src/demos/fullscreen/JGearsFullscreen.java
+++ b/src/demos/fullscreen/JGearsFullscreen.java
@@ -154,7 +154,7 @@ public class JGearsFullscreen {
       float green[] = { 0.0f, 0.8f, 0.2f, 1.0f };
       float blue[] = { 0.2f, 0.2f, 1.0f, 1.0f };
 
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, pos);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, pos, 0);
       gl.glEnable(GL.GL_CULL_FACE);
       gl.glEnable(GL.GL_LIGHTING);
       gl.glEnable(GL.GL_LIGHT0);
@@ -163,19 +163,19 @@ public class JGearsFullscreen {
       /* make the gears */
       gear1 = gl.glGenLists(1);
       gl.glNewList(gear1, GL.GL_COMPILE);
-      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, red);
+      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, red, 0);
       gear(gl, 1.0f, 4.0f, 1.0f, 20, 0.7f);
       gl.glEndList();
             
       gear2 = gl.glGenLists(1);
       gl.glNewList(gear2, GL.GL_COMPILE);
-      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, green);
+      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, green, 0);
       gear(gl, 0.5f, 2.0f, 2.0f, 10, 0.7f);
       gl.glEndList();
             
       gear3 = gl.glGenLists(1);
       gl.glNewList(gear3, GL.GL_COMPILE);
-      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, blue);
+      gl.glMaterialfv(GL.GL_FRONT, GL.GL_AMBIENT_AND_DIFFUSE, blue, 0);
       gear(gl, 1.3f, 2.0f, 0.5f, 10, 0.7f);
       gl.glEndList();
             
@@ -223,7 +223,7 @@ public class JGearsFullscreen {
           0, 0, 1, 0,
           0, 0, 0, 1
         };
-        gl.glLoadTransposeMatrixfARB(identityTranspose);
+        gl.glLoadTransposeMatrixfARB(identityTranspose, 0);
       }
       gl.glFrustum(-1.0f, 1.0f, -h, h, 5.0f, 60.0f);
       gl.glMatrixMode(GL.GL_MODELVIEW);