Merge branch 'master' of https://github.com/processing/processing.git

app/.settings/org.eclipse.jdt.core.prefs

@@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

build/shared/lib/theme.txt

@@ -6,9 +6,7 @@ status.error.fgcolor = #ffffff
 status.error.bgcolor = #662000
 status.edit.fgcolor = #000000
 status.edit.bgcolor = #cc9900
-#status.font = SansSerif,plain,12
-#status.font.macosx = Helvetica,plain,12
-status.font = processing.sans,plain,13
+status.font = processing.sans,plain,14
 
 # TABS
 # Settings for the tab area at the top.
@@ -34,11 +32,11 @@ buttons.hide.color = #0E1B25
 buttons.bgimage = true
 
 # TOOLBAR BUTTON TEXT
-buttons.status.font = processing.sans,plain,13
+buttons.status.font = processing.sans,bold,13
 buttons.status.color = #ffffff
 
 # MODE SELECTOR
-mode.button.font = processing.sans,plain,13
+mode.button.font = processing.sans,bold,13
 # outline color of the mode button
 mode.button.color = #ffffff
 

core/build.xml

@@ -13,8 +13,8 @@
     <methods dir="${basedir}/src/processing/core" recorder="true" />
 
     <mkdir dir="bin" />
-    <javac source="1.6"
-	   target="1.6" 
+    <javac source="1.7"
+	   target="1.7" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
 	   debug="true"

core/src/processing/core/PMatrix.java

@@ -97,6 +97,8 @@ public interface PMatrix {
   /**
    * Apply another matrix to the left of this one.
    */
+  public void preApply(PMatrix left);
+
   public void preApply(PMatrix2D left);
 
   public void preApply(PMatrix3D left);

core/src/processing/core/PMatrix2D.java

@@ -247,6 +247,15 @@ public class PMatrix2D implements PMatrix {
   /**
    * Apply another matrix to the left of this one.
    */
+  public void preApply(PMatrix source) {
+    if (source instanceof PMatrix2D) {
+      preApply((PMatrix2D) source);
+    } else if (source instanceof PMatrix3D) {
+      preApply((PMatrix3D) source);
+    }
+  }
+
+
   public void preApply(PMatrix2D left) {
     preApply(left.m00, left.m01, left.m02,
              left.m10, left.m11, left.m12);

core/src/processing/core/PMatrix3D.java

@@ -369,6 +369,15 @@ public final class PMatrix3D implements PMatrix /*, PConstants*/ {
   /**
    * Apply another matrix to the left of this one.
    */
+  public void preApply(PMatrix source) {
+    if (source instanceof PMatrix2D) {
+      preApply((PMatrix2D) source);
+    } else if (source instanceof PMatrix3D) {
+      preApply((PMatrix3D) source);
+    }
+  }
+
+
   public void preApply(PMatrix3D left) {
     preApply(left.m00, left.m01, left.m02, left.m03,
              left.m10, left.m11, left.m12, left.m13,

core/todo.txt

@@ -6,6 +6,16 @@ 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
 
 high
 _ Sort out blending differences with P2D/P3D

todo.txt

@@ -6,19 +6,21 @@ X reset font smoothing for everyone to its default by changing the pref
 X   https://github.com/processing/processing/issues/2164
 X   https://github.com/processing/processing/issues/2160
 X Add option to not embed the Java runtime (saves space, but breakage)
-
-_ emacs style errors in commander aren't quite right
-_   https://github.com/processing/processing/issues/2158
-_ return code needs to be 1 instead of 0
-_   https://github.com/processing/processing/issues/1798#issuecomment-26711847
+X return code needs to be 1 instead of 0 w/ Commander
+X   https://github.com/processing/processing/issues/1798#issuecomment-26711847
+X additional font tweaks due to decreased legibility with Oracle Java
+X type looks a little feeble on OS X with non-retina machines
+X   https://github.com/processing/processing/issues/2135
+X   should we increase the size of the mode dropdown?
+_ processing-java broken in 2.1 beta 1 on OS X
+_   https://github.com/processing/processing/issues/2159
+_   need to use the embedded Java, different classpath, etc
+_   also might be time to put something in to check the version
 
 
 medium
 _ try installing 10.7.3 on Mac Mini and check whether things run
 _   make sure it's only running on 64-bit machines? 
-_ type looks a little feeble on OS X with non-retina machines
-_   https://github.com/processing/processing/issues/2135
-_   should we increase the size of the mode dropdown?
 _ use platformDelete() to remove untitled sketches?
 _ change to using platformDelete() instead of Base.removeDir() where possible
 _   verify that the OS X version uses the real call
@@ -36,6 +38,8 @@ _ look through all isPopupTrigger() code
 _   make sure both press/release are implemented
 _ change Windows export to use launch4j instead of the launcher.cpp file
 _   actually call ant from inside p5?
+_ emacs style errors in commander aren't quite right
+_   https://github.com/processing/processing/issues/2158
 
 post 2.1 cleaning
 _ remove video for macosx32 from the repo permanently