Make sure there are polygons before trying to perform CSG operations

Author: madhephaestus

src/main/java/eu/mihosoft/vrl/v3d/CSG.java

@@ -1112,6 +1112,10 @@ private CSG _unionIntersectOpt(CSG csg) {
 	 * @return the csg
 	 */
 	private CSG _unionNoOpt(CSG csg) {
+		if(this.getPolygons().size()==0)
+			return csg.clone();
+		if(csg.getPolygons().size()==0)
+			return this.clone();
 		Node a = new Node(this.clone().getPolygons());
 		Node b = new Node(csg.clone().getPolygons());
 		a.clipTo(b);
@@ -1303,7 +1307,12 @@ public CSG difference(CSG csg) {
 	private CSG _differenceCSGBoundsOpt(CSG csg) {
 		CSG a1 = this._differenceNoOpt(csg.getBounds().toCSG());
 		CSG a2 = this.intersect(csg.getBounds().toCSG());
-		CSG result = a2._differenceNoOpt(csg)._unionIntersectOpt(a1).optimization(getOptType());
+		
+		CSG result = null;
+		if(a2.getPolygons().size()>0)
+			result = a2._differenceNoOpt(csg)._unionIntersectOpt(a1).optimization(getOptType());
+		else
+			result=a1;
 		if (getName().length() != 0 && csg.getName().length() != 0) {
 			result.setName(name);
 		}

src/main/java/eu/mihosoft/vrl/v3d/CSGServerHandler.java

@@ -26,20 +26,21 @@ public void run() {
 		try (ObjectInputStream ois = new ObjectInputStream(clientSocket.getInputStream());
 				ObjectOutputStream oos = new ObjectOutputStream(clientSocket.getOutputStream())) {
 
-			System.out.println("Client connected: " + clientSocket.getRemoteSocketAddress());
+			// System.out.println("Client connected: " +
+			// clientSocket.getRemoteSocketAddress());
 
 			// Read the CSG request
 			CSGRequest request = (CSGRequest) ois.readObject();
-			System.out.println("Received request: " + request.getOperation());
+			// System.out.println("Received request: " + request.getOperation());
 			boolean APIPass = true;
 			String apiKey2 = request.getAPIKey();
 			if (getAPIKEYs() != null) {
 				APIPass = false;
-				if (apiKey2!=null)
+				if (apiKey2 != null)
 					for (int i = 0; i < getAPIKEYs().length; i++)
 						if (apiKey2.contentEquals(getAPIKEYs()[i])) {
 							APIPass = true;
-							System.out.println("API Key Match");
+							// System.out.println("API Key Match");
 							break;
 						}
 			}
@@ -64,7 +65,7 @@ public void run() {
 			oos.writeObject(response);
 			oos.flush();
 
-			System.out.println("Sent response: " + response);
+			// System.out.println("Sent response: " + response);
 
 		} catch (IOException | ClassNotFoundException e) {
 			System.err.println("client disconnected: ");
@@ -74,7 +75,7 @@ public void run() {
 	}
 
 	private void close() {
-		System.out.println("Closing Handler socket");
+		//System.out.println("Closing Handler socket");
 		try {
 			if (!clientSocket.isClosed()) {
 				clientSocket.close();
@@ -89,12 +90,13 @@ private CSGResponse processCSGRequest(CSGRequest request) {
 		CSGClient.setServerCall(true);
 		try {
 			List<CSG> csgList = request.getCsgList();
+			
 			switch (request.getOperation()) {
 			case DIFFERENCE:
 				CSG first = csgList.remove(0);
-				if(csgList.size()==1) {
+				if (csgList.size() == 1) {
 					back.add(first.difference(csgList.get(0)));
-				}else
+				} else
 					back.add(first.difference(csgList));
 				break;
 			case INTERSECT:
@@ -107,11 +109,19 @@ private CSGResponse processCSGRequest(CSGRequest request) {
 					back.add(c.triangulate(true));
 				break;
 			case UNION:
-				if(csgList.size()==2) {
-					back.add(csgList.get(0).union(csgList.get(1)));
-				}else
-					back.add(CSG.unionAll(csgList));
-				break;
+				try {
+					
+					if (csgList.size() == 2) {
+						CSG csg = csgList.get(0);
+						CSG csg2 = csgList.get(1);
+						back.add(csg.union(csg2));
+					} else
+						back.add(CSG.unionAll(csgList));
+					break;
+				} catch (Throwable tr) {
+					tr.printStackTrace();
+					throw tr;
+				}
 			case minkowskiHullShape:
 				CSG m1 = csgList.remove(0);
 				CSG t = csgList.remove(0);

src/main/java/eu/mihosoft/vrl/v3d/Node.java

@@ -81,10 +81,10 @@ public Node(List<Polygon> polygons) {
 		}
 	}
 
-	/**
-	 * Constructor. Creates a node without polygons.
-	 */
-	public Node() {
+//	/**
+//	 * Constructor. Creates a node without polygons.
+//	 */
+	private Node() {
 		this(null);
 	}
 
@@ -96,7 +96,7 @@ public Node() {
 	@Override
 	public Node clone() {
 		Node node = new Node();
-		node.plane = this.plane == null ? null : this.plane.clone();
+		node.setPlane(this.getPlane() == null ? null : this.getPlane().clone());
 		node.front = this.front == null ? null : this.front.clone();
 		node.back = this.back == null ? null : this.back.clone();
 //        node.polygons = new ArrayList<>();
@@ -132,16 +132,16 @@ public void invert() {
 			polygon.flip();
 		});
 
-		if (this.plane == null && !polygons.isEmpty()) {
-			this.plane = polygons.get(0).getPlane().clone();
-		} else if (this.plane == null && polygons.isEmpty()) {
+		if (this.getPlane() == null && !polygons.isEmpty()) {
+			this.setPlane(polygons.get(0).getPlane().clone());
+		} else if (this.getPlane() == null && polygons.isEmpty()) {
 
 			//com.neuronrobotics.sdk.common.Log.error("Please fix me! I don't know what to do?");
-			throw new RuntimeException("Please fix me! I don't know what to do?");
+			throw new RuntimeException("Please fix me! Plane = "+plane+" and polygons are empty");
 			// return;
 		}
 
-		this.plane.flip();
+		this.getPlane().flip();
 
 		if (this.front != null) {
 			this.front.invert();
@@ -166,15 +166,15 @@ public void invert() {
 	 */
 	private List<Polygon> clipPolygons(List<Polygon> polygons) {
 
-		if (this.plane == null) {
+		if (this.getPlane() == null) {
 			return new ArrayList<>(polygons);
 		}
 
 		List<Polygon> frontP = new ArrayList<>();
 		List<Polygon> backP = new ArrayList<>();
 
 		for (Polygon polygon : polygons) {
-			this.plane.splitPolygon(polygon, frontP, backP, frontP, backP);
+			this.getPlane().splitPolygon(polygon, frontP, backP, frontP, backP);
 		}
 		if (this.front != null) {
 			frontP = this.front.clipPolygons(frontP);
@@ -264,8 +264,8 @@ public final void build(List<Polygon> polygons, long depth, long maxDepth) {
 			return;
 		}
 
-		if (this.plane == null) {
-			this.plane = polygons.get(0).getPlane().clone();
+		if (this.getPlane() == null) {
+			this.setPlane(polygons.get(0).getPlane().clone());
 		}
 		//this.polygons.add(polygons.get(0));
 
@@ -274,7 +274,7 @@ public final void build(List<Polygon> polygons, long depth, long maxDepth) {
 
 		// parellel version does not work here
 		for(int i=0;i<polygons.size();i++) {
-			this.plane.splitPolygon(polygons.get(i), this.polygons, this.polygons, frontP, backP);
+			this.getPlane().splitPolygon(polygons.get(i), this.polygons, this.polygons, frontP, backP);
 		}
 		if (frontP.size() > 0) {
 			if (this.front == null) {
@@ -289,4 +289,14 @@ public final void build(List<Polygon> polygons, long depth, long maxDepth) {
 			this.back.build(backP, depth + 1,maxDepth);
 		}
 	}
+
+	public Plane getPlane() {
+		return plane;
+	}
+
+	public void setPlane(Plane plane) {
+		if(plane==null)
+			throw new RuntimeException("Plane can not be null!");
+		this.plane = plane;
+	}
 }

src/main/java/eu/mihosoft/vrl/v3d/Polygon.java

@@ -832,6 +832,8 @@ public Plane getPlane() {
 	}
 
 	public void setPlane(Plane plane) {
+		if(plane==null)
+			throw new RuntimeException("Plane can not be null!");
 		this.plane = plane;
 	}
 }