Add hull to the client server system

Author: madhephaestus

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

@@ -878,6 +878,7 @@ public CSG dumbUnion(CSG csg) {
 	public CSG union(List<CSG> csgs) {
 			if (CSGClient.isRunning()) {
 				ArrayList<CSG> go = new ArrayList<CSG>(csgs);
+				go.add(this);
 				try {
 					return CSGClient.getClient().union(go).get(0);
 				} catch (Exception e) {

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

@@ -11,7 +11,7 @@
 import java.security.cert.X509Certificate;
 
 //CSG Client class that maintains connection and provides clean API
-class CSGClient {
+public class CSGClient {
 	// statics
 	private static CSGClient client = null;
 
@@ -71,7 +71,9 @@ public void checkServerTrusted(X509Certificate[] certs, String authType) {
 	public ArrayList<CSG> union(List<CSG> csgList) throws Exception {
 		return performOperation(csgList, CSGRemoteOperation.UNION);
 	}
-
+	public ArrayList<CSG> hull(List<Vector3d> points, PropertyStorage storage) throws Exception  {
+		return performOperation(new ArrayList<CSG>(), CSGRemoteOperation.hull,points,storage);
+	}
 	/**
 	 * Perform difference operations on consecutive CSG pairs
 	 * 
@@ -119,11 +121,16 @@ public ArrayList<CSG> minkowskiHullShape(ArrayList<CSG> csgList) throws Exceptio
 	public ArrayList<CSG> triangulate(ArrayList<CSG> csgList) throws Exception {
 		return performOperation(csgList, CSGRemoteOperation.TRIANGULATE);
 	}
-
 	/**
 	 * Internal method to perform operations and handle request/response
 	 */
-	private ArrayList<CSG> performOperation(List<CSG> csgList, CSGRemoteOperation operation) throws Exception {
+	private ArrayList<CSG> performOperation(List<CSG> csgList, CSGRemoteOperation operation)throws Exception{
+		return performOperation(csgList,operation,null,null);
+	}
+	/**
+	 * Internal method to perform operations and handle request/response
+	 */
+	private ArrayList<CSG> performOperation(List<CSG> csgList, CSGRemoteOperation operation,List<Vector3d> points, PropertyStorage storage) throws Exception {
 		ArrayList<CSG> back = null;
 		SSLSocket socket = (SSLSocket) factory.createSocket(hostname, port);
 		try {
@@ -142,7 +149,7 @@ private ArrayList<CSG> performOperation(List<CSG> csgList, CSGRemoteOperation op
 				tmp.setRegenerate(null);
 				toSend.add(tmp);
 			}
-			CSGRequest request = new CSGRequest(toSend, operation);
+			CSGRequest request = new CSGRequest(toSend, operation,points,storage);
 			if (key != null)
 				request.setAPIKEY(key);
 			oos.writeObject(request);

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

@@ -4,5 +4,5 @@ public enum CSGRemoteOperation {
 	   UNION,
 	    DIFFERENCE,
 	    INTERSECT,
-	    TRIANGULATE, minkowskiHullShape
+	    TRIANGULATE, minkowskiHullShape,hull
 }

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

@@ -9,13 +9,17 @@ class CSGRequest implements Serializable {
 	private List<CSG> csgList;
 	private CSGRemoteOperation operation;
 	private String APIKEY;
+	private List<Vector3d> points;
+	private PropertyStorage storage;
 
 	public CSGRequest() {
 		this.csgList = new ArrayList<>();
 		this.operation = CSGRemoteOperation.UNION;
 	}
 
-	public CSGRequest(List<CSG> csgList, CSGRemoteOperation operation) {
+	public CSGRequest(List<CSG> csgList, CSGRemoteOperation operation,List<Vector3d> points, PropertyStorage storage) {
+		this.setPoints(points);
+		this.setStorage(storage);
 		this.csgList = csgList != null ? new ArrayList<>(csgList) : new ArrayList<>();
 		this.operation = operation != null ? operation : CSGRemoteOperation.UNION;
 	}
@@ -48,4 +52,20 @@ public String getAPIKey() {
 	public void setAPIKEY(String aPIKEY) {
 		APIKEY = aPIKEY;
 	}
+
+	public List<Vector3d> getPoints() {
+		return points;
+	}
+
+	public void setPoints(List<Vector3d> points) {
+		this.points = points;
+	}
+
+	public PropertyStorage getStorage() {
+		return storage;
+	}
+
+	public void setStorage(PropertyStorage storage) {
+		this.storage = storage;
+	}
 }

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

@@ -9,6 +9,8 @@
 
 import javax.net.ssl.SSLSocket;
 
+import eu.mihosoft.vrl.v3d.ext.quickhull3d.HullUtil;
+
 class CSGServerHandler implements Runnable {
 	private SSLSocket clientSocket;
 
@@ -113,6 +115,9 @@ private CSGResponse processCSGRequest(CSGRequest request) {
 				CSG t = csgList.remove(0);
 				back.addAll(m1.minkowskiHullShape(t));
 				break;
+			case hull:
+				back.add(HullUtil.hull(request.getPoints(), request.getStorage()));
+				break;
 			default:
 				throw new RuntimeException("No Such Operation " + request.getOperation());
 			}

src/main/java/eu/mihosoft/vrl/v3d/ext/quickhull3d/HullUtil.java

@@ -6,10 +6,12 @@
 package eu.mihosoft.vrl.v3d.ext.quickhull3d;
 
 import eu.mihosoft.vrl.v3d.CSG;
+import eu.mihosoft.vrl.v3d.CSGClient;
 import eu.mihosoft.vrl.v3d.Vector3d;
 import eu.mihosoft.vrl.v3d.Polygon;
 import eu.mihosoft.vrl.v3d.PropertyStorage;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -58,7 +60,16 @@ public static CSG hull(List<?> points) {
 	 * @return the csg
 	 */
 	public static CSG hull(List<Vector3d> points, PropertyStorage storage) {
-
+			if (CSGClient.isRunning()) {
+				try {
+					CSG csg = CSGClient.getClient().hull(points,new PropertyStorage()).get(0);
+					csg.setStorage(storage);
+					return csg;
+				} catch (Exception e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
 		Point3d[] hullPoints = points.stream().map((vec) -> new Point3d(vec.x, vec.y, vec.z)).toArray(Point3d[]::new);
 
 		QuickHull3D hull = new QuickHull3D();

src/test/java/eu/mihosoft/vrl/v3d/ServerClientTest.java

@@ -37,7 +37,7 @@ public void test() throws Exception {
 		// Create client with try-with-resources for automatic cleanup
 		try {
 
-			CSG a = new Cube(20).toCSG();
+			CSG a = new Cube(20).toCSG().movex(100).movez(100);
 			a.getBounds();
 			a.setManipulator(new javafx.scene.transform.Affine());
 			a.setManufacturing(new PrepForManufacturing() {
@@ -58,6 +58,7 @@ public CSG prep(CSG incoming) {
 			CSG d1 = a.difference(b);
 			CSG t1 = d1.clone().triangulate(true);
 			ArrayList<CSG> m1 = a.minkowskiHullShape(b);
+			CSG h1 = u1.hull();
 
 			CSGClient.start(hostname, port, f);
 			// Set a low number to ensure the Server is used. this defaults to 200
@@ -83,6 +84,9 @@ public CSG prep(CSG incoming) {
 					fail();
 				}
 			}
+			CSG h = u1.hull();
+			if(h.getPolygons().size()!=h1.getPolygons().size())
+				fail();
 			CSGClient.close();
 		} catch (Exception e) {
 			System.err.println("Communication error: " + e.getMessage());