kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Edwin Jakobs
2020-02-21 09:25:29 +01:00
committed by edwin
parent 885b9e54a4
commit 04cf74e969
14 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
orx-jvm/orx-syphon/src/main/kotlin/SyphonClient.kt
View File

@@ -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

4
orx-jvm/orx-syphon/src/main/kotlin/SyphonServer.kt
View File

@@ -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

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

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

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

@@ -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 {

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

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

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

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

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

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

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

@@ -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)

BIN
orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/Syphon Executable file → Normal file
View File

Binary file not shown.

BIN
orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/libJSyphon.jnilib Executable file → Normal file
View File

Binary file not shown.

3
orx-jvm/orx-syphon/src/test/kotlin/ClientExample.kt
View File

@@ -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 {

50
orx-jvm/orx-syphon/src/test/kotlin/ClientExampleSpecificServer.kt
View File

@@ -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)
}
}
}
//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)
// }
// }
//}

3
orx-jvm/orx-syphon/src/test/kotlin/ServerExample.kt
View File

@@ -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.*

72
orx-jvm/orx-syphon/src/test/kotlin/ServerExampleAlternateRenderTarget.kt
View File

@@ -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))
}
}
}
//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))
// }
// }
//}