diff --git a/MPEMessagingExamples/.classpath b/MPEMessagingExamples/.classpath
index a02ffe8..5e849a7 100644
--- a/MPEMessagingExamples/.classpath
+++ b/MPEMessagingExamples/.classpath
@@ -11,8 +11,6 @@
-
-
@@ -21,5 +19,8 @@
+
+
+
diff --git a/MPEMessagingExamples/.project b/MPEMessagingExamples/.project
index c603ffc..27ea83c 100644
--- a/MPEMessagingExamples/.project
+++ b/MPEMessagingExamples/.project
@@ -1,6 +1,6 @@
- MPEMessagingExamples
+ Most-Pixels-Ever-Examples
diff --git a/Most-Pixels-Ever-Processing/data/asynch.xml b/MPEMessagingExamples/data/asynch.xml
similarity index 100%
rename from Most-Pixels-Ever-Processing/data/asynch.xml
rename to MPEMessagingExamples/data/asynch.xml
diff --git a/Most-Pixels-Ever-Processing/data/mpe0.xml b/MPEMessagingExamples/data/mpe0.xml
similarity index 100%
rename from Most-Pixels-Ever-Processing/data/mpe0.xml
rename to MPEMessagingExamples/data/mpe0.xml
diff --git a/Most-Pixels-Ever-Processing/data/mpe1.xml b/MPEMessagingExamples/data/mpe1.xml
similarity index 100%
rename from Most-Pixels-Ever-Processing/data/mpe1.xml
rename to MPEMessagingExamples/data/mpe1.xml
diff --git a/MPEMessagingExamples/lib/core/core.jar b/MPEMessagingExamples/lib/core/core.jar
deleted file mode 100644
index 281761b..0000000
Binary files a/MPEMessagingExamples/lib/core/core.jar and /dev/null differ
diff --git a/MPEMessagingExamples/lib/simpleML.jar b/MPEMessagingExamples/lib/simpleML.jar
deleted file mode 100644
index f594e24..0000000
Binary files a/MPEMessagingExamples/lib/simpleML.jar and /dev/null differ
diff --git a/MPEMessagingExamples/lib/video/video.jar b/MPEMessagingExamples/lib/video/video.jar
deleted file mode 100644
index 45d1a90..0000000
Binary files a/MPEMessagingExamples/lib/video/video.jar and /dev/null differ
diff --git a/MPEMessagingExamples/mpe.jar b/MPEMessagingExamples/mpe.jar
deleted file mode 100644
index 4f4ee63..0000000
Binary files a/MPEMessagingExamples/mpe.jar and /dev/null differ
diff --git a/MPEMessagingExamples/mpefiles/mpe0.ini b/MPEMessagingExamples/mpefiles/mpe0.ini
deleted file mode 100644
index a4cf38e..0000000
--- a/MPEMessagingExamples/mpefiles/mpe0.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-id=0;
-server=localhost;
-port=9002;
-localScreenSize=320,240;
-localLocation=0,0;
-masterDimensions=960,240;
-debug=0;
diff --git a/MPEMessagingExamples/mpefiles/mpe1.ini b/MPEMessagingExamples/mpefiles/mpe1.ini
deleted file mode 100644
index 49d79c7..0000000
--- a/MPEMessagingExamples/mpefiles/mpe1.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-id=1;
-server=localhost;
-port=9002;
-localScreenSize=320,240;
-localLocation=320,0;
-masterDimensions=960,240;
-debug=0;
diff --git a/MPEMessagingExamples/mpefiles/mpe2.ini b/MPEMessagingExamples/mpefiles/mpe2.ini
deleted file mode 100644
index c32ea51..0000000
--- a/MPEMessagingExamples/mpefiles/mpe2.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-id=2;
-server=localhost;
-port=9002;
-localScreenSize=320,240;
-localLocation=640,0;
-masterDimensions=960,240;
-debug=0;
diff --git a/MPEMessagingExamples/src/helloworld/HelloWorld.java b/MPEMessagingExamples/src/helloworld/HelloWorld.java
index 2f89c59..b01d025 100644
--- a/MPEMessagingExamples/src/helloworld/HelloWorld.java
+++ b/MPEMessagingExamples/src/helloworld/HelloWorld.java
@@ -15,7 +15,7 @@
public class HelloWorld extends PApplet {
- final int ID = 1;
+ final int ID = 0;
float x;
TCPClient client;
@@ -28,7 +28,7 @@ static public void main(String args[]) {
public void setup() {
// make a new Client using an INI file
// sketchPath() is used so that the INI file is local to the sketch
- client = new TCPClient(sketchPath("mpefiles/mpe"+ID+".ini"), this);
+ client = new TCPClient("mpe"+ID+".xml", this);
// the size is determined by the client's local width and height
size(client.getLWidth(), client.getLHeight());
@@ -47,7 +47,6 @@ public void setup() {
// Keep the motor running... draw() needs to be added in auto mode, even if
// it is empty to keep things rolling.
public void draw() {
- frame.setLocation(client.getID()*client.getLWidth(),0);
}
//--------------------------------------
diff --git a/Most-Pixels-Ever-Processing/src/mpe/examples/ASyncClientExample.java b/MPEMessagingExamples/src/mpe/examples/ASyncClientExample.java
similarity index 100%
rename from Most-Pixels-Ever-Processing/src/mpe/examples/ASyncClientExample.java
rename to MPEMessagingExamples/src/mpe/examples/ASyncClientExample.java
diff --git a/Most-Pixels-Ever-Processing/src/mpe/examples/AutoBalls.java b/MPEMessagingExamples/src/mpe/examples/AutoBalls.java
similarity index 100%
rename from Most-Pixels-Ever-Processing/src/mpe/examples/AutoBalls.java
rename to MPEMessagingExamples/src/mpe/examples/AutoBalls.java
diff --git a/Most-Pixels-Ever-Processing/src/mpe/examples/BouncingBalls.java b/MPEMessagingExamples/src/mpe/examples/BouncingBalls.java
similarity index 100%
rename from Most-Pixels-Ever-Processing/src/mpe/examples/BouncingBalls.java
rename to MPEMessagingExamples/src/mpe/examples/BouncingBalls.java
diff --git a/Most-Pixels-Ever-Processing/src/mpe/examples/OptimizedBalls.java b/MPEMessagingExamples/src/mpe/examples/OptimizedBalls.java
similarity index 100%
rename from Most-Pixels-Ever-Processing/src/mpe/examples/OptimizedBalls.java
rename to MPEMessagingExamples/src/mpe/examples/OptimizedBalls.java
diff --git a/Most-Pixels-Ever-Processing/src/mpe/examples/ThreeDTest.java b/MPEMessagingExamples/src/mpe/examples/ThreeDTest.java
similarity index 100%
rename from Most-Pixels-Ever-Processing/src/mpe/examples/ThreeDTest.java
rename to MPEMessagingExamples/src/mpe/examples/ThreeDTest.java
diff --git a/Most-Pixels-Ever-Processing/src/mpe/examples/VideoTest.java b/MPEMessagingExamples/src/mpe/examples/VideoTest.java
similarity index 100%
rename from Most-Pixels-Ever-Processing/src/mpe/examples/VideoTest.java
rename to MPEMessagingExamples/src/mpe/examples/VideoTest.java
diff --git a/Most-Pixels-Ever-Processing/src/mpe/examples/quotes/QuoteDisplay.java b/MPEMessagingExamples/src/mpe/examples/quotes/QuoteDisplay.java
similarity index 100%
rename from Most-Pixels-Ever-Processing/src/mpe/examples/quotes/QuoteDisplay.java
rename to MPEMessagingExamples/src/mpe/examples/quotes/QuoteDisplay.java
diff --git a/Most-Pixels-Ever-Processing/src/mpe/examples/quotes/QuoteFetcher.java b/MPEMessagingExamples/src/mpe/examples/quotes/QuoteFetcher.java
similarity index 100%
rename from Most-Pixels-Ever-Processing/src/mpe/examples/quotes/QuoteFetcher.java
rename to MPEMessagingExamples/src/mpe/examples/quotes/QuoteFetcher.java
diff --git a/Most-Pixels-Ever-Processing/src/template/library/HelloLibrary.java b/Most-Pixels-Ever-Processing/src/template/library/HelloLibrary.java
deleted file mode 100755
index 32cc568..0000000
--- a/Most-Pixels-Ever-Processing/src/template/library/HelloLibrary.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * ##library.name##
- * ##library.sentence##
- * ##library.url##
- *
- * Copyright ##copyright## ##author##
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * @author ##author##
- * @modified ##date##
- * @version ##library.prettyVersion## (##library.version##)
- */
-
-package template.library;
-
-
-import processing.core.*;
-
-/**
- * This is a template class and can be used to start a new processing library or tool.
- * Make sure you rename this class as well as the name of the example package 'template'
- * to your own library or tool naming convention.
- *
- * @example Hello
- *
- * (the tag @example followed by the name of an example included in folder 'examples' will
- * automatically include the example in the javadoc.)
- *
- */
-
-public class HelloLibrary {
-
- // myParent is a reference to the parent sketch
- PApplet myParent;
-
- int myVariable = 0;
-
- public final static String VERSION = "##library.prettyVersion##";
-
-
- /**
- * a Constructor, usually called in the setup() method in your sketch to
- * initialize and start the library.
- *
- * @example Hello
- * @param theParent
- */
- public HelloLibrary(PApplet theParent) {
- myParent = theParent;
- welcome();
- }
-
-
- private void welcome() {
- System.out.println("##library.name## ##library.prettyVersion## by ##author##");
- }
-
-
- public String sayHello() {
- return "hello library.";
- }
- /**
- * return the version of the library.
- *
- * @return String
- */
- public static String version() {
- return VERSION;
- }
-
- /**
- *
- * @param theA
- * the width of test
- * @param theB
- * the height of test
- */
- public void setVariable(int theA, int theB) {
- myVariable = theA + theB;
- }
-
- /**
- *
- * @return int
- */
- public int getVariable() {
- return myVariable;
- }
-}
-