Adding intersection to the group opperation as an option

Author: madhephaestus

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

@@ -13,12 +13,15 @@
 import javafx.scene.paint.Color;
 
 public class Group extends AbstractAddFrom implements ICaDoodleOpperation {
-	@Expose (serialize = true, deserialize = true)
+	@Expose(serialize = true, deserialize = true)
 	private List<String> names = new ArrayList<String>();
-	@Expose (serialize = true, deserialize = true)
-	public String groupID=null;
-	@Expose (serialize = true, deserialize = true)
-	public boolean hull=false;
+	@Expose(serialize = true, deserialize = true)
+	public String groupID = null;
+	@Expose(serialize = true, deserialize = true)
+	public boolean hull = false;
+	@Expose(serialize = true, deserialize = true)
+	public boolean intersect = false;
+
 	@Override
 	public String getType() {
 		return "Group";
@@ -31,51 +34,57 @@ public List<CSG> process(List<CSG> incoming) {
 		ArrayList<CSG> back = new ArrayList<CSG>();
 		ArrayList<CSG> replace = new ArrayList<CSG>();
 		back.addAll(incoming);
-		for(CSG csg: incoming) {
-			if(csg.isLock())
+		for (CSG csg : incoming) {
+			if (csg.isLock())
 				continue;
-			for(String name:names) {
-				if(name.contentEquals(csg.getName())) {
+			for (String name : names) {
+				if (name.contentEquals(csg.getName())) {
 					replace.add(csg);
-					CSG c=csg.clone().syncProperties(csg).setRegenerate(csg.getRegenerate()).setName(name);
-					if(csg.isHole()) {
+					CSG c = csg.clone().syncProperties(csg).setRegenerate(csg.getRegenerate()).setName(name);
+					if (csg.isHole()) {
 						holes.add(c);
-					}else
+					} else
 						solids.add(c);
 					c.addGroupMembership(getGroupID());
 					back.add(c);
 				}
 			}
 		}
-		for(CSG c:replace) {
+		for (CSG c : replace) {
 			back.remove(c);
 		}
-		CSG result =null;
-		if(holes.size()>0&&solids.size()==0) {
+		CSG result = null;
+		if (holes.size() > 0 && solids.size() == 0) {
 			result = CSG.unionAll(holes);
-			if(hull)
-				result=result.hull();
+			if (hull)
+				result = result.hull();
 			result.setIsHole(true);
 
-		}else {
-			CSG holecutter =null;
-			if(holes.size()>0) {
-				holecutter=CSG.unionAll(holes);
-				if(hull)
-					holecutter=holecutter.hull();
+		} else {
+			CSG holecutter = null;
+			if (holes.size() > 0) {
+				if (intersect)
+					holecutter = intersect(holes);
+				else
+					holecutter = CSG.unionAll(holes);
+				if (hull)
+					holecutter = holecutter.hull();
 			}
-			result = CSG.unionAll(solids);
+			if (intersect)
+				result = intersect(solids);
+			else
+				result = CSG.unionAll(solids);
 			Color c = result.getColor();
-			if(hull) {
-				result=result.hull();
+			if (hull) {
+				result = result.hull();
 			}
-			if(holecutter!=null)
-				result=result.difference(holecutter);
+			if (holecutter != null)
+				result = result.difference(holecutter);
 			result.setIsHole(false);
 			result.setColor(c);
 		}
 		HashMap<String, IParametric> mapOfparametrics = result.getMapOfparametrics();
-		if(mapOfparametrics!=null)
+		if (mapOfparametrics != null)
 			mapOfparametrics.clear();
 		result.addIsGroupResult(getGroupID());
 		result.setName(getGroupID());
@@ -84,6 +93,14 @@ public List<CSG> process(List<CSG> incoming) {
 		return back;
 	}
 
+	private CSG intersect(ArrayList<CSG> solids) {
+		CSG first = solids.get(0);
+		for(int i=1;i<solids.size();i++) {
+			first=first.intersect(solids.get(i));
+		}
+		return first;
+	}
+
 	public List<String> getNames() {
 		return names;
 	}
@@ -94,15 +111,21 @@ public Group setNames(List<String> names) {
 	}
 
 	public String getGroupID() {
-		if(groupID==null)
-			groupID=RandomStringFactory.generateRandomString();
+		if (groupID == null)
+			groupID = RandomStringFactory.generateRandomString();
 		return groupID;
 	}
 
+	public Group setIntersect(boolean intersect) {
+		this.intersect = intersect;
+		return this;
+	}
+
 	public Group setHull(boolean hull) {
 		this.hull = hull;
 		return this;
 	}
+
 	@Override
 	public File getFile() throws NoSuchFileException {
 		throw new NoSuchFileException(null);