Merge branch 'feature-processing2'

.classpath

@@ -6,27 +6,30 @@
 	<classpathentry excluding="**/.svn|**/.svn/" kind="src" path="config"/>
 	<classpathentry excluding="**/.svn|**/.svn/" kind="src" path="data"/>
 	<classpathentry kind="src" path="examples-extern"/>
-	<classpathentry kind="src" path="notworking"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="lib/core.jar" sourcepath="/processing-1.0.9/core"/>
-	<classpathentry kind="lib" path="lib/glgraphics.jar"/>
-	<classpathentry kind="lib" path="lib/gluegen-rt.jar"/>
-	<classpathentry kind="lib" path="lib/jogl.jar">
+	<classpathentry kind="lib" path="lib/gluegen-rt.jar">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="unfolding/libNative/macosx"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="unfolding/lib/libNative"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
-	<classpathentry kind="lib" path="lib/opengl.jar"/>
 	<classpathentry kind="lib" path="lib/libTUIO.jar"/>
 	<classpathentry kind="lib" path="lib/sqlitejdbc-v056.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.10.jar"/>
 	<classpathentry kind="lib" path="lib/json4processing.jar"/>
 	<classpathentry kind="lib" path="lib-extern/Ani.jar"/>
-	<classpathentry kind="lib" path="lib-extern/controlP5.jar"/>
 	<classpathentry kind="lib" path="lib-extern/geonames-1.1.6.jar"/>
 	<classpathentry kind="lib" path="lib-extern/joda-time-2.0.jar"/>
 	<classpathentry kind="lib" path="lib-extern/toxiclibs_p5.jar"/>
 	<classpathentry kind="lib" path="lib-extern/toxiclibscore.jar"/>
+	<classpathentry kind="lib" path="lib/jogl-all.jar">
+		<attributes>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="unfolding/libNative"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/gluegen-rt-natives-macosx-universal.jar"/>
+	<classpathentry kind="lib" path="lib/jogl-all-natives-macosx-universal.jar"/>
+	<classpathentry kind="lib" path="lib/core.jar"/>
+	<classpathentry kind="lib" path="lib-extern/controlP5.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -3,10 +3,6 @@ bin/*
 build/
 dist/
 doc/
-
-*.DS_STORE
 .DS_Store
-
 data/splendor-big.png
-
 src/de/fhpotsdam/unfolding/mapdisplay/GLGraphicsMapDisplayTransparentTest.java

.settings/org.eclipse.core.resources.prefs

@@ -1,2 +1,4 @@
 eclipse.preferences.version=1
+encoding//examples/de/fhpotsdam/unfolding/examples/image/ImageOverlayApp.java=UTF-8
+encoding//src/de/fhpotsdam/unfolding/mapdisplay/AbstractMapDisplay.java=UTF-8
 encoding//src/de/fhpotsdam/unfolding/utils/DebugDisplay.java=UTF-8

README.md

@@ -22,19 +22,20 @@ such as OpenStreetMap or TileMill.
 
 
 ## Download
-Get Unfolding from <http://unfoldingmaps.org/> or directly from here: https://github.com/tillnagel/unfolding/downloads
+Get Unfolding from <http://unfoldingmaps.org/> or directly from here: http://unfoldingmaps.org/downloads
 
 
 ## Credit
-Developed at Interaction Design Lab, FH Potsdam, and the HCI group, KU Leuven.
+Developed at Interaction Design Lab, FH Potsdam, the HCI group, KU Leuven, and MIT Senseable City Labs.
+See http://unfoldingmaps.org/contact.html for the full credits.
 
 
 ## License
 
 You may use Unfolding under the terms of the MIT License. See http://en.wikipedia.org/wiki/MIT_License for more information.
 
 
-Copyright (C) 2013 Till Nagel, and contributors
+Copyright (C) 2014 Till Nagel, and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build.xml

@@ -9,7 +9,7 @@
 		/resources/unfolding_app_template/classpath
 		/resources/unfolding_app_template/classpath_with_examples
 	-->
-	<property name="version" value="0.9.3" />
+	<property name="version" value="0.9.5" />
 	<property name="unfolding.jar" value="unfolding.${version}.jar" />
 
 	<property name="src.dir" location="src" />
@@ -116,21 +116,25 @@
 		<mkdir dir="${dist.dir}/unfolding_app_template/bin" />
 		<mkdir dir="${dist.dir}/unfolding_app_template/data" />
 		<mkdir dir="${dist.dir}/unfolding_app_template/lib" />
