From a8c2f7217cecbb0a161a9e36aedc6e4cae16f8b4 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Wed, 19 Apr 2023 09:55:24 +0200 Subject: [PATCH] Update demos to use MouseTracker (#303) --- orx-jumpflood/src/jvmDemo/kotlin/DemoDirectionField01.kt | 4 +++- orx-jumpflood/src/jvmDemo/kotlin/DemoDistanceField01.kt | 4 +++- orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF01.kt | 5 ++++- orx-jvm/orx-minim/src/demo/kotlin/DemoAdditive01.kt | 6 ++++-- .../orx-poisson-fill/src/demo/kotlin/DemoPoissonFill01.kt | 4 +++- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/orx-jumpflood/src/jvmDemo/kotlin/DemoDirectionField01.kt b/orx-jumpflood/src/jvmDemo/kotlin/DemoDirectionField01.kt index e9845a6e..c6d167a9 100644 --- a/orx-jumpflood/src/jvmDemo/kotlin/DemoDirectionField01.kt +++ b/orx-jumpflood/src/jvmDemo/kotlin/DemoDirectionField01.kt @@ -1,3 +1,4 @@ +import org.openrndr.MouseTracker import org.openrndr.application import org.openrndr.color.ColorRGBa import org.openrndr.draw.* @@ -37,6 +38,7 @@ fun main() = application { //x_fill.rgb = vec3(1.0 / (x_fill.r + x_fill.g)); """ } + val mouseTracker = MouseTracker(mouse) extend { // Draw moving white shapes on a black background @@ -68,7 +70,7 @@ fun main() = application { directionalField.apply(rt.colorBuffer(0), result) drawer.isolated { - if (mouse.pressedButtons.isEmpty()) { + if (mouseTracker.pressedButtons.isEmpty()) { shadeStyle = shader image(result) } else { diff --git a/orx-jumpflood/src/jvmDemo/kotlin/DemoDistanceField01.kt b/orx-jumpflood/src/jvmDemo/kotlin/DemoDistanceField01.kt index ff77c7ae..c6cdbf6c 100644 --- a/orx-jumpflood/src/jvmDemo/kotlin/DemoDistanceField01.kt +++ b/orx-jumpflood/src/jvmDemo/kotlin/DemoDistanceField01.kt @@ -1,3 +1,4 @@ +import org.openrndr.MouseTracker import org.openrndr.application import org.openrndr.color.ColorRGBa import org.openrndr.draw.* @@ -42,6 +43,7 @@ fun main() = application { vec3(1.0, 0.0, 0.0) : vec3(0.0, 1.0, 1.0)); """ } + val mouseTracker = MouseTracker(mouse) extend { // Draw moving white shapes on a black background @@ -73,7 +75,7 @@ fun main() = application { distanceField.apply(rt.colorBuffer(0), result) drawer.isolated { - if (mouse.pressedButtons.isEmpty()) { + if (mouseTracker.pressedButtons.isEmpty()) { shadeStyle = shader image(result) } else { diff --git a/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF01.kt b/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF01.kt index 3afd0270..e63ce0fb 100644 --- a/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF01.kt +++ b/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF01.kt @@ -1,3 +1,4 @@ +import org.openrndr.MouseTracker import org.openrndr.application import org.openrndr.draw.ColorFormat import org.openrndr.draw.ColorType @@ -19,8 +20,10 @@ fun main() { sdf.setShapes(shapes) sdf.apply(emptyArray(), df) + val mouseTracker = MouseTracker(mouse) + extend { - if(mouse.pressedButtons.isEmpty()) + if(mouseTracker.pressedButtons.isEmpty()) drawer.image(df) else drawer.shapes(shapes) diff --git a/orx-jvm/orx-minim/src/demo/kotlin/DemoAdditive01.kt b/orx-jvm/orx-minim/src/demo/kotlin/DemoAdditive01.kt index 13c0233e..8eccedbf 100644 --- a/orx-jvm/orx-minim/src/demo/kotlin/DemoAdditive01.kt +++ b/orx-jvm/orx-minim/src/demo/kotlin/DemoAdditive01.kt @@ -1,5 +1,6 @@ import ddf.minim.ugens.Oscil import ddf.minim.ugens.Pan +import org.openrndr.MouseTracker import org.openrndr.application import org.openrndr.color.rgb import org.openrndr.extra.minim.minim @@ -31,7 +32,7 @@ fun main() { // and the current amplitude defined by the lfo (low frequency // oscillator). val synths = List(20) { - // By default Oscil creates sine waves, but it can be changed. + // By default, Oscil creates sine waves, but it can be changed. val lfo = Oscil( Random.nextFloat() * 0.1f + 0.005f, 0.05f @@ -56,6 +57,7 @@ fun main() { } val bgColor = rgb(0.094, 0.188, 0.349) val lineColor = rgb(0.992, 0.918, 0.671) + val mouseTracker = MouseTracker(mouse) extend { drawer.clear(bgColor) @@ -78,7 +80,7 @@ fun main() { circle(pos, 500 * lfo.lastValues.last().toDouble()) } } - if (mouse.pressedButtons.isNotEmpty()) { + if (mouseTracker.pressedButtons.isNotEmpty()) { synths.random().first.setFrequency(randomFreq()) } } diff --git a/orx-jvm/orx-poisson-fill/src/demo/kotlin/DemoPoissonFill01.kt b/orx-jvm/orx-poisson-fill/src/demo/kotlin/DemoPoissonFill01.kt index 5aa59874..f25208ed 100644 --- a/orx-jvm/orx-poisson-fill/src/demo/kotlin/DemoPoissonFill01.kt +++ b/orx-jvm/orx-poisson-fill/src/demo/kotlin/DemoPoissonFill01.kt @@ -1,4 +1,5 @@ import org.openrndr.MouseButton +import org.openrndr.MouseTracker import org.openrndr.application import org.openrndr.color.ColorHSVa import org.openrndr.color.ColorRGBa @@ -41,6 +42,7 @@ fun main() { 100.0 + it * 10.0), Polar(Random.double(-1.0, 1.0), 0.0)) } + val mouseTracker = MouseTracker(mouse) extend { drawer.isolatedWithTarget(dry) { @@ -61,7 +63,7 @@ fun main() { // draw dark gray window border. // hold mouse button to fade in. - borderOpacity += if (MouseButton.LEFT in mouse.pressedButtons) 0.01 else -0.01 + borderOpacity += if (MouseButton.LEFT in mouseTracker.pressedButtons) 0.01 else -0.01 borderOpacity = borderOpacity.clamp(0.0, 1.0) stroke = rgb(0.2).opacify(borderOpacity) fill = null