Revision: 221
Author:
andres....@gmail.com
Date: Sat Jul 13 12:32:54 2013
Log: using the updated texture get/draw API in Processing 0220 (2.0.2?)
http://code.google.com/p/syphon-implementations/source/detail?r=221
Modified:
/trunk/Syphon Implementations/Processing_2_0/resources/build.properties
/trunk/Syphon
Implementations/Processing_2_0/src/codeanticode/syphon/Syphon.java
/trunk/Syphon
Implementations/Processing_2_0/src/codeanticode/syphon/SyphonClient.java
=======================================
--- /trunk/Syphon Implementations/Processing_2_0/resources/build.properties
Wed Dec 5 12:44:39 2012
+++ /trunk/Syphon Implementations/Processing_2_0/resources/build.properties
Sat Jul 13 12:32:54 2013
@@ -10,7 +10,7 @@
# (0)
# Where is your processing build located?
-build.location=${user.home}/Coding/Processing/svn/trunk/processing/build/macosx/work/Processing.app/Contents/Resources/Java/core/library
+build.location=${user.home}/Coding/Processing/git/build/macosx/work/Processing.app/Contents/Resources/Java/core/library
@@ -34,7 +34,7 @@
# For Windows the default path would be ${user.home}/workspace/libs
# (make adjustments below)
-classpath.local.location=${user.home}/Coding/Processing/svn/trunk/processing
+classpath.local.location=${user.home}/Coding/Processing/git
@@ -100,16 +100,16 @@
# set the current version of your project.
-project.version=Beta2-r7
-project.copyright=(c) 2011-2012
+project.version=1.0
+project.copyright=(c) 2011-2013
project.dependencies=opengl, jsyphon
-project.keywords=frame sharing, realtime, osx, creative coding, opengl
+project.keywords=frame sharing, realtime, osx, opengl, creative coding
author.name=Andres Colubri
author.url=
http://interfaze.info/
tested.platform=OSX
-tested.processingversion=2.0b7
+tested.processingversion=2.0.2
# recommendations for storing your source code online are:
code.google or
github.
=======================================
--- /trunk/Syphon
Implementations/Processing_2_0/src/codeanticode/syphon/Syphon.java Sat Dec
8 10:53:33 2012
+++ /trunk/Syphon
Implementations/Processing_2_0/src/codeanticode/syphon/Syphon.java Sat Jul
13 12:32:54 2013
@@ -78,7 +78,7 @@
*/
protected static void init() {
if (count == 0) {
- PApplet.println("Syphon library for Processing " + VERSION);
+ PApplet.println("Processing Syphon library " + VERSION);
}
count++;
}
=======================================
--- /trunk/Syphon
Implementations/Processing_2_0/src/codeanticode/syphon/SyphonClient.java
Wed Dec 5 22:17:19 2012
+++ /trunk/Syphon
Implementations/Processing_2_0/src/codeanticode/syphon/SyphonClient.java
Sat Jul 13 12:32:54 2013
@@ -246,8 +246,10 @@
PGraphicsOpenGL destpg = (PGraphicsOpenGL)dest;
destpg.beginDraw();
destpg.background(0);
- destpg.drawTexture(PGL.TEXTURE_RECTANGLE, texId, texWidth, texHeight,
- 0, 0, texWidth, texHeight);
+ PGL pgl = destpg.beginPGL();
+ pgl.drawTexture(PGL.TEXTURE_RECTANGLE, texId, texWidth, texHeight,
+ 0, 0, texWidth, texHeight);
+ destpg.endPGL();
destpg.endDraw();
return dest;
@@ -284,8 +286,10 @@
PGraphicsOpenGL destpg = (PGraphicsOpenGL)tempDest;
destpg.beginDraw();
destpg.background(0);
- destpg.drawTexture(PGL.TEXTURE_RECTANGLE, texId, texWidth, texHeight,
- 0, 0, texWidth, texHeight);
+ PGL pgl = destpg.beginPGL();
+ pgl.drawTexture(PGL.TEXTURE_RECTANGLE, texId, texWidth, texHeight,
+ 0, 0, texWidth, texHeight);
+ destpg.endPGL();
destpg.endDraw();
// Uses the PGraphics texture as the cache object for the image