java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31096/src/java/org/lwjgl

Modified Files:
	BufferUtils.java 
Log Message:
Fixed comments

Index: BufferUtils.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/BufferUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BufferUtils.java	1 Mar 2004 13:06:13 -0000	1.1
+++ BufferUtils.java	1 Mar 2004 13:07:00 -0000	1.2
@@ -71,8 +71,8 @@
 	/**
 	 * Construct a direct native-order shortbuffer with the specified number
 	 * of elements.
-	 * @param size The size, in shorts
-	 * @return a ShortBuffer
+	 * @param size The size, in ints
+	 * @return an IntBuffer
 	 */
 	public static IntBuffer createIntBuffer(int size) {
 		return createByteBuffer(size << 2).asIntBuffer();
@@ -81,8 +81,8 @@
 	/**
 	 * Construct a direct native-order shortbuffer with the specified number
 	 * of elements.
-	 * @param size The size, in shorts
-	 * @return a ShortBuffer
+	 * @param size The size, in floats
+	 * @return a FloatBuffer
 	 */
 	public static FloatBuffer createFloatBuffer(int size) {
 		return createByteBuffer(size << 2).asFloatBuffer();

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31025/src/java/org/lwjgl

Added Files:
	BufferUtils.java 
Log Message:
New buffer utils

--- NEW FILE: BufferUtils.java ---
/*
 * Copyright (c) 2002 Light Weight Java Game Library Project
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 * * Redistributions of source code must retain the above copyright
 *   notice, this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * * Neither the name of 'Light Weight Java Game Library' nor the names of
 *   its contributors may be used to endorse or promote products derived
 *   from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

package org.lwjgl;

import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.nio.ShortBuffer;

/**
 * $Id: BufferUtils.java,v 1.1 2004/03/01 13:06:13 cix_foo Exp $
 *
 * Some often-used Buffer code for creating native buffers of the appropriate size.

 * @author $Author: cix_foo $
 * @version $Revision: 1.1 $
 */

public final class BufferUtils {
	
	/**
	 * Construct a direct native-ordered bytebuffer with the specified size.
	 * @param size The size, in bytes
	 * @return a ByteBuffer
	 */	
	public static ByteBuffer createByteBuffer(int size) {
		return ByteBuffer.allocateDirect(size).order(ByteOrder.nativeOrder());
	}
	
	/**
	 * Construct a direct native-order shortbuffer with the specified number
	 * of elements.
	 * @param size The size, in shorts
	 * @return a ShortBuffer
	 */
	public static ShortBuffer createShortBuffer(int size) {
		return createByteBuffer(size << 1).asShortBuffer();
	}

	/**
	 * Construct a direct native-order shortbuffer with the specified number
	 * of elements.
	 * @param size The size, in shorts
	 * @return a ShortBuffer
	 */
	public static IntBuffer createIntBuffer(int size) {
		return createByteBuffer(size << 2).asIntBuffer();
	}

	/**
	 * Construct a direct native-order shortbuffer with the specified number
	 * of elements.
	 * @param size The size, in shorts
	 * @return a ShortBuffer
	 */
	public static FloatBuffer createFloatBuffer(int size) {
		return createByteBuffer(size << 2).asFloatBuffer();
	}

}

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7692

Modified Files:
	ARBProgram.java 
Log Message:
no message

Index: ARBProgram.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/ARBProgram.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ARBProgram.java	15 Feb 2004 19:41:08 -0000	1.3
+++ ARBProgram.java	1 Mar 2004 00:58:53 -0000	1.4
@@ -50,7 +50,7 @@
 	/*
 	* Accepted by the <format> parameter of ProgramStringARB:
 	*/
-	public final static int GL_PROGRAM_FORMAT_ASCII_ARB = 0x8875;
+	public static final int GL_PROGRAM_FORMAT_ASCII_ARB = 0x8875;
 
 	/*
 	* Accepted by the <pname> parameter of GetProgramivARB:
@@ -178,7 +178,7 @@
 			throw new BufferUnderflowException();
 		}
 	}
-	
+
 	// ---------------------------
 	public static void glProgramEnvParameterARB(int target, int index, FloatBuffer params) {
 		checkProgramEnv(index, params);

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6682

Modified Files:
	GLContext.java 
Log Message:
Added ARB_fragment_program_shadow

Index: GLContext.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLContext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- GLContext.java	24 Feb 2004 14:31:34 -0000	1.5
+++ GLContext.java	1 Mar 2004 00:53:58 -0000	1.6
@@ -51,7 +51,7 @@
  * @version $Revision$
  */
 public final class GLContext {
-	
+
 	/** The currently initialised context */
 	private static WeakReference currentContext;
 
@@ -61,6 +61,7 @@
 	public static boolean GL_ARB_imaging;
 	public static boolean GL_ARB_depth_texture;
 	public static boolean GL_ARB_fragment_program;
+	public static boolean GL_ARB_fragment_program_shadow;
 	public static boolean GL_ARB_fragment_shader;
 	public static boolean GL_ARB_matrix_palette;
 	public static boolean GL_ARB_multisample;
@@ -191,7 +192,7 @@
 			}
 		}
 	}
