From 9d9fef3899fb458078b3719c38ab38f1618471e6 Mon Sep 17 00:00:00 2001
From: hayden v <haydenv06@gmail.com>
Date: Wed, 4 Mar 2020 10:55:48 +1000
Subject: [PATCH] dont touch vulkan PLEASE

---
 .../hydos/ginger/engine/common/obj/Mesh.java  |  1 +
 .../engine/common/obj/OBJFileLoader.java      |  4 ++-
 .../engine/vulkan/model/VKModelData.java      | 36 +++++++++++--------
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/github/hydos/ginger/engine/common/obj/Mesh.java b/src/main/java/com/github/hydos/ginger/engine/common/obj/Mesh.java
index 2c630b6..29f4c37 100644
--- a/src/main/java/com/github/hydos/ginger/engine/common/obj/Mesh.java
+++ b/src/main/java/com/github/hydos/ginger/engine/common/obj/Mesh.java
@@ -7,6 +7,7 @@ public class Mesh
 	private float[] normals;
 	private int[] indices;
 	private float furthestPoint;
+	public Vertex[] vkVertices;//may not be set only used for vulkan
 
 	public Mesh(float[] vertices, float[] textureCoords, float[] normals, int[] indices,
 		float furthestPoint)
diff --git a/src/main/java/com/github/hydos/ginger/engine/common/obj/OBJFileLoader.java b/src/main/java/com/github/hydos/ginger/engine/common/obj/OBJFileLoader.java
index c70cbc0..dcf283c 100644
--- a/src/main/java/com/github/hydos/ginger/engine/common/obj/OBJFileLoader.java
+++ b/src/main/java/com/github/hydos/ginger/engine/common/obj/OBJFileLoader.java
@@ -74,6 +74,8 @@ public class OBJFileLoader
 			textureCoords[j * 2 + 1] = 1 - vertex.getTextureIndex().y;
 			j++;
 		}
-		return new Mesh(verticies, textureCoords, new float[normals.sizeof()], indicesList, i);
+		Mesh mesh = new Mesh(verticies, textureCoords, new float[normals.sizeof()], indicesList, i);
+		mesh.vkVertices = vertexList;
+		return mesh;
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/hydos/ginger/engine/vulkan/model/VKModelData.java b/src/main/java/com/github/hydos/ginger/engine/vulkan/model/VKModelData.java
index 36d0ac7..d06e984 100644
--- a/src/main/java/com/github/hydos/ginger/engine/vulkan/model/VKModelData.java
+++ b/src/main/java/com/github/hydos/ginger/engine/vulkan/model/VKModelData.java
@@ -127,15 +127,28 @@ public class VKModelData
     }
 
     
-    private void memcpy(ByteBuffer buffer, float[] indices) {
+    private void memcpy(ByteBuffer buffer, float[] vertices) {
 
-        for(float index : indices) {
-            buffer.putFloat(index);
+//        buffer.putFloat(vertex.color.x());
+//        buffer.putFloat(vertex.color.y());
+//        buffer.putFloat(vertex.color.z());
+//
+//        buffer.putFloat(vertex.texCoords.x());
+//        buffer.putFloat(vertex.texCoords.y());
+        int i = 0;
+    	for(float vertex : vertices) {
+            buffer.putFloat(vertex);
+            if(i == 2) {
+            	i = 0;
+                buffer.putFloat(1);
+                buffer.putFloat(1);
+                buffer.putFloat(1);
+            }
+            i++;
+            
         }
-
-        buffer.rewind();
     }
-	
+
     private void createVertexBuffer() {
 
         try(MemoryStack stack = stackPush()) {
@@ -153,12 +166,7 @@ public class VKModelData
             long stagingBuffer = pBuffer.get(0);
             long stagingBufferMemory = pBufferMemory.get(0);
 
-            PointerBuffer data = stack.mallocPointer(1);
 
-            VK12.vkMapMemory(VKRegister.device, stagingBufferMemory, 0, bufferSize, 0, data);
-            {
-                memcpy(data.getByteBuffer(0, (int) bufferSize), mesh.getVertices());
-            }
             VK12.vkUnmapMemory(VKRegister.device, stagingBufferMemory);
 
             createBuffer(bufferSize,
@@ -177,7 +185,7 @@ public class VKModelData
         }
     }
     
-    private void memcpyIndices(ByteBuffer buffer, int[] indices) {
+    private void memcpy(ByteBuffer buffer, int[] indices) {
 
         for(int index : indices) {
             buffer.putInt(index);
@@ -207,13 +215,13 @@ public class VKModelData
 
             VK12.vkMapMemory(VKRegister.device, stagingBufferMemory, 0, bufferSize, 0, data);
             {
-            	memcpyIndices(data.getByteBuffer(0, (int) bufferSize), mesh.getIndices());
+            	memcpy(data.getByteBuffer(0, (int) bufferSize), mesh.getIndices());
             }
             VK12.vkUnmapMemory(VKRegister.device, stagingBufferMemory);
 
             createBuffer(bufferSize,
             	VK12.VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK12.VK_BUFFER_USAGE_INDEX_BUFFER_BIT,
-                    VK12.VK_MEMORY_HEAP_DEVICE_LOCAL_BIT,
+            	VK12.VK_MEMORY_HEAP_DEVICE_LOCAL_BIT,
                     pBuffer,
                     pBufferMemory);