diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9400df575..d473bf180 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,12 +47,6 @@ jobs: run: export DISPLAY=:99 - - name: Pull a JavaFX JDK - run: wget http://static.azul.com/zulu/bin/zulu8.44.0.13-ca-fx-jdk8.0.242-linux_x64.tar.gz - - - name: After JDK download, list directory contnts - run: pwd; ls -la - - name: Build with Gradle run: bash makeJar.sh diff --git a/.gitignore b/.gitignore index 56dbf75f5..ef7f47305 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /MUJOCO_LOG.TXT /physicsTest/ /zulu8.*.tar.gz +/zulu17.50.19-ca-fx-jdk17.0.11-linux_x64.tar.gz diff --git a/build.gradle b/build.gradle index 2eb5a81fb..6ecd6d00c 100644 --- a/build.gradle +++ b/build.gradle @@ -11,9 +11,6 @@ buildscript { } ] } - dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0' - } } boolean is64Bit() { @@ -74,9 +71,12 @@ plugins { id 'signing' id 'application' id 'eclipse' + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id 'org.openjfx.javafxplugin' version '0.0.13'apply false } -apply plugin: 'com.github.johnrengelman.shadow' if (project == rootProject) { + apply plugin: 'com.github.johnrengelman.shadow' + apply plugin: 'org.openjfx.javafxplugin' apply plugin: 'application' }else { apply plugin: 'java-library' @@ -356,6 +356,9 @@ dependencies { // https://mvnrepository.com/artifact/com.fifesoft/rsyntaxtextarea implementation group: 'com.fifesoft', name: 'rsyntaxtextarea', version: '3.4.1' + // https://mvnrepository.com/artifact/eu.mihosoft.monacofx/monacofx + implementation("eu.mihosoft.monacofx:monacofx:0.0.8") + //compile 'org.bubblecloud.jbullet:jbullet:2.72.2.4' // https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-svggen implementation group: 'org.apache.xmlgraphics', name: 'batik-all', version: '1.17' @@ -441,17 +444,115 @@ eclipse{ } } } + +// Start cadoodle build transfer + +subprojects { + apply plugin: 'java' + apply plugin: 'eclipse' + sourceCompatibility = 1.8 + targetCompatibility = 17 + + eclipse { + classpath { + downloadSources = true + downloadJavadoc = true + file { + whenMerged { + entries.forEach { entry -> + if (entry.kind == 'lib') { + entry.entryAttributes['module'] = 'true' + } + } + } + } + } + jdt { + sourceCompatibility = 1.8 + targetCompatibility = 17 + } + } + + tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + options.compilerArgs << '-Xlint:deprecation' << '-Xlint:unchecked' + } +} + +subprojects { subproject -> + subproject.afterEvaluate { + if (subproject.plugins.hasPlugin('com.github.johnrengelman.shadow')) { + subproject.tasks.matching { it.name == 'shadowJar' }.all { + System.out.println("Disabling Shadowjar for "+it) + it.enabled = false + } + } + } +} + + +javafx { + version = '17' // or whichever version you're using + modules = [ + 'javafx.controls', + 'javafx.fxml', + 'javafx.graphics'] // add other modules as needed +} +tasks.withType(Test) { + useJUnitPlatform() + jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED' +} +def javafxOptions = [ + '--add-exports', 'javafx.graphics/com.sun.javafx.css=ALL-UNNAMED', + '--add-exports', 'javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED', + '--add-exports', 'javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED', + '--add-exports', 'javafx.base/com.sun.javafx.event=ALL-UNNAMED', + '--add-exports', 'javafx.controls/com.sun.javafx.scene.control.skin.resources=ALL-UNNAMED', + '--add-exports', 'javafx.graphics/com.sun.javafx.util=ALL-UNNAMED', + '--add-exports', 'javafx.graphics/com.sun.javafx.scene.input=ALL-UNNAMED', + '--add-opens','javafx.graphics/javafx.scene=ALL-UNNAMED', + '--add-opens','java.base/java.io=ALL-UNNAMED', + '--add-opens','java.base/java.lang=ALL-UNNAMED' +] +run { + jvmArgs = javafxOptions +} +application { + // Define the main class for the application. + mainClass = 'com.neuronrobotics.bowlerstudio.BowlerStudio' + applicationDefaultJvmArgs =javafxOptions +} + +tasks.withType(JavaCompile) { + options.compilerArgs += [ + '--add-modules', 'ALL-MODULE-PATH', + '--add-opens', 'java.base/java.lang=ALL-UNNAMED', + '--add-opens', 'java.base/java.io=ALL-UNNAMED' + ]+javafxOptions +} +tasks.named('test') { + // Use JUnit Platform for unit tests. + useJUnitPlatform() +} + shadowJar { + archiveBaseName.set('BowlerStudio') + archiveClassifier.set('') + archiveVersion.set('') zip64 true - mainClassName = 'com.neuronrobotics.bowlerstudio.BowlerStudio' - if (project == rootProject) { - baseName = 'BowlerStudio' - classifier = "" - }else { - archiveBaseName.set('BowlerStudio') - archiveClassifier.set('') - archiveVersion.set('') - } mergeServiceFiles() } +//shadowJar { +// zip64 true +// mainClassName = 'com.neuronrobotics.bowlerstudio.BowlerStudio' +// if (project == rootProject) { +// baseName = 'BowlerStudio' +// classifier = "" +// }else { +// archiveBaseName.set('BowlerStudio') +// archiveClassifier.set('') +// archiveVersion.set('') +// } +// mergeServiceFiles() +//} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f3d88b1c2..c1962a79e 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b7c8c5dbf..37aef8d3f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2fe81a7d9..aeb74cbb4 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,78 +17,110 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -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='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -97,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -105,79 +137,109 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -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" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat old mode 100755 new mode 100644 index 9109989e3..6689b85be --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +55,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,38 +65,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/libraries/bowler-script-kernel b/libraries/bowler-script-kernel index 6308afb14..ef74adbb5 160000 --- a/libraries/bowler-script-kernel +++ b/libraries/bowler-script-kernel @@ -1 +1 @@ -Subproject commit 6308afb14b9ef72796544dc7bf96823d00c1a99a +Subproject commit ef74adbb547c686819a67f777dd324fb77c91bad diff --git a/makeJar.sh b/makeJar.sh index 2cdf253b5..3d6e016e3 100644 --- a/makeJar.sh +++ b/makeJar.sh @@ -1,16 +1,24 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +name=$(jq -r '."Linux-x64".name' jvm.json) +type=$(jq -r '."Linux-x64".type' jvm.json) +url=$(jq -r '."Linux-x64".url' jvm.json) + +# Verify the variables were set correctly +echo "Name: $name" +echo "Type: $type" +echo "URL: $url" export ARCH=x86_64 -JVM=zulu8.78.0.19-ca-fx-jdk8.0.412-linux_x64 +JVM=$name set -e -ZIP=$JVM.tar.gz -export JAVA_HOME=$HOME/bin/java8/ +ZIP=$JVM.$type +export JAVA_HOME=$HOME/bin/java17/ if test -d $JAVA_HOME/$JVM/; then echo "$JAVA_HOME exists." else rm -rf $JAVA_HOME mkdir -p $JAVA_HOME - wget https://cdn.azul.com/zulu/bin/$ZIP + wget $url$ZIP tar -xvzf $ZIP -C $JAVA_HOME mv $JAVA_HOME/$JVM/* $JAVA_HOME/ fi diff --git a/runLinux.sh b/runLinux.sh new file mode 100644 index 000000000..b861d6af1 --- /dev/null +++ b/runLinux.sh @@ -0,0 +1,45 @@ +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +name=$(jq -r '."Linux-x64".name' jvm.json) +type=$(jq -r '."Linux-x64".type' jvm.json) +url=$(jq -r '."Linux-x64".url' jvm.json) + +# Verify the variables were set correctly +echo "Name: $name" +echo "Type: $type" +echo "URL: $url" + +export ARCH=x86_64 +JVM=$name +set -e +ZIP=$JVM.$type +export JAVA_HOME=$HOME/bin/java17/ +if test -d $JAVA_HOME/$JVM/; then + echo "$JAVA_HOME exists." +else + rm -rf $JAVA_HOME + mkdir -p $JAVA_HOME + wget $url$ZIP + tar -xvzf $ZIP -C $JAVA_HOME + mv $JAVA_HOME/$JVM/* $JAVA_HOME/ +fi +echo "Java home set to $JAVA_HOME" + +./gradlew clean shadowJar + +$JAVA_HOME/bin/java -Dprism.forceGPU=true --add-exports \ + javafx.graphics/com.sun.javafx.css=ALL-UNNAMED \ + --add-exports \ + javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED \ + --add-exports \ + javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED \ + --add-exports \ + javafx.base/com.sun.javafx.event=ALL-UNNAMED \ + --add-exports \ + javafx.controls/com.sun.javafx.scene.control.skin.resources=ALL-UNNAMED \ + --add-exports \ + javafx.graphics/com.sun.javafx.util=ALL-UNNAMED \ + --add-exports \ + javafx.graphics/com.sun.javafx.scene.input=ALL-UNNAMED \ + --add-opens \ + javafx.graphics/javafx.scene=ALL-UNNAMED \ + -jar build/libs/BowlerStudio.jar \ No newline at end of file diff --git a/src/main/java/com/neuronrobotics/bowlerstudio/tabs/LocalFileScriptTab.java b/src/main/java/com/neuronrobotics/bowlerstudio/tabs/LocalFileScriptTab.java index 8d416c3ee..40823d77a 100644 --- a/src/main/java/com/neuronrobotics/bowlerstudio/tabs/LocalFileScriptTab.java +++ b/src/main/java/com/neuronrobotics/bowlerstudio/tabs/LocalFileScriptTab.java @@ -46,6 +46,7 @@ import com.neuronrobotics.bowlerstudio.utils.FindTextWidget; import javafx.stage.Stage; import javafx.stage.WindowEvent; +import eu.mihosoft.monacofx.*; public class LocalFileScriptTab extends VBox implements IScriptEventListener, EventHandler { private static final int MaxTextSize = 75000; @@ -66,16 +67,12 @@ public void uncaughtException(Thread t, Throwable e) { private ScriptingFileWidget scripting; IScriptEventListener l = null; - + private int lineSelected = 0; private SwingNode swingNode; private RTextScrollPane spscrollPane; - private Highlighter highlighter; - private HighlightPainter painter; - private int lineSelected = 0; - - private MyRSyntaxTextArea textArea = new MyRSyntaxTextArea(200, 300); + private RSyntaxTextArea textArea = new RSyntaxTextArea(200, 300); private final File file; @@ -91,41 +88,7 @@ public void uncaughtException(Thread t, Throwable e) { BowlerStudio.invokeLater(() -> Thread.setDefaultUncaughtExceptionHandler(new IssueReportingExceptionHandler())); } - - public class MyRSyntaxTextArea extends RSyntaxTextArea implements ComponentListener { - - /** - * - */ - private static final long serialVersionUID = 1L; - - public MyRSyntaxTextArea() { - this.addComponentListener(this); - } - - public MyRSyntaxTextArea(int i, int j) { - super(i, j); - } - - public void componentResized(ComponentEvent e) { - com.neuronrobotics.sdk.common.Log.error("componentResized"); - - } - - public void componentHidden(ComponentEvent e) { - com.neuronrobotics.sdk.common.Log.error("componentHidden"); - } - - public void componentMoved(ComponentEvent e) { - com.neuronrobotics.sdk.common.Log.error("componentMoved"); - } - - public void componentShown(ComponentEvent e) { - com.neuronrobotics.sdk.common.Log.error("componentShown"); - } - - } - + MonacoFX text_Area = new MonacoFX(); public static void setExtentionSyntaxType(String shellType, String syntax) { langaugeMapping.put(shellType, syntax); } @@ -269,20 +232,20 @@ public void caretUpdate(CaretEvent e) { }); - textArea.addMouseListener(new MouseAdapter() { - public void mouseClicked(MouseEvent e) { - try { - if (e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() > 2) { - highlighter.removeAllHighlights(); - } - } catch (Throwable t) { - t.printStackTrace(); - } - // com.neuronrobotics.sdk.common.Log.error("Number of click: " + e.getClickCount()); - // com.neuronrobotics.sdk.common.Log.error("Click position (X, Y): " + e.getX() + ", - // " + e.getY()); - } - }); +// textArea.addMouseListener(new MouseAdapter() { +// public void mouseClicked(MouseEvent e) { +// try { +// if (e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() > 2) { +// highlighter.removeAllHighlights(); +// } +// } catch (Throwable t) { +// t.printStackTrace(); +// } +// // com.neuronrobotics.sdk.common.Log.error("Number of click: " + e.getClickCount()); +// // com.neuronrobotics.sdk.common.Log.error("Click position (X, Y): " + e.getX() + ", +// // " + e.getY()); +// } +// }); spscrollPane = new RTextScrollPane(textArea); @@ -291,23 +254,23 @@ public void mouseClicked(MouseEvent e) { getScripting().setFocusTraversable(false); - swingNode.setOnMouseEntered(mouseEvent -> { - // com.neuronrobotics.sdk.common.Log.error("On mouse entered " + file.getName()); - // resizeEvent(); - BowlerStudio.invokeLater(() -> { - resizeEvent(); - setSelectedTab(this); -// spscrollPane.setSize((int) spscrollPane.getWidth(), (int) spscrollPane.getHeight()); -// spscrollPane.invalidate(); -// spscrollPane.repaint(); -// textArea.invalidate(); -// textArea.repaint(); -// textArea.requestFocusInWindow(); -// FxTimer.runLater(Duration.ofMillis((int) 16), () -> { -// swingNode.requestFocus(); -// }); - }); - }); +// swingNode.setOnMouseEntered(mouseEvent -> { +// // com.neuronrobotics.sdk.common.Log.error("On mouse entered " + file.getName()); +// // resizeEvent(); +// BowlerStudio.invokeLater(() -> { +// resizeEvent(); +// //setSelectedTab(this); +//// spscrollPane.setSize((int) spscrollPane.getWidth(), (int) spscrollPane.getHeight()); +//// spscrollPane.invalidate(); +//// spscrollPane.repaint(); +//// textArea.invalidate(); +//// textArea.repaint(); +//// textArea.requestFocusInWindow(); +//// FxTimer.runLater(Duration.ofMillis((int) 16), () -> { +//// swingNode.requestFocus(); +//// }); +// }); +// }); // textArea // Set event listener to listen for CTRL+S and save file KeyStroke keystroke_s = KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_MASK); @@ -375,25 +338,25 @@ public void actionPerformed(ActionEvent e) { } private void resizeEvent() { - if (!((lastRefresh + 60) < System.currentTimeMillis()) - || spscrollPane.getVerticalScrollBar().getValueIsAdjusting() - || spscrollPane.getHorizontalScrollBar().getValueIsAdjusting()) { - return; - } - lastRefresh = System.currentTimeMillis(); - BowlerStudio.invokeLater(() -> { - spscrollPane.setSize((int) spscrollPane.getWidth(), (int) spscrollPane.getHeight()); - spscrollPane.invalidate(); - spscrollPane.repaint(); - textArea.invalidate(); - textArea.repaint(); - - textArea.requestFocusInWindow(); - BowlerStudio.runLater(Duration.ofMillis((int) 16), () -> { - swingNode.setContent(spscrollPane); - swingNode.requestFocus(); - }); - }); +// if (!((lastRefresh + 60) < System.currentTimeMillis()) +// || spscrollPane.getVerticalScrollBar().getValueIsAdjusting() +// || spscrollPane.getHorizontalScrollBar().getValueIsAdjusting()) { +// return; +// } +// lastRefresh = System.currentTimeMillis(); +// BowlerStudio.invokeLater(() -> { +// spscrollPane.setSize((int) spscrollPane.getWidth(), (int) spscrollPane.getHeight()); +// spscrollPane.invalidate(); +// spscrollPane.repaint(); +// textArea.invalidate(); +// textArea.repaint(); +// +// textArea.requestFocusInWindow(); +// BowlerStudio.runLater(Duration.ofMillis((int) 16), () -> { +// swingNode.setContent(spscrollPane); +// swingNode.requestFocus(); +// }); +// }); } diff --git a/src/main/java/com/neuronrobotics/bowlerstudio/threed/BowlerStudio3dEngine.java b/src/main/java/com/neuronrobotics/bowlerstudio/threed/BowlerStudio3dEngine.java index 828d1016f..e5b5cc6ba 100644 --- a/src/main/java/com/neuronrobotics/bowlerstudio/threed/BowlerStudio3dEngine.java +++ b/src/main/java/com/neuronrobotics/bowlerstudio/threed/BowlerStudio3dEngine.java @@ -609,7 +609,6 @@ public void run() { } }.start(); } - /** * Adds the object. * @@ -617,6 +616,15 @@ public void run() { * @return the mesh view */ public MeshView addObject(CSG currentCsg, File source) { + return addObject(currentCsg, source,-1,0); + } + /** + * Adds the object. + * + * @param currentCsg the current + * @return the mesh view + */ + public MeshView addObject(CSG currentCsg, File source,double opacity,double viewOrder) { if (currentCsg == null) return new MeshView(); // for(Polygon poly:currentCsg.getPolygons()) @@ -649,6 +657,16 @@ public MeshView addObject(CSG currentCsg, File source) { MeshView current = getCsgMap().get(currentCsg); current.setCullFace(CullFace.BACK); ((PhongMaterial) current.getMaterial()).setSpecularColor(javafx.scene.paint.Color.WHITE); + if(opacity>0) { + PhongMaterial phongMaterial = (PhongMaterial) current.getMaterial(); + Color diffuseColor = phongMaterial.getDiffuseColor(); + diffuseColor = Color.color(diffuseColor.getRed(), diffuseColor.getGreen(), diffuseColor.getBlue(), + opacity); + phongMaterial.setDiffuseColor(diffuseColor); + } + if (Runtime.version().feature() >= 17) { + current.setViewOrder(viewOrder); + } // TriangleMesh mesh =(TriangleMesh) current.getMesh(); // mesh.vertexFormatProperty() ContextMenu cm = new ContextMenu(); @@ -2030,10 +2048,12 @@ public void setAllCSG(Collection toAdd, File source) { @Override public void addCSG(Collection toAdd, File source) { + addCSG(toAdd,source,-1,0); + } + public void addCSG(Collection toAdd, File source, double opacity,double viewOrder ) { for (CSG c : toAdd) - addObject(c, source); + addObject(c, source,opacity,viewOrder); } - @Override public void highlightException(File fileEngineRunByName, Throwable ex) {