diff --git a/buildSrc/build.garble b/buildSrc/build.garble deleted file mode 100644 index 7b1fd49a..00000000 --- a/buildSrc/build.garble +++ /dev/null @@ -1,51 +0,0 @@ - -project.ext.lwjglVersion = "3.2.3" -def osArch = System.getProperty("os.arch") -project.ext.arch = osArch.startsWith("armv8") || osArch.contains("64") ? "x86-64" : "x86" - -//switch ( OperatingSystem.current() ) { -// case OperatingSystem.WINDOWS: -// project.ext.OS = "windows" -// break -// case OperatingSystem.LINUX: -// project.ext.OS = "linux" -// break -// case OperatingSystem.MAC_OS: -// project.ext.OS = "macos" -// break -//} -project.ext.OS = "linux" - -class LwjglRule implements ComponentMetadataRule { //val os: String, val arch: String, val classifier: String) - private def nativeVariants = [ - [os: OperatingSystemFamily.LINUX, arch: "arm32", classifier: "natives-linux-arm32"], - [os: OperatingSystemFamily.LINUX, arch: "arm64", classifier: "natives-linux-arm64"], - [os: OperatingSystemFamily.LINUX, arch: "x86-64", classifier: "natives-linux"], - [os: OperatingSystemFamily.WINDOWS, arch: "x86", classifier: "natives-windows-x86"], - [os: OperatingSystemFamily.WINDOWS, arch: "x86-64", classifier: "natives-windows"], - [os: OperatingSystemFamily.MACOS, arch: "x86-64", classifier: "natives-macos"] - ] - - @javax.inject.Inject - ObjectFactory getObjects() { } - - void execute(ComponentMetadataContext context) { - context.details.withVariant("runtime") { - attributes { - attributes.attribute(OperatingSystemFamily.OPERATING_SYSTEM_ATTRIBUTE, objects.named(OperatingSystemFamily, "none")) - attributes.attribute(MachineArchitecture.ARCHITECTURE_ATTRIBUTE, objects.named(MachineArchitecture, "none")) - } - } - nativeVariants.each { variantDefinition -> - context.details.addVariant("${variantDefinition.classifier}-runtime", "runtime") { - attributes { - attributes.attribute(OperatingSystemFamily.OPERATING_SYSTEM_ATTRIBUTE, objects.named(OperatingSystemFamily, variantDefinition.os)) - attributes.attribute(MachineArchitecture.ARCHITECTURE_ATTRIBUTE, objects.named(MachineArchitecture, variantDefinition.arch)) - } - withFiles { - addFile("${context.details.id.name}-${context.details.id.version}-${variantDefinition.classifier}.jar") - } - } - } - } -} \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 638ca742..09adf245 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -3,12 +3,36 @@ plugins { `kotlin-dsl` } +sourceSets { + + val preload by creating { + this.java { + srcDir("src/preload/kotlin") + } + } + val main by getting { + + + } + +} repositories { mavenCentral() + mavenLocal() gradlePluginPortal() } + dependencies { implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30") + val preloadImplementation by configurations.getting { } + preloadImplementation("org.openrndr:openrndr-application:0.5.1-SNAPSHOT") + preloadImplementation("org.openrndr:openrndr-extensions:0.5.1-SNAPSHOT") } + +tasks.all { + println(this.name) + +} +tasks.getByName("compileKotlin").dependsOn("compilePreloadKotlin") \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/orx.collect-screenshots.gradle.kts b/buildSrc/src/main/kotlin/CollectScreenShots.kt similarity index 80% rename from buildSrc/src/main/kotlin/orx.collect-screenshots.gradle.kts rename to buildSrc/src/main/kotlin/CollectScreenShots.kt index af2248e3..eb1775ac 100644 --- a/buildSrc/src/main/kotlin/orx.collect-screenshots.gradle.kts +++ b/buildSrc/src/main/kotlin/CollectScreenShots.kt @@ -1,5 +1,17 @@ +import org.gradle.api.DefaultTask +import org.gradle.api.file.DirectoryProperty +import org.gradle.api.file.FileCollection +import org.gradle.api.file.FileType +import org.gradle.api.provider.ListProperty +import org.gradle.api.provider.Property +import org.gradle.api.tasks.* +import org.gradle.kotlin.dsl.register +import org.gradle.work.Incremental +import org.gradle.work.InputChanges import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmCompilation +import java.io.File import java.net.URLClassLoader +import javax.inject.Inject abstract class CollectScreenshotsTask @Inject constructor() : DefaultTask() { @get:Incremental @@ -22,6 +34,11 @@ abstract class CollectScreenshotsTask @Inject constructor() : DefaultTask() { } @TaskAction fun execute(inputChanges: InputChanges) { + val preloadClass = File(project.rootProject.projectDir, "buildSrc/build/classes/kotlin/preload") + require(preloadClass.exists()) { + "preload class not found: '${preloadClass.absolutePath}'" + + } inputChanges.getFileChanges(inputDir).forEach { change -> if (change.fileType == FileType.DIRECTORY) return@forEach if (change.file.extension == "class" && !(change.file.name.contains("$"))) { @@ -29,21 +46,19 @@ abstract class CollectScreenshotsTask @Inject constructor() : DefaultTask() { if (klassName.dropLast(2) in ignore.get()) return@forEach - val cp = (runtimeDependencies.get().map { it.toURI().toURL() } + inputDir.get().asFile.toURI().toURL()) + val cp = (runtimeDependencies.get().map { it.toURI().toURL() } + + inputDir.get().asFile.toURI().toURL() + ) .toTypedArray() val ucl = URLClassLoader(cp) - - - - val klass = ucl.loadClass(klassName) println("Collecting screenshot for ${klassName} ${klass}") val mainMethod = klass.getMethod("main") println(mainMethod) project.javaexec { - this.classpath += project.files(inputDir.get().asFile) + this.classpath += project.files(inputDir.get().asFile, preloadClass) this.classpath += runtimeDependencies.get() this.mainClass.set(klassName) this.workingDir(project.rootProject.projectDir) @@ -84,7 +99,9 @@ object ScreenshotsHelper { task.inputDir.set(output.classesDirs.first()) task.runtimeDependencies.set(runtimeDependencyFiles) task.config() + task.dependsOn(this.compileKotlinTask) return task + } } diff --git a/buildSrc/src/main/kotlin/orx.embed-shaders.gradle.kts b/buildSrc/src/main/kotlin/EmbedShaders.kt similarity index 85% rename from buildSrc/src/main/kotlin/orx.embed-shaders.gradle.kts rename to buildSrc/src/main/kotlin/EmbedShaders.kt index aadec6a7..cba188c2 100644 --- a/buildSrc/src/main/kotlin/orx.embed-shaders.gradle.kts +++ b/buildSrc/src/main/kotlin/EmbedShaders.kt @@ -1,3 +1,12 @@ +import org.gradle.api.DefaultTask +import org.gradle.api.file.DirectoryProperty +import org.gradle.api.file.FileType +import org.gradle.api.provider.Property +import org.gradle.api.tasks.* +import org.gradle.work.ChangeType +import org.gradle.work.Incremental +import org.gradle.work.InputChanges +import org.gradle.workers.WorkerExecutor import javax.inject.Inject abstract class EmbedShadersTask : DefaultTask() { @@ -28,6 +37,7 @@ abstract class EmbedShadersTask : DefaultTask() { @TaskAction fun execute(inputChanges: InputChanges) { + inputChanges.getFileChanges(inputDir).forEach { change -> if (change.fileType == FileType.DIRECTORY) return@forEach val name = "${namePrefix.get()}${change.file.nameWithoutExtension.replace("-", "_")}" diff --git a/buildSrc/src/preload/kotlin/ApplicationPreload.kt b/buildSrc/src/preload/kotlin/ApplicationPreload.kt new file mode 100644 index 00000000..65bb30f0 --- /dev/null +++ b/buildSrc/src/preload/kotlin/ApplicationPreload.kt @@ -0,0 +1,18 @@ +package org.openrndr + +import org.openrndr.ApplicationPreload +import org.openrndr.extensions.SingleScreenshot + +class Preload : ApplicationPreload() { + override fun onConfiguration(configuration: Configuration) { +// configuration.width = 1280 +// configuration.height = 720 + } + override fun onProgramSetup(program: Program) { + println("installing single screenshot extension at 0") + program.extensions.add(0, SingleScreenshot().apply { + this.outputFile = System.getProperty("screenshotPath") + setup(program) + }) + } +} \ No newline at end of file diff --git a/orx-camera/build.gradle.kts b/orx-camera/build.gradle.kts index 6e6dff4c..1af12553 100644 --- a/orx-camera/build.gradle.kts +++ b/orx-camera/build.gradle.kts @@ -1,9 +1,8 @@ -import Orx_embed_shaders_gradle.EmbedShadersTask +import EmbedShadersTask plugins { kotlin("multiplatform") kotlin("plugin.serialization") - id("orx.embed-shaders") } val kotlinxSerializationVersion: String by rootProject.extra diff --git a/orx-color/build.gradle.kts b/orx-color/build.gradle.kts index 82839061..1ae6c2b3 100644 --- a/orx-color/build.gradle.kts +++ b/orx-color/build.gradle.kts @@ -1,9 +1,8 @@ -import Orx_collect_screenshots_gradle.ScreenshotsHelper.collectScreenshots +import ScreenshotsHelper.collectScreenshots plugins { kotlin("multiplatform") kotlin("plugin.serialization") - id("orx.collect-screenshots") } val kotlinxSerializationVersion: String by rootProject.extra diff --git a/orx-color/src/demo/kotlin/DemoColorPlane01.kt b/orx-color/src/demo/kotlin/DemoColorPlane01.kt index a63f6b04..d64f3815 100644 --- a/orx-color/src/demo/kotlin/DemoColorPlane01.kt +++ b/orx-color/src/demo/kotlin/DemoColorPlane01.kt @@ -16,13 +16,6 @@ fun main() { } program { - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - val mesh = sphereMesh(8, 8, radius = 0.1) val instanceData = vertexBuffer( @@ -32,8 +25,7 @@ fun main() { }, 90 * 100 ) - - + println(extensions.size) extend(Orbital()) extend { diff --git a/orx-color/src/demo/kotlin/DemoColorPlane02.kt b/orx-color/src/demo/kotlin/DemoColorPlane02.kt index 7a9d9e76..1f8cbe48 100644 --- a/orx-color/src/demo/kotlin/DemoColorPlane02.kt +++ b/orx-color/src/demo/kotlin/DemoColorPlane02.kt @@ -15,12 +15,6 @@ fun main() { height = 800 } program { - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } val mesh = sphereMesh(8, 8, radius = 0.1) val instanceData = vertexBuffer( diff --git a/orx-color/src/demo/kotlin/DemoColorRange01.kt b/orx-color/src/demo/kotlin/DemoColorRange01.kt index 17d47401..25005837 100644 --- a/orx-color/src/demo/kotlin/DemoColorRange01.kt +++ b/orx-color/src/demo/kotlin/DemoColorRange01.kt @@ -12,12 +12,6 @@ import org.openrndr.shape.Rectangle fun main() = application { program { - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } val numColors = 10 val colorLists = listOf( ColorRGBa.PINK..ColorRGBa.BLUE.toHSVa() blend numColors, diff --git a/orx-color/src/demo/kotlin/DemoColorRange02.kt b/orx-color/src/demo/kotlin/DemoColorRange02.kt index a3927318..8483a0be 100644 --- a/orx-color/src/demo/kotlin/DemoColorRange02.kt +++ b/orx-color/src/demo/kotlin/DemoColorRange02.kt @@ -11,12 +11,6 @@ import org.openrndr.extras.color.spaces.toHSLUVa fun main() = application { program { - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } extend { val cs = colorSequence(0.0 to ColorRGBa.PINK, 0.5 to ColorRGBa.BLUE, diff --git a/orx-color/src/demo/kotlin/DemoColorRange03.kt b/orx-color/src/demo/kotlin/DemoColorRange03.kt index 24efb0af..f56fddca 100644 --- a/orx-color/src/demo/kotlin/DemoColorRange03.kt +++ b/orx-color/src/demo/kotlin/DemoColorRange03.kt @@ -11,12 +11,6 @@ import org.openrndr.extras.color.spaces.toXSLUVa fun main() { application { program { - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } extend { drawer.clear(ColorRGBa.WHITE) diff --git a/orx-color/src/demo/kotlin/DemoColorRange04.kt b/orx-color/src/demo/kotlin/DemoColorRange04.kt index b3dc7af8..27d6e9ec 100644 --- a/orx-color/src/demo/kotlin/DemoColorRange04.kt +++ b/orx-color/src/demo/kotlin/DemoColorRange04.kt @@ -21,13 +21,6 @@ fun main() { } program { - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - val mesh = sphereMesh(8, 8, radius = 0.1) extend(Orbital()) diff --git a/orx-color/src/demo/kotlin/DemoHSLUV01.kt b/orx-color/src/demo/kotlin/DemoHSLUV01.kt index 54fa0fed..da39de35 100644 --- a/orx-color/src/demo/kotlin/DemoHSLUV01.kt +++ b/orx-color/src/demo/kotlin/DemoHSLUV01.kt @@ -14,12 +14,6 @@ import org.openrndr.shape.Rectangle fun main() { application { program { - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } val font = loadFont("demo-data/fonts/IBMPlexMono-Regular.ttf", 26.0) extend { drawer.stroke = null diff --git a/orx-color/src/demo/kotlin/DemoHSLUV02.kt b/orx-color/src/demo/kotlin/DemoHSLUV02.kt index ffbe6caa..22435be3 100644 --- a/orx-color/src/demo/kotlin/DemoHSLUV02.kt +++ b/orx-color/src/demo/kotlin/DemoHSLUV02.kt @@ -23,13 +23,6 @@ fun main() { } program { - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - extend { drawer.clear(ColorRGBa.GRAY) val color = ColorRGBa.RED diff --git a/orx-color/src/demo/kotlin/DemoHistogram01.kt b/orx-color/src/demo/kotlin/DemoHistogram01.kt index 46b7bb00..40c215dc 100644 --- a/orx-color/src/demo/kotlin/DemoHistogram01.kt +++ b/orx-color/src/demo/kotlin/DemoHistogram01.kt @@ -7,12 +7,6 @@ import org.openrndr.extras.color.statistics.calculateHistogramRGB fun main() = application { program { - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } val useColors = 32 val image = loadImage("demo-data/images/image-001.png") diff --git a/orx-color/src/demo/kotlin/DemoHistogram02.kt b/orx-color/src/demo/kotlin/DemoHistogram02.kt index 251a6507..014e89b6 100644 --- a/orx-color/src/demo/kotlin/DemoHistogram02.kt +++ b/orx-color/src/demo/kotlin/DemoHistogram02.kt @@ -8,12 +8,6 @@ import kotlin.math.pow fun main() = application { program { - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } val image = loadImage("demo-data/images/image-001.png") // -- here we use non-uniform weighting, such that bright colors are prioritized val histogram = calculateHistogramRGB(image, weighting = { diff --git a/orx-color/src/demo/kotlin/DemoHistogram03.kt b/orx-color/src/demo/kotlin/DemoHistogram03.kt index ad039251..c98519e1 100644 --- a/orx-color/src/demo/kotlin/DemoHistogram03.kt +++ b/orx-color/src/demo/kotlin/DemoHistogram03.kt @@ -7,12 +7,6 @@ import org.openrndr.extras.color.statistics.calculateHistogramRGB fun main() = application { program { - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } val image = loadImage("demo-data/images/image-001.png") val histogram = calculateHistogramRGB(image) extend { diff --git a/orx-color/src/demo/kotlin/DemoXSLUV01.kt b/orx-color/src/demo/kotlin/DemoXSLUV01.kt index cdb6c21b..bc4a25e5 100644 --- a/orx-color/src/demo/kotlin/DemoXSLUV01.kt +++ b/orx-color/src/demo/kotlin/DemoXSLUV01.kt @@ -39,13 +39,6 @@ fun main() { } program { - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - val arcs = (0..4).map { Arc(it * 90.0 - 45.0, 50.0, 90.0, 50.0) }.split(5) extend { diff --git a/orx-compositor/build.gradle.kts b/orx-compositor/build.gradle.kts index c8f1a402..68db9f97 100644 --- a/orx-compositor/build.gradle.kts +++ b/orx-compositor/build.gradle.kts @@ -1,9 +1,8 @@ -import Orx_collect_screenshots_gradle.ScreenshotsHelper.collectScreenshots +import ScreenshotsHelper.collectScreenshots plugins { kotlin("multiplatform") kotlin("plugin.serialization") - id("orx.collect-screenshots") } val kotlinxSerializationVersion: String by rootProject.extra diff --git a/orx-easing/build.gradle.kts b/orx-easing/build.gradle.kts index 2e43b7f2..ba68a86c 100644 --- a/orx-easing/build.gradle.kts +++ b/orx-easing/build.gradle.kts @@ -1,9 +1,8 @@ -import Orx_collect_screenshots_gradle.ScreenshotsHelper.collectScreenshots +import ScreenshotsHelper.collectScreenshots plugins { kotlin("multiplatform") kotlin("plugin.serialization") - id("orx.collect-screenshots") } val kotlinxSerializationVersion: String by rootProject.extra diff --git a/orx-easing/src/demo/kotlin/DemoEasings01.kt b/orx-easing/src/demo/kotlin/DemoEasings01.kt index 27a5aad3..5c8b42d1 100644 --- a/orx-easing/src/demo/kotlin/DemoEasings01.kt +++ b/orx-easing/src/demo/kotlin/DemoEasings01.kt @@ -23,13 +23,6 @@ fun main() { drawer.lineSegment(0.0, 40.0, 400.0, 40.0) drawer.lineSegment(0.0, 20.0, 400.0, 20.0) } - - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - extend { drawer.stroke = ColorRGBa.WHITE diff --git a/orx-fx/build.gradle.kts b/orx-fx/build.gradle.kts index 89b70b35..89e6f9c2 100644 --- a/orx-fx/build.gradle.kts +++ b/orx-fx/build.gradle.kts @@ -1,12 +1,8 @@ -import Orx_collect_screenshots_gradle.ScreenshotsHelper.collectScreenshots -import Orx_embed_shaders_gradle.EmbedShadersTask - +import ScreenshotsHelper.collectScreenshots plugins { kotlin("multiplatform") kotlin("plugin.serialization") - id("orx.embed-shaders") - id("orx.collect-screenshots") } val kotlinxSerializationVersion: String by rootProject.extra diff --git a/orx-fx/src/demo/kotlin/DemoBlur01.kt b/orx-fx/src/demo/kotlin/DemoBlur01.kt index ec52850b..50866c77 100644 --- a/orx-fx/src/demo/kotlin/DemoBlur01.kt +++ b/orx-fx/src/demo/kotlin/DemoBlur01.kt @@ -9,15 +9,6 @@ import kotlin.math.sin fun main() { application { program { - - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.delayFrames = 60 - this.outputFile = System.getProperty("screenshotPath") - } - } - // In this buffer we will draw some simple shapes val dry = renderTarget(width / 3, height / 3) { colorBuffer() diff --git a/orx-gradient-descent/build.gradle.kts b/orx-gradient-descent/build.gradle.kts index 6e6dff4c..6e146c11 100644 --- a/orx-gradient-descent/build.gradle.kts +++ b/orx-gradient-descent/build.gradle.kts @@ -1,9 +1,6 @@ -import Orx_embed_shaders_gradle.EmbedShadersTask - plugins { kotlin("multiplatform") kotlin("plugin.serialization") - id("orx.embed-shaders") } val kotlinxSerializationVersion: String by rootProject.extra diff --git a/orx-image-fit/build.gradle.kts b/orx-image-fit/build.gradle.kts index 6e6dff4c..6e146c11 100644 --- a/orx-image-fit/build.gradle.kts +++ b/orx-image-fit/build.gradle.kts @@ -1,9 +1,6 @@ -import Orx_embed_shaders_gradle.EmbedShadersTask - plugins { kotlin("multiplatform") kotlin("plugin.serialization") - id("orx.embed-shaders") } val kotlinxSerializationVersion: String by rootProject.extra diff --git a/orx-kdtree/src/demo/kotlin/DemoNearestNeighbour01.kt b/orx-kdtree/src/demo/kotlin/DemoNearestNeighbour01.kt index 7d511871..fd5200da 100644 --- a/orx-kdtree/src/demo/kotlin/DemoNearestNeighbour01.kt +++ b/orx-kdtree/src/demo/kotlin/DemoNearestNeighbour01.kt @@ -12,12 +12,6 @@ fun main() { height = 720 } program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - val points = MutableList(1000) { Vector2(Math.random() * width, Math.random() * height) } diff --git a/orx-no-clear/src/demo/kotlin/DemoNoClear.kt b/orx-no-clear/src/demo/kotlin/DemoNoClear.kt index ff9212bc..5c1742a9 100644 --- a/orx-no-clear/src/demo/kotlin/DemoNoClear.kt +++ b/orx-no-clear/src/demo/kotlin/DemoNoClear.kt @@ -13,14 +13,6 @@ fun main() { program { var time = 0.0 - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.delayFrames = 120 - this.outputFile = System.getProperty("screenshotPath") - } - } - // ------------------------------------------------------------ // By default OPENRNDR clears the canvas on each animation // frame. NoClear disables that behavior, letting you diff --git a/orx-noise/README.md b/orx-noise/README.md index 35407be2..684b16a6 100644 --- a/orx-noise/README.md +++ b/orx-noise/README.md @@ -190,6 +190,11 @@ val v8 = billow(seed, x, y, z, ::perlinLinear, octaves, lacunarity, gain) ![DemoPoissonDiskSamplingKt](https://github.com/openrndr/orx/blob/media/orx-noise/images/DemoPoissonDiskSamplingKt.png ## Demos +### DemoFunctionalComposition01 +[source code](src/demo/kotlin/DemoFunctionalComposition01.kt) + +![DemoFunctionalComposition01Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-noise/images/DemoFunctionalComposition01Kt.png) + ### DemoGradientPerturb2D [source code](src/demo/kotlin/DemoGradientPerturb2D.kt) diff --git a/orx-noise/build.garble b/orx-noise/build.garble deleted file mode 100644 index d7a0c320..00000000 --- a/orx-noise/build.garble +++ /dev/null @@ -1,22 +0,0 @@ -sourceSets { - demo { - java { - srcDirs = ["src/demo/kotlin"] - compileClasspath += main.getCompileClasspath() - runtimeClasspath += main.getRuntimeClasspath() - } - } -} - -dependencies { - implementation project(":orx-shader-phrases") - implementation project(":orx-parameters") - - demoImplementation(project(":orx-camera")) - demoImplementation("org.openrndr:openrndr-application:$openrndrVersion") - demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion") - - demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion") - demoRuntimeOnly("org.openrndr:openrndr-gl3-natives-$openrndrOS:$openrndrVersion") - demoImplementation(sourceSets.getByName("main").output) -} \ No newline at end of file diff --git a/orx-noise/build.gradle.kts b/orx-noise/build.gradle.kts index 36d1c934..0e50d5c6 100644 --- a/orx-noise/build.gradle.kts +++ b/orx-noise/build.gradle.kts @@ -1,3 +1,5 @@ +import ScreenshotsHelper.collectScreenshots + plugins { kotlin("multiplatform") kotlin("plugin.serialization") @@ -28,6 +30,7 @@ kotlin { implementation(compilations["main"]!!.output.allOutputs) } } + collectScreenshots { } } } compilations.all { diff --git a/orx-noise/src/demo/kotlin/DemoFunctionalComposition01.kt b/orx-noise/src/demo/kotlin/DemoFunctionalComposition01.kt index d71ec132..bb76496d 100644 --- a/orx-noise/src/demo/kotlin/DemoFunctionalComposition01.kt +++ b/orx-noise/src/demo/kotlin/DemoFunctionalComposition01.kt @@ -11,22 +11,12 @@ import org.openrndr.extra.noise.withVector2Output import org.openrndr.extra.noise.gradient import org.openrndr.shape.contour -typealias IDDD_D = ((Int, Double, Double, Double) -> Double) fun main() = application { configure { width = 720 height = 720 } program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - - val c = simplex3D.perturb({v->v})::class - println(c) - println(IDDD_D::perturb) val n = simplex3D.withVector2Output().gradient() extend { drawer.stroke = null diff --git a/orx-noise/src/demo/kotlin/DemoGradientPerturb2D.kt b/orx-noise/src/demo/kotlin/DemoGradientPerturb2D.kt index 02984a22..9b5bec10 100644 --- a/orx-noise/src/demo/kotlin/DemoGradientPerturb2D.kt +++ b/orx-noise/src/demo/kotlin/DemoGradientPerturb2D.kt @@ -7,17 +7,11 @@ import org.openrndr.extra.noise.simplex import org.openrndr.math.Vector2 import kotlin.math.absoluteValue - fun main() { application { program { val cb = colorBuffer(width, height) val shad = cb.shadow - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } extend { for (y in 0 until height) { for (x in 0 until width) { diff --git a/orx-noise/src/demo/kotlin/DemoGradientPerturb3D.kt b/orx-noise/src/demo/kotlin/DemoGradientPerturb3D.kt index a1acc55d..a186e7eb 100644 --- a/orx-noise/src/demo/kotlin/DemoGradientPerturb3D.kt +++ b/orx-noise/src/demo/kotlin/DemoGradientPerturb3D.kt @@ -12,11 +12,6 @@ fun main() { program { val cb = colorBuffer(width, height) val shad = cb.shadow - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } extend { for (y in 0 until height) { for (x in 0 until width) { diff --git a/orx-noise/src/demo/kotlin/DemoPoissonDiskSampling.kt b/orx-noise/src/demo/kotlin/DemoPoissonDiskSampling.kt index 9bed3b40..8703fb42 100644 --- a/orx-noise/src/demo/kotlin/DemoPoissonDiskSampling.kt +++ b/orx-noise/src/demo/kotlin/DemoPoissonDiskSampling.kt @@ -1,6 +1,5 @@ - import org.openrndr.application +import org.openrndr.application import org.openrndr.color.ColorRGBa -import org.openrndr.extensions.SingleScreenshot import org.openrndr.extra.noise.poissonDiskSampling import org.openrndr.math.Vector2 import org.openrndr.shape.Circle @@ -8,14 +7,7 @@ import org.openrndr.shape.Circle fun main() { application { program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - var points = poissonDiskSampling(200.0, 200.0, 5.0, 10) - val rectPoints = points.map { Circle(Vector2(100.0, 100.0) + it, 3.0) } points = poissonDiskSampling(200.0, 200.0, 5.0, 10, true) { w: Double, h: Double, v: Vector2 -> @@ -26,7 +18,6 @@ fun main() { extend { drawer.clear(ColorRGBa.BLACK) - drawer.stroke = null drawer.fill = ColorRGBa.PINK drawer.circles(rectPoints) diff --git a/orx-noise/src/demo/kotlin/DemoSimplex01.kt b/orx-noise/src/demo/kotlin/DemoSimplex01.kt index e45b8ed0..4e023c37 100644 --- a/orx-noise/src/demo/kotlin/DemoSimplex01.kt +++ b/orx-noise/src/demo/kotlin/DemoSimplex01.kt @@ -11,11 +11,6 @@ fun main() = application { height = 720 } program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } extend { drawer.stroke = null drawer.fill = ColorRGBa.PINK diff --git a/orx-quadtree/build.gradle.kts b/orx-quadtree/build.gradle.kts index ff505483..032279c3 100644 --- a/orx-quadtree/build.gradle.kts +++ b/orx-quadtree/build.gradle.kts @@ -1,9 +1,8 @@ -import Orx_collect_screenshots_gradle.ScreenshotsHelper.collectScreenshots +import ScreenshotsHelper.collectScreenshots plugins { kotlin("multiplatform") kotlin("plugin.serialization") - id("orx.collect-screenshots") } val kotlinxSerializationVersion: String by rootProject.extra diff --git a/orx-quadtree/src/demo/kotlin/DemoQuadTree01.kt b/orx-quadtree/src/demo/kotlin/DemoQuadTree01.kt index d64aea2a..15d38adb 100644 --- a/orx-quadtree/src/demo/kotlin/DemoQuadTree01.kt +++ b/orx-quadtree/src/demo/kotlin/DemoQuadTree01.kt @@ -16,12 +16,6 @@ fun main() { title = "QuadTree" } program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - val box = Rectangle.fromCenter(Vector2(400.0), 750.0) val points = (0 until 1_000).map { diff --git a/orx-quadtree/src/demo/kotlin/DemoQuadTree02.kt b/orx-quadtree/src/demo/kotlin/DemoQuadTree02.kt index 045cb86b..3bd4660a 100644 --- a/orx-quadtree/src/demo/kotlin/DemoQuadTree02.kt +++ b/orx-quadtree/src/demo/kotlin/DemoQuadTree02.kt @@ -16,12 +16,6 @@ fun main() { title = "QuadTree" } program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - val box = Rectangle.fromCenter(Vector2(400.0), 750.0) val points = (0 until 100).map { diff --git a/orx-shade-styles/build.gradle.kts b/orx-shade-styles/build.gradle.kts index 781ee12b..762e62c2 100644 --- a/orx-shade-styles/build.gradle.kts +++ b/orx-shade-styles/build.gradle.kts @@ -1,10 +1,8 @@ -import Orx_collect_screenshots_gradle.ScreenshotsHelper.collectScreenshots +import ScreenshotsHelper.collectScreenshots plugins { kotlin("multiplatform") kotlin("plugin.serialization") - id("orx.embed-shaders") - id("orx.collect-screenshots") } val kotlinxSerializationVersion: String by rootProject.extra diff --git a/orx-shade-styles/src/demo/kotlin/DemoAllGradients01.kt b/orx-shade-styles/src/demo/kotlin/DemoAllGradients01.kt index 1065a1a5..68c0ce85 100644 --- a/orx-shade-styles/src/demo/kotlin/DemoAllGradients01.kt +++ b/orx-shade-styles/src/demo/kotlin/DemoAllGradients01.kt @@ -17,12 +17,6 @@ fun main() { height = 500 } program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - // Create gradients with initial colors val gradients = listOf( RadialGradient(ColorRGBa.PINK, ColorRGBa.WHITE), diff --git a/orx-shade-styles/src/demo/kotlin/DemoLinearGradient.kt b/orx-shade-styles/src/demo/kotlin/DemoLinearGradient.kt index 1d50a48b..c5d6d262 100644 --- a/orx-shade-styles/src/demo/kotlin/DemoLinearGradient.kt +++ b/orx-shade-styles/src/demo/kotlin/DemoLinearGradient.kt @@ -10,11 +10,6 @@ import kotlin.math.cos fun main() { application { program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } extend { drawer.shadeStyle = linearGradient( ColorRGBa.RED.toOKLABa(), diff --git a/orx-shade-styles/src/demo/kotlin/DemoNPointGradient01.kt b/orx-shade-styles/src/demo/kotlin/DemoNPointGradient01.kt index a5a5fe17..f09ce82d 100644 --- a/orx-shade-styles/src/demo/kotlin/DemoNPointGradient01.kt +++ b/orx-shade-styles/src/demo/kotlin/DemoNPointGradient01.kt @@ -20,12 +20,6 @@ import kotlin.math.cos fun main() { application { program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - val numPoints = 8 val gradient = NPointGradient(Array(numPoints) { ColorXSVa(it * 360.0 / numPoints, 1.0, 1.0).toRGBa() diff --git a/orx-shade-styles/src/demo/kotlin/DemoNPointLinearGradient01.kt b/orx-shade-styles/src/demo/kotlin/DemoNPointLinearGradient01.kt index bdaaec59..a9f7bf22 100644 --- a/orx-shade-styles/src/demo/kotlin/DemoNPointLinearGradient01.kt +++ b/orx-shade-styles/src/demo/kotlin/DemoNPointLinearGradient01.kt @@ -18,12 +18,6 @@ import kotlin.math.sin fun main() { application { program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - val numPoints = 8 val gradient = NPointLinearGradient(Array(numPoints) { ColorXSVa(it * 360.0 / numPoints, 1.0, 1.0).toRGBa() diff --git a/orx-shade-styles/src/demo/kotlin/DemoNPointRadialGradient01.kt b/orx-shade-styles/src/demo/kotlin/DemoNPointRadialGradient01.kt index 61a4dd62..2736f107 100644 --- a/orx-shade-styles/src/demo/kotlin/DemoNPointRadialGradient01.kt +++ b/orx-shade-styles/src/demo/kotlin/DemoNPointRadialGradient01.kt @@ -15,12 +15,6 @@ import kotlin.random.Random fun main() { application { program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - val gradient = NPointRadialGradient(arrayOf( ColorRGBa.PINK.opacify(0.0), ColorRGBa.PINK, ColorRGBa.WHITE, ColorRGBa.PINK, diff --git a/orx-shade-styles/src/demo/kotlin/DemoRadialGradient01.kt b/orx-shade-styles/src/demo/kotlin/DemoRadialGradient01.kt index 7aafcfa8..d786876e 100644 --- a/orx-shade-styles/src/demo/kotlin/DemoRadialGradient01.kt +++ b/orx-shade-styles/src/demo/kotlin/DemoRadialGradient01.kt @@ -8,11 +8,6 @@ import kotlin.math.cos fun main() { application { program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } extend { drawer.shadeStyle = radialGradient( ColorRGBa.PINK, diff --git a/orx-shader-phrases/build.gradle.kts b/orx-shader-phrases/build.gradle.kts index a5de7e70..de0abbcd 100644 --- a/orx-shader-phrases/build.gradle.kts +++ b/orx-shader-phrases/build.gradle.kts @@ -1,9 +1,6 @@ -import Orx_embed_shaders_gradle.EmbedShadersTask - plugins { kotlin("multiplatform") kotlin("plugin.serialization") - id("orx.embed-shaders") } val kotlinxSerializationVersion: String by rootProject.extra diff --git a/orx-shapes/build.gradle.kts b/orx-shapes/build.gradle.kts index eeb97de9..91ec52bf 100644 --- a/orx-shapes/build.gradle.kts +++ b/orx-shapes/build.gradle.kts @@ -1,8 +1,8 @@ -import Orx_collect_screenshots_gradle.ScreenshotsHelper.collectScreenshots +import ScreenshotsHelper.collectScreenshots + plugins { kotlin("multiplatform") kotlin("plugin.serialization") - id("orx.collect-screenshots") } val kotlinxSerializationVersion: String by rootProject.extra diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatch01.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatch01.kt index cac3cb07..4936d4e0 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatch01.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatch01.kt @@ -21,12 +21,6 @@ fun main() { height = 800 } program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - // helper to get screen locations using normalized uv values fun pos(u: Double, v: Double) = drawer.bounds.position(u, v) val c0 = LineSegment(pos(0.1, 0.1), pos(0.9, 0.1)) diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatch02.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatch02.kt index 44b836eb..07ad1821 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatch02.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatch02.kt @@ -21,12 +21,6 @@ fun main() { height = 800 } program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - val c = Circle(width / 2.0, height / 2.0, 350.0).contour val bp = bezierPatch(c) diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatch03.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatch03.kt index d686e682..cda47d74 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatch03.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatch03.kt @@ -21,12 +21,6 @@ fun main() { height = 800 } program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - val bp = bezierPatch( Circle(width / 2.0, height / 2.0, 350.0).contour ) diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatch04.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatch04.kt index 2b9e54bd..73bd2da9 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatch04.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatch04.kt @@ -18,12 +18,6 @@ fun main() { height = 800 } program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - val bp = bezierPatch( Circle(drawer.bounds.center, 350.0).contour //Rectangle.fromCenter(drawer.bounds.center, 550.0).contour diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatch05.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatch05.kt index 991eaa05..19bba926 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatch05.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatch05.kt @@ -28,13 +28,6 @@ fun main() { multisample = WindowMultisample.SampleCount(8) } program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - multisample = BufferMultisample.SampleCount(8) - } - } - val c0 = Segment3D(Vector3(-5.0, 0.0, -9.0), Vector3(5.0, 0.0, -9.0)) val c1 = Segment3D(Vector3(-5.0, -5.0, -3.0), Vector3(5.0, -5.0, -3.0)) val c2 = Segment3D(Vector3(-5.0, 5.0, 3.0), Vector3(5.0, 5.0, 3.0)) diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer01.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer01.kt index 96a7ad3e..929c240d 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer01.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer01.kt @@ -8,11 +8,6 @@ import org.openrndr.shape.Circle fun main() { application { program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } extend { drawer.clear(ColorRGBa.PINK) val bp = bezierPatch( diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer02.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer02.kt index 56ef2fa3..45ae9e29 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer02.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer02.kt @@ -14,11 +14,6 @@ fun main() { height = 720 } program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } extend { drawer.clear(ColorRGBa.BLACK) val bp2 = bezierPatch( diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer03.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer03.kt index abb2c752..dc95e961 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer03.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatchDrawer03.kt @@ -22,11 +22,6 @@ fun main() { height = 720 } program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } extend { drawer.clear(ColorRGBa.BLACK) val colors = listOf( diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatches01.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatches01.kt index ddedb7a3..e5ae2f7d 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatches01.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatches01.kt @@ -23,12 +23,6 @@ fun main() { height = 800 } program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } - val c0 = Circle(width / 3.0, height / 2.0, 150.0).contour val bp0 = bezierPatch(c0) diff --git a/orx-shapes/src/demo/kotlin/DemoRectangleGrid.kt b/orx-shapes/src/demo/kotlin/DemoRectangleGrid.kt index 46d4b617..589e4390 100644 --- a/orx-shapes/src/demo/kotlin/DemoRectangleGrid.kt +++ b/orx-shapes/src/demo/kotlin/DemoRectangleGrid.kt @@ -10,11 +10,6 @@ fun main() { height = 800 } program { - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } extend { drawer.fill = ColorRGBa.WHITE.opacify(0.25) drawer.stroke = ColorRGBa.PINK diff --git a/orx-shapes/src/demo/kotlin/DemoRegularPolygon.kt b/orx-shapes/src/demo/kotlin/DemoRegularPolygon.kt index 828c1676..5b7a65fd 100644 --- a/orx-shapes/src/demo/kotlin/DemoRegularPolygon.kt +++ b/orx-shapes/src/demo/kotlin/DemoRegularPolygon.kt @@ -8,12 +8,6 @@ import kotlin.math.cos fun main() = application { program { - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } extend { drawer.fill = ColorRGBa.PINK drawer.stroke = ColorRGBa.WHITE diff --git a/orx-shapes/src/demo/kotlin/DemoRegularStar01.kt b/orx-shapes/src/demo/kotlin/DemoRegularStar01.kt index 138164b8..3fb3e590 100644 --- a/orx-shapes/src/demo/kotlin/DemoRegularStar01.kt +++ b/orx-shapes/src/demo/kotlin/DemoRegularStar01.kt @@ -7,12 +7,6 @@ import kotlin.math.sin fun main() = application { program { - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } extend { drawer.fill = ColorRGBa.PINK drawer.stroke = ColorRGBa.WHITE diff --git a/orx-shapes/src/demo/kotlin/DemoRegularStar02.kt b/orx-shapes/src/demo/kotlin/DemoRegularStar02.kt index 22d30619..461355ab 100644 --- a/orx-shapes/src/demo/kotlin/DemoRegularStar02.kt +++ b/orx-shapes/src/demo/kotlin/DemoRegularStar02.kt @@ -9,12 +9,6 @@ import kotlin.math.sin fun main() = application { program { - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } extend { drawer.fill = ColorRGBa.PINK drawer.stroke = ColorRGBa.WHITE diff --git a/orx-shapes/src/demo/kotlin/DemoRoundedRectangle.kt b/orx-shapes/src/demo/kotlin/DemoRoundedRectangle.kt index 56419b6a..38e594d5 100644 --- a/orx-shapes/src/demo/kotlin/DemoRoundedRectangle.kt +++ b/orx-shapes/src/demo/kotlin/DemoRoundedRectangle.kt @@ -6,12 +6,6 @@ import kotlin.math.cos fun main() = application { program { - // -- this block is for automation purposes only - if (System.getProperty("takeScreenshot") == "true") { - extend(SingleScreenshot()) { - this.outputFile = System.getProperty("screenshotPath") - } - } extend { drawer.fill = ColorRGBa.WHITE drawer.stroke = ColorRGBa.PINK