Compare commits
117 Commits
openrndr-0
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
326474823c | ||
|
|
3d6774275a | ||
|
|
d38df2eed7 | ||
|
|
622bfc5077 | ||
|
|
c2756d2b9d | ||
|
|
3ed7c18932 | ||
|
|
86c36a0f35 | ||
|
|
e6a9e319d9 | ||
|
|
a385ebb216 | ||
|
|
e1d44de9a1 | ||
|
|
8191515779 | ||
|
|
7597ac35e2 | ||
|
|
69f698df1f | ||
|
|
f93a523115 | ||
|
|
8f08e44141 | ||
|
|
aa3e5e15ac | ||
|
|
de0ec94804 | ||
|
|
bf588e1baa | ||
|
|
ba99027329 | ||
|
|
5e6fbdd06a | ||
|
|
cd5a98322b | ||
|
|
fef8e76e52 | ||
|
|
315e788a32 | ||
|
|
ca85dec73a | ||
|
|
4247fd0989 | ||
|
|
2d6963b627 | ||
|
|
72270a5421 | ||
|
|
89aeaf68eb | ||
|
|
b164dc2bc5 | ||
|
|
de3079cbee | ||
|
|
e57ba1bff7 | ||
|
|
ce0877cdd1 | ||
|
|
fff6fcee83 | ||
|
|
5ff7884bd5 | ||
|
|
bf7d308796 | ||
|
|
a21da71eb1 | ||
|
|
dbe277002a | ||
|
|
2a4d2142e0 | ||
|
|
7bc745fbed | ||
|
|
374cd51b8a | ||
|
|
0ca9db90d0 | ||
|
|
e7f3475de0 | ||
|
|
ef7cee01c7 | ||
|
|
9e08c6cfb6 | ||
|
|
1565ef12be | ||
|
|
de35f064d8 | ||
|
|
6e5fac82ac | ||
|
|
a9edf8d79f | ||
|
|
418339fe4b | ||
|
|
aad6a8f576 | ||
|
|
4d65172d93 | ||
|
|
b3f94abc82 | ||
|
|
e4dfb4aaed | ||
|
|
524635e1ad | ||
|
|
db5ea1cdd2 | ||
|
|
04139af57c | ||
|
|
c77fd4c99a | ||
|
|
3ef46bcc4e | ||
|
|
1384143d6f | ||
|
|
6b14304c80 | ||
|
|
c6f608f880 | ||
|
|
3bfb55041d | ||
|
|
91e953ab61 | ||
|
|
10ccb692c7 | ||
|
|
0edd57129a | ||
|
|
0278b7dc9e | ||
|
|
440d67654d | ||
|
|
fa280af373 | ||
|
|
0268725ead | ||
|
|
d8d9445062 | ||
|
|
0ccab3a8bf | ||
|
|
0282d5a0b5 | ||
|
|
24e441189a | ||
|
|
d019406420 | ||
|
|
3cdf6ea780 | ||
|
|
df784c99c1 | ||
|
|
80078cc2cb | ||
|
|
527b502e74 | ||
|
|
c4e5b3b1aa | ||
|
|
5b2634fdd1 | ||
|
|
8c2f9c0ec6 | ||
|
|
dec0b36aaf | ||
|
|
cf4ebfc490 | ||
|
|
cc31b08b91 | ||
|
|
3a4d22d940 | ||
|
|
b98a1068f7 | ||
|
|
b57fb1abc6 | ||
|
|
14630e3b5b | ||
|
|
638e579f3e | ||
|
|
9604de3243 | ||
|
|
15fb5393e7 | ||
|
|
c518834f71 | ||
|
|
a83e888dc3 | ||
|
|
498fd6773d | ||
|
|
d5702db78f | ||
|
|
d692d6998d | ||
|
|
3db83af277 | ||
|
|
29db13e82a | ||
|
|
a3c9178d4d | ||
|
|
84f54b3f4e | ||
|
|
4c9e1c552f | ||
|
|
e36cad040e | ||
|
|
ce3bf56b43 | ||
|
|
5ce3313da5 | ||
|
|
9695d5e8af | ||
|
|
5242dae526 | ||
|
|
d97e80c903 | ||
|
|
adf88e1062 | ||
|
|
eda66cc37a | ||
|
|
fa820c6d3c | ||
|
|
411b5f5b12 | ||
|
|
2f2d279e24 | ||
|
|
a35675fd03 | ||
|
|
2477ce7de8 | ||
|
|
0fd7a72d4f | ||
|
|
f907422a5e | ||
|
|
f3d8d0a3dc |
5
.github/workflows/build-on-commit.yaml
vendored
5
.github/workflows/build-on-commit.yaml
vendored
@@ -3,13 +3,14 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
|
- next-version
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- uses: actions/setup-java@v3
|
- uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
java-version: '17'
|
java-version: '17'
|
||||||
|
|||||||
6
.github/workflows/publish-binaries.yaml
vendored
6
.github/workflows/publish-binaries.yaml
vendored
@@ -23,10 +23,10 @@ jobs:
|
|||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up JDK 17
|
- name: Set up JDK 17
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
java-version: '17'
|
java-version: '17'
|
||||||
@@ -48,7 +48,7 @@ jobs:
|
|||||||
run: mv ./build/distributions/openrndr-application.zip ./build/distributions/openrndr-application-${{env.OR_TARGET_NAME}}.zip
|
run: mv ./build/distributions/openrndr-application.zip ./build/distributions/openrndr-application-${{env.OR_TARGET_NAME}}.zip
|
||||||
|
|
||||||
- name: Create Release
|
- name: Create Release
|
||||||
uses: ncipollo/release-action@v1.12.0
|
uses: ncipollo/release-action@v1.14.0
|
||||||
id: create_release
|
id: create_release
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|||||||
5
.gitignore
vendored
5
.gitignore
vendored
@@ -3,6 +3,11 @@ build
|
|||||||
out
|
out
|
||||||
.idea
|
.idea
|
||||||
.gradle
|
.gradle
|
||||||
|
.kotlin
|
||||||
|
.lwjgl
|
||||||
video/
|
video/
|
||||||
screenshots/
|
screenshots/
|
||||||
gui-parameters/
|
gui-parameters/
|
||||||
|
ffmpegOutput.txt
|
||||||
|
ShaderError.glsl
|
||||||
|
|
||||||
|
|||||||
66
README.md
66
README.md
@@ -7,13 +7,20 @@ go-to starting point for writing OPENRNDR-based software.
|
|||||||
|
|
||||||
If you are looking at this from IntelliJ IDEA you can start by expanding the _project_ tab on the left. You will find a template program in `src/main/kotlin/TemplateProgram.kt` and a live-coding example in `src/main/kotlin/TemplateLiveProgram.kt`.
|
If you are looking at this from IntelliJ IDEA you can start by expanding the _project_ tab on the left. You will find a template program in `src/main/kotlin/TemplateProgram.kt` and a live-coding example in `src/main/kotlin/TemplateLiveProgram.kt`.
|
||||||
|
|
||||||
You will find some [basic instructions](https://guide.openrndr.org/setUpYourFirstProgram.html) in the [OPENRNDR guide](https://guide.openrndr.org)
|
You will find some [basic instructions](https://guide.openrndr.org/setUpYourFirstProgram.html) in the [OPENRNDR guide](https://guide.openrndr.org).
|
||||||
|
|
||||||
## Gradle tasks
|
## Gradle tasks
|
||||||
|
|
||||||
- `./gradlew run` runs the TemplateProgram (Use `gradlew.bat run` under Windows)
|
- `./gradlew run` runs `TemplateProgram.kt` (Use `gradlew.bat run` under Windows)
|
||||||
- `./gradlew shadowJar` creates an executable platform specific jar file with all dependencies. Run the resulting program by typing `java -jar build/libs/openrndr-template-1.0.0-all.jar` in a terminal from the project root.
|
- `./gradlew run -Popenrndr.application=MyProgramKt` runs `src/main/kotlin/myProgram.kt`
|
||||||
- `./gradlew jpackageZip` creates a zip with a stand-alone executable for the current platform (works with Java 14 only)
|
- `./gradlew run -Popenrndr.application=foo.bar.MyProgramKt` runs `src/main/kotlin/foo/bar/myProgram.kt` (assuming `package foo.bar` is used in myProgram.kt)
|
||||||
|
- `./gradlew shadowJar` creates an executable platform specific jar file with all dependencies. Run the resulting program by typing `java -jar build/libs/openrndr-template-1.0.0-all.jar` in a terminal from the project root. If your project contains multiple `main` methods, specify which one to run with `java -cp build/libs/openrndr-template-1.0.0-all.jar MyProgramKt`, where `MyProgramKt` can also be `foo.bar.MyProgramKt` if it's in the package `foo.bar`.
|
||||||
|
- `./gradlew jpackageZip` creates a zip with a stand-alone executable for the current platform (requires Java 17 or newer). Run it like this: `cd build/jpackage/openrndr-application/ && bin/openrndr-application`.
|
||||||
|
- `./gradlew dependencyUpydates` checks whether any dependencies have newer versions.
|
||||||
|
|
||||||
|
## Tips and issues
|
||||||
|
|
||||||
|
See the [wiki](https://github.com/openrndr/openrndr-template/wiki)
|
||||||
|
|
||||||
## Cross builds
|
## Cross builds
|
||||||
|
|
||||||
@@ -21,48 +28,39 @@ To create a runnable jar for a platform different from your current platform, us
|
|||||||
|
|
||||||
## Updating OPENRNDR, ORX and other dependencies
|
## Updating OPENRNDR, ORX and other dependencies
|
||||||
|
|
||||||
The openrndr-template depends on various packages including the core [openrndr](https://github.com/openrndr/openrndr/) and the [orx](https://github.com/openrndr/orx/) extensions. The version numbers of these dependencies are specified in your [libs.versions.toml](gradle/libs.versions.toml) file. If you want to learn about file format visit the [Gradle documentation](https://docs.gradle.org/current/userguide/platforms.html#sub:conventional-dependencies-toml) website.
|
The openrndr-template depends on various packages including the core [openrndr](https://github.com/openrndr/openrndr/) and the [orx](https://github.com/openrndr/orx/) extensions and
|
||||||
|
provides the optional [orsl](https://github.com/openrndr/orsl/) shader helper modules.
|
||||||
|
The version numbers of these dependencies are specified in your [libs.versions.toml](gradle/libs.versions.toml) file.
|
||||||
|
Learn more about this file in the [Gradle documentation](https://docs.gradle.org/current/userguide/platforms.html#sub:conventional-dependencies-toml) website.
|
||||||
|
|
||||||
Newer versions of OPENRNDR and ORX bring useful features and bug fixes. The most recent versions are
|
Newer versions bring useful features and bug fixes. The most recent versions are<br>
|
||||||
<br> for OPENRNDR.
|

|
||||||
<br> for ORX.
|

|
||||||
|
.
|
||||||
|
|
||||||
You can use those version numbers in your toml file. They can look like "0.4.3" or "0.4.3-alpha4". Use the complete string, as in:
|
Switch to the [next-version branch](https://github.com/openrndr/openrndr-template/tree/next-version) or enter these versions manually in your toml file.
|
||||||
|
They can look like "0.4.3" or "0.4.3-alpha4". Use the complete string, as in:
|
||||||
|
|
||||||
openrndr = "0.4.3-alpha4"
|
openrndr = "0.4.5-alpha5"
|
||||||
orx = "0.4.3-alpha4"
|
orx = "0.4.5-alpha5"
|
||||||
|
orsl = "0.4.5-alpha5"
|
||||||
|
|
||||||
You can add other dependencies needed by your project to your [build.gradle.kts](build.gradle.kts) file, inside the `dependencies { }` block.
|
You can add other dependencies needed by your project to your [build.gradle.kts](build.gradle.kts) file, inside the `dependencies { }` block.
|
||||||
|
|
||||||
Remember to reload the Gradle configuration after changing any dependencies.
|
⚠️ Remember to reload the Gradle configuration after changing any dependencies.
|
||||||
|
|
||||||
## Run other Kotlin programs from the command line
|
|
||||||
|
|
||||||
By default `./gradlew run` runs a program called `TemplateProgram.kt` but a different one can be provided as an argument:
|
|
||||||
|
|
||||||
To run `src/main/kotlin/myProgram.kt`
|
|
||||||
|
|
||||||
./gradlew run -Popenrndr.application=MyProgramKt
|
|
||||||
|
|
||||||
To run `src/main/kotlin/foo/bar/myProgram.kt` (assuming `package foo.bar` in myProgram.kt)
|
|
||||||
|
|
||||||
./gradlew run -Popenrndr.application=foo.bar.MyProgramKt
|
|
||||||
|
|
||||||
## Github Actions
|
## Github Actions
|
||||||
|
|
||||||
This repository contains a number of Github Actions under `./github/workflows`.
|
This repository contains various Github Actions under `./github/workflows`:
|
||||||
|
|
||||||
[build-on-commit.yaml](.github/workflows/build-on-commit.yaml) runs a basic build on every commit,
|
- [build-on-commit.yaml](.github/workflows/build-on-commit.yaml) runs a basic build on every commit,
|
||||||
which can help detect issues in the source code.
|
which can help detect issues in the source code.
|
||||||
|
|
||||||
[publish-binaries.yaml](.github/workflows/publish-binaries.yaml) publishes binaries for Linux, Mac and Windows
|
- [publish-binaries.yaml](.github/workflows/publish-binaries.yaml) publishes binaries for Linux, Mac and Windows
|
||||||
any time a commit is tagged with a version number like `v1.*`.
|
any time a commit is tagged with a version number like `v1.*`. For example, we can create and push a tag with these git commands:
|
||||||
|
```
|
||||||
For example, we can create and push a tag with these git commands:
|
|
||||||
|
|
||||||
git tag -a v1.0.0 -m "v1.0.0"
|
git tag -a v1.0.0 -m "v1.0.0"
|
||||||
git push origin v1.0.0
|
git push origin v1.0.0
|
||||||
|
```
|
||||||
|
|
||||||
The progress of the running actions can be followed under the Actions tab in GitHub.
|
You can follow the progress of the action under the Actions tab in GitHub. Once complete, the executables will appear under the Releases section.
|
||||||
Once complete, the executables will be found under the Releases section.
|
|
||||||
|
|
||||||
|
|||||||
127
build.gradle.kts
127
build.gradle.kts
@@ -1,7 +1,8 @@
|
|||||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||||
import org.gradle.internal.os.OperatingSystem
|
import org.gradle.internal.os.OperatingSystem
|
||||||
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
|
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
|
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
|
||||||
|
|
||||||
group = "org.openrndr.template"
|
group = "org.openrndr.template"
|
||||||
version = "1.0.0"
|
version = "1.0.0"
|
||||||
@@ -10,20 +11,25 @@ val applicationMainClass = "TemplateProgramKt"
|
|||||||
|
|
||||||
/** ## additional ORX features to be added to this project */
|
/** ## additional ORX features to be added to this project */
|
||||||
val orxFeatures = setOf<String>(
|
val orxFeatures = setOf<String>(
|
||||||
|
// "orx-axidraw",
|
||||||
// "orx-boofcv",
|
// "orx-boofcv",
|
||||||
"orx-camera",
|
"orx-camera",
|
||||||
// "orx-chataigne",
|
// "orx-chataigne",
|
||||||
"orx-color",
|
"orx-color",
|
||||||
|
"orx-composition",
|
||||||
"orx-compositor",
|
"orx-compositor",
|
||||||
// "orx-compute-graph",
|
// "orx-compute-graph",
|
||||||
// "orx-compute-graph-nodes",
|
// "orx-compute-graph-nodes",
|
||||||
|
"orx-delegate-magic",
|
||||||
// "orx-dnk3",
|
// "orx-dnk3",
|
||||||
// "orx-easing",
|
// "orx-easing",
|
||||||
|
"orx-envelopes",
|
||||||
// "orx-expression-evaluator",
|
// "orx-expression-evaluator",
|
||||||
|
// "orx-fcurve",
|
||||||
|
// "orx-fft",
|
||||||
// "orx-file-watcher",
|
// "orx-file-watcher",
|
||||||
"orx-fx",
|
"orx-fx",
|
||||||
// "orx-git-archiver",
|
// "orx-git-archiver",
|
||||||
// "orx-glslify",
|
|
||||||
// "orx-gradient-descent",
|
// "orx-gradient-descent",
|
||||||
"orx-gui",
|
"orx-gui",
|
||||||
// "orx-hash-grid",
|
// "orx-hash-grid",
|
||||||
@@ -36,6 +42,7 @@ val orxFeatures = setOf<String>(
|
|||||||
// "orx-kinect-v1",
|
// "orx-kinect-v1",
|
||||||
// "orx-kotlin-parser",
|
// "orx-kotlin-parser",
|
||||||
// "orx-marching-squares",
|
// "orx-marching-squares",
|
||||||
|
// "orx-math",
|
||||||
// "orx-mesh-generators",
|
// "orx-mesh-generators",
|
||||||
// "orx-midi",
|
// "orx-midi",
|
||||||
// "orx-minim",
|
// "orx-minim",
|
||||||
@@ -48,6 +55,7 @@ val orxFeatures = setOf<String>(
|
|||||||
"orx-panel",
|
"orx-panel",
|
||||||
// "orx-parameters",
|
// "orx-parameters",
|
||||||
// "orx-poisson-fill",
|
// "orx-poisson-fill",
|
||||||
|
// "orx-property-watchers",
|
||||||
// "orx-quadtree",
|
// "orx-quadtree",
|
||||||
// "orx-rabbit-control",
|
// "orx-rabbit-control",
|
||||||
// "orx-realsense2",
|
// "orx-realsense2",
|
||||||
@@ -55,9 +63,11 @@ val orxFeatures = setOf<String>(
|
|||||||
"orx-shade-styles",
|
"orx-shade-styles",
|
||||||
// "orx-shader-phrases",
|
// "orx-shader-phrases",
|
||||||
"orx-shapes",
|
"orx-shapes",
|
||||||
|
"orx-svg",
|
||||||
// "orx-syphon",
|
// "orx-syphon",
|
||||||
// "orx-temporal-blur",
|
// "orx-temporal-blur",
|
||||||
// "orx-tensorflow",
|
// "orx-tensorflow",
|
||||||
|
"orx-text-writer",
|
||||||
// "orx-time-operators",
|
// "orx-time-operators",
|
||||||
// "orx-timer",
|
// "orx-timer",
|
||||||
// "orx-triangulation",
|
// "orx-triangulation",
|
||||||
@@ -98,6 +108,8 @@ plugins {
|
|||||||
alias(libs.plugins.shadow)
|
alias(libs.plugins.shadow)
|
||||||
alias(libs.plugins.runtime)
|
alias(libs.plugins.runtime)
|
||||||
alias(libs.plugins.gitarchive.tomarkdown).apply(false)
|
alias(libs.plugins.gitarchive.tomarkdown).apply(false)
|
||||||
|
alias(libs.plugins.versions)
|
||||||
|
alias(libs.plugins.kotlin.serialization)
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
@@ -108,20 +120,28 @@ repositories {
|
|||||||
dependencies {
|
dependencies {
|
||||||
|
|
||||||
// implementation(libs.jsoup)
|
// implementation(libs.jsoup)
|
||||||
// implementation(libs.gson)
|
|
||||||
// implementation(libs.csv)
|
// implementation(libs.csv)
|
||||||
|
|
||||||
|
/* ORSL dependencies */
|
||||||
|
|
||||||
|
// implementation(libs.orsl.shader.generator)
|
||||||
|
// implementation(libs.orsl.extension.color)
|
||||||
|
// implementation(libs.orsl.extension.easing)
|
||||||
|
// implementation(libs.orsl.extension.gradient)
|
||||||
|
// implementation(libs.orsl.extension.noise)
|
||||||
|
// implementation(libs.orsl.extension.pbr)
|
||||||
|
// implementation(libs.orsl.extension.raymarching)
|
||||||
|
// implementation(libs.orsl.extension.sdf)
|
||||||
|
|
||||||
implementation(libs.kotlinx.coroutines.core)
|
implementation(libs.kotlinx.coroutines.core)
|
||||||
|
implementation(libs.kotlinx.serialization.core)
|
||||||
|
implementation(libs.kotlinx.serialization.json)
|
||||||
implementation(libs.slf4j.api)
|
implementation(libs.slf4j.api)
|
||||||
implementation(libs.kotlin.logging)
|
implementation(libs.kotlin.logging)
|
||||||
|
|
||||||
when (applicationLogging) {
|
when (applicationLogging) {
|
||||||
Logging.NONE -> {
|
Logging.NONE -> runtimeOnly(libs.slf4j.nop)
|
||||||
runtimeOnly(libs.slf4j.nop)
|
Logging.SIMPLE -> runtimeOnly(libs.slf4j.simple)
|
||||||
}
|
|
||||||
Logging.SIMPLE -> {
|
|
||||||
runtimeOnly(libs.slf4j.simple)
|
|
||||||
}
|
|
||||||
Logging.FULL -> {
|
Logging.FULL -> {
|
||||||
runtimeOnly(libs.log4j.slf4j2)
|
runtimeOnly(libs.log4j.slf4j2)
|
||||||
runtimeOnly(libs.log4j.core)
|
runtimeOnly(libs.log4j.core)
|
||||||
@@ -136,21 +156,24 @@ dependencies {
|
|||||||
// ------------------------------------------------------------------------------------------------------------------ //
|
// ------------------------------------------------------------------------------------------------------------------ //
|
||||||
|
|
||||||
java {
|
java {
|
||||||
sourceCompatibility = JavaVersion.VERSION_11
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
targetCompatibility = JavaVersion.VERSION_11
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
tasks.withType<KotlinCompile> {
|
kotlin {
|
||||||
kotlinOptions.jvmTarget = "11"
|
compilerOptions {
|
||||||
|
languageVersion = KotlinVersion.KOTLIN_2_0
|
||||||
|
apiVersion = KotlinVersion.KOTLIN_2_0
|
||||||
|
jvmTarget = JvmTarget.JVM_17
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------------------------ //
|
// ------------------------------------------------------------------------------------------------------------------ //
|
||||||
|
|
||||||
project.setProperty("mainClassName", applicationMainClass)
|
|
||||||
|
|
||||||
application {
|
application {
|
||||||
if (hasProperty("openrndr.application")) {
|
mainClass = if (hasProperty("openrndr.application"))
|
||||||
mainClass.set("${property("openrndr.application")}")
|
"${property("openrndr.application")}"
|
||||||
}
|
else
|
||||||
|
applicationMainClass
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
@@ -166,36 +189,36 @@ tasks {
|
|||||||
exclude(dependency("org.apache.logging.log4j:log4j-slf4j2-impl:.*"))
|
exclude(dependency("org.apache.logging.log4j:log4j-slf4j2-impl:.*"))
|
||||||
exclude(dependency("com.fasterxml.jackson.core:jackson-databind:.*"))
|
exclude(dependency("com.fasterxml.jackson.core:jackson-databind:.*"))
|
||||||
exclude(dependency("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:.*"))
|
exclude(dependency("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:.*"))
|
||||||
|
exclude(dependency("org.bytedeco:.*"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------------------------------------------------------------ //
|
||||||
|
|
||||||
|
tasks {
|
||||||
named<org.beryx.runtime.JPackageTask>("jpackage") {
|
named<org.beryx.runtime.JPackageTask>("jpackage") {
|
||||||
doLast {
|
doLast {
|
||||||
val destPath = if(OperatingSystem.current().isMacOsX)
|
val destPath = if (OperatingSystem.current().isMacOsX)
|
||||||
"build/jpackage/openrndr-application.app/Contents/Resources/data"
|
"build/jpackage/openrndr-application.app/Contents/Resources/data"
|
||||||
else
|
else
|
||||||
"build/jpackage/openrndr-application/data"
|
"build/jpackage/openrndr-application/data"
|
||||||
|
|
||||||
copy {
|
copy {
|
||||||
from("data") {
|
from("data") { include("**/*") }
|
||||||
include("**/*")
|
|
||||||
}
|
|
||||||
into(destPath)
|
into(destPath)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------------------------ //
|
register<Zip>("jpackageZip") {
|
||||||
|
archiveFileName = "openrndr-application.zip"
|
||||||
tasks.register<Zip>("jpackageZip") {
|
from("${layout.buildDirectory.get()}/jpackage") {
|
||||||
archiveFileName.set("openrndr-application.zip")
|
|
||||||
from("$buildDir/jpackage") {
|
|
||||||
include("**/*")
|
include("**/*")
|
||||||
}
|
}
|
||||||
|
dependsOn("jpackage")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
tasks.findByName("jpackageZip")?.dependsOn("jpackage")
|
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------------------------ //
|
|
||||||
|
|
||||||
runtime {
|
runtime {
|
||||||
jpackage {
|
jpackage {
|
||||||
@@ -206,14 +229,34 @@ runtime {
|
|||||||
jvmArgs.add("-Duser.dir=${"$"}APPDIR/../Resources")
|
jvmArgs.add("-Duser.dir=${"$"}APPDIR/../Resources")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
options.set(listOf("--strip-debug", "--compress", "1", "--no-header-files", "--no-man-pages"))
|
options = listOf("--strip-debug", "--compress", "1", "--no-header-files", "--no-man-pages")
|
||||||
modules.set(listOf("jdk.unsupported", "java.management", "java.desktop"))
|
modules = listOf("jdk.unsupported", "java.management", "java.desktop")
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------------------------ //
|
// ------------------------------------------------------------------------------------------------------------------ //
|
||||||
|
|
||||||
tasks.register<org.openrndr.extra.gitarchiver.GitArchiveToMarkdown>("gitArchiveToMarkDown") {
|
tasks {
|
||||||
historySize.set(20)
|
register<org.openrndr.extra.gitarchiver.GitArchiveToMarkdown>("gitArchiveToMarkDown") {
|
||||||
|
historySize = 20
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------------------------------------------------------------ //
|
||||||
|
|
||||||
|
tasks {
|
||||||
|
dependencyUpdates {
|
||||||
|
gradleReleaseChannel = "current"
|
||||||
|
|
||||||
|
val nonStableKeywords = listOf("alpha", "beta", "rc")
|
||||||
|
|
||||||
|
fun isNonStable(version: String) = nonStableKeywords.any {
|
||||||
|
version.lowercase().contains(it)
|
||||||
|
}
|
||||||
|
|
||||||
|
rejectVersionIf {
|
||||||
|
isNonStable(candidate.version) && !isNonStable(currentVersion)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------------------------ //
|
// ------------------------------------------------------------------------------------------------------------------ //
|
||||||
@@ -242,11 +285,13 @@ class Openrndr {
|
|||||||
"aarch64", "arm-v8" -> "macos-arm64"
|
"aarch64", "arm-v8" -> "macos-arm64"
|
||||||
else -> "macos"
|
else -> "macos"
|
||||||
}
|
}
|
||||||
|
|
||||||
currOs.isLinux -> when (currArch) {
|
currOs.isLinux -> when (currArch) {
|
||||||
"x86-64" -> "linux-x64"
|
"x86-64" -> "linux-x64"
|
||||||
"aarch64" -> "linux-arm64"
|
"aarch64" -> "linux-arm64"
|
||||||
else -> throw IllegalArgumentException("architecture not supported: $currArch")
|
else -> throw IllegalArgumentException("architecture not supported: $currArch")
|
||||||
}
|
}
|
||||||
|
|
||||||
else -> throw IllegalArgumentException("os not supported: ${currOs.name}")
|
else -> throw IllegalArgumentException("os not supported: ${currOs.name}")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -263,7 +308,6 @@ class Openrndr {
|
|||||||
implementation(openrndr("openal"))
|
implementation(openrndr("openal"))
|
||||||
runtimeOnly(openrndrNatives("openal"))
|
runtimeOnly(openrndrNatives("openal"))
|
||||||
implementation(openrndr("application"))
|
implementation(openrndr("application"))
|
||||||
implementation(openrndr("svg"))
|
|
||||||
implementation(openrndr("animatable"))
|
implementation(openrndr("animatable"))
|
||||||
implementation(openrndr("extensions"))
|
implementation(openrndr("extensions"))
|
||||||
implementation(openrndr("filter"))
|
implementation(openrndr("filter"))
|
||||||
@@ -284,25 +328,26 @@ class Openrndr {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val openrndr = Openrndr()
|
val openrndr = Openrndr()
|
||||||
|
|
||||||
if (properties["openrndr.tasks"] == "true") {
|
if (properties["openrndr.tasks"] == "true") {
|
||||||
task("create executable jar for $applicationMainClass") {
|
tasks.register("create executable jar for $applicationMainClass") {
|
||||||
group = " \uD83E\uDD8C OPENRNDR"
|
group = " \uD83E\uDD8C OPENRNDR"
|
||||||
dependsOn("shadowJar")
|
dependsOn("shadowJar")
|
||||||
}
|
}
|
||||||
|
|
||||||
task("run $applicationMainClass") {
|
tasks.register("run $applicationMainClass") {
|
||||||
group = " \uD83E\uDD8C OPENRNDR"
|
group = " \uD83E\uDD8C OPENRNDR"
|
||||||
dependsOn("run")
|
dependsOn("run")
|
||||||
}
|
}
|
||||||
|
|
||||||
task("create standalone executable for $applicationMainClass") {
|
tasks.register("create standalone executable for $applicationMainClass") {
|
||||||
group = " \uD83E\uDD8C OPENRNDR"
|
group = " \uD83E\uDD8C OPENRNDR"
|
||||||
dependsOn("jpackageZip")
|
dependsOn("jpackageZip")
|
||||||
}
|
}
|
||||||
|
|
||||||
task("add IDE file scopes") {
|
tasks.register("add IDE file scopes") {
|
||||||
group = " \uD83E\uDD8C OPENRNDR"
|
group = " \uD83E\uDD8C OPENRNDR"
|
||||||
val scopesFolder = File("${project.projectDir}/.idea/scopes")
|
val scopesFolder = File("${project.projectDir}/.idea/scopes")
|
||||||
scopesFolder.mkdirs()
|
scopesFolder.mkdirs()
|
||||||
@@ -311,7 +356,7 @@ if (properties["openrndr.tasks"] == "true") {
|
|||||||
"Code" to "file:*.kt||file:*.frag||file:*.vert||file:*.glsl",
|
"Code" to "file:*.kt||file:*.frag||file:*.vert||file:*.glsl",
|
||||||
"Text" to "file:*.txt||file:*.md||file:*.xml||file:*.json",
|
"Text" to "file:*.txt||file:*.md||file:*.xml||file:*.json",
|
||||||
"Gradle" to "file[*buildSrc*]:*/||file:*gradle.*||file:*.gradle||file:*/gradle-wrapper.properties||file:*.toml",
|
"Gradle" to "file[*buildSrc*]:*/||file:*gradle.*||file:*.gradle||file:*/gradle-wrapper.properties||file:*.toml",
|
||||||
"Images" to "file:*.png||file:*.jpg||file:*.dds||file:*.exr"
|
"Media" to "file:*.png||file:*.jpg||file:*.dds||file:*.exr||file:*.mp3||file:*.wav||file:*.mp4||file:*.mov||file:*.svg"
|
||||||
)
|
)
|
||||||
files.forEach { (name, pattern) ->
|
files.forEach { (name, pattern) ->
|
||||||
val file = File(scopesFolder, "__$name.xml")
|
val file = File(scopesFolder, "__$name.xml")
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
openrndr.tasks=true
|
openrndr.tasks=true
|
||||||
kotlin.code.style=official
|
kotlin.code.style=official
|
||||||
org.gradle.unsafe.configuration-cache=false
|
#org.gradle.configuration-cache=true
|
||||||
|
#org.gradle.configuration-cache.parallel=true
|
||||||
|
#org.gradle.configuration-cache.problems=warn
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,21 @@
|
|||||||
[versions]
|
[versions]
|
||||||
kotlin = "1.8.21"
|
kotlin = "2.2.10"
|
||||||
openrndr = "0.4.3"
|
openrndr = "0.4.5"
|
||||||
orx = "0.4.3"
|
orx = "0.4.5"
|
||||||
|
orsl = "0.4.5-alpha5"
|
||||||
orml = "0.4.1"
|
orml = "0.4.1"
|
||||||
|
slf4j = "2.0.17"
|
||||||
slf4j = "2.0.7"
|
log4j = "2.23.1"
|
||||||
log4j = "2.20.0"
|
jackson = "2.17.2"
|
||||||
jackson = "2.14.2"
|
junit = "4.13.2"
|
||||||
|
kotlinxCoroutines = "1.10.2"
|
||||||
|
kotlinxSerialization = "1.9.0"
|
||||||
|
kotlinLogging = "7.0.13"
|
||||||
|
kotlinCsvJvm = "1.9.3"
|
||||||
|
jsoup = "1.17.1"
|
||||||
|
shadow = "9.1.0"
|
||||||
|
runtime = "1.13.1"
|
||||||
|
versions = "0.52.0"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" }
|
kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" }
|
||||||
@@ -19,15 +28,27 @@ log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.
|
|||||||
jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" }
|
jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" }
|
||||||
jackson-json = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dataformat-yaml", version.ref = "jackson" }
|
jackson-json = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dataformat-yaml", version.ref = "jackson" }
|
||||||
|
|
||||||
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.6.4" }
|
orsl-shader-generator = { group = "org.openrndr.extra", name = "orsl-shader-generator", version.ref = "orsl" }
|
||||||
kotlin-logging = { group = "io.github.microutils", name = "kotlin-logging", version = "3.0.5" }
|
orsl-extension-color = { group = "org.openrndr.extra", name = "orsl-extension-color", version.ref = "orsl" }
|
||||||
junit = { group = "junit", name = "junit", version = "4.13.2" }
|
orsl-extension-easing = { group = "org.openrndr.extra", name = "orsl-extension-easing", version.ref = "orsl" }
|
||||||
jsoup = { group = "org.jsoup", name = "jsoup", version = "1.16.1" }
|
orsl-extension-gradient = { group = "org.openrndr.extra", name = "orsl-extension-gradient", version.ref = "orsl" }
|
||||||
gson = { group = "com.google.code.gson", name = "gson", version = "2.10.1" }
|
orsl-extension-noise = { group = "org.openrndr.extra", name = "orsl-extension-noise", version.ref = "orsl" }
|
||||||
csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version = "1.9.0" }
|
orsl-extension-pbr = { group = "org.openrndr.extra", name = "orsl-extension-pbr", version.ref = "orsl" }
|
||||||
|
orsl-extension-raymarching = { group = "org.openrndr.extra", name = "orsl-extension-raymarching", version.ref = "orsl" }
|
||||||
|
orsl-extension-sdf = { group = "org.openrndr.extra", name = "orsl-extension-sdf", version.ref = "orsl" }
|
||||||
|
|
||||||
|
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
|
||||||
|
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
|
||||||
|
kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinxSerialization" }
|
||||||
|
kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version.ref = "kotlinLogging" }
|
||||||
|
junit = { group = "junit", name = "junit", version.ref = "junit" }
|
||||||
|
jsoup = { group = "org.jsoup", name = "jsoup", version.ref = "jsoup" }
|
||||||
|
csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version.ref = "kotlinCsvJvm" }
|
||||||
|
|
||||||
[plugins]
|
[plugins]
|
||||||
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
|
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
|
||||||
shadow = { id = "com.github.johnrengelman.shadow", version = "7.1.2" }
|
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
|
||||||
runtime = { id = "org.beryx.runtime", version = "1.13.0" }
|
shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
|
||||||
|
runtime = { id = "org.beryx.runtime", version.ref = "runtime" }
|
||||||
gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" }
|
gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" }
|
||||||
|
versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
|
||||||
|
|||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
30
gradlew
vendored
30
gradlew
vendored
@@ -15,6 +15,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
@@ -55,7 +57,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (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
|
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@@ -83,7 +85,8 @@ done
|
|||||||
# This is normally unused
|
# This is normally unused
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
@@ -111,7 +114,7 @@ case "$( uname )" in #(
|
|||||||
NONSTOP* ) nonstop=true ;;
|
NONSTOP* ) nonstop=true ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
CLASSPATH="\\\"\\\""
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
@@ -130,10 +133,13 @@ location of your Java installation."
|
|||||||
fi
|
fi
|
||||||
else
|
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.
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
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
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
@@ -141,7 +147,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
max*)
|
max*)
|
||||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
warn "Could not query maximum file descriptor limit"
|
warn "Could not query maximum file descriptor limit"
|
||||||
esac
|
esac
|
||||||
@@ -149,7 +155,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
'' | soft) :;; #(
|
'' | soft) :;; #(
|
||||||
*)
|
*)
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
ulimit -n "$MAX_FD" ||
|
ulimit -n "$MAX_FD" ||
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
esac
|
esac
|
||||||
@@ -198,16 +204,16 @@ fi
|
|||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# 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"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command;
|
# Collect all arguments for the java command:
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
# and any embedded shellness will be escaped.
|
||||||
# double quotes to make sure that they get re-expanded; and
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
# * put everything else in single quotes, so that it's not re-expanded.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
-classpath "$CLASSPATH" \
|
-classpath "$CLASSPATH" \
|
||||||
org.gradle.wrapper.GradleWrapperMain \
|
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
# Stop when "xargs" is not available.
|
||||||
|
|||||||
26
gradlew.bat
vendored
26
gradlew.bat
vendored
@@ -13,6 +13,8 @@
|
|||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
|
|||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
@@ -57,22 +59,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
set CLASSPATH=
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import org.openrndr.application
|
|||||||
import org.openrndr.color.ColorRGBa
|
import org.openrndr.color.ColorRGBa
|
||||||
import org.openrndr.draw.loadFont
|
import org.openrndr.draw.loadFont
|
||||||
import org.openrndr.draw.loadImage
|
import org.openrndr.draw.loadImage
|
||||||
import org.openrndr.draw.tint
|
import org.openrndr.extra.color.colormatrix.tint
|
||||||
import kotlin.math.cos
|
import kotlin.math.cos
|
||||||
import kotlin.math.sin
|
import kotlin.math.sin
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user