Transform rectangle

client/src/main/java/core/engine/Engine.java

@@ -1,5 +1,6 @@
 package core.engine;
 
+import core.engine.entity.Entity;
 import core.engine.model.RawModel;
 import core.engine.model.TexturedModel;
 import core.engine.shader.StaticShader;
@@ -9,6 +10,7 @@ import org.lwjgl.glfw.GLFWErrorCallback;
 import org.lwjgl.glfw.GLFWVidMode;
 import org.lwjgl.opengl.GL;
 import org.lwjgl.system.MemoryStack;
+import utils.vectors.Vector3f;
 
 import java.nio.IntBuffer;
 
@@ -54,10 +56,10 @@ public class Engine {
         // Configure GLFW
         glfwDefaultWindowHints(); // optional, the current window hints are already the default
         glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE); // the window will stay hidden after creation
-        glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE); // the window will be resizable
+        glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE); // the window will be resizable
 
         // Create the window
-        window = glfwCreateWindow(300, 300, "Hello World!", NULL, NULL);
+        window = glfwCreateWindow(1280, 720, "Hello World!", NULL, NULL);
         if ( window == NULL )
             throw new RuntimeException("Failed to create the GLFW window");
 
@@ -127,12 +129,15 @@ public class Engine {
         RawModel model = loader.loadToVAO(vertices,textureCoords,  indices);
         ModelTexture modelTexture = new ModelTexture(loader.loadTexture("test_texture"));
         TexturedModel texturedModel = new TexturedModel(model, modelTexture);
+        Entity entity = new Entity(texturedModel, new Vector3f(-1,0,0), 0,0,0,1);
         // Run the rendering loop until the user has attempted to close
         // the window or has pressed the ESCAPE key.
         while ( !glfwWindowShouldClose(window) ) {
+            entity.increasePosition(0.002f, 0,-0.0002f);
+            entity.increaseRotation(0,1,0);
             renderer.prepare();
             shader.start();
-            renderer.render(texturedModel);
+            renderer.render(entity, shader);
             shader.stop();
             glfwSwapBuffers(window); // swap the color buffers
 

client/src/main/java/core/engine/Renderer.java

@@ -1,11 +1,15 @@
 package core.engine;
 
+import core.engine.entity.Entity;
 import core.engine.model.RawModel;
 import core.engine.model.TexturedModel;
+import core.engine.shader.StaticShader;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL13;
 import org.lwjgl.opengl.GL20;
 import org.lwjgl.opengl.GL30;
+import utils.MatrixGraphicUtils;
+import utils.vectors.Matrix4f;
 
 import static org.lwjgl.opengl.GL11C.*;
 
@@ -16,11 +20,15 @@ public class Renderer {
         GL11.glClearColor(1,0,0,1);
     }
 
-    public void render(TexturedModel texturedModel) {
+    public void render(Entity entity, StaticShader shader) {
+        TexturedModel texturedModel = entity.getModel();
         RawModel rawModel = texturedModel.getRawModel();
         GL30.glBindVertexArray(rawModel.getVaoID());
         GL20.glEnableVertexAttribArray(0);
         GL20.glEnableVertexAttribArray(1);
+        Matrix4f transformationMatrix = MatrixGraphicUtils.createTransformationMatrix(entity.getPosition(), entity.getRotX(),
+                entity.getRotY(), entity.getRotZ(), entity.getScale());
+        shader.loadTransformationMatrix(transformationMatrix);
         GL13.glActiveTexture(GL13.GL_TEXTURE0);
         GL11.glBindTexture(GL11.GL_TEXTURE_2D, texturedModel.getModelTexture().getTextureID());
         GL11.glDrawElements(GL11.GL_TRIANGLES, rawModel.getVertexCount(), GL11.GL_UNSIGNED_INT, 0);

client/src/main/java/core/engine/entity/Entity.java

@@ -0,0 +1,81 @@
+package core.engine.entity;
+
+import core.engine.model.TexturedModel;
+import utils.vectors.Vector3f;
+
+public class Entity {
+
+    private TexturedModel model;
+    private Vector3f position;
+    private float rotX, rotY, rotZ;
+    private float scale;
+
+    public Entity(TexturedModel model, Vector3f position, float rotX, float rotY, float rotZ, float scale) {
+        this.model = model;
+        this.position = position;
+        this.rotX = rotX;
+        this.rotY = rotY;
+        this.rotZ = rotZ;
+        this.scale = scale;
+    }
+
+    public void increasePosition(float dx, float dy, float dz) {
+        position.x += dx;
+        position.y += dy;
+        position.z += dz;
+    }
+
+    public void increaseRotation(float dx, float dy, float dz) {
+         rotX += dx;
+         rotY += dy;
+         rotZ += dz;
+    }
+
+    public TexturedModel getModel() {
+        return model;
+    }
+
+    public void setModel(TexturedModel model) {
+        this.model = model;
+    }
+
+    public Vector3f getPosition() {
+        return position;
+    }
+
+    public void setPosition(Vector3f position) {
+        this.position = position;
+    }
+
+    public float getRotX() {
+        return rotX;
+    }
+
+    public void setRotX(float rotX) {
+        this.rotX = rotX;
+    }
+
+    public float getRotY() {
+        return rotY;
+    }
+
+    public void setRotY(float rotY) {
+        this.rotY = rotY;
+    }
+
+    public float getRotZ() {
+        return rotZ;
+    }
+
+    public void setRotZ(float rotZ) {
+        this.rotZ = rotZ;
+    }
+
+    public float getScale() {
+        return scale;
+    }
+
+    public void setScale(float scale) {
+        this.scale = scale;
+    }
+}

client/src/main/java/core/engine/shader/ShaderProgram.java

@@ -1,12 +1,16 @@
 package core.engine.shader;
 
+import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL20;
+import utils.vectors.Matrix4f;
+import utils.vectors.Vector3f;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
+import java.nio.FloatBuffer;
 
 public abstract class ShaderProgram {
 
@@ -14,15 +18,24 @@ public abstract class ShaderProgram {
     private int vertexShaderID;
     private int fragmentShaderID;
 
+    private static FloatBuffer matrixBuffer = BufferUtils.createFloatBuffer(16);
+
     public ShaderProgram(String vertexFile, String fragmentFile) {
         vertexShaderID = loadShader(vertexFile, GL20.GL_VERTEX_SHADER);
         fragmentShaderID = loadShader(fragmentFile, GL20.GL_FRAGMENT_SHADER);
         programID = GL20.glCreateProgram();
         GL20.glAttachShader(programID, vertexShaderID);
         GL20.glAttachShader(programID, fragmentShaderID);
+        bindAttributes();
         GL20.glLinkProgram(programID);
         GL20.glValidateProgram(programID);
-        bindAttributes();
+        getAllUniformLocations();
+    }
+
+    protected abstract void getAllUniformLocations();
+
+    protected int getUniformLocation(String uniformName) {
+        return GL20.glGetUniformLocation(programID, uniformName);
     }
 
     public void start() {
@@ -48,6 +61,24 @@ public abstract class ShaderProgram {
         GL20.glBindAttribLocation(programID, attribute, variableName);
     }
 
+    protected void loadFloat(int location, float value) {
+        GL20.glUniform1f(location, value);
+    }
+
+    protected void loadVector(int location, Vector3f vector) {
+        GL20.glUniform3f(location, vector.x, vector.y, vector.z);
+    }
+
+    protected void loadBoolean(int location, boolean value) {
+        GL20.glUniform1f(location, value? 1: 0);
+    }
+
+    protected void loadMatrix(int location, Matrix4f matrix) {
+        matrix.store(matrixBuffer);
+        matrixBuffer.flip();
+        GL20.glUniformMatrix4fv(location,false, matrixBuffer);
+    }
+
     private static int loadShader(String file, int type) {
         StringBuilder shadersource = new StringBuilder();
         try {

client/src/main/java/core/engine/shader/StaticShader.java

@@ -1,16 +1,29 @@
 package core.engine.shader;
 
+import utils.vectors.Matrix4f;
+
 public class StaticShader extends ShaderProgram{
 
     private static final String VERTEX_FILE = "src/main/java/core/engine/shader/vertexShader.glsl";
     private static final String FRAGMENT_FILE = "src/main/java/core/engine/shader/fragmentShader.glsl";
+
+    private int location_transformationMatrix;
     public StaticShader() {
         super(VERTEX_FILE, FRAGMENT_FILE);
     }
 
+    @Override
+    protected void getAllUniformLocations() {
+        this.location_transformationMatrix = super.getUniformLocation("transformationMatrix");
+    }
+
     @Override
     protected void bindAttributes() {
         super.bindAttribute(0, "position");
         super.bindAttribute(1, "textureCoords");
     }
+
+    public void loadTransformationMatrix(Matrix4f matrix) {
+        super.loadMatrix(location_transformationMatrix, matrix);
+    }
 }

client/src/main/java/core/engine/shader/vertexShader.glsl

@@ -3,9 +3,11 @@
 in vec3 position;
 in vec2 textureCoords;
 
+uniform mat4 transformationMatrix;
+
 out vec2 pass_textureCoords;
 
 void main(void) {
-    gl_Position = vec4(position, 1.0);
+    gl_Position = transformationMatrix * vec4(position, 1.0);
     pass_textureCoords = textureCoords;
 }

client/src/main/java/utils/MatrixGraphicUtils.java

@@ -0,0 +1,31 @@
+package utils;
+
+import utils.vectors.Matrix4f;
+import utils.vectors.Vector3f;
+
+public class MatrixGraphicUtils {
+
+    public static Matrix4f createTransformationMatrix(Vector3f translation, float rx, float ry,
+                                                      float rz, float scale) {
+        Matrix4f matrix = new Matrix4f();
+        matrix.setIdentity();
+        Matrix4f.translate(translation, matrix, matrix);
+        Matrix4f.rotate((float) Math.toRadians(rx), new Vector3f(1,0,0), matrix, matrix);
+        Matrix4f.rotate((float) Math.toRadians(ry), new Vector3f(0,1,0), matrix, matrix);
+        Matrix4f.rotate((float) Math.toRadians(rz), new Vector3f(0,0,1), matrix, matrix);
+        Matrix4f.scale(new Vector3f(scale,scale,scale), matrix, matrix);
+        return matrix;
+    }
+
+    /*public static Matrix4f createViewMatrix(Camera camera) {
+        Matrix4f viewMatrix = new Matrix4f();
+        viewMatrix.setIdentity();
+        Matrix4f.rotate((float) Math.toRadians(camera.getPitch()), new Vector3f(1, 0, 0), viewMatrix,
+                viewMatrix);
+        Matrix4f.rotate((float) Math.toRadians(camera.getYaw()), new Vector3f(0, 1, 0), viewMatrix, viewMatrix);
+        Vector3f cameraPos = camera.getPosition();
+        Vector3f negativeCameraPos = new Vector3f(-cameraPos.x,-cameraPos.y,-cameraPos.z);
+        Matrix4f.translate(negativeCameraPos, viewMatrix, viewMatrix);
+        return viewMatrix;
+    }*/
+}

client/src/main/java/utils/vectors/Matrix.java

@@ -0,0 +1,103 @@
+package utils.vectors;
+
+import java.io.Serializable;
+import java.nio.FloatBuffer;
+
+/**
+ *
+ * Base class for matrices. When a matrix is constructed it will be the identity
+ * matrix unless otherwise stated.
+ *
+ * @author cix_foo <cix_foo@users.sourceforge.net>
+ * @version $Revision$
+ * $Id$
+ */
+public abstract class Matrix implements Serializable {
+
+    /**
+     * Constructor for Matrix.
+     */
+    protected Matrix() {
+        super();
+    }
+
+    /**
+     * Set this matrix to be the identity matrix.
+     * @return this
+     */
+    public abstract Matrix setIdentity();
+
+
+    /**
+     * Invert this matrix
+     * @return this
+     */
+    public abstract Matrix invert();
+
+
+    /**
+     * Load from a float buffer. The buffer stores the matrix in column major
+     * (OpenGL) order.
+     *
+     * @param buf A float buffer to read from
+     * @return this
+     */
+    public abstract Matrix load(FloatBuffer buf);
+
+
+    /**
+     * Load from a float buffer. The buffer stores the matrix in row major
+     * (mathematical) order.
+     *
+     * @param buf A float buffer to read from
+     * @return this
+     */
+    public abstract Matrix loadTranspose(FloatBuffer buf);
+
+
+    /**
+     * Negate this matrix
+     * @return this
+     */
+    public abstract Matrix negate();
+
+
+    /**
+     * Store this matrix in a float buffer. The matrix is stored in column
+     * major (openGL) order.
+     * @param buf The buffer to store this matrix in
+     * @return this
+     */
+    public abstract Matrix store(FloatBuffer buf);
+
+
+    /**
+     * Store this matrix in a float buffer. The matrix is stored in row
+     * major (maths) order.
+     * @param buf The buffer to store this matrix in
+     * @return this
+     */
+    public abstract Matrix storeTranspose(FloatBuffer buf);
+
+
+    /**
+     * Transpose this matrix
+     * @return this
+     */
+    public abstract Matrix transpose();
+
+
+    /**
+     * Set this matrix to 0.
+     * @return this
+     */
+    public abstract Matrix setZero();
+
+
+    /**
+     * @return the determinant of the matrix
+     */
+    public abstract float determinant();
+
+
+}

client/src/main/java/utils/vectors/Matrix2f.java

@@ -0,0 +1,370 @@
+package utils.vectors;
+
+
+import java.io.Serializable;
+import java.nio.FloatBuffer;
+
+/**
+ *
+ * Holds a 2x2 matrix
+ *
+ * @author cix_foo <cix_foo@users.sourceforge.net>
+ * @version $Revision$
+ * $Id$
+ */
+
+public class Matrix2f extends Matrix implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public float m00, m01, m10, m11;
+
+    /**
+     * Constructor for Matrix2f. The matrix is initialised to the identity.
+     */
+    public Matrix2f() {
+        setIdentity();
+    }
+
+    /**
+     * Constructor
+     */
+    public Matrix2f(Matrix2f src) {
+        load(src);
+    }
+
+    /**
+     * Load from another matrix
+     * @param src The source matrix
+     * @return this
+     */
+    public Matrix2f load(Matrix2f src) {
+        return load(src, this);
+    }
+
+    /**
+     * Copy the source matrix to the destination matrix.
+     * @param src The source matrix
+     * @param dest The destination matrix, or null if a new one should be created.
+     * @return The copied matrix
+     */
+    public static Matrix2f load(Matrix2f src, Matrix2f dest) {
+        if (dest == null)
+            dest = new Matrix2f();
+
+        dest.m00 = src.m00;
+        dest.m01 = src.m01;
+        dest.m10 = src.m10;
+        dest.m11 = src.m11;
+
+        return dest;
+    }
+
+    /**
+     * Load from a float buffer. The buffer stores the matrix in column major
+     * (OpenGL) order.
+     *
+     * @param buf A float buffer to read from
+     * @return this
+     */
+    public Matrix load(FloatBuffer buf) {
+
+        m00 = buf.get();
+        m01 = buf.get();
+        m10 = buf.get();
+        m11 = buf.get();
+
+        return this;
+    }
+
+    /**
+     * Load from a float buffer. The buffer stores the matrix in row major
+     * (mathematical) order.
+     *
+     * @param buf A float buffer to read from
+     * @return this
+     */
+    public Matrix loadTranspose(FloatBuffer buf) {
+
+        m00 = buf.get();
+        m10 = buf.get();
+        m01 = buf.get();
+        m11 = buf.get();
+
+        return this;
+    }
+
+    /**
+     * Store this matrix in a float buffer. The matrix is stored in column
+     * major (openGL) order.
+     * @param buf The buffer to store this matrix in
+     */
+    public Matrix store(FloatBuffer buf) {
+        buf.put(m00);
+        buf.put(m01);
+        buf.put(m10);
+        buf.put(m11);
+        return this;
+    }
+
+    /**
+     * Store this matrix in a float buffer. The matrix is stored in row
+     * major (maths) order.
+     * @param buf The buffer to store this matrix in
+     */
+    public Matrix storeTranspose(FloatBuffer buf) {
+        buf.put(m00);
+        buf.put(m10);
+        buf.put(m01);
+        buf.put(m11);
+        return this;
+    }
+
+
+
+    /**
+     * Add two matrices together and place the result in a third matrix.
+     * @param left The left source matrix
+     * @param right The right source matrix
+     * @param dest The destination matrix, or null if a new one is to be created
+     * @return the destination matrix
+     */
+    public static Matrix2f add(Matrix2f left, Matrix2f right, Matrix2f dest) {
+        if (dest == null)
+            dest = new Matrix2f();
+
+        dest.m00 = left.m00 + right.m00;
+        dest.m01 = left.m01 + right.m01;
+        dest.m10 = left.m10 + right.m10;
+        dest.m11 = left.m11 + right.m11;
+
+        return dest;
+    }
+
+    /**
+     * Subtract the right matrix from the left and place the result in a third matrix.
+     * @param left The left source matrix
+     * @param right The right source matrix
+     * @param dest The destination matrix, or null if a new one is to be created
+     * @return the destination matrix
+     */
+    public static Matrix2f sub(Matrix2f left, Matrix2f right, Matrix2f dest) {
+        if (dest == null)
+            dest = new Matrix2f();
+
+        dest.m00 = left.m00 - right.m00;
+        dest.m01 = left.m01 - right.m01;
+        dest.m10 = left.m10 - right.m10;
+        dest.m11 = left.m11 - right.m11;
+
+        return dest;
+    }
+
+    /**
+     * Multiply the right matrix by the left and place the result in a third matrix.
+     * @param left The left source matrix
+     * @param right The right source matrix
+     * @param dest The destination matrix, or null if a new one is to be created
+     * @return the destination matrix
+     */
+    public static Matrix2f mul(Matrix2f left, Matrix2f right, Matrix2f dest) {
+        if (dest == null)
+            dest = new Matrix2f();
+
+        float m00 = left.m00 * right.m00 + left.m10 * right.m01;
+        float m01 = left.m01 * right.m00 + left.m11 * right.m01;
+        float m10 = left.m00 * right.m10 + left.m10 * right.m11;
+        float m11 = left.m01 * right.m10 + left.m11 * right.m11;
+
+        dest.m00 = m00;
+        dest.m01 = m01;
+        dest.m10 = m10;
+        dest.m11 = m11;
+
+        return dest;
+    }
+
+    /**
+     * Transform a Vector by a matrix and return the result in a destination
+     * vector.
+     * @param left The left matrix
+     * @param right The right vector
+     * @param dest The destination vector, or null if a new one is to be created
+     * @return the destination vector
+     */
+    public static Vector2f transform(Matrix2f left, Vector2f right, Vector2f dest) {
+        if (dest == null)
+            dest = new Vector2f();
+
+        float x = left.m00 * right.x + left.m10 * right.y;
+        float y = left.m01 * right.x + left.m11 * right.y;
+
+        dest.x = x;
+        dest.y = y;
+
+        return dest;
+    }
+
+    /**
+     * Transpose this matrix
+     * @return this
+     */
+    public Matrix transpose() {
+        return transpose(this);
+    }
+
+    /**
+     * Transpose this matrix and place the result in another matrix.
+     * @param dest The destination matrix or null if a new matrix is to be created
+     * @return the transposed matrix
+     */
+    public Matrix2f transpose(Matrix2f dest) {
+        return transpose(this, dest);
+    }
+
+    /**
+     * Transpose the source matrix and place the result in the destination matrix.
+     * @param src The source matrix or null if a new matrix is to be created
+     * @param dest The destination matrix or null if a new matrix is to be created
+     * @return the transposed matrix
+     */
+    public static Matrix2f transpose(Matrix2f src, Matrix2f dest) {
+        if (dest == null)
+            dest = new Matrix2f();
+
+        float m01 = src.m10;
+        float m10 = src.m01;
+
+        dest.m01 = m01;
+        dest.m10 = m10;
+
+        return dest;
+    }
+
+    /**
+     * Invert this matrix
+     * @return this if successful, null otherwise
+     */
+    public Matrix invert() {
+        return invert(this, this);
+    }
+
+    /**
+     * Invert the source matrix and place the result in the destination matrix.
+     * @param src The source matrix to be inverted
+     * @param dest The destination matrix or null if a new matrix is to be created
+     * @return The inverted matrix, or null if source can't be reverted.
+     */
+    public static Matrix2f invert(Matrix2f src, Matrix2f dest) {
+        /*
+         *inv(A) = 1/det(A) * adj(A);
+         */
+
+        float determinant = src.determinant();
+        if (determinant != 0) {
+            if (dest == null)
+                dest = new Matrix2f();
+            float determinant_inv = 1f/determinant;
+            float t00 =  src.m11*determinant_inv;
+            float t01 = -src.m01*determinant_inv;
+            float t11 =  src.m00*determinant_inv;
+            float t10 = -src.m10*determinant_inv;
+
+            dest.m00 = t00;
+            dest.m01 = t01;
+            dest.m10 = t10;
+            dest.m11 = t11;
+            return dest;
+        } else
+            return null;
+    }
+
+    /**
+     * Returns a string representation of this matrix
+     */
+    public String toString() {
+        StringBuilder buf = new StringBuilder();
+        buf.append(m00).append(' ').append(m10).append(' ').append('\n');
+        buf.append(m01).append(' ').append(m11).append(' ').append('\n');
+        return buf.toString();
+    }
+
+    /**
+     * Negate this matrix
+     * @return this
+     */
+    public Matrix negate() {
+        return negate(this);
+    }
+
+    /**
+     * Negate this matrix and stash the result in another matrix.
+     * @param dest The destination matrix, or null if a new matrix is to be created
+     * @return the negated matrix
+     */
+    public Matrix2f negate(Matrix2f dest) {
+        return negate(this, dest);
+    }
+
+    /**
+     * Negate the source matrix and stash the result in the destination matrix.
+     * @param src The source matrix to be negated
+     * @param dest The destination matrix, or null if a new matrix is to be created
+     * @return the negated matrix
+     */
+    public static Matrix2f negate(Matrix2f src, Matrix2f dest) {
+        if (dest == null)
+            dest = new Matrix2f();
+
+        dest.m00 = -src.m00;
+        dest.m01 = -src.m01;
+        dest.m10 = -src.m10;
+        dest.m11 = -src.m11;
+
+        return dest;
+    }
+
+    /**
+     * Set this matrix to be the identity matrix.
+     * @return this
+     */
+    public Matrix setIdentity() {
+        return setIdentity(this);
+    }
+
+    /**
+     * Set the source matrix to be the identity matrix.
+     * @param src The matrix to set to the identity.
+     * @return The source matrix
+     */
+    public static Matrix2f setIdentity(Matrix2f src) {
+        src.m00 = 1.0f;
+        src.m01 = 0.0f;
+        src.m10 = 0.0f;
+        src.m11 = 1.0f;
+        return src;
+    }
+
+    /**
+     * Set this matrix to 0.
+     * @return this
+     */
+    public Matrix setZero() {
+        return setZero(this);
+    }
+
+    public static Matrix2f setZero(Matrix2f src) {
+        src.m00 = 0.0f;
+        src.m01 = 0.0f;
+        src.m10 = 0.0f;
+        src.m11 = 0.0f;
+        return src;
+    }
+
+    /* (non-Javadoc)
+     * @see org.lwjgl.vector.Matrix#determinant()
+     */
+    public float determinant() {
+        return m00 * m11 - m01*m10;
+    }
+}

client/src/main/java/utils/vectors/Matrix3f.java

@@ -0,0 +1,480 @@
+package utils.vectors;
+
+
+import java.io.Serializable;
+import java.nio.FloatBuffer;
+
+/**
+ *
+ * Holds a 3x3 matrix.
+ *
+ * @author cix_foo <cix_foo@users.sourceforge.net>
+ * @version $Revision$
+ * $Id$
+ */
+
+public class Matrix3f extends Matrix implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public float m00,
+            m01,
+            m02,
+            m10,
+            m11,
+            m12,
+            m20,
+            m21,
+            m22;
+
+    /**
+     * Constructor for Matrix3f. Matrix is initialised to the identity.
+     */
+    public Matrix3f() {
+        super();
+        setIdentity();
+    }
+
+    /**
+     * Load from another matrix
+     * @param src The source matrix
+     * @return this
+     */
+    public Matrix3f load(Matrix3f src) {
+        return load(src, this);
+    }
+
+    /**
+     * Copy source matrix to destination matrix
+     * @param src The source matrix
+     * @param dest The destination matrix, or null of a new matrix is to be created
+     * @return The copied matrix
+     */
+    public static Matrix3f load(Matrix3f src, Matrix3f dest) {
+        if (dest == null)
+            dest = new Matrix3f();
+
+        dest.m00 = src.m00;
+        dest.m10 = src.m10;
+        dest.m20 = src.m20;
+        dest.m01 = src.m01;
+        dest.m11 = src.m11;
+        dest.m21 = src.m21;
+        dest.m02 = src.m02;
+        dest.m12 = src.m12;
+        dest.m22 = src.m22;
+
+        return dest;
+    }
+
+    /**
+     * Load from a float buffer. The buffer stores the matrix in column major
+     * (OpenGL) order.
+     *
+     * @param buf A float buffer to read from
+     * @return this
+     */
+    public Matrix load(FloatBuffer buf) {
+
+        m00 = buf.get();
+        m01 = buf.get();
+        m02 = buf.get();
+        m10 = buf.get();
+        m11 = buf.get();
+        m12 = buf.get();
+        m20 = buf.get();
+        m21 = buf.get();
+        m22 = buf.get();
+
+        return this;
+    }
+
+    /**
+     * Load from a float buffer. The buffer stores the matrix in row major
+     * (maths) order.
+     *
+     * @param buf A float buffer to read from
+     * @return this
+     */
+    public Matrix loadTranspose(FloatBuffer buf) {
+
+        m00 = buf.get();
+        m10 = buf.get();
+        m20 = buf.get();
+        m01 = buf.get();
+        m11 = buf.get();
+        m21 = buf.get();
+        m02 = buf.get();
+        m12 = buf.get();
+        m22 = buf.get();
+
+        return this;
+    }
+
+    /**
+     * Store this matrix in a float buffer. The matrix is stored in column
+     * major (openGL) order.
+     * @param buf The buffer to store this matrix in
+     */
+    public Matrix store(FloatBuffer buf) {
+        buf.put(m00);
+        buf.put(m01);
+        buf.put(m02);
+        buf.put(m10);
+        buf.put(m11);
+        buf.put(m12);
+        buf.put(m20);
+        buf.put(m21);
+        buf.put(m22);
+        return this;
+    }
+
+    /**
+     * Store this matrix in a float buffer. The matrix is stored in row
+     * major (maths) order.
+     * @param buf The buffer to store this matrix in
+     */
+    public Matrix storeTranspose(FloatBuffer buf) {
+        buf.put(m00);
+        buf.put(m10);
+        buf.put(m20);
+        buf.put(m01);
+        buf.put(m11);
+        buf.put(m21);
+        buf.put(m02);
+        buf.put(m12);
+        buf.put(m22);
+        return this;
+    }
+
+    /**
+     * Add two matrices together and place the result in a third matrix.
+     * @param left The left source matrix
+     * @param right The right source matrix
+     * @param dest The destination matrix, or null if a new one is to be created
+     * @return the destination matrix
+     */
+    public static Matrix3f add(Matrix3f left, Matrix3f right, Matrix3f dest) {
+        if (dest == null)
+            dest = new Matrix3f();
+
+        dest.m00 = left.m00 + right.m00;
+        dest.m01 = left.m01 + right.m01;
+        dest.m02 = left.m02 + right.m02;
+        dest.m10 = left.m10 + right.m10;
+        dest.m11 = left.m11 + right.m11;
+        dest.m12 = left.m12 + right.m12;
+        dest.m20 = left.m20 + right.m20;
+        dest.m21 = left.m21 + right.m21;
+        dest.m22 = left.m22 + right.m22;
+
+        return dest;
+    }
+
+    /**
+     * Subtract the right matrix from the left and place the result in a third matrix.
+     * @param left The left source matrix
+     * @param right The right source matrix
+     * @param dest The destination matrix, or null if a new one is to be created
+     * @return the destination matrix
+     */
+    public static Matrix3f sub(Matrix3f left, Matrix3f right, Matrix3f dest) {
+        if (dest == null)
+            dest = new Matrix3f();
+
+        dest.m00 = left.m00 - right.m00;
+        dest.m01 = left.m01 - right.m01;
+        dest.m02 = left.m02 - right.m02;
+        dest.m10 = left.m10 - right.m10;
+        dest.m11 = left.m11 - right.m11;
+        dest.m12 = left.m12 - right.m12;
+        dest.m20 = left.m20 - right.m20;
+        dest.m21 = left.m21 - right.m21;
+        dest.m22 = left.m22 - right.m22;
+
+        return dest;
+    }
+
+    /**
+     * Multiply the right matrix by the left and place the result in a third matrix.
+     * @param left The left source matrix
+     * @param right The right source matrix
+     * @param dest The destination matrix, or null if a new one is to be created
+     * @return the destination matrix
+     */
+    public static Matrix3f mul(Matrix3f left, Matrix3f right, Matrix3f dest) {
+        if (dest == null)
+            dest = new Matrix3f();
+
+        float m00 =
+                left.m00 * right.m00 + left.m10 * right.m01 + left.m20 * right.m02;
+        float m01 =
+                left.m01 * right.m00 + left.m11 * right.m01 + left.m21 * right.m02;
+        float m02 =
+                left.m02 * right.m00 + left.m12 * right.m01 + left.m22 * right.m02;
+        float m10 =
+                left.m00 * right.m10 + left.m10 * right.m11 + left.m20 * right.m12;
+        float m11 =
+                left.m01 * right.m10 + left.m11 * right.m11 + left.m21 * right.m12;
+        float m12 =
+                left.m02 * right.m10 + left.m12 * right.m11 + left.m22 * right.m12;
+        float m20 =
+                left.m00 * right.m20 + left.m10 * right.m21 + left.m20 * right.m22;
+        float m21 =
+                left.m01 * right.m20 + left.m11 * right.m21 + left.m21 * right.m22;
+        float m22 =
+                left.m02 * right.m20 + left.m12 * right.m21 + left.m22 * right.m22;
+
+        dest.m00 = m00;
+        dest.m01 = m01;
+        dest.m02 = m02;
+        dest.m10 = m10;
+        dest.m11 = m11;
+        dest.m12 = m12;
+        dest.m20 = m20;
+        dest.m21 = m21;
+        dest.m22 = m22;
+
+        return dest;
+    }
+
+    /**
+     * Transform a Vector by a matrix and return the result in a destination
+     * vector.
+     * @param left The left matrix
+     * @param right The right vector
+     * @param dest The destination vector, or null if a new one is to be created
+     * @return the destination vector
+     */
+    public static Vector3f transform(Matrix3f left, Vector3f right, Vector3f dest) {
+        if (dest == null)
+            dest = new Vector3f();
+
+        float x = left.m00 * right.x + left.m10 * right.y + left.m20 * right.z;
+        float y = left.m01 * right.x + left.m11 * right.y + left.m21 * right.z;
+        float z = left.m02 * right.x + left.m12 * right.y + left.m22 * right.z;
+
+        dest.x = x;
+        dest.y = y;
+        dest.z = z;
+
+        return dest;
+    }
+
+    /**
+     * Transpose this matrix
+     * @return this
+     */
+    public Matrix transpose() {
+        return transpose(this, this);
+    }
+
+    /**
+     * Transpose this matrix and place the result in another matrix
+     * @param dest The destination matrix or null if a new matrix is to be created
+     * @return the transposed matrix
+     */
+    public Matrix3f transpose(Matrix3f dest) {
+        return transpose(this, dest);
+    }
+
+    /**
+     * Transpose the source matrix and place the result into the destination matrix
+     * @param src The source matrix to be transposed
+     * @param dest The destination matrix or null if a new matrix is to be created
+     * @return the transposed matrix
+     */
+    public static Matrix3f transpose(Matrix3f src, Matrix3f dest) {
+        if (dest == null)
+            dest = new Matrix3f();
+        float m00 = src.m00;
+        float m01 = src.m10;
+        float m02 = src.m20;
+        float m10 = src.m01;
+        float m11 = src.m11;
+        float m12 = src.m21;
+        float m20 = src.m02;
+        float m21 = src.m12;
+        float m22 = src.m22;
+
+        dest.m00 = m00;
+        dest.m01 = m01;
+        dest.m02 = m02;
+        dest.m10 = m10;
+        dest.m11 = m11;
+        dest.m12 = m12;
+        dest.m20 = m20;
+        dest.m21 = m21;
+        dest.m22 = m22;
+        return dest;
+    }
+
+    /**
+     * @return the determinant of the matrix
+     */
+    public float determinant() {
+        float f =
+                m00 * (m11 * m22 - m12 * m21)
+                        + m01 * (m12 * m20 - m10 * m22)
+                        + m02 * (m10 * m21 - m11 * m20);
+        return f;
+    }
+
+    /**
+     * Returns a string representation of this matrix
+     */
+    public String toString() {
+        StringBuilder buf = new StringBuilder();
+        buf.append(m00).append(' ').append(m10).append(' ').append(m20).append(' ').append('\n');
+        buf.append(m01).append(' ').append(m11).append(' ').append(m21).append(' ').append('\n');
+        buf.append(m02).append(' ').append(m12).append(' ').append(m22).append(' ').append('\n');
+        return buf.toString();
+    }
+
+    /**
+     * Invert this matrix
+     * @return this if successful, null otherwise
+     */
+    public Matrix invert() {
+        return invert(this, this);
+    }
+
+    /**
+     * Invert the source matrix and put the result into the destination matrix
+     * @param src The source matrix to be inverted
+     * @param dest The destination matrix, or null if a new one is to be created
+     * @return The inverted matrix if successful, null otherwise
+     */
+    public static Matrix3f invert(Matrix3f src, Matrix3f dest) {
+        float determinant = src.determinant();
+
+        if (determinant != 0) {
+            if (dest == null)
+                dest = new Matrix3f();
+            /* do it the ordinary way
+             *
+             * inv(A) = 1/det(A) * adj(T), where adj(T) = transpose(Conjugate Matrix)
+             *
+             * m00 m01 m02
+             * m10 m11 m12
+             * m20 m21 m22
+             */
+            float determinant_inv = 1f/determinant;
+
+            // get the conjugate matrix
+            float t00 = src.m11 * src.m22 - src.m12* src.m21;
+            float t01 = - src.m10 * src.m22 + src.m12 * src.m20;
+            float t02 = src.m10 * src.m21 - src.m11 * src.m20;
+            float t10 = - src.m01 * src.m22 + src.m02 * src.m21;
+            float t11 = src.m00 * src.m22 - src.m02 * src.m20;
+            float t12 = - src.m00 * src.m21 + src.m01 * src.m20;
+            float t20 = src.m01 * src.m12 - src.m02 * src.m11;
+            float t21 = -src.m00 * src.m12 + src.m02 * src.m10;
+            float t22 = src.m00 * src.m11 - src.m01 * src.m10;
+
+            dest.m00 = t00*determinant_inv;
+            dest.m11 = t11*determinant_inv;
+            dest.m22 = t22*determinant_inv;
+            dest.m01 = t10*determinant_inv;
+            dest.m10 = t01*determinant_inv;
+            dest.m20 = t02*determinant_inv;
+            dest.m02 = t20*determinant_inv;
+            dest.m12 = t21*determinant_inv;
+            dest.m21 = t12*determinant_inv;
+            return dest;
+        } else
+            return null;
+    }
+
+
+    /**
+     * Negate this matrix
+     * @return this
+     */
+    public Matrix negate() {
+        return negate(this);
+    }
+
+    /**
+     * Negate this matrix and place the result in a destination matrix.
+     * @param dest The destination matrix, or null if a new matrix is to be created
+     * @return the negated matrix
+     */
+    public Matrix3f negate(Matrix3f dest) {
+        return negate(this, dest);
+    }
+
+    /**
+     * Negate the source matrix and place the result in the destination matrix.
+     * @param src The source matrix
+     * @param dest The destination matrix, or null if a new matrix is to be created
+     * @return the negated matrix
+     */
+    public static Matrix3f negate(Matrix3f src, Matrix3f dest) {
+        if (dest == null)
+            dest = new Matrix3f();
+
+        dest.m00 = -src.m00;
+        dest.m01 = -src.m02;
+        dest.m02 = -src.m01;
+        dest.m10 = -src.m10;
+        dest.m11 = -src.m12;
+        dest.m12 = -src.m11;
+        dest.m20 = -src.m20;
+        dest.m21 = -src.m22;
+        dest.m22 = -src.m21;
+        return dest;
+    }
+
+    /**
+     * Set this matrix to be the identity matrix.
+     * @return this
+     */
+    public Matrix setIdentity() {
+        return setIdentity(this);
+    }
+
+    /**
+     * Set the matrix to be the identity matrix.
+     * @param m The matrix to be set to the identity
+     * @return m
+     */
+    public static Matrix3f setIdentity(Matrix3f m) {
+        m.m00 = 1.0f;
+        m.m01 = 0.0f;
+        m.m02 = 0.0f;
+        m.m10 = 0.0f;
+        m.m11 = 1.0f;
+        m.m12 = 0.0f;
+        m.m20 = 0.0f;
+        m.m21 = 0.0f;
+        m.m22 = 1.0f;
+        return m;
+    }
+
+    /**
+     * Set this matrix to 0.
+     * @return this
+     */
+    public Matrix setZero() {
+        return setZero(this);
+    }
+
+    /**
+     * Set the matrix matrix to 0.
+     * @param m The matrix to be set to 0
+     * @return m
+     */
+    public static Matrix3f setZero(Matrix3f m) {
+        m.m00 = 0.0f;
+        m.m01 = 0.0f;
+        m.m02 = 0.0f;
+        m.m10 = 0.0f;
+        m.m11 = 0.0f;
+        m.m12 = 0.0f;
+        m.m20 = 0.0f;
+        m.m21 = 0.0f;
+        m.m22 = 0.0f;
+        return m;
+    }
+}

client/src/main/java/utils/vectors/Matrix4f.java

@@ -0,0 +1,819 @@
+package utils.vectors;
+
+
+import java.io.Serializable;
+import java.nio.FloatBuffer;
+
+/**
+ * Holds a 4x4 float matrix.
+ *
+ * @author foo
+ */
+public class Matrix4f extends Matrix implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    public float m00, m01, m02, m03, m10, m11, m12, m13, m20, m21, m22, m23, m30, m31, m32, m33;
+
+    /**
+     * Construct a new matrix, initialized to the identity.
+     */
+    public Matrix4f() {
+        super();
+        setIdentity();
+    }
+
+    public Matrix4f(final Matrix4f src) {
+        super();
+        load(src);
+    }
+
+    /**
+     * Returns a string representation of this matrix
+     */
+    public String toString() {
+        StringBuilder buf = new StringBuilder();
+        buf.append(m00).append(' ').append(m10).append(' ').append(m20).append(' ').append(m30).append('\n');
+        buf.append(m01).append(' ').append(m11).append(' ').append(m21).append(' ').append(m31).append('\n');
+        buf.append(m02).append(' ').append(m12).append(' ').append(m22).append(' ').append(m32).append('\n');
+        buf.append(m03).append(' ').append(m13).append(' ').append(m23).append(' ').append(m33).append('\n');
+        return buf.toString();
+    }
+
+    /**
+     * Set this matrix to be the identity matrix.
+     * @return this
+     */
+    public Matrix setIdentity() {
+        return setIdentity(this);
+    }
+
+    /**
+     * Set the given matrix to be the identity matrix.
+     * @param m The matrix to set to the identity
+     * @return m
+     */
+    public static Matrix4f setIdentity(Matrix4f m) {
+        m.m00 = 1.0f;
+        m.m01 = 0.0f;
+        m.m02 = 0.0f;
+        m.m03 = 0.0f;
+        m.m10 = 0.0f;
+        m.m11 = 1.0f;
+        m.m12 = 0.0f;
+        m.m13 = 0.0f;
+        m.m20 = 0.0f;
+        m.m21 = 0.0f;
+        m.m22 = 1.0f;
+        m.m23 = 0.0f;
+        m.m30 = 0.0f;
+        m.m31 = 0.0f;
+        m.m32 = 0.0f;
+        m.m33 = 1.0f;
+
+        return m;
+    }
+
+    /**
+     * Set this matrix to 0.
+     * @return this
+     */
+    public Matrix setZero() {
+        return setZero(this);
+    }
+
+    /**
+     * Set the given matrix to 0.
+     * @param m The matrix to set to 0
+     * @return m
+     */
+    public static Matrix4f setZero(Matrix4f m) {
+        m.m00 = 0.0f;
+        m.m01 = 0.0f;
+        m.m02 = 0.0f;
+        m.m03 = 0.0f;
+        m.m10 = 0.0f;
+        m.m11 = 0.0f;
+        m.m12 = 0.0f;
+        m.m13 = 0.0f;
+        m.m20 = 0.0f;
+        m.m21 = 0.0f;
+        m.m22 = 0.0f;
+        m.m23 = 0.0f;
+        m.m30 = 0.0f;
+        m.m31 = 0.0f;
+        m.m32 = 0.0f;
+        m.m33 = 0.0f;
+
+        return m;
+    }
+
+    /**
+     * Load from another matrix4f
+     * @param src The source matrix
+     * @return this
+     */
+    public Matrix4f load(Matrix4f src) {
+        return load(src, this);
+    }
+
+    /**
+     * Copy the source matrix to the destination matrix
+     * @param src The source matrix
+     * @param dest The destination matrix, or null of a new one is to be created
+     * @return The copied matrix
+     */
+    public static Matrix4f load(Matrix4f src, Matrix4f dest) {
+        if (dest == null)
+            dest = new Matrix4f();
+        dest.m00 = src.m00;
+        dest.m01 = src.m01;
+        dest.m02 = src.m02;
+        dest.m03 = src.m03;
+        dest.m10 = src.m10;
+        dest.m11 = src.m11;
+        dest.m12 = src.m12;
+        dest.m13 = src.m13;
+        dest.m20 = src.m20;
+        dest.m21 = src.m21;
+        dest.m22 = src.m22;
+        dest.m23 = src.m23;
+        dest.m30 = src.m30;
+        dest.m31 = src.m31;
+        dest.m32 = src.m32;
+        dest.m33 = src.m33;
+
+        return dest;
+    }
+
+    /**
+     * Load from a float buffer. The buffer stores the matrix in column major
+     * (OpenGL) order.
+     *
+     * @param buf A float buffer to read from
+     * @return this
+     */
+    public Matrix load(FloatBuffer buf) {
+
+        m00 = buf.get();
+        m01 = buf.get();
+        m02 = buf.get();
+        m03 = buf.get();
+        m10 = buf.get();
+        m11 = buf.get();
+        m12 = buf.get();
+        m13 = buf.get();
+        m20 = buf.get();
+        m21 = buf.get();
+        m22 = buf.get();
+        m23 = buf.get();
+        m30 = buf.get();
+        m31 = buf.get();
+        m32 = buf.get();
+        m33 = buf.get();
+
+        return this;
+    }
+
+    /**
+     * Load from a float buffer. The buffer stores the matrix in row major
+     * (maths) order.
+     *
+     * @param buf A float buffer to read from
+     * @return this
+     */
+    public Matrix loadTranspose(FloatBuffer buf) {
+
+        m00 = buf.get();
+        m10 = buf.get();
+        m20 = buf.get();
+        m30 = buf.get();
+        m01 = buf.get();
+        m11 = buf.get();
+        m21 = buf.get();
+        m31 = buf.get();
+        m02 = buf.get();
+        m12 = buf.get();
+        m22 = buf.get();
+        m32 = buf.get();
+        m03 = buf.get();
+        m13 = buf.get();
+        m23 = buf.get();
+        m33 = buf.get();
+
+        return this;
+    }
+
+    /**
+     * Store this matrix in a float buffer. The matrix is stored in column
+     * major (openGL) order.
+     * @param buf The buffer to store this matrix in
+     */
+    public Matrix store(FloatBuffer buf) {
+        buf.put(m00);
+        buf.put(m01);
+        buf.put(m02);
+        buf.put(m03);
+        buf.put(m10);
+        buf.put(m11);
+        buf.put(m12);
+        buf.put(m13);
+        buf.put(m20);
+        buf.put(m21);
+        buf.put(m22);
+        buf.put(m23);
+        buf.put(m30);
+        buf.put(m31);
+        buf.put(m32);
+        buf.put(m33);
+        return this;
+    }
+
+    /**
+     * Store this matrix in a float buffer. The matrix is stored in row
+     * major (maths) order.
+     * @param buf The buffer to store this matrix in
+     */
+    public Matrix storeTranspose(FloatBuffer buf) {
+        buf.put(m00);
+        buf.put(m10);
+        buf.put(m20);
+        buf.put(m30);
+        buf.put(m01);
+        buf.put(m11);
+        buf.put(m21);
+        buf.put(m31);
+        buf.put(m02);
+        buf.put(m12);
+        buf.put(m22);
+        buf.put(m32);
+        buf.put(m03);
+        buf.put(m13);
+        buf.put(m23);
+        buf.put(m33);
+        return this;
+    }
+
+    /**
+     * Store the rotation portion of this matrix in a float buffer. The matrix is stored in column
+     * major (openGL) order.
+     * @param buf The buffer to store this matrix in
+     */
+    public Matrix store3f(FloatBuffer buf) {
+        buf.put(m00);
+        buf.put(m01);
+        buf.put(m02);
+        buf.put(m10);
+        buf.put(m11);
+        buf.put(m12);
+        buf.put(m20);
+        buf.put(m21);
+        buf.put(m22);
+        return this;
+    }
+
+    /**
+     * Add two matrices together and place the result in a third matrix.
+     * @param left The left source matrix
+     * @param right The right source matrix
+     * @param dest The destination matrix, or null if a new one is to be created
+     * @return the destination matrix
+     */
+    public static Matrix4f add(Matrix4f left, Matrix4f right, Matrix4f dest) {
+        if (dest == null)
+            dest = new Matrix4f();
+
+        dest.m00 = left.m00 + right.m00;
+        dest.m01 = left.m01 + right.m01;
+        dest.m02 = left.m02 + right.m02;
+        dest.m03 = left.m03 + right.m03;
+        dest.m10 = left.m10 + right.m10;
+        dest.m11 = left.m11 + right.m11;
+        dest.m12 = left.m12 + right.m12;
+        dest.m13 = left.m13 + right.m13;
+        dest.m20 = left.m20 + right.m20;
+        dest.m21 = left.m21 + right.m21;
+        dest.m22 = left.m22 + right.m22;
+        dest.m23 = left.m23 + right.m23;
+        dest.m30 = left.m30 + right.m30;
+        dest.m31 = left.m31 + right.m31;
+        dest.m32 = left.m32 + right.m32;
+        dest.m33 = left.m33 + right.m33;
+
+        return dest;
+    }
+
+    /**
+     * Subtract the right matrix from the left and place the result in a third matrix.
+     * @param left The left source matrix
+     * @param right The right source matrix
+     * @param dest The destination matrix, or null if a new one is to be created
+     * @return the destination matrix
+     */
+    public static Matrix4f sub(Matrix4f left, Matrix4f right, Matrix4f dest) {
+        if (dest == null)
+            dest = new Matrix4f();
+
+        dest.m00 = left.m00 - right.m00;
+        dest.m01 = left.m01 - right.m01;
+        dest.m02 = left.m02 - right.m02;
+        dest.m03 = left.m03 - right.m03;
+        dest.m10 = left.m10 - right.m10;
+        dest.m11 = left.m11 - right.m11;
+        dest.m12 = left.m12 - right.m12;
+        dest.m13 = left.m13 - right.m13;
+        dest.m20 = left.m20 - right.m20;
+        dest.m21 = left.m21 - right.m21;
+        dest.m22 = left.m22 - right.m22;
+        dest.m23 = left.m23 - right.m23;
+        dest.m30 = left.m30 - right.m30;
+        dest.m31 = left.m31 - right.m31;
+        dest.m32 = left.m32 - right.m32;
+        dest.m33 = left.m33 - right.m33;
+
+        return dest;
+    }
+
+    /**
+     * Multiply the right matrix by the left and place the result in a third matrix.
+     * @param left The left source matrix
+     * @param right The right source matrix
+     * @param dest The destination matrix, or null if a new one is to be created
+     * @return the destination matrix
+     */
+    public static Matrix4f mul(Matrix4f left, Matrix4f right, Matrix4f dest) {
+        if (dest == null)
+            dest = new Matrix4f();
+
+        float m00 = left.m00 * right.m00 + left.m10 * right.m01 + left.m20 * right.m02 + left.m30 * right.m03;
+        float m01 = left.m01 * right.m00 + left.m11 * right.m01 + left.m21 * right.m02 + left.m31 * right.m03;
+        float m02 = left.m02 * right.m00 + left.m12 * right.m01 + left.m22 * right.m02 + left.m32 * right.m03;
+        float m03 = left.m03 * right.m00 + left.m13 * right.m01 + left.m23 * right.m02 + left.m33 * right.m03;
+        float m10 = left.m00 * right.m10 + left.m10 * right.m11 + left.m20 * right.m12 + left.m30 * right.m13;
+        float m11 = left.m01 * right.m10 + left.m11 * right.m11 + left.m21 * right.m12 + left.m31 * right.m13;
+        float m12 = left.m02 * right.m10 + left.m12 * right.m11 + left.m22 * right.m12 + left.m32 * right.m13;
+        float m13 = left.m03 * right.m10 + left.m13 * right.m11 + left.m23 * right.m12 + left.m33 * right.m13;
+        float m20 = left.m00 * right.m20 + left.m10 * right.m21 + left.m20 * right.m22 + left.m30 * right.m23;
+        float m21 = left.m01 * right.m20 + left.m11 * right.m21 + left.m21 * right.m22 + left.m31 * right.m23;
+        float m22 = left.m02 * right.m20 + left.m12 * right.m21 + left.m22 * right.m22 + left.m32 * right.m23;
+        float m23 = left.m03 * right.m20 + left.m13 * right.m21 + left.m23 * right.m22 + left.m33 * right.m23;
+        float m30 = left.m00 * right.m30 + left.m10 * right.m31 + left.m20 * right.m32 + left.m30 * right.m33;
+        float m31 = left.m01 * right.m30 + left.m11 * right.m31 + left.m21 * right.m32 + left.m31 * right.m33;
+        float m32 = left.m02 * right.m30 + left.m12 * right.m31 + left.m22 * right.m32 + left.m32 * right.m33;
+        float m33 = left.m03 * right.m30 + left.m13 * right.m31 + left.m23 * right.m32 + left.m33 * right.m33;
+
+        dest.m00 = m00;
+        dest.m01 = m01;
+        dest.m02 = m02;
+        dest.m03 = m03;
+        dest.m10 = m10;
+        dest.m11 = m11;
+        dest.m12 = m12;
+        dest.m13 = m13;
+        dest.m20 = m20;
+        dest.m21 = m21;
+        dest.m22 = m22;
+        dest.m23 = m23;
+        dest.m30 = m30;
+        dest.m31 = m31;
+        dest.m32 = m32;
+        dest.m33 = m33;
+
+        return dest;
+    }
+
+    /**
+     * Transform a Vector by a matrix and return the result in a destination
+     * vector.
+     * @param left The left matrix
+     * @param right The right vector
+     * @param dest The destination vector, or null if a new one is to be created
+     * @return the destination vector
+     */
+    public static Vector4f transform(Matrix4f left, Vector4f right, Vector4f dest) {
+        if (dest == null)
+            dest = new Vector4f();
+
+        float x = left.m00 * right.x + left.m10 * right.y + left.m20 * right.z + left.m30 * right.w;
+        float y = left.m01 * right.x + left.m11 * right.y + left.m21 * right.z + left.m31 * right.w;
+        float z = left.m02 * right.x + left.m12 * right.y + left.m22 * right.z + left.m32 * right.w;
+        float w = left.m03 * right.x + left.m13 * right.y + left.m23 * right.z + left.m33 * right.w;
+
+        dest.x = x;
+        dest.y = y;
+        dest.z = z;
+        dest.w = w;
+
+        return dest;
+    }
+
+    /**
+     * Transpose this matrix
+     * @return this
+     */
+    public Matrix transpose() {
+        return transpose(this);
+    }
+
+    /**
+     * Translate this matrix
+     * @param vec The vector to translate by
+     * @return this
+     */
+    public Matrix4f translate(Vector2f vec) {
+        return translate(vec, this);
+    }
+
+    /**
+     * Translate this matrix
+     * @param vec The vector to translate by
+     * @return this
+     */
+    public Matrix4f translate(Vector3f vec) {
+        return translate(vec, this);
+    }
+
+    /**
+     * Scales this matrix
+     * @param vec The vector to scale by
+     * @return this
+     */
+    public Matrix4f scale(Vector3f vec) {
+        return scale(vec, this, this);
+    }
+
+    /**
+     * Scales the source matrix and put the result in the destination matrix
+     * @param vec The vector to scale by
+     * @param src The source matrix
+     * @param dest The destination matrix, or null if a new matrix is to be created
+     * @return The scaled matrix
+     */
+    public static Matrix4f scale(Vector3f vec, Matrix4f src, Matrix4f dest) {
+        if (dest == null)
+            dest = new Matrix4f();
+        dest.m00 = src.m00 * vec.x;
+        dest.m01 = src.m01 * vec.x;
+        dest.m02 = src.m02 * vec.x;
+        dest.m03 = src.m03 * vec.x;
+        dest.m10 = src.m10 * vec.y;
+        dest.m11 = src.m11 * vec.y;
+        dest.m12 = src.m12 * vec.y;
+        dest.m13 = src.m13 * vec.y;
+        dest.m20 = src.m20 * vec.z;
+        dest.m21 = src.m21 * vec.z;
+        dest.m22 = src.m22 * vec.z;
+        dest.m23 = src.m23 * vec.z;
+        return dest;
+    }
+
+    /**
+     * Rotates the matrix around the given axis the specified angle
+     * @param angle the angle, in radians.
+     * @param axis The vector representing the rotation axis. Must be normalized.
+     * @return this
+     */
+    public Matrix4f rotate(float angle, Vector3f axis) {
+        return rotate(angle, axis, this);
+    }
+
+    /**
+     * Rotates the matrix around the given axis the specified angle
+     * @param angle the angle, in radians.
+     * @param axis The vector representing the rotation axis. Must be normalized.
+     * @param dest The matrix to put the result, or null if a new matrix is to be created
+     * @return The rotated matrix
+     */
+    public Matrix4f rotate(float angle, Vector3f axis, Matrix4f dest) {
+        return rotate(angle, axis, this, dest);
+    }
+
+    /**
+     * Rotates the source matrix around the given axis the specified angle and
+     * put the result in the destination matrix.
+     * @param angle the angle, in radians.
+     * @param axis The vector representing the rotation axis. Must be normalized.
+     * @param src The matrix to rotate
+     * @param dest The matrix to put the result, or null if a new matrix is to be created
+     * @return The rotated matrix
+     */
+    public static Matrix4f rotate(float angle, Vector3f axis, Matrix4f src, Matrix4f dest) {
+        if (dest == null)
+            dest = new Matrix4f();
+        float c = (float) Math.cos(angle);
+        float s = (float) Math.sin(angle);
+        float oneminusc = 1.0f - c;
+        float xy = axis.x*axis.y;
+        float yz = axis.y*axis.z;
+        float xz = axis.x*axis.z;
+        float xs = axis.x*s;
+        float ys = axis.y*s;
+        float zs = axis.z*s;
+
+        float f00 = axis.x*axis.x*oneminusc+c;
+        float f01 = xy*oneminusc+zs;
+        float f02 = xz*oneminusc-ys;
+        // n[3] not used
+        float f10 = xy*oneminusc-zs;
+        float f11 = axis.y*axis.y*oneminusc+c;
+        float f12 = yz*oneminusc+xs;
+        // n[7] not used
+        float f20 = xz*oneminusc+ys;
+        float f21 = yz*oneminusc-xs;
+        float f22 = axis.z*axis.z*oneminusc+c;
+
+        float t00 = src.m00 * f00 + src.m10 * f01 + src.m20 * f02;
+        float t01 = src.m01 * f00 + src.m11 * f01 + src.m21 * f02;
+        float t02 = src.m02 * f00 + src.m12 * f01 + src.m22 * f02;
+        float t03 = src.m03 * f00 + src.m13 * f01 + src.m23 * f02;
+        float t10 = src.m00 * f10 + src.m10 * f11 + src.m20 * f12;
+        float t11 = src.m01 * f10 + src.m11 * f11 + src.m21 * f12;
+        float t12 = src.m02 * f10 + src.m12 * f11 + src.m22 * f12;
+        float t13 = src.m03 * f10 + src.m13 * f11 + src.m23 * f12;
+        dest.m20 = src.m00 * f20 + src.m10 * f21 + src.m20 * f22;
+        dest.m21 = src.m01 * f20 + src.m11 * f21 + src.m21 * f22;
+        dest.m22 = src.m02 * f20 + src.m12 * f21 + src.m22 * f22;
+        dest.m23 = src.m03 * f20 + src.m13 * f21 + src.m23 * f22;
+        dest.m00 = t00;
+        dest.m01 = t01;
+        dest.m02 = t02;
+        dest.m03 = t03;
+        dest.m10 = t10;
+        dest.m11 = t11;
+        dest.m12 = t12;
+        dest.m13 = t13;
+        return dest;
+    }
+
+    /**
+     * Translate this matrix and stash the result in another matrix
+     * @param vec The vector to translate by
+     * @param dest The destination matrix or null if a new matrix is to be created
+     * @return the translated matrix
+     */
+    public Matrix4f translate(Vector3f vec, Matrix4f dest) {
+        return translate(vec, this, dest);
+    }
+
+    /**
+     * Translate the source matrix and stash the result in the destination matrix
+     * @param vec The vector to translate by
+     * @param src The source matrix
+     * @param dest The destination matrix or null if a new matrix is to be created
+     * @return The translated matrix
+     */
+    public static Matrix4f translate(Vector3f vec, Matrix4f src, Matrix4f dest) {
+        if (dest == null)
+            dest = new Matrix4f();
+
+        dest.m30 += src.m00 * vec.x + src.m10 * vec.y + src.m20 * vec.z;
+        dest.m31 += src.m01 * vec.x + src.m11 * vec.y + src.m21 * vec.z;
+        dest.m32 += src.m02 * vec.x + src.m12 * vec.y + src.m22 * vec.z;
+        dest.m33 += src.m03 * vec.x + src.m13 * vec.y + src.m23 * vec.z;
+
+        return dest;
+    }
+
+    /**
+     * Translate this matrix and stash the result in another matrix
+     * @param vec The vector to translate by
+     * @param dest The destination matrix or null if a new matrix is to be created
+     * @return the translated matrix
+     */
+    public Matrix4f translate(Vector2f vec, Matrix4f dest) {
+        return translate(vec, this, dest);
+    }
+
+    /**
+     * Translate the source matrix and stash the result in the destination matrix
+     * @param vec The vector to translate by
+     * @param src The source matrix
+     * @param dest The destination matrix or null if a new matrix is to be created
+     * @return The translated matrix
+     */
+    public static Matrix4f translate(Vector2f vec, Matrix4f src, Matrix4f dest) {
+        if (dest == null)
+            dest = new Matrix4f();
+
+        dest.m30 += src.m00 * vec.x + src.m10 * vec.y;
+        dest.m31 += src.m01 * vec.x + src.m11 * vec.y;
+        dest.m32 += src.m02 * vec.x + src.m12 * vec.y;
+        dest.m33 += src.m03 * vec.x + src.m13 * vec.y;
+
+        return dest;
+    }
+
+    /**
+     * Transpose this matrix and place the result in another matrix
+     * @param dest The destination matrix or null if a new matrix is to be created
+     * @return the transposed matrix
+     */
+    public Matrix4f transpose(Matrix4f dest) {
+        return transpose(this, dest);
+    }
+
+    /**
+     * Transpose the source matrix and place the result in the destination matrix
+     * @param src The source matrix
+     * @param dest The destination matrix or null if a new matrix is to be created
+     * @return the transposed matrix
+     */
+    public static Matrix4f transpose(Matrix4f src, Matrix4f dest) {
+        if (dest == null)
+            dest = new Matrix4f();
+        float m00 = src.m00;
+        float m01 = src.m10;
+        float m02 = src.m20;
+        float m03 = src.m30;
+        float m10 = src.m01;
+        float m11 = src.m11;
+        float m12 = src.m21;
+        float m13 = src.m31;
+        float m20 = src.m02;
+        float m21 = src.m12;
+        float m22 = src.m22;
+        float m23 = src.m32;
+        float m30 = src.m03;
+        float m31 = src.m13;
+        float m32 = src.m23;
+        float m33 = src.m33;
+
+        dest.m00 = m00;
+        dest.m01 = m01;
+        dest.m02 = m02;
+        dest.m03 = m03;
+        dest.m10 = m10;
+        dest.m11 = m11;
+        dest.m12 = m12;
+        dest.m13 = m13;
+        dest.m20 = m20;
+        dest.m21 = m21;
+        dest.m22 = m22;
+        dest.m23 = m23;
+        dest.m30 = m30;
+        dest.m31 = m31;
+        dest.m32 = m32;
+        dest.m33 = m33;
+
+        return dest;
+    }
+
+    /**
+     * @return the determinant of the matrix
+     */
+    public float determinant() {
+        float f =
+                m00
+                        * ((m11 * m22 * m33 + m12 * m23 * m31 + m13 * m21 * m32)
+                        - m13 * m22 * m31
+                        - m11 * m23 * m32
+                        - m12 * m21 * m33);
+        f -= m01
+                * ((m10 * m22 * m33 + m12 * m23 * m30 + m13 * m20 * m32)
+                - m13 * m22 * m30
+                - m10 * m23 * m32
+                - m12 * m20 * m33);
+        f += m02
+                * ((m10 * m21 * m33 + m11 * m23 * m30 + m13 * m20 * m31)
+                - m13 * m21 * m30
+                - m10 * m23 * m31
+                - m11 * m20 * m33);
+        f -= m03
+                * ((m10 * m21 * m32 + m11 * m22 * m30 + m12 * m20 * m31)
+                - m12 * m21 * m30
+                - m10 * m22 * m31
+                - m11 * m20 * m32);
+        return f;
+    }
+
+    /**
+     * Calculate the determinant of a 3x3 matrix
+     * @return result
+     */
+
+    private static float determinant3x3(float t00, float t01, float t02,
+                                        float t10, float t11, float t12,
+                                        float t20, float t21, float t22)
+    {
+        return   t00 * (t11 * t22 - t12 * t21)
+                + t01 * (t12 * t20 - t10 * t22)
+                + t02 * (t10 * t21 - t11 * t20);
+    }
+
+    /**
+     * Invert this matrix
+     * @return this if successful, null otherwise
+     */
+    public Matrix invert() {
+        return invert(this, this);
+    }
+
+    /**
+     * Invert the source matrix and put the result in the destination
+     * @param src The source matrix
+     * @param dest The destination matrix, or null if a new matrix is to be created
+     * @return The inverted matrix if successful, null otherwise
+     */
+    public static Matrix4f invert(Matrix4f src, Matrix4f dest) {
+        float determinant = src.determinant();
+
+        if (determinant != 0) {
+            /*
+             * m00 m01 m02 m03
+             * m10 m11 m12 m13
+             * m20 m21 m22 m23
+             * m30 m31 m32 m33
+             */
+            if (dest == null)
+                dest = new Matrix4f();
+            float determinant_inv = 1f/determinant;
+
+            // first row
+            float t00 =  determinant3x3(src.m11, src.m12, src.m13, src.m21, src.m22, src.m23, src.m31, src.m32, src.m33);
+            float t01 = -determinant3x3(src.m10, src.m12, src.m13, src.m20, src.m22, src.m23, src.m30, src.m32, src.m33);
+            float t02 =  determinant3x3(src.m10, src.m11, src.m13, src.m20, src.m21, src.m23, src.m30, src.m31, src.m33);
+            float t03 = -determinant3x3(src.m10, src.m11, src.m12, src.m20, src.m21, src.m22, src.m30, src.m31, src.m32);
+            // second row
+            float t10 = -determinant3x3(src.m01, src.m02, src.m03, src.m21, src.m22, src.m23, src.m31, src.m32, src.m33);
+            float t11 =  determinant3x3(src.m00, src.m02, src.m03, src.m20, src.m22, src.m23, src.m30, src.m32, src.m33);
+            float t12 = -determinant3x3(src.m00, src.m01, src.m03, src.m20, src.m21, src.m23, src.m30, src.m31, src.m33);
+            float t13 =  determinant3x3(src.m00, src.m01, src.m02, src.m20, src.m21, src.m22, src.m30, src.m31, src.m32);
+            // third row
+            float t20 =  determinant3x3(src.m01, src.m02, src.m03, src.m11, src.m12, src.m13, src.m31, src.m32, src.m33);
+            float t21 = -determinant3x3(src.m00, src.m02, src.m03, src.m10, src.m12, src.m13, src.m30, src.m32, src.m33);
+            float t22 =  determinant3x3(src.m00, src.m01, src.m03, src.m10, src.m11, src.m13, src.m30, src.m31, src.m33);
+            float t23 = -determinant3x3(src.m00, src.m01, src.m02, src.m10, src.m11, src.m12, src.m30, src.m31, src.m32);
+            // fourth row
+            float t30 = -determinant3x3(src.m01, src.m02, src.m03, src.m11, src.m12, src.m13, src.m21, src.m22, src.m23);
+            float t31 =  determinant3x3(src.m00, src.m02, src.m03, src.m10, src.m12, src.m13, src.m20, src.m22, src.m23);
+            float t32 = -determinant3x3(src.m00, src.m01, src.m03, src.m10, src.m11, src.m13, src.m20, src.m21, src.m23);
+            float t33 =  determinant3x3(src.m00, src.m01, src.m02, src.m10, src.m11, src.m12, src.m20, src.m21, src.m22);
+
+            // transpose and divide by the determinant
+            dest.m00 = t00*determinant_inv;
+            dest.m11 = t11*determinant_inv;
+            dest.m22 = t22*determinant_inv;
+            dest.m33 = t33*determinant_inv;
+            dest.m01 = t10*determinant_inv;
+            dest.m10 = t01*determinant_inv;
+            dest.m20 = t02*determinant_inv;
+            dest.m02 = t20*determinant_inv;
+            dest.m12 = t21*determinant_inv;
+            dest.m21 = t12*determinant_inv;
+            dest.m03 = t30*determinant_inv;
+            dest.m30 = t03*determinant_inv;
+            dest.m13 = t31*determinant_inv;
+            dest.m31 = t13*determinant_inv;
+            dest.m32 = t23*determinant_inv;
+            dest.m23 = t32*determinant_inv;
+            return dest;
+        } else
+            return null;
+    }
+
+    /**
+     * Negate this matrix
+     * @return this
+     */
+    public Matrix negate() {
+        return negate(this);
+    }
+
+    /**
+     * Negate this matrix and place the result in a destination matrix.
+     * @param dest The destination matrix, or null if a new matrix is to be created
+     * @return the negated matrix
+     */
+    public Matrix4f negate(Matrix4f dest) {
+        return negate(this, dest);
+    }
+
+    /**
+     * Negate this matrix and place the result in a destination matrix.
+     * @param src The source matrix
+     * @param dest The destination matrix, or null if a new matrix is to be created
+     * @return The negated matrix
+     */
+    public static Matrix4f negate(Matrix4f src, Matrix4f dest) {
+        if (dest == null)
+            dest = new Matrix4f();
+
+        dest.m00 = -src.m00;
+        dest.m01 = -src.m01;
+        dest.m02 = -src.m02;
+        dest.m03 = -src.m03;
+        dest.m10 = -src.m10;
+        dest.m11 = -src.m11;
+        dest.m12 = -src.m12;
+        dest.m13 = -src.m13;
+        dest.m20 = -src.m20;
+        dest.m21 = -src.m21;
+        dest.m22 = -src.m22;
+        dest.m23 = -src.m23;
+        dest.m30 = -src.m30;
+        dest.m31 = -src.m31;
+        dest.m32 = -src.m32;
+        dest.m33 = -src.m33;
+
+        return dest;
+    }
+}

client/src/main/java/utils/vectors/ReadableVector.java

@@ -0,0 +1,20 @@
+package utils.vectors;
+
+import java.nio.FloatBuffer;
+
+public interface ReadableVector {
+    /**
+     * @return the length of the vector
+	 */
+    float length();
+    /**
+     * @return the length squared of the vector
+     */
+    float lengthSquared();
+    /**
+     * Store this vector in a FloatBuffer
+     * @param buf The buffer to store it in, at the current position
+     * @return this
+     */
+    Vector store(FloatBuffer buf);
+}

client/src/main/java/utils/vectors/ReadableVector2f.java

@@ -0,0 +1,12 @@
+package utils.vectors;
+
+public interface ReadableVector2f {
+    /**
+     * @return x
+     */
+    float getX();
+    /**
+     * @return y
+     */
+    float getY();
+}

client/src/main/java/utils/vectors/ReadableVector3f.java

@@ -0,0 +1,8 @@
+package utils.vectors;
+
+public interface ReadableVector3f extends ReadableVector2f {
+    /**
+     * @return z
+     */
+    float getZ();
+}

client/src/main/java/utils/vectors/ReadableVector4f.java

@@ -0,0 +1,10 @@
+package utils.vectors;
+
+public interface ReadableVector4f  extends ReadableVector3f {
+
+    /**
+     * @return w
+     */
+    float getW();
+
+}

client/src/main/java/utils/vectors/Vector.java

@@ -0,0 +1,82 @@
+package utils.vectors;
+
+
+import java.io.Serializable;
+import java.nio.FloatBuffer;
+
+/**
+ *
+ * Base class for vectors.
+ *
+ * @author cix_foo <cix_foo@users.sourceforge.net>
+ * @version $Revision$
+ * $Id$
+ */
+public abstract class Vector implements Serializable, ReadableVector {
+
+    /**
+     * Constructor for Vector.
+     */
+    protected Vector() {
+        super();
+    }
+
+    /**
+     * @return the length of the vector
+     */
+    public final float length() {
+        return (float) Math.sqrt(lengthSquared());
+    }
+
+
+    /**
+     * @return the length squared of the vector
+     */
+    public abstract float lengthSquared();
+
+    /**
+     * Load this vector from a FloatBuffer
+     * @param buf The buffer to load it from, at the current position
+     * @return this
+     */
+    public abstract Vector load(FloatBuffer buf);
+
+    /**
+     * Negate a vector
+     * @return this
+     */
+    public abstract Vector negate();
+
+
+    /**
+     * Normalise this vector
+     * @return this
+     */
+    public final Vector normalise() {
+        float len = length();
+        if (len != 0.0f) {
+            float l = 1.0f / len;
+            return scale(l);
+        } else
+            throw new IllegalStateException("Zero length vector");
+    }
+
+
+    /**
+     * Store this vector in a FloatBuffer
+     * @param buf The buffer to store it in, at the current position
+     * @return this
+     */
+    public abstract Vector store(FloatBuffer buf);
+
+
+    /**
+     * Scale this vector
+     * @param scale The scale factor
+     * @return this
+     */
+    public abstract Vector scale(float scale);
+
+
+
+}

client/src/main/java/utils/vectors/Vector2f.java

@@ -0,0 +1,269 @@
+package utils.vectors;
+import java.io.Serializable;
+import java.nio.FloatBuffer;
+
+/**
+ *
+ * Holds a 2-tuple vector.
+ *
+ * @author cix_foo <cix_foo@users.sourceforge.net>
+ * @version $Revision$
+ * $Id$
+ */
+
+public class Vector2f extends Vector implements Serializable, ReadableVector2f, WriteableVector2f {
+
+    private static final long serialVersionUID = 1L;
+
+    public float x, y;
+
+    /**
+     * Constructor for Vector2f.
+     */
+    public Vector2f() {
+        super();
+    }
+
+    /**
+     * Constructor.
+     */
+    public Vector2f(ReadableVector2f src) {
+        set(src);
+    }
+
+    /**
+     * Constructor.
+     */
+    public Vector2f(float x, float y) {
+        set(x, y);
+    }
+
+    /* (non-Javadoc)
+     * @see org.lwjgl.util.vector.WritableVector2f#set(float, float)
+     */
+    public void set(float x, float y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    /**
+     * Load from another Vector2f
+     * @param src The source vector
+     * @return this
+     */
+    public Vector2f set(ReadableVector2f src) {
+        x = src.getX();
+        y = src.getY();
+        return this;
+    }
+
+    /**
+     * @return the length squared of the vector
+     */
+    public float lengthSquared() {
+        return x * x + y * y;
+    }
+
+    /**
+     * Translate a vector
+     * @param x The translation in x
+     * @param y the translation in y
+     * @return this
+     */
+    public Vector2f translate(float x, float y) {
+        this.x += x;
+        this.y += y;
+        return this;
+    }
+
+    /**
+     * Negate a vector
+     * @return this
+     */
+    public Vector negate() {
+        x = -x;
+        y = -y;
+        return this;
+    }
+
+    /**
+     * Negate a vector and place the result in a destination vector.
+     * @param dest The destination vector or null if a new vector is to be created
+     * @return the negated vector
+     */
+    public Vector2f negate(Vector2f dest) {
+        if (dest == null)
+            dest = new Vector2f();
+        dest.x = -x;
+        dest.y = -y;
+        return dest;
+    }
+
+
+    /**
+     * Normalise this vector and place the result in another vector.
+     * @param dest The destination vector, or null if a new vector is to be created
+     * @return the normalised vector
+     */
+    public Vector2f normalise(Vector2f dest) {
+        float l = length();
+
+        if (dest == null)
+            dest = new Vector2f(x / l, y / l);
+        else
+            dest.set(x / l, y / l);
+
+        return dest;
+    }
+
+    /**
+     * The dot product of two vectors is calculated as
+     * v1.x * v2.x + v1.y * v2.y + v1.z * v2.z
+     * @param left The LHS vector
+     * @param right The RHS vector
+     * @return left dot right
+     */
+    public static float dot(Vector2f left, Vector2f right) {
+        return left.x * right.x + left.y * right.y;
+    }
+
+
+
+    /**
+     * Calculate the angle between two vectors, in radians
+     * @param a A vector
+     * @param b The other vector
+     * @return the angle between the two vectors, in radians
+     */
+    public static float angle(Vector2f a, Vector2f b) {
+        float dls = dot(a, b) / (a.length() * b.length());
+        if (dls < -1f)
+            dls = -1f;
+        else if (dls > 1.0f)
+            dls = 1.0f;
+        return (float)Math.acos(dls);
+    }
+
+    /**
+     * Add a vector to another vector and place the result in a destination
+     * vector.
+     * @param left The LHS vector
+     * @param right The RHS vector
+     * @param dest The destination vector, or null if a new vector is to be created
+     * @return the sum of left and right in dest
+     */
+    public static Vector2f add(Vector2f left, Vector2f right, Vector2f dest) {
+        if (dest == null)
+            return new Vector2f(left.x + right.x, left.y + right.y);
+        else {
+            dest.set(left.x + right.x, left.y + right.y);
+            return dest;
+        }
+    }
+
+    /**
+     * Subtract a vector from another vector and place the result in a destination
+     * vector.
+     * @param left The LHS vector
+     * @param right The RHS vector
+     * @param dest The destination vector, or null if a new vector is to be created
+     * @return left minus right in dest
+     */
+    public static Vector2f sub(Vector2f left, Vector2f right, Vector2f dest) {
+        if (dest == null)
+            return new Vector2f(left.x - right.x, left.y - right.y);
+        else {
+            dest.set(left.x - right.x, left.y - right.y);
+            return dest;
+        }
+    }
+
+    /**
+     * Store this vector in a FloatBuffer
+     * @param buf The buffer to store it in, at the current position
+     * @return this
+     */
+    public Vector store(FloatBuffer buf) {
+        buf.put(x);
+        buf.put(y);
+        return this;
+    }
+
+    /**
+     * Load this vector from a FloatBuffer
+     * @param buf The buffer to load it from, at the current position
+     * @return this
+     */
+    public Vector load(FloatBuffer buf) {
+        x = buf.get();
+        y = buf.get();
+        return this;
+    }
+
+    /* (non-Javadoc)
+     * @see org.lwjgl.vector.Vector#scale(float)
+     */
+    public Vector scale(float scale) {
+
+        x *= scale;
+        y *= scale;
+
+        return this;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    public String toString() {
+        StringBuilder sb = new StringBuilder(64);
+
+        sb.append("Vector2f[");
+        sb.append(x);
+        sb.append(", ");
+        sb.append(y);
+        sb.append(']');
+        return sb.toString();
+    }
+
+    /**
+     * @return x
+     */
+    public final float getX() {
+        return x;
+    }
+
+    /**
+     * @return y
+     */
+    public final float getY() {
+        return y;
+    }
+
+    /**
+     * Set X
+     * @param x
+     */
+    public final void setX(float x) {
+        this.x = x;
+    }
+
+    /**
+     * Set Y
+     * @param y
+     */
+    public final void setY(float y) {
+        this.y = y;
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj == null) return false;
+        if (getClass() != obj.getClass()) return false;
+        Vector2f other = (Vector2f)obj;
+
+        if (x == other.x && y == other.y) return true;
+
+        return false;
+    }
+
+}

client/src/main/java/utils/vectors/Vector3f.java

@@ -0,0 +1,328 @@
+package utils.vectors;
+
+import java.io.Serializable;
+import java.nio.FloatBuffer;
+
+
+/**
+ *
+ * Holds a 3-tuple vector.
+ *
+ * @author cix_foo <cix_foo@users.sourceforge.net>
+ * @version $Revision$
+ * $Id$
+ */
+
+public class Vector3f extends Vector implements Serializable, ReadableVector3f, WriteableVector3f {
+
+    private static final long serialVersionUID = 1L;
+
+    public float x, y, z;
+
+    /**
+     * Constructor for Vector3f.
+     */
+    public Vector3f() {
+        super();
+    }
+
+    /**
+     * Constructor
+     */
+    public Vector3f(ReadableVector3f src) {
+        set(src);
+    }
+
+    /**
+     * Constructor
+     */
+    public Vector3f(float x, float y, float z) {
+        set(x, y, z);
+    }
+
+    /* (non-Javadoc)
+     * @see org.lwjgl.util.vector.WritableVector2f#set(float, float)
+     */
+    public void set(float x, float y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    /* (non-Javadoc)
+     * @see org.lwjgl.util.vector.WritableVector3f#set(float, float, float)
+     */
+    public void set(float x, float y, float z) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
+    /**
+     * Load from another Vector3f
+     * @param src The source vector
+     * @return this
+     */
+    public Vector3f set(ReadableVector3f src) {
+        x = src.getX();
+        y = src.getY();
+        z = src.getZ();
+        return this;
+    }
+
+    /**
+     * @return the length squared of the vector
+     */
+    public float lengthSquared() {
+        return x * x + y * y + z * z;
+    }
+
+    /**
+     * Translate a vector
+     * @param x The translation in x
+     * @param y the translation in y
+     * @return this
+     */
+    public Vector3f translate(float x, float y, float z) {
+        this.x += x;
+        this.y += y;
+        this.z += z;
+        return this;
+    }
+
+    /**
+     * Add a vector to another vector and place the result in a destination
+     * vector.
+     * @param left The LHS vector
+     * @param right The RHS vector
+     * @param dest The destination vector, or null if a new vector is to be created
+     * @return the sum of left and right in dest
+     */
+    public static Vector3f add(Vector3f left, Vector3f right, Vector3f dest) {
+        if (dest == null)
+            return new Vector3f(left.x + right.x, left.y + right.y, left.z + right.z);
+        else {
+            dest.set(left.x + right.x, left.y + right.y, left.z + right.z);
+            return dest;
+        }
+    }
+
+    /**
+     * Subtract a vector from another vector and place the result in a destination
+     * vector.
+     * @param left The LHS vector
+     * @param right The RHS vector
+     * @param dest The destination vector, or null if a new vector is to be created
+     * @return left minus right in dest
+     */
+    public static Vector3f sub(Vector3f left, Vector3f right, Vector3f dest) {
+        if (dest == null)
+            return new Vector3f(left.x - right.x, left.y - right.y, left.z - right.z);
+        else {
+            dest.set(left.x - right.x, left.y - right.y, left.z - right.z);
+            return dest;
+        }
+    }
+
+    /**
+     * The cross product of two vectors.
+     *
+     * @param left The LHS vector
+     * @param right The RHS vector
+     * @param dest The destination result, or null if a new vector is to be created
+     * @return left cross right
+     */
+    public static Vector3f cross(
+            Vector3f left,
+            Vector3f right,
+            Vector3f dest)
+    {
+
+        if (dest == null)
+            dest = new Vector3f();
+
+        dest.set(
+                left.y * right.z - left.z * right.y,
+                right.x * left.z - right.z * left.x,
+                left.x * right.y - left.y * right.x
+        );
+
+        return dest;
+    }
+
+
+
+    /**
+     * Negate a vector
+     * @return this
+     */
+    public Vector negate() {
+        x = -x;
+        y = -y;
+        z = -z;
+        return this;
+    }
+
+    /**
+     * Negate a vector and place the result in a destination vector.
+     * @param dest The destination vector or null if a new vector is to be created
+     * @return the negated vector
+     */
+    public Vector3f negate(Vector3f dest) {
+        if (dest == null)
+            dest = new Vector3f();
+        dest.x = -x;
+        dest.y = -y;
+        dest.z = -z;
+        return dest;
+    }
+
+
+    /**
+     * Normalise this vector and place the result in another vector.
+     * @param dest The destination vector, or null if a new vector is to be created
+     * @return the normalised vector
+     */
+    public Vector3f normalise(Vector3f dest) {
+        float l = length();
+
+        if (dest == null)
+            dest = new Vector3f(x / l, y / l, z / l);
+        else
+            dest.set(x / l, y / l, z / l);
+
+        return dest;
+    }
+
+    /**
+     * The dot product of two vectors is calculated as
+     * v1.x * v2.x + v1.y * v2.y + v1.z * v2.z
+     * @param left The LHS vector
+     * @param right The RHS vector
+     * @return left dot right
+     */
+    public static float dot(Vector3f left, Vector3f right) {
+        return left.x * right.x + left.y * right.y + left.z * right.z;
+    }
+
+    /**
+     * Calculate the angle between two vectors, in radians
+     * @param a A vector
+     * @param b The other vector
+     * @return the angle between the two vectors, in radians
+     */
+    public static float angle(Vector3f a, Vector3f b) {
+        float dls = dot(a, b) / (a.length() * b.length());
+        if (dls < -1f)
+            dls = -1f;
+        else if (dls > 1.0f)
+            dls = 1.0f;
+        return (float)Math.acos(dls);
+    }
+
+    /* (non-Javadoc)
+     * @see org.lwjgl.vector.Vector#load(FloatBuffer)
+     */
+    public Vector load(FloatBuffer buf) {
+        x = buf.get();
+        y = buf.get();
+        z = buf.get();
+        return this;
+    }
+
+    /* (non-Javadoc)
+     * @see org.lwjgl.vector.Vector#scale(float)
+     */
+    public Vector scale(float scale) {
+
+        x *= scale;
+        y *= scale;
+        z *= scale;
+
+        return this;
+
+    }
+
+    /* (non-Javadoc)
+     * @see org.lwjgl.vector.Vector#store(FloatBuffer)
+     */
+    public Vector store(FloatBuffer buf) {
+
+        buf.put(x);
+        buf.put(y);
+        buf.put(z);
+
+        return this;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    public String toString() {
+        StringBuilder sb = new StringBuilder(64);
+
+        sb.append("Vector3f[");
+        sb.append(x);
+        sb.append(", ");
+        sb.append(y);
+        sb.append(", ");
+        sb.append(z);
+        sb.append(']');
+        return sb.toString();
+    }
+
+    /**
+     * @return x
+     */
+    public final float getX() {
+        return x;
+    }
+
+    /**
+     * @return y
+     */
+    public final float getY() {
+        return y;
+    }
+
+    /**
+     * Set X
+     * @param x
+     */
+    public final void setX(float x) {
+        this.x = x;
+    }
+
+    /**
+     * Set Y
+     * @param y
+     */
+    public final void setY(float y) {
+        this.y = y;
+    }
+
+    /**
+     * Set Z
+     * @param z
+     */
+    public void setZ(float z) {
+        this.z = z;
+    }
+
+    /* (Overrides)
+     * @see org.lwjgl.vector.ReadableVector3f#getZ()
+     */
+    public float getZ() {
+        return z;
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj == null) return false;
+        if (getClass() != obj.getClass()) return false;
+        Vector3f other = (Vector3f)obj;
+
+        if (x == other.x && y == other.y && z == other.z) return true;
+
+        return false;
+    }
+}

client/src/main/java/utils/vectors/Vector4f.java

@@ -0,0 +1,320 @@
+package utils.vectors;
+
+
+
+import java.io.Serializable;
+import java.nio.FloatBuffer;
+
+/**
+ *
+ * Holds a 4-tuple vector.
+ *
+ * @author cix_foo <cix_foo@users.sourceforge.net>
+ * @version $Revision$
+ * $Id$
+ */
+
+public class Vector4f extends Vector implements Serializable, ReadableVector4f, WriteableVector4f {
+
+    private static final long serialVersionUID = 1L;
+
+    public float x, y, z, w;
+
+    /**
+     * Constructor for Vector4f.
+     */
+    public Vector4f() {
+        super();
+    }
+
+    /**
+     * Constructor
+     */
+    public Vector4f(ReadableVector4f src) {
+        set(src);
+    }
+
+    /**
+     * Constructor
+     */
+    public Vector4f(float x, float y, float z, float w) {
+        set(x, y, z, w);
+    }
+
+    /* (non-Javadoc)
+     * @see org.lwjgl.util.vector.WritableVector2f#set(float, float)
+     */
+    public void set(float x, float y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    /* (non-Javadoc)
+     * @see org.lwjgl.util.vector.WritableVector3f#set(float, float, float)
+     */
+    public void set(float x, float y, float z) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
+    /* (non-Javadoc)
+     * @see org.lwjgl.util.vector.WritableVector4f#set(float, float, float, float)
+     */
+    public void set(float x, float y, float z, float w) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.w = w;
+    }
+
+    /**
+     * Load from another Vector4f
+     * @param src The source vector
+     * @return this
+     */
+    public Vector4f set(ReadableVector4f src) {
+        x = src.getX();
+        y = src.getY();
+        z = src.getZ();
+        w = src.getW();
+        return this;
+    }
+
+    /**
+     * @return the length squared of the vector
+     */
+    public float lengthSquared() {
+        return x * x + y * y + z * z + w * w;
+    }
+
+    /**
+     * Translate a vector
+     * @param x The translation in x
+     * @param y the translation in y
+     * @return this
+     */
+    public Vector4f translate(float x, float y, float z, float w) {
+        this.x += x;
+        this.y += y;
+        this.z += z;
+        this.w += w;
+        return this;
+    }
+
+    /**
+     * Add a vector to another vector and place the result in a destination
+     * vector.
+     * @param left The LHS vector
+     * @param right The RHS vector
+     * @param dest The destination vector, or null if a new vector is to be created
+     * @return the sum of left and right in dest
+     */
+    public static Vector4f add(Vector4f left, Vector4f right, Vector4f dest) {
+        if (dest == null)
+            return new Vector4f(left.x + right.x, left.y + right.y, left.z + right.z, left.w + right.w);
+        else {
+            dest.set(left.x + right.x, left.y + right.y, left.z + right.z, left.w + right.w);
+            return dest;
+        }
+    }
+
+    /**
+     * Subtract a vector from another vector and place the result in a destination
+     * vector.
+     * @param left The LHS vector
+     * @param right The RHS vector
+     * @param dest The destination vector, or null if a new vector is to be created
+     * @return left minus right in dest
+     */
+    public static Vector4f sub(Vector4f left, Vector4f right, Vector4f dest) {
+        if (dest == null)
+            return new Vector4f(left.x - right.x, left.y - right.y, left.z - right.z, left.w - right.w);
+        else {
+            dest.set(left.x - right.x, left.y - right.y, left.z - right.z, left.w - right.w);
+            return dest;
+        }
+    }
+
+
+    /**
+     * Negate a vector
+     * @return this
+     */
+    public Vector negate() {
+        x = -x;
+        y = -y;
+        z = -z;
+        w = -w;
+        return this;
+    }
+
+    /**
+     * Negate a vector and place the result in a destination vector.
+     * @param dest The destination vector or null if a new vector is to be created
+     * @return the negated vector
+     */
+    public Vector4f negate(Vector4f dest) {
+        if (dest == null)
+            dest = new Vector4f();
+        dest.x = -x;
+        dest.y = -y;
+        dest.z = -z;
+        dest.w = -w;
+        return dest;
+    }
+
+
+    /**
+     * Normalise this vector and place the result in another vector.
+     * @param dest The destination vector, or null if a new vector is to be created
+     * @return the normalised vector
+     */
+    public Vector4f normalise(Vector4f dest) {
+        float l = length();
+
+        if (dest == null)
+            dest = new Vector4f(x / l, y / l, z / l, w / l);
+        else
+            dest.set(x / l, y / l, z / l, w / l);
+
+        return dest;
+    }
+
+    /**
+     * The dot product of two vectors is calculated as
+     * v1.x * v2.x + v1.y * v2.y + v1.z * v2.z + v1.w * v2.w
+     * @param left The LHS vector
+     * @param right The RHS vector
+     * @return left dot right
+     */
+    public static float dot(Vector4f left, Vector4f right) {
+        return left.x * right.x + left.y * right.y + left.z * right.z + left.w * right.w;
+    }
+
+    /**
+     * Calculate the angle between two vectors, in radians
+     * @param a A vector
+     * @param b The other vector
+     * @return the angle between the two vectors, in radians
+     */
+    public static float angle(Vector4f a, Vector4f b) {
+        float dls = dot(a, b) / (a.length() * b.length());
+        if (dls < -1f)
+            dls = -1f;
+        else if (dls > 1.0f)
+            dls = 1.0f;
+        return (float)Math.acos(dls);
+    }
+
+    /* (non-Javadoc)
+     * @see org.lwjgl.vector.Vector#load(FloatBuffer)
+     */
+    public Vector load(FloatBuffer buf) {
+        x = buf.get();
+        y = buf.get();
+        z = buf.get();
+        w = buf.get();
+        return this;
+    }
+
+    /* (non-Javadoc)
+     * @see org.lwjgl.vector.Vector#scale(float)
+     */
+    public Vector scale(float scale) {
+        x *= scale;
+        y *= scale;
+        z *= scale;
+        w *= scale;
+        return this;
+    }
+
+    /* (non-Javadoc)
+     * @see org.lwjgl.vector.Vector#store(FloatBuffer)
+     */
+    public Vector store(FloatBuffer buf) {
+
+        buf.put(x);
+        buf.put(y);
+        buf.put(z);
+        buf.put(w);
+
+        return this;
+    }
+
+    public String toString() {
+        return "Vector4f: " + x + " " + y + " " + z + " " + w;
+    }
+
+    /**
+     * @return x
+     */
+    public final float getX() {
+        return x;
+    }
+
+    /**
+     * @return y
+     */
+    public final float getY() {
+        return y;
+    }
+
+    /**
+     * Set X
+     * @param x
+     */
+    public final void setX(float x) {
+        this.x = x;
+    }
+
+    /**
+     * Set Y
+     * @param y
+     */
+    public final void setY(float y) {
+        this.y = y;
+    }
+
+    /**
+     * Set Z
+     * @param z
+     */
+    public void setZ(float z) {
+        this.z = z;
+    }
+
+
+    /* (Overrides)
+     * @see org.lwjgl.vector.ReadableVector3f#getZ()
+     */
+    public float getZ() {
+        return z;
+    }
+
+    /**
+     * Set W
+     * @param w
+     */
+    public void setW(float w) {
+        this.w = w;
+    }
+
+    /* (Overrides)
+     * @see org.lwjgl.vector.ReadableVector3f#getZ()
+     */
+    public float getW() {
+        return w;
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj == null) return false;
+        if (getClass() != obj.getClass()) return false;
+        Vector4f other = (Vector4f)obj;
+
+        if (x == other.x && y == other.y && z == other.z && w == other.w) return true;
+
+        return false;
+    }
+}

client/src/main/java/utils/vectors/WriteableVector2f.java

@@ -0,0 +1,23 @@
+package utils.vectors;
+
+public interface WriteableVector2f {
+    /**
+     * Set the X value
+     * @param x
+     */
+    void setX(float x);
+
+    /**
+     * Set the Y value
+     * @param y
+     */
+    void setY(float y);
+
+    /**
+     * Set the X,Y values
+     * @param x
+     * @param y
+     */
+    void set(float x, float y);
+
+}

client/src/main/java/utils/vectors/WriteableVector3f.java

@@ -0,0 +1,17 @@
+package utils.vectors;
+
+public interface WriteableVector3f extends WriteableVector2f {
+        /**
+         * Set the Z value
+         * @param z
+         */
+        void setZ(float z);
+
+        /**
+         * Set the X,Y,Z values
+         * @param x
+         * @param y
+         * @param z
+         */
+        void set(float x, float y, float z);
+}

client/src/main/java/utils/vectors/WriteableVector4f.java

@@ -0,0 +1,20 @@
+package utils.vectors;
+
+public interface WriteableVector4f extends WriteableVector3f {
+
+    /**
+     * Set the W value
+     * @param w
+     */
+    void setW(float w);
+
+    /**
+     * Set the X,Y,Z,W values
+     * @param x
+     * @param y
+     * @param z
+     * @param w
+     */
+    void set(float x, float y, float z, float w);
+
+}