Skip to content

Commit 53a79ed

Browse files
committed
Refactroing: Get rid of utils methods.
Made private: scaleFace(Mesh3D mesh, Face3D face, float scale) Removed: extrudeFace(Mesh3D mesh, Face3D face, float scale, float amount, boolean remove) This special version of face extrusion was used by the ported cube creator only and had too many parameters anyway.
1 parent 2693c4b commit 53a79ed

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

src/main/java/mesh/creator/creative/PortedCubeCreator.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
import mesh.creator.IMeshCreator;
1111
import mesh.creator.primitives.CubeCreator;
1212
import mesh.creator.primitives.SegmentedCubeCreator;
13+
import mesh.modifier.ExtrudeModifier;
1314
import mesh.modifier.ScaleModifier;
1415
import mesh.modifier.SolidifyModifier;
1516
import mesh.modifier.subdivision.CatmullClarkModifier;
1617
import mesh.selection.FaceSelection;
17-
import mesh.util.Mesh3DUtil;
1818

1919
public class PortedCubeCreator implements IMeshCreator {
2020

@@ -84,8 +84,11 @@ private void selectCenterFaces() {
8484
}
8585

8686
private void extrudeCenterFaces() {
87-
for (Face3D face : centerFaces)
88-
Mesh3DUtil.extrudeFace(mesh, face, 1, -1, true);
87+
ExtrudeModifier modifier = new ExtrudeModifier();
88+
modifier.setScale(1);
89+
modifier.setAmount(-1);
90+
modifier.modify(mesh, centerFaces);
91+
mesh.faces.removeAll(centerFaces);
8992
}
9093

9194
private void removeDoubles() {

src/main/java/mesh/util/Mesh3DUtil.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public static void flipDirection(Mesh3D mesh) {
2323
}
2424
}
2525

26+
// Used by face selection only
2627
public static float perimeter(Mesh3D mesh, Face3D face) {
2728
float perimeter = 0;
2829
for (int i = 0; i < face.indices.length - 2; i++) {
@@ -34,7 +35,7 @@ public static float perimeter(Mesh3D mesh, Face3D face) {
3435
return perimeter;
3536
}
3637

37-
public static void scaleFace(Mesh3D mesh, Face3D face, float scale) {
38+
private static void scaleFace(Mesh3D mesh, Face3D face, float scale) {
3839
Vector3f center = mesh.calculateFaceCenter(face);
3940
for (int i = 0; i < face.indices.length; i++) {
4041
Vector3f v = mesh.vertices.get(face.indices[i]);
@@ -134,11 +135,12 @@ public static void extrudeFace(Mesh3D mesh, Face3D face, float scale,
134135
}
135136
}
136137

137-
public static void extrudeFace(Mesh3D mesh, Face3D face, float scale,
138-
float amount, boolean remove) {
139-
extrudeFace(mesh, face, scale, amount);
140-
if (remove)
141-
mesh.removeFace(face);
142-
}
138+
// To may parameters -> Should be easy to remove / Used by Ported cube only
139+
// public static void extrudeFace(Mesh3D mesh, Face3D face, float scale,
140+
// float amount, boolean remove) {
141+
// extrudeFace(mesh, face, scale, amount);
142+
// if (remove)
143+
// mesh.removeFace(face);
144+
// }
143145

144146
}

0 commit comments

Comments
 (0)