pull in the rounding fix from @breiler#61
pull in the rounding fix from @breiler#61madhephaestus wants to merge 12 commits intoNeuronRobotics:developmentfrom
Conversation
Using plain java to build
# Conflicts: # jcsg-core/src/test/java/eu/mihosoft/vrl/v3d/StlExportTest.java # jcsg-core/src/test/java/eu/mihosoft/vrl/v3d/StlLoadTest.java # jcsg-javafx/src/main/java/eu/mihosoft/vrl/v3d/javafx/thumbnail/ThumbnailImage.java
# Conflicts: # .gitignore # build.gradle # jcsg-core/src/main/java/com/piro/bezier/Bezier.java # jcsg-core/src/main/java/com/piro/bezier/BezierHistory.java # jcsg-core/src/main/java/com/piro/bezier/BezierPath.java # jcsg-core/src/main/java/eu/mihosoft/vrl/v3d/CSG.java # jcsg-core/src/main/java/eu/mihosoft/vrl/v3d/Text3d.java # jcsg-core/src/test/java/eu/mihosoft/vrl/v3d/ParallelComputeTest.java # jcsg-core/src/test/java/eu/mihosoft/vrl/v3d/TextTest.java # jcsg-javafx/src/main/java/eu/mihosoft/vrl/v3d/javafx/ext/openjfx/importers/Optimizer.java # src/main/java/eu/mihosoft/vrl/v3d/TextExtrude.java
|
@breiler Specifically I would like to be able to merge excellent fixes like this: 9de7837#diff-2ee73e55edd59363fb21e684f922fbba11f6efe06243e517f37420d4df175560 and this 3965876 into the mainlaine. Can we work out a strategy to make fixes mergable upstream? Maybe you have a development branch that follows this repos development for code fixes, and another branch for your build and deployment changes? |
|
I am not sure that this is a problem when using JavaFX text graphics. My main goal was to not depend on the JavaFX-library since it can't be packaged for multi OS distribution. I had to do a bunch of hacks to move code that is dependant on it which I am not proud of (ie: https://github.com/breiler/jcsg/blob/master/jcsg-javafx/src/main/java/eu/mihosoft/vrl/v3d/javafx/Mesh.java). So if you are willing to have the library split up there would not be a need for my fork. |
2 participants
@breiler I would love to add this fix in!