yodaaaaaa
This commit is contained in:
@@ -87,11 +87,11 @@ public class ModelLoader {
|
||||
// textureCoords.add(buff.get(i).y());
|
||||
}
|
||||
|
||||
VertexBuffer positionVBO = new VertexBuffer(toFloatArray(positions), vertNumber);
|
||||
VertexBuffer positionVBO = new VertexBuffer(toFloatArray(positions), VERTEX_SIZE);
|
||||
positionVBO.AddVertexAttribPointer(VERTEX_POSITION_INDEX, VERTEX_SIZE, 0);
|
||||
VertexBuffer textureVBO = new VertexBuffer(toFloatArray(positions), vertNumber);
|
||||
VertexBuffer textureVBO = new VertexBuffer(toFloatArray(textureCoords), UV_SIZE);
|
||||
textureVBO.AddVertexAttribPointer(VERTEX_UV_INDEX, UV_SIZE, 0);
|
||||
VertexBuffer normalVBO = new VertexBuffer(toFloatArray(positions), vertNumber);
|
||||
VertexBuffer normalVBO = new VertexBuffer(toFloatArray(normals), VERTEX_SIZE);
|
||||
normalVBO.AddVertexAttribPointer(VERTEX_NORMAL_INDEX, VERTEX_SIZE, 0);
|
||||
|
||||
VertexArray vao = new VertexArray(new ElementBuffer(toIntArray(indicies)));
|
||||
@@ -115,7 +115,7 @@ public class ModelLoader {
|
||||
}
|
||||
}
|
||||
|
||||
public static List<VertexArray> loadModel(String filename) throws IOException {
|
||||
public static DDDModel loadModel(String filename) throws IOException {
|
||||
InputStream input = AssetManager.getResource(filename);
|
||||
byte[] buffer = input.readAllBytes();
|
||||
ByteBuffer data = MemoryUtil.memCalloc(buffer.length);
|
||||
@@ -134,7 +134,7 @@ public class ModelLoader {
|
||||
|
||||
MemoryUtil.memFree(data);
|
||||
|
||||
return vertecies;
|
||||
return new DDDModel(vertecies);
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user