verticies -> vertices everywhere
This commit is contained in:
@@ -407,7 +407,7 @@ public class ModelViewer
|
|||||||
y *= TILE_SCALE;
|
y *= TILE_SCALE;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Split into two triangles with verticies
|
Split into two triangles with vertices
|
||||||
x,y,z1 x+1,y,z2 x,y+1,z3
|
x,y,z1 x+1,y,z2 x,y+1,z3
|
||||||
x,y+1,z3 x+1,y,z2 x+1,y+1,z4
|
x,y+1,z3 x+1,y,z2 x+1,y+1,z4
|
||||||
|
|
||||||
|
|||||||
@@ -38,28 +38,28 @@ public class Model
|
|||||||
this.model = model;
|
this.model = model;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Vertex> getVerticies()
|
public List<Vertex> getVertices()
|
||||||
{
|
{
|
||||||
int[] verticiesX = model.getVerticesX();
|
int[] verticesX = model.getVerticesX();
|
||||||
int[] verticiesY = model.getVerticesY();
|
int[] verticesY = model.getVerticesY();
|
||||||
int[] verticiesZ = model.getVerticesZ();
|
int[] verticesZ = model.getVerticesZ();
|
||||||
|
|
||||||
assert verticiesX.length == verticiesY.length;
|
assert verticesX.length == verticesY.length;
|
||||||
assert verticiesY.length == verticiesZ.length;
|
assert verticesY.length == verticesZ.length;
|
||||||
|
|
||||||
List<Vertex> verticies = new ArrayList<>();
|
List<Vertex> vertices = new ArrayList<>();
|
||||||
|
|
||||||
for (int i = 0; i < verticiesX.length; ++i)
|
for (int i = 0; i < verticesX.length; ++i)
|
||||||
{
|
{
|
||||||
Vertex v = new Vertex(
|
Vertex v = new Vertex(
|
||||||
verticiesX[i],
|
verticesX[i],
|
||||||
verticiesY[i],
|
verticesY[i],
|
||||||
verticiesZ[i]
|
verticesZ[i]
|
||||||
);
|
);
|
||||||
verticies.add(v);
|
vertices.add(v);
|
||||||
}
|
}
|
||||||
|
|
||||||
return verticies;
|
return vertices;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Triangle> getTriangles()
|
public List<Triangle> getTriangles()
|
||||||
@@ -71,7 +71,7 @@ public class Model
|
|||||||
assert trianglesX.length == trianglesY.length;
|
assert trianglesX.length == trianglesY.length;
|
||||||
assert trianglesY.length == trianglesZ.length;
|
assert trianglesY.length == trianglesZ.length;
|
||||||
|
|
||||||
List<Vertex> verticies = getVerticies();
|
List<Vertex> vertices = getVertices();
|
||||||
List<Triangle> triangles = new ArrayList<>(trianglesX.length);
|
List<Triangle> triangles = new ArrayList<>(trianglesX.length);
|
||||||
|
|
||||||
for (int i = 0; i < trianglesX.length; ++i)
|
for (int i = 0; i < trianglesX.length; ++i)
|
||||||
@@ -81,9 +81,9 @@ public class Model
|
|||||||
int triangleZ = trianglesZ[i];
|
int triangleZ = trianglesZ[i];
|
||||||
|
|
||||||
Triangle triangle = new Triangle(
|
Triangle triangle = new Triangle(
|
||||||
verticies.get(triangleX),
|
vertices.get(triangleX),
|
||||||
verticies.get(triangleY),
|
vertices.get(triangleY),
|
||||||
verticies.get(triangleZ)
|
vertices.get(triangleZ)
|
||||||
);
|
);
|
||||||
triangles.add(triangle);
|
triangles.add(triangle);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user