Merge branch 'development' of github.com:NeuronRobotics/JCSG into dev…

…elopment
NeuronRobotics · Dec 27, 2024 · 552527a · 552527a
2 parents 7f6af18 + cf25ced
commit 552527a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/eu/mihosoft/vrl/v3d/CSG.java b/src/main/java/eu/mihosoft/vrl/v3d/CSG.java
@@ -2570,6 +2570,9 @@ public CSG setRegenerate(IRegenerate function) {
 		regenerate = function;
 		return this;
 	}
+	public IRegenerate getRegenerate() {
+		return regenerate ;
+	}
 
 	public CSG regenerate() {
 		this.markForRegeneration = false;
@@ -3151,6 +3154,7 @@ public boolean isHole() {
 
 	public CSG syncProperties(CSG dying) {
 		getStorage().syncProperties(dying.getStorage());
+		regenerate=dying.regenerate;
 		return this;
 	}
 

diff --git a/src/main/java/eu/mihosoft/vrl/v3d/PropertyStorage.java b/src/main/java/eu/mihosoft/vrl/v3d/PropertyStorage.java
@@ -33,6 +33,7 @@
  */
 package eu.mihosoft.vrl.v3d;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -122,6 +123,12 @@ public void syncProperties(PropertyStorage dying) {
     			HashSet<String> clonedSet =  new HashSet<String>();
     			clonedSet.addAll((HashSet<String>)property);
     			property=clonedSet;	
+    		}
+    		if(ArrayList.class.isInstance(property)) {
+    			Object clonedSet =  map.get(o);
+    			ArrayList<String> newList = clonedSet==null?new ArrayList<String>():(ArrayList<String>)clonedSet;
+    			newList.addAll((ArrayList<String>)property);
+    			property=newList;	
     		}
 			set(o,property);
     	}

diff --git a/src/test/java/eu/mihosoft/vrl/v3d/StlExportTest.java b/src/test/java/eu/mihosoft/vrl/v3d/StlExportTest.java
@@ -12,8 +12,8 @@ public class StlExportTest {
 
 	@Test
 	public void makeBadSTL() throws IOException {
-		//Plane.setEPSILON(1.0e-11);
-		//Vector3d.setEXPORTEPSILON(10);
+		Plane.setEPSILON(1.0e-12);
+		Vector3d.setEXPORTEPSILON(1.0e-9);
 		CSG.setUseGPU(false);
 		CSG.setPreventNonManifoldTriangles(true);
 		CSG badExport2 = CSG.text(" A QUICK BROWN FOX JUMPS OVER THE LAZY DOG", 10,30,"Serif Regular").movey(30);