-	
+
 	/**
 	 * Makes a GL context the current context. This method does not make the context current though!
 	 * Instead it simply ensures that the current context is reflected accurately by GLContext's
@@ -214,7 +215,7 @@
 			// Yes, so we don't need to do anything. Our caps and function pointers are still valid.
 			return;
 		}
-		
+
 		// Ok, now it's the current context.
 		currentContext = new WeakReference(context);
 		HashSet exts = new HashSet();
@@ -222,7 +223,7 @@
 		determineAvailableExtensions(exts);
 		VBOTracker.setCurrent(currentContext);
 	}
-	
+
 	/**
 	 * Native method to initialize a context
 	 * @param exts An empty Set of Strings that will be filled with the names of enabled extensions

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/glu
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24752

Modified Files:
	GLU.java MipMap.java PixelStoreState.java Project.java 
	Registry.java Sphere.java Util.java 
Log Message:
Made gluProject to use one result FloatBuffer, javadoc corrections

Index: GLU.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/glu/GLU.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- GLU.java	7 Feb 2004 11:43:17 -0000	1.5
+++ GLU.java	29 Feb 2004 23:42:51 -0000	1.6
@@ -8,8 +8,8 @@
 
 /**
  * GLU.java
- * 
- * 
+ *
+ *
  * Created 23-dec-2003
  * @author Erik Duijs
  */
@@ -53,7 +53,7 @@
 			float right,
 			float bottom,
 			float top) {
-		
+
 		GL11.glOrtho(left, right, bottom, top, -1.0, 1.0);
 	}
 
@@ -81,18 +81,16 @@
 	 * @param modelMatrix
 	 * @param projMatrix
 	 * @param viewport
-	 * @param winx
-	 * @param winy
-	 * @param winz
+	 * @param win_pos
 	 * @return
 	 */
-	public static boolean gluProject(float objx, float objy, float objz, 
-			FloatBuffer modelMatrix, 
+	public static boolean gluProject(float objx, float objy, float objz,
+			FloatBuffer modelMatrix,
 			FloatBuffer projMatrix,
 			IntBuffer viewport,
-			FloatBuffer winx, FloatBuffer winy, FloatBuffer winz)
+			FloatBuffer win_pos)
 	{
-		return Project.gluProject(objx, objy, objz, modelMatrix, projMatrix, viewport, winx, winy, winz);
+		return Project.gluProject(objx, objy, objz, modelMatrix, projMatrix, viewport, win_pos);
 	}
 
 	/**
@@ -107,7 +105,7 @@
 	 * @return
 	 */
 	public static boolean gluUnProject(float winx, float winy, float winz,
-			FloatBuffer modelMatrix, 
+			FloatBuffer modelMatrix,
 			FloatBuffer projMatrix,
 			IntBuffer viewport,
 			FloatBuffer obj_pos)
