From 9b120dcd79d3dbb0df247f9d66f0bf6b792212cd Mon Sep 17 00:00:00 2001
From: Christopher Wellons <mosquitopsu@gmail.com>
Date: Fri, 9 Dec 2011 16:58:52 -0500
Subject: [PATCH 1/2] Example LWJGL project.

---
 build.xml                                     |   2 +-
 ivy.xml                                       |  18 ++-
 project.properties                            |   2 +-
 src/com/nullprogram/lwjgl/Lwjgl.java          |  38 ++++++
 src/com/nullprogram/lwjgl/package-info.java   |   4 +
 .../java/project/SampleJavaProject.java       |  72 ----------
 .../java/project/SampleLwjglProject.java      | 129 ++++++++++++++++++
 .../java/project/SampleJavaProjectTest.java   |  42 ------
 test/sample/java/project/SampleLWJGLTest.java |  37 +++++
 9 files changed, 227 insertions(+), 117 deletions(-)
 create mode 100644 src/com/nullprogram/lwjgl/Lwjgl.java
 create mode 100644 src/com/nullprogram/lwjgl/package-info.java
 delete mode 100644 src/sample/java/project/SampleJavaProject.java
 create mode 100644 src/sample/java/project/SampleLwjglProject.java
 delete mode 100644 test/sample/java/project/SampleJavaProjectTest.java
 create mode 100644 test/sample/java/project/SampleLWJGLTest.java

diff --git a/build.xml b/build.xml
index b60d3f56..ca1640c5 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="SampleJavaProject" default="jar"
+<project name="SampleLwjglProject" default="jar"
          xmlns:ivy="antlib:org.apache.ivy.ant">
 
   <!-- Project-specific configuration -->
diff --git a/ivy.xml b/ivy.xml
index 6d3e0686..aaccaf38 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ivy-module version="2.0">
+<ivy-module version="2.0" xmlns:e="http://ant.apache.org/ivy/extra">
   <info organisation="com.nullprogram" module="sample-java-project"/>
   <configurations>
     <conf name="default"/>
@@ -7,6 +7,22 @@
     <conf name="test" extends="build" visibility="private"/>
   </configurations>
   <dependencies>
+    <dependency org="org.lwjgl.lwjgl" name="lwjgl" rev="2.8.2"
+                conf="default"/>
+    <dependency org="org.lwjgl.lwjgl" name="lwjgl-platform" rev="2.8.2"
+                conf="default">
+      <artifact name="lwjgl-platform" e:classifier="natives-linux"/>
+      <artifact name="lwjgl-platform" e:classifier="natives-windows"/>
+      <artifact name="lwjgl-platform" e:classifier="natives-osx"/>
+    </dependency>
+    <dependency org="net.java.jinput" name="jinput-platform" rev="2.0.5"
+                conf="default">
+      <artifact name="jinput-platform" e:classifier="natives-linux"/>
+      <artifact name="jinput-platform" e:classifier="natives-windows"/>
+      <artifact name="jinput-platform" e:classifier="natives-osx"/>
+    </dependency>
+    <dependency org="com.nullprogram" name="native-guide" rev="0.2"
+                conf="default"/>
     <dependency org="commons-cli" name="commons-cli" rev="1.2"
                 conf="default"/>
     <dependency org="junit" name="junit" rev="4.10"
diff --git a/project.properties b/project.properties
index ba0d7cbb..dee21ab7 100644
--- a/project.properties
+++ b/project.properties
@@ -1,5 +1,5 @@
 # Project information
-artifactId = sample-java-project
+artifactId = sample-lwjgl-project
 description = An Ant-based sample Java project.
 version = 1.0-SNAPSHOT
 package.main = sample.java.project
