[orx-syphon] Move demos from test to demo, add OpenGL requirements

buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts

@@ -35,7 +35,7 @@ val main: SourceSet by sourceSets.getting
 
 @Suppress("UNUSED_VARIABLE")
 val demo: SourceSet by sourceSets.creating {
-    val skipDemos = setOf("openrndr-demos", "orx-minim", "orx-realsense2", "orx-runway", "orx-video-profiles", "orx-midi")
+    val skipDemos = setOf("openrndr-demos", "orx-minim", "orx-realsense2", "orx-runway", "orx-video-profiles", "orx-midi", "orx-syphon")
     if (project.name !in skipDemos) {
         collectScreenshots(project, this@creating) { }
     }

orx-jvm/orx-syphon/README.md

@@ -12,18 +12,21 @@ import org.openrndr.color.ColorRGBa
 import kotlin.math.sin
 
 
-fun main() = application {
+fun main() {
-    configure {
+    System.setProperty("org.openrndr.gl3.gl_type", "gl")
-        width = 1000
+    application {
-        height = 1000
+        configure {
-    }
+            width = 1000
+            height = 1000
+        }
 
-    program {
+        program {
-        extend(SyphonServer())
+            extend(SyphonServer())
 
-        extend {
+            extend {
-            drawer.background(ColorRGBa.RED)
+                drawer.background(ColorRGBa.RED)
-            drawer.circle(width/2.0, height/2.0, sin(seconds) * width / 2.0)
+                drawer.circle(width / 2.0, height / 2.0, sin(seconds) * width / 2.0)
+            }
         }
     }
 }
@@ -38,31 +41,34 @@ import org.openrndr.draw.renderTarget
 import kotlin.math.*
 
 
-fun main() = application {
+fun main() {
-    configure {
+    System.setProperty("org.openrndr.gl3.gl_type", "gl")
-        width = 1000
+    application {
-        height = 1000
+        configure {
-    }
+            width = 1000
-
+            height = 1000
-    program {
-        val rt = renderTarget(100, 100) {
-            colorBuffer()
         }
 
-        // You can give the server a different name
+        program {
-        extend(SyphonServer("Test", rt))
+            val rt = renderTarget(100, 100) {
-
+                colorBuffer()
-        extend {
-            /**
-             * This is what will be sent to Syphon, and drawn in a small corner of the screen
-             */
-            drawer.isolatedWithTarget(rt) {
-                drawer.background(ColorRGBa(sin(seconds), cos(seconds / 2.0), 0.5, 1.0))
             }
 
-            drawer.background(ColorRGBa.GRAY)
+            // You can give the server a different name
-            drawer.circle(width/2.0, height/2.0, sin(seconds) * width / 2.0)
+            extend(SyphonServer("Test", rt))
-            drawer.image(rt.colorBuffer(0))
+
+            extend {
+                /**
+                 * This is what will be sent to Syphon, and drawn in a small corner of the screen
+                 */
+                drawer.isolatedWithTarget(rt) {
+                    drawer.background(ColorRGBa(sin(seconds), cos(seconds / 2.0), 0.5, 1.0))
+                }
+
+                drawer.background(ColorRGBa.GRAY)
+                drawer.circle(width / 2.0, height / 2.0, sin(seconds) * width / 2.0)
+                drawer.image(rt.colorBuffer(0))
+            }
         }
     }
 }

orx-jvm/orx-syphon/src/demo/kotlin/DemoClient01.kt

@@ -0,0 +1,23 @@
+import jsyphon.SyphonClient
+import org.openrndr.application
+import org.openrndr.color.ColorRGBa
+
+fun main() {
+    System.setProperty("org.openrndr.gl3.gl_type", "gl")
+    application {
+        configure {
+            width = 1000
+            height = 800
+        }
+
+        program {
+            val syphonClient = SyphonClient()
+
+            extend(syphonClient)
+            extend {
+                drawer.clear(ColorRGBa.BLACK)
+                drawer.image(syphonClient.buffer)
+            }
+        }
+    }
+}

orx-jvm/orx-syphon/src/demo/kotlin/DemoServer01.kt

@@ -0,0 +1,27 @@
+import jsyphon.SyphonServer
+import org.openrndr.application
+import org.openrndr.color.ColorRGBa
+
+import kotlin.math.*
+
+
+fun main() {
+    // force to use GL driver
+    System.setProperty("org.openrndr.gl3.gl_type", "gl")
+    application {
+        configure {
+            width = 1000
+            height = 1000
+        }
+
+        program {
+            extend(SyphonServer("Test"))
+
+            extend {
+                drawer.clear(ColorRGBa.PINK)
+                drawer.fill = ColorRGBa.WHITE
+                drawer.circle(drawer.bounds.center, abs(cos(seconds)) * height * 0.5)
+            }
+        }
+    }
+}

orx-jvm/orx-syphon/src/main/kotlin/SyphonClient.kt

@@ -5,10 +5,13 @@ package jsyphon
 import org.openrndr.Extension
 import org.openrndr.Program
 import org.openrndr.draw.*
+import org.openrndr.internal.Driver
 
 
 import org.openrndr.internal.gl3.ColorBufferGL3
+import org.openrndr.internal.gl3.DriverTypeGL
 import org.openrndr.internal.gl3.TextureStorageModeGL
+import org.openrndr.internal.gl3.glType
 
 
 class SyphonClient(private val appName: String? = null, private val serverName: String? = null): Extension {
@@ -18,6 +21,10 @@ class SyphonClient(private val appName: String? = null, private val serverName:
     var buffer: ColorBuffer = colorBuffer(10, 10)
 
     override fun setup(program: Program) {
+        require(Driver.glType == DriverTypeGL.GL) {
+            "The SyphonClient extension will only work when using OpenGL. Use -Dorg.openrndr.gl3.gl_type=gl to force OPENRNDR to use OpenGL."
+        }
+
         buffer = colorBuffer(program.width, program.height)
 
         client.init()

orx-jvm/orx-syphon/src/main/kotlin/SyphonServer.kt

@@ -7,8 +7,11 @@ import org.openrndr.Program
 import org.openrndr.draw.Drawer
 import org.openrndr.draw.RenderTarget
 import org.openrndr.draw.renderTarget
+import org.openrndr.internal.Driver
 
 import org.openrndr.internal.gl3.ColorBufferGL3
+import org.openrndr.internal.gl3.DriverTypeGL
+import org.openrndr.internal.gl3.glType
 
 
 class SyphonServer(private val name: String = "OPENRNDR", var providedTarget: RenderTarget? = null): Extension {
@@ -17,6 +20,10 @@ class SyphonServer(private val name: String = "OPENRNDR", var providedTarget: Re
     private var targetToSend: RenderTarget? = null
 
     override fun setup(program: Program) {
+        require(Driver.glType == DriverTypeGL.GL) {
+            "The SyphonServer extension will only work when using OpenGL. Use -Dorg.openrndr.gl3.gl_type=gl to force OPENRNDR to use OpenGL."
+        }
+
         server.initWithName(name)
 
         // Create a new target that binds to the main one if no target is provided

orx-jvm/orx-syphon/src/test/kotlin/ClientExample.kt

@@ -1,22 +0,0 @@
-import jsyphon.SyphonClient
-import org.openrndr.application
-import org.openrndr.color.ColorRGBa
-
-
-
-fun main() = application {
-    configure {
-        width = 1000
-        height = 800
-    }
-
-    program {
-        val syphonClient = SyphonClient()
-
-        extend(syphonClient)
-        extend {
-            drawer.clear(ColorRGBa.BLACK)
-            drawer.image(syphonClient.buffer)
-        }
-    }
-}

orx-jvm/orx-syphon/src/test/kotlin/ServerExample.kt

@@ -1,23 +0,0 @@
-import jsyphon.SyphonServer
-import org.openrndr.application
-import org.openrndr.color.ColorRGBa
-
-import kotlin.math.*
-
-
-fun main() = application {
-    configure {
-        width = 1000
-        height = 1000
-    }
-
-    program {
-        extend(SyphonServer("Test"))
-
-        extend {
-            drawer.clear(ColorRGBa.PINK)
-            drawer.fill = ColorRGBa.WHITE
-            drawer.circle(drawer.bounds.center, abs(cos(seconds)) * height * 0.5)
-        }
-    }
-}