@@ -129,7 +127,7 @@
 			float width,
 			float height,
 			IntBuffer viewport) {
-		
+
 		Project.gluPickMatrix(x, y, width, height, viewport);
 	}
 
@@ -141,11 +139,11 @@
 	public static String gluGetString(int name) {
 		return Registry.gluGetString(name);
 	}
-	
+
 	/**
 	 * Method gluCheckExtension.
-	 * @param string
-	 * @param string1
+	 * @param extName
+	 * @param extString
 	 * @return boolean
 	 */
 	public static boolean gluCheckExtension(String extName, String extString) {
@@ -171,21 +169,21 @@
 			int format,
 			int type,
 			ByteBuffer data) {
-		
+
 		return MipMap.gluBuild2DMipmaps(target, components, width, height, format, type, data);
 	}
 
 	/**
 	 * Method gluScaleImage.
 	 * @param format
-	 * @param width
-	 * @param height
-	 * @param type
-	 * @param data
-	 * @param w
-	 * @param h
-	 * @param type1
-	 * @param image
+	 * @param widthIn
+	 * @param heightIn
+	 * @param typeIn
+	 * @param dataIn
+	 * @param widthOut
+	 * @param heightOut
+	 * @param typeOut
+	 * @param dataOut
 	 * @return int
 	 */
 	public static int gluScaleImage(
@@ -198,7 +196,7 @@
 			int heightOut,
 			int typeOut,
 			ByteBuffer dataOut) {
-		
+
 		return MipMap.gluScaleImage(format, widthIn, heightIn, typeIn, dataIn, widthOut, heightOut, typeOut, dataOut);
 	}
 

Index: MipMap.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/glu/MipMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MipMap.java	21 Jan 2004 10:06:47 -0000	1.2
+++ MipMap.java	29 Feb 2004 23:42:51 -0000	1.3
@@ -6,8 +6,8 @@
 
 /**
  * MipMap.java
- * 
- * 
+ *
+ *
  * Created 11-jan-2004
  * @author Erik Duijs
  */
@@ -15,7 +15,7 @@
 
 	/**
 	 * Method gluBuild2DMipmaps
-	 * 
+	 *
 	 * @param target
 	 * @param components
 	 * @param width
@@ -123,14 +123,14 @@
 	/**
 	 * Method gluScaleImage.
 	 * @param format
-	 * @param width
-	 * @param height
-	 * @param type
-	 * @param data
-	 * @param w
-	 * @param h
-	 * @param type1
-	 * @param image
+	 * @param widthIn
+	 * @param heightIn
+	 * @param typein
+	 * @param dataIn
+	 * @param widthOut
+	 * @param heightOut
+	 * @param typeOut
+	 * @param dataOut
 	 * @return int
 	 */
 	public static int gluScaleImage(
@@ -149,7 +149,7 @@
 		float sx, sy;
 		int sizein, sizeout;
 		int rowstride, rowlen;
-		
+
 		components = compPerPix(format);
 		if (components == -1) {
 			return GLU_INVALID_ENUM;
@@ -253,7 +253,7 @@
 			}
 		}
 
