Merge pull request #481 from CommonWealthRobotics/manifold3d-test

Manifold3d test

Author: madhephaestus

.github/workflows/release.yml

@@ -49,9 +49,6 @@ jobs:
       with:
         java-version: 21
         jdkFile: zulu21.46.19-ca-fx-jdk21.0.9-linux_x64.tar.gz
-
-    - name: Run Unit Tests
-      run: xvfb-run -s '-screen 0 1024x768x24' ./gradlew test     
     - name: release
       uses: actions/create-release@v1
       id: create_release

build.gradle

@@ -421,7 +421,17 @@ jar {
 				)
 	}
 }
+tasks.withType(JavaCompile).configureEach {
+	options.compilerArgs += ['--enable-preview']
+}
+
+tasks.withType(Test).configureEach {
+	jvmArgs '--enable-preview'
+}
 
+tasks.withType(JavaExec).configureEach {
+	jvmArgs '--enable-preview'
+}
 task ('showAll') {
 	doLast {
 		allprojects.each {

jvm.json

@@ -4,7 +4,7 @@
 			  ,
 			  "type":"tar.gz",
 			  "name":"zulu21.46.19-ca-fx-jdk21.0.9-linux_x64",
-			  "jvmargs":["-Dprism.forceGPU=true","-XX:MaxRAMPercentage=90.0",	"--add-exports",
+			  "jvmargs":["--enable-preview","-Dprism.forceGPU=true","-XX:MaxRAMPercentage=90.0",	"--add-exports",
 	"javafx.graphics/com.sun.javafx.css=ALL-UNNAMED",
 	"--add-exports",
 	"javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED",
@@ -26,7 +26,7 @@
 			  ,
 			  "type":"tar.gz",
 			  "name":"zulu17.52.17-ca-fx-jdk17.0.12-linux_aarch64",
-			  "jvmargs":["-Dprism.forceGPU=true","-XX:MaxRAMPercentage=90.0",	"--add-exports",
+			  "jvmargs":["--enable-preview","-Dprism.forceGPU=true","-XX:MaxRAMPercentage=90.0",	"--add-exports",
 	"javafx.graphics/com.sun.javafx.css=ALL-UNNAMED",
 	"--add-exports",
 	"javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED",
@@ -48,7 +48,7 @@
 			  ,
 			  "type":"zip",
 			  "name":"zulu21.46.19-ca-fx-jdk21.0.9-win_x64",
-			  "jvmargs":["-XX:MaxRAMPercentage=90.0",	"--add-exports",
+			  "jvmargs":["--enable-preview","-XX:MaxRAMPercentage=90.0",	"--add-exports",
 	"javafx.graphics/com.sun.javafx.css=ALL-UNNAMED",
 	"--add-exports",
 	"javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED",
@@ -70,7 +70,7 @@
 			  ,
 			  "type":"zip",
 			  "name":"zulu21.46.19-ca-fx-jdk21.0.9-macosx_x64",
-			  "jvmargs":["-Dprism.forceGPU=true","-XX:MaxRAMPercentage=90.0",	"--add-exports",
+			  "jvmargs":["--enable-preview","-Dprism.forceGPU=true","-XX:MaxRAMPercentage=90.0",	"--add-exports",
 	"javafx.graphics/com.sun.javafx.css=ALL-UNNAMED",
 	"--add-exports",
 	"javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED",
@@ -92,7 +92,7 @@
 			  ,
 			  "type":"zip",
 			  "name":"zulu21.46.19-ca-fx-jdk21.0.9-macosx_aarch64",
-			  "jvmargs":["-Dprism.forceGPU=true","-XX:MaxRAMPercentage=90.0",	"--add-exports",
+			  "jvmargs":["--enable-preview","-Dprism.forceGPU=true","-XX:MaxRAMPercentage=90.0",	"--add-exports",
 	"javafx.graphics/com.sun.javafx.css=ALL-UNNAMED",
 	"--add-exports",
 	"javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED",

libraries/bowler-script-kernel

@@ -40,6 +40,7 @@
 import com.neuronrobotics.sdk.config.SDKBuildInfo;
 import com.neuronrobotics.sdk.util.ThreadUtil;
 import eu.mihosoft.vrl.v3d.CSG;
+import eu.mihosoft.vrl.v3d.CSG.OptType;
 import eu.mihosoft.vrl.v3d.parametrics.CSGDatabase;
 import eu.mihosoft.vrl.v3d.parametrics.CSGDatabaseInstance;
 import javafx.application.Application;
@@ -132,7 +133,7 @@ public static void main(String[] args) throws Exception {
 			// TODO Auto-generated catch block
 			Log.error(e);
 		}
-
+		CSG.setDefaultOptType(OptType.Manifold3d);
 		DownloadManager.setSTUDIO_INSTALL("BowlerStudioInstall");
 
 		if (args.length != 0) {

src/main/java/com/neuronrobotics/bowlerstudio/BowlerStudio.java

@@ -1660,6 +1660,7 @@ public void onLogin(String arg0) {
 		new Thread(r).start();
 
 		CreatureLab3dController.getEngine().setControls(showRuler, idlespin, autohighlight);
+		CreatureLab3dController.getEngine().reattachMouseHandlers();
 		WindowMenu.getItems().addAll(showRuler, idlespin, autohighlight, showCSGProgress, useAdvancedSTL);
 
 		new Thread() {

src/main/java/com/neuronrobotics/bowlerstudio/BowlerStudioMenu.java

@@ -165,19 +165,15 @@ void initialize() {
 
 	private void setupUi() {
 		BowlerStudio.runLater(() -> {
-			getEngine().getSubScene().setFocusTraversable(false);
-			getEngine().getSubScene().widthProperty().bind(viewContainer.widthProperty());
-			getEngine().getSubScene().heightProperty().bind(viewContainer.heightProperty());
+			getEngine().setFocusTraversable(false);
+			getEngine().bind(viewContainer);
 		});
 		BowlerStudio.runLater(() -> {
 			Group controlsBox = getEngine().getControlsBox(AssetFactory.loadIcon("Home-Camera.png"),
 					AssetFactory.loadIcon("Generate-Cad.png"), AssetFactory.loadIcon("Clear-Screen.png"));
 			jfx3dControls.getChildren().add(controlsBox);
-			viewContainer.getChildren().add(getEngine().getSubScene());
-			AnchorPane.setTopAnchor(getEngine().getSubScene(), 0.0);
-			AnchorPane.setRightAnchor(getEngine().getSubScene(), 0.0);
-			AnchorPane.setLeftAnchor(getEngine().getSubScene(), 0.0);
-			AnchorPane.setBottomAnchor(getEngine().getSubScene(), 0.0);
+			getEngine().addTo(viewContainer);
+			getEngine().handleMouse(viewContainer);
 		});
 	}
 

src/main/java/com/neuronrobotics/bowlerstudio/CreatureLab3dController.java

@@ -3,6 +3,8 @@
 import java.awt.Graphics2D;
 import java.util.function.BooleanSupplier;
 
+import org.jfree.util.Log;
+
 public class SplashManager {
 	private static Graphics2D splashGraphics;
 
@@ -20,8 +22,10 @@ private static void closeSplashLocal() {
 			splashGraphics = null;
 			return;
 		}
-		if (closePreventer.getAsBoolean())
+		if (closePreventer.getAsBoolean()) {
+			Log.debug("Close prevented by " + closePreventer);
 			return;
+		}
 		PsudoSplash.close();
 	}