-		<mkdir dir="${dist.dir}/unfolding_app_template/libNative" />
+		<!--<mkdir dir="${dist.dir}/unfolding_app_template/libNative" />-->
 		<mkdir dir="${dist.dir}/unfolding_app_template/src" />
 		<!-- copy all libs -->
 		<copy todir="${dist.dir}/unfolding_app_template/lib/">
 			<fileset dir="lib">
 				<exclude name="*junit*" />
 			</fileset>
 		</copy>
+		<!--
 		<copy todir="${dist.dir}/unfolding_app_template/libNative/">
 			<fileset dir="libNative" />
 		</copy>
+		-->
 		<!-- copy our current unfolding jar -->
 		<copy file="${dist.dir}/${unfolding.jar}" todir="${dist.dir}/unfolding_app_template/lib/" />
 		<!-- copy readme -->
 		<copy file="resources/unfolding_app_template/README" todir="${dist.dir}/unfolding_app_template/" />
+		<!-- copy license -->
+		<copy file="LICENSE.txt" todir="${dist.dir}/unfolding_app_template/" />
 		<!-- copy main example src -->
 		<copy file="examples/HelloUnfoldingWorld.java" todir="${dist.dir}/unfolding_app_template/src/" />
 		<!-- copy .classpath and .project -->
@@ -150,17 +154,19 @@
 		<mkdir dir="${dist.dir}/unfolding_app_template_with_examples/bin" />
 		<mkdir dir="${dist.dir}/unfolding_app_template_with_examples/data" />
 		<mkdir dir="${dist.dir}/unfolding_app_template_with_examples/lib" />
-		<mkdir dir="${dist.dir}/unfolding_app_template_with_examples/libNative" />
+		<!--<mkdir dir="${dist.dir}/unfolding_app_template_with_examples/libNative" />-->
 		<mkdir dir="${dist.dir}/unfolding_app_template_with_examples/src" />
 		<!-- copy all libs -->
 		<copy todir="${dist.dir}/unfolding_app_template_with_examples/lib/">
 			<fileset dir="lib">
 				<exclude name="*junit*" />
 			</fileset>
 		</copy>
+		<!--
 		<copy todir="${dist.dir}/unfolding_app_template_with_examples/libNative/">
 			<fileset dir="libNative" />
 		</copy>
+		-->
 		<!-- copy our current unfolding jar -->
 		<copy file="${dist.dir}/${unfolding.jar}" todir="${dist.dir}/unfolding_app_template_with_examples/lib/" />
 		<!-- copy data files -->
@@ -169,6 +175,7 @@
 		</copy>
 		<!-- copy readme -->
 		<copy file="resources/unfolding_app_template/README" todir="${dist.dir}/unfolding_app_template_with_examples/" />
+		<copy file="LICENSE.txt" todir="${dist.dir}/unfolding_app_template_with_examples/" />
 		<!-- copy main example src -->
 		<copy file="examples/HelloUnfoldingWorld.java" todir="${dist.dir}/unfolding_app_template/src/" />
 		<!-- copy some examples -->
@@ -192,8 +199,11 @@
 		<mkdir dir="${dist.dir}/Unfolding/library" />
 		<mkdir dir="${dist.dir}/Unfolding/reference" />
 
+		<!-- copy library.properties -->
+		<copy todir="${dist.dir}/Unfolding/" file="resources/library.properties" />
+
 		<!-- copy libs -->
-		<copy file="${dist.dir}/${unfolding.jar}" tofile="${dist.dir}/Unfolding/library/Unfolding.jar" />
+		<copy tofile="${dist.dir}/Unfolding/library/Unfolding.jar" file="${dist.dir}/${unfolding.jar}" />
 		<copy todir="${dist.dir}/Unfolding/library/" file="${lib.dir}/log4j-1.2.15.jar" />
 		<copy todir="${dist.dir}/Unfolding/library/" file="${lib.dir}/json4processing.jar" />
 
@@ -215,7 +225,7 @@
 
 	<!--
 		Copy the javadoc to the gh-pages folder.
-		The assumption is, that there is a gh-gages folder ../gh-pages/.
+		The assumption is, that there is a gh-pages folder ../gh-pages/.
 		This should make it easier to keep the api section on gh-pages up to date.
 	-->
 	<target name="docs2ghpages" depends="docs2ghpages.errormsg, dir.gh-pages.check, docs" if="dir.exists">