Commit: a889c6556262b4f9ed62adf4dfdb5e046ab8ee07 - MikuMikuStudio (git)

Main repository of MikuMikuStudio

Commit MetaInfo

• Revision: a889c6556262b4f9ed62adf4dfdb5e046ab8ee07 (tree)
• Time: 2003-09-04 01:20:52
• Author: mojomonkey <mojomonkey@75d0...>
• Commiter: mojomonkey

Log Message

Conversion to LWJGL 0.7

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@73 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

Change Summary

• modified: src/jme/AbstractGame.java
• modified: src/jme/controller/BaseFPSController.java
• modified: src/jme/entity/Entity.java
• modified: src/jme/entity/camera/Camera.java
• modified: src/jme/entity/camera/Frustum.java
• modified: src/jme/entity/effects/ParticleEmitter.java
• modified: src/jme/entity/effects/ParticleSystem.java
• modified: src/jme/geometry/hud/SplashScreen.java
• modified: src/jme/geometry/hud/text/Font2D.java
• modified: src/jme/geometry/model/md3/Md3Model.java
• modified: src/jme/geometry/model/ms/MilkshapeModel.java
• modified: src/jme/geometry/primitive/Box.java
• modified: src/jme/geometry/primitive/Cylinder.java
• modified: src/jme/geometry/primitive/Disk.java
• modified: src/jme/geometry/primitive/PartialDisk.java
• modified: src/jme/geometry/primitive/Primitive.java
• modified: src/jme/geometry/primitive/Pyramid.java
• modified: src/jme/geometry/primitive/Quad.java
• modified: src/jme/geometry/primitive/Quadric.java
• modified: src/jme/geometry/primitive/Sphere.java
• modified: src/jme/geometry/primitive/Triangle.java
• modified: src/jme/locale/SimpleLocale.java
• modified: src/jme/locale/external/BruteForce.java
• modified: src/jme/locale/external/Geomipmap.java
• modified: src/jme/locale/external/Terrain.java
• modified: src/jme/locale/external/feature/SkyBox.java
• modified: src/jme/locale/external/feature/SkyDome.java
• modified: src/jme/locale/external/feature/WaterMesh.java
• modified: src/jme/locale/external/feature/WaterPlane.java
• modified: src/jme/system/DisplaySystem.java
• modified: src/jme/texture/TextureManager.java
• modified: src/jme/world/World.java
• modified: src/test/application/TestApplication.java
• modified: src/test/general/TestController.java
• modified: src/test/general/TestMain.java
• modified: src/test/general/TestParticleSystem.java
• modified: src/test/keycontroller/KeyController.java
• modified: src/test/keycontroller/TestKeyController.java
• add: src/test/model/TestMilkshape.java
• modified: src/test/polygon/TestPolygon.java

Incremental Difference

--- a/src/jme/AbstractGame.java
+++ b/src/jme/AbstractGame.java
@@ -42,7 +42,7 @@ import org.lwjgl.Display;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL;
-import org.lwjgl.opengl.GLU;
+import org.lwjgl.opengl.Window;
 
 /**
  * <code>AbstractGame</code> defines a common way to organize the flow of a 
@@ -56,18 +56,6 @@ import org.lwjgl.opengl.GLU;
 
 public abstract class AbstractGame {
 
-	/**
-	 * gl is the object to communicate with the OpenGL base context.
-	 * This object must be initialized during the initalization phase.
-	 */
-	protected GL gl = null;
-
-	/**
-	 * glu is the object to communication with the OpenGL utility context.
-	 * This object must be initialized during the initalization phase.
-	 */
-	protected GLU glu = null;
-
 	//Flag for running the system.
 	private boolean finished;
 	//holds all splashscreens
