Changelog from upsteam

.gitignore

@@ -1,4 +1,9 @@
 /build/
 /.gradle/
 /.idea/
-/.nb-gradle/
+/.nb-gradle/
+/bin/
+/.settings/
+/.classpath
+/.project
+/.vscode/

.travis.yml

@@ -2,12 +2,16 @@ sudo: false
 
 language: java
 jdk:
-  - oraclejdk8
+  #- oraclejdk8
+  #- oraclejdk9
+  - openjdk11
+  - openjdk12
+  # - oraclejdk10 openjdk 10 is broken on travis (maybe they use the wrong download link?)
 
-before_install:
-  - "export DISPLAY=:99.0"
-  - "export TERM=dumb"
-  - "sh -e /etc/init.d/xvfb start"
+# before_install:
+#   - "export DISPLAY=:99.0"
+#   - "export TERM=dumb"
+#   - "sh -e /etc/init.d/xvfb start"
 
 install:
     - TERM=dumb ./gradlew --refresh-dependencies --stacktrace

README.md

@@ -1,10 +1,21 @@
 JCSG
 =======
 
-[![Build Status](https://travis-ci.org/miho/JCSG.png?branch=master)](https://travis-ci.org/miho/JCSG) [ ![Download](https://api.bintray.com/packages/miho/JCSG/jcsg/images/download.svg) ](https://bintray.com/miho/JCSG/jcsg/_latestVersion)
+[![Build Status](https://travis-ci.org/miho/JCSG.png?branch=master)](https://travis-ci.org/miho/JCSG)
+[![Javadocs](https://www.javadoc.io/badge/eu.mihosoft.vrl.jcsg/jcsg.svg)](https://www.javadoc.io/doc/eu.mihosoft.vrl.jcsg/jcsg)
+<a href="https://foojay.io/today/works-with-openjdk">
+   <img align="right" 
+        src="https://github.com/foojayio/badges/raw/main/works_with_openjdk/Works-with-OpenJDK.png"   
+        width="100">
+</a>
+
+<br>
+
 
 Java implementation of BSP based CSG (Constructive Solid Geometry). It is the only simple and free Java implementation I am aware of. This implementation uses an optimized CSG algorithm based on [csg.js](https://github.com/evanw/csg.js) (see `CSG` and `Node` classes). Thanks to the author for creating the [csg.js](https://github.com/evanw/csg.js) library.
 
+There's also the related [VCSG](https://github.com/miho/VCSG) library, a [plugin for VRL-Studio](https://github.com/VRL-Studio/VRL-JCSG) and two extension libraries: [JCSG-MeshExtension](https://github.com/miho/JCSG-MeshExtensions) and [JCSG-PathExtension](https://github.com/miho/JCSG-PathExtensions).
+
 In addition to CSG this library provides the following features:
 
 - optimized `difference()` and `union()` operations (many thanks to Sebastian Reiter)
@@ -28,7 +39,7 @@ To see what's possible with JCSG try [JFXScad](https://github.com/miho/JFXScad).
 
 ### Requirements
 
-- Java >= 1.8
+- Java >= 11
 - Internet connection (dependencies are downloaded automatically)
 - IDE: [Gradle](http://www.gradle.org/) Plugin (not necessary for command line usage)
 
@@ -43,7 +54,7 @@ Navigate to the [Gradle](http://www.gradle.org/) project (e.g., `path/to/JCSG`)
 
 #### Bash (Linux/OS X/Cygwin/other Unix-like shell)
 
-    sh gradlew assemble
+    bash gradlew assemble
 
 #### Windows (CMD)
 
@@ -80,3 +91,9 @@ try {
     Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
 }
 ```
+
+## Thanks to
+
+ - [JetBrains](https://www.jetbrains.com) for their [IntelliJ IDEA](https://www.jetbrains.com/idea/) license(s)
+
+ - Evan Wallace for creating the JavaScript library [csg.js](https://github.com/evanw/csg.js)

build.gradle

@@ -2,18 +2,19 @@ plugins {
     id 'application'
     id 'java'
     id 'maven-publish'
-    id 'net.nemerosa.versioning' version '1.5.0'
-    id 'com.jfrog.bintray' version '1.6'
+    id 'org.openjfx.javafxplugin' version '0.0.7'
+    //id 'net.nemerosa.versioning' version '2.8.2'
+    id 'com.jfrog.bintray' version '1.8.4'
 }
 
-sourceCompatibility = '1.8'
+sourceCompatibility = '11'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 //apply from: 'http://gradle-plugins.mihosoft.eu/latest/vlicenseheader.gradle'
 //repairHeaders.licenseHeaderText = new File(projectDir,'./license-template.txt')
 
-task wrapper(type: Wrapper, description: 'Creates and deploys the Gradle wrapper to the current directory.') {
-    gradleVersion = '3.3'
+wrapper {
+    gradleVersion = '6.4'
 }
 
 if (!hasProperty('mainClass')) {
@@ -26,6 +27,8 @@ mainClassName = mainClass
 repositories {
     mavenCentral()
     jcenter()
+
+    mavenLocal()
 }
 
 // javadoc is way too strict for my taste.
@@ -60,10 +63,10 @@ dependencies {
 
     testCompile group: 'junit', name: 'junit', version: '4.+'
 
-    compile group: 'eu.mihosoft.ext.org.fxyz', name: 'extfxyz', version: '0.4'
-    compile group: 'eu.mihosoft.ext.org.fxyz', name: 'extfxyz', version: '0.4', classifier: 'sources'
-    compile group: 'eu.mihosoft.vvecmath', name: 'vvecmath', version: '0.3.2'
-    compile group: 'eu.mihosoft.vvecmath', name: 'vvecmath', version: '0.3.2', classifier: 'sources'
+   // compile group: 'eu.mihosoft.ext.org.fxyz', name: 'extfxyz', version: '0.4'
+    //compile group: 'eu.mihosoft.ext.org.fxyz', name: 'extfxyz', version: '0.4', classifier: 'sources'
+    compile group: 'eu.mihosoft.vvecmath', name: 'vvecmath', version: '0.3.8'
+    compile group: 'eu.mihosoft.vvecmath', name: 'vvecmath', version: '0.3.8', classifier: 'sources'
     compile 'org.slf4j:slf4j-simple:1.6.1'
 }
 
@@ -94,15 +97,24 @@ jar {
           'Created-By': System.properties['java.version'] + " (" + System.properties['java.vendor'] + " " + System.properties['java.vm.version'] + ")",
           'Build-Date': project.buildDate,
           'Build-Time': project.buildTime,
-          'Build-Revision': versioning.info.commit,
+          //'Build-Revision': versioning.info.commit,
           'Specification-Title': project.name,
           'Specification-Version': project.version,
           'Implementation-Title': project.name,
-          'Implementation-Version': project.version
+          'Implementation-Version': project.version,
+          'Automatic-Module-Name': "eu.mihosoft.jcsg"
         )
     }
 }
 
+javafx {
+    modules = [ 'javafx.graphics', 'javafx.fxml']
+}
+
+test {
+    maxHeapSize = '2G'
+}
+
 
 def pomConfig = {
     name 'jcsg'

gradle.properties

@@ -1,2 +1,2 @@
 group   = eu.mihosoft.vrl.jcsg
-version = 0.5.2
+version = 0.5.8-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Feb 03 21:44:21 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip

gradlew

@@ -1,4 +1,20 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
 ##
@@ -28,16 +44,16 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,16 +170,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"