diff --git a/core.jar b/core.jar index f0bae82..5b410ab 100644 Binary files a/core.jar and b/core.jar differ diff --git a/core_3-5-4.jar b/core_3-5-4.jar new file mode 100644 index 0000000..f0bae82 Binary files /dev/null and b/core_3-5-4.jar differ diff --git a/core_4-1.jar b/core_4-1.jar new file mode 100644 index 0000000..5b410ab Binary files /dev/null and b/core_4-1.jar differ diff --git a/lib/JNISpout_32.dll b/lib/JNISpout_32.dll index 051456e..e8903c7 100644 Binary files a/lib/JNISpout_32.dll and b/lib/JNISpout_32.dll differ diff --git a/lib/JNISpout_64.dll b/lib/JNISpout_64.dll index 2a72680..327e12f 100644 Binary files a/lib/JNISpout_64.dll and b/lib/JNISpout_64.dll differ diff --git a/resources/build.properties b/resources/build.properties index eb9d856..51beceb 100644 --- a/resources/build.properties +++ b/resources/build.properties @@ -148,7 +148,7 @@ library.version = 7 # The version as the user will see it. -library.prettyVersion = 2.0.7.3 +library.prettyVersion = 2.0.7.5 # The min and max revision of Processing compatible with your Library. @@ -167,6 +167,7 @@ library.prettyVersion = 2.0.7.3 # PROCESSING 3.3.7 (REV 0264) - 13 March 2018 # PROCESSING 3.4 (REV 0265) - 26 July 2018 # PROCESSING 3.5.4 (REV 0270) - 17 January 2020 +# PROCESSING 4.0.1 (REV 1286) - 09 August 2022 compatible.minRevision=246 compatible.maxRevision=0 @@ -175,12 +176,12 @@ compatible.maxRevision=0 # against. This information is only used in the generated webpage. tested.platform=windows -tested.processingVersion=3.5.4 +tested.processingVersion=4.0.1 # Additional information for the generated webpage. -library.copyright=(c) 2022 +library.copyright=(c) 2023 library.dependencies=none library.keywords=texture, video, opengl diff --git a/resources/core.jar b/resources/core.jar index f0bae82..5b410ab 100644 Binary files a/resources/core.jar and b/resources/core.jar differ diff --git a/resources/library.properties b/resources/library.properties index 1f4fff6..4de7783 100644 --- a/resources/library.properties +++ b/resources/library.properties @@ -45,7 +45,7 @@ version = 7 # The version as the user will see it. If blank, the version attribute will be # used here. This should be a single word, with no spaces. -prettyVersion = 2.0.7.3 +prettyVersion = 2.0.7.5 # The min and max revision of Processing compatible with your Library. # Note that these fields use the revision and not the version of Processing, diff --git a/src/spout/JNISpout.java b/src/spout/JNISpout.java index 7a91b9f..53763c6 100644 --- a/src/spout/JNISpout.java +++ b/src/spout/JNISpout.java @@ -10,7 +10,7 @@ public class JNISpout { // Java instead of operating system String sunDataModel = System.getProperty("sun.arch.data.model"); - System.out.println("Spout " + sunDataModel +"bit v2.0.7.0 - Java " + jvm_version); + System.out.println("Spout " + sunDataModel +"bit v2.0.7.5 - Java " + jvm_version); // System.out.println("Java " + sunDataModel + "bit " + jvm_version); if(sunDataModel.equals("32")) System.loadLibrary("JNISpout_32"); @@ -60,7 +60,6 @@ else if(sunDataModel.equals("64")) protected static native int getTextureID(long ptr); protected static native boolean getMemoryShareMode(long ptr); protected static native int getShareMode(long ptr); - protected static native boolean setAdapter(int index, long ptr); // SpoutControls protected static native boolean createControl(String name, String type, float minimum, float maximum, float value, String text, long ptr); diff --git a/src/spout/Spout.java b/src/spout/Spout.java index 823ef8f..06d1b10 100644 --- a/src/spout/Spout.java +++ b/src/spout/Spout.java @@ -94,13 +94,18 @@ // Publish Release 2.0.7.2 tagged as "latest" and test download from sketch // 23.02.22 Add separate function ReceiveImage(PImage) // Load pixels and update them from the received texture -// 26.02.22 pgs alloccated by receiveGraphics rathere than in advance +// 26.02.22 pgs allocated by receiveGraphics rather than in advance // loadPixels() of PGraphics object in receiveGraphics to avoid null pixels array // getSenderData = return empty string if bufferSize = 0 // Initialize bufferSize on Spout object create // 27.02.22 Publish Release 2.0.7.3 // Processing 3.5.4 retained while Processing 4 is beta // Testing with Processing 4 shows no problems +// 01.11.22 Change to core.jar Processing 4.0.1 +// Rebuild with updated JSpoutLIB libraries Release 2.0.7.5 +// 20.12.22 Remove SetAdapter from JNI library +// 06.01.23 Update JSpoutLIB with SpoutGL files 2.007.009 +// Rebuild Release 2.0.7.5 // // ======================================================================================================== @@ -833,17 +838,7 @@ public void spoutLogFatal(String text) { JNISpout.spoutLogFatal(text, spoutPtr); } - - /** - * Set the adapter for Spout output - * @param index - * @return - */ - public boolean setAdapter(int index) - { - return JNISpout.setAdapter(index, spoutPtr); - } - + /** * Resize the receiver drawing surface and sketch window to that of the sender *