From 991f576df66f9572115dc5c0edab5eef8e1adb9e Mon Sep 17 00:00:00 2001 From: hayden v Date: Wed, 4 Mar 2020 13:17:47 +1000 Subject: [PATCH] yEs --- .../github/hydos/ginger/engine/common/obj/OBJFileLoader.java | 2 +- .../github/hydos/ginger/engine/vulkan/model/VKModelData.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 dcf283c..bc0ec3e 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 @@ -59,7 +59,7 @@ public class OBJFileLoader { float[] verticies = new float[vertexList.length * 3]; float[] textureCoords = new float[vertexList.length * 2]; - //texture coords where stored in the vertices so there should be as many as there are vertices + //texture cords where stored in the vertices so there should be as many as there are vertices int j = 0; int i = 0; for (Vertex vertex : vertexList) 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 d06e984..dcfc1ef 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 @@ -166,7 +166,12 @@ 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,