From 351b8165ef9d3147224557195d93c4fee7940fc4 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Mon, 29 Mar 2004 07:32:37 +0000 Subject: [PATCH] Fixed naming --- src/java/org/lwjgl/opengl/GL11.java | 6 +++--- src/java/org/lwjgl/opengl/GL15.java | 4 ++-- src/java/org/lwjgl/opengl/glu/Project.java | 4 ++-- src/java/org/lwjgl/test/opengl/Grass.java | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/java/org/lwjgl/opengl/GL11.java b/src/java/org/lwjgl/opengl/GL11.java index 2ed2928b..21b0ed18 100644 --- a/src/java/org/lwjgl/opengl/GL11.java +++ b/src/java/org/lwjgl/opengl/GL11.java @@ -1114,12 +1114,12 @@ public final class GL11 { private static native void nglLightModeliv(int pname, IntBuffer params, int params_offset); public static native void glLightf(int light, int pname, float param); public static native void glLighti(int light, int pname, int param); - public static void glLightfv(int light, int pname, FloatBuffer params) { + public static void glLight(int light, int pname, FloatBuffer params) { BufferChecks.checkBuffer(params); nglLightfv(light, pname, params, params.position()); } private static native void nglLightfv(int light, int pname, FloatBuffer params, int params_offset); - public static void glLightiv(int light, int pname, IntBuffer params) { + public static void glLight(int light, int pname, IntBuffer params) { BufferChecks.checkBuffer(params); nglLightiv(light, pname, params, params.position()); } @@ -1176,7 +1176,7 @@ public final class GL11 { public static native void glNormal3i(int nx, int ny, int nz); public static native void glNewList(int list, int mode); public static native void glEndList(); - public static void glMultMatrixf(FloatBuffer m) { + public static void glMultMatrix(FloatBuffer m) { BufferChecks.checkBuffer(m, 16); nglMultMatrixf(m, m.position()); } diff --git a/src/java/org/lwjgl/opengl/GL15.java b/src/java/org/lwjgl/opengl/GL15.java index 61ca9535..7337351e 100644 --- a/src/java/org/lwjgl/opengl/GL15.java +++ b/src/java/org/lwjgl/opengl/GL15.java @@ -273,7 +273,7 @@ public final class GL15 { // --------------------------- // --------------------------- - public static void glGetQueryObjecti(int id, int pname, IntBuffer params) { + public static void glGetQueryObject(int id, int pname, IntBuffer params) { BufferChecks.checkBuffer(params); nglGetQueryObjectiv(id, pname, params, params.position()); } @@ -285,7 +285,7 @@ public final class GL15 { // --------------------------- // --------------------------- - public static void glGetQueryObjectui(int id, int pname, IntBuffer params) { + public static void glGetQueryObjectu(int id, int pname, IntBuffer params) { BufferChecks.checkBuffer(params); nglGetQueryObjectuiv(id, pname, params, params.position()); } diff --git a/src/java/org/lwjgl/opengl/glu/Project.java b/src/java/org/lwjgl/opengl/glu/Project.java index 5ec08d5e..7fa5be76 100644 --- a/src/java/org/lwjgl/opengl/glu/Project.java +++ b/src/java/org/lwjgl/opengl/glu/Project.java @@ -188,7 +188,7 @@ public class Project extends Util { matrix.put(3 * 4 + 2, -2 * zNear * zFar / deltaZ); matrix.put(3 * 4 + 3, 0); - GL11.glMultMatrixf(matrix); + GL11.glMultMatrix(matrix); } /** @@ -248,7 +248,7 @@ public class Project extends Util { matrix.put(1 * 4 + 2, -forward[1]); matrix.put(2 * 4 + 2, -forward[2]); - GL11.glMultMatrixf(matrix); + GL11.glMultMatrix(matrix); GL11.glTranslatef(-eyex, -eyey, -eyez); } diff --git a/src/java/org/lwjgl/test/opengl/Grass.java b/src/java/org/lwjgl/test/opengl/Grass.java index 017dc3e7..95a6a668 100644 --- a/src/java/org/lwjgl/test/opengl/Grass.java +++ b/src/java/org/lwjgl/test/opengl/Grass.java @@ -165,14 +165,14 @@ public class Grass { light_buf_f.put(LightDiffuse); light_buf_f.flip(); - GL11.glLightfv( + GL11.glLight( GL11.GL_LIGHT0, GL11.GL_DIFFUSE, light_buf_f); light_buf_f.clear(); light_buf_f.put(LightPosition); light_buf_f.flip(); - GL11.glLightfv( + GL11.glLight( GL11.GL_LIGHT0, GL11.GL_POSITION, light_buf_f);