michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed naming

This commit is contained in:
Elias Naur 2004-03-29 07:32:37 +00:00
parent 5fb7f5e0e2
commit 351b8165ef
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/lwjgl/opengl/GL11.java
View File

@ -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());
}

4
src/java/org/lwjgl/opengl/GL15.java
View File

@ -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());
}

4
src/java/org/lwjgl/opengl/glu/Project.java
View File

@ -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);
}

4
src/java/org/lwjgl/test/opengl/Grass.java
View File

@ -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);