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

2020-02-21 09:25:29 +01:00
parent 885b9e54a4
commit 04cf74e969
14 changed files with 75 additions and 73 deletions
--- 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
--- 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


--- 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.*
--- 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 {
--- 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
--- 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)
--- 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
--- 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)

--- a/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/Syphon
+++ b/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/Syphon
--- a/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/libJSyphon.jnilib
+++ b/orx-jvm/orx-syphon/src/main/resources/jsyphon-natives/libJSyphon.jnilib