Player (WIP)

src/org/dhsdev/flowerknight/FlowerKnight.java

@@ -1,5 +1,6 @@
 package org.dhsdev.flowerknight;
 
+import org.dhsdev.flowerknight.game.Player;
 import org.dhsdev.flowerknight.gl.Renderable;
 import org.dhsdev.flowerknight.gl.Texture;
 import org.dhsdev.flowerknight.gl.comp.Label;
@@ -56,13 +57,13 @@ public static void init() {
         Camera.init();
 
         try {
-            Texture.LOGO = new Texture("res/logo.png");
-            Texture.LOGO.bind();
+            Texture.LOGO  = new Texture("res/logo.png");
+            Texture.ARDEN = new Texture("res/arden.png");
         } catch (IOException e) {
-            Logger.log("Could not load logo", Severity.ERROR);
+            Logger.log("Could not load textures", Severity.ERROR);
         }
 
-        Renderable.renderables.add(new Label("Test", "Test Text", 0.4f,0.4f, 0f, 0f));
+        Renderable.renderables.add(new Player(0, 0));
 
         Shader.getSpotlightShader().registerUniform("time");
 
@@ -116,6 +117,8 @@ public static void exit() {
 
         Texture.LOGO.unbind();
         Texture.LOGO.delete();
+        Texture.ARDEN.unbind();
+        Texture.ARDEN.delete();
 
         glfwTerminate();
     }

src/org/dhsdev/flowerknight/game/GameObject.java

@@ -18,7 +18,7 @@ public class GameObject {
      * The strength of gravity. Until we get an actual game object, we have no
      * clue how fast this will make things fall, so keep it zero for now.
      */
-    public static final float GRAVITY_STRENGTH = 0.0f;
+    public static final float GRAVITY_STRENGTH = 0.0001f;
 
     /**
      * The x-position.
@@ -75,6 +75,9 @@ protected void update() {
         if (hasGravity)
             yVelocity -= GameObject.GRAVITY_STRENGTH;
 
+        y += yVelocity;
+        x += xVelocity;
+
         // TODO - collision, etc.
 
     }

src/org/dhsdev/flowerknight/game/Player.java

@@ -0,0 +1,43 @@
+package org.dhsdev.flowerknight.game;
+
+import org.dhsdev.flowerknight.gl.Mesh;
+import org.dhsdev.flowerknight.gl.Renderable;
+import org.dhsdev.flowerknight.gl.Texture;
+
+/**
+ * A player that exists.
+ */
+public class Player extends GameObject implements Renderable {
+
+    private Mesh mesh;
+
+    /**
+     * Adds the object to the list.
+     * @param xP the x location
+     * @param yP the y location
+     */
+    public Player(float xP, float yP) {
+        super(xP, yP);
+    }
+
+    @Override
+    public void draw() {
+        mesh = new Mesh(
+                new float[] {
+                        (float) (x - 0.1), (float) (y - 0.1),
+                        (float) (x - 0.1), (float) (y + 0.1),
+                        (float) (x + 0.1), (float) (y + 0.1),
+                        (float) (x + 0.1), (float) (y - 0.1),
+                },
+                new int[] {
+                        0, 1, 3, 3, 1, 2
+                }
+        );
+        mesh.render(Texture.ARDEN);
+    }
+
+    @Override
+    public void clear() {
+        // Nothing for now.
+    }
+}

src/org/dhsdev/flowerknight/gl/Mesh.java

@@ -98,25 +98,14 @@ private int getVboId(int[] arr) {
      * code.
      * @param texture the OpenGL textureID to use.
      */
-    public void render(TextureEnum texture) {
+    public void render(Texture texture) {
 
-        int pos = texture.ordinal();
-        int texMax = TextureEnum.values().length;
-
-        float stride = 1 / (float) texMax;
-
-        // We select a square from the large texture atlas image.
-        var texCoords = new float[] {
-            pos * stride,       1,
-            pos * stride,       0,
-            (pos + 1) * stride, 0,
-            (pos + 1) * stride, 1,
-        };
+        texture.bind();
 
         glBindVertexArray(vaoId);
 
         // Texture coordinates
-        int texVboId = getVboId(texCoords);
+        int texVboId = getVboId(new float[] { 0, 1, 0, 0, 1, 0, 1, 1 });
         glVertexAttribPointer(1, GAME_DIMENSION, GL_FLOAT, false, 0, 0);
 
         // Draw the mesh

src/org/dhsdev/flowerknight/gl/Texture.java

@@ -76,7 +76,7 @@ public void delete() {
     /**
      * The textures
      */
-    public static Texture LOGO;
+    public static Texture LOGO, ARDEN;
 
     /**
      * Set this to be used.

src/org/dhsdev/flowerknight/gl/comp/Label.java

@@ -19,7 +19,7 @@ public class Label extends Component  {
     private float offsetX;
     private float offsetY;
     private Mesh mesh;
-    private TextureEnum tex;
+    private Texture texture;
     private Shader shader;
 
     /**
@@ -57,7 +57,7 @@ public Label(String name, String text, float x, float y, float offsetX, float of
     @Override
     public void draw() {
         shader.bind();
-        mesh.render(TextureEnum.LOGO);
+        mesh.render(texture);
     }
 
     @Override