commit a41b530d32c579c27d59857fee900bf9dd8bff9b Author: Edwin Jakobs Date: Thu Aug 1 15:57:24 2019 +0200 New gradle/kts based OPENRNDR program template diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..30f741b --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +application.log +build +out +.idea +.gradle diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..a86dced --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,138 @@ +import org.gradle.internal.os.OperatingSystem +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +val kotlinVersion = "1.3.41" + +plugins { + java + kotlin("jvm") version("1.3.41") +} +group = "org.openrndr.template" +version = "1.0-SNAPSHOT" + +val applicationMainClass = "TemplateProgramKt" +val applicationFullLogging = false + +val openrndrUseSnapshot = false +val openrndrVersion = if (openrndrUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.35-rc1" +val openrndrOs = when (OperatingSystem.current()) { + OperatingSystem.WINDOWS -> "windows" + OperatingSystem.MAC_OS -> "macos" + OperatingSystem.LINUX -> "linux-x64" + else -> throw IllegalArgumentException("os not supported") +} + +// supported features are: video, panel +val openrndrFeatures = setOf("video") + +val panelUseSnapshot = false +val panelVersion = "0.3.16" + +val orxUseSnapshot = false +val orxVersion = "0.0.30" + +// supported features are: orx-camera, orx-compositor,orx-easing, orx-filter-extension,orx-file-watcher, +// orx-integral-image, orx-interval-tree, orx-jumpflood,orx-kdtree, orx-mesh-generators,orx-midi, orx-no-clear, +// orx-noise, orx-obj, orx-olive + +val orxFeatures = setOf("orx-noise") + +repositories { + mavenCentral() + if (openrndrUseSnapshot || orxUseSnapshot || panelUseSnapshot) { + mavenLocal() + } + maven(url = "https://dl.bintray.com/openrndr/openrndr") + maven(url = "https://jitpack.io") +} + +fun DependencyHandler.orx(module: String): Any { + return if (!orxUseSnapshot) { + "com.github.openrndr.orx:$module:v$orxVersion" + } else { + "org.openrndr.extra:$module:$orxVersion" + } +} + +fun DependencyHandler.openrndr(module: String): Any { + return "org.openrndr:openrndr-$module:$openrndrVersion" +} + +fun DependencyHandler.openrndrNatives(module: String): Any { + return "org.openrndr:openrndr-$module-natives-$openrndrOs:$openrndrVersion" +} + +dependencies { + runtime(openrndr("gl3")) + runtime(openrndrNatives("gl3")) + compile(openrndr("core")) + compile(openrndr("svg")) + compile(openrndr("animatable")) + compile(openrndr("extensions")) + compile(openrndr("filter")) + + compile("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.3.0-RC") + + compile("io.github.microutils", "kotlin-logging","1.7.2") + + if (!applicationFullLogging) { + runtime("org.slf4j","slf4j-nop","1.7.25") + } else { + runtime("org.apache.logging.log4j", "log4j-slf4j-impl", "2.12.0") + runtime("com.fasterxml.jackson.core", "jackson-databind", "2.8.7") + runtime("com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml", "2.8.7") + } + + if ("video" in openrndrFeatures) { + compile(openrndr("ffmpeg")) + runtime(openrndrNatives("ffmpeg")) + } + + if ("panel" in openrndrFeatures) { + compile("com.github.openrndr:openrndr-panel:v$panelVersion") + } + + for (feature in orxFeatures) { + compile(orx(feature)) + } + + if ("orx-olive" in orxFeatures) { + compile("org.jetbrains.kotlin", "kotlin-scripting-compiler-embeddable") + } + + implementation(kotlin("stdlib-jdk8")) + testCompile("junit", "junit", "4.12") +} + +configure { + sourceCompatibility = JavaVersion.VERSION_1_8 +} +tasks.withType { + kotlinOptions.jvmTarget = "1.8" +} + +tasks.withType { + manifest { + attributes["Main-Class"] = applicationMainClass + } + doFirst { + from(configurations.compileClasspath.get().map { if (it.isDirectory) it else zipTree(it) }) + from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) }) + } + + exclude(listOf("META-INF/*.RSA", "META-INF/*.SF", "META-INF/*.DSA", "**/module-info*")) + archiveFileName.set("application-$openrndrOs.jar") +} + +tasks.create("zipDistribution", Zip::class.java) { + archiveFileName.set("application-$openrndrOs.zip") + from("./") { + include("data/**") + } + from("$buildDir/libs/application-$openrndrOs.jar") +}.dependsOn(tasks.jar) + +tasks.create("run", JavaExec::class.java) { + main = applicationMainClass + classpath = sourceSets.main.get().runtimeClasspath +}.dependsOn(tasks.build) \ No newline at end of file diff --git a/data/fonts/IBMPlexMono-Regular.ttf b/data/fonts/IBMPlexMono-Regular.ttf new file mode 100644 index 0000000..f99c8e9 Binary files /dev/null and b/data/fonts/IBMPlexMono-Regular.ttf differ diff --git a/data/images/pm5544.png b/data/images/pm5544.png new file mode 100644 index 0000000..4c55c9d Binary files /dev/null and b/data/images/pm5544.png differ diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..29e08e8 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..87b738c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..8e39c72 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Aug 01 12:32:31 CEST 2019 +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..af6708f --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# 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 +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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; +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" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + 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 +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 +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 + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; 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 + # 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\"" + fi + i=$((i+1)) + 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" + +# 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 + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..6d57edc --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +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% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..52bd101 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'openrndr-template' + diff --git a/src/main/kotlin/TemplateProgram.kt b/src/main/kotlin/TemplateProgram.kt new file mode 100644 index 0000000..3187dc8 --- /dev/null +++ b/src/main/kotlin/TemplateProgram.kt @@ -0,0 +1,30 @@ +import org.openrndr.application +import org.openrndr.color.ColorRGBa +import org.openrndr.draw.FontImageMap +import org.openrndr.draw.loadImage +import org.openrndr.draw.tint + +fun main() = application { + configure { + width = 768 + height = 576 + } + + program { + + val image = loadImage("file:data/images/pm5544.png") + val font = FontImageMap.fromUrl("file:data/fonts/IBMPlexMono-Regular.ttf", 64.0) + + extend { + drawer.drawStyle.colorMatrix = tint(ColorRGBa.WHITE.shade(0.2)) + drawer.image(image) + + drawer.fill = ColorRGBa.PINK + drawer.circle(Math.cos(seconds)*width/2.0+width/2.0, Math.sin(0.5*seconds)*height/2.0 + height/2.0, 140.0) + + drawer.fontMap = font + drawer.fill = ColorRGBa.WHITE + drawer.text("OPENRNDR", width/2.0, height /2.0) + } + } +} \ No newline at end of file diff --git a/src/main/resources/log4j2.yaml b/src/main/resources/log4j2.yaml new file mode 100644 index 0000000..cdef115 --- /dev/null +++ b/src/main/resources/log4j2.yaml @@ -0,0 +1,20 @@ +Configuration: + status: warn + Appenders: + Console: + name: Console + target: SYSTEM_OUT + PatternLayout: + Pattern: "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" + File: + append: false + name: File_Appender + fileName: application.log + PatternLayout: + Pattern: "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" + Loggers: + Root: + level: debug + AppenderRef: + - ref: Console + - ref: File_Appender \ No newline at end of file