New release! Compatible with Processing 2.0!

jdf · Jun 20, 2013 · 8d226be · 8d226be
1 parent 02a2fe0
commit 8d226be
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/build.xml b/build.xml
@@ -1,30 +1,29 @@
-<project name="processingLibs" default="build">
+<project name="PeasyCam" default="build">
 
 	<description>
        PeasyCam build
     </description>
 
-	<property name="processing" location="../processing-1.5.1" />
-	<property name="processingLibraries" location="C:/Documents and Settings/Administrator/My Documents/Processing/libraries" />
+	<property name="processingLibraries" location="/Users/feinberg/Documents/Processing/libraries" />
 
-	<property name="libraryClasspath" location="${processing}/lib" />
+	<property name="libraryClasspath" location="../processing/core/library" />
 	<path id="library-classpath">
 		<fileset dir="${libraryClasspath}">
 			<include name="core.jar" />
 		</fileset>
 	</path>
 
-	<property name="javaVersion" value="1.5" />
+	<property name="javaVersion" value="1.6" />
 
     <property file="library.properties" prefix="library" />
 
     <property name="author" value="Jonathan Feinberg" />
-	<property name="copyright" value="(c) 2011" />
+	<property name="copyright" value="(c) 2013" />
 	<property name="libraryName" value="peasycam" />
 	<property name="yourLink" value="http://mrfeinberg.com" />
 	<property name="keywords" value="3D,camera,rotation" />
-	<property name="tested:platform" value="Windows" />
-	<property name="tested:processingVersion" value="1.5.1" />
+	<property name="tested:platform" value="Mac" />
+	<property name="tested:processingVersion" value="2.0" />
 	<property name="tested:dependencies" value="" />
 	<property name="source:host" value="GitHub" />
 	<property name="source:url" value="http://github.com/jdf/peasycam/" />
@@ -85,9 +84,10 @@
 
 		<echo message="bin: ${bin}"/>
 		<echo message="javaVersion: ${javaVersion}"/>
-		<echo message="library-classpath$ ${library-classpath}"/>
+		<echo message="library-classpath$ ${libraryClasspath}"/>
                 <mkdir dir="${bin}"/>
-		<javac target="${javaVersion}" destdir="${bin}" source="${javaVersion}">
+		<javac target="${javaVersion}" destdir="${bin}" source="${javaVersion}"
+			includeantruntime="false">
 			<classpath>
 				<path refid="library-classpath" />
 			</classpath>

diff --git a/library.properties b/library.properties
@@ -3,4 +3,4 @@ authorList = [Jonathan Feinberg](http://mrfeinberg.com/)
 url = http://mrfeinberg.com/peasycam/
 category = 3D
 sentence = A mouse driven camera-control library for 3D sketches.
-version = 106
+version = 200
diff --git a/src/peasy/PeasyCam.java b/src/peasy/PeasyCam.java
@@ -99,7 +99,7 @@ public void handleWheel(final int delta) {
 
 	private final PMatrix3D originalMatrix; // for HUD restore
 
-	public final String VERSION = "t1";
+	public final String VERSION = "200";
 
 	public PeasyCam(final PApplet parent, final double distance) {
 		this(parent, 0, 0, 0, distance);
@@ -268,13 +268,13 @@ public void keyEvent(final KeyEvent e) {
 		public void mouseEvent(final MouseEvent e) {
 			switch (e.getAction()) {
 			case MouseEvent.WHEEL:
-				wheelHandler.handleWheel((int)e.getAmount());
+				wheelHandler.handleWheel((int)e.getCount());
 				break;
 			case MouseEvent.RELEASE:
 				dragConstraint = null;
 				break;
 			case MouseEvent.CLICK:
-				if (resetOnDoubleClick && 2 == (int)e.getAmount()) {
+				if (resetOnDoubleClick && 2 == (int)e.getCount()) {
 					reset();
 				}
 				break;

diff --git a/web/index.html b/web/index.html
@@ -330,7 +330,7 @@ <h2>Tested</h2>
         </div>
 
         <div id="footer">
-          <p>by ##author##, 2008.</p>
+          <p>by ##author##, 2013.</p>
         </div>
       </div>
     </body>
-Original file line number
+Diff line change
@@ Expand Up / @@ -330,7 +330,7 @@ <h2>Tested</h2> @@
             </div>
             <div id="footer">
-              <p>by ##author##, 2008.</p>
+              <p>by ##author##, 2013.</p>
             </div>
           </div>
         </body>
@@ Expand Down @@