Permalink
Browse files

updating for Processing 3

  • Loading branch information...
shiffman committed Jun 8, 2016
1 parent f025e64 commit 1d6e073151470d925cc1ee70d3d371e520c656d5
Showing with 42 additions and 224 deletions.
  1. +1 −0 .gitignore
  2. +0 −23 Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpe.xml
  3. +0 −78 Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Info.plist
  4. BIN Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/MacOS/JavaApplicationStub
  5. +0 −1 Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/PkgInfo
  6. BIN Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/core.jar
  7. BIN ...mples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/gluegen-rt-natives-macosx-universal.jar
  8. BIN ...ixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/gluegen-rt.jar
  9. BIN ...xamples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/jogl-all-natives-macosx-universal.jar
  10. BIN ...-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/jogl-all.jar
  11. BIN Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/mpe.jar
  12. BIN Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/mpeTest.jar
  13. BIN Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/sketch.icns
  14. +0 −23 Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpe.xml
  15. +0 −78 Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Info.plist
  16. BIN Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/MacOS/JavaApplicationStub
  17. +0 −1 Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/PkgInfo
  18. BIN Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/core.jar
  19. BIN ...mples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/gluegen-rt-natives-macosx-universal.jar
  20. BIN ...ixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/gluegen-rt.jar
  21. BIN ...xamples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/jogl-all-natives-macosx-universal.jar
  22. BIN ...-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/jogl-all.jar
  23. BIN Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/mpe.jar
  24. BIN Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/mpeTest.jar
  25. BIN Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/sketch.icns
  26. +3 −3 Most-Pixels-Ever-Processing/examples/mpeTest/mpe.xml
  27. +5 −3 Most-Pixels-Ever-Processing/examples/mpeTest/mpeTest.pde
  28. +19 −9 Most-Pixels-Ever-Processing/resources/build.properties
  29. +12 −3 Most-Pixels-Ever-Processing/resources/library.properties
  30. +1 −1 Most-Pixels-Ever-Processing/src/mpe/client/TCPClient.java
  31. +1 −1 Most-Pixels-Ever-Server/java/src/mpe/server/MPEServer.java
