diff --git a/build.gradle.kts b/build.gradle.kts index 98b3bf6..4aeba45 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,10 +8,17 @@ plugins { kotlin("jvm") version("1.3.50") } group = "org.openrndr.template" -version = "0.3.5" +version = "0.3.6" val applicationMainClass = "TemplateProgramKt" -val applicationFullLogging = false + +enum class Logging { + NONE, + SIMPLE, + FULL +} + +val applicationLogging = Logging.SIMPLE val openrndrUseSnapshot = false val openrndrVersion = if (openrndrUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.35" @@ -29,11 +36,11 @@ val panelUseSnapshot = false val panelVersion = if (panelUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.17-m3" 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.38" // 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 +// 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-osc val orxFeatures = setOf("orx-noise") @@ -68,14 +75,20 @@ dependencies { compile("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.3.0") - 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") + compile("io.github.microutils", "kotlin-logging","1.7.6") + + when(applicationLogging) { + Logging.NONE -> { + runtime("org.slf4j","slf4j-nop","1.7.29") + } + Logging.SIMPLE -> { + runtime("org.slf4j","slf4j-simple","1.7.29") + } + Logging.FULL -> { + runtime("org.apache.logging.log4j", "log4j-slf4j-impl", "2.12.1") + 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) { diff --git a/src/main/kotlin/TemplateProgram.kt b/src/main/kotlin/TemplateProgram.kt index 3187dc8..c8d0c62 100644 --- a/src/main/kotlin/TemplateProgram.kt +++ b/src/main/kotlin/TemplateProgram.kt @@ -1,8 +1,10 @@ import org.openrndr.application import org.openrndr.color.ColorRGBa -import org.openrndr.draw.FontImageMap +import org.openrndr.draw.loadFont import org.openrndr.draw.loadImage import org.openrndr.draw.tint +import kotlin.math.cos +import kotlin.math.sin fun main() = application { configure { @@ -12,19 +14,19 @@ fun main() = application { program { - val image = loadImage("file:data/images/pm5544.png") - val font = FontImageMap.fromUrl("file:data/fonts/IBMPlexMono-Regular.ttf", 64.0) + val image = loadImage("data/images/pm5544.png") + val font = loadFont("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.circle(cos(seconds) * width / 2.0 + width / 2.0, 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) + drawer.text("OPENRNDR", width / 2.0, height / 2.0) } } } \ No newline at end of file