Compare commits

..

3 Commits

Author SHA1 Message Date
Edwin Jakobs
52649f84db Bumped orx to 0.3.34 2019-09-06 16:30:41 +02:00
edwin
2e52f074f2 Added natives for orx-kinect-v1 2019-08-28 12:58:20 +02:00
edwin
7d6ac87a34 Bumped OPENRNDR to 0.3.35, orx to 0.3.32, kotlin to 1.3.50 2019-08-27 19:38:24 +02:00

View File

@@ -8,7 +8,7 @@ plugins {
kotlin("jvm") version("1.3.50") kotlin("jvm") version("1.3.50")
} }
group = "org.openrndr.template" group = "org.openrndr.template"
version = "0.3.5" version = "0.3.4"
val applicationMainClass = "TemplateProgramKt" val applicationMainClass = "TemplateProgramKt"
val applicationFullLogging = false val applicationFullLogging = false
@@ -29,9 +29,9 @@ val panelUseSnapshot = false
val panelVersion = if (panelUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.17-m3" val panelVersion = if (panelUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.17-m3"
val orxUseSnapshot = false val orxUseSnapshot = false
val orxVersion = if (orxUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.36" val orxVersion = if (orxUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.34"
// supported features are: orx-camera, orx-compositor,orx-easing, orx-filter-extension,orx-file-watcher, // supported features are: orx-camera, orx-compositor,orx-easing, orx-filter-extension,orx-file-watcher, orx-kinect-v1
// orx-integral-image, orx-interval-tree, orx-jumpflood,orx-kdtree, orx-mesh-generators,orx-midi, orx-no-clear, // orx-integral-image, orx-interval-tree, orx-jumpflood,orx-kdtree, orx-mesh-generators,orx-midi, orx-no-clear,
// orx-noise, orx-obj, orx-olive // orx-noise, orx-obj, orx-olive
@@ -57,6 +57,10 @@ fun DependencyHandler.openrndrNatives(module: String): Any {
return "org.openrndr:openrndr-$module-natives-$openrndrOs:$openrndrVersion" return "org.openrndr:openrndr-$module-natives-$openrndrOs:$openrndrVersion"
} }
fun DependencyHandler.orxNatives(module: String): Any {
return "org.openrndr.extra:$module-natives-$openrndrOs:$orxVersion"
}
dependencies { dependencies {
runtime(openrndr("gl3")) runtime(openrndr("gl3"))
runtime(openrndrNatives("gl3")) runtime(openrndrNatives("gl3"))
@@ -66,7 +70,7 @@ dependencies {
compile(openrndr("extensions")) compile(openrndr("extensions"))
compile(openrndr("filter")) compile(openrndr("filter"))
compile("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.3.0") compile("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.3.0-RC")
compile("io.github.microutils", "kotlin-logging","1.7.2") compile("io.github.microutils", "kotlin-logging","1.7.2")
@@ -95,6 +99,10 @@ dependencies {
compile("org.jetbrains.kotlin", "kotlin-scripting-compiler-embeddable") compile("org.jetbrains.kotlin", "kotlin-scripting-compiler-embeddable")
} }
if ("orx-kinect-v1" in orxFeatures) {
runtime(orxNatives("orx-kinect-v1"))
}
implementation(kotlin("stdlib-jdk8")) implementation(kotlin("stdlib-jdk8"))
testCompile("junit", "junit", "4.12") testCompile("junit", "junit", "4.12")
} }
@@ -130,4 +138,4 @@ tasks.create("zipDistribution", Zip::class.java) {
tasks.create("run", JavaExec::class.java) { tasks.create("run", JavaExec::class.java) {
main = applicationMainClass main = applicationMainClass
classpath = sourceSets.main.get().runtimeClasspath classpath = sourceSets.main.get().runtimeClasspath
}.dependsOn(tasks.build) }.dependsOn(tasks.build)