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

6 files changed, 17 insertions, 17 deletions

diff --git a/src/gleem/ExaminerViewer.java b/src/gleem/ExaminerViewer.java
index 2cb2f05..9760165 100644
--- a/src/gleem/ExaminerViewer.java
+++ b/src/gleem/ExaminerViewer.java
@@ -581,11 +581,11 @@ public class ExaminerViewer {
     gl.glMatrixMode(GL.GL_MODELVIEW);
     float[] data = new float[16];
     params.getModelviewMatrix().getColumnMajorData(data);
-    gl.glLoadMatrixf(data);
+    gl.glLoadMatrixf(data, 0);
 
     gl.glMatrixMode(GL.GL_PROJECTION);
     params.getProjectionMatrix().getColumnMajorData(data);
-    gl.glLoadMatrixf(data);
+    gl.glLoadMatrixf(data, 0);
   }
 
   private void recalcInverseRotation(GL gl) {
diff --git a/src/gleem/TestExaminerViewer.java b/src/gleem/TestExaminerViewer.java
index 55d0283..3ba68e4 100644
--- a/src/gleem/TestExaminerViewer.java
+++ b/src/gleem/TestExaminerViewer.java
@@ -85,9 +85,9 @@ public class TestExaminerViewer {
       float[] lightPosition = new float[] {1, 1, 1, 0};
       float[] ambient       = new float[] { 0.0f, 0.0f, 0.0f, 1.0f };
       float[] diffuse       = new float[] { 1.0f, 1.0f, 1.0f, 1.0f };
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT,  ambient);
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE,  diffuse);
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, lightPosition);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT,  ambient, 0);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE,  diffuse, 0);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, lightPosition, 0);
 
       gl.glEnable(GL.GL_LIGHTING);
       gl.glEnable(GL.GL_LIGHT0);
diff --git a/src/gleem/TestHandleBox.java b/src/gleem/TestHandleBox.java
index adf8e32..0761c8b 100644
--- a/src/gleem/TestHandleBox.java
+++ b/src/gleem/TestHandleBox.java
@@ -63,9 +63,9 @@ public class TestHandleBox {
       float[] lightPosition = new float[] {1, 1, 1, 0};
       float[] ambient       = new float[] { 0.0f, 0.0f, 0.0f, 1.0f };
       float[] diffuse       = new float[] { 1.0f, 1.0f, 1.0f, 1.0f };
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT,  ambient);
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE,  diffuse);
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, lightPosition);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT,  ambient, 0);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE,  diffuse, 0);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, lightPosition, 0);
 
       gl.glEnable(GL.GL_LIGHTING);
       gl.glEnable(GL.GL_LIGHT0);
diff --git a/src/gleem/TestMultiWin.java b/src/gleem/TestMultiWin.java
index ce2c257..4b9fa58 100644
--- a/src/gleem/TestMultiWin.java
+++ b/src/gleem/TestMultiWin.java
@@ -87,9 +87,9 @@ public class TestMultiWin {
       float[] lightPosition = new float[] {1, 1, 1, 0};
       float[] ambient       = new float[] { 0.0f, 0.0f, 0.0f, 1.0f };
       float[] diffuse       = new float[] { 1.0f, 1.0f, 1.0f, 1.0f };
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT,  ambient);
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE,  diffuse);
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, lightPosition);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT,  ambient, 0);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE,  diffuse, 0);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, lightPosition, 0);
 
       gl.glEnable(GL.GL_LIGHTING);
       gl.glEnable(GL.GL_LIGHT0);
diff --git a/src/gleem/TestTranslate1.java b/src/gleem/TestTranslate1.java
index 131fa0c..79fb4ca 100644
--- a/src/gleem/TestTranslate1.java
+++ b/src/gleem/TestTranslate1.java
@@ -63,9 +63,9 @@ public class TestTranslate1 {
       float[] lightPosition = new float[] {1, 1, 1, 0};
       float[] ambient       = new float[] { 0.0f, 0.0f, 0.0f, 1.0f };
       float[] diffuse       = new float[] { 1.0f, 1.0f, 1.0f, 1.0f };
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT,  ambient);
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE,  diffuse);
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, lightPosition);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT,  ambient, 0);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE,  diffuse, 0);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, lightPosition, 0);
 
       gl.glEnable(GL.GL_LIGHTING);
       gl.glEnable(GL.GL_LIGHT0);
diff --git a/src/gleem/TestTranslate2.java b/src/gleem/TestTranslate2.java
index 1789575..0906d8f 100644
--- a/src/gleem/TestTranslate2.java
+++ b/src/gleem/TestTranslate2.java
@@ -63,9 +63,9 @@ public class TestTranslate2 {
       float[] lightPosition = new float[] {1, 1, 1, 0};
       float[] ambient       = new float[] { 0.0f, 0.0f, 0.0f, 1.0f };
       float[] diffuse       = new float[] { 1.0f, 1.0f, 1.0f, 1.0f };
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT,  ambient);
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE,  diffuse);
-      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, lightPosition);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT,  ambient, 0);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE,  diffuse, 0);
+      gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, lightPosition, 0);
 
       gl.glEnable(GL.GL_LIGHTING);
       gl.glEnable(GL.GL_LIGHT0);