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

Fix some inconsistencies in GLU

This commit is contained in:
Elias Naur 2004-02-05 16:53:30 +00:00
parent 00ef847c88
commit c16c219a48
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/lwjgl/opengl/glu/GLU.java
View File

@ -112,9 +112,9 @@ public class GLU implements GLUConstants {
FloatBuffer modelMatrix, FloatBuffer modelMatrix,
FloatBuffer projMatrix, FloatBuffer projMatrix,
IntBuffer viewport, IntBuffer viewport,
FloatBuffer objx, FloatBuffer objy, FloatBuffer objz) FloatBuffer obj_pos)
{ {
return Project.gluUnProject(winx, winy, winz, modelMatrix, projMatrix, viewport, objx, objy, objz); return Project.gluUnProject(winx, winy, winz, modelMatrix, projMatrix, viewport, obj_pos);
} }
/** /**
@ -130,7 +130,7 @@ public class GLU implements GLUConstants {
float y, float y,
float width, float width,
float height, float height,
int viewport[]) { IntBuffer viewport) {
Project.gluPickMatrix(x, y, width, height, viewport); Project.gluPickMatrix(x, y, width, height, viewport);
} }

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

@ -302,7 +302,7 @@ public class Project extends Util implements GLUConstants {
FloatBuffer modelMatrix, FloatBuffer modelMatrix,
FloatBuffer projMatrix, FloatBuffer projMatrix,
IntBuffer viewport, IntBuffer viewport,
FloatBuffer objx, FloatBuffer objy, FloatBuffer objz) FloatBuffer obj_pos)
{ {
float[] in = new float[4]; float[] in = new float[4];
float[] out = new float[4]; float[] out = new float[4];
@ -329,9 +329,9 @@ public class Project extends Util implements GLUConstants {
out[0] /= out[3]; out[0] /= out[3];
out[1] /= out[3]; out[1] /= out[3];
out[2] /= out[3]; out[2] /= out[3];
objx.put(0, out[0]); obj_pos.put(0, out[0]);
objy.put(0, out[1]); obj_pos.put(1, out[1]);
objz.put(0, out[2]); obj_pos.put(2, out[2]);
return true; return true;
} }
@ -348,16 +348,16 @@ public class Project extends Util implements GLUConstants {
float y, float y,
float deltax, float deltax,
float deltay, float deltay,
int[] viewport) { IntBuffer viewport) {
if (deltax <= 0 || deltay <= 0) { if (deltax <= 0 || deltay <= 0) {
return; return;
} }
/* Translate and scale the picked region to the entire window */ /* Translate and scale the picked region to the entire window */
GL11.glTranslatef( GL11.glTranslatef(
(viewport[2] - 2 * (x - viewport[0])) / deltax, (viewport.get(2) - 2 * (x - viewport.get(0))) / deltax,
(viewport[3] - 2 * (y - viewport[1])) / deltay, (viewport.get(3) - 2 * (y - viewport.get(1))) / deltay,
0); 0);
GL11.glScalef(viewport[2] / deltax, viewport[3] / deltay, 1.0f); GL11.glScalef(viewport.get(2) / deltax, viewport.get(3) / deltay, 1.0f);
} }
} }