From 466a15f16024d12e576e3047336a9c3117a7f8b7 Mon Sep 17 00:00:00 2001
From: Sebastian <s.boeckelmann3@gmail.com>
Date: Fri, 25 Aug 2023 07:20:04 +0200
Subject: [PATCH] Generate single Hexagon

---
 client/res/white.png                          | Bin 0 -> 575 bytes
 client/src/main/java/core/engine/Engine.java  |  11 ++-
 .../main/java/core/engine/entity/Camera.java  |   2 +-
 .../java/core/engine/model/HexagonModel.java  |  88 ++++++++++++++++++
 4 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 client/res/white.png
 create mode 100644 client/src/main/java/core/engine/model/HexagonModel.java

diff --git a/client/res/white.png b/client/res/white.png
new file mode 100644
index 0000000000000000000000000000000000000000..c81624bb8f1377a152a4546ae6139b6326a186d3
GIT binary patch
literal 575
zcmV-F0>J%=P)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmP!xqvQ^lecK|6>zWT;LSL`5963Pq?8YK2xEOkVm2O&XFE
z7e~Rh;NZ_<)xpJCR|i)?5c~mgb#YR3krMAq3N2#1@OU5R-E(;FK0v6KnPzp21DbA|
zsYG1NWLL$mSA@`megqJZnPtpLQWC!Pbx(a%cQKyj-}h(rsyT}R0g-r?8KzCVK|H-_
z8=UuvBdjQ^#OK6gCS8#Dk?V@bZ=4G*3p_Jorc?985n{2>#!4HrqNx#25l2-`r+gvf
zvC4UivsSLM<~{if!#RCrnd`KMk-#FBAVGwJDoQBBMvQiy6bmUjkNfzCT)#vvg<K^t
zax9<%4YKP8|AXJNweph_UQ##?biO#w#|Y513p8qu^L^|%jT0dF3|#3gf29u0e3D*k
zY0)E~ZyUI{ZfVLMaJd5vJ{htpyHb#rkk13}XY@^3VBi+$Ui0SGJjdw+kfvEBZ-9eC
zV6;Hl>pt%ewa@L}p62|10MmSOXLJRci2wiq32;bRa{vG?BLDy{BLR4&KXw2B00(qQ
zO+^Ri2n!McDP-@HX#fBK8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b
z04PaBK~zY`?ae^}000C8F!b+yO7PnXtdrEIsb>O#Kp+qZ1OkEJ$^ysn13g6}bT<G1
N002ovPDHLkV1f#t=~4gy

literal 0
HcmV?d00001

diff --git a/client/src/main/java/core/engine/Engine.java b/client/src/main/java/core/engine/Engine.java
index dadb681..4a4411b 100644
--- a/client/src/main/java/core/engine/Engine.java
+++ b/client/src/main/java/core/engine/Engine.java
@@ -3,6 +3,7 @@ package core.engine;
 import core.engine.entity.Camera;
 import core.engine.entity.Entity;
 import core.engine.entity.Light;
+import core.engine.model.HexagonModel;
 import core.engine.model.RawModel;
 import core.engine.model.TexturedModel;
 import core.engine.renderer.MasterRenderer;
@@ -129,13 +130,21 @@ public class Engine {
         //Generate Simple, Flat Terrain
         Terrain terrain = new Terrain( loader, new ModelTexture(loader.loadTexture("grass")));
 
+        //Create Hexagon
+        HexagonModel hexagonModel = new HexagonModel();
+        RawModel hexagonRawModel = loader.loadToVAO(hexagonModel.getVertices(), hexagonModel.getTextureCoords(), hexagonModel.getNormals(), hexagonModel.getIndices());
+        ModelTexture hexagonTexture = new ModelTexture(loader.loadTexture("white"));
+        TexturedModel hexagontexturedModel = new TexturedModel(hexagonRawModel, hexagonTexture);
+        Entity hexagonEntity = new Entity(hexagontexturedModel, new Vector3f(0,1,0), 0,0,0,1);
+
         // Run the rendering loop until the user has attempted to close
         // the window or has pressed the ESCAPE key.
         MasterRenderer renderer = new MasterRenderer();
         input(camera, renderer);
         while ( !glfwWindowShouldClose(window) ) {
+            renderer.processEntity(hexagonEntity);
             //entity.increaseRotation(0,1,0);
-            renderer.processTerrain(terrain);
+            //renderer.processTerrain(terrain);
             //renderer.processEntity(entity);
             renderer.render(light, camera);
             glfwSwapBuffers(window); // swap the color buffers
diff --git a/client/src/main/java/core/engine/entity/Camera.java b/client/src/main/java/core/engine/entity/Camera.java
index 11b72f2..f853f22 100644
--- a/client/src/main/java/core/engine/entity/Camera.java
+++ b/client/src/main/java/core/engine/entity/Camera.java
@@ -4,7 +4,7 @@ import utils.vectors.Vector3f;
 
 public class Camera {
 
-    private Vector3f position = new Vector3f(50,100,50);
+    private Vector3f position = new Vector3f(0,2,0);
     private float pitch = 90;
     private float yaw = 180;
     private float roll;
diff --git a/client/src/main/java/core/engine/model/HexagonModel.java b/client/src/main/java/core/engine/model/HexagonModel.java
new file mode 100644
index 0000000..be17c65
--- /dev/null
+++ b/client/src/main/java/core/engine/model/HexagonModel.java
@@ -0,0 +1,88 @@
+package core.engine.model;
+
+import utils.vectors.Vector3f;
+public class HexagonModel {
+
+    private float[] vertices;
+    private float[] normals;
+    private float[] textureCoords;
+    private int[] indices;
+
+    public HexagonModel() {
+        // Vertices (including the center)
+        vertices = new float[]{
+                0.0f, 0.0f, 0.0f,     // Center
+                0.0f, 0.0f, 1.0f,     // Top Vertex
+                0.866f, 0.0f, 0.5f,   // Upper Right Vertex
+                0.866f, 0.0f, -0.5f,  // Lower Right Vertex
+                0.0f, 0.0f, -1.0f,    // Bottom Vertex
+                -0.866f, 0.0f, -0.5f, // Lower Left Vertex
+                -0.866f, 0.0f, 0.5f   // Upper Left Vertex
+        };
+
+// Normals
+        normals = new float[]{
+                0, 1, 0, // Center
+                0, 1, 0, // Top Vertex
+                0, 1, 0, // Upper Right Vertex
+                0, 1, 0, // Lower Right Vertex
+                0, 1, 0, // Bottom Vertex
+                0, 1, 0, // Lower Left Vertex
+                0, 1, 0  // Upper Left Vertex
+        };
+
+// Texture Coordinates
+        textureCoords = new float[]{
+                0.5f, 0.5f, // Center
+                0.5f, 0.0f, // Top Vertex
+                1.0f, 0.25f, // Upper Right Vertex
+                1.0f, 0.75f, // Lower Right Vertex
+                0.5f, 1.0f, // Bottom Vertex
+                0.0f, 0.75f, // Lower Left Vertex
+                0.0f, 0.25f // Upper Left Vertex
+        };
+
+// Indices
+        indices = new int[]{
+                0, 1, 2, // Center to Top Vertex to Upper Right Vertex
+                0, 2, 3, // Center to Upper Right Vertex to Lower Right Vertex
+                0, 3, 4, // Center to Lower Right Vertex to Bottom Vertex
+                0, 4, 5, // Center to Bottom Vertex to Lower Left Vertex
+                0, 5, 6, // Center to Lower Left Vertex to Upper Left Vertex
+                0, 6, 1  // Center to Upper Left Vertex to Top Vertex
+        };
+
+    }
+
+    public float[] getVertices() {
+        return vertices;
+    }
+
+    public void setVertices(float[] vertices) {
+        this.vertices = vertices;
+    }
+
+    public float[] getNormals() {
+        return normals;
+    }
+
+    public void setNormals(float[] normals) {
+        this.normals = normals;
+    }
+
+    public float[] getTextureCoords() {
+        return textureCoords;
+    }
+
+    public void setTextureCoords(float[] textureCoords) {
+        this.textureCoords = textureCoords;
+    }
+
+    public int[] getIndices() {
+        return indices;
+    }
+
+    public void setIndices(int[] indices) {
+        this.indices = indices;
+    }
+}