Remove unnecessary uses of "takeScreenshot" (#349)

2024-09-02 12:15:44 +02:00
parent 141d1fa789
commit f713ca3a3d
25 changed files with 34 additions and 141 deletions
--- a/orx-jvm/orx-git-archiver/src/demo/kotlin/GitArchiverDemo01.kt
+++ b/orx-jvm/orx-git-archiver/src/demo/kotlin/GitArchiverDemo01.kt
@@ -6,11 +6,6 @@
 //
 //fun main() = application {
 //    program {
-//        if (System.getProperty("takeScreenshot") == "true") {
-//            extend(SingleScreenshot()) {
-//                this.outputFile = System.getProperty("screenshotPath")
-//            }
-//        }
 //        val ga = extend(GitArchiver()) {
 //            commitOnRun = true
 //            commitOnRequestAssets = false
--- a/orx-jvm/orx-gui/src/demo/kotlin/DemoAppearance01.kt
+++ b/orx-jvm/orx-gui/src/demo/kotlin/DemoAppearance01.kt
@@ -12,13 +12,6 @@ import org.openrndr.shape.Circle
 */
 fun main() = application {
    program {
-        // -- this block is for automation purposes only
-        if (System.getProperty("takeScreenshot") == "true") {
-            extend(SingleScreenshot()) {
-                this.outputFile = System.getProperty("screenshotPath")
-            }
-        }
-
        val gui = GUI(GUIAppearance(baseColor = ColorRGBa.GRAY.opacify(0.9), barWidth = 400))
        gui.compartmentsCollapsedByDefault = false

--- a/orx-jvm/orx-keyframer/src/demo/kotlin/DemoEvelope01.kt
+++ b/orx-jvm/orx-keyframer/src/demo/kotlin/DemoEvelope01.kt
@@ -11,11 +11,6 @@ fun main() = application {
        }
        val animation = Animation()
        animation.loadFromJson(URL(resourceUrl("/demo-envelope-01.json")))
-        if (System.getProperty("takeScreenshot") == "true") {
-            extend(SingleScreenshot()) {
-                this.outputFile = System.getProperty("screenshotPath")
-            }
-        }
        extend {
            animation(seconds)
            drawer.circle(animation.position, 100.0)
--- a/orx-jvm/orx-keyframer/src/demo/kotlin/DemoFull01.kt
+++ b/orx-jvm/orx-keyframer/src/demo/kotlin/DemoFull01.kt
@@ -14,11 +14,6 @@ fun main() = application {
        }
        val animation = Animation()
        animation.loadFromJson(URL(resourceUrl("/demo-full-01.json")), format = KeyframerFormat.FULL)
-        if (System.getProperty("takeScreenshot") == "true") {
-            extend(SingleScreenshot()) {
-                this.outputFile = System.getProperty("screenshotPath")
-            }
-        }
        extend {
            animation(seconds)
            drawer.fill = animation.color
--- a/orx-jvm/orx-keyframer/src/demo/kotlin/DemoScrub01.kt
+++ b/orx-jvm/orx-keyframer/src/demo/kotlin/DemoScrub01.kt
@@ -30,11 +30,6 @@ fun main() = application {
                }
            }
        }
-        if (System.getProperty("takeScreenshot") == "true") {
-            extend(SingleScreenshot()) {
-                this.outputFile = System.getProperty("screenshotPath")
-            }
-        }
        extend(cm)
        class Animation: Keyframer() {
            val position by Vector2Channel(arrayOf("x", "y"))
--- a/orx-jvm/orx-keyframer/src/demo/kotlin/DemoSimple01.kt
+++ b/orx-jvm/orx-keyframer/src/demo/kotlin/DemoSimple01.kt
@@ -11,11 +11,6 @@ fun main() = application {
        }
        val animation = Animation()
        animation.loadFromJson(URL(resourceUrl("/demo-simple-01.json")))
-        if (System.getProperty("takeScreenshot") == "true") {
-            extend(SingleScreenshot()) {
-                this.outputFile = System.getProperty("screenshotPath")
-            }
-        }
        extend {
            animation(seconds)
            drawer.circle(animation.position, 100.0)
--- a/orx-jvm/orx-keyframer/src/demo/kotlin/DemoSimple02.kt
+++ b/orx-jvm/orx-keyframer/src/demo/kotlin/DemoSimple02.kt
@@ -13,11 +13,6 @@ fun main() = application {
        }
        val animation = Animation()
        animation.loadFromJson(URL(resourceUrl("/demo-simple-02.json")))
-        if (System.getProperty("takeScreenshot") == "true") {
-            extend(SingleScreenshot()) {
-                this.outputFile = System.getProperty("screenshotPath")
-            }
-        }
        extend {
            animation(seconds)
            drawer.fill = animation.color
--- a/orx-jvm/orx-keyframer/src/demo/kotlin/DemoSimpleExpressions01.kt
+++ b/orx-jvm/orx-keyframer/src/demo/kotlin/DemoSimpleExpressions01.kt
@@ -14,11 +14,6 @@ fun main() = application {
        val animation = Animation()
        animation.loadFromJson(URL(resourceUrl("/demo-simple-expressions-01.json")),
                parameters = mapOf("cycleDuration" to 2.0))
-        if (System.getProperty("takeScreenshot") == "true") {
-            extend(SingleScreenshot()) {
-                this.outputFile = System.getProperty("screenshotPath")
-            }
-        }
        extend {
            animation(seconds)
            drawer.circle(animation.position, animation.radius)
--- a/orx-jvm/orx-panel/src/demo/kotlin/DemoHorizontalLayout01.kt
+++ b/orx-jvm/orx-panel/src/demo/kotlin/DemoHorizontalLayout01.kt
@@ -12,12 +12,6 @@ import org.openrndr.panel.style.*

 fun main() = application {
    program {
-        // -- this block is for automation purposes only
-        if (System.getProperty("takeScreenshot") == "true") {
-            extend(SingleScreenshot()) {
-                this.outputFile = System.getProperty("screenshotPath")
-            }
-        }
        val cm = controlManager {
            styleSheet(has class_ "horizontal") {
                paddingLeft = 10.px
--- a/orx-jvm/orx-panel/src/demo/kotlin/DemoVerticalLayout01.kt
+++ b/orx-jvm/orx-panel/src/demo/kotlin/DemoVerticalLayout01.kt
@@ -8,12 +8,6 @@ import org.openrndr.panel.style.*

 fun main() = application {
    program {
-        // -- this block is for automation purposes only
-        if (System.getProperty("takeScreenshot") == "true") {
-            extend(SingleScreenshot()) {
-                this.outputFile = System.getProperty("screenshotPath")
-            }
-        }
        val cm = controlManager {
            styleSheet(has class_ "side-bar") {
                this.height = 100.percent
--- a/orx-jvm/orx-panel/src/demo/kotlin/DemoWatchDiv01.kt
+++ b/orx-jvm/orx-panel/src/demo/kotlin/DemoWatchDiv01.kt
@@ -41,12 +41,6 @@ fun main() = application {
    }

    program {
-        // -- this block is for automation purposes only
-        if (System.getProperty("takeScreenshot") == "true") {
-            extend(SingleScreenshot()) {
-                this.outputFile = System.getProperty("screenshotPath")
-            }
-        }
        val programState = ProgramState()
        val cm = controlManager {
            layout {
--- a/orx-jvm/orx-panel/src/demo/kotlin/DemoWatchObjectDiv01.kt
+++ b/orx-jvm/orx-panel/src/demo/kotlin/DemoWatchObjectDiv01.kt
@@ -17,12 +17,6 @@ fun main() = application {
        var z = 0
    }
    program {
-        // -- this block is for automation purposes only
-        if (System.getProperty("takeScreenshot") == "true") {
-            extend(SingleScreenshot()) {
-                this.outputFile = System.getProperty("screenshotPath")
-            }
-        }
        val programState = State()
        val cm = controlManager {
            layout {
--- a/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControl.kt
+++ b/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControl.kt
@@ -15,13 +15,6 @@ fun main() = application {
    }

    program {
-        // -- this block is for automation purposes only
-        if (System.getProperty("takeScreenshot") == "true") {
-            extend(SingleScreenshot()) {
-                this.outputFile = System.getProperty("screenshotPath")
-            }
-        }
-
        val rabbit = RabbitControlServer()
        val font = loadFont("demo-data/fonts/IBMPlexMono-Regular.ttf", 20.0)
        val settings = object {
--- a/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControlManualOverlay.kt
+++ b/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControlManualOverlay.kt
@@ -12,13 +12,6 @@ fun main() = application {
    }

    program {
-        // -- this block is for automation purposes only
-        if (System.getProperty("takeScreenshot") == "true") {
-            extend(SingleScreenshot()) {
-                this.outputFile = System.getProperty("screenshotPath")
-            }
-        }
-
        val rabbit = RabbitControlServer(showQRUntilClientConnects = false)

        val settings = object {
--- a/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitHole.kt
+++ b/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitHole.kt
@@ -15,13 +15,6 @@ fun main() = application {
    }

    program {
-        // -- this block is for automation purposes only
-        if (System.getProperty("takeScreenshot") == "true") {
-            extend(SingleScreenshot()) {
-                this.outputFile = System.getProperty("screenshotPath")
-            }
-        }
-
        /**
         * Start RabbitControlServer with a Rabbithole with key 'orxtest'
         * Please visit https://rabbithole.rabbitcontrol.cc for more information.