[orx-syphon] Undo refactoring, update Syphon/JSyphon native libraries

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

@@ -1,11 +1,11 @@
-package org.openrndr.extra.syphon
+package jsyphon
 
 
 
 import org.openrndr.Extension
 import org.openrndr.Program
 import org.openrndr.draw.*
-import org.openrndr.extra.syphon.jsyphon.JSyphonClient
+
 
 import org.openrndr.internal.gl3.ColorBufferGL3
 import org.openrndr.internal.gl3.TextureStorageModeGL

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

@@ -1,4 +1,4 @@
-package org.openrndr.extra.syphon
+package jsyphon
 
 
 
@@ -7,7 +7,7 @@ import org.openrndr.Program
 import org.openrndr.draw.Drawer
 import org.openrndr.draw.RenderTarget
 import org.openrndr.draw.renderTarget
-import org.openrndr.extra.syphon.jsyphon.JSyphonServer
+
 import org.openrndr.internal.gl3.ColorBufferGL3
 
 

orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonClient.kt

@@ -1,4 +1,4 @@
-package org.openrndr.extra.syphon.jsyphon
+        package jsyphon
 
 import java.io.File
 import java.util.*

orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonImage.kt

@@ -1,4 +1,4 @@
-package org.openrndr.extra.syphon.jsyphon
+package jsyphon
 
 class JSyphonImage(private val name: Int, private val width: Int, private val height: Int) {
     fun textureName(): Int {

orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonNative.kt

@@ -1,4 +1,4 @@
-package org.openrndr.extra.syphon.jsyphon
+package jsyphon
 
 import org.openrndr.platform.Platform
 import org.openrndr.platform.PlatformType

orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonServer.kt

@@ -1,4 +1,4 @@
-package org.openrndr.extra.syphon.jsyphon
+package jsyphon
 /*
 JSyphonServer.java - 
 Copyright 2011 -Skye Book (sbook) & Anton Marini (vade)

orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonServerList.kt

@@ -1,4 +1,4 @@
-package org.openrndr.extra.syphon.jsyphon
+package jsyphon
 import java.io.File
 import java.util.ArrayList
 import java.util.HashMap

orx-jvm/orx-syphon/src/main/kotlin/jsyphon/Util.kt

@@ -1,4 +1,4 @@
-package org.openrndr.extra.syphon.jsyphon
+package jsyphon
 class NSSize (var x: Int, var y: Int)
 class NSPoint(var x: Int, var y: Int)
 

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

@@ -1,6 +1,7 @@
+import jsyphon.SyphonClient
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extra.syphon.SyphonClient
+
 
 
 fun main() = application {

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

@@ -1,25 +1,25 @@
-import org.openrndr.application
+//import org.openrndr.application
-import org.openrndr.color.ColorRGBa
+//import org.openrndr.color.ColorRGBa
-import org.openrndr.extra.syphon.SyphonClient
+//import org.openrndr.extra.syphon.SyphonClient
-
+//
-/**
+///**
- * This example uses After Effects and OPENRNDR connected via Syphon
+// * This example uses After Effects and OPENRNDR connected via Syphon
- */
+// */
-fun main() = application {
+//fun main() = application {
-    configure {
+//    configure {
-        // The maximum resolution supported by the free
+//        // The maximum resolution supported by the free
-        // version of AESyphon
+//        // version of AESyphon
-        width = 1024
+//        width = 1024
-        height = 768
+//        height = 768
-    }
+//    }
-
+//
-    program {
+//    program {
-        val syphonClient = SyphonClient("Adobe After Effects", "Live Preview")
+//        val syphonClient = SyphonClient("Adobe After Effects", "Live Preview")
-
+//
-        extend(syphonClient)
+//        extend(syphonClient)
-        extend {
+//        extend {
-            drawer.clear(ColorRGBa.BLACK)
+//            drawer.clear(ColorRGBa.BLACK)
-            drawer.image(syphonClient.buffer)
+//            drawer.image(syphonClient.buffer)
-        }
+//        }
-    }
+//    }
-}
+//}

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

@@ -1,6 +1,7 @@
+import jsyphon.SyphonServer
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extra.syphon.SyphonServer
+
 import kotlin.math.*
 
 

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

@@ -1,36 +1,36 @@
-import org.openrndr.application
+//import org.openrndr.application
-import org.openrndr.color.ColorRGBa
+//import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.isolatedWithTarget
+//import org.openrndr.draw.isolatedWithTarget
-import org.openrndr.draw.renderTarget
+//import org.openrndr.draw.renderTarget
-import org.openrndr.extra.syphon.SyphonServer
+//import org.openrndr.extra.syphon.SyphonServer
-import kotlin.math.*
+//import kotlin.math.*
-
+//
-fun main() = application {
+//fun main() = application {
-    configure {
+//    configure {
-        width = 1000
+//        width = 1000
-        height = 1000
+//        height = 1000
-    }
+//    }
-
+//
-    program {
+//    program {
-        val rt = renderTarget(100, 100) {
+//        val rt = renderTarget(100, 100) {
-            colorBuffer()
+//            colorBuffer()
-        }
+//        }
-
+//
-        // You can give the server a different name
+//        // You can give the server a different name
-        extend(SyphonServer("Test", rt))
+//        extend(SyphonServer("Test", rt))
-
+//
-        extend {
+//        extend {
-            /**
+//            /**
-             * This is what will be sent to Syphon, and drawn in a small corner of the screen
+//             * This is what will be sent to Syphon, and drawn in a small corner of the screen
-             */
+//             */
-            drawer.isolatedWithTarget(rt) {
+//            drawer.isolatedWithTarget(rt) {
-                drawer.clear(ColorRGBa(sin(seconds), cos(seconds / 2.0), 0.5, 1.0))
+//                drawer.clear(ColorRGBa(sin(seconds), cos(seconds / 2.0), 0.5, 1.0))
-            }
+//            }
-
+//
-            drawer.clear(ColorRGBa.PINK)
+//            drawer.clear(ColorRGBa.PINK)
-            drawer.fill = ColorRGBa.WHITE
+//            drawer.fill = ColorRGBa.WHITE
-            drawer.circle(drawer.bounds.center, abs(cos(seconds)) * height * 0.5)
+//            drawer.circle(drawer.bounds.center, abs(cos(seconds)) * height * 0.5)
-            drawer.image(rt.colorBuffer(0))
+//            drawer.image(rt.colorBuffer(0))
-        }
+//        }
-    }
+//    }
-}
+//}