@@ -88,16 +76,15 @@ public abstract class AbstractGame {
 			initSystem();
 			
             //check if user initialized gl and glu;
-			if (null == gl || null == glu) {
+			if (!Window.isCreated()) {
 				throw new MonkeyRuntimeException(
-					"The gl and glu contexts"
-						+ "must be initialized in the init phase");
+					"Window must be created during initialization.");
 			}
 			showTitle();
 			initGame();
 
 			//main loop
-			while (!finished && !gl.isCloseRequested()) {
+			while (!finished && !Window.isCloseRequested()) {
 				//update game state
 				update();
 
@@ -105,8 +92,8 @@ public abstract class AbstractGame {
 				render();
 
 				//swap buffers
-				gl.paint();
-				gl.tick();
+				Window.paint();
+				Window.update();
 			}
 		} catch (Throwable t) {
 			t.printStackTrace();
@@ -125,11 +112,11 @@ public abstract class AbstractGame {
 	public final void showTitle() {
 		
 		for(int i = 0; i < splashScreens.size(); i++) {
-			gl.clear(GL.COLOR_BUFFER_BIT | GL.DEPTH_BUFFER_BIT);
-			gl.loadIdentity();
+			GL.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+			GL.glLoadIdentity();
 			((SplashScreen)splashScreens.get(i)).render();
-			gl.paint();
-			gl.tick();
+			Window.paint();
+			Window.update();
 			((SplashScreen)splashScreens.get(i)).holdDisplay();
 		}
 	}

--- a/src/jme/controller/BaseFPSController.java
+++ b/src/jme/controller/BaseFPSController.java
@@ -360,8 +360,8 @@ public class BaseFPSController extends AbstractGameController {
         Vector view =
             entity.getView().subtract(entity.getPosition());
 
-        float cosTheta = org.lwjgl.Math.cos(angle);
-        float sinTheta = org.lwjgl.Math.sin(angle);
+        float cosTheta = (float)Math.cos(angle);
+        float sinTheta = (float)Math.sin(angle);
 
         newView.x = (cosTheta + (1 - cosTheta) * x * x) * view.x;
         newView.x += ((1 - cosTheta) * x * y - z * sinTheta) * view.y;

--- a/src/jme/entity/Entity.java
+++ b/src/jme/entity/Entity.java
@@ -41,12 +41,12 @@ import jme.exception.MonkeyRuntimeException;
 import jme.geometry.Geometry;
 import jme.geometry.bounding.BoundingVolume;
 import jme.math.Vector;
-import jme.physics.PhysicsModule; 
-import jme.system.DisplaySystem;
+import jme.physics.PhysicsModule;
 import jme.entity.camera.Frustum;
 import jme.utility.LoggingSystem;
 
 import org.lwjgl.opengl.GL;
+import org.lwjgl.opengl.Window;
 
 /**
  * <code>Entity</code> defines a game entity that consists of a piece of
@@ -65,7 +65,7 @@ import org.lwjgl.opengl.GL;
  * <code>Entity</code> to represent something abstract.
  * 
  * @author Mark Powell
- * @version 0.1.0
+ * @version $Id: Entity.java,v 1.7 2003-09-03 16:20:52 mojomonkey Exp $
  */
 public class Entity implements EntityInterface {
     /**
@@ -110,9 +110,6 @@ public class Entity implements EntityInterface {
     //physics
     private PhysicsModule physics;
     
-    //the gl object for translation and rotation of the entity.
-    protected GL gl;
-
     /**
      * Constructor initializes the entity. All attributes of the 
      * <code>Entity</code> are empty.
@@ -127,11 +124,9 @@ public class Entity implements EntityInterface {
         }
         children = new ArrayList();
         position = new Vector();
-        
-		gl = DisplaySystem.getDisplaySystem().getGL();
 
-		if(null == gl) {
-			throw new MonkeyGLException("The OpenGL context must be set before " +
				"using Entity.");
+		if(!Window.isCreated()) {
+			throw new MonkeyGLException("Window must be created before Entity.");
 		}
 
         LoggingSystem.getLoggingSystem().getLogger().log(
@@ -154,8 +149,6 @@ public class Entity implements EntityInterface {
         children = new ArrayList();
         position = new Vector();
         
-        gl = DisplaySystem.getDisplaySystem().getGL();
-
         children.add(child);
 
         LoggingSystem.getLoggingSystem().getLogger().log(
@@ -318,12 +311,12 @@ public class Entity implements EntityInterface {
      * Each child is then rendered in turn.
      */
     public void render() {
-        gl.pushMatrix();
-		gl.enable(GL.DEPTH_TEST);
-        gl.translatef(position.x, position.y, position.z);
-        gl.rotatef(roll, 0, 0, 1);
-        gl.rotatef(yaw, 0, 1, 0);
-        gl.rotatef(pitch, 1, 0, 1);
+        GL.glPushMatrix();
+        GL.glEnable(GL.GL_DEPTH_TEST);
+        GL.glTranslatef(position.x, position.y, position.z);
+        GL.glRotatef(roll, 0, 0, 1);
+        GL.glRotatef(yaw, 0, 1, 0);
+        GL.glRotatef(pitch, 1, 0, 1);
         
         //no geometry, so don't render.
         if (null != geometry) {
@@ -334,8 +327,8 @@ public class Entity implements EntityInterface {
         for (int i = 0; i < children.size(); i++) {
             ((Entity)children.get(i)).render();
         }
-		gl.disable(GL.DEPTH_TEST);
-        gl.popMatrix();
+        GL.glDisable(GL.GL_DEPTH_TEST);
+        GL.glPopMatrix();
     }
 
     /**

--- a/src/jme/entity/camera/Camera.java
+++ b/src/jme/entity/camera/Camera.java
@@ -32,10 +32,12 @@
 
 package jme.entity.camera;
 
+import org.lwjgl.opengl.GL;
+import org.lwjgl.opengl.GLU;
+
 import jme.entity.Entity;
 import jme.locale.external.feature.Sky;
 import jme.math.Vector;
-import jme.system.DisplaySystem;
 
 /**
  * <code>Camera</code> defines a camera in three dimensional space. The camera
@@ -288,20 +290,20 @@ public class Camera extends Entity{
      * camera to determine the view. 
      */
     public void render() {
-        DisplaySystem.getDisplaySystem().getGLU().lookAt(
+        GLU.gluLookAt(
             getPosition().x, getPosition().y, getPosition().z,
             getView().x, getView().y, getView().z,
             getUp().x, getUp().y, getUp().z);
         
         if(null != sky) {
-            gl.pushMatrix();
+            GL.glPushMatrix();
             float x = getPosition().x - sky.getSize() / 2;
             float y = getPosition().y - sky.getSize() * 0.75f;
             float z = getPosition().z - sky.getSize() / 2;
-            gl.translatef(x, y, z);
+            GL.glTranslatef(x, y, z);
         
             sky.render();
-            gl.popMatrix();
+            GL.glPopMatrix();
         }
         
         for(int i = 0; i < children.size(); i++) {

--- a/src/jme/entity/camera/Frustum.java
+++ b/src/jme/entity/camera/Frustum.java
@@ -37,10 +37,8 @@ import java.nio.ByteOrder;
 import java.nio.FloatBuffer;
 import java.util.logging.Level;
 
-import jme.system.DisplaySystem;
 import jme.utility.LoggingSystem;
 
-import org.lwjgl.Sys;
 import org.lwjgl.opengl.GL;
 
 /**
@@ -71,7 +69,7 @@ public class Frustum {
      *
      */
     public Frustum() {
-        gl = DisplaySystem.getDisplaySystem().getGL();
+        //gl = DisplaySystem.getDisplaySystem().getGL();
         proj = new float[16];
         modl = new float[16];
         clip = new float[16];
@@ -99,17 +97,14 @@ public class Frustum {
      */
     public void update() {
         float t;
-
-        int projPtr = Sys.getDirectBufferAddress(projBuf);
-        gl.getFloatv(GL.PROJECTION_MATRIX, projPtr);
-        projBuf.rewind();
+        projBuf.clear();
+        modlBuf.clear();
+        GL.glGetFloat(GL.GL_PROJECTION_MATRIX, projBuf);
         projBuf.get(proj);
 
-        int modlPtr = Sys.getDirectBufferAddress(modlBuf);
-        gl.getFloatv(GL.MODELVIEW_MATRIX, modlPtr);
-        modlBuf.rewind();
+        GL.glGetFloat(GL.GL_MODELVIEW_MATRIX, modlBuf);
         modlBuf.get(modl);
-
+       
         clip[0] =
             modl[0] * proj[0]
                 + modl[1] * proj[4]
@@ -202,7 +197,7 @@ public class Frustum {
 
         /* Normalize the result */
         t =
-            org.lwjgl.Math.sqrt(
+            (float)Math.sqrt(
                 frustum[0][0] * frustum[0][0]
                     + frustum[0][1] * frustum[0][1]
                     + frustum[0][2] * frustum[0][2]);
@@ -219,7 +214,7 @@ public class Frustum {
 
         /* Normalize the result */
         t =
-            org.lwjgl.Math.sqrt(
+            (float)Math.sqrt(
                 frustum[1][0] * frustum[1][0]
                     + frustum[1][1] * frustum[1][1]
                     + frustum[1][2] * frustum[1][2]);
@@ -236,7 +231,7 @@ public class Frustum {
 
         /* Normalize the result */
         t =
-            org.lwjgl.Math.sqrt(
+            (float)Math.sqrt(
                 frustum[2][0] * frustum[2][0]
                     + frustum[2][1] * frustum[2][1]
                     + frustum[2][2] * frustum[2][2]);
@@ -253,7 +248,7 @@ public class Frustum {
 
         /* Normalize the result */
         t =
-            org.lwjgl.Math.sqrt(
+            (float)Math.sqrt(
                 frustum[3][0] * frustum[3][0]
                     + frustum[3][1] * frustum[3][1]
                     + frustum[3][2] * frustum[3][2]);
@@ -270,7 +265,7 @@ public class Frustum {
 
         /* Normalize the result */
         t =
-            org.lwjgl.Math.sqrt(
+            (float)Math.sqrt(
                 frustum[4][0] * frustum[4][0]
                     + frustum[4][1] * frustum[4][1]
                     + frustum[4][2] * frustum[4][2]);
@@ -287,7 +282,7 @@ public class Frustum {
 
         /* Normalize the result */
         t =
-            org.lwjgl.Math.sqrt(
+            (float)Math.sqrt(
                 frustum[5][0] * frustum[5][0]
                     + frustum[5][1] * frustum[5][1]
                     + frustum[5][2] * frustum[5][2]);

--- a/src/jme/entity/effects/ParticleEmitter.java
+++ b/src/jme/entity/effects/ParticleEmitter.java
@@ -36,11 +36,9 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.FloatBuffer;
 
-import org.lwjgl.Sys;
 import org.lwjgl.opengl.GL;
 import org.lwjgl.vector.Vector3f;
 
-import jme.system.DisplaySystem;
 import jme.texture.TextureManager;
 
 /**
@@ -64,8 +62,6 @@ import jme.texture.TextureManager;
  * @version 1
  */
 public class ParticleEmitter {
-	//gl object for rendering
-	private GL gl;
 
 	//handles the particle objects.
 	private int numParticles;
@@ -110,7 +106,6 @@ public class ParticleEmitter {
 	 * 		on screen at any one time.
 	 */
 	public ParticleEmitter(int numParticles) {
-		gl = DisplaySystem.getDisplaySystem().getGL();
 
 		this.numParticles = numParticles;
 		particles = new Particle[numParticles];
@@ -206,16 +201,15 @@ public class ParticleEmitter {
 	 * effect using two dimensional objects. 
 	 */
 	public void render() {
-		gl.pushMatrix();
+		GL.glPushMatrix();
 		//set gl state.
-		gl.enable(GL.TEXTURE_2D);
-		gl.enable(GL.BLEND);
-		gl.blendFunc(GL.SRC_ALPHA, GL.ONE);
+		GL.glEnable(GL.GL_TEXTURE_2D);
+		GL.glEnable(GL.GL_BLEND);
+		GL.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE);
 		TextureManager.getTextureManager().bind(texId);
 
 		//get the view matrix for billboarding.
-		int bufPtr = Sys.getDirectBufferAddress(buf);
-		gl.getFloatv(GL.MODELVIEW_MATRIX, bufPtr);
+        GL.glGetFloat(GL.GL_MODELVIEW_MATRIX, buf);
 		buf.rewind();
 		buf.get(matrix);
 
@@ -230,13 +224,13 @@ public class ParticleEmitter {
 
 		//render each particle
 		for (int i = 0; i < numParticles; i++) {
-			gl.color4f(
+			GL.glColor4f(
 				particles[i].color.x,
 				particles[i].color.y,
 				particles[i].color.z,
 				particles[i].life);
-			gl.begin(GL.TRIANGLE_STRIP);
-			gl.texCoord2d(1, 1);
+			GL.glBegin(GL.GL_TRIANGLE_STRIP);
+			GL.glTexCoord2f(1, 1);
 
 			//top right of quad
 			billboard.x =
@@ -248,8 +242,8 @@ public class ParticleEmitter {
 			billboard.z =
 				(right.z + up.z) * particles[i].size.z
 					+ particles[i].position.z;
-			gl.vertex3f(billboard.x, billboard.y, billboard.z);
-			gl.texCoord2d(0, 1);
+			GL.glVertex3f(billboard.x, billboard.y, billboard.z);
+			GL.glTexCoord2f(0, 1);
 
 			//top left of quad
 			billboard.x =
@@ -262,8 +256,8 @@ public class ParticleEmitter {
 				(up.z - right.z) * particles[i].size.z
 					+ particles[i].position.z;
 			
-			gl.vertex3f(billboard.x, billboard.y, billboard.z);
-			gl.texCoord2d(1, 0);
+			GL.glVertex3f(billboard.x, billboard.y, billboard.z);
+			GL.glTexCoord2f(1, 0);
 
 			//bottom right of quad
 			billboard.x =
@@ -273,8 +267,8 @@ public class ParticleEmitter {
 			billboard.z =
 				(right.z - up.z) * particles[i].size.z + particles[i].position.z;
 			
-			gl.vertex3f(billboard.x, billboard.y, billboard.z);
-			gl.texCoord2d(0, 0);
+			GL.glVertex3f(billboard.x, billboard.y, billboard.z);
+			GL.glTexCoord2f(0, 0);
 
 			//bottom left of quad
 			billboard.x =
@@ -290,15 +284,15 @@ public class ParticleEmitter {
 					- particles[i].size.z
 					+ particles[i].position.z;
 			
-			gl.vertex3f(billboard.x, billboard.y, billboard.z);
-			gl.end();
+			GL.glVertex3f(billboard.x, billboard.y, billboard.z);
+			GL.glEnd();
 
 		}
 
 		//revert open gl state
-		gl.disable(GL.TEXTURE_2D);
-        gl.disable(GL.BLEND);
-		gl.popMatrix();
+		GL.glDisable(GL.GL_TEXTURE_2D);
+        GL.glDisable(GL.GL_BLEND);
+		GL.glPopMatrix();
 	}
 
 	/**
@@ -399,8 +393,8 @@ public class ParticleEmitter {
 	public void setTexture(String filename) {
 		texId = TextureManager.getTextureManager().loadTexture(
 				filename,
-				GL.LINEAR_MIPMAP_LINEAR,
-				GL.LINEAR,
+				GL.GL_LINEAR_MIPMAP_LINEAR,
+				GL.GL_LINEAR,
 				true);
 	}
 	

--- a/src/jme/entity/effects/ParticleSystem.java
+++ b/src/jme/entity/effects/ParticleSystem.java
@@ -38,7 +38,6 @@ import org.lwjgl.opengl.GL;
 import org.lwjgl.vector.Vector3f;
 
 import jme.entity.EntityInterface;
-import jme.system.DisplaySystem;
 import jme.entity.camera.Frustum;
 import jme.geometry.bounding.BoundingVolume;
 
@@ -47,17 +46,15 @@ import jme.geometry.bounding.BoundingVolume;
  * particle emitters. 
  * 
  * @author Mark Powell
- * @version $Id: ParticleSystem.java,v 1.3 2003-08-31 19:49:49 mojomonkey Exp $
+ * @version $Id: ParticleSystem.java,v 1.4 2003-09-03 16:20:52 mojomonkey Exp $
  */
 public class ParticleSystem implements EntityInterface {
     private ArrayList emitters;
     private Vector3f position;
-    private GL gl;
     private BoundingVolume boundingVolume;
     
     public ParticleSystem() {
         emitters = new ArrayList();
-        gl = DisplaySystem.getDisplaySystem().getGL();
         position = new Vector3f();
     }
 
@@ -65,12 +62,12 @@ public class ParticleSystem implements EntityInterface {
      * @see jme.entity.EntityInterface#render()
      */
     public void render() {
-    	gl.pushMatrix();
-    	gl.translatef(position.x, position.y, position.z);
+        GL.glPushMatrix();
+        GL.glTranslatef(position.x, position.y, position.z);
         for(int i = 0; i < emitters.size(); i++) {
             ((ParticleEmitter)emitters.get(i)).render();
         }
-        gl.popMatrix();
+        GL.glPopMatrix();
     }
 
     /**

--- a/src/jme/geometry/hud/SplashScreen.java
+++ b/src/jme/geometry/hud/SplashScreen.java
@@ -33,10 +33,10 @@ package jme.geometry.hud;
 
 import jme.exception.MonkeyGLException;
 import jme.exception.MonkeyRuntimeException;
-import jme.system.DisplaySystem;
 import jme.texture.TextureManager;
 
 import org.lwjgl.opengl.GL;
+import org.lwjgl.opengl.Window;
 
 /**
  * <code>SplashScreen</code> creates a screen encompassing splash screen to 
@@ -45,10 +45,9 @@ import org.lwjgl.opengl.GL;
  * to be displayed for a set amount of time. 
  * 
  * @author Mark Powell 
- * @version 0.1.0
+ * @version $Id: SplashScreen.java,v 1.2 2003-09-03 16:20:51 mojomonkey Exp $
  */
 public class SplashScreen {
-	private GL gl;
 	private int texId;
 	private float x, y;
 	private float width, height;
@@ -62,17 +61,16 @@ public class SplashScreen {
 	 * 		the OpenGL context.
 	 */
 	public SplashScreen() {
-		gl = DisplaySystem.getDisplaySystem().getGL();
-		if(null == gl) {
-			throw new MonkeyGLException("GL is null. Insure Display has been " +
				"created.");
+		if(!Window.isCreated()) {
+			throw new MonkeyGLException("Window must be created first.");
 		}
 		red = 1.0f;
 		blue = 1.0f;
 		green = 1.0f;
 		alpha = 1.0f;
 		
-		width = gl.getWidth();
-		height = gl.getHeight();
+		width = Window.getWidth();
+		height = Window.getHeight();
 		
 		isBlended = true;
 	}
@@ -84,8 +82,8 @@ public class SplashScreen {
 	public void setTexture(String filename) {
 		texId = TextureManager.getTextureManager().loadTexture(
 			filename,
-			GL.LINEAR,
-			GL.LINEAR,
+			GL.GL_LINEAR,
+			GL.GL_LINEAR,
 			true);
 	}
 	
@@ -169,46 +167,46 @@ public class SplashScreen {
 		
 		//set the GL states to how we want them.
 		if(isBlended) {
-			gl.enable(GL.BLEND);
+			GL.glEnable(GL.GL_BLEND);
 		}
-		gl.disable(GL.DEPTH_TEST);
-		gl.enable(GL.TEXTURE_2D);
-		gl.matrixMode(GL.PROJECTION);
-		gl.pushMatrix();
-		gl.loadIdentity();
-		gl.ortho(0, gl.getWidth(), 0, gl.getHeight(), -1, 1);
-		gl.matrixMode(GL.MODELVIEW);
-		gl.pushMatrix();
-		gl.loadIdentity();
-		gl.translatef(x,y,0);
-		gl.color4f(red,green,blue,alpha);
+		GL.glDisable(GL.GL_DEPTH_TEST);
+		GL.glEnable(GL.GL_TEXTURE_2D);
+		GL.glMatrixMode(GL.GL_PROJECTION);
+		GL.glPushMatrix();
+		GL.glLoadIdentity();
+		GL.glOrtho(0, Window.getWidth(), 0, Window.getHeight(), -1, 1);
+		GL.glMatrixMode(GL.GL_MODELVIEW);
+		GL.glPushMatrix();
+		GL.glLoadIdentity();
+		GL.glTranslatef(x,y,0);
+		GL.glColor4f(red,green,blue,alpha);
 		TextureManager.getTextureManager().bind(texId);
 		
-		gl.begin(GL.QUADS);
+		GL.glBegin(GL.GL_QUADS);
 		
-		gl.texCoord2i(0,1);
-		gl.vertex3f(0.0f, height, 0.0f);
+		GL.glTexCoord2f(0,1);
+		GL.glVertex3f(0.0f, height, 0.0f);
 		
-		gl.texCoord2i(0,0);
-		gl.vertex3f(0.0f, 0.0f, 0.0f);
+		GL.glTexCoord2f(0,0);
+		GL.glVertex3f(0.0f, 0.0f, 0.0f);
 		
-		gl.texCoord2i(1,0);
-		gl.vertex3f(width, 0.0f, 0.0f);
+		GL.glTexCoord2f(1,0);
+		GL.glVertex3f(width, 0.0f, 0.0f);
 		
-		gl.texCoord2i(1,1);
-		gl.vertex3f(width, height, 0.0f);
+		GL.glTexCoord2f(1,1);
+		GL.glVertex3f(width, height, 0.0f);
 		
-		gl.end();
+		GL.glEnd();
 		
 		if(isBlended) {
-			gl.disable(GL.BLEND);
+			GL.glDisable(GL.GL_BLEND);
 		}
-		gl.matrixMode(GL.PROJECTION);
-		gl.popMatrix();
-		gl.matrixMode(GL.MODELVIEW);
-		gl.popMatrix();
-		gl.enable(GL.DEPTH_TEST);
-		gl.disable(GL.TEXTURE_2D);
+		GL.glMatrixMode(GL.GL_PROJECTION);
+		GL.glPopMatrix();
+		GL.glMatrixMode(GL.GL_MODELVIEW);
+		GL.glPopMatrix();
+		GL.glEnable(GL.GL_DEPTH_TEST);
+		GL.glDisable(GL.GL_TEXTURE_2D);
 	}
 
 	

--- a/src/jme/geometry/hud/text/Font2D.java
+++ b/src/jme/geometry/hud/text/Font2D.java
@@ -35,11 +35,10 @@ package jme.geometry.hud.text;
 import java.nio.ByteBuffer;
 import java.util.logging.Level;
 
-import org.lwjgl.Sys;
 import org.lwjgl.opengl.GL;
+import org.lwjgl.opengl.Window;
 
 import jme.exception.MonkeyRuntimeException;
-import jme.system.DisplaySystem;
 
 import jme.texture.TextureManager;
 import jme.utility.LoggingSystem;
@@ -60,21 +59,19 @@ import jme.utility.LoggingSystem;
  * 
  * 
  * @author Mark Powell
- * @version 1
+ * @version $Id: Font2D.java,v 1.3 2003-09-03 16:20:52 mojomonkey Exp $
  */
 public class Font2D {
     public static final int NORMAL = 0;
     public static final int ITALICS = 1;
 
-    private GL gl = null;
-
     //texture name and 
     private int texId;
     private int base;
-    
+
     //Color to render the font.
     private float red, green, blue, alpha;
-    
+
     private boolean isBlended = true;
 
     /**
@@ -85,27 +82,24 @@ public class Font2D {
      * @see jme.texture.TextureManager
      * 
      * @param texture the path to the image that defines the fonts.
-     */ 
+     */
     public Font2D(String texture) {
         red = 1.0f;
         green = 1.0f;
         blue = 1.0f;
         alpha = 1.0f;
-        
-        gl = DisplaySystem.getDisplaySystem().getGL();
-        
-        if(null == gl) {
-            throw new MonkeyRuntimeException("GL must be created before a call " +
-                "to Font2D is allowed.");
+
+        if (!Window.isCreated()) {
+            throw new MonkeyRuntimeException("Window must be created before Font2D.");
         }
-        
+
         setFontTexture(texture);
 
         buildDisplayList();
-        
-        
-        LoggingSystem.getLoggingSystem().getLogger().log(Level.INFO,
-                "Successfully created Font2D using " + texture);
+
+        LoggingSystem.getLoggingSystem().getLogger().log(
+            Level.INFO,
+            "Successfully created Font2D using " + texture);
     }
 
     /**
@@ -115,11 +109,12 @@ public class Font2D {
      * @param texture the new texture to use.
      */
     public void setFontTexture(String texture) {
-        texId = TextureManager.getTextureManager().loadTexture(
-            texture,
-            GL.LINEAR,
-            GL.LINEAR,
-            false);
+        texId =
+            TextureManager.getTextureManager().loadTexture(
+                texture,
+                GL.GL_LINEAR,
+                GL.GL_LINEAR,
+                false);
     }
 
     /**
@@ -137,14 +132,14 @@ public class Font2D {
         blue = b;
         alpha = a;
     }
-    
+
     /**
      * <code>deleteFont</code> deletes the current display list of font objects.
      * The font will be useless until a call to <code>buildDisplayLists</code> 
      * is made.
      */
     public void deleteFont() {
-        gl.deleteLists(base, 256);
+        GL.glDeleteLists(base, 256);
     }
 
     /**
@@ -165,43 +160,42 @@ public class Font2D {
         }
 
         TextureManager.getTextureManager().bind(texId);
-        
+
         //set the GL states to how we want them.
-        if(isBlended) {
-            gl.enable(GL.BLEND);
+        if (isBlended) {
+            GL.glEnable(GL.GL_BLEND);
         }
-        gl.disable(GL.DEPTH_TEST);
-        gl.enable(GL.TEXTURE_2D);
-        gl.matrixMode(GL.PROJECTION);
-        gl.pushMatrix();
-        gl.loadIdentity();
-        gl.ortho(0, gl.getWidth(), 0, gl.getHeight(), -1, 1);
-        gl.matrixMode(GL.MODELVIEW);
-        gl.pushMatrix();
-        gl.loadIdentity();
-        gl.translated(x, y, 0);
-        gl.listBase(base - 32 + (128 * set));
+        GL.glDisable(GL.GL_DEPTH_TEST);
+        GL.glEnable(GL.GL_TEXTURE_2D);
+        GL.glMatrixMode(GL.GL_PROJECTION);
+        GL.glPushMatrix();
+        GL.glLoadIdentity();
+        GL.glOrtho(0, Window.getWidth(), 0, Window.getHeight(), -1, 1);
+        GL.glMatrixMode(GL.GL_MODELVIEW);
+        GL.glPushMatrix();
+        GL.glLoadIdentity();
+        GL.glTranslatef(x, y, 0);
+        GL.glListBase(base - 32 + (128 * set));
 
         //Put the string into a "pointer"
-        ByteBuffer scratch = ByteBuffer.allocateDirect(text.getBytes().length);
+        ByteBuffer scratch =
+            ByteBuffer.allocateDirect(text.getBytes().length);
         scratch.put(text.getBytes());
-        gl.color4f(red,green,blue,alpha);
+        scratch.flip();
+        GL.glColor4f(red, green, blue, alpha);
         //call the list for each letter in the string.
-        gl.callLists(
-            text.length(),
-            GL.BYTE,
-            Sys.getDirectBufferAddress(scratch));
-        
+        GL.glCallLists(scratch);
+
         //reset the GL states.
-        if(isBlended) {
-            gl.disable(GL.BLEND);
+        if (isBlended) {
+            GL.glDisable(GL.GL_BLEND);
         }
-        gl.matrixMode(GL.PROJECTION);
-        gl.popMatrix();
-        gl.matrixMode(GL.MODELVIEW);
-        gl.popMatrix();
-        gl.enable(GL.DEPTH_TEST);
-        gl.disable(GL.TEXTURE_2D);
+        GL.glMatrixMode(GL.GL_PROJECTION);
+        GL.glPopMatrix();
+        GL.glMatrixMode(GL.GL_MODELVIEW);
+        GL.glPopMatrix();
+        GL.glEnable(GL.GL_DEPTH_TEST);
+        GL.glDisable(GL.GL_TEXTURE_2D);
     }
 
     /**
@@ -213,29 +207,29 @@ public class Font2D {
         float cx;
         float cy;
 
-        base = gl.genLists(256);
+        base = GL.glGenLists(256);
         TextureManager.getTextureManager().bind(texId);
 
         for (int loop = 0; loop < 256; loop++) {
             cx = (loop % 16) / 16.0f;
             cy = (loop / 16) / 16.0f;
 
-            gl.newList(base + loop, GL.COMPILE);
-            gl.begin(GL.QUADS);
-            gl.texCoord2f(cx, 1 - cy - 0.0625f);
-            gl.vertex2i(0, 0);
-            gl.texCoord2f(cx + 0.0625f, 1 - cy - 0.0625f);
-            gl.vertex2i(16, 0);
-            gl.texCoord2f(cx + 0.0625f, 1 - cy);
-            gl.vertex2i(16, 16);
-            gl.texCoord2f(cx, 1 - cy);
-            gl.vertex2i(0, 16);
-            gl.end();
-            gl.translated(10, 0, 0);
-            gl.endList();
+            GL.glNewList(base + loop, GL.GL_COMPILE);
+            GL.glBegin(GL.GL_QUADS);
+            GL.glTexCoord2f(cx, 1 - cy - 0.0625f);
+            GL.glVertex2i(0, 0);
+            GL.glTexCoord2f(cx + 0.0625f, 1 - cy - 0.0625f);
+            GL.glVertex2i(16, 0);
+            GL.glTexCoord2f(cx + 0.0625f, 1 - cy);
+            GL.glVertex2i(16, 16);
+            GL.glTexCoord2f(cx, 1 - cy);
+            GL.glVertex2i(0, 16);
+            GL.glEnd();
+            GL.glTranslatef(10, 0, 0);
+            GL.glEndList();
         }
     }
-    
+
     /**
      * <code>toString</code> returns the string representation of this
      * font object in the Format:<br><br>
@@ -249,9 +243,9 @@ public class Font2D {
     public String toString() {
         String string = super.toString();
         string += "\nColor: " + red + " " + green + " " + blue + " " + alpha;
-        string += "\nBlended: " + isBlended; 
+        string += "\nBlended: " + isBlended;
         string += "\nTexture: " + texId;
-        
+
         return string;
     }
 }

--- a/src/jme/geometry/model/md3/Md3Model.java
+++ b/src/jme/geometry/model/md3/Md3Model.java
@@ -59,8 +59,8 @@ import jme.geometry.bounding.BoundingBox;
 import jme.geometry.bounding.BoundingSphere;
 import jme.geometry.model.Triangle;
 
-import org.lwjgl.Sys;
 import org.lwjgl.opengl.GL;
+import org.lwjgl.opengl.Window;
 
 /**
  * <code>Md3Model</code> handles loading and rendering a Quake 3 MD3 format
@@ -99,6 +99,7 @@ import org.lwjgl.opengl.GL;
  * 
  * 
  * @author Mark Powell
+ * @version $Id: Md3Model.java,v 1.7 2003-09-03 16:20:52 mojomonkey Exp $
  */
 public class Md3Model implements Geometry {
     /**
@@ -153,9 +154,6 @@ public class Md3Model implements Geometry {
     private BoundingSphere boundingSphere;
     private BoundingBox boundingBox;
 
-    //OpenGL context.
-    private GL gl;
-
     //Model constants
     private static final int START_TORSO_ANIMATION = 6;
     private static final int START_LEGS_ANIMATION = 13;
@@ -174,9 +172,8 @@ public class Md3Model implements Geometry {
         if (null == path || null == model) {
             throw new MonkeyRuntimeException("Path and model cannot be null.");
         }
-        gl = DisplaySystem.getDisplaySystem().getGL();
-        if (null == gl) {
-            throw new MonkeyGLException("OpenGL context must be created first.");
+        if (!Window.isCreated()) {
+            throw new MonkeyGLException("Window must be created first.");
         }
         
         buf =
@@ -270,16 +267,16 @@ public class Md3Model implements Geometry {
      * front.
      */
     public void render() {
-        DisplaySystem.getDisplaySystem().cullMode(GL.FRONT, true);
+        DisplaySystem.getDisplaySystem().cullMode(GL.GL_FRONT, true);
         
         //MD3 has Z up, so remedy this.
-		gl.rotatef(-90,0,1,0);
-        gl.rotatef(-90, 1, 0, 0);
+		GL.glRotatef(-90,0,1,0);
+        GL.glRotatef(-90, 1, 0, 0);
         
         //scale by a desired factor
-        gl.scalef(scale.x, scale.y, scale.z);
+        GL.glScalef(scale.x, scale.y, scale.z);
         //set the desired color
-        gl.color4f(r, g, b, a);
+        GL.glColor4f(r, g, b, a);
 
         //Update the leg and torso animations
         updateModel(lower);
@@ -287,8 +284,8 @@ public class Md3Model implements Geometry {
 
         //start rendering with the legs first.
         drawLink(lower);
-        //set culling back to GL.BACK
-        DisplaySystem.getDisplaySystem().cullMode(GL.BACK, true);
+        //set culling back to GL.GL_BACK
+        DisplaySystem.getDisplaySystem().cullMode(GL.GL_BACK, true);
     }
 
     /**
@@ -1047,8 +1044,8 @@ public class Md3Model implements Geometry {
                 ((MaterialInfo)model.materials.get(i)).texureId =
                     TextureManager.getTextureManager().loadTexture(
                         fullPath,
-                        GL.LINEAR_MIPMAP_LINEAR,
-                        GL.LINEAR,
+                        GL.GL_LINEAR_MIPMAP_LINEAR,
+                        GL.GL_LINEAR,
                         true);
             }
         }
@@ -1246,16 +1243,16 @@ public class Md3Model implements Geometry {
                 finalMatrix[14] = position.z;
 
                 //render the model
-                gl.pushMatrix();
+                GL.glPushMatrix();
 
                 buf.clear();
                 buf.put(finalMatrix);
-                int ptr = Sys.getDirectBufferAddress(buf);
-                gl.multMatrixf(ptr);
+                buf.flip();
+                GL.glMultMatrixf(buf);
                 //render the children
                 drawLink(model.links[i]);
 
-                gl.popMatrix();
+                GL.glPopMatrix();
             }
         }
 
@@ -1308,18 +1305,18 @@ public class Md3Model implements Geometry {
             
             //if there is a texture assigned to the model, use it.
             if (object3d.hasTexture) {
-                gl.enable(GL.TEXTURE_2D);
+                GL.glEnable(GL.GL_TEXTURE_2D);
 
                 int textureID = ((MaterialInfo)model.materials.get(
                             object3d.materialID)).texureId;
 
                 TextureManager.getTextureManager().bind(textureID);
             } else {
-                gl.disable(GL.TEXTURE_2D);
+                GL.glDisable(GL.GL_TEXTURE_2D);
             }
 
             //render the model as triangles
-            gl.begin(GL.TRIANGLES);
+            GL.glBegin(GL.GL_TRIANGLES);
 
             for (int j = 0; j < object3d.numOfFaces; j++) {
                 for (int whichVertex = 0; whichVertex < 3; whichVertex++) {
@@ -1327,7 +1324,7 @@ public class Md3Model implements Geometry {
 
                     if (object3d.texVerts != null) {
                         // Assign the texture coordinate to this vertex
-                        gl.texCoord2f(
+                        GL.glTexCoord2f(
                             object3d.texVerts[index].x,
                             object3d.texVerts[index].y);
                     }
@@ -1336,14 +1333,14 @@ public class Md3Model implements Geometry {
                     Vector point2 = object3d.verts[nextIndex + index];
                     
                     //interpolate
-                    gl.vertex3f(
+                    GL.glVertex3f(
                         point1.x + model.t * (point2.x - point1.x),
                         point1.y + model.t * (point2.y - point1.y),
                         point1.z + model.t * (point2.z - point1.z));
 
                 }
             }
-            gl.end();
+            GL.glEnd();
         }
     }
     

--- a/src/jme/geometry/model/ms/MilkshapeModel.java
+++ b/src/jme/geometry/model/ms/MilkshapeModel.java
@@ -37,11 +37,11 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
 import java.util.logging.Level;
 
-import org.lwjgl.Sys;
 import org.lwjgl.opengl.GL;
-import org.lwjgl.vector.Vector3f;
+import org.lwjgl.opengl.Window;
 
 import jme.exception.MonkeyGLException;
 import jme.geometry.*;
@@ -55,7 +55,6 @@ import jme.geometry.model.Triangle;
 import jme.geometry.model.Vertex;
 import jme.math.Matrix;
 import jme.math.Vector;
-import jme.system.DisplaySystem;
 import jme.texture.TextureManager;
 import jme.utility.Conversion;
 import jme.utility.LoggingSystem;
@@ -67,6 +66,7 @@ import jme.utility.LoggingSystem;
  * to version 3. Animation is not currently supported, but planned.
  * 
  * @author Mark Powell
+ * @version $Id: MilkshapeModel.java,v 1.5 2003-09-03 16:20:52 mojomonkey Exp $
  */
 public class MilkshapeModel implements Geometry {
     //defines the bounding volumes of the model.
@@ -77,17 +77,14 @@ public class MilkshapeModel implements Geometry {
     private float animationFPS;
     private float currentTime;
     private int totalFrames;
-    
+
     //model data information
     private String modelFile;
     private ByteBuffer buffer;
     private String id;
     private String path;
     private int version;
-    /**
-     * the OpenGL context object.
-     */
-    private GL gl;
+
     /**
      * the color of the model. This color will be applied as a whole to the
      * model and may be trumped by the material level.
@@ -96,7 +93,7 @@ public class MilkshapeModel implements Geometry {
     /**
      * the scale of the model, where 1.0 is the standard size of the model.
      */
-    private Vector3f scale;
+    private Vector scale;
     /**
      * the number of meshes that makes up the model.
      */
@@ -148,8 +145,7 @@ public class MilkshapeModel implements Geometry {
      * @throws MonkeyGLException if the OpenGL context has not been created.
      */
     public MilkshapeModel(String modelFile) {
-        gl = DisplaySystem.getDisplaySystem().getGL();
-        if (null == gl) {
+        if (!Window.isCreated()) {
             throw new MonkeyGLException(
                 "OpenGL context must be " + "created before MilkshapeModel.");
         }
@@ -160,7 +156,7 @@ public class MilkshapeModel implements Geometry {
         blue = 1.0f;
         green = 1.0f;
         alpha = 1.0f;
-        scale = new Vector3f(1.0f, 1.0f, 1.0f);
+        scale = new Vector(1.0f, 1.0f, 1.0f);
 
         initialize();
         setBoundingVolumes();
@@ -178,7 +174,7 @@ public class MilkshapeModel implements Geometry {
             file.getAbsolutePath().substring(
                 0,
                 file.getAbsolutePath().length() - file.getName().length());
-        int length = (int)file.length();
+        int length = (int) file.length();
         data = new byte[length];
         FileInputStream fis;
         try {
@@ -428,58 +424,56 @@ public class MilkshapeModel implements Geometry {
         Triangle currentTri;
         int triangleIndex;
         int index;
-        ByteBuffer temp = ByteBuffer.allocateDirect(16);
-        temp.order(ByteOrder.nativeOrder());
-        gl.color4f(red, green, blue, alpha);
-        gl.pushMatrix();
-        gl.scalef(scale.x, scale.y, scale.z);
+        FloatBuffer temp =
+            ByteBuffer
+                .allocateDirect(16)
+                .order(ByteOrder.nativeOrder())
+                .asFloatBuffer();
+        GL.glColor4f(red, green, blue, alpha);
+        GL.glPushMatrix();
+        GL.glScalef(scale.x, scale.y, scale.z);
 
         //go through each mesh and render them.
         for (int i = 0; i < numMeshes; i++) {
             int materialIndex = meshes[i].materialIndex;
             //if the material is set, use it to set the texture and lighting.
             if (materialIndex >= 0) {
-
-                gl.materialfv(
-                    GL.FRONT,
-                    GL.AMBIENT,
-                    Sys.getDirectBufferAddress(
-                        temp.asFloatBuffer().put(
-                            materials[materialIndex].ambient)));
-                gl.materialfv(
-                    GL.FRONT,
-                    GL.DIFFUSE,
-                    Sys.getDirectBufferAddress(
-                        temp.asFloatBuffer().put(
-                            materials[materialIndex].diffuse)));
-                gl.materialfv(
-                    GL.FRONT,
-                    GL.SPECULAR,
-                    Sys.getDirectBufferAddress(
-                        temp.asFloatBuffer().put(
-                            materials[materialIndex].specular)));
-                gl.materialfv(
-                    GL.FRONT,
-                    GL.EMISSION,
-                    Sys.getDirectBufferAddress(
-                        temp.asFloatBuffer().put(
-                            materials[materialIndex].emissive)));
-                gl.materialf(
-                    GL.FRONT,
-                    GL.SHININESS,
+                temp.clear();
+                temp.put(materials[materialIndex].ambient);
+                temp.flip();
+                GL.glMaterial(GL.GL_FRONT, GL.GL_AMBIENT, temp);
+                
+                temp.clear();
+                temp.put(materials[materialIndex].diffuse);
+                temp.flip();
+                GL.glMaterial(GL.GL_FRONT, GL.GL_DIFFUSE, temp);
+                
+                temp.clear();
+                temp.put(materials[materialIndex].specular);
+                temp.flip();
+                GL.glMaterial(GL.GL_FRONT, GL.GL_SPECULAR, temp);
+                
+                temp.clear();
+                temp.put(materials[materialIndex].emissive);
+                temp.flip();
+                GL.glMaterial(GL.GL_FRONT, GL.GL_EMISSION, temp);
+                
+                GL.glMaterialf(
+                    GL.GL_FRONT,
+                    GL.GL_SHININESS,
                     materials[materialIndex].shininess);
 
                 if (materials[materialIndex].texture > 0) {
                     TextureManager.getTextureManager().bind(
                         materials[materialIndex].texture);
-                    gl.enable(GL.TEXTURE_2D);
+                    GL.glEnable(GL.GL_TEXTURE_2D);
                 } else
-                    gl.disable(GL.TEXTURE_2D);
+                    GL.glDisable(GL.GL_TEXTURE_2D);
             } else {
-                gl.disable(GL.TEXTURE_2D);
+                GL.glDisable(GL.GL_TEXTURE_2D);
             }
 
-            gl.begin(GL.TRIANGLES);
+            GL.glBegin(GL.GL_TRIANGLES);
             int m = meshes[i].numTriangles;
 
             //render all triangles defined for the current mesh.
@@ -490,21 +484,21 @@ public class MilkshapeModel implements Geometry {
                 for (int k = 0; k < 3; k++) {
                     index = currentTri.vertexIndices[k];
 
-                    gl.normal3f(
+                    GL.glNormal3f(
                         currentTri.vertexNormals[k][0],
                         currentTri.vertexNormals[k][1],
                         currentTri.vertexNormals[k][2]);
-                    gl.texCoord2f(currentTri.s[k], currentTri.t[k]);
-                    gl.vertex3f(
+                    GL.glTexCoord2f(currentTri.s[k], currentTri.t[k]);
+                    GL.glVertex3f(
                         vertices[index].point[0],
                         vertices[index].point[1],
                         vertices[index].point[2]);
                 }
             }
-            gl.end();
+            GL.glEnd();
         }
-        gl.popMatrix();
-        gl.disable(GL.TEXTURE_2D);
+        GL.glPopMatrix();
+        GL.glDisable(GL.GL_TEXTURE_2D);
     }
 
     /**
@@ -538,7 +532,7 @@ public class MilkshapeModel implements Geometry {
      * normal size of the model.
      * @param scale the multiplier of the model's size.
      */
-    public void setScale(Vector3f scale) {
+    public void setScale(Vector scale) {
         this.scale = scale;
     }
 
@@ -578,11 +572,13 @@ public class MilkshapeModel implements Geometry {
             }
         }
         distanceSqr *= scale.x;
-        float distance = (float)Math.sqrt(distanceSqr);
+        float distance = (float) Math.sqrt(distanceSqr);
         boundingSphere = new BoundingSphere(distance, null);
-        boundingBox = new BoundingBox(new Vector(), 
-        	new Vector(-distance, -distance, -distance),
-        	new Vector(distance, distance, distance));
+        boundingBox =
+            new BoundingBox(
+                new Vector(),
+                new Vector(-distance, -distance, -distance),
+                new Vector(distance, distance, distance));
     }
 
     /**
@@ -653,8 +649,8 @@ public class MilkshapeModel implements Geometry {
                 materials[i].texture =
                     TextureManager.getTextureManager().loadTexture(
                         fullFilename,
-                        GL.LINEAR_MIPMAP_LINEAR,
-                        GL.LINEAR,
+                        GL.GL_LINEAR_MIPMAP_LINEAR,
+                        GL.GL_LINEAR,
                         true);
             } else
                 materials[i].texture = 0;

--- a/src/jme/geometry/primitive/Box.java
+++ b/src/jme/geometry/primitive/Box.java
@@ -37,7 +37,6 @@ import jme.exception.MonkeyRuntimeException;
 import jme.geometry.bounding.BoundingBox;
 import jme.geometry.bounding.BoundingSphere;
 import jme.math.Vector;
-import jme.system.DisplaySystem;
 import jme.texture.TextureManager;
 import jme.utility.LoggingSystem;
 
@@ -60,7 +59,7 @@ import org.lwjgl.opengl.GL;
  * 7 - Back face, bottom right<br>
  * 
  * @author Mark Powell
- * @version $Id: Box.java,v 1.3 2003-08-08 18:59:01 mojomonkey Exp $
+ * @version $Id: Box.java,v 1.4 2003-09-03 16:20:51 mojomonkey Exp $
  */
 public class Box extends Primitive {
     private GL gl;
@@ -71,7 +70,6 @@ public class Box extends Primitive {
      * of the box defined as (0,0,0).
      */
     public Box() {
-		gl = DisplaySystem.getDisplaySystem().getGL();
     	corners = new Vector[8];
     	for(int i = 0; i < 8; i++) {
     		corners[i] = new Vector();
@@ -92,7 +90,6 @@ public class Box extends Primitive {
 			throw new MonkeyRuntimeException("Corners cannot be null.");
 		}
         this.corners = corners;
-        gl = DisplaySystem.getDisplaySystem().getGL();
 		initialize();
 		LoggingSystem.getLoggingSystem().getLogger().log(Level.INFO, 
 					"Box created.");
@@ -105,7 +102,6 @@ public class Box extends Primitive {
      * @param size the length of a side of the cube.
      */
     public Box(float size) {
-		gl = DisplaySystem.getDisplaySystem().getGL();
     	corners = new Vector[8];
     	
     	corners[0] = new Vector(-size/2, size/2, -size/2);
@@ -129,76 +125,76 @@ public class Box extends Primitive {
     public void render() {
         if(getTextureId() > 0) {
             TextureManager.getTextureManager().bind(getTextureId());
-            gl.enable(GL.TEXTURE_2D);
+            GL.glEnable(GL.GL_TEXTURE_2D);
         }
         
-        gl.begin(GL.QUADS);
+        GL.glBegin(GL.GL_QUADS);
         
         //front
-        gl.color4f(red, blue, green, alpha);
-        gl.texCoord2i(1,1);
-        gl.vertex3f(corners[0].x, corners[0].y, corners[0].z);
-        gl.texCoord2i(0,1);
-        gl.vertex3f(corners[1].x, corners[1].y, corners[1].z);
-        gl.texCoord2i(0,0);
-		gl.vertex3f(corners[3].x, corners[3].y, corners[3].z);
-		gl.texCoord2i(1,0);
-		gl.vertex3f(corners[2].x, corners[2].y, corners[2].z);
+        GL.glColor4f(red, blue, green, alpha);
+        GL.glTexCoord2f(1,1);
+        GL.glVertex3f(corners[0].x, corners[0].y, corners[0].z);
+        GL.glTexCoord2f(0,1);
+        GL.glVertex3f(corners[1].x, corners[1].y, corners[1].z);
+        GL.glTexCoord2f(0,0);
+		GL.glVertex3f(corners[3].x, corners[3].y, corners[3].z);
+		GL.glTexCoord2f(1,0);
+		GL.glVertex3f(corners[2].x, corners[2].y, corners[2].z);
 		
 		//back
-		gl.texCoord2i(1,1);
-        gl.vertex3f(corners[5].x, corners[5].y, corners[5].z);
-		gl.texCoord2i(0,1);
-		gl.vertex3f(corners[4].x, corners[4].y, corners[4].z);
-		gl.texCoord2i(0,0);
-		gl.vertex3f(corners[6].x, corners[6].y, corners[6].z);
-		gl.texCoord2i(1,0);
-		gl.vertex3f(corners[7].x, corners[7].y, corners[7].z);
+		GL.glTexCoord2f(1,1);
+        GL.glVertex3f(corners[5].x, corners[5].y, corners[5].z);
+		GL.glTexCoord2f(0,1);
+		GL.glVertex3f(corners[4].x, corners[4].y, corners[4].z);
+		GL.glTexCoord2f(0,0);
+		GL.glVertex3f(corners[6].x, corners[6].y, corners[6].z);
+		GL.glTexCoord2f(1,0);
+		GL.glVertex3f(corners[7].x, corners[7].y, corners[7].z);
 		
         //Top
-		gl.texCoord2i(1,1);
-		gl.vertex3f(corners[4].x, corners[4].y, corners[4].z);
-		gl.texCoord2i(0,1);
-		gl.vertex3f(corners[5].x, corners[5].y, corners[5].z);
-		gl.texCoord2i(0,0);
-		gl.vertex3f(corners[1].x, corners[1].y, corners[1].z);
-		gl.texCoord2i(1,0);
-		gl.vertex3f(corners[0].x, corners[0].y, corners[0].z);
+		GL.glTexCoord2f(1,1);
+		GL.glVertex3f(corners[4].x, corners[4].y, corners[4].z);
+		GL.glTexCoord2f(0,1);
+		GL.glVertex3f(corners[5].x, corners[5].y, corners[5].z);
+		GL.glTexCoord2f(0,0);
+		GL.glVertex3f(corners[1].x, corners[1].y, corners[1].z);
+		GL.glTexCoord2f(1,0);
+		GL.glVertex3f(corners[0].x, corners[0].y, corners[0].z);
 		
 		//Bottom
-		gl.texCoord2i(1,1);
-		gl.vertex3f(corners[6].x, corners[6].y, corners[6].z);
-		gl.texCoord2i(0,1);
-		gl.vertex3f(corners[2].x, corners[2].y, corners[2].z);
-		gl.texCoord2i(0,0);
-		gl.vertex3f(corners[3].x, corners[3].y, corners[3].z);
-		gl.texCoord2i(1,0);
-		gl.vertex3f(corners[7].x, corners[7].y, corners[7].z);
+		GL.glTexCoord2f(1,1);
+		GL.glVertex3f(corners[6].x, corners[6].y, corners[6].z);
+		GL.glTexCoord2f(0,1);
+		GL.glVertex3f(corners[2].x, corners[2].y, corners[2].z);
+		GL.glTexCoord2f(0,0);
+		GL.glVertex3f(corners[3].x, corners[3].y, corners[3].z);
+		GL.glTexCoord2f(1,0);
+		GL.glVertex3f(corners[7].x, corners[7].y, corners[7].z);
 		
 		//left
-		gl.texCoord2i(1,1);
-		gl.vertex3f(corners[4].x, corners[4].y, corners[4].z);
-		gl.texCoord2i(0,1);
-		gl.vertex3f(corners[0].x, corners[0].y, corners[0].z);
-		gl.texCoord2i(0,0);
-		gl.vertex3f(corners[2].x, corners[2].y, corners[2].z);
-		gl.texCoord2i(1,0);
-		gl.vertex3f(corners[6].x, corners[6].y, corners[6].z);
+		GL.glTexCoord2f(1,1);
+		GL.glVertex3f(corners[4].x, corners[4].y, corners[4].z);
+		GL.glTexCoord2f(0,1);
+		GL.glVertex3f(corners[0].x, corners[0].y, corners[0].z);
+		GL.glTexCoord2f(0,0);
+		GL.glVertex3f(corners[2].x, corners[2].y, corners[2].z);
+		GL.glTexCoord2f(1,0);
+		GL.glVertex3f(corners[6].x, corners[6].y, corners[6].z);
 		
 		//right
-		gl.texCoord2i(1,1);
-		gl.vertex3f(corners[1].x, corners[1].y, corners[1].z);
-		gl.texCoord2i(0,1);
-		gl.vertex3f(corners[5].x, corners[5].y, corners[5].z);
-		gl.texCoord2i(0,0);
-		gl.vertex3f(corners[7].x, corners[7].y, corners[7].z);
-		gl.texCoord2i(1,0);
-		gl.vertex3f(corners[3].x, corners[3].y, corners[3].z);
+		GL.glTexCoord2f(1,1);
+		GL.glVertex3f(corners[1].x, corners[1].y, corners[1].z);
+		GL.glTexCoord2f(0,1);
+		GL.glVertex3f(corners[5].x, corners[5].y, corners[5].z);
+		GL.glTexCoord2f(0,0);
+		GL.glVertex3f(corners[7].x, corners[7].y, corners[7].z);
+		GL.glTexCoord2f(1,0);
+		GL.glVertex3f(corners[3].x, corners[3].y, corners[3].z);
         
-        gl.end();
+        GL.glEnd();
         
         if(getTextureId() > 0) {
-        	gl.disable(GL.TEXTURE_2D);
+        	GL.glDisable(GL.GL_TEXTURE_2D);
         }
  
     }

--- a/src/jme/geometry/primitive/Cylinder.java
+++ b/src/jme/geometry/primitive/Cylinder.java
@@ -38,7 +38,6 @@ import jme.exception.MonkeyRuntimeException;
 import jme.geometry.bounding.BoundingBox;
 import jme.geometry.bounding.BoundingSphere;
 import jme.math.Vector;
-import jme.system.DisplaySystem;
 import jme.utility.LoggingSystem;
 
 import org.lwjgl.opengl.GLU;
@@ -53,7 +52,7 @@ import org.lwjgl.opengl.GLU;
  * image, but framerate will suffer.
  * 
  * @author Mark Powell
- * @version $Id: Cylinder.java,v 1.2 2003-08-07 21:24:37 mojomonkey Exp $
+ * @version $Id: Cylinder.java,v 1.3 2003-09-03 16:20:51 mojomonkey Exp $
  */
 public class Cylinder extends Quadric {
     
@@ -100,7 +99,6 @@ public class Cylinder extends Quadric {
         boundingBox = new BoundingBox(new Vector(), new Vector(-(float)height,-(float)height,-(float)height),
         	new Vector((float)height,(float)height,(float)height));
         
-        glu = DisplaySystem.getDisplaySystem().getGLU();
         
         super.initialize();
         
@@ -113,8 +111,8 @@ public class Cylinder extends Quadric {
      */
     public void render() {
         super.preRender();
-        glu.cylinder(quadricPointer, baseRadius, topRadius, height, slices,
-                stacks);
+//        GLU.gluCylinder(quadricPointer, baseRadius, topRadius, height, slices,
+//                stacks);
         super.clean();
     }
     

--- a/src/jme/geometry/primitive/Disk.java
+++ b/src/jme/geometry/primitive/Disk.java
@@ -38,10 +38,8 @@ import jme.exception.MonkeyRuntimeException;
 import jme.geometry.bounding.BoundingBox;
 import jme.geometry.bounding.BoundingSphere;
 import jme.math.Vector;
-import jme.system.DisplaySystem;
 import jme.utility.LoggingSystem;
 
-import org.lwjgl.opengl.GLU;
 
 /**
  * <code>Disk</code> defines a disk geometry. The disk is defined by two radii.
@@ -52,7 +50,7 @@ import org.lwjgl.opengl.GLU;
  * determine the number of concentric rings around the center.
  * 
  * @author Mark Powell
- * @version $Id: Disk.java,v 1.2 2003-08-07 21:24:37 mojomonkey Exp $
+ * @version $Id: Disk.java,v 1.3 2003-09-03 16:20:51 mojomonkey Exp $
  */
 public class Disk extends Quadric {
     
@@ -62,8 +60,6 @@ public class Disk extends Quadric {
     protected int slices;
     protected int loops;
     
-    //reference to the GLU object
-    protected GLU glu;
     
     /**
      * Constructor creates a new Disk geometry object. The disk is defined by
@@ -100,8 +96,6 @@ public class Disk extends Quadric {
         		new Vector((float)outerRadius,(float)outerRadius,(float)outerRadius));
         boundingSphere = new BoundingSphere((float)outerRadius, null);
         
-        glu = DisplaySystem.getDisplaySystem().getGLU();
-        
         super.initialize();
         
         LoggingSystem.getLoggingSystem().getLogger().log(Level.INFO,
@@ -113,7 +107,7 @@ public class Disk extends Quadric {
      */
     public void render() {
         super.preRender();
-        glu.disk(quadricPointer, innerRadius, outerRadius, slices, loops);
+        //glu.disk(quadricPointer, innerRadius, outerRadius, slices, loops);
         super.clean();
     }
     

--- a/src/jme/geometry/primitive/PartialDisk.java
+++ b/src/jme/geometry/primitive/PartialDisk.java
@@ -50,7 +50,7 @@ import jme.math.Vector;
  * the negative x-axis
  * 
  * @author Mark Powell
- * @version $Id: PartialDisk.java,v 1.2 2003-08-07 21:24:37 mojomonkey Exp $
+ * @version $Id: PartialDisk.java,v 1.3 2003-09-03 16:20:51 mojomonkey Exp $
  */
 public class PartialDisk extends Disk {
     
@@ -91,8 +91,8 @@ public class PartialDisk extends Disk {
     public void render() {
         super.preRender();
         
-        glu.partialDisk(quadricPointer, innerRadius, outerRadius, slices,
-                loops, startAngle, endAngle);
+//        glu.partialDisk(quadricPointer, innerRadius, outerRadius, slices,
+//                loops, startAngle, endAngle);
                 
         super.clean();
     }

--- a/src/jme/geometry/primitive/Primitive.java
+++ b/src/jme/geometry/primitive/Primitive.java
@@ -37,7 +37,6 @@ import org.lwjgl.opengl.GL;
 import jme.geometry.Geometry;
 import jme.geometry.bounding.BoundingBox;
 import jme.geometry.bounding.BoundingSphere;
-import jme.system.DisplaySystem;
 import jme.texture.TextureManager;
 
 /**
@@ -91,8 +90,8 @@ public abstract class Primitive implements Geometry {
     public void setTexture(String filename) {
         texID = TextureManager.getTextureManager().loadTexture(
                 filename,
-                GL.LINEAR_MIPMAP_LINEAR,
-                GL.LINEAR,
+                GL.GL_LINEAR_MIPMAP_LINEAR,
+                GL.GL_LINEAR,
                 true);
     }
     /**
@@ -131,7 +130,7 @@ public abstract class Primitive implements Geometry {
      */
     public void clean() {
         if (-1 != texID) {
-            DisplaySystem.getDisplaySystem().getGL().disable(GL.TEXTURE_2D);
+            GL.glDisable(GL.GL_TEXTURE_2D);
         }
     }
 

--- a/src/jme/geometry/primitive/Pyramid.java
+++ b/src/jme/geometry/primitive/Pyramid.java
@@ -38,11 +38,11 @@ import jme.exception.MonkeyRuntimeException;
 import jme.geometry.bounding.BoundingBox;
 import jme.geometry.bounding.BoundingSphere;
 import jme.math.Vector;
-import jme.system.DisplaySystem;
 import jme.texture.TextureManager;
 import jme.utility.LoggingSystem;
 
 import org.lwjgl.opengl.GL;
+import org.lwjgl.opengl.Window;
 
 /**
  * <code>Pyramid</code> defines a primitive object of a pyramid shape. The
@@ -50,7 +50,7 @@ import org.lwjgl.opengl.GL;
  * base and the height.
  * 
  * @author Mark Powell
- * @version $Id: Pyramid.java,v 1.2 2003-08-07 21:24:37 mojomonkey Exp $
+ * @version $Id: Pyramid.java,v 1.3 2003-09-03 16:20:51 mojomonkey Exp $
  */
 public class Pyramid extends Primitive {
     private boolean usingDisplay;
@@ -73,11 +73,10 @@ public class Pyramid extends Primitive {
             throw new MonkeyRuntimeException(
                 "Neither base nor height can be " + "negative.");
         }
-        gl = DisplaySystem.getDisplaySystem().getGL();
 
-        if (null == gl) {
+        if (!Window.isCreated()) {
             throw new MonkeyGLException(
-                "OpenGL context must be created " + "before Pyramid.");
+                "Window must be created before Pyramid.");
         }
         this.base = base;
         this.height = height;
@@ -119,10 +118,11 @@ public class Pyramid extends Primitive {
      */
     public void useDisplayList(boolean value) {
         if (value) {
-            listId = gl.genLists(1);
-            gl.newList(listId, GL.COMPILE);
+            listId = GL.glGenLists(1);
+            GL.glNewList(listId, GL.GL_COMPILE);
             renderPyramid();
-            gl.endList();
+            GL.glEndList();
+            usingDisplay = true;
         } else {
             usingDisplay = false;
         }
@@ -133,7 +133,7 @@ public class Pyramid extends Primitive {
      */
     public void render() {
         if (usingDisplay) {
-            gl.callList(listId);
+            GL.glCallList(listId);
         } else {
             renderPyramid();
         }
@@ -171,62 +171,62 @@ public class Pyramid extends Primitive {
     private void renderPyramid() {
         if (getTextureId() > 0) {
             TextureManager.getTextureManager().bind(getTextureId());
-            gl.enable(GL.TEXTURE_2D);
+            GL.glEnable(GL.GL_TEXTURE_2D);
         }
 
-        gl.color4f(red, green, blue, alpha);
-        gl.begin(GL.TRIANGLES);
+        GL.glColor4f(red, green, blue, alpha);
+        GL.glBegin(GL.GL_TRIANGLES);
 
         //front
-        gl.texCoord2f(1, 0);
-        gl.vertex3f(-base / 2, -height / 2, -base / 2); //f1
-        gl.texCoord2f(0.5f, 1);
-        gl.vertex3f(0, height / 2, 0); //top
-        gl.texCoord2f(0.75f, 0);
-        gl.vertex3f(base / 2, -height / 2, -base / 2); //f2
+        GL.glTexCoord2f(1, 0);
+        GL.glVertex3f(-base / 2, -height / 2, -base / 2); //f1
+        GL.glTexCoord2f(0.5f, 1);
+        GL.glVertex3f(0, height / 2, 0); //top
+        GL.glTexCoord2f(0.75f, 0);
+        GL.glVertex3f(base / 2, -height / 2, -base / 2); //f2
 
         //right
-        gl.texCoord2f(0.75f, 0);
-        gl.vertex3f(base / 2, -height / 2, -base / 2); //f2
-        gl.texCoord2f(0.5f, 1);
-        gl.vertex3f(0, height / 2, 0); //top
-        gl.texCoord2f(0.5f, 0);
-        gl.vertex3f(base / 2, -height / 2, base / 2); //b2
+        GL.glTexCoord2f(0.75f, 0);
+        GL.glVertex3f(base / 2, -height / 2, -base / 2); //f2
+        GL.glTexCoord2f(0.5f, 1);
+        GL.glVertex3f(0, height / 2, 0); //top
+        GL.glTexCoord2f(0.5f, 0);
+        GL.glVertex3f(base / 2, -height / 2, base / 2); //b2
 
         //back
-        gl.texCoord2f(0.5f, 0);
-        gl.vertex3f(base / 2, -height / 2, base / 2); //b2
-        gl.texCoord2f(0.5f, 1);
-        gl.vertex3f(0, height / 2, 0); //top
-        gl.texCoord2f(0.25f, 0);
-        gl.vertex3f(-base / 2, -height / 2, base / 2); //b1
+        GL.glTexCoord2f(0.5f, 0);
+        GL.glVertex3f(base / 2, -height / 2, base / 2); //b2
+        GL.glTexCoord2f(0.5f, 1);
+        GL.glVertex3f(0, height / 2, 0); //top
+        GL.glTexCoord2f(0.25f, 0);
+        GL.glVertex3f(-base / 2, -height / 2, base / 2); //b1
 
         //left
-        gl.texCoord2f(0.25f, 0);
-        gl.vertex3f(-base / 2, -height / 2, base / 2); //b1
-        gl.texCoord2f(0.5f, 1);
-        gl.vertex3f(0, height / 2, 0); //top
-        gl.texCoord2f(0, 0);
-        gl.vertex3f(-base / 2, -height / 2, -base / 2); //f1
+        GL.glTexCoord2f(0.25f, 0);
+        GL.glVertex3f(-base / 2, -height / 2, base / 2); //b1
+        GL.glTexCoord2f(0.5f, 1);
+        GL.glVertex3f(0, height / 2, 0); //top
+        GL.glTexCoord2f(0, 0);
+        GL.glVertex3f(-base / 2, -height / 2, -base / 2); //f1
 
         //bottom
-        gl.texCoord2f(0, 0);
-        gl.vertex3f(-base / 2, -height / 2, -base / 2); //f1
-        gl.texCoord2f(1, 1);
-        gl.vertex3f(base / 2, -height / 2, base / 2); //b2
-        gl.texCoord2f(0, 1);
-        gl.vertex3f(-base / 2, -height / 2, base / 2); //b1
-        gl.texCoord2f(0, 0);
-        gl.vertex3f(-base / 2, -height / 2, -base / 2); //f1
-        gl.texCoord2f(1, 0);
-        gl.vertex3f(base / 2, -height / 2, -base / 2); //f2
-        gl.texCoord2f(1, 1);
-        gl.vertex3f(base / 2, -height / 2, base / 2); //b2
-
-        gl.end();
+        GL.glTexCoord2f(0, 0);
+        GL.glVertex3f(-base / 2, -height / 2, -base / 2); //f1
+        GL.glTexCoord2f(1, 1);
+        GL.glVertex3f(base / 2, -height / 2, base / 2); //b2
+        GL.glTexCoord2f(0, 1);
+        GL.glVertex3f(-base / 2, -height / 2, base / 2); //b1
+        GL.glTexCoord2f(0, 0);
+        GL.glVertex3f(-base / 2, -height / 2, -base / 2); //f1
+        GL.glTexCoord2f(1, 0);
+        GL.glVertex3f(base / 2, -height / 2, -base / 2); //f2
+        GL.glTexCoord2f(1, 1);
+        GL.glVertex3f(base / 2, -height / 2, base / 2); //b2
+
+        GL.glEnd();
 
         if (getTextureId() > 0) {
-            gl.disable(GL.TEXTURE_2D);
+            GL.glDisable(GL.GL_TEXTURE_2D);
         }
     }
 

--- a/src/jme/geometry/primitive/Quad.java
+++ b/src/jme/geometry/primitive/Quad.java
@@ -36,7 +36,6 @@ import jme.exception.MonkeyRuntimeException;
 import jme.geometry.bounding.BoundingBox;
 import jme.geometry.bounding.BoundingSphere;
 import jme.math.Vector;
-import jme.system.DisplaySystem;
 import jme.texture.TextureManager;
 
 import org.lwjgl.opengl.GL;
@@ -54,7 +53,7 @@ import org.lwjgl.opengl.GL;
  * 3 - BottomLeft<br>
  * 
  * @author Mark Powell
- * @version $Id: Quad.java,v 1.4 2003-08-19 02:10:14 mojomonkey Exp $
+ * @version $Id: Quad.java,v 1.5 2003-09-03 16:20:51 mojomonkey Exp $
  */
 public class Quad extends Primitive {
     private GL gl;
@@ -70,7 +69,6 @@ public class Quad extends Primitive {
 		if(null == points) {
 			throw new MonkeyRuntimeException("Points cannot be null.");
 		}
-		gl = DisplaySystem.getDisplaySystem().getGL();
 		this.points = points;
 		initialize();
 	}
@@ -111,27 +109,27 @@ public class Quad extends Primitive {
     */
     public void render() {
 		if(getTextureId() > 0) {
-			gl.enable(GL.TEXTURE_2D);
+			GL.glEnable(GL.GL_TEXTURE_2D);
 			TextureManager.getTextureManager().bind(getTextureId());
 		}
 		
-		gl.begin(GL.QUADS);
+		GL.glBegin(GL.GL_QUADS);
 		
-		gl.color4f(red,green,blue,alpha);
+		GL.glColor4f(red,green,blue,alpha);
 		
-		gl.texCoord2i(1,1);
-		gl.vertex3f(points[0].x,points[0].y,points[0].z);
-		gl.texCoord2i(0,1);
-		gl.vertex3f(points[1].x,points[1].y,points[1].z);
-		gl.texCoord2i(0,0);
-		gl.vertex3f(points[2].x,points[2].y,points[2].z);
-		gl.texCoord2i(1,0);
-		gl.vertex3f(points[3].x,points[3].y,points[3].z);
+		GL.glTexCoord2f(1,1);
+		GL.glVertex3f(points[0].x,points[0].y,points[0].z);
+		GL.glTexCoord2f(0,1);
+		GL.glVertex3f(points[1].x,points[1].y,points[1].z);
+		GL.glTexCoord2f(0,0);
+		GL.glVertex3f(points[2].x,points[2].y,points[2].z);
+		GL.glTexCoord2f(1,0);
+		GL.glVertex3f(points[3].x,points[3].y,points[3].z);
 		
-		gl.end();
+		GL.glEnd();
 		
 		if(getTextureId() > 0) {
-			gl.disable(GL.TEXTURE_2D);
+			GL.glDisable(GL.GL_TEXTURE_2D);
 		}
 
     }

--- a/src/jme/geometry/primitive/Quadric.java
+++ b/src/jme/geometry/primitive/Quadric.java
@@ -34,7 +34,6 @@ package jme.geometry.primitive;
 
 import org.lwjgl.opengl.GL;
 
-import jme.system.DisplaySystem;
 import jme.texture.TextureManager;
 
 /**
@@ -63,7 +62,7 @@ public abstract class Quadric extends Primitive {
 	 * subclass geometry. This creates a new quadric object.
 	 */
 	public void initialize() {
-		quadricPointer = DisplaySystem.getDisplaySystem().getGLU().newQuadric();
+		//quadricPointer = DisplaySystem.getDisplaySystem().getGLU().newQuadric();
 	}
 
 	/**
@@ -72,13 +71,13 @@ public abstract class Quadric extends Primitive {
 	 */
 	public void preRender() {
 		if (getTextureId() > 0) {
-			DisplaySystem.getDisplaySystem().getGL().enable(GL.TEXTURE_2D);
+			//DisplaySystem.getDisplaySystem().getGL().enable(GL.TEXTURE_2D);
 			TextureManager.getTextureManager().bind(getTextureId());
-			DisplaySystem.getDisplaySystem().getGLU().quadricTexture(
-				quadricPointer,
-				true);
+//			DisplaySystem.getDisplaySystem().getGLU().quadricTexture(
+//				quadricPointer,
+//				true);
 		}
-		DisplaySystem.getDisplaySystem().getGL().color4f(
+		GL.glColor4f(
 			red,
 			green,
 			blue,

--- a/src/jme/geometry/primitive/Sphere.java
+++ b/src/jme/geometry/primitive/Sphere.java
@@ -40,7 +40,6 @@ import jme.exception.MonkeyRuntimeException;
 import jme.geometry.bounding.BoundingBox;
 import jme.geometry.bounding.BoundingSphere;
 import jme.math.Vector;
-import jme.system.DisplaySystem;
 import jme.utility.LoggingSystem;
 
 /**
@@ -52,7 +51,7 @@ import jme.utility.LoggingSystem;
  * However, frame rate will drop accordingly.
  * 
  * @author Mark Powell
- * @version $Id: Sphere.java,v 1.2 2003-08-07 21:24:37 mojomonkey Exp $
+ * @version $Id: Sphere.java,v 1.3 2003-09-03 16:20:51 mojomonkey Exp $
  */
 public class Sphere extends Quadric {
 
@@ -91,8 +90,6 @@ public class Sphere extends Quadric {
         this.slices = slices;
         this.stacks = stacks;
 
-        glu = DisplaySystem.getDisplaySystem().getGLU();
-
         super.initialize();
         
         //build bounding volumes
@@ -110,7 +107,7 @@ public class Sphere extends Quadric {
     public void render() {
         super.preRender();
 
-        glu.sphere(quadricPointer, radius, slices, stacks);
+        //glu.sphere(quadricPointer, radius, slices, stacks);
 
         super.clean();
     }

--- a/src/jme/geometry/primitive/Triangle.java
+++ b/src/jme/geometry/primitive/Triangle.java
@@ -35,7 +35,6 @@ package jme.geometry.primitive;
 import jme.exception.MonkeyRuntimeException;
 import jme.geometry.bounding.BoundingBox;
 import jme.geometry.bounding.BoundingSphere;
-import jme.system.DisplaySystem;
 import jme.texture.TextureManager;
 import jme.math.Vector;
 
@@ -53,7 +52,7 @@ import org.lwjgl.opengl.GL;
  * 2 - BottomRight<br>
  * 
  * @author Samuel Wasson
- * @version $Id: Triangle.java,v 1.2 2003-08-19 02:10:14 mojomonkey Exp $
+ * @version $Id: Triangle.java,v 1.3 2003-09-03 16:20:51 mojomonkey Exp $
  */
 
 public class Triangle extends Primitive {
@@ -70,7 +69,6 @@ public class Triangle extends Primitive {
 		if(null == points) {
 			throw new MonkeyRuntimeException("Points cannot be null.");
 		}
-		gl  = DisplaySystem.getDisplaySystem().getGL();
 		this.points = points;
 		initialize();
 	}
@@ -110,24 +108,24 @@ public class Triangle extends Primitive {
 	 */
 	public void render() {
 		 if(getTextureId() > 0) {
-			 gl.enable(GL.TEXTURE_2D);
+			 GL.glEnable(GL.GL_TEXTURE_2D);
 			 TextureManager.getTextureManager().bind(getTextureId());
 		 }
 		 
-		 gl.begin(GL.TRIANGLES);
-		 gl.color4f(red, green, blue, alpha);
+		 GL.glBegin(GL.GL_TRIANGLES);
+		 GL.glColor4f(red, green, blue, alpha);
 		 
-		 gl.texCoord2i(1,1);
-		 gl.vertex3f(points[0].x, points[0].y, points[0].z);
-		 gl.texCoord2i(0,0);
-		 gl.vertex3f(points[1].x, points[1].y, points[1].z);
-		 gl.texCoord2i(1,0);
-		 gl.vertex3f(points[2].x, points[2].y, points[2].z);
+		 GL.glTexCoord2f(1,1);
+		 GL.glVertex3f(points[0].x, points[0].y, points[0].z);
+		 GL.glTexCoord2f(0,0);
+		 GL.glVertex3f(points[1].x, points[1].y, points[1].z);
+		 GL.glTexCoord2f(1,0);
+		 GL.glVertex3f(points[2].x, points[2].y, points[2].z);
 		 
-		 gl.end();
+		 GL.glEnd();
 		 
 		 if(getTextureId() > 0) {
-			gl.disable(GL.TEXTURE_2D);
+			GL.glDisable(GL.GL_TEXTURE_2D);
 		 }
 	}
 	

--- a/src/jme/locale/SimpleLocale.java
+++ b/src/jme/locale/SimpleLocale.java
@@ -35,7 +35,6 @@ package jme.locale;
 import java.util.logging.Level;
 
 import jme.exception.MonkeyRuntimeException;
-import jme.system.DisplaySystem;
 import jme.texture.TextureManager;
 import jme.utility.LoggingSystem;
 
@@ -67,7 +66,7 @@ public class SimpleLocale implements Locale {
     private float alpha = 1.0f;
 
     //gl object.
-    private GL gl;
+    //private GL gl;
 
     /**
      * Constructor builds a new <code>SimpleLocale</code> with the defined,
@@ -88,8 +87,7 @@ public class SimpleLocale implements Locale {
 
         this.center = center;
         this.halfLength = length / 2;
-        gl = DisplaySystem.getDisplaySystem().getGL();
-
+        
         LoggingSystem.getLoggingSystem().getLogger().log(
             Level.INFO,
             "SimpleLocale created.");
@@ -112,29 +110,29 @@ public class SimpleLocale implements Locale {
 
         //bind texture only if one has been set.
         if (textureID > 0) {
-            gl.enable(GL.TEXTURE_2D);
+            GL.glEnable(GL.GL_TEXTURE_2D);
             TextureManager.getTextureManager().bind(textureID);
         }
 
-        gl.color4f(red, green, blue, alpha);
-        gl.begin(GL.QUADS);
+        GL.glColor4f(red, green, blue, alpha);
+        GL.glBegin(GL.GL_QUADS);
 
-        gl.texCoord2f(0f, 1f);
-        gl.vertex3f(center.x - halfLength, center.y, center.z + halfLength);
+        GL.glTexCoord2f(0f, 1f);
+        GL.glVertex3f(center.x - halfLength, center.y, center.z + halfLength);
 
-        gl.texCoord2f(1f, 1f);
-        gl.vertex3f(center.x + halfLength, center.y, center.z + halfLength);
+        GL.glTexCoord2f(1f, 1f);
+        GL.glVertex3f(center.x + halfLength, center.y, center.z + halfLength);
 
-        gl.texCoord2f(1f, 0f);
-        gl.vertex3f(center.x + halfLength, center.y, center.z - halfLength);
+        GL.glTexCoord2f(1f, 0f);
+        GL.glVertex3f(center.x + halfLength, center.y, center.z - halfLength);
 
-        gl.texCoord2f(0f, 0f);
-        gl.vertex3f(center.x - halfLength, center.y, center.z - halfLength);
+        GL.glTexCoord2f(0f, 0f);
+        GL.glVertex3f(center.x - halfLength, center.y, center.z - halfLength);
 
-        gl.end();
+        GL.glEnd();
 
         if (textureID > 0) {
-            gl.disable(GL.TEXTURE_2D);
+            GL.glDisable(GL.GL_TEXTURE_2D);
         }
     }
 
@@ -145,8 +143,8 @@ public class SimpleLocale implements Locale {
     public void setTexture(String filename) {
         textureID = TextureManager.getTextureManager().loadTexture(
             filename,
-            GL.LINEAR_MIPMAP_LINEAR,
-            GL.LINEAR,
+            GL.GL_LINEAR_MIPMAP_LINEAR,
+            GL.GL_LINEAR,
             true);
     }
 

--- a/src/jme/locale/external/BruteForce.java
+++ b/src/jme/locale/external/BruteForce.java
@@ -36,7 +36,6 @@ import org.lwjgl.opengl.GL;
 
 import jme.exception.MonkeyRuntimeException;
 import jme.locale.external.data.AbstractHeightMap;
-import jme.system.DisplaySystem;
 import jme.texture.TextureManager;
 
 /**
@@ -46,7 +45,7 @@ import jme.texture.TextureManager;
  * distance, etc.
  * 
  * @author Mark Powell
- * @version 1
+ * @version $Id: BruteForce.java,v 1.2 2003-09-03 16:20:51 mojomonkey Exp $
  */
 public class BruteForce extends Terrain {
 	
@@ -66,7 +65,6 @@ public class BruteForce extends Terrain {
 
 		this.heightData = heightData;
 		this.terrainSize = heightData.getSize();
-		gl = DisplaySystem.getDisplaySystem().getGL();
 	}
 
 	
@@ -97,16 +95,16 @@ public class BruteForce extends Terrain {
 
 		//set up the appropriate textures.
 		if (isDetailed && isTextured) {
-			gl.activeTextureARB(GL.TEXTURE0_ARB);
-			gl.enable(GL.TEXTURE_2D);
+			GL.glActiveTextureARB(GL.GL_TEXTURE0_ARB);
+			GL.glEnable(GL.GL_TEXTURE_2D);
 			TextureManager.getTextureManager().bind(terrainTexture);
-			gl.activeTextureARB(GL.TEXTURE1_ARB);
-			gl.enable(GL.TEXTURE_2D);
+			GL.glActiveTextureARB(GL.GL_TEXTURE1_ARB);
+			GL.glEnable(GL.GL_TEXTURE_2D);
 			TextureManager.getTextureManager().bind(detailId);
-			gl.texEnvi(GL.TEXTURE_ENV, GL.TEXTURE_ENV_MODE, GL.COMBINE_ARB);
-			gl.texEnvi(GL.TEXTURE_ENV, GL.RGB_SCALE_ARB, 2);
+			GL.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_TEXTURE_ENV_MODE, GL.GL_COMBINE_ARB);
+			GL.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_RGB_SCALE_ARB, 2);
 		} else if (isTextured) {
-			gl.enable(GL.TEXTURE_2D);
+			GL.glEnable(GL.GL_TEXTURE_2D);
 			TextureManager.getTextureManager().bind(terrainTexture);
 		}
 
@@ -117,7 +115,7 @@ public class BruteForce extends Terrain {
         //be swapped. This will need to be resolved in the loaders, before
         //the terrain can be rendered in a normal fashion.
 		for (int z = 0; z < terrainSize - 1; z++) {
-			gl.begin(GL.TRIANGLE_STRIP);
+			GL.glBegin(GL.GL_TRIANGLE_STRIP);
             
             if (isTextured) {
                  texDown = (float) z / terrainSize;
@@ -138,21 +136,21 @@ public class BruteForce extends Terrain {
 					green = 1.0f;
 					blue = 1.0f;
 				}
-				gl.color3f(red, green, blue);
+				GL.glColor3f(red, green, blue);
 
 				if (isTextured && isDetailed) {
 					texLeft = (float) x / terrainSize;
-					gl.multiTexCoord2fARB(GL.TEXTURE0_ARB, texDown, texLeft);
-					gl.multiTexCoord2fARB(
-						GL.TEXTURE1_ARB,
+					GL.glMultiTexCoord2fARB(GL.GL_TEXTURE0_ARB, texDown, texLeft);
+					GL.glMultiTexCoord2fARB(
+						GL.GL_TEXTURE1_ARB,
 						texLeft * repeatDetailMap,
 						texDown * repeatDetailMap);
 				} else if (isTextured) {
 					texLeft = (float) x / terrainSize;
-					gl.texCoord2f(texLeft, texDown);
+					GL.glTexCoord2f(texLeft, texDown);
 				}
 				
-				gl.vertex3f(x, heightData.getScaledHeightAtPoint(z, x), z);
+				GL.glVertex3f(x, heightData.getScaledHeightAtPoint(z, x), z);
 
 				if (isLit) {
 					shade = lightMap.getShade(z+1,x);
@@ -164,38 +162,38 @@ public class BruteForce extends Terrain {
 					green = 1.0f;
 					blue = 1.0f;
 				}
-				gl.color3f(red, green, blue);
+				GL.glColor3f(red, green, blue);
 				
 				if (isTextured && isDetailed) {
-					gl.multiTexCoord2fARB(GL.TEXTURE0_ARB, texUp, texLeft);
-					gl.multiTexCoord2fARB(
-						GL.TEXTURE1_ARB,
+					GL.glMultiTexCoord2fARB(GL.GL_TEXTURE0_ARB, texUp, texLeft);
+					GL.glMultiTexCoord2fARB(
+						GL.GL_TEXTURE1_ARB,
 						texLeft * repeatDetailMap,
 						texUp * repeatDetailMap);
 				} else if (isTextured) {
-					gl.texCoord2f(texLeft, texUp);
+					GL.glTexCoord2f(texLeft, texUp);
 				}
 
-				gl.vertex3f(
+				GL.glVertex3f(
 					x,
 					heightData.getScaledHeightAtPoint(z+1, x),
 					z + 1);
 			}
 
-			gl.end();
+			GL.glEnd();
 		}
 		
 		
 
 		if (isDetailed) {
-			gl.activeTextureARB(GL.TEXTURE1_ARB);
-			gl.bindTexture(GL.TEXTURE_2D, 0);
-			gl.activeTextureARB(GL.TEXTURE0_ARB);
-			gl.bindTexture(GL.TEXTURE_2D, 0);
+			GL.glActiveTextureARB(GL.GL_TEXTURE1_ARB);
+			GL.glBindTexture(GL.GL_TEXTURE_2D, 0);
+			GL.glActiveTextureARB(GL.GL_TEXTURE0_ARB);
+			GL.glBindTexture(GL.GL_TEXTURE_2D, 0);
 		} 
 
 		if (isTextured) {
-			gl.disable(GL.TEXTURE_2D);
+			GL.glDisable(GL.GL_TEXTURE_2D);
 		}
 		
 	}

--- a/src/jme/locale/external/Geomipmap.java
+++ b/src/jme/locale/external/Geomipmap.java
@@ -36,7 +36,6 @@ import java.util.logging.Level;
 
 import jme.exception.MonkeyRuntimeException;
 import jme.locale.external.data.AbstractHeightMap;
-import jme.system.DisplaySystem;
 import jme.entity.camera.Camera;
 import jme.texture.TextureManager;
 import jme.utility.LoggingSystem;
@@ -70,7 +69,7 @@ import org.lwjgl.opengl.GL;
  * <code>MidPointHeightMap</code> would not work for this.
  * 
  * @author Mark Powell
- * @version 0.1.0
+ * @version $Id: Geomipmap.java,v 1.3 2003-09-03 16:20:51 mojomonkey Exp $
  */
 public class Geomipmap extends Terrain {
 	private Camera camera;
@@ -96,7 +95,6 @@ public class Geomipmap extends Terrain {
 		if (patchSize <= 0) {
 			throw new MonkeyRuntimeException("patchSize must be greater than 0.");
 		}
-		gl = DisplaySystem.getDisplaySystem().getGL();
 
 		this.heightData = heightMap;
 		this.terrainSize = heightData.getSize();
@@ -190,7 +188,7 @@ public class Geomipmap extends Terrain {
 
 				if (patches[patch].isVisible || camera.hasMoved()) {
 					patches[patch].distance =
-						org.lwjgl.Math.sqrt(
+						(float)Math.sqrt(
 							(patchX - camera.getPosition().x)
 								* (patchX - camera.getPosition().x)
 								+ (patchY - camera.getPosition().y)
@@ -210,20 +208,20 @@ public class Geomipmap extends Terrain {
 	 */
 	public void render() {
 
-		gl.activeTextureARB(GL.TEXTURE0_ARB);
-		gl.enable(GL.TEXTURE_2D);
-		gl.enable(GL.DEPTH_TEST);
+		GL.glActiveTextureARB(GL.GL_TEXTURE0_ARB);
+		GL.glEnable(GL.GL_TEXTURE_2D);
+		GL.glEnable(GL.GL_DEPTH_TEST);
 		if(useDistanceFog || useVolumeFog) {
-			gl.enable(GL.FOG);
+			GL.glEnable(GL.GL_FOG);
 		}
 		TextureManager.getTextureManager().bind(terrainTexture);
 
 		if (isDetailed) {
-			gl.activeTextureARB(GL.TEXTURE1_ARB);
-			gl.enable(GL.TEXTURE_2D);
+			GL.glActiveTextureARB(GL.GL_TEXTURE1_ARB);
+			GL.glEnable(GL.GL_TEXTURE_2D);
 			TextureManager.getTextureManager().bind(detailId);
-			gl.texEnvi(GL.TEXTURE_ENV, GL.TEXTURE_ENV_MODE, GL.COMBINE_ARB);
-			gl.texEnvi(GL.TEXTURE_ENV, GL.RGB_SCALE_ARB, 2);
+			GL.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_TEXTURE_ENV_MODE, GL.GL_COMBINE_ARB);
+			GL.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_RGB_SCALE_ARB, 2);
 		}
 
 		patchesRendered = 0;
@@ -236,16 +234,16 @@ public class Geomipmap extends Terrain {
 			}
 		}
 
-		gl.activeTextureARB(GL.TEXTURE1_ARB);
-		gl.disable(GL.TEXTURE_2D);
-		gl.bindTexture(GL.TEXTURE_2D, 0);
+		GL.glActiveTextureARB(GL.GL_TEXTURE1_ARB);
+		GL.glDisable(GL.GL_TEXTURE_2D);
+		GL.glBindTexture(GL.GL_TEXTURE_2D, 0);
 
-		gl.activeTextureARB(GL.TEXTURE0_ARB);
-		gl.disable(GL.TEXTURE_2D);
-		gl.bindTexture(GL.TEXTURE_2D, 0);
-		gl.disable(GL.DEPTH_TEST);
+		GL.glActiveTextureARB(GL.GL_TEXTURE0_ARB);
+		GL.glDisable(GL.GL_TEXTURE_2D);
+		GL.glBindTexture(GL.GL_TEXTURE_2D, 0);
+		GL.glDisable(GL.GL_DEPTH_TEST);
 		if(useDistanceFog || useVolumeFog) {
-			gl.disable(GL.FOG);
+			GL.glDisable(GL.GL_FOG);
 		}
 	}
 
@@ -285,13 +283,13 @@ public class Geomipmap extends Terrain {
 			green = 1.0f;
 			blue = 1.0f;
 		}
-		gl.color3f(red, green, blue);
+		GL.glColor3f(red, green, blue);
 
 		//set up the texture coordinates.
-		gl.multiTexCoord2fARB(GL.TEXTURE0_ARB, u, v);
+		GL.glMultiTexCoord2fARB(GL.GL_TEXTURE0_ARB, u, v);
 		if (isDetailed) {
-			gl.multiTexCoord2fARB(
-				GL.TEXTURE1_ARB,
+			GL.glMultiTexCoord2fARB(
+				GL.GL_TEXTURE1_ARB,
 				u * repeatDetailMap,
 				v * repeatDetailMap);
 		}
@@ -301,7 +299,7 @@ public class Geomipmap extends Terrain {
 				heightData.getScaledHeightAtPoint((int) x, (int) z));
 		}
 		//render the point.
-		gl.vertex3f(
+		GL.glVertex3f(
 			x * xScale,
 			heightData.getScaledHeightAtPoint((int) x, (int) z),
 			z * zScale);
@@ -335,7 +333,7 @@ public class Geomipmap extends Terrain {
 		midX = ((texLeft + texRight) / 2);
 		midZ = ((texBottom + texTop) / 2);
 
-		gl.begin(GL.TRIANGLE_FAN);
+		GL.glBegin(GL.GL_TRIANGLE_FAN);
 
 		//a fan is rendered by drawing a line from the center to the
 		//four corners. If a neighbor side is true, we also draw a 
@@ -371,7 +369,7 @@ public class Geomipmap extends Terrain {
 
 		renderVertex(x - halfSize, z - halfSize, texLeft, texBottom);
 
-		gl.end();
+		GL.glEnd();
 	}
 
 	/**

--- a/src/jme/locale/external/Terrain.java
+++ b/src/jme/locale/external/Terrain.java
@@ -34,12 +34,13 @@ package jme.locale.external;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
 import java.util.logging.Level;
 
 import javax.swing.ImageIcon;
 
-import org.lwjgl.Sys;
 import org.lwjgl.opengl.GL;
+import org.lwjgl.opengl.GLCaps;
 
 import jme.exception.MonkeyRuntimeException;
 import jme.lighting.AbstractLightMap;
@@ -153,16 +154,13 @@ public abstract class Terrain implements Locale {
 	 */
 	public void setFogAttributes(int mode, float[] color, 
 			float density, float start, float end) {
-		ByteBuffer temp = ByteBuffer.allocateDirect(16);
-		temp.order(ByteOrder.nativeOrder());
-
-		gl.fogi(GL.FOG_MODE, mode);
-		gl.fogfv(GL.FOG_COLOR, 
-			Sys.getDirectBufferAddress(
-			temp.asFloatBuffer().put(color)));
-		gl.fogf(GL.FOG_DENSITY, density);
-		gl.fogf(GL.FOG_START, start);
-		gl.fogf(GL.FOG_END, end);
+		FloatBuffer buf = ByteBuffer.allocateDirect(16).order(ByteOrder.nativeOrder()).asFloatBuffer();
+		
+		GL.glFogi(GL.GL_FOG_MODE, mode);
+		GL.glFog(GL.GL_FOG_COLOR, buf);
+		GL.glFogf(GL.GL_FOG_DENSITY, density);
+		GL.glFogf(GL.GL_FOG_START, start);
+		GL.glFogf(GL.GL_FOG_END, end);
 	}
 	
 	/**
@@ -192,9 +190,9 @@ public abstract class Terrain implements Locale {
 	public void setDistanceFog(boolean value) {
 		useDistanceFog = value;
 		if(value) {
-			gl.enable(GL.FOG);
+			GL.glEnable(GL.GL_FOG);
 		} else {
-			gl.disable(GL.FOG);
+			GL.glDisable(GL.GL_FOG);
 		}
 	}
 	
@@ -217,10 +215,10 @@ public abstract class Terrain implements Locale {
 		useVolumeFog = value;
 		
 		if(value) {
-			gl.fogi( GL.FOG_COORDINATE_SOURCE_EXT, GL.FOG_COORDINATE_EXT );
-			gl.enable(GL.FOG);
+			GL.glFogi( GL.GL_FOG_COORDINATE_SOURCE_EXT, GL.GL_FOG_COORDINATE_EXT );
+			GL.glEnable(GL.GL_FOG);
 		} else {
-			gl.disable(GL.FOG);
+			GL.glDisable(GL.GL_FOG);
 		}
 	}
 	
@@ -231,9 +229,9 @@ public abstract class Terrain implements Locale {
 	 */
 	protected void setVolumetricFogCoord(float height) {
 		if(height > fogDepth) {
-			gl.fogCoordfEXT(-(height-fogDepth));
+			GL.glFogCoordfEXT(-(height-fogDepth));
 		} else {
-			gl.fogCoordfEXT(0);
+			GL.glFogCoordfEXT(0);
 		}
 	}
 
@@ -247,7 +245,7 @@ public abstract class Terrain implements Locale {
 	public void setDetailTexture(String detailTexture, int repeat) {
 
 		this.repeatDetailMap = repeat;
-		boolean canMulti = gl.ARB_multitexture;
+		boolean canMulti = GLCaps.GL_ARB_multitexture;
 
 		if (!canMulti) {
 			LoggingSystem.getLoggingSystem().getLogger().log(
@@ -258,8 +256,8 @@ public abstract class Terrain implements Locale {
 		if(null != detailTexture && canMulti) {		
 			detailId = TextureManager.getTextureManager().loadTexture(
 					detailTexture,
-					GL.LINEAR_MIPMAP_LINEAR,
-					GL.LINEAR,
+					GL.GL_LINEAR_MIPMAP_LINEAR,
+					GL.GL_LINEAR,
 					true);
 			isDetailed = true;
 		} else {
@@ -277,8 +275,8 @@ public abstract class Terrain implements Locale {
 		if (texture != null) {
 			if((terrainTexture = TextureManager.getTextureManager().loadTexture(
 					texture,
-					GL.LINEAR_MIPMAP_LINEAR,
-					GL.LINEAR,
+					GL.GL_LINEAR_MIPMAP_LINEAR,
+					GL.GL_LINEAR,
 					true)) != -1) {
 				isTextured = true;
 			}
@@ -297,8 +295,8 @@ public abstract class Terrain implements Locale {
 		if (texture != null) {
 			if((terrainTexture = TextureManager.getTextureManager().loadTexture(
 					texture,
-					GL.LINEAR_MIPMAP_LINEAR,
-					GL.LINEAR,
+					GL.GL_LINEAR_MIPMAP_LINEAR,
+					GL.GL_LINEAR,
 					true)) != -1) {
 				isTextured = true;
 			}

--- a/src/jme/locale/external/feature/SkyBox.java
+++ b/src/jme/locale/external/feature/SkyBox.java
@@ -35,12 +35,11 @@ package jme.locale.external.feature;
 import java.util.logging.Level;
 
 import jme.exception.MonkeyRuntimeException;
-import jme.system.DisplaySystem;
+import jme.math.Vector;
 import jme.texture.TextureManager;
 import jme.utility.LoggingSystem;
 
 import org.lwjgl.opengl.GL;
-import org.lwjgl.vector.Vector3f;
 
 /**
  * <code>SkyBox</code> defines a implementation of the sky interface
@@ -49,7 +48,7 @@ import org.lwjgl.vector.Vector3f;
  * depth buffer for the skybox is turn off so it will always appear behind
  * any object/locale rendered. The skybox moves with the connected entity.
  * @author Mark Powell
- * @version 0.1.0
+ * @version $Id: SkyBox.java,v 1.2 2003-09-03 16:20:51 mojomonkey Exp $
  */
 public class SkyBox implements Sky {
 	/**
@@ -78,15 +77,12 @@ public class SkyBox implements Sky {
 	public static final int BACK = 5;
 
 	//area of the box
-	private Vector3f center;
+	private Vector center;
 	private float size;
 
 	//appearance of box
 	private int[] textures;
-	private Vector3f color;
-
-	//gl object for rendering.
-	private GL gl;
+	private Vector color;
 
 	/**
 	 * Constructor creates a new <code>SkyBox</code> object. The size of
@@ -95,12 +91,11 @@ public class SkyBox implements Sky {
 	 * @param size the size of each side of the box.
 	 */
 	public SkyBox(float size) {
-		center = new Vector3f();
+		center = new Vector();
 		textures = new int[6];
-		gl = DisplaySystem.getDisplaySystem().getGL();
 		this.size = size / 2;
-		this.center = new Vector3f(this.size, 32, this.size);
-		color = new Vector3f(1.0f, 1.0f, 1.0f);
+		this.center = new Vector(this.size, 32, this.size);
+		color = new Vector(1.0f, 1.0f, 1.0f);
 
 		LoggingSystem.getLoggingSystem().getLogger().log(
 			Level.INFO,
@@ -122,8 +117,8 @@ public class SkyBox implements Sky {
 
 		textures[side] = TextureManager.getTextureManager().loadTexture(
 				filename,
-				GL.LINEAR_MIPMAP_LINEAR,
-				GL.LINEAR,
+				GL.GL_LINEAR_MIPMAP_LINEAR,
+				GL.GL_LINEAR,
 				true);
 	}
 	
@@ -145,8 +140,8 @@ public class SkyBox implements Sky {
 		for (int i = 0; i < 6; i++) {
 			this.textures[i] = TextureManager.getTextureManager().loadTexture(
 					textures[i],
-					GL.LINEAR_MIPMAP_LINEAR,
-					GL.LINEAR,
+					GL.GL_LINEAR_MIPMAP_LINEAR,
+					GL.GL_LINEAR,
 					true);
 		}
 	}
@@ -163,7 +158,7 @@ public class SkyBox implements Sky {
 	 * <code>setColor</code> sets the color tint of the skybox. 
 	 * @param color the tint of the box.
 	 */
-	public void setColor(Vector3f color) {
+	public void setColor(Vector color) {
 		if (null == color) {
 			throw new MonkeyRuntimeException("Color cannot be null.");
 		}
@@ -184,93 +179,93 @@ public class SkyBox implements Sky {
 	 */
 	public void render() {
 
-		gl.color4f(color.x, color.y, color.z, 1.0f);
-		gl.enable(GL.TEXTURE_2D);
-		gl.disable(GL.DEPTH_TEST);
+		GL.glColor4f(color.x, color.y, color.z, 1.0f);
+		GL.glEnable(GL.GL_TEXTURE_2D);
+		GL.glDisable(GL.GL_DEPTH_TEST);
 
-		gl.pushMatrix();
-		gl.translatef(center.x, center.y, center.z);
+		GL.glPushMatrix();
+		GL.glTranslatef(center.x, center.y, center.z);
 
 		//front face
 		TextureManager.getTextureManager().bind(textures[FRONT]);
-		gl.begin(GL.TRIANGLE_FAN);
-		gl.texCoord2f(1.0f, 1.0f);
-		gl.vertex3f(size, size, size);
-		gl.texCoord2f(1.0f, 0.0f);
-		gl.vertex3f(size, -size, size);
-		gl.texCoord2f(0.0f, 0.0f);
-		gl.vertex3f(-size, -size, size);
-		gl.texCoord2f(0.0f, 1.0f);
-		gl.vertex3f(-size, size, size);
-		gl.end();
+		GL.glBegin(GL.GL_TRIANGLE_FAN);
+		GL.glTexCoord2f(1.0f, 1.0f);
+		GL.glVertex3f(size, size, size);
+		GL.glTexCoord2f(1.0f, 0.0f);
+		GL.glVertex3f(size, -size, size);
+		GL.glTexCoord2f(0.0f, 0.0f);
+		GL.glVertex3f(-size, -size, size);
+		GL.glTexCoord2f(0.0f, 1.0f);
+		GL.glVertex3f(-size, size, size);
+		GL.glEnd();
 
 		//back face
 		TextureManager.getTextureManager().bind(textures[BACK]);
-		gl.begin(GL.TRIANGLE_FAN);
-		gl.texCoord2f(1.0f, 1.0f);
-		gl.vertex3f(-size, size, -size);
-		gl.texCoord2f(1.0f, 0.0f);
-		gl.vertex3f(-size, -size, -size);
-		gl.texCoord2f(0.0f, 0.0f);
-		gl.vertex3f(size, -size, -size);
-		gl.texCoord2f(0.0f, 1.0f);
-		gl.vertex3f(size, size, -size);
-		gl.end();
+		GL.glBegin(GL.GL_TRIANGLE_FAN);
+		GL.glTexCoord2f(1.0f, 1.0f);
+		GL.glVertex3f(-size, size, -size);
+		GL.glTexCoord2f(1.0f, 0.0f);
+		GL.glVertex3f(-size, -size, -size);
+		GL.glTexCoord2f(0.0f, 0.0f);
+		GL.glVertex3f(size, -size, -size);
+		GL.glTexCoord2f(0.0f, 1.0f);
+		GL.glVertex3f(size, size, -size);
+		GL.glEnd();
 
 		//right face
 		TextureManager.getTextureManager().bind(textures[RIGHT]);
-		gl.begin(GL.TRIANGLE_FAN);
-		gl.texCoord2f(1.0f, 1.0f);
-		gl.vertex3f(size, size, -size);
-		gl.texCoord2f(1.0f, 0.0f);
-		gl.vertex3f(size, -size, -size);
-		gl.texCoord2f(0.0f, 0.0f);
-		gl.vertex3f(size, -size, size);
-		gl.texCoord2f(0.0f, 1.0f);
-		gl.vertex3f(size, size, size);
-		gl.end();
+		GL.glBegin(GL.GL_TRIANGLE_FAN);
+		GL.glTexCoord2f(1.0f, 1.0f);
+		GL.glVertex3f(size, size, -size);
+		GL.glTexCoord2f(1.0f, 0.0f);
+		GL.glVertex3f(size, -size, -size);
+		GL.glTexCoord2f(0.0f, 0.0f);
+		GL.glVertex3f(size, -size, size);
+		GL.glTexCoord2f(0.0f, 1.0f);
+		GL.glVertex3f(size, size, size);
+		GL.glEnd();
 
 		//left face
 		TextureManager.getTextureManager().bind(textures[LEFT]);
-		gl.begin(GL.TRIANGLE_FAN);
-		gl.texCoord2f(1.0f, 1.0f);
-		gl.vertex3f(-size, size, size);
-		gl.texCoord2f(1.0f, 0.0f);
-		gl.vertex3f(-size, -size, size);
-		gl.texCoord2f(0.0f, 0.0f);
-		gl.vertex3f(-size, -size, -size);
-		gl.texCoord2f(0.0f, 1.0f);
-		gl.vertex3f(-size, size, -size);
-		gl.end();
+		GL.glBegin(GL.GL_TRIANGLE_FAN);
+		GL.glTexCoord2f(1.0f, 1.0f);
+		GL.glVertex3f(-size, size, size);
+		GL.glTexCoord2f(1.0f, 0.0f);
+		GL.glVertex3f(-size, -size, size);
+		GL.glTexCoord2f(0.0f, 0.0f);
+		GL.glVertex3f(-size, -size, -size);
+		GL.glTexCoord2f(0.0f, 1.0f);
+		GL.glVertex3f(-size, size, -size);
+		GL.glEnd();
 
 		//top face
 		TextureManager.getTextureManager().bind(textures[TOP]);
-		gl.begin(GL.TRIANGLE_FAN);
-		gl.texCoord2f(0.0f, 0.0f);
-		gl.vertex3f(-size, size, size);
-		gl.texCoord2f(0.0f, 1.0f);
-		gl.vertex3f(-size, size, -size);
-		gl.texCoord2f(1.0f, 1.0f);
-		gl.vertex3f(size, size, -size);
-		gl.texCoord2f(1.0f, 0.0f);
-		gl.vertex3f(size, size, size);
-		gl.end();
+		GL.glBegin(GL.GL_TRIANGLE_FAN);
+		GL.glTexCoord2f(0.0f, 0.0f);
+		GL.glVertex3f(-size, size, size);
+		GL.glTexCoord2f(0.0f, 1.0f);
+		GL.glVertex3f(-size, size, -size);
+		GL.glTexCoord2f(1.0f, 1.0f);
+		GL.glVertex3f(size, size, -size);
+		GL.glTexCoord2f(1.0f, 0.0f);
+		GL.glVertex3f(size, size, size);
+		GL.glEnd();
 
 		//bottom face
 		TextureManager.getTextureManager().bind(textures[BOTTOM]);
-		gl.begin(GL.TRIANGLE_FAN);
-		gl.texCoord2f(0.0f, 0.0f);
-		gl.vertex3f(-size, -size, -size);
-		gl.texCoord2f(0.0f, 1.0f);
-		gl.vertex3f(-size, -size, size);
-		gl.texCoord2f(1.0f, 1.0f);
-		gl.vertex3f(size, -size, size);
-		gl.texCoord2f(1.0f, 0.0f);
-		gl.vertex3f(size, -size, -size);
-		gl.end();
-		gl.popMatrix();
+		GL.glBegin(GL.GL_TRIANGLE_FAN);
+		GL.glTexCoord2f(0.0f, 0.0f);
+		GL.glVertex3f(-size, -size, -size);
+		GL.glTexCoord2f(0.0f, 1.0f);
+		GL.glVertex3f(-size, -size, size);
+		GL.glTexCoord2f(1.0f, 1.0f);
+		GL.glVertex3f(size, -size, size);
+		GL.glTexCoord2f(1.0f, 0.0f);
+		GL.glVertex3f(size, -size, -size);
+		GL.glEnd();
+		GL.glPopMatrix();
 		
-		gl.enable(GL.DEPTH_TEST);
+		GL.glEnable(GL.GL_DEPTH_TEST);
 	}
 
 }

--- a/src/jme/locale/external/feature/SkyDome.java
+++ b/src/jme/locale/external/feature/SkyDome.java
@@ -35,11 +35,11 @@ import java.util.logging.Level;
 
 import jme.exception.MonkeyGLException;
 import jme.geometry.model.Vertex;
-import jme.system.DisplaySystem;
 import jme.texture.TextureManager;
 import jme.utility.LoggingSystem;
 
 import org.lwjgl.opengl.GL;
+import org.lwjgl.opengl.Window;
 
 /**
  * <code>SkyDome</code> defines an implementation of the sky interface where
@@ -52,11 +52,11 @@ import org.lwjgl.opengl.GL;
  * <a href="http://www.spheregames.com/files/SkyDomesPDF.zip">this</a> 
  * PDF file.
  * @author Mark Powell
+ * @version $Id: SkyDome.java,v 1.3 2003-09-03 16:20:51 mojomonkey Exp $
  */
 public class SkyDome implements Sky {
 
 	private int texId;
-	private GL gl;
 
 	//attributes of the dome
 	private float radius;
@@ -97,11 +97,9 @@ public class SkyDome implements Sky {
 		float hTile,
 		float vTile) {
 
-		gl = DisplaySystem.getDisplaySystem().getGL();
-
-		if (null == gl) {
+		if (!Window.isCreated()) {
 			throw new MonkeyGLException(
-				"GL must be initialized before " + "calling SkyDome.");
+				"Window must be created before SkyDome.");
 		}
 
 		this.radius = radius;
@@ -126,8 +124,8 @@ public class SkyDome implements Sky {
 		texId =
 			TextureManager.getTextureManager().loadTexture(
 				filename,
-				GL.LINEAR_MIPMAP_LINEAR,
-				GL.LINEAR,
+				GL.GL_LINEAR_MIPMAP_LINEAR,
+				GL.GL_LINEAR,
 				true);
 	}
 
@@ -188,31 +186,31 @@ public class SkyDome implements Sky {
 	 * texture. 
 	 */
 	public void render() {
-		gl.enable(GL.TEXTURE_2D);
-		gl.disable(GL.DEPTH_TEST);
-		gl.cullFace(GL.FRONT);
-		gl.bindTexture(GL.TEXTURE_2D, texId);
+		GL.glEnable(GL.GL_TEXTURE_2D);
+		GL.glDisable(GL.GL_DEPTH_TEST);
+		GL.glCullFace(GL.GL_FRONT);
+		GL.glBindTexture(GL.GL_TEXTURE_2D, texId);
 
-		gl.pushMatrix();
-		gl.rotatef(270, 1.0f, 0.0f, 0.0f);
-		gl.rotatef(rotation, 0.0f, 0.0f, 1.0f);
-		gl.begin(GL.TRIANGLE_STRIP);
+		GL.glPushMatrix();
+		GL.glRotatef(270, 1.0f, 0.0f, 0.0f);
+		GL.glRotatef(rotation, 0.0f, 0.0f, 1.0f);
+		GL.glBegin(GL.GL_TRIANGLE_STRIP);
 
 		for (int i = 0; i < numVertices; i++) {
-			gl.color3f(1.0f, 1.0f, 1.0f);
+			GL.glColor3f(1.0f, 1.0f, 1.0f);
 
-			gl.texCoord2f(
+			GL.glTexCoord2f(
 				vertices[i].u + xTexAnimation,
 				vertices[i].v + yTexAnimation);
-			gl.vertex3f(vertices[i].x, vertices[i].y, vertices[i].z);
+			GL.glVertex3f(vertices[i].x, vertices[i].y, vertices[i].z);
 		}
 
-		gl.end();
+		GL.glEnd();
 
-		gl.popMatrix();
-		gl.disable(GL.TEXTURE_2D);
-		gl.enable(GL.DEPTH_TEST);
-		gl.cullFace(GL.BACK);
+		GL.glPopMatrix();
+		GL.glDisable(GL.GL_TEXTURE_2D);
+		GL.glEnable(GL.GL_DEPTH_TEST);
+		GL.glCullFace(GL.GL_BACK);
 	}
 
 	/**

--- a/src/jme/locale/external/feature/WaterMesh.java
+++ b/src/jme/locale/external/feature/WaterMesh.java
@@ -33,9 +33,7 @@ package jme.locale.external.feature;
 
 import java.util.logging.Level;
 
-import jme.exception.MonkeyGLException;
 import jme.exception.MonkeyRuntimeException;
-import jme.system.DisplaySystem;
 import jme.texture.TextureManager;
 import jme.utility.LoggingSystem;
 
@@ -45,10 +43,10 @@ import org.lwjgl.opengl.GL;
  * <code>WaterMesh</code> creates a mesh that represents water height values.
  * This mesh contains a wave origin that causes ripples to flow outward. 
  * @author Mark Powell
+ * @version $Id: WaterMesh.java,v 1.2 2003-09-03 16:20:51 mojomonkey Exp $
  */
 public class WaterMesh implements Water {
     private int texId;
-    private GL gl;
     private float height;
     private int size;
     private int spacing;
@@ -74,13 +72,7 @@ public class WaterMesh implements Water {
      * @throws MonkeyRuntimeException if size is negative.
      */
     public WaterMesh(int size, int spacing, float amplitude) {
-        gl = DisplaySystem.getDisplaySystem().getGL();
-
-        if (null == gl) {
-            throw new MonkeyGLException(
-                "OpenGL Context must be created before WaterMesh.");
-        }
-
+        
         water = new float[size][size];
         wt = new float[size][size];
         v = -4;
@@ -111,8 +103,8 @@ public class WaterMesh implements Water {
         texId =
             TextureManager.getTextureManager().loadTexture(
                 filename,
-                GL.LINEAR_MIPMAP_LINEAR,
-                GL.LINEAR,
+                GL.GL_LINEAR_MIPMAP_LINEAR,
+                GL.GL_LINEAR,
                 true);
     }
 
@@ -169,17 +161,17 @@ public class WaterMesh implements Water {
      * <code>render</code> displays the water mesh to the view port.
      */
     public void render() {
-        gl.enable(GL.BLEND);
-        gl.enable(GL.TEXTURE_2D);
-        gl.enable(GL.DEPTH_TEST);
-        gl.disable(GL.CULL_FACE);
+        GL.glEnable(GL.GL_BLEND);
+        GL.glEnable(GL.GL_TEXTURE_2D);
+        GL.glEnable(GL.GL_DEPTH_TEST);
+        GL.glDisable(GL.GL_CULL_FACE);
         TextureManager.getTextureManager().bind(texId);
         float tx, ty;
 
         /* Draw water */
-        gl.color4f(1f, 1f, 1f, 0.6f);
+        GL.glColor4f(1f, 1f, 1f, 0.6f);
 
-        gl.begin(GL.TRIANGLES);
+        GL.glBegin(GL.GL_TRIANGLES);
         float td = (float)1 / size;
 
         for (int i = 0; i < size - 1; i++) {
@@ -188,38 +180,38 @@ public class WaterMesh implements Water {
             for (int j = 0; j < size - 1; j++) {
                 ty = (float)j / size;
                 
-                gl.texCoord2f(tx, ty);
-                gl.vertex3f(spacing * i, water[i][j] + height, spacing * j);
-                gl.texCoord2f(tx + td, ty);
-                gl.vertex3f(
+                GL.glTexCoord2f(tx, ty);
+                GL.glVertex3f(spacing * i, water[i][j] + height, spacing * j);
+                GL.glTexCoord2f(tx + td, ty);
+                GL.glVertex3f(
                     spacing * (i + 1),
                     water[i + 1][j] + height,
                     spacing * j);
-                gl.texCoord2f(tx + td, ty + td);
-                gl.vertex3f(
+                GL.glTexCoord2f(tx + td, ty + td);
+                GL.glVertex3f(
                     spacing * (i + 1),
                     water[i + 1][j + 1] + height,
                     spacing * (j + 1));
 
-                gl.texCoord2f(tx, ty + td);
-                gl.vertex3f(
+                GL.glTexCoord2f(tx, ty + td);
+                GL.glVertex3f(
                     spacing * i,
                     water[i][j + 1] + height,
                     spacing * (j + 1));
-                gl.texCoord2f(tx, ty);
-                gl.vertex3f(spacing * i, water[i][j] + height, spacing * j);
-                gl.texCoord2f(tx + td, ty + td);
-                gl.vertex3f(
+                GL.glTexCoord2f(tx, ty);
+                GL.glVertex3f(spacing * i, water[i][j] + height, spacing * j);
+                GL.glTexCoord2f(tx + td, ty + td);
+                GL.glVertex3f(
                     spacing * (i + 1),
                     water[i + 1][j + 1] + height,
                     spacing * (j + 1));
             }
         }
-        gl.end();
+        GL.glEnd();
         
-        gl.disable(GL.BLEND);
-        gl.disable(GL.TEXTURE_2D);
-        gl.disable(GL.DEPTH_TEST);
-        gl.enable(GL.CULL_FACE);
+        GL.glDisable(GL.GL_BLEND);
+        GL.glDisable(GL.GL_TEXTURE_2D);
+        GL.glDisable(GL.GL_DEPTH_TEST);
+        GL.glEnable(GL.GL_CULL_FACE);
     }
 }

--- a/src/jme/locale/external/feature/WaterPlane.java
+++ b/src/jme/locale/external/feature/WaterPlane.java
@@ -33,7 +33,6 @@ package jme.locale.external.feature;
 
 import jme.exception.MonkeyRuntimeException;
 import jme.math.Vector;
-import jme.system.DisplaySystem;
 import jme.texture.TextureManager;
 
 import org.lwjgl.opengl.GL;
@@ -46,7 +45,7 @@ import org.lwjgl.opengl.GL;
  * the texture sliding across the plane.
  * 
  * @author Mark Powell
- * @version 1
+ * @version $Id: WaterPlane.java,v 1.3 2003-09-03 16:20:51 mojomonkey Exp $
  */
 public class WaterPlane implements Water {
 
@@ -77,8 +76,6 @@ public class WaterPlane implements Water {
 	private float changeX = 0.0f;
 	private float changeZ = 0.0f;
 	
-	//opengl object
-	private GL gl;
 	
 	/**
 	 * Constructor instantiates a new <code>WaterPlane</code> object. 
@@ -97,7 +94,6 @@ public class WaterPlane implements Water {
 		this.baseLevel = baseLevel;
 		this.variation = variation;
 		
-		gl = DisplaySystem.getDisplaySystem().getGL();
 	}
 
 	/**
@@ -111,8 +107,8 @@ public class WaterPlane implements Water {
 		}
 		texId = TextureManager.getTextureManager().loadTexture(
 				filename,
-				GL.LINEAR_MIPMAP_LINEAR,
-				GL.LINEAR,
+				GL.GL_LINEAR_MIPMAP_LINEAR,
+				GL.GL_LINEAR,
 				true);
 	}
 
@@ -197,34 +193,34 @@ public class WaterPlane implements Water {
 	 * texture, color and location.
 	 */
 	public void render() {
-		gl.enable(GL.BLEND);
-		gl.enable(GL.TEXTURE_2D);
-		gl.enable(GL.DEPTH_TEST);
-		gl.disable(GL.CULL_FACE);
-		gl.blendFunc(GL.SRC_ALPHA, GL.ONE);
+		GL.glEnable(GL.GL_BLEND);
+		GL.glEnable(GL.GL_TEXTURE_2D);
+		GL.glEnable(GL.GL_DEPTH_TEST);
+		GL.glDisable(GL.GL_CULL_FACE);
+		GL.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE);
 		
-		gl.color4f(color.x, color.y, color.z, transparency);
+		GL.glColor4f(color.x, color.y, color.z, transparency);
 		
 		TextureManager.getTextureManager().bind(texId);
 		
-		gl.begin(GL.TRIANGLE_STRIP);
+		GL.glBegin(GL.GL_TRIANGLE_STRIP);
 		
 		
-		gl.texCoord2f(changeX, changeZ);
-		gl.vertex3f(0.0f, currentLevel, 0.0f);
-		gl.texCoord2f(changeX + repeat, changeZ);
-		gl.vertex3f(size, currentLevel, 0.0f);
-		gl.texCoord2f(changeX, changeZ+repeat);
-		gl.vertex3f(0.0f, currentLevel, size);
-		gl.texCoord2f(changeX + repeat, changeZ + repeat);
-		gl.vertex3f(size, currentLevel, size);
+		GL.glTexCoord2f(changeX, changeZ);
+		GL.glVertex3f(0.0f, currentLevel, 0.0f);
+		GL.glTexCoord2f(changeX + repeat, changeZ);
+		GL.glVertex3f(size, currentLevel, 0.0f);
+		GL.glTexCoord2f(changeX, changeZ+repeat);
+		GL.glVertex3f(0.0f, currentLevel, size);
+		GL.glTexCoord2f(changeX + repeat, changeZ + repeat);
+		GL.glVertex3f(size, currentLevel, size);
 		
-		gl.end();
+		GL.glEnd();
 		
-		gl.disable(GL.BLEND);
-		gl.disable(GL.TEXTURE_2D);
-		gl.disable(GL.DEPTH_TEST);
-		gl.enable(GL.CULL_FACE);
+		GL.glDisable(GL.GL_BLEND);
+		GL.glDisable(GL.GL_TEXTURE_2D);
+		GL.glDisable(GL.GL_DEPTH_TEST);
+		GL.glEnable(GL.GL_CULL_FACE);
 	}
 
 }

--- a/src/jme/system/DisplaySystem.java
+++ b/src/jme/system/DisplaySystem.java
@@ -48,11 +48,11 @@ import jme.utility.LoggingSystem;
 
 import org.lwjgl.Display;
 import org.lwjgl.DisplayMode;
-import org.lwjgl.Sys;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL;
-import org.lwjgl.opengl.GLU;
+import org.lwjgl.opengl.GLCaps;
+import org.lwjgl.opengl.Window;
 
 /**
  * <code>DisplaySystem</code> manages the Window and OpenGL context of the 
@@ -82,10 +82,6 @@ public class DisplaySystem {
     //Singleton reference.
     private static DisplaySystem instance = null;
 
-    //the OpenGL objects
-    private static GL gl;
-    private static GLU glu;
-
     //attributes of the window
     private int height;
     private int width;
@@ -179,7 +175,7 @@ public class DisplaySystem {
         this.title = title;
 
         //recreate the display
-        gl.destroy();
+        Window.destroy();
         initDisplay();
         Keyboard.destroy();
         Mouse.destroy();
@@ -280,30 +276,6 @@ public class DisplaySystem {
     }
 
     /**
-     * <code>getGL</code> returns the OpenGL core object. This <code>GL</code>
-     * object can be used to make any calls to the OpenGL core gl functions.
-     * 
-     * @return the <code>GL</code> object referred to this display. If 
-     *      <code>createDisplaySystem</code> has not been called before invoking
-     *      this method, null will be returned.
-     */
-    public GL getGL() {
-        return gl;
-    }
-
-    /**
-     * <code>getGLU</code> returns the OpenGL utility object. This <code>GLU</code>
-     * object can be used to make any calls to the OpenGL utility functions.
-     * 
-     * @return the <code>GLU</code> object referred to this display. If 
-     *      <code>createDisplaySystem</code> has not been called before invoking
-     *      this method, null will be returned.
-     */
-    public GLU getGLU() {
-        return glu;
-    }
-
-    /**
      * <code>getDisplaySystem</code> returns the reference to the singleton 
      * object of the <code>DisplaySystem</code>. After a call to 
      * <code>createDisplaySystem</code> is made, you can retrieve any 
@@ -359,11 +331,11 @@ public class DisplaySystem {
      * @param on true turn on culling, false turn it off.
      */
     public void cullMode(int mode, boolean on) {
-        gl.cullFace(mode);
+        GL.glCullFace(mode);
         if (on) {
-            gl.enable(GL.CULL_FACE);
+            GL.glEnable(GL.GL_CULL_FACE);
         } else {
-            gl.disable(GL.CULL_FACE);
+            GL.glDisable(GL.GL_CULL_FACE);
         }
     }
 
@@ -395,15 +367,14 @@ public class DisplaySystem {
                 .allocateDirect(width * height * 4)
                 .order(ByteOrder.nativeOrder())
                 .asIntBuffer();
-        int buffh = Sys.getDirectBufferAddress(buff);
-        gl.readPixels(
+        GL.glReadPixels(
             0,
             0,
             width,
             height,
-            GL.BGRA,
-            GL.UNSIGNED_BYTE,
-            buffh);
+            GL.GL_BGRA,
+            GL.GL_UNSIGNED_BYTE,
+            buff);
         BufferedImage img =
             new BufferedImage(
                 width,
@@ -452,7 +423,7 @@ public class DisplaySystem {
 
             if (fullscreen) {
                 Display.setDisplayMode(mode);
-                gl = new GL(title, bpp, 0, 16, 0);
+                Window.create(title, bpp, 0, 16, 0);
             } else {
                 int x, y;
                 x =
@@ -462,11 +433,10 @@ public class DisplaySystem {
                     (Toolkit.getDefaultToolkit().getScreenSize().height
                         - height)
                         / 2;
-                gl = new GL(title, x, y, width, height, bpp, 0, 16, 0);
+                Window.create(title, x, y, width, height, bpp, 0, 16, 0);
             }
 
-            gl.create();
-            gl.determineAvailableExtensions();
+            GLCaps.determineAvailableExtensions();
 
             LoggingSystem.getLoggingSystem().getLogger().log(
                 Level.INFO,
@@ -477,7 +447,5 @@ public class DisplaySystem {
                 "Failed to create display due to " + e);
             System.exit(1);
         }
-
-        glu = new GLU(gl);
     }
 }

--- a/src/jme/texture/TextureManager.java
+++ b/src/jme/texture/TextureManager.java
@@ -55,12 +55,11 @@ import javax.swing.ImageIcon;
 
 import jme.exception.MonkeyGLException;
 import jme.exception.MonkeyRuntimeException;
-import jme.system.DisplaySystem;
 import jme.utility.LoggingSystem;
 
-import org.lwjgl.Sys;
 import org.lwjgl.opengl.GL;
 import org.lwjgl.opengl.GLU;
+import org.lwjgl.opengl.Window;
 
 /**
  * <code>TextureManager</code> maintains all textures within the running
@@ -122,13 +121,10 @@ public class TextureManager {
      * @throws MonkeyGLException if OpenGL context has not been created.
      */
     private TextureManager() {
-        gl = DisplaySystem.getDisplaySystem().getGL();
-        glu = DisplaySystem.getDisplaySystem().getGLU();
 
-        if (null == gl || null == glu) {
+        if (!Window.isCreated()) {
             throw new MonkeyGLException(
-                "GL/GLU must be initialized before "
-                    + "calling TextureManager.");
+                "Window must be created before " + "TextureManager.");
         }
         textureList = new HashMap();
         keyList = new ArrayList();
@@ -330,7 +326,7 @@ public class TextureManager {
 
             if (id != boundID) {
                 boundID = id;
-                gl.bindTexture(GL.TEXTURE_2D, id);
+                GL.glBindTexture(GL.GL_TEXTURE_2D, id);
             }
 
             return true;
@@ -353,7 +349,7 @@ public class TextureManager {
     public void bind(int id) {
         if (id != boundID) {
             boundID = id;
-            gl.bindTexture(GL.TEXTURE_2D, id);
+            GL.glBindTexture(GL.GL_TEXTURE_2D, id);
         }
     }
 
@@ -378,9 +374,7 @@ public class TextureManager {
                     .order(ByteOrder.nativeOrder())
                     .asIntBuffer();
             buf.put(id);
-            int bufPtr = Sys.getDirectBufferAddress(buf);
-
-            gl.deleteTextures(1, bufPtr);
+            GL.glDeleteTextures(buf);
             textureList.remove(file);
             return true;
         }
@@ -404,16 +398,14 @@ public class TextureManager {
         for (int i = 0; i < keyList.size(); i++) {
             key = ((TextureData) keyList.get(i)).name;
             id = ((Integer) textureList.get(key)).intValue();
-            if (gl.isTexture(id)) {
+            if (GL.glIsTexture(id)) {
                 IntBuffer buf =
                     ByteBuffer
                         .allocateDirect(4)
                         .order(ByteOrder.nativeOrder())
                         .asIntBuffer();
                 buf.put(id);
-                int bufPtr = Sys.getDirectBufferAddress(buf);
-
-                gl.deleteTextures(1, bufPtr);
+                GL.glDeleteTextures(buf);
             }
         }
 
@@ -505,8 +497,6 @@ public class TextureManager {
         //Get a pointer to the image memory
         ByteBuffer scratch =
             ByteBuffer.allocateDirect(4 * tex.getWidth() * tex.getHeight());
-        int dataAddress = Sys.getDirectBufferAddress(scratch);
-
         byte data[] =
             (byte[]) tex.getRaster().getDataElements(
                 0,
@@ -516,47 +506,53 @@ public class TextureManager {
                 null);
         scratch.clear();
         scratch.put(data);
+        scratch.rewind();
 
-        //Create A IntBuffer For Image Address In Memory     
+        // Create A IntBuffer For Image Address In Memory   
         IntBuffer buf =
             ByteBuffer
                 .allocateDirect(4)
                 .order(ByteOrder.nativeOrder())
                 .asIntBuffer();
-        int bufPtr = Sys.getDirectBufferAddress(buf);
 
         //Create the texture
-        gl.genTextures(1, bufPtr);
+        GL.glGenTextures(buf);
 
-        gl.bindTexture(GL.TEXTURE_2D, buf.get(0));
+        GL.glBindTexture(GL.GL_TEXTURE_2D, buf.get(0));
 
         // Linear Filtering
-        gl.texParameteri(GL.TEXTURE_2D, GL.TEXTURE_MIN_FILTER, minFilter);
+        GL.glTexParameteri(
+            GL.GL_TEXTURE_2D,
+            GL.GL_TEXTURE_MIN_FILTER,
+            minFilter);
         // Linear Filtering
-        gl.texParameteri(GL.TEXTURE_2D, GL.TEXTURE_MAG_FILTER, magFilter);
+        GL.glTexParameteri(
+            GL.GL_TEXTURE_2D,
+            GL.GL_TEXTURE_MAG_FILTER,
+            magFilter);
 
         if (isMipmapped) {
             //generate the mipmaps
-            glu.build2DMipmaps(
-                GL.TEXTURE_2D,
+            GLU.gluBuild2DMipmaps(
+                GL.GL_TEXTURE_2D,
                 3,
                 tex.getWidth(),
                 tex.getHeight(),
-                GL.RGB,
-                GL.UNSIGNED_BYTE,
-                dataAddress);
+                GL.GL_RGB,
+                GL.GL_UNSIGNED_BYTE,
+                scratch);
         } else {
             // Generate The Texture
-            gl.texImage2D(
-                GL.TEXTURE_2D,
+            GL.glTexImage2D(
+                GL.GL_TEXTURE_2D,
                 0,
-                GL.RGB,
+                GL.GL_RGB,
                 tex.getWidth(),
                 tex.getHeight(),
                 0,
-                GL.RGB,
-                GL.UNSIGNED_BYTE,
-                dataAddress);
+                GL.GL_RGB,
+                GL.GL_UNSIGNED_BYTE,
+                scratch);
         }
 
         LoggingSystem.getLoggingSystem().getLogger().log(
@@ -893,8 +889,7 @@ public class TextureManager {
 
         private short constructShort(byte[] in, int offset) {
             short ret = (short) (in[offset + 1] & 0xff);
-            ret =
-                (short) ((ret << 8) | (short) (in[offset + 0] & 0xff));
+            ret = (short) ((ret << 8) | (short) (in[offset + 0] & 0xff));
             return (ret);
         }
 

--- a/src/jme/world/World.java
+++ b/src/jme/world/World.java
@@ -43,7 +43,6 @@ import jme.locale.Locale;
 import jme.locale.external.feature.Water;
 import jme.entity.camera.Camera;
 import jme.entity.effects.ParticleSystem;
-import jme.system.DisplaySystem;
 import jme.utility.LoggingSystem;
 
 /**
@@ -78,7 +77,7 @@ public class World {
      */
     public World() {
         entityList = new ArrayList();
-        gl = DisplaySystem.getDisplaySystem().getGL();
+        //gl = DisplaySystem.getDisplaySystem().getGL();
         LoggingSystem.getLoggingSystem().getLogger().log(Level.INFO,
                 "Created World");
     }
@@ -230,9 +229,9 @@ public class World {
                     
                     if(null != locale) {
                     	if(o instanceof ParticleSystem && locale.useDistanceFog()) {
-                    		gl.disable(GL.FOG);
+                    		GL.glDisable(GL.GL_FOG);
                     	} else if(locale.useDistanceFog()) {
-                    		gl.enable(GL.FOG);
+                    		GL.glEnable(GL.GL_FOG);
                     	}
                     }
                     
@@ -241,9 +240,9 @@ public class World {
                     
                     if(null != locale) {
                     	if(o instanceof ParticleSystem && locale.useDistanceFog()) {
-							gl.enable(GL.FOG);
+							GL.glEnable(GL.GL_FOG);
 						} else if(locale.useDistanceFog()) {
-							gl.disable(GL.FOG);
+							GL.glDisable(GL.GL_FOG);
 						}
                     }
                 }

--- a/src/test/application/TestApplication.java
+++ b/src/test/application/TestApplication.java
@@ -31,9 +31,11 @@
  */
  
 package test.application;
- 
+
 import org.lwjgl.Display; 
 import org.lwjgl.opengl.GL; 
+import org.lwjgl.opengl.GLU;
+import org.lwjgl.opengl.Window;
 
 import jme.AbstractGame; 
 import jme.system.DisplaySystem;
@@ -44,7 +46,7 @@ import jme.system.DisplaySystem;
  * You will can use this basic construct to build more complex jME applications
  *  
  * @author Samuel Wasson
- * @version $Id: TestApplication.java,v 1.2 2003-08-08 02:16:56 mojomonkey Exp $
+ * @version $Id: TestApplication.java,v 1.3 2003-09-03 16:20:51 mojomonkey Exp $
  */
 
 //Edit: Mark Powell - altered comments slightly. 8/7/03
@@ -60,8 +62,8 @@ public class TestApplication extends AbstractGame {
      * Render is called once per frame to display the data.
      */
 	protected void render() {
-		gl.clear(GL.COLOR_BUFFER_BIT | GL.DEPTH_BUFFER_BIT);
-		gl.loadIdentity();
+		GL.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+		GL.glLoadIdentity();
 	}
 	
     /** 
@@ -71,7 +73,7 @@ public class TestApplication extends AbstractGame {
 		
 		DisplaySystem.createDisplaySystem(
 			"TestApplication", 
-			"jme/data/Images/Monkey.jpg",
+			"data/Images/Monkey.jpg",
 			true
 		);
 	}
@@ -80,27 +82,23 @@ public class TestApplication extends AbstractGame {
 
 		 // Here we create the OpenGL bindings.
 		 
-		gl = DisplaySystem.getDisplaySystem().getGL();
-		glu = DisplaySystem.getDisplaySystem().getGLU();
-		
-		
 		//Define the clear color to be black
 				
-		gl.clearColor(0.0f, 0.0f, 0.0f, 0.0f);
+		GL.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
-		gl.matrixMode(GL.PROJECTION);
-		gl.loadIdentity();
+		GL.glMatrixMode(GL.GL_PROJECTION);
+		GL.glLoadIdentity();
 		
 		
 		 // Calculate the aspect ratio
-		glu.perspective(
+        GLU.gluPerspective(
 			45.0f,
 			(float)Display.getWidth() / (float)Display.getHeight(),
 			0.01f,
 			750.0f);
 		
-		gl.matrixMode(GL.MODELVIEW);
-		gl.hint(GL.PERSPECTIVE_CORRECTION_HINT, GL.NICEST);		
+		GL.glMatrixMode(GL.GL_MODELVIEW);
+		GL.glHint(GL.GL_PERSPECTIVE_CORRECTION_HINT, GL.GL_NICEST);		
 	}
 
     /**
@@ -126,7 +124,7 @@ public class TestApplication extends AbstractGame {
      * Clean up the OpenGL resources
      */
 	protected void cleanup() {
-		gl.destroy();
+		Window.destroy();
 	}
 
     /**

--- a/src/test/general/TestController.java
+++ b/src/test/general/TestController.java
@@ -66,7 +66,7 @@ public class TestController extends TrackingController {
 		if (isKeyDown("exit")) {
 			return false;
 		}
-
+        
 		if (isKeyDown("640x480")) {
 			if (smode != 0) {
 				smode = 0;
@@ -89,15 +89,15 @@ public class TestController extends TrackingController {
 		}
 
 		if (isKeyDown("linemode")) {
-			DisplaySystem.getDisplaySystem().getGL().polygonMode(
-				GL.FRONT_AND_BACK,
-				GL.LINE);
+			GL.glPolygonMode(
+				GL.GL_FRONT_AND_BACK,
+				GL.GL_LINE);
 		}
 
 		if (isKeyDown("fillmode")) {
-			DisplaySystem.getDisplaySystem().getGL().polygonMode(
-				GL.FRONT_AND_BACK,
-				GL.FILL);
+			GL.glPolygonMode(
+				GL.GL_FRONT_AND_BACK,
+				GL.GL_FILL);
 		}
 
 		if (isKeyDown("screenshot")) {

--- a/src/test/general/TestMain.java
+++ b/src/test/general/TestMain.java
@@ -39,6 +39,10 @@ import org.lwjgl.Display;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL;
+import org.lwjgl.opengl.GLCaps;
+import org.lwjgl.opengl.GLU;
+import org.lwjgl.opengl.Window;
+
 import jme.AbstractGame;
 import jme.entity.Entity;
 import jme.geometry.model.md3.Md3Model;
@@ -83,10 +87,11 @@ public class TestMain extends AbstractGame {
 	SplashScreen ss;
 
 	static {
-		if (GL.WGL_EXT_swap_control) {
+		if (GLCaps.WGL_EXT_swap_control) {
 			GL.wglSwapIntervalEXT(1);
 		}
 	}
+    
 
 	int tex1, tex2, tex3;
 
@@ -181,8 +186,8 @@ public class TestMain extends AbstractGame {
 
 	}
 	protected void render() {
-		gl.clear(GL.COLOR_BUFFER_BIT | GL.DEPTH_BUFFER_BIT);
-		gl.loadIdentity();
+		GL.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+		GL.glLoadIdentity();
 		cc.render();
 		world.render();
 		font.print(
@@ -230,25 +235,23 @@ public class TestMain extends AbstractGame {
 	}
 
 	private void initGL() {
-		gl = DisplaySystem.getDisplaySystem().getGL();
-		glu = DisplaySystem.getDisplaySystem().getGLU();
-		gl.shadeModel(GL.SMOOTH);
-		gl.clearColor(0.0f, 0.0f, 0.0f, 0.0f);
-		gl.clearDepth(1.0);
-		gl.enable(GL.DEPTH_TEST);
-		gl.depthFunc(GL.LESS);
-		gl.matrixMode(GL.PROJECTION);
-		gl.loadIdentity();
+		GL.glShadeModel(GL.GL_SMOOTH);
+        GL.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+        GL.glClearDepth(1.0);
+        GL.glEnable(GL.GL_DEPTH_TEST);
+        GL.glDepthFunc(GL.GL_LESS);
+        GL.glMatrixMode(GL.GL_PROJECTION);
+        GL.glLoadIdentity();
 		// Calculate The Aspect Ratio Of The Window
-		glu.perspective(
+        GLU.gluPerspective(
 			45.0f,
 			(float) Display.getWidth() / (float) Display.getHeight(),
 			0.1f,
-			750.0f);
-		gl.matrixMode(GL.MODELVIEW);
-		gl.hint(GL.PERSPECTIVE_CORRECTION_HINT, GL.NICEST);
-		gl.blendFunc(GL.SRC_ALPHA, GL.ONE);
-		DisplaySystem.getDisplaySystem().cullMode(GL.BACK, true);
+			500.0f);
+		GL.glMatrixMode(GL.GL_MODELVIEW);
+		GL.glHint(GL.GL_PERSPECTIVE_CORRECTION_HINT, GL.GL_NICEST);
+		GL.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE);
+		DisplaySystem.getDisplaySystem().cullMode(GL.GL_BACK, true);
 
 	}
 	protected void reinit() {
@@ -267,7 +270,7 @@ public class TestMain extends AbstractGame {
 		}
 
 		float[] color = { 0.5f, 0.5f, 0.5f, 1.0f };
-		l.setFogAttributes(GL.LINEAR, color, 0.35f, 100.0f, 750.0f);
+		l.setFogAttributes(GL.GL_LINEAR, color, 0.35f, 50.0f, 500.0f);
 		l.setDistanceFog(true);
 	}
 	protected void initSystem() {
@@ -376,7 +379,7 @@ public class TestMain extends AbstractGame {
 		world.setWater(wp);
 		world.setLocale(l);
 		float[] color = { 0.5f, 0.5f, 0.5f, 1.0f };
-		l.setFogAttributes(GL.LINEAR, color, 0.35f, 50.0f, 750.0f);
+		l.setFogAttributes(GL.GL_LINEAR, color, 0.35f, 50.0f, 750.0f);
 		l.setDistanceFog(true);
 		l.setVolumetricFog(false);
 		l.setVolumetricFogDepth(100);
@@ -426,7 +429,7 @@ public class TestMain extends AbstractGame {
 	protected void cleanup() {
 		Keyboard.destroy();
 		Mouse.destroy();
-		gl.destroy();
+		Window.destroy();
 		TextureManager.reset();
 	}
 	public static void main(String[] args) {

--- a/src/test/general/TestParticleSystem.java
+++ b/src/test/general/TestParticleSystem.java
@@ -34,6 +34,8 @@ package test.general;
 
 import org.lwjgl.Display;
 import org.lwjgl.opengl.GL;
+import org.lwjgl.opengl.GLU;
+import org.lwjgl.opengl.Window;
 import org.lwjgl.vector.Vector3f;
 
 import jme.AbstractGame;
@@ -57,30 +59,28 @@ public class TestParticleSystem extends AbstractGame {
 	}
 
 	protected void render() {
-		gl.clear(GL.COLOR_BUFFER_BIT | GL.DEPTH_BUFFER_BIT);
-		gl.loadIdentity();
+		GL.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+		GL.glLoadIdentity();
 		ps.render();
 	}
 
 	protected void initSystem() {
 		//create the window
-		DisplaySystem.createDisplaySystem("Particles", "jme/data/Images/Monkey.jpg", true);
-		//create the OpenGL bindings
-		gl = DisplaySystem.getDisplaySystem().getGL();
-		glu = DisplaySystem.getDisplaySystem().getGLU();
+		DisplaySystem.createDisplaySystem("Particles", "data/Images/Monkey.jpg", true);
+		
 		//Define what the clear color will be (black)
-		gl.clearColor(0.0f, 0.0f, 0.0f, 0.0f);
-		gl.matrixMode(GL.PROJECTION);
-		gl.loadIdentity();
+		GL.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+		GL.glMatrixMode(GL.GL_PROJECTION);
+		GL.glLoadIdentity();
 		// Calculate The Aspect Ratio Of The Window
-		glu.perspective(
+        GLU.gluPerspective(
 			45.0f,
 			(float) Display.getWidth() / (float) Display.getHeight(),
 			0.01f,
 			750.0f);
-		gl.matrixMode(GL.MODELVIEW);
-		gl.hint(GL.PERSPECTIVE_CORRECTION_HINT, GL.NICEST);
-		gl.disable(GL.DEPTH_TEST);
+		GL.glMatrixMode(GL.GL_MODELVIEW);
+		GL.glHint(GL.GL_PERSPECTIVE_CORRECTION_HINT, GL.GL_NICEST);
+		GL.glDisable(GL.GL_DEPTH_TEST);
 	}
 
 	protected void initGame() {
@@ -95,7 +95,7 @@ public class TestParticleSystem extends AbstractGame {
 		pe.setSpeed(1);
 		pe.setGravity(new Vector3f(0.0f,-100.0f,10.0f));
 		pe.setFriction(1);
-		pe.setTexture("jme/data/texture/star.png");
+		pe.setTexture("data/texture/star.png");
 		pe.loopAnimation(true);
 		
 		ps = new ParticleSystem();
@@ -106,10 +106,11 @@ public class TestParticleSystem extends AbstractGame {
 	protected void reinit() {
 		//nothing here... YET!
 	}
+    
 
 	protected void cleanup() {
 		//clean up the OpenGL resources
-		gl.destroy();
+		Window.destroy();
 	}
 
 	public static void main(String[] args) {

--- a/src/test/keycontroller/KeyController.java
+++ b/src/test/keycontroller/KeyController.java
@@ -48,6 +48,7 @@ public class KeyController extends BaseFPSController {
 	
 	public void setKeys() {
 	 key.set("triangle", Keyboard.KEY_1);
+     key.set("screenshot", Keyboard.KEY_P);
 	}
 	
 	protected boolean checkAdditionalKeys() {
@@ -60,6 +61,11 @@ public class KeyController extends BaseFPSController {
 		 app.setRenderObject(1);
 		 return true;
 	 }
+     
+     if(isKeyDown("screenshot")) {
+         app.takeScreenShot();
+         return true;
+     }
 	 return true;
 	}
 }
\ No newline at end of file

--- a/src/test/keycontroller/TestKeyController.java
+++ b/src/test/keycontroller/TestKeyController.java
@@ -34,6 +34,8 @@ package test.keycontroller;
  
 import org.lwjgl.Display; 
 import org.lwjgl.opengl.GL; 
+import org.lwjgl.opengl.GLU;
+import org.lwjgl.opengl.Window;
 
 import jme.AbstractGame; 
 import jme.system.DisplaySystem;
@@ -72,7 +74,7 @@ public class TestKeyController extends AbstractGame {
 	 */
 	protected void update() {
 		if(!controller.update(timer.getFrameRate())) { 
-		finish();
+		  finish();
 		}
 		timer.update();
 	}
@@ -83,26 +85,30 @@ public class TestKeyController extends AbstractGame {
 	protected void setRenderObject(int value) {
 	 Flag = value;
 	}
+    
+    public void takeScreenShot() {
+        DisplaySystem.getDisplaySystem().takeScreenShot("test");
+    }
 	
 	/**
 	 * Render is called once per frame to display the data.
 	 */
 	protected void render() {
-		gl.clear(GL.COLOR_BUFFER_BIT | GL.DEPTH_BUFFER_BIT);
-		gl.loadIdentity();
+		GL.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+		GL.glLoadIdentity();
 		
 		controller.render();
 		
 		// Enable texture mapping
-		gl.enable(GL.TEXTURE_2D);
+		GL.glEnable(GL.GL_TEXTURE_2D);
 
 		if(Flag == 1) {
-		  gl.pushMatrix();
+		  GL.glPushMatrix();
 		  entity1.render();
-		  gl.popMatrix();
+		  GL.glPopMatrix();
 		}
 		
-		gl.end();
+		GL.glEnd();
 		
 		/*
 		 * Print out the frame rate.
@@ -124,7 +130,7 @@ public class TestKeyController extends AbstractGame {
 	 */
 	protected void initDisplay() {
 		DisplaySystem.createDisplaySystem(
-			"TestApplication", 
+			"TestKeyController", 
 			"data/Images/Monkey.jpg",
 			true
 		);
@@ -132,26 +138,21 @@ public class TestKeyController extends AbstractGame {
 	
 	protected void initGL() {
 
-		// Here we create the OpenGL bindings.
-		gl = DisplaySystem.getDisplaySystem().getGL();
-		glu = DisplaySystem.getDisplaySystem().getGLU();
-		
-
 		 // Define the clear color to be black
-		gl.clearColor(0.0f, 0.0f, 0.0f, 0.0f);
+		GL.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
-		gl.matrixMode(GL.PROJECTION);
-		gl.loadIdentity();
+		GL.glMatrixMode(GL.GL_PROJECTION);
+		GL.glLoadIdentity();
 		
 		// Calculate the aspect ratio
-		glu.perspective(
+        GLU.gluPerspective(
 			45.0f,
 			(float)Display.getWidth() / (float)Display.getHeight(),
 			0.01f,
 			750.0f);
 		
-		gl.matrixMode(GL.MODELVIEW);
-		gl.hint(GL.PERSPECTIVE_CORRECTION_HINT, GL.NICEST);		
+		GL.glMatrixMode(GL.GL_MODELVIEW);
+		GL.glHint(GL.GL_PERSPECTIVE_CORRECTION_HINT, GL.GL_NICEST);		
 	}
 
 	protected void initSystem() {
@@ -162,7 +163,7 @@ public class TestKeyController extends AbstractGame {
 	protected void initGame() {
 
 		 // Blend the font together so it doesn't chop the letters off 
-		gl.blendFunc(GL.SRC_ALPHA, GL.ONE);
+		GL.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE);
 		
 		 //Instantiate a font object
 		font = new Font2D("data/Font/font.png");
@@ -207,7 +208,7 @@ public class TestKeyController extends AbstractGame {
 	 * Clean up the OpenGL resources
 	 */
 	protected void cleanup() {
-		gl.destroy();
+		Window.destroy();
 	}
 	
 	public static void main(String[] args) { 

--- /dev/null
+++ b/src/test/model/TestMilkshape.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2003, jMonkeyEngine - Mojo Monkey Coding
+ * 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 the Mojo Monkey Coding, jME, jMonkey Engine, 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 test.model;
+
+import org.lwjgl.Display; 
+import org.lwjgl.opengl.GL; 
+import org.lwjgl.opengl.GLU;
+import org.lwjgl.opengl.Window;
+
+import jme.AbstractGame; 
+import jme.controller.BaseFPSController;
+import jme.entity.camera.Camera;
+import jme.geometry.model.ms.MilkshapeModel;
+import jme.system.DisplaySystem;
+import jme.utility.Timer;
+
+/**
+ * 
+ * @author Mark Powell
+ */
+
+public class TestMilkshape extends AbstractGame {
+    //our model object
+    private MilkshapeModel model;
+    
+    BaseFPSController controller;
+    Timer timer;
+    Camera camera;
+    /**
+     * This is where we'll do any updating
+     */
+    protected void update() {
+        timer.update();
+        if(!controller.update(timer.getFrameRate())) { 
+          finish();
+        }
+    }
+    
+    /**
+     * Render is called once per frame to display the data.
+     */
+    protected void render() {
+        GL.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+        GL.glLoadIdentity();
+        controller.render();
+        model.render();
+    }
+    
+    /** 
+     * This is where we create and initialize the window.
+     */
+    protected void initDisplay() {
+        
+        DisplaySystem.createDisplaySystem(
+            "TestMilkshape", 
+            "data/Images/Monkey.jpg",
+            true
+        );
+    }
+    
+    protected void initGL() {
+
+         // Here we create the OpenGL bindings.
+         
+        //Define the clear color to be black
+                
+        GL.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+
+        GL.glMatrixMode(GL.GL_PROJECTION);
+        GL.glLoadIdentity();
+        
+        
+         // Calculate the aspect ratio
+        GLU.gluPerspective(
+            45.0f,
+            (float)Display.getWidth() / (float)Display.getHeight(),
+            0.01f,
+            750.0f);
+        
+        GL.glMatrixMode(GL.GL_MODELVIEW);
+        GL.glHint(GL.GL_PERSPECTIVE_CORRECTION_HINT, GL.GL_NICEST);     
+    }
+
+    /**
+     * Called first to initialize system attributes.
+     */
+    protected void initSystem() {
+        initDisplay();
+        initGL();
+    }
+    /** 
+     * Nothing here yet.
+     */
+    protected void initGame() {
+        model = new MilkshapeModel("./data/model/arab/ak47.ms3d");
+        camera = new Camera(1,0,0,100,0,10,0,0,1,0);
+        controller = new BaseFPSController(camera);
+        timer = Timer.getTimer();
+    }
+
+    /** 
+     * Nothing here yet.
+     */
+    protected void reinit() {
+    }
+
+    /**
+     * Clean up the OpenGL resources
+     */
+    protected void cleanup() {
+        Window.destroy();
+    }
+
+    /**
+     * <code>main</code> entry point for application.
+     * @param args comman line arguments, none used.
+     */ 
+    public static void main(String[] args) { 
+       TestMilkshape testApp = new TestMilkshape(); 
+       testApp.start(); 
+    }   
+}
+    
\ No newline at end of file

--- a/src/test/polygon/TestPolygon.java
+++ b/src/test/polygon/TestPolygon.java
@@ -29,13 +29,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  */
- 
+
 package test.polygon;
- 
-import org.lwjgl.Display; 
-import org.lwjgl.opengl.GL; 
 
-import jme.AbstractGame; 
+import org.lwjgl.Display;
+import org.lwjgl.opengl.GL;
+import org.lwjgl.opengl.GLU;
+import org.lwjgl.opengl.Window;
+
+import jme.AbstractGame;
 import jme.system.DisplaySystem;
 import jme.utility.Timer;
 import jme.math.Vector;
@@ -48,134 +50,133 @@ import jme.geometry.primitive.Triangle;
  * You will can use this basic construct to build more complex jME applications
  *  
  * @author Samuel Wasson
- * @version 0.1.0
+ * @version $Id: TestPolygon.java,v 1.4 2003-09-03 16:20:51 mojomonkey Exp $
  */
 
 public class TestPolygon extends AbstractGame {
-	
-	private Timer timer;
-	private Font2D font;
-	private Triangle triangle;
-	private Vector[] points;
-
-	/**
-	 * This is where we'll do any updating.
-	 */
-	protected void update() {
-	// Update each frame to calculate the framerate
-	timer.getFrameRate();
-	timer.update();
-	}
-	
-	/**
-	 * Render is called once per frame to display the data.
-	 */
-	protected void render() {
-		gl.clear(GL.COLOR_BUFFER_BIT | GL.DEPTH_BUFFER_BIT);
-		gl.loadIdentity();
-		
-
-		// Enable texture mapping
-		gl.enable(GL.TEXTURE_2D);
-
-		triangle.render();
-		
-		/*
-		 * Print out the frame rate.
-		 * The print method takes 4 parameters 
-		 * (int, int, string, int). The first two 
-		 * ints are the coordinates to start the text. 
-		 * These are screen coordinates in pixels where 
-		 * (0, 0) is the lower left hand of the screen. 
-		 * The String is whatever you want to display. 
-		 * The last parameter is the font type where 0 
-		 * is normal and 1 is italics
-		 */
-		font.print(1,1,"Frame Rate - " + timer.getFrameRate(), 0);
-
-	}
-	
-	/** 
-	 * This is where we create and initialize the window.
-	 */
-	protected void initDisplay() {
-		DisplaySystem.createDisplaySystem(
-			"TestApplication", 
-			"jme/data/Images/Monkey.jpg",
-			true
-		);
-	}
-	
-	protected void initGL() {
-
-		// Here we create the OpenGL bindings.
-		gl = DisplaySystem.getDisplaySystem().getGL();
-		glu = DisplaySystem.getDisplaySystem().getGLU();
-		
-
-		 // Define the clear color to be black
-		gl.clearColor(0.0f, 0.0f, 0.0f, 0.0f);
-
-		gl.matrixMode(GL.PROJECTION);
-		gl.loadIdentity();
-		
-		// Calculate the aspect ratio
-		glu.perspective(
-			45.0f,
-			(float)Display.getWidth() / (float)Display.getHeight(),
-			0.01f,
-			750.0f);
-		
-		gl.matrixMode(GL.MODELVIEW);
-		gl.hint(GL.PERSPECTIVE_CORRECTION_HINT, GL.NICEST);		
-	}
-
-	protected void initSystem() {
-		initDisplay();
-		initGL();
-	}
-
-	protected void initGame() {
-
-		 // Blend the font together so it doesn't chop the letters off 
-		gl.blendFunc(GL.SRC_ALPHA, GL.ONE);
-		
-		 //Instantiate a font object
-		font = new Font2D("jme/data/Font/font.png");
-		
-		 // Instantiate a new timer object
-		timer = Timer.getTimer();
-		
-		 // Initiate a new Vector class
-		points = new Vector[3];
-		
-		 // Initialize the Vector array
-		for (int i = 0; i < 3; i++) {
-			points[i] = new Vector();
-		}
-		
-		 // Add points to the Vector array
-		points[0].x = 0.0f; points[0].y = 1.0f; points[0].z = -5.0f;
-		points[1].x = -1.0f; points[1].y = -1.0f; points[1].z = -5.0f;
-		points[2].x = 1.0f; points[2].y = -1.0f; points[2].z = -5.0f;
-		
-		 // Instantiate a new Triangle object
-		triangle = new Triangle(points);
-	}
-
-	protected void reinit() {
-		 // Nothing here yet.
-	}
-
-	/**
-	 * Clean up the OpenGL resources
-	 */
-	protected void cleanup() {
-		gl.destroy();
-	}
-	
-	public static void main(String[] args) { 
-	   TestPolygon testPoly = new TestPolygon(); 
-	   testPoly.start(); 
-	}	
+
+    private Timer timer;
+    private Font2D font;
+    private Triangle triangle;
+    private Vector[] points;
+
+    /**
+     * This is where we'll do any updating.
+     */
+    protected void update() {
+        // Update each frame to calculate the framerate
+        timer.getFrameRate();
+        timer.update();
+    }
+
+    /**
+     * Render is called once per frame to display the data.
+     */
+    protected void render() {
+        GL.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+        GL.glLoadIdentity();
+
+        // Enable texture mapping
+        GL.glEnable(GL.GL_TEXTURE_2D);
+
+        triangle.render();
+
+        /*
+         * Print out the frame rate.
+         * The print method takes 4 parameters 
+         * (int, int, string, int). The first two 
+         * ints are the coordinates to start the text. 
+         * These are screen coordinates in pixels where 
+         * (0, 0) is the lower left hand of the screen. 
+         * The String is whatever you want to display. 
+         * The last parameter is the font type where 0 
+         * is normal and 1 is italics
+         */
+        font.print(1, 1, "Frame Rate - " + timer.getFrameRate(), 0);
+
+    }
+
+    /** 
+     * This is where we create and initialize the window.
+     */
+    protected void initDisplay() {
+        DisplaySystem.createDisplaySystem(
+            "TestPolygon",
+            "data/Images/Monkey.jpg",
+            true);
+    }
+
+    protected void initGL() {
+
+        // Define the clear color to be black
+        GL.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+
+        GL.glMatrixMode(GL.GL_PROJECTION);
+        GL.glLoadIdentity();
+
+        // Calculate the aspect ratio
+        GLU.gluPerspective(
+            45.0f,
+            (float) Display.getWidth() / (float) Display.getHeight(),
+            0.01f,
+            750.0f);
+
+        GL.glMatrixMode(GL.GL_MODELVIEW);
+        GL.glHint(GL.GL_PERSPECTIVE_CORRECTION_HINT, GL.GL_NICEST);
+    }
+
+    protected void initSystem() {
+        initDisplay();
+        initGL();
+    }
+
+    protected void initGame() {
+
+        // Blend the font together so it doesn't chop the letters off 
+        GL.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE);
+
+        //Instantiate a font object
+        font = new Font2D("data/Font/font.png");
+
+        // Instantiate a new timer object
+        timer = Timer.getTimer();
+
+        // Initiate a new Vector class
+        points = new Vector[3];
+
+        // Initialize the Vector array
+        for (int i = 0; i < 3; i++) {
+            points[i] = new Vector();
+        }
+
+        // Add points to the Vector array
+        points[0].x = 0.0f;
+        points[0].y = 1.0f;
+        points[0].z = -5.0f;
+        points[1].x = -1.0f;
+        points[1].y = -1.0f;
+        points[1].z = -5.0f;
+        points[2].x = 1.0f;
+        points[2].y = -1.0f;
+        points[2].z = -5.0f;
+
+        // Instantiate a new Triangle object
+        triangle = new Triangle(points);
+    }
+
+    protected void reinit() {
+        // Nothing here yet.
+    }
+
+    /**
+     * Clean up the OpenGL resources
+     */
+    protected void cleanup() {
+        Window.destroy();
+    }
+
+    public static void main(String[] args) {
+        TestPolygon testPoly = new TestPolygon();
+        testPoly.start();
+    }
 }
\ No newline at end of file