Browse Source

Upgrade to OPENRNDR 0.3.39

master
Edwin Jakobs 5 years ago
parent
commit
97c55825e2
  1. 71
      build.gradle.kts

71
build.gradle.kts

@ -2,30 +2,56 @@ import org.gradle.internal.os.OperatingSystem
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
/* the name of this project, default is the template version but you are free to change these */
group = "org.openrndr.template" group = "org.openrndr.template"
version = "0.3.9" version = "0.3.10"
val applicationMainClass = "TemplateProgramKt" val applicationMainClass = "TemplateProgramKt"
/* Which additional (ORX) libraries should be added to this project. */
val orxFeatures = setOf(
// "orx-camera",
"orx-compositor",
// "orx-easing",
// "orx-filter-extension",
// "orx-file-watcher",
"orx-fx",
"orx-gui",
// "orx-integral-image",
// "orx-interval-tree",
"orx-image-fit",
// "orx-jumpflood",
// "orx-kinect-v1",
// "orx-kdtree",
// "orx-mesh-generators"
// "orx-midi",
// "orx-noclear",
"orx-noise",
// "orx-obj"
"orx-olive",
// "orx-osc"
// "orx-palette"
// "orx-runway"
"orx-shade-styles"
)
/* Which OPENRNDR libraries should be added to this project? */
val openrndrFeatures = setOf(
"panel",
"video"
)
/* Which version of OPENRNDR, ORX and Panel should be used? */
val openrndrUseSnapshot = false val openrndrUseSnapshot = false
val openrndrVersion = if (openrndrUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.38" val openrndrVersion = if (openrndrUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.39"
val panelUseSnapshot = false val panelUseSnapshot = false
val panelVersion = if (panelUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.20" val panelVersion = if (panelUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.21"
val orxUseSnapshot = false val orxUseSnapshot = false
val orxVersion = if (orxUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.46" val orxVersion = if (orxUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.47"
// supported features are: orx-camera, orx-compositor,orx-easing, orx-filter-extension,orx-file-watcher, orx-fx
// orx-integral-image, orx-interval-tree, orx-jumpflood, orx-kinect-v1, orx-kdtree, orx-mesh-generators,orx-midi, orx-no-clear,
// orx-noise, orx-obj, orx-olive, orx-osc, orx-palette, orx-runway
val orxFeatures = setOf("orx-noise", "orx-fx", "orx-olive")
// supported features are: video, panel
val openrndrFeatures = setOf("video", "panel")
// --------------------------------------------------------------------------------------------------------------------
//<editor-fold desc="This is code for OPENRNDR, no need to edit this .. most of the times">
val supportedPlatforms = setOf("windows", "macos", "linux-x64", "linux-arm64") val supportedPlatforms = setOf("windows", "macos", "linux-x64", "linux-arm64")
val openrndrOs = if (project.hasProperty("targetPlatform")) { val openrndrOs = if (project.hasProperty("targetPlatform")) {
@ -45,12 +71,15 @@ val openrndrOs = if (project.hasProperty("targetPlatform")) {
} }
else -> throw IllegalArgumentException("os not supported") else -> throw IllegalArgumentException("os not supported")
} }
//</editor-fold>
enum class Logging { enum class Logging {
NONE, NONE,
SIMPLE, SIMPLE,
FULL FULL
} }
/* What type of logging should this project use? */
val applicationLogging = Logging.SIMPLE val applicationLogging = Logging.SIMPLE
val kotlinVersion = "1.3.61" val kotlinVersion = "1.3.61"
@ -84,8 +113,14 @@ fun DependencyHandler.orxNatives(module: String): Any {
return "org.openrndr.extra:$module-natives-$openrndrOs:$orxVersion" return "org.openrndr.extra:$module-natives-$openrndrOs:$orxVersion"
} }
dependencies { dependencies {
/* This is where you add additional (third-party) dependencies */
// implementation("org.jsoup:jsoup:1.12.2")
// implementation("com.google.code.gson:gson:2.8.6")
//<editor-fold desc="Managed dependencies">
runtimeOnly(openrndr("gl3")) runtimeOnly(openrndr("gl3"))
runtimeOnly(openrndrNatives("gl3")) runtimeOnly(openrndrNatives("gl3"))
implementation(openrndr("openal")) implementation(openrndr("openal"))
@ -97,7 +132,6 @@ dependencies {
implementation(openrndr("filter")) implementation(openrndr("filter"))
implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.3.3") implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.3.3")
implementation("io.github.microutils", "kotlin-logging","1.7.8") implementation("io.github.microutils", "kotlin-logging","1.7.8")
when(applicationLogging) { when(applicationLogging) {
@ -128,7 +162,7 @@ dependencies {
} }
if ("orx-kinect-v1" in orxFeatures) { if ("orx-kinect-v1" in orxFeatures) {
runtimeOnly("orx-kinect-v1") runtimeOnly(orxNatives("orx-kinect-v1"))
} }
if ("orx-olive" in orxFeatures) { if ("orx-olive" in orxFeatures) {
@ -137,6 +171,7 @@ dependencies {
implementation(kotlin("stdlib-jdk8")) implementation(kotlin("stdlib-jdk8"))
testImplementation("junit", "junit", "4.12") testImplementation("junit", "junit", "4.12")
//</editor-fold>
} }
// -------------------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------------------

Loading…
Cancel
Save