Moving the sweep code into the Extrude class in JavaCAD

Author: madhephaestus

build.gradle

@@ -156,7 +156,7 @@ repositories {
 
 dependencies {
 
-	api 'com.neuronrobotics:JavaCad:2.2.0'
+	api 'com.neuronrobotics:JavaCad:2.3.0'
 	api project('java-bowler')
 	api project('GithubPasswordManager:GithubPasswordManager')
 

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Sweep.java

@@ -64,41 +64,12 @@ public String getType() {
 		return "Sweep";
 	}
 
-	public static CSG sweep(Polygon p, Transform increment, Transform offset, int steps) {
-		Polygon offsetP = p.transformed(offset);
-		List<Polygon> newPolygons = new ArrayList<>();
-		newPolygons.addAll(PolygonUtil.concaveToConvex(offsetP));
-		Transform running = new Transform();
-		Polygon prev = offsetP;
-		for (int i = 0; i < steps; i++) {
-			running.apply(increment);
-			Polygon step = offsetP.transformed(running);
-			List<Polygon> parts = monotoneExtrude(prev, step);
-			prev = step;
-			newPolygons.addAll(parts);
-		}
-		Polygon polygon2 = offsetP.transformed(running);
-		List<Polygon> topPolygons = PolygonUtil.concaveToConvex(polygon2.flipped());
-		newPolygons.addAll(topPolygons);
-
-		return CSG.fromPolygons(newPolygons);
-	}
-
-	public static CSG sweep(Polygon p, double angle, double z, double radius, int steps) {
-		return sweep(p, new Transform().rotX(angle).movex(z), new Transform().movey(radius), steps);
-	}
-
 	public CSG sweep(Polygon p, String name, Bounds b) {
 		double sweepTot = angle(name).getMM();
 		double d = sweepTot / 360;
 		int steps = (int) (steps(name).getMM() * d);
 		double angle = sweepTot / steps;
 		Parameter zp = zoffset(name);
-//		double d = zp.getMM()-b.getTotalY();
-//		if(d<0) {
-//			d=0;
-//			zp.setMM(b.getTotalY());
-//		}
 		double z = zp.getMM() * d / steps;
 		double radius = radius(name).getMM();
 		if (angle < 0)
@@ -107,7 +78,7 @@ public CSG sweep(Polygon p, String name, Bounds b) {
 		Transform increment = new Transform().rotY(-angle).movey(z);
 		Transform radiusT = new Transform().movex(radius);
 		Polygon transformedP = p.transformed(centerandAllignedPolygon);
-		return sweep(transformedP, increment, radiusT, steps).rotx(-90).setName(name);
+		return Extrude.sweep(transformedP, increment, radiusT, steps).rotx(-90).setName(name);
 	}
 
 	private LengthParameter radius(String name) {
@@ -144,47 +115,7 @@ private LengthParameter angle(String name) {
 		return angle;
 	}
 
-	public static List<Polygon> monotoneExtrude(Polygon polygon2, Polygon polygon1) {
-		List<Polygon> newPolygons = new ArrayList<>();
-//		CSG extrude;
-		// polygon1=polygon1.flipped();
-		// newPolygons.addAll(PolygonUtil.concaveToConvex(polygon1.flipped()));
-		// Polygon polygon2 = polygon1.translated(dir);
-
-		int numvertices = polygon1.vertices.size();
-		// com.neuronrobotics.sdk.common.Log.error("Building Polygon
-		// "+polygon1.getPoints().size());
-		for (int i = 0; i < numvertices; i++) {
 
-			int nexti = (i + 1) % numvertices;
-
-			Vector3d bottomV1 = polygon1.vertices.get(i).pos;
-			Vector3d topV1 = polygon2.vertices.get(i).pos;
-			Vector3d bottomV2 = polygon1.vertices.get(nexti).pos;
-			Vector3d topV2 = polygon2.vertices.get(nexti).pos;
-			double distance = bottomV1.minus(bottomV2).magnitude();
-			if (Math.abs(distance) < Plane.getEPSILON()) {
-				// com.neuronrobotics.sdk.common.Log.error("Skipping invalid polygon "+i+" to
-				// "+nexti);
-				continue;
-			}
-			try {
-				newPolygons.add(Polygon.fromPoints(Arrays.asList(bottomV2, topV2, topV1), polygon1.getStorage()));
-				newPolygons.add(Polygon.fromPoints(Arrays.asList(bottomV2, topV1, bottomV1), polygon1.getStorage()));
-			} catch (Exception ex) {
-				// com.neuronrobotics.sdk.common.Log.error("Polygon has problems: ");
-				ex.printStackTrace();
-			}
-		}
-
-//		polygon2 = polygon2.flipped();
-//		List<Polygon> topPolygons = PolygonUtil.concaveToConvex(polygon2.flipped());
-//
-//		newPolygons.addAll(topPolygons);
-//		extrude = CSG.fromPolygons(newPolygons);
-
-		return newPolygons;
-	}
 
 	@Override
 	public List<CSG> process(List<CSG> incoming) {