diff --git a/src/com/nullprogram/lwjgl/Lwjgl.java b/src/com/nullprogram/lwjgl/Lwjgl.java
new file mode 100644
index 00000000..2c39391f
--- /dev/null
+++ b/src/com/nullprogram/lwjgl/Lwjgl.java
@@ -0,0 +1,38 @@
+package com.nullprogram.lwjgl;
+
+import com.nullprogram.guide.Arch;
+import static com.nullprogram.guide.NativeGuide.prepare;
+
+/**
+ * Prepares all of the LWJGL native binaries for loading.
+ */
+public final class Lwjgl {
+
+    /** Hidden constructor. */
+    private Lwjgl() {
+    }
+
+    /**
+     * Prepares all of the LWJGL native libraries for loading.
+     * @throws java.io.IOException when the libraries could not be loaded
+     */
+    public static void setup() throws java.io.IOException {
+        prepare(Arch.LINUX_64, "/libjinput-linux64.so");
+        prepare(Arch.LINUX_32, "/libjinput-linux.so");
+        prepare(Arch.LINUX_64, "/liblwjgl64.so");
+        prepare(Arch.LINUX_32, "/liblwjgl.so");
+        prepare(Arch.LINUX_64, "/libopenal64.so");
+        prepare(Arch.LINUX_32, "/libopenal.so");
+        prepare(Arch.MAC_64, "/libjinput-osx.jnilib");
+        prepare(Arch.MAC_64, "/liblwjgl.jnilib");
+        prepare(Arch.MAC_64, "/openal.dylib");
+        prepare(Arch.WINDOWS_64, "/jinput-dx8_64.dll");
+        prepare(Arch.WINDOWS_32, "/jinput-dx8.dll");
+        prepare(Arch.WINDOWS_64, "/jinput-raw_64.dll");
+        prepare(Arch.WINDOWS_32, "/jinput-raw.dll");
+        prepare(Arch.WINDOWS_64, "/lwjgl64.dll");
+        prepare(Arch.WINDOWS_32, "/lwjgl.dll");
+        prepare(Arch.WINDOWS_32, "/OpenAL32.dll");
+        prepare(Arch.WINDOWS_64, "/OpenAL64.dll");
+    }
+}
diff --git a/src/com/nullprogram/lwjgl/package-info.java b/src/com/nullprogram/lwjgl/package-info.java
new file mode 100644
index 00000000..644eaf25
--- /dev/null
+++ b/src/com/nullprogram/lwjgl/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Just a LWJGL native library loader, using NativeGuide.
+ */
+package com.nullprogram.lwjgl;
diff --git a/src/sample/java/project/SampleJavaProject.java b/src/sample/java/project/SampleJavaProject.java
deleted file mode 100644
index db0bf7b7..00000000
--- a/src/sample/java/project/SampleJavaProject.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package sample.java.project;
-
-import java.util.Timer;
-import java.util.TimerTask;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import lombok.Setter;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.GnuParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-
-/**
- * The main class of the application. It contains the main() method,
- * the first method called.
- */
-@NoArgsConstructor
-@AllArgsConstructor
-public class SampleJavaProject extends TimerTask {
-
-    /** The delay between printed messages. */
-    private static final long PRINT_DELAY = 1000L;
-
-    /** The name to be printed in the output message. */
-    @Getter @Setter @NonNull
-    private String name = "world";
-
-    /**
-     * Print the "Hello, world!" string.
-     * @param args application input arguments
-     */
-    public static void main(final String[] args) {
-        /* Set up the command line arguments. */
-        Options options = new Options();
-        options.addOption(new Option("name", true, "set the user's name"));
-        options.addOption(new Option("loop", "print endlessly, hotswap demo"));
-        options.addOption(new Option("help", "print this help message"));
-        CommandLine line = null;
-        try {
-            line = new GnuParser().parse(options, args);
-        } catch (org.apache.commons.cli.ParseException e) {
-            System.err.println(e.getMessage());
-            System.exit(1);
-        }
-
-        /* Handle each argument. */
-        SampleJavaProject sjp;
-        if (line.hasOption("help")) {
-            HelpFormatter formatter = new HelpFormatter();
-            formatter.printHelp("SampleJavaProject [options]", options);
-            System.exit(0);
-        }
-        if (line.hasOption("name")) {
-            sjp = new SampleJavaProject(line.getOptionValue("name"));
-        } else {
-            sjp = new SampleJavaProject();
-        }
-        if (line.hasOption("loop")) {
-            new Timer().schedule(sjp, 0L, PRINT_DELAY);
-        } else {
-            sjp.run();
-        }
-    }
-
-    @Override
-    public final void run() {
-        System.out.printf("Hello, %s!\n", name);
-    }
-}
diff --git a/src/sample/java/project/SampleLwjglProject.java b/src/sample/java/project/SampleLwjglProject.java
new file mode 100644
index 00000000..97ad1f86
--- /dev/null
+++ b/src/sample/java/project/SampleLwjglProject.java
@@ -0,0 +1,129 @@
+package sample.java.project;
+
+import lombok.extern.java.Log;
+import org.lwjgl.LWJGLException;
+import org.lwjgl.opengl.Display;
+import org.lwjgl.opengl.DisplayMode;
+import org.lwjgl.opengl.GL11;
+
+/**
+ * The main class.
+ *
+ * This is the main class of the application. It contains the main()
+ * method, the first method called.
+ */
+@Log
+public class SampleLwjglProject implements Runnable {
+
+    /** The delay between frames. */
+    private static final int FPS = 30;
+
+    /** Width of the display. */
+    private static final int WIDTH = 800;
+
+    /** Height of the display. */
+    private static final int HEIGHT = 600;
+
+    /** The length of one second in milliseconds. */
+    private static final double SECOND = 1000d;
+
+    /** The size of the quad. */
+    private static final float QUAD_SIZE = 200;
+
+    /** Rate of red oscillation. */
+    private static final float RED_RATE = 1f;
+
+    /** Rate of green oscillation. */
+    private static final float GREEN_RATE = 2.2f;
+
+    /** Rate of blue oscillation. */
+    private static final float BLUE_RATE = 0.125f;
+
+    /** Rate of rotation oscillation. */
+    private static final float ROT_RATE = 4f;
+
+    /** Range of rotation oscillation. */
+    private static final float ROT_RANGE = 12;
+
+    /** Height division for quad. */
+    private static final float HDIV = 4;
+
+    /** Width division for quad. */
+    private static final float WDIV = 2;
+
+    /**
+     * The main class.
+     *
+     * Print the "Hello, world!" string.
+     *
+     * @param args application input arguments
+     */
+    public static void main(final String[] args) {
+        try {
+            com.nullprogram.lwjgl.Lwjgl.setup();
+        } catch (java.io.IOException e) {
+            log.severe("could not prepare libraries: " + e);
+            System.exit(0);
+        }
+        new SampleLwjglProject().run();
+    }
+
+    @Override
+    public final void run() {
+        try {
+            Display.setDisplayMode(new DisplayMode(WIDTH, HEIGHT));
+            Display.create();
+            init();
+        } catch (LWJGLException e) {
+            log.severe("could not prepare display: " + e);
+            return;
+        }
+
+        while (!Display.isCloseRequested()) {
+            repaint();
+            Display.update();
+            Display.sync(FPS);
+        }
+        Display.destroy();
+    }
+
+    /**
+     * Initial display configuration.
+     */
+    private void init() {
+        GL11.glMatrixMode(GL11.GL_PROJECTION);
+        GL11.glLoadIdentity();
+        GL11.glOrtho(0, WIDTH, HEIGHT, 0, 1, -1);
+        GL11.glMatrixMode(GL11.GL_MODELVIEW);
+    }
+
+    /**
+     * Draw the OpenGL display.
+     */
+    private void repaint() {
+        double time = System.currentTimeMillis() / SECOND;
+
+        /* Clear the screen and depth buffer */
+        GL11.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT);
+
+        /* set the color of the quad (R,G,B,A) */
+        float red = (float) Math.abs(Math.sin(time * RED_RATE));
+        float green = (float) Math.abs(Math.cos(time * GREEN_RATE));
+        float blue = (float) Math.abs(Math.tan(time * BLUE_RATE));
+        GL11.glColor3f(red, green, blue);
+
+        /* draw quad */
+        GL11.glPushMatrix();
+        float r = (float) (Math.sin(time * ROT_RATE) * ROT_RANGE + ROT_RANGE);
+        GL11.glRotatef(r, 0f, 0f, 1f);
+
+        GL11.glBegin(GL11.GL_QUADS);
+        GL11.glVertex2f(WIDTH / WDIV, HEIGHT / HDIV);
+        GL11.glVertex2f(WIDTH / WDIV + QUAD_SIZE, HEIGHT / HDIV);
+        GL11.glVertex2f(WIDTH / WDIV + QUAD_SIZE, HEIGHT / HDIV + QUAD_SIZE);
+        GL11.glVertex2f(WIDTH / WDIV, HEIGHT / HDIV + QUAD_SIZE);
+        GL11.glEnd();
+
+        GL11.glPopMatrix();
+    }
+}
diff --git a/test/sample/java/project/SampleJavaProjectTest.java b/test/sample/java/project/SampleJavaProjectTest.java
deleted file mode 100644
index 2ed17604..00000000
--- a/test/sample/java/project/SampleJavaProjectTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package sample.java.project;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Sample JUnit tests.
- */
-public class SampleJavaProjectTest {
-
-    /**
-     * Holds an instance of the class we are testing.
-     */
-    private SampleJavaProject sjp;
-
-    /**
-     * JUnit set up method.
-     */
-    @Before
-    public final void setUp() {
-        sjp = new SampleJavaProject();
-    }
-
-    /**
-     * Tests the generated setter and getter methods.
-     */
-    @Test
-    public final void testGetSet() {
-        sjp.setName("foo");
-        assertEquals("foo", sjp.getName());
-    }
-
-    /**
-     * Tests that the null check in the setter.
-     */
-    @Test(expected=NullPointerException.class)
-    public final void nullTest() {
-        sjp.setName(null);
-    }
-}
diff --git a/test/sample/java/project/SampleLWJGLTest.java b/test/sample/java/project/SampleLWJGLTest.java
new file mode 100644
index 00000000..e4dd43fd
--- /dev/null
+++ b/test/sample/java/project/SampleLWJGLTest.java
@@ -0,0 +1,37 @@
+package sample.java.project;
+
+import junit.framework.TestCase;
+import org.lwjgl.LWJGLException;
+import org.lwjgl.opengl.Display;
+
+/**
+ * A sample JUnit test.
+ *
+ * This test exists as a placeholder for the test unit framework.
+ */
+public class SampleLWJGLTest extends TestCase {
+
+    /**
+     * JUnit set up method.
+     */
+    public final void setUp() {
+        try {
+            com.nullprogram.lwjgl.Lwjgl.setup();
+        } catch (java.io.IOException e) {
+            fail("Failed to load native libraries.");
+        }
+    }
+
+    /**
+     * Tests the add() method in the main class.
+     */
+    public final void testDisplay() {
+        try {
+            Display.create();
+            Display.update();
+            Display.destroy();
+        } catch (LWJGLException e) {
+            fail("" + e);
+        }
+    }
+}

