Make lighting work on MacOSX

Author: breiler

ugs-fx/build-linux-x64.sh

@@ -13,7 +13,7 @@ if [ -z ${PROJECT_VERSION} ]; then echo "Missing PROJECT_VERSION"; exit 1; fi
 if [ -z ${APP_VERSION} ]; then echo "Missing APP_VERSION"; exit 1; fi
 
 # Download JVM
-JVM=zulu17.50.19-ca-fx-jdk17.0.11-linux_x64
+JVM=zulu21.42.19-ca-fx-jdk21.0.7-linux_x64
 set -e
 ZIP=$JVM.tar.gz
 export JAVA_HOME=.jdks/$JVM

ugs-fx/build-macosx-aarch64.sh

@@ -13,7 +13,7 @@ if [ -z ${PROJECT_VERSION} ]; then echo "Missing PROJECT_VERSION"; exit 1; fi
 if [ -z ${APP_VERSION} ]; then echo "Missing APP_VERSION"; exit 1; fi
 
 # Download JVM
-JVM=zulu17.58.21-ca-fx-jdk17.0.15-macosx_aarch64
+JVM=zulu21.42.19-ca-fx-jdk21.0.7-macosx_aarch64
 set -e
 ZIP=$JVM.tar.gz
 export JAVA_HOME=.jdks/$JVM

ugs-fx/build-macosx-x64.sh

@@ -13,7 +13,7 @@ if [ -z ${PROJECT_VERSION} ]; then echo "Missing PROJECT_VERSION"; exit 1; fi
 if [ -z ${APP_VERSION} ]; then echo "Missing APP_VERSION"; exit 1; fi
 
 # Download JVM
-JVM=zulu17.58.21-ca-fx-jdk17.0.15-macosx_x64
+JVM=zulu21.42.19-ca-fx-jdk21.0.7-macosx_x64
 set -e
 ZIP=$JVM.tar.gz
 export JAVA_HOME=.jdks/$JVM

ugs-fx/build-windows-x64.bat

@@ -16,7 +16,7 @@ if "%APP_VERSION%"=="" (
 )
 
 :: ----------- DOWNLOAD JVM ------------------------------------------------
-set JVM=zulu17.50.19-ca-fx-jdk17.0.11-win_x64
+set JVM=zulu21.42.19-ca-fx-jdk21.0.7-win_x64
 set ZIP=%JVM%.zip
 set JAVA_HOME=.jdks\%JVM%
 
@@ -90,6 +90,6 @@ for %%s in ("msi" "exe") do call "%JAVA_HOME%\bin\jpackage" ^
   --license-file ..\COPYING ^
   --about-url https://universalgcodesender.com/
 
-move "target\installer\Universal G-code Sender*.exe" "target\installer\ugs-%APP_VERSION%.exe"
-move "target\installer\Universal G-code Sender*.msi" "target\installer\ugs-%APP_VERSION%.msi"
+move "target\installer\Universal G-code Sender*.exe" "target\installer\ugs-%APP_VERSION%-x64.exe"
+move "target\installer\Universal G-code Sender*.msi" "target\installer\ugs-%APP_VERSION%-x64.msi"
 echo Done.

ugs-fx/pom.xml

@@ -16,7 +16,7 @@
     <url>https://github.com/winder/Universal-G-Code-Sender/tree/master/ugs-fx</url>
 
     <properties>
-        <javafx.version>17.0.13</javafx.version>
+        <javafx.version>21.0.7</javafx.version>
         <exec.maven.plugin.version>3.5.0</exec.maven.plugin.version>
     </properties>
 

ugs-fx/src/main/java/com/willwinder/universalgcodesender/fx/visualizer/Tool.java

@@ -92,10 +92,13 @@ public MeshView createCone(float radius, float height, int divisions, Color colo
 
         // Create MeshView and material
         MeshView cone = new MeshView(mesh);
-        cone.setDrawMode(DrawMode.FILL); // or DrawMode.LINE for wireframe
+        cone.setDrawMode(DrawMode.FILL);
         cone.setCullFace(CullFace.BACK);
 
-        PhongMaterial material = new PhongMaterial(color);
+        PhongMaterial material = new PhongMaterial();
+        material.setDiffuseColor(color);
+        material.setSpecularColor(Color.WHITE);
+        material.setSpecularPower(32);
         cone.setMaterial(material);
 
         return cone;

ugs-fx/src/main/java/com/willwinder/universalgcodesender/fx/visualizer/Visualizer.java

@@ -1,12 +1,13 @@
 package com.willwinder.universalgcodesender.fx.visualizer;
 
 import javafx.application.Platform;
+import javafx.geometry.Point3D;
 import javafx.scene.AmbientLight;
 import javafx.scene.Camera;
+import javafx.scene.DirectionalLight;
 import javafx.scene.Group;
 import javafx.scene.ParallelCamera;
 import javafx.scene.PerspectiveCamera;
-import javafx.scene.PointLight;
 import javafx.scene.SceneAntialiasing;
 import javafx.scene.SubScene;
 import javafx.scene.input.MouseButton;
@@ -36,15 +37,12 @@ public Visualizer() {
         rotateGroup.getTransforms().addAll(rotateX, rotateY, new Rotate(180, Rotate.Z_AXIS));
 
         // Lighting
-        PointLight light = new PointLight(Color.WHITE);
-        light.setTranslateX(-200);
-        light.setTranslateY(-100);
-        light.setTranslateZ(-100);
+        DirectionalLight light = new DirectionalLight(Color.WHITE);
+        light.setDirection(new Point3D(1, -1, -1));
         light.getScope().addAll(tool);
 
-
         // Root group applies panning
-        AmbientLight ambient = new AmbientLight(Color.rgb(210, 210, 210));
+        AmbientLight ambient = new AmbientLight(Color.rgb(255, 255, 255));
         root3D = new Group(rotateGroup, ambient, light);
         root3D.getTransforms().add(translate);
 
@@ -149,4 +147,4 @@ public void setCameraPosition(double x, double y, double z) {
         cameraTranslate.setY(y);
         cameraTranslate.setZ(z);
     }
-}
+}