View
@@ -1,3 +1,4 @@
*.class
.DS_Store
Most-Pixels-Ever-Processing/distribution/
+bin/
@@ -1,23 +0,0 @@
-<settings>
- <id>0</id>
- <name>renderer0</name> <!-- optional -->
- <server>
- <ip>localhost</ip>
- <port>9002</port>
- </server>
- <local_dimensions>
- <width>320</width>
- <height>480</height>
- </local_dimensions>
- <local_location>
- <x>0</x>
- <y>0</y>
- </local_location>
- <master_dimensions>
- <width>640</width>
- <height>480</height>
- </master_dimensions>
- <offset_window>true</offset_window>
- <verbose>true</verbose>
- <simulation fps="30">false</simulation>
-</settings>
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
- <dict>
- <key>CFBundleName</key>
- <string>mpeTest</string>
- <key>CFBundleVersion</key>
- <string>1.0</string>
- <key>CFBundleAllowMixedLocalizations</key>
- <string>true</string>
- <key>CFBundleExecutable</key>
- <string>JavaApplicationStub</string>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleIconFile</key>
- <string>sketch.icns</string>
- <key>CFBundleIdentifier</key>
- <string>mpeTest</string>
-
- <!-- http://developer.apple.com/documentation/MacOSX/Conceptual/BPRuntimeConfig/Articles/PListKeys.html#//apple_ref/doc/uid/20001431-113616 -->
- <key>LSUIPresentationMode</key>
- <integer>0</integer>
-
- <key>LSArchitecturePriority</key>
- <array>
- <string>x86_64</string>
- <string>i386</string>
- </array>
-
- <key>Java</key>
- <dict>
- <key>VMOptions</key>
- <string> -Xms64m -Xmx2048m</string>
-
- <key>MainClass</key>
- <string>mpeTest</string>
-
- <!-- We don't support Java 7 on OS X.
- Using it will break lots of things. -->
- <key>JVMVersion</key>
- <string>1.6*</string>
-
- <key>ClassPath</key>
- <string>$JAVAROOT/mpeTest.jar:$JAVAROOT/core.jar:$JAVAROOT/jogl-all.jar:$JAVAROOT/gluegen-rt.jar:$JAVAROOT/jogl-all-natives-macosx-universal.jar:$JAVAROOT/gluegen-rt-natives-macosx-universal.jar:$JAVAROOT/mpe.jar</string>
-
- <!-- http://developer.apple.com/releasenotes/Java/java141/system_properties/chapter_4_section_1.html#//apple_ref/doc/uid/TP30000285 -->
- <key>Properties</key>
- <dict>
- <key>apple.laf.useScreenMenuBar</key>
- <string>true</string>
- <key>apple.awt.showGrowBox</key>
- <string>false</string>
- <key>com.apple.smallTabs</key>
- <string>true</string>
- <key>apple.awt.Antialiasing</key>
- <string>false</string>
- <key>apple.awt.TextAntialiasing</key>
- <string>true</string>
- <key>com.apple.hwaccel</key>
- <string>true</string>
- <!--
- As of 2.0.1, this was set to 'false', but not sure why.
- Now changed to 'true', otherwise it shows .app packages
- as folders when using selectInput() and others.
- https://github.com/processing/processing/issues/1959
- -->
- <key>apple.awt.use-file-dialog-packages</key>
- <string>true</string>
- </dict>
- </dict>
- </dict>
-</plist>
@@ -1,23 +0,0 @@
-<settings>
- <id>1</id>
- <name>renderer1</name> <!-- optional -->
- <server>
- <ip>localhost</ip>
- <port>9002</port>
- </server>
- <local_dimensions>
- <width>320</width>
- <height>480</height>
- </local_dimensions>
- <local_location>
- <x>320</x>
- <y>0</y>
- </local_location>
- <master_dimensions>
- <width>640</width>
- <height>480</height>
- </master_dimensions>
- <offset_window>true</offset_window>
- <verbose>true</verbose>
- <simulation fps="30">false</simulation>
-</settings>
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
- <dict>
- <key>CFBundleName</key>
- <string>mpeTest</string>
- <key>CFBundleVersion</key>
- <string>1.0</string>
- <key>CFBundleAllowMixedLocalizations</key>
- <string>true</string>
- <key>CFBundleExecutable</key>
- <string>JavaApplicationStub</string>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleIconFile</key>
- <string>sketch.icns</string>
- <key>CFBundleIdentifier</key>
- <string>mpeTest</string>
-
- <!-- http://developer.apple.com/documentation/MacOSX/Conceptual/BPRuntimeConfig/Articles/PListKeys.html#//apple_ref/doc/uid/20001431-113616 -->
- <key>LSUIPresentationMode</key>
- <integer>0</integer>
-
- <key>LSArchitecturePriority</key>
- <array>
- <string>x86_64</string>
- <string>i386</string>
- </array>
-
- <key>Java</key>
- <dict>
- <key>VMOptions</key>
- <string> -Xms64m -Xmx2048m</string>
-
- <key>MainClass</key>
- <string>mpeTest</string>
-
- <!-- We don't support Java 7 on OS X.
- Using it will break lots of things. -->
- <key>JVMVersion</key>
- <string>1.6*</string>
-
- <key>ClassPath</key>
- <string>$JAVAROOT/mpeTest.jar:$JAVAROOT/core.jar:$JAVAROOT/jogl-all.jar:$JAVAROOT/gluegen-rt.jar:$JAVAROOT/jogl-all-natives-macosx-universal.jar:$JAVAROOT/gluegen-rt-natives-macosx-universal.jar:$JAVAROOT/mpe.jar</string>
-
- <!-- http://developer.apple.com/releasenotes/Java/java141/system_properties/chapter_4_section_1.html#//apple_ref/doc/uid/TP30000285 -->
- <key>Properties</key>
- <dict>
- <key>apple.laf.useScreenMenuBar</key>
- <string>true</string>
- <key>apple.awt.showGrowBox</key>
- <string>false</string>
- <key>com.apple.smallTabs</key>
- <string>true</string>
- <key>apple.awt.Antialiasing</key>
- <string>false</string>
- <key>apple.awt.TextAntialiasing</key>
- <string>true</string>
- <key>com.apple.hwaccel</key>
- <string>true</string>
- <!--
- As of 2.0.1, this was set to 'false', but not sure why.
- Now changed to 'true', otherwise it shows .app packages
- as folders when using selectInput() and others.
- https://github.com/processing/processing/issues/1959
- -->
- <key>apple.awt.use-file-dialog-packages</key>
- <string>true</string>
- </dict>
- </dict>
- </dict>
-</plist>
@@ -3,7 +3,7 @@
<name>renderer0</name> <!-- optional -->
<server>
<ip>localhost</ip>
- <port>9002</port>
+ <port>9002</port>
</server>
<local_dimensions>
<width>320</width>
@@ -18,6 +18,6 @@
<height>480</height>
</master_dimensions>
<offset_window>true</offset_window>
- <verbose>true</verbose>
+ <verbose>false</verbose>
<simulation fps="30">false</simulation>
-</settings>
+</settings>
@@ -3,12 +3,15 @@ import mpe.client.*;
ArrayList<Ball> balls;
TCPClient client;
-void setup() {
+void settings() {
// make a new Client using an XML file
client = new TCPClient(this, "mpe.xml");
// the size is determined by the client's local width and height
size(client.getLWidth(), client.getLHeight());
+}
+
+void setup() {
// the random seed must be identical for all clients
randomSeed(1);
@@ -69,5 +72,4 @@ void mousePressed() {
int x = mouseX + client.getXoffset();
int y = mouseY + client.getYoffset();
client.broadcast(x + "," + y);
-}
-
+}
@@ -38,7 +38,7 @@ sketchbook.location=${user.home}/Dropbox/Processing
# Uncommenting the line below will overwrite the classpath.local.location from
# above.
-classpath.local.location=/Applications/Processing-2.1.app/Contents/Java/
+classpath.local.location=/Applications/Processing-3.1.1.app/Contents/Java/
# Add all jar files that are required for compiling your project to the local
@@ -59,7 +59,7 @@ classpath.libraries.location=${sketchbook.location}/libraries
# (3)
# Set the java version that should be used to compile your library.
-java.target.version=1.6
+java.target.version=1.7
# Set the description of the Ant build.xml file.
@@ -149,23 +149,33 @@ source.repository=https://github.com/shiffman/Most-Pixels-Ever-Processing
# This is used to compare different versions of the same library, and check if
# an update is available.
-library.version=3
+library.version=4
+
+# The min and max revision of Processing compatible with your Library.
+# Note that these fields use the revision and not the version of Processing,
+# parsable as an int. For example, the revision number for 2.2.1 is 227.
+# You can find the revision numbers in the change log: https://raw.githubusercontent.com/processing/processing/master/build/shared/revisions.txt
+# Only use maxRevision (or minRevision), when your Library is known to
+# break in a later (or earlier) release. Otherwise, use the default value 0.
+
+compatible.minRevision=246
+compatible.maxRevision=0
+
# The version as the user will see it.
-library.prettyVersion=2.0.2
+library.prettyVersion=2.0.3
-library.copyright=(c) 2013
+library.copyright=(c) 2016
library.dependencies=?
library.keywords=?
tested.platform=osx,windows
-tested.processingVersion=2.1
+tested.processingVersion=3.1.1
# Include javadoc references into your project's javadocs.
-
-javadoc.java.href=http://java.sun.com/javase/6/docs/api/
-javadoc.processing.href=http://processing.googlecode.com/svn/trunk/processing/build/javadoc/core/
+javadoc.java.href=http://docs.oracle.com/javase/7/docs/api/
+javadoc.processing.href=http://processing.org/reference/javadoc/core/
@@ -5,7 +5,7 @@
name = Most Pixels Ever
# List of authors. Links can be provided using the syntax [author name](url).
-authorList = [Daniel Shiffman](http://shiffman.net)
+authors = [Daniel Shiffman](http://shiffman.net)
# A web page for your library, NOT a direct link to where to download it.
url = https://github.com/shiffman/Most-Pixels-Ever-Processing
@@ -42,8 +42,17 @@ paragraph = Through server / client communication multiple sketches can be run o
# compare different versions of the same library, and check if an update is
# available. You should think of it as a counter, counting the total number of
# releases you've had.
-version = 3 # This must be parsable as an int
+version = 4 # This must be parsable as an int
# The version as the user will see it. If blank, the version attribute will be
# used here.
-prettyVersion = 2.0.2 # This is treated as a String
+prettyVersion = 2.0.3 # This is treated as a String
+
+# The min and max revision of Processing compatible with your library.
+# Note that these fields use the revision and not the version of Processing,
+# parsable as an int. For example, the revision number for 2.2.1 is 227.
+# You can find the revision numbers in the change log: https://raw.githubusercontent.com/processing/processing/master/build/shared/revisions.txt
+# Only use maxRevision (or minRevision), when your library is known to
+# break in a later (or earlier) release. Otherwise, use the default value 0.
+minRevision = 246
+maxRevision = 0
@@ -25,7 +25,7 @@
public class TCPClient extends Thread {
- public static final String version = "2.0.2";
+ public static final String version = "2.0.3";
/** If VERBOSE is true, the client will print lots of messages about what it is doing.
* Set with debug=true; in your XML file. */
@@ -22,7 +22,7 @@
public class MPEServer {
- public static final String version = "2.0.2";
+ public static final String version = "2.0.3";
private HashMap<Integer,Connection> connectionlookup = new HashMap<Integer,Connection>();
private ArrayList<Connection> synchconnections = new ArrayList<Connection>();

0 comments on commit 1d6e073

Please sign in to comment.