More adopted moth + warmitup

2 files changed, 8 insertions, 46 deletions

diff --git a/src/main/kotlin/org/openrndr/Preload.kt b/src/main/kotlin/org/openrndr/Preload.kt
index 42bab94..0fd1656 100644
--- a/src/main/kotlin/org/openrndr/Preload.kt
+++ b/src/main/kotlin/org/openrndr/Preload.kt
@@ -9,10 +9,16 @@ import phenax.utils.*
 class Preload : ApplicationPreload() {
   override fun onProgramSetup(program: Program) {
     println("Program: ${program.name}")
+    val fileSuffix =
+            if (System.getenv("PHENAX_FILE_SUFFIX").isNullOrEmpty()) {
+              ""
+            } else {
+              ".${System.getenv("PHENAX_FILE_SUFFIX") ?: ""}"
+            }
     if (recordingEnabled) {
       program.extend(ScreenRecorder()) {
         outputToVideo = true
-        outputFile = "video/${program.name}.mp4"
+        outputFile = "video/${program.name}${fileSuffix}.mp4"
         frameRate = 60
         maximumDuration = recordDuration()
         quitAfterMaximum = true
@@ -20,7 +26,7 @@ class Preload : ApplicationPreload() {
       }
     } else if (screenshotEnabled) {
       program.extend(SingleScreenshot()) {
-        outputFile = "screenshot/${program.name}.png"
+        outputFile = "screenshot/${program.name}${fileSuffix}.png"
         async = false
         quitAfterScreenshot = true
       }
diff --git a/src/main/kotlin/trtrfr/TrtrfrProgram.kt b/src/main/kotlin/trtrfr/TrtrfrProgram.kt
index 7d2f959..4d26c11 100644
--- a/src/main/kotlin/trtrfr/TrtrfrProgram.kt
+++ b/src/main/kotlin/trtrfr/TrtrfrProgram.kt
@@ -4,7 +4,6 @@ import org.openrndr.application
 import org.openrndr.color.*
 import org.openrndr.draw.*
 import org.openrndr.math.IntVector2
-import org.openrndr.math.Vector2
 import phenax.utils.*
 
 fun main() = application {
@@ -31,33 +30,8 @@ fun main() = application {
     val outputSize = IntVector2(width, height)
     val outputBuffer = colorBuffer(outputSize.x, outputSize.y, type = ColorType.UINT8)
 
-    var scale: Double = 1.0
-    var offset: Vector2 = Vector2.ZERO
-    var moving = false
-
-    program.keyboard.keyDown.listen {
-      if (it.name == "r") {
-        scale = 1.0
-        offset = Vector2.ZERO
-      }
-    }
-    program.mouse.buttonDown.listen { moving = true }
-    program.mouse.buttonUp.listen { moving = false }
-    var lastPos = Vector2.ZERO
-    program.mouse.moved.listen {
-      val dimens = Vector2(program.width.toDouble(), program.height.toDouble())
-      var pos = (Vector2(it.position.x, -it.position.y) - dimens / 2.0).div(dimens)
-      val del = lastPos - pos
-      lastPos = pos
-      if (moving) offset = offset + del * 5.0 / scale
-    }
-
-    program.mouse.scrolled.listen { scale = scale * (1 + it.rotation.y / 3) }
-
     extend {
       cs.uniform("enable_antialiasing", enableAntialiasing)
-      cs.uniform("offset", offset)
-      cs.uniform("scale", scale)
       cs.uniform("seconds", seconds)
       cs.image("output_image", 0, outputBuffer.imageBinding(0, ImageAccess.WRITE))
       cs.execute(
@@ -66,24 +40,6 @@ fun main() = application {
               1
       )
       drawer.image(outputBuffer, 0.0, 0.0, width.toDouble(), height.toDouble())
-
-      // val shadow = outputBuffer.shadow
-      // shadow.download()
-      // for (y in 0 until outputBuffer.height) {
-      //   for (x in 0 until outputBuffer.width) {
-      //     val c = shadow[x, y]
-      //     shadow[x, y] =
-      //             ColorRGBa(
-      //                     Math.pow(c.r, (1.0 / 2.2)),
-      //                     Math.pow(c.g, (1.0 / 2.2)),
-      //                     Math.pow(c.b, (1.0 / 2.2)),
-      //                     c.alpha
-      //             )
-      //   }
-      // }
-      // shadow.upload()
-      // outputBuffer.saveToFile(java.io.File("screenshot/${program.name}.png"), async = false)
-      // program.application.exit()
     }
   }
 }