From 8eba3acf7097fe8d71ec6b53516841d3872cb642 Mon Sep 17 00:00:00 2001
From: Christopher Wellons <mosquitopsu@gmail.com>
Date: Fri, 9 Dec 2011 21:47:27 -0500
Subject: [PATCH 2/2] Turn it into a cube demo.

---
 checkstyle.xml                                |   2 -
 ivy.xml                                       |   2 +
 .../java/project/SampleLwjglProject.java      | 139 ++++++++++++------
 3 files changed, 99 insertions(+), 44 deletions(-)

diff --git a/checkstyle.xml b/checkstyle.xml
index b5a20d6a..8b8a611f 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -161,8 +161,6 @@
         <module name="EqualsHashCode"/>
         <module name="HiddenField"/>
         <module name="IllegalInstantiation"/>
-        <module name="InnerAssignment"/>
-        <module name="MagicNumber"/>
         <module name="MissingSwitchDefault"/>
         <module name="RedundantThrows"/>
         <module name="SimplifyBooleanExpression"/>
diff --git a/ivy.xml b/ivy.xml
index aaccaf38..b5e64cec 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -21,6 +21,8 @@
       <artifact name="jinput-platform" e:classifier="natives-windows"/>
       <artifact name="jinput-platform" e:classifier="natives-osx"/>
     </dependency>
