halotroop
/
Ginger3D
1
0
Fork 0
Code Pull Requests Packages Releases Activity

Merge branch 'Vulkan' into Multi-Render-API

pull/12/head^2
Caroline Bell 2020-03-03 16:57:40 -08:00 committed by GitHub
parent eccb4d5842 9d9fef3899
commit 3b8b9ec34d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/github/hydos/ginger/engine/common/obj/Mesh.java
View File

@ -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)

4
src/main/java/com/github/hydos/ginger/engine/common/obj/OBJFileLoader.java
View File

@ -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;
}
}