Skip to content

Commit a21b33a

Browse files
committed
refactor extracted methods and members
1 parent 19573d6 commit a21b33a

1 file changed

Lines changed: 35 additions & 21 deletions

File tree

mesh/src/main/java/mesh/creator/archimedian/TruncatedOctahedronCreator.java

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,46 @@
55

66
public class TruncatedOctahedronCreator implements IMeshCreator {
77

8+
private float a = 1.0f;
9+
10+
private float b = 0.0f;
11+
12+
private float c = 2.0f;
13+
814
@Override
915
public Mesh3D create() {
1016
Mesh3D mesh = new Mesh3D();
17+
createVertices(mesh);
18+
createFaces(mesh);
19+
return mesh;
20+
}
1121

12-
float a = 1.0f;
13-
float b = 0.0f;
14-
float c = 2.0f;
22+
private void createFaces(Mesh3D mesh) {
23+
createQuadFaces(mesh);
24+
createHexagonalFaces(mesh);
25+
}
26+
27+
private void createHexagonalFaces(Mesh3D mesh) {
28+
mesh.addFace(0, 4, 14, 21, 17, 10);
29+
mesh.addFace(0, 8, 16, 20, 12, 4);
30+
mesh.addFace(1, 6, 12, 20, 18, 9);
31+
mesh.addFace(1, 11, 19, 21, 14, 6);
32+
mesh.addFace(2, 5, 13, 22, 16, 8);
33+
mesh.addFace(2, 10, 17, 23, 15, 5);
34+
mesh.addFace(3, 7, 15, 23, 19, 11);
35+
mesh.addFace(3, 9, 18, 22, 13, 7);
36+
}
37+
38+
private void createQuadFaces(Mesh3D mesh) {
39+
mesh.addFace(0, 10, 2, 8);
40+
mesh.addFace(1, 9, 3, 11);
41+
mesh.addFace(4, 12, 6, 14);
42+
mesh.addFace(5, 15, 7, 13);
43+
mesh.addFace(16, 22, 18, 20);
44+
mesh.addFace(17, 21, 19, 23);
45+
}
1546

47+
private void createVertices(Mesh3D mesh) {
1648
mesh.addVertex(+b, +a, +c);
1749
mesh.addVertex(+b, +a, -c);
1850
mesh.addVertex(+b, -a, +c);
@@ -42,23 +74,5 @@ public Mesh3D create() {
4274
mesh.addVertex(-c, +a, +b);
4375
mesh.addVertex(+c, -a, +b);
4476
mesh.addVertex(-c, -a, +b);
45-
46-
mesh.addFace(0, 10, 2, 8);
47-
mesh.addFace(1, 9, 3, 11);
48-
mesh.addFace(4, 12, 6, 14);
49-
mesh.addFace(5, 15, 7, 13);
50-
mesh.addFace(16, 22, 18, 20);
51-
mesh.addFace(17, 21, 19, 23);
52-
53-
mesh.addFace(0, 4, 14, 21, 17, 10);
54-
mesh.addFace(0, 8, 16, 20, 12, 4);
55-
mesh.addFace(1, 6, 12, 20, 18, 9);
56-
mesh.addFace(1, 11, 19, 21, 14, 6);
57-
mesh.addFace(2, 5, 13, 22, 16, 8);
58-
mesh.addFace(2, 10, 17, 23, 15, 5);
59-
mesh.addFace(3, 7, 15, 23, 19, 11);
60-
mesh.addFace(3, 9, 18, 22, 13, 7);
61-
62-
return mesh;
6377
}
6478
}

0 commit comments

Comments
 (0)