+    <dependency org="org.lwjgl.lwjgl" name="lwjgl_util" rev="2.8.2"
+                conf="default"/>
     <dependency org="com.nullprogram" name="native-guide" rev="0.2"
                 conf="default"/>
     <dependency org="commons-cli" name="commons-cli" rev="1.2"
diff --git a/src/sample/java/project/SampleLwjglProject.java b/src/sample/java/project/SampleLwjglProject.java
index 97ad1f86..fa5e6be5 100644
--- a/src/sample/java/project/SampleLwjglProject.java
+++ b/src/sample/java/project/SampleLwjglProject.java
@@ -1,10 +1,12 @@
 package sample.java.project;
 
-import lombok.extern.java.Log;
+import java.nio.FloatBuffer;
+import org.lwjgl.BufferUtils;
 import org.lwjgl.LWJGLException;
 import org.lwjgl.opengl.Display;
 import org.lwjgl.opengl.DisplayMode;
 import org.lwjgl.opengl.GL11;
+import org.lwjgl.util.glu.Project;
 
 /**
  * The main class.
@@ -12,14 +14,13 @@
  * This is the main class of the application. It contains the main()
  * method, the first method called.
  */
-@Log
 public class SampleLwjglProject implements Runnable {
 
     /** The delay between frames. */
-    private static final int FPS = 30;
+    private static final int FPS = 60;
 
     /** Width of the display. */
-    private static final int WIDTH = 800;
+    private static final int WIDTH = 600;
 
     /** Height of the display. */
     private static final int HEIGHT = 600;
@@ -27,29 +28,41 @@ public class SampleLwjglProject implements Runnable {
     /** The length of one second in milliseconds. */
     private static final double SECOND = 1000d;
 
-    /** The size of the quad. */
-    private static final float QUAD_SIZE = 200;
+    /** Rate of rotation. */
+    private static final float ROTS_RATE = 100f;
 
-    /** Rate of red oscillation. */
-    private static final float RED_RATE = 1f;
+    /** Rate of rotation oscillation. */
+    private static final float ROTR_RATE = 4f;
 
-    /** Rate of green oscillation. */
-    private static final float GREEN_RATE = 2.2f;
+    /** Range of rotation oscillation. */
+    private static final float ROT_RANGE = 36;
 
-    /** Rate of blue oscillation. */
-    private static final float BLUE_RATE = 0.125f;
+    /** Red diffuse light. */
+    private static final float[] DIFFUSE = {1f, 0f, 0f, 1f};
 
-    /** Rate of rotation oscillation. */
-    private static final float ROT_RATE = 4f;
+    /** Infinite light location. */
+    private static final float[] POSITION = {1f, 1f, 1f, 0f};
 
-    /** Range of rotation oscillation. */
-    private static final float ROT_RANGE = 12;
+    /** Normals for the 6 faces of a cube. */
+    private static final float[][] NORMALS = {
+        {-1f, 0f, 0f}, {0f, 1f, 0f}, {1f, 0f, 0f},
+        {0f, -1f, 0f}, {0f, 0f, 1f}, {0f, 0f, -1f}
+    };
 
-    /** Height division for quad. */
-    private static final float HDIV = 4;
+    /** Vertex indices for the 6 faces of a cube. */
+    private static final int[][] FACES = {
+        {0, 1, 2, 3}, {3, 2, 6, 7}, {7, 6, 5, 4},
+        {4, 5, 1, 0}, {5, 6, 2, 1}, {7, 4, 0, 3}
+    };
 
-    /** Width division for quad. */
-    private static final float WDIV = 2;
+    /** Will be filled in with X, Y, Z vertexes. */
+    private static final float[][] V = new float[8][3];
+
+    /** Colors of the sides of the cube. */
+    private static final float[][] COLORS = {
+        {1f, 0f, 0f}, {0f, 1f, 0f}, {0f, 0f, 1f},
+        {1f, 1f, 0f}, {0f, 1f, 1f}, {1f, 0f, 1f}
+    };
 
     /**
      * The main class.
@@ -62,7 +75,7 @@ public static void main(final String[] args) {
         try {
             com.nullprogram.lwjgl.Lwjgl.setup();
         } catch (java.io.IOException e) {
-            log.severe("could not prepare libraries: " + e);
+            System.out.println("error: could not prepare libraries: " + e);
             System.exit(0);
         }
         new SampleLwjglProject().run();
@@ -72,10 +85,11 @@ public static void main(final String[] args) {
     public final void run() {
         try {
             Display.setDisplayMode(new DisplayMode(WIDTH, HEIGHT));
+            Display.setTitle("LWJGL Cube Demo");
             Display.create();
             init();
         } catch (LWJGLException e) {
-            log.severe("could not prepare display: " + e);
+            System.out.println("error: could not prepare display: " + e);
             return;
         }
 
@@ -87,42 +101,83 @@ public final void run() {
         Display.destroy();
     }
 
+    /**
+     * Wrap a float array with a direct FloatBuffer.
+     * @param in  the float array to be wrapped
+     * @return a direct FloatBuffer
+     */
+    private FloatBuffer wrap(final float[] in) {
+        FloatBuffer buffer;
+        buffer = BufferUtils.createFloatBuffer(in.length * 4);
+        return buffer.put(in);
+    }
+
     /**
      * Initial display configuration.
      */
     private void init() {
+        /* Setup cube vertex data. */
+        V[0][0] = V[1][0] = V[2][0] = V[3][0] = -1;
+        V[4][0] = V[5][0] = V[6][0] = V[7][0] = 1;
+        V[0][1] = V[1][1] = V[4][1] = V[5][1] = -1;
+        V[2][1] = V[3][1] = V[6][1] = V[7][1] = 1;
+        V[0][2] = V[3][2] = V[4][2] = V[7][2] = 1;
+        V[1][2] = V[2][2] = V[5][2] = V[6][2] = -1;
+
+        /* Enable a single OpenGL light. */
+        GL11.glLight(GL11.GL_LIGHT0, GL11.GL_DIFFUSE, wrap(DIFFUSE));
+        GL11.glLight(GL11.GL_LIGHT0, GL11.GL_POSITION, wrap(POSITION));
+        GL11.glEnable(GL11.GL_LIGHT0);
+        //GL11.glEnable(GL11.GL_LIGHTING);
+
+        /* Use depth buffering for hidden surface elimination. */
+        GL11.glEnable(GL11.GL_DEPTH_TEST);
+
+        /* Setup the view of the cube. */
         GL11.glMatrixMode(GL11.GL_PROJECTION);
-        GL11.glLoadIdentity();
-        GL11.glOrtho(0, WIDTH, HEIGHT, 0, 1, -1);
+        Project.gluPerspective(40f, 1f, 1f, 10f);
         GL11.glMatrixMode(GL11.GL_MODELVIEW);
+        Project.gluLookAt(0f, 0f, 5f,
+                          0f, 0f, 0f,
+                          0f, 1f, 0f);
+
+        /* Adjust cube position to be asthetic angle. */
+        GL11.glTranslatef(0f, 0f, -1f);
+        GL11.glRotatef(60f, 1f, 0f, 0f);
+        GL11.glRotatef(-20f, 0f, 0f, 1f);
     }
 
     /**
      * Draw the OpenGL display.
      */
     private void repaint() {
-        double time = System.currentTimeMillis() / SECOND;
-
-        /* Clear the screen and depth buffer */
         GL11.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT);
 
-        /* set the color of the quad (R,G,B,A) */
-        float red = (float) Math.abs(Math.sin(time * RED_RATE));
-        float green = (float) Math.abs(Math.cos(time * GREEN_RATE));
-        float blue = (float) Math.abs(Math.tan(time * BLUE_RATE));
-        GL11.glColor3f(red, green, blue);
-
-        /* draw quad */
+        double time = System.currentTimeMillis() / SECOND;
         GL11.glPushMatrix();
-        float r = (float) (Math.sin(time * ROT_RATE) * ROT_RANGE + ROT_RANGE);
+        float r = (float) (Math.sin(time * ROTR_RATE) * ROT_RANGE + ROT_RANGE);
         GL11.glRotatef(r, 0f, 0f, 1f);
-
-        GL11.glBegin(GL11.GL_QUADS);
-        GL11.glVertex2f(WIDTH / WDIV, HEIGHT / HDIV);
-        GL11.glVertex2f(WIDTH / WDIV + QUAD_SIZE, HEIGHT / HDIV);
-        GL11.glVertex2f(WIDTH / WDIV + QUAD_SIZE, HEIGHT / HDIV + QUAD_SIZE);
-        GL11.glVertex2f(WIDTH / WDIV, HEIGHT / HDIV + QUAD_SIZE);
-        GL11.glEnd();
+        float s = (float) (time * ROTS_RATE % 360);
+        GL11.glRotatef(s, 1f, 0f, 0f);
+
+        for (int i = 0; i < 6; i++) {
+            GL11.glBegin(GL11.GL_QUADS);
+            GL11.glColor3f(COLORS[i][0], COLORS[i][1], COLORS[i][2]);
+            GL11.glNormal3f(NORMALS[i][0], NORMALS[i][1], NORMALS[i][2]);
+            GL11.glVertex3f(V[FACES[i][0]][0],
+                            V[FACES[i][0]][1],
+                            V[FACES[i][0]][2]);
+            GL11.glVertex3f(V[FACES[i][1]][0],
+                            V[FACES[i][1]][1],
+                            V[FACES[i][1]][2]);
+            GL11.glVertex3f(V[FACES[i][2]][0],
+                            V[FACES[i][2]][1],
+                            V[FACES[i][2]][2]);
+            GL11.glVertex3f(V[FACES[i][3]][0],
+                            V[FACES[i][3]][1],
+                            V[FACES[i][3]][2]);
+            GL11.glEnd();
+        }
 
         GL11.glPopMatrix();
     }