-		
+
 		// Convert temp output
 		if (pss.packRowLength > 0) {
 			rowlen = pss.packRowLength;

Index: PixelStoreState.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/glu/PixelStoreState.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PixelStoreState.java	21 Jan 2004 10:06:47 -0000	1.2
+++ PixelStoreState.java	29 Feb 2004 23:42:51 -0000	1.3
@@ -4,8 +4,8 @@
 
 /**
  * PixelStoreState.java
- * 
- * 
+ *
+ *
  * Created 11-jan-2004
  * @author Erik Duijs
  */
@@ -19,15 +19,15 @@
 	public int packAlignment = glGetIntegerv(GL11.GL_PACK_ALIGNMENT);
 	public int packSkipRows = glGetIntegerv(GL11.GL_PACK_SKIP_ROWS);
 	public int packSkipPixels = glGetIntegerv(GL11.GL_PACK_SKIP_PIXELS);
-	
+
 	/**
 	 * Constructor for PixelStoreState.
 	 */
-	public PixelStoreState() {
+	PixelStoreState() {
 		super();
 		load();
 	}
-	
+
 	public void load() {
 		unpackRowLength = glGetIntegerv(GL11.GL_UNPACK_ROW_LENGTH);
 		unpackAlignment = glGetIntegerv(GL11.GL_UNPACK_ALIGNMENT);

Index: Project.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/glu/Project.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Project.java	5 Feb 2004 16:53:30 -0000	1.4
+++ Project.java	29 Feb 2004 23:42:51 -0000	1.5
@@ -7,8 +7,8 @@
 
 /**
  * Project.java
- * 
- * 
+ *
+ *
  * Created 11-jan-2004
  * @author Erik Duijs
  */
@@ -48,7 +48,7 @@
 	private static void __gluMultMatrixVecf(FloatBuffer finalMatrix, float[] in, float[] out) {
 
 		for (int i=0; i<4; i++) {
-			out[i] = 
+			out[i] =
 				in[0] * finalMatrix.get(0*4+i) +
 				in[1] * finalMatrix.get(1*4+i) +
 				in[2] * finalMatrix.get(2*4+i) +
@@ -57,8 +57,8 @@
 	}
 
 	/**
-	 * @param finalMatrix
-	 * @param finalMatrix2
+	 * @param src
+	 * @param inverse
 	 * @return
 	 */
 	private static boolean __gluInvertMatrixf(FloatBuffer src, FloatBuffer inverse) {
@@ -129,23 +129,23 @@
 	}
 
 	/**
-	 * @param modelMatrix
-	 * @param projMatrix
-	 * @param finalMatrix
+	 * @param a
+	 * @param b
+	 * @param r
 	 */
 	private static void __gluMultMatricesf(FloatBuffer a, FloatBuffer b, FloatBuffer r) {
 
 		for (int i = 0; i < 4; i++) {
 			for (int j = 0; j < 4; j++) {
-				r.put(i*4+j, 
+				r.put(i*4+j,
 						a.get(i*4+0)*b.get(0*4+j) +
 						a.get(i*4+1)*b.get(1*4+j) +
 						a.get(i*4+2)*b.get(2*4+j) +
 						a.get(i*4+3)*b.get(3*4+j));
 			}
-		}		
+		}
 	}
-	
+
 	/**
 	 * Method gluPerspective.
 	 * @param fovy
@@ -199,7 +199,6 @@
 			float upy,
 			float upz) {
 
-		int i;
 		float[] forward = new float[3];
 		float[] side = new float[3];
 		float[] up = new float[3];
@@ -246,16 +245,14 @@
 	 * @param modelMatrix
 	 * @param projMatrix
 	 * @param viewport
-	 * @param winx
-	 * @param winy
-	 * @param winz
+	 * @param win_pos
 	 * @return
 	 */
-	public static boolean gluProject(float objx, float objy, float objz, 
-			FloatBuffer modelMatrix, 
+	public static boolean gluProject(float objx, float objy, float objz,
+			FloatBuffer modelMatrix,
 			FloatBuffer projMatrix,
 			IntBuffer viewport,
-			FloatBuffer winx, FloatBuffer winy, FloatBuffer winz)
+			FloatBuffer win_pos)
 	{
 		float[] in = new float[4];
 		float[] out = new float[4];
@@ -279,9 +276,12 @@
 		in[0] = in[0] * viewport.get(2) + viewport.get(0);
 		in[1] = in[1] * viewport.get(3) + viewport.get(1);
 
-		winx.put(0, in[0]);
-		winy.put(0, in[1]);
-		winz.put(0, in[2]);
+		int pos = win_pos.position();
+
+		win_pos.put(pos++, in[0]);
+		win_pos.put(pos++, in[1]);
+		win_pos.put(pos, in[2]);
+
 		return true;
 	}
 
@@ -293,13 +293,11 @@
 	 * @param modelMatrix
 	 * @param projMatrix
 	 * @param viewport
-	 * @param objx
-	 * @param objy
-	 * @param objz
+	 * @param obj_pos
 	 * @return
 	 */
 	public static boolean gluUnProject(float winx, float winy, float winz,
-			FloatBuffer modelMatrix, 
+			FloatBuffer modelMatrix,
 			FloatBuffer projMatrix,
 			IntBuffer viewport,
 			FloatBuffer obj_pos)
@@ -329,9 +327,13 @@
 		out[0] /= out[3];
 		out[1] /= out[3];
 		out[2] /= out[3];
-		obj_pos.put(0, out[0]);
-		obj_pos.put(1, out[1]);
-		obj_pos.put(2, out[2]);
+
+		int pos = obj_pos.position();
+
+		obj_pos.put(pos++, out[0]);
+		obj_pos.put(pos++, out[1]);
+		obj_pos.put(pos, out[2]);
+
 		return true;
 	}
 

Index: Registry.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/glu/Registry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Registry.java	20 Jan 2004 14:24:36 -0000	1.1
+++ Registry.java	29 Feb 2004 23:42:51 -0000	1.2
@@ -2,8 +2,8 @@
 
 /**
  * Registry.java
- * 
- * 
+ *
+ *
  * Created 11-jan-2004
  * @author Erik Duijs
  */
@@ -30,17 +30,15 @@
 
 	/**
 	 * Method gluCheckExtension
-	 * 
+	 *
 	 * @param extName is an extension name.
-	 * @param extString is a string of extensions separated by blank(s). There may or 
+	 * @param extString is a string of extensions separated by blank(s). There may or
 	 * may not be leading or trailing blank(s) in extString.
 	 * This works in cases of extensions being prefixes of another like
 	 * GL_EXT_texture and GL_EXT_texture3D.
 	 * @return boolean true if extName is found otherwise it returns false.
 	 */
 	public static boolean gluCheckExtension(String extName, String extString) {
-		boolean flag = false;
-
 		if (extString == null || extName == null)
 			return false;
 

Index: Sphere.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/glu/Sphere.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Sphere.java	21 Jan 2004 10:06:47 -0000	1.2
+++ Sphere.java	29 Feb 2004 23:42:51 -0000	1.3
@@ -5,8 +5,8 @@
 
 /**
  * Sphere.java
- * 
- * 
+ *
+ *
  * Created 23-dec-2003
  * @author Erik Duijs
  */
@@ -27,7 +27,7 @@
 	 * If the orientation is set to GLU.OUTSIDE (with glu.quadricOrientation), then
 	 * any normals generated point away from the center of the sphere. Otherwise,
 	 * they point toward the center of the sphere.
-	
+
 	 * If texturing is turned on (with glu.quadricTexture), then texture
 	 * coordinates are generated so that t ranges from 0.0 at z=-radius to 1.0 at
 	 * z=radius (t increases linearly along longitudinal lines), and s ranges from
@@ -44,11 +44,7 @@
 		boolean normals;
 		float nsign;
 
-		if (super.normals == GLU_NONE) {
-			normals = false;
-		} else {
-			normals = true;
-		}
+		normals = super.normals != GLU_NONE;
 
 		if (super.orientation == GLU_INSIDE) {
 			nsign = -1.0f;
@@ -125,7 +121,6 @@
 				GL11.glVertex3f(0.0f, 0.0f, -radius * nsign);
 				rho = PI - drho;
 				s = 1.0f;
-				t = dt;
 				for (j = slices; j >= 0; j--) {
 					theta = (j == slices) ? 0.0f : j * dtheta;
 					x = -sin(theta) * sin(rho);
@@ -141,7 +136,7 @@
 		} else if (
 			super.drawStyle == GLU_LINE
 				|| super.drawStyle == GLU_SILHOUETTE) {
-			// draw stack lines 
+			// draw stack lines
 			for (i = 1;
 				i < stacks;
 				i++) { // stack line at i==stacks-1 was missing here

Index: Util.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/glu/Util.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Util.java	15 Feb 2004 19:41:51 -0000	1.3
+++ Util.java	29 Feb 2004 23:42:51 -0000	1.4
@@ -10,8 +10,8 @@
 
 /**
  * Util.java
- * 
- * 
+ *
+ *
  * Created 7-jan-2004
  * @author Erik Duijs
  */
@@ -21,13 +21,20 @@
 	private static IntBuffer scratch = createIntBuffer(256);
 
 	/**
-	 * Return ceiling of integer division
	 * @param a
	 * @param b
	 * @return int
	 */
+	 * Return ceiling of integer division
+	 * @param a
+	 * @param b
+	 * @return int
+	 */
 	protected static int ceil(int a, int b) {
 		return (a % b == 0 ? a / b : a / b + 1);
 	}
 
 	/**
-	 * Normalize vector
	 * @param v
	 * @return float[]
	 */
+	 * Normalize vector
+	 * @param v
+	 * @return float[]
+	 */
 	protected static float[] normalize(float[] v) {
 		float r;
 
@@ -43,13 +50,17 @@
 	}
 
 	/**
-	 * Calculate cross-product
	 * @param v1
	 * @param v2
	 * @param result
	 */
+	 * Calculate cross-product
+	 * @param v1
+	 * @param v2
+	 * @param result
+	 */
 	protected static void cross(float[] v1, float[] v2, float[] result) {
 		result[0] = v1[1] * v2[2] - v1[2] * v2[1];
 		result[1] = v1[2] * v2[0] - v1[0] * v2[2];
 		result[2] = v1[0] * v2[1] - v1[1] * v2[0];
 	}
-	
+
 	/**
 	 * Method compPerPix.
 	 * @param format
@@ -82,11 +93,11 @@
 
 	/**
 	 * Method nearestPower.
-	 * 
-	 * Compute the nearest power of 2 number.  This algorithm is a little 
+	 *
+	 * Compute the nearest power of 2 number.  This algorithm is a little
 	 * strange, but it works quite well.
-	 * 
-	 * @param width
+	 *
+	 * @param value
 	 * @return int
 	 */
 	protected static int nearestPower(int value) {
@@ -104,8 +115,8 @@
 			} else if (value == 3) {
 				return i * 4;
 			}
-			value = value >> 1;
-			i *= 2;
+			value >>= 1;
+			i <<= 1;
 		}
 	}
 
@@ -175,9 +186,12 @@
 
 		return n * m;
 	}
-	
+
 	/**
-	 * Create a FloatBuffer of specified size.
	 * @param size
	 * @return FloatBuffer
	 */
+	 * Create a FloatBuffer of specified size.
+	 * @param size
+	 * @return FloatBuffer
+	 */
 	protected static FloatBuffer createFloatBuffer(int size) {
 		ByteBuffer temp = ByteBuffer.allocateDirect(4 * size);
 		temp.order(ByteOrder.nativeOrder());
@@ -186,7 +200,10 @@
 	}
 
 	/**
-	 * Create IntBuffer of specified size.
	 * @param size
	 * @return IntBuffer
	 */
+	 * Create IntBuffer of specified size.
+	 * @param size
+	 * @return IntBuffer
+	 */
 	protected static IntBuffer createIntBuffer(int size) {
 		ByteBuffer temp = ByteBuffer.allocateDirect(4 * size);
 		temp.order(ByteOrder.nativeOrder());
@@ -197,7 +214,10 @@
 	/**
 	 * Convenience method for returning an int,
 	 * rather than getting it out of a buffer yourself.
-	 * 
	 * @param what
	 * @return int
	 */
+	 *
+	 * @param what
+	 * @return int
+	 */
 	protected static int glGetIntegerv(int what) {
 		scratch.rewind();
 		GL11.glGetInteger(what, scratch);