Skip to content

Commit 3fa6f2b

Browse files
renames
1 parent 31af7e9 commit 3fa6f2b

2 files changed

Lines changed: 8 additions & 13 deletions

File tree

src/main/java/cam72cam/mod/model/common/mesh/Face.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public Vertex(Vec3d vertex, Vec2f uv) {
5555
}
5656

5757
public Vertex(FaceAccessor.VertexAccessor accessor) {
58-
this.pos = accessor.shotPos();
59-
this.uv = accessor.shotUv();
58+
this.pos = accessor.snapPos();
59+
this.uv = accessor.snapUv();
6060
}
6161

6262
public Vertex scale(double factor) {

src/main/java/cam72cam/mod/model/common/util/FaceAccessor.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ public FaceAccessor ofGroup(String groupName) {
8484
* Convert current accessing face into an {@link Face}.
8585
* @return OBJFace of current face
8686
*/
87-
public Face shot() {
87+
public Face snapFace() {
8888
Face.Vertex vert0 = new Face.Vertex(v0);
8989
Face.Vertex vert1 = new Face.Vertex(v1);
9090
Face.Vertex vert2 = new Face.Vertex(v2);
9191
return new Face(vert0, vert1, vert2, normalOffset != -1
92-
? v0.shotNormal()
92+
? v0.snapNormal()
9393
: vert1.pos.subtract(vert0.pos).crossProduct(vert2.pos.subtract(vert0.pos)).normalize());
9494
}
9595

@@ -124,11 +124,6 @@ public FaceAccessor next() {
124124
currentFaceIndex = iteratorIndex++;
125125
return FaceAccessor.this;
126126
}
127-
128-
@Override
129-
public void remove() {
130-
Iterator.super.remove();
131-
}
132127
}
133128

134129
@Override
@@ -152,18 +147,18 @@ protected VertexAccessor(int vertOffset) {
152147
this.vertOffset = vertOffset;
153148
}
154149

155-
public Vec3d shotPos() {
150+
public Vec3d snapPos() {
156151
return new Vec3d(x(), y(), z());
157152
}
158153

159-
public Vec2f shotUv() {
154+
public Vec2f snapUv() {
160155
if (uvOffset == -1) {
161156
return Vec2f.ZERO;
162157
}
163158
return new Vec2f(u(), v());
164159
}
165160

166-
public Vec3d shotNormal() {
161+
public Vec3d snapNormal() {
167162
if (normalOffset == -1) {
168163
return Vec3d.ZERO;
169164
}
@@ -235,7 +230,7 @@ public float ny() {
235230
if (normalOffset == -1) {
236231
return 0;
237232
}
238-
return model.getVboData()[(currentFaceIndex * 3 + vertOffset) * stride + normalOffset + 1];
233+
return data[(currentFaceIndex * 3 + vertOffset) * stride + normalOffset + 1];
239234
}
240235

241236
public float nz() {

0 commit comments

Comments
 (0)