From 5cf631a183e794deb9dd9d74c401d4c54ce17a9a Mon Sep 17 00:00:00 2001 From: Kevin harrington Date: Sat, 11 Jan 2025 14:15:47 -0500 Subject: [PATCH] Set the color of the extrusions based on the SVG color for the polygon --- build.gradle | 2 +- .../bowlerstudio/scripting/cadoodle/Sweep.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8fa14070..0802beec 100755 --- a/build.gradle +++ b/build.gradle @@ -156,7 +156,7 @@ repositories { dependencies { - api 'com.neuronrobotics:JavaCad:2.1.1' + api 'com.neuronrobotics:JavaCad:2.2.0' api project('java-bowler') api project('GithubPasswordManager:GithubPasswordManager') diff --git a/src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Sweep.java b/src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Sweep.java index 4b436977..e3597627 100644 --- a/src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Sweep.java +++ b/src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Sweep.java @@ -28,6 +28,7 @@ import eu.mihosoft.vrl.v3d.parametrics.LengthParameter; import eu.mihosoft.vrl.v3d.parametrics.StringParameter; import eu.mihosoft.vrl.v3d.svg.SVGLoad; +import javafx.scene.paint.Color; public class Sweep extends AbstractAddFrom{ @Expose(serialize = true, deserialize = true) @@ -211,7 +212,12 @@ public File getFile() throws NoSuchFileException { private CSG processGiven( Polygon p, Bounds b, int j, String name) { + Color c=p.getColor(); + if(c==null) + c=Color.ROSYBROWN; + boolean hole = p.isHole(); CSG csg = sweep(p,name,b); + Transform nrToCSG = TransformFactory.nrToCSG(getLocation()); String pathname; try { @@ -233,6 +239,8 @@ private CSG processGiven( Polygon p, Bounds b, int j, String name) { .setParameter(angle) .setParameter(z) .setParameter(radius) + .setColor(c) + .setIsHole(hole) .setRegenerate(previous -> { try { File file = getFile();