Merge pull request #44 from matejsemancik/feature/game-of-life-text-size

game of life text size
matejsemancik · Nov 15, 2019 · 069da3b · 069da3b
2 parents f130ea0 + 8a818de
commit 069da3b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/main/kotlin/dev/matsem/astral/Config.kt b/src/main/kotlin/dev/matsem/astral/Config.kt
@@ -3,7 +3,7 @@ package dev.matsem.astral
 object Config {
 
     object Sketch {
-        const val DEFAULT_SELECTOR = 'o'
+        const val DEFAULT_SELECTOR = 'g'
     }
 
     object Color {

diff --git a/src/main/kotlin/dev/matsem/astral/sketches/gameoflife/GameOfLifeSketch.kt b/src/main/kotlin/dev/matsem/astral/sketches/gameoflife/GameOfLifeSketch.kt
@@ -6,10 +6,7 @@ import dev.matsem.astral.sketches.SketchLoader
 import dev.matsem.astral.tools.audio.beatcounter.BeatCounter
 import dev.matsem.astral.tools.audio.beatcounter.OnKick
 import dev.matsem.astral.tools.automator.MidiAutomator
-import dev.matsem.astral.tools.extensions.remap
-import dev.matsem.astral.tools.extensions.resizeRatioAware
-import dev.matsem.astral.tools.extensions.shorterDimension
-import dev.matsem.astral.tools.extensions.translateCenter
+import dev.matsem.astral.tools.extensions.*
 import dev.matsem.astral.tools.galaxy.Galaxy
 import org.koin.core.inject
 import processing.core.PApplet.constrain
@@ -62,6 +59,7 @@ class GameOfLifeSketch : BaseSketch() {
     private val outlineEnabledButton = galaxy.createToggleButton(channel = 11, cc = 12, defaultValue = true)
 
     private val overlayButtons = galaxy.createButtonGroup(11, listOf(13, 14, 15, 16, 17, 18, 19, 20, 21), listOf())
+    private val overlaySizeSlider = galaxy.createPot(channel = 11, cc = 22, initialValue = 1f)
 
     override fun onBecameActive() = with(sketch) {
         rectMode(PConstants.CORNER)
@@ -131,7 +129,7 @@ class GameOfLifeSketch : BaseSketch() {
         overlayText?.let { text ->
             textFont(pixelFont)
             textAlign(CENTER, CENTER)
-            textSize(24f)
+            textSize(overlaySizeSlider.rawValue.midiRange(12f, 24f))
 
             // Text stroke hack
             if (outlineEnabledButton.isPressed) {
@@ -148,8 +146,11 @@ class GameOfLifeSketch : BaseSketch() {
         }
 
         overlayImage?.let { image ->
+            pushMatrix()
             translateCenter()
+            scale(overlaySizeSlider.rawValue.midiRange(0.8f, 1.4f))
             image(image, -image.width / 2f, -image.height / 2f)
+            popMatrix()
         }
 
         endDraw()

diff --git a/touchosc/Astral.touchosc b/touchosc/Astral.touchosc