diff --git a/orx-jvm/orx-syphon/src/main/kotlin/SyphonClient.kt b/orx-jvm/orx-syphon/src/main/kotlin/SyphonClient.kt index 5bb23729..50556af8 100644 --- a/orx-jvm/orx-syphon/src/main/kotlin/SyphonClient.kt +++ b/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 diff --git a/orx-jvm/orx-syphon/src/main/kotlin/SyphonServer.kt b/orx-jvm/orx-syphon/src/main/kotlin/SyphonServer.kt index dc41df83..5902614f 100644 --- a/orx-jvm/orx-syphon/src/main/kotlin/SyphonServer.kt +++ b/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 diff --git a/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonClient.kt b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonClient.kt index 5cca11aa..1b57e8d9 100644 --- a/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonClient.kt +++ b/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.* diff --git a/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonImage.kt b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonImage.kt index feddc76d..d994a30f 100644 --- a/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonImage.kt +++ b/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 { diff --git a/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonNative.kt b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonNative.kt index e6134407..7902db60 100644 --- a/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonNative.kt +++ b/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 diff --git a/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonServer.kt b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonServer.kt index 3f967e29..65a2f7e6 100644 --- a/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonServer.kt +++ b/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) diff --git a/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonServerList.kt b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonServerList.kt index bef9df31..0ef8d24c 100644 --- a/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/JSyphonServerList.kt +++ b/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 diff --git a/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/Util.kt b/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/Util.kt index f59061bb..69b33d48 100644 --- a/orx-jvm/orx-syphon/src/main/kotlin/jsyphon/Util.kt +++ b/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) diff --git a/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/Syphon b/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/Syphon old mode 100755 new mode 100644 index 7cf6833f..9b3c2b66 Binary files a/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/Syphon and b/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/Syphon differ diff --git a/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/libJSyphon.jnilib b/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/libJSyphon.jnilib old mode 100755 new mode 100644 index 062c85fd..971fc8e8 Binary files a/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/libJSyphon.jnilib and b/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/libJSyphon.jnilib differ diff --git a/orx-jvm/orx-syphon/src/test/kotlin/ClientExample.kt b/orx-jvm/orx-syphon/src/test/kotlin/ClientExample.kt index 3e319319..b38dfca8 100644 --- a/orx-jvm/orx-syphon/src/test/kotlin/ClientExample.kt +++ b/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 { diff --git a/orx-jvm/orx-syphon/src/test/kotlin/ClientExampleSpecificServer.kt b/orx-jvm/orx-syphon/src/test/kotlin/ClientExampleSpecificServer.kt index 3d886a16..92edb9ef 100644 --- a/orx-jvm/orx-syphon/src/test/kotlin/ClientExampleSpecificServer.kt +++ b/orx-jvm/orx-syphon/src/test/kotlin/ClientExampleSpecificServer.kt @@ -1,25 +1,25 @@ -import org.openrndr.application -import org.openrndr.color.ColorRGBa -import org.openrndr.extra.syphon.SyphonClient - -/** - * This example uses After Effects and OPENRNDR connected via Syphon - */ -fun main() = application { - configure { - // The maximum resolution supported by the free - // version of AESyphon - width = 1024 - height = 768 - } - - program { - val syphonClient = SyphonClient("Adobe After Effects", "Live Preview") - - extend(syphonClient) - extend { - drawer.clear(ColorRGBa.BLACK) - drawer.image(syphonClient.buffer) - } - } -} \ No newline at end of file +//import org.openrndr.application +//import org.openrndr.color.ColorRGBa +//import org.openrndr.extra.syphon.SyphonClient +// +///** +// * This example uses After Effects and OPENRNDR connected via Syphon +// */ +//fun main() = application { +// configure { +// // The maximum resolution supported by the free +// // version of AESyphon +// width = 1024 +// height = 768 +// } +// +// program { +// val syphonClient = SyphonClient("Adobe After Effects", "Live Preview") +// +// extend(syphonClient) +// extend { +// drawer.clear(ColorRGBa.BLACK) +// drawer.image(syphonClient.buffer) +// } +// } +//} \ No newline at end of file diff --git a/orx-jvm/orx-syphon/src/test/kotlin/ServerExample.kt b/orx-jvm/orx-syphon/src/test/kotlin/ServerExample.kt index e0b14bfd..a21d2037 100644 --- a/orx-jvm/orx-syphon/src/test/kotlin/ServerExample.kt +++ b/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.* diff --git a/orx-jvm/orx-syphon/src/test/kotlin/ServerExampleAlternateRenderTarget.kt b/orx-jvm/orx-syphon/src/test/kotlin/ServerExampleAlternateRenderTarget.kt index c36d8259..53e25761 100644 --- a/orx-jvm/orx-syphon/src/test/kotlin/ServerExampleAlternateRenderTarget.kt +++ b/orx-jvm/orx-syphon/src/test/kotlin/ServerExampleAlternateRenderTarget.kt @@ -1,36 +1,36 @@ -import org.openrndr.application -import org.openrndr.color.ColorRGBa -import org.openrndr.draw.isolatedWithTarget -import org.openrndr.draw.renderTarget -import org.openrndr.extra.syphon.SyphonServer -import kotlin.math.* - -fun main() = application { - configure { - width = 1000 - height = 1000 - } - - program { - val rt = renderTarget(100, 100) { - colorBuffer() - } - - // You can give the server a different name - extend(SyphonServer("Test", rt)) - - extend { - /** - * This is what will be sent to Syphon, and drawn in a small corner of the screen - */ - drawer.isolatedWithTarget(rt) { - drawer.clear(ColorRGBa(sin(seconds), cos(seconds / 2.0), 0.5, 1.0)) - } - - drawer.clear(ColorRGBa.PINK) - drawer.fill = ColorRGBa.WHITE - drawer.circle(drawer.bounds.center, abs(cos(seconds)) * height * 0.5) - drawer.image(rt.colorBuffer(0)) - } - } -} \ No newline at end of file +//import org.openrndr.application +//import org.openrndr.color.ColorRGBa +//import org.openrndr.draw.isolatedWithTarget +//import org.openrndr.draw.renderTarget +//import org.openrndr.extra.syphon.SyphonServer +//import kotlin.math.* +// +//fun main() = application { +// configure { +// width = 1000 +// height = 1000 +// } +// +// program { +// val rt = renderTarget(100, 100) { +// colorBuffer() +// } +// +// // You can give the server a different name +// extend(SyphonServer("Test", rt)) +// +// extend { +// /** +// * This is what will be sent to Syphon, and drawn in a small corner of the screen +// */ +// drawer.isolatedWithTarget(rt) { +// drawer.clear(ColorRGBa(sin(seconds), cos(seconds / 2.0), 0.5, 1.0)) +// } +// +// drawer.clear(ColorRGBa.PINK) +// drawer.fill = ColorRGBa.WHITE +// drawer.circle(drawer.bounds.center, abs(cos(seconds)) * height * 0.5) +// drawer.image(rt.colorBuffer(0)) +// } +// } +//} \ No newline at end of file