Merge remote-tracking branch 'upstream/master'

as per request #2172

Author: dhowe

app/src/processing/app/Base.java

@@ -46,9 +46,9 @@
 public class Base {
  // Added accessors for 0218 because the UpdateCheck class was not properly
  // updating the values, due to javac inlining the static final values.
- static private final int REVISION = 223;
+ static private final int REVISION = 224;
  /** This might be replaced by main() if there's a lib/version.txt file. */
- static private String VERSION_NAME = "0223"; //$NON-NLS-1$
+ static private String VERSION_NAME = "0224"; //$NON-NLS-1$
  /** Set true if this a proper release rather than a numbered revision. */
 // static private boolean RELEASE = false;
 
@@ -1592,7 +1592,7 @@ static public String getPlatformName() {
  }
 
 
- // Because the Oracle JDK is 64-bit only, we lose this ability, feature, 
+ // Because the Oracle JDK is 64-bit only, we lose this ability, feature,
  // edge case, headache.
 // /**
 // * Return whether sketches will run as 32- or 64-bits. On Linux and Windows,
@@ -1605,10 +1605,10 @@ static public String getPlatformName() {
 // }
 // return nativeBits;
 // }
- 
- /** 
- * Return whether sketches will run as 32- or 64-bits based 
- * on the JVM that's in use. 
+
+ /**
+ * Return whether sketches will run as 32- or 64-bits based
+ * on the JVM that's in use.
  */
  static public int getNativeBits() {
  return nativeBits;

build/build.xml

@@ -1035,8 +1035,23 @@
  ${windows.dist}
  =======================================================
  </echo>
+ </target> 
+
+
+ <!-- - - - - - - - - - - - - - - - - - -->
+ <!-- Package source 'n tag the release -->
+ <!-- - - - - - - - - - - - - - - - - - -->
+
+<!--
+not ready to automate this yet, since we often have to reset the tag
+ <target name="dist-src" depends="dist">
+ <exec executable="git">
+remove the spaces for depth since it should be double dash, but screws up comments
+ <arg line="clone - -depth 1 git@github.com:processing/processing.git /tmp/processing-${version}-src" />
+ </exec>
  </target>
- 
+-->
+
 
  <!-- - - - - - - - - -->
  <!-- Developer Docs -->

build/shared/lib/defaults.txt

@@ -26,6 +26,8 @@
 # You'll have problems running Processing if you incorrectly 
 # modify lines in this file. It will probably not start at all.
 
+# AGAIN, DO NOT ALTER THIS FILE! I'M ONLY YELLING BECAUSE I LOVE YOU!
+
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -265,18 +267,18 @@ editor.token.invalid.style = #666666,bold
 
 
 # which platforms to export by default
-export.application.platform.windows = true
-export.application.platform.macosx = true
-export.application.platform.linux = true
+#export.application.platform.windows = true
+#export.application.platform.macosx = true
+#export.application.platform.linux = true
 
 # whether or not to export as full screen (present) mode
 export.application.fullscreen = false
 
 # whether to show the stop button when exporting to application
 export.application.stop = true
 
-# false will place all exported files into a single .jar
-#export.applet.separate_jar_files = false
+# embed Java by default for lower likelihood of problems
+export.application.embed_java = true
 
 # set to false to no longer delete applet or application folders before export
 export.delete_target_folder = true

build/shared/revisions.txt

@@ -1,4 +1,10 @@
-PROCESSING 2.1 beta 2 (REV 0223) - 2X October 2013
+PROCESSING 2.1 (REV 0223) - 27 October 2013
+
+There have been major changes since 2.0.3, most of them are outlined in 
+the release notes for 2.1 beta 1 (look down a few dozen lines).
+
+This release includes a few updates to fix problems introduced in the beta 
+release, as well as additional general bug fixes, especially for OpenGL.
 
 + Added an option to not embed the Java runtime into an exported application.
  This saves you the 100 MB footprint, but requires your users to install
@@ -31,6 +37,64 @@ PROCESSING 2.1 beta 2 (REV 0223) - 2X October 2013
  object), we've added code so that println() works as before. But we
  can't do the same for arrays of objects, such as String. 
 
++ The preference for font smoothing (anti-aliasing) in the editor has been
+ reset in this release. Fonts are unusably gross on OS X (and Linux) 
+ without smoothing and Oracle's version of Java (now in use with 2.1),
+ and many longtime users have anti-aliasing turned off. You can still 
+ turn off smoothing in the Preferences window, but the results may be poor.
+ https://github.com/processing/processing/issues/2164
+ https://github.com/processing/processing/issues/2160
+
+
+[ bug fixes ]
+
++ Fix dataPath() problem with OS X (was breaking Movie on export)
+
++ Command line processing-java was broken in 2.1 beta 1 on OS X
+ https://github.com/processing/processing/issues/2159
+
++ Fix a situation where processing-java would return 0 instead of 1 on errors
+ https://github.com/processing/processing/issues/1798#issuecomment-26711847
+
++ Alpha values from the pixels array were coming back as 0
+ https://github.com/processing/processing/issues/2030
+
++ Additional UI font tweaks due to decreased legibility with Oracle Java
+ https://github.com/processing/processing/issues/2135
+
+
+[ OpenGL updates ] 
+
++ Using sketchQuality() does not work properly with P3D, OPENGL, P2D
+ https://github.com/processing/processing/pull/2157
+
++ Fix crashes when the sketch window is resized
+ https://github.com/processing/processing/issues/1880
+ https://github.com/processing/processing/pull/2156
+
++ scale() wasn't affecting stroke weight in P3D
+ https://github.com/processing/processing/issues/2162
+
++ Add set(boolean) to PShader
+ https://github.com/processing/processing/issues/1991
+ https://github.com/processing/processing/pull/1993
+
++ Add PMatrix.preApply(PMatrix)
+ https://github.com/processing/processing/pull/2146
+ https://github.com/processing/processing/issues/2145
+
++ Updated to another version of JOGL (jogl-2.1-b1115, gluegen-2.1-b735)
+ for OS X 10.9 support.
+
++ Add warning when no uv texture coordinates are supplied
+ https://github.com/processing/processing/issues/2034
+
++ Flicker issues when resizing P2D/P3D/OPENGL
+ https://github.com/processing/processing/issues/15
+
++ Additional fix for occasional flash/flicker with drawing complex scenes
+ https://github.com/processing/processing/commit/cca2f08a24ef892c494f5a75aa0e4b01de7e5d8a
+
 
 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 
 

core/done.txt

@@ -1,3 +1,33 @@
+0223 core (2.1)
+X fix dataPath() problem with OS X (was breaking Movie)
+X alpha values from the pixels array coming back as 0
+X only tested on background(), not image()
+X https://github.com/processing/processing/issues/2030
+
+opengl 
+X Using sketchQuality() does not work properly with P3D, OPENGL, P2D
+X https://github.com/processing/processing/pull/2157
+X Fix crashes when the sketch window is resized
+X https://github.com/processing/processing/issues/1880
+X https://github.com/processing/processing/pull/2156
+X scale() wasn't affecting stroke weight in P3D
+X https://github.com/processing/processing/issues/2162
+X add set(boolean) to PShader
+X https://github.com/processing/processing/issues/1991
+X https://github.com/processing/processing/pull/1993
+X add PMatrix.preApply(PMatrix)
+X https://github.com/processing/processing/pull/2146
+X https://github.com/processing/processing/issues/2145
+X updated to another version of JOGL
+X updated to jogl-2.1-b1115, gluegen-2.1-b735 for OSX 10.9 support
+X Add warning when no uv texture coordinates are supplied
+X https://github.com/processing/processing/issues/2034
+X threading/flicker issues when resizing P2D/P3D/OPENGL
+X https://github.com/processing/processing/issues/15
+X additional flicker avoidance
+X https://github.com/processing/processing/commit/cca2f08a24ef892c494f5a75aa0e4b01de7e5d8a
+
+
 0222 core (2.1b1)
 X background color for present mode has no effect
 X https://github.com/processing/processing/issues/2071

core/src/processing/core/PApplet.java

@@ -7844,7 +7844,7 @@ static public String desktopPath(String what) {
  * This is only available with applications, not applets or Android.
  * On Windows and Linux, this is simply the data folder, which is located
  * in the same directory as the EXE file and lib folders. On Mac OS X, this
- * is a path to the data folder buried inside Contents/Resources/Java.
+ * is a path to the data folder buried inside Contents/Java.
  * For the latter point, that also means that the data folder should not be
  * considered writable. Use sketchPath() for now, or inputPath() and
  * outputPath() once they're available in the 2.0 release.
@@ -7871,11 +7871,12 @@ public File dataFile(String where) {
 
  String jarPath =
  getClass().getProtectionDomain().getCodeSource().getLocation().getPath();
- if (jarPath.contains("Contents/Resources/Java/")) {
+ if (jarPath.contains("Contents/Java/")) {
  // The path will be URL encoded (%20 for spaces) coming from above
  // http://code.google.com/p/processing/issues/detail?id=1073
  File containingFolder = new File(urlDecode(jarPath)).getParentFile();
  File dataFolder = new File(containingFolder, "data");
+ System.out.println(dataFolder);
  return new File(dataFolder, where);
  }
  // Windows, Linux, or when not using a Mac OS X .app file
@@ -7885,7 +7886,7 @@ public File dataFile(String where) {
 
  /**
  * On Windows and Linux, this is simply the data folder. On Mac OS X, this is
- * the path to the data folder buried inside Contents/Resources/Java
+ * the path to the data folder buried inside Contents/Java
  */
 // public File inputFile(String where) {
 // }