Not a subclass of Util anymore.

This commit is contained in:
Erik Duijs 2004-01-21 16:17:15 +00:00
parent 6886a154d0
commit fce7fea613
1 changed files with 85 additions and 40 deletions

View File

@ -1,6 +1,8 @@
package org.lwjgl.opengl.glu; package org.lwjgl.opengl.glu;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
@ -11,7 +13,7 @@ import org.lwjgl.opengl.GL11;
* Created 23-dec-2003 * Created 23-dec-2003
* @author Erik Duijs * @author Erik Duijs
*/ */
public class GLU extends Util implements GLUConstants { public class GLU implements GLUConstants {
/** /**
* Method gluLookAt * Method gluLookAt
@ -26,15 +28,15 @@ public class GLU extends Util implements GLUConstants {
* @param upz * @param upz
*/ */
public static void gluLookAt( public static void gluLookAt(
float eyex, float eyex,
float eyey, float eyey,
float eyez, float eyez,
float centerx, float centerx,
float centery, float centery,
float centerz, float centerz,
float upx, float upx,
float upy, float upy,
float upz) { float upz) {
Project.gluLookAt(eyex, eyey, eyez, centerx, centery, centerz, upx, upy, upz); Project.gluLookAt(eyex, eyey, eyez, centerx, centery, centerz, upx, upy, upz);
} }
@ -47,10 +49,10 @@ public class GLU extends Util implements GLUConstants {
* @param top * @param top
*/ */
public static void gluOrtho2D( public static void gluOrtho2D(
float left, float left,
float right, float right,
float bottom, float bottom,
float top) { float top) {
GL11.glOrtho(left, right, bottom, top, -1.0, 1.0); GL11.glOrtho(left, right, bottom, top, -1.0, 1.0);
} }
@ -63,14 +65,57 @@ public class GLU extends Util implements GLUConstants {
* @param zFar * @param zFar
*/ */
public static void gluPerspective( public static void gluPerspective(
float fovy, float fovy,
float aspect, float aspect,
float zNear, float zNear,
float zFar) { float zFar) {
Project.gluPerspective(fovy, aspect, zNear, zFar); Project.gluPerspective(fovy, aspect, zNear, zFar);
} }
/**
* Method gluProject
* @param objx
* @param objy
* @param objz
* @param modelMatrix
* @param projMatrix
* @param viewport
* @param winx
* @param winy
* @param winz
* @return
*/
public static boolean gluProject(float objx, float objy, float objz,
FloatBuffer modelMatrix,
FloatBuffer projMatrix,
IntBuffer viewport,
FloatBuffer winx, FloatBuffer winy, FloatBuffer winz)
{
return Project.gluProject(objx, objy, objz, modelMatrix, projMatrix, viewport, winx, winy, winz);
}
/**
* Method gluUnproject
* @param winx
* @param winy
* @param winz
* @param modelMatrix
* @param projMatrix
* @param viewport
* @param objx
* @param objy
* @param objz
* @return
*/
public static boolean gluUnProject(float winx, float winy, float winz,
FloatBuffer modelMatrix,
FloatBuffer projMatrix,
IntBuffer viewport,
FloatBuffer objx, FloatBuffer objy, FloatBuffer objz)
{
return Project.gluUnProject(winx, winy, winz, modelMatrix, projMatrix, viewport, objx, objy, objz);
}
/** /**
* Method gluPickMatrix * Method gluPickMatrix
@ -81,11 +126,11 @@ public class GLU extends Util implements GLUConstants {
* @param viewport * @param viewport
*/ */
public static void gluPickMatrix( public static void gluPickMatrix(
float x, float x,
float y, float y,
float width, float width,
float height, float height,
int viewport[]) { int viewport[]) {
Project.gluPickMatrix(x, y, width, height, viewport); Project.gluPickMatrix(x, y, width, height, viewport);
} }
@ -121,14 +166,14 @@ public class GLU extends Util implements GLUConstants {
* @return int * @return int
*/ */
public static int gluBuild2DMipmaps( public static int gluBuild2DMipmaps(
int target, int target,
int components, int components,
int width, int width,
int height, int height,
int format, int format,
int type, int type,
ByteBuffer data) { ByteBuffer data) {
return MipMap.gluBuild2DMipmaps(target, components, width, height, format, type, data); return MipMap.gluBuild2DMipmaps(target, components, width, height, format, type, data);
} }
@ -146,15 +191,15 @@ public class GLU extends Util implements GLUConstants {
* @return int * @return int
*/ */
public static int gluScaleImage( public static int gluScaleImage(
int format, int format,
int widthIn, int widthIn,
int heightIn, int heightIn,
int typeIn, int typeIn,
ByteBuffer dataIn, ByteBuffer dataIn,
int widthOut, int widthOut,
int heightOut, int heightOut,
int typeOut, int typeOut,
ByteBuffer dataOut) { ByteBuffer dataOut) {
return MipMap.gluScaleImage(format, widthIn, heightIn, typeIn, dataIn, widthOut, heightOut, typeOut, dataOut); return MipMap.gluScaleImage(format, widthIn, heightIn, typeIn, dataIn, widthOut, heightOut, typeOut, dataOut);
} }