From 0cfd53520e1324882e15b7bc0376daf72fe5e57f Mon Sep 17 00:00:00 2001 From: KiwiStrongis Date: Tue, 15 Oct 2013 17:57:54 -0400 Subject: [PATCH 1/4] added PMatrix.preApply( PMatrix) to resolve Issue #2145 --- core/src/processing/core/PMatrix.java | 2 ++ core/src/processing/core/PMatrix2D.java | 9 +++++++++ core/src/processing/core/PMatrix3D.java | 9 +++++++++ 3 files changed, 20 insertions(+) diff --git a/core/src/processing/core/PMatrix.java b/core/src/processing/core/PMatrix.java index 53f7fa54b..2670eb5ce 100644 --- a/core/src/processing/core/PMatrix.java +++ b/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); diff --git a/core/src/processing/core/PMatrix2D.java b/core/src/processing/core/PMatrix2D.java index d5616b58d..1ee6b0a88 100644 --- a/core/src/processing/core/PMatrix2D.java +++ b/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); diff --git a/core/src/processing/core/PMatrix3D.java b/core/src/processing/core/PMatrix3D.java index deeb23b45..f75cb1227 100644 --- a/core/src/processing/core/PMatrix3D.java +++ b/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, From 8572e317c765664727c5ec93b40f6f7c5f1503f6 Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Fri, 25 Oct 2013 09:51:20 -0400 Subject: [PATCH 2/4] switching to Java 1.7 for source because of revalidate() usage --- app/.settings/org.eclipse.jdt.core.prefs | 6 +++--- core/todo.txt | 10 ++++++++++ todo.txt | 13 ++++++++----- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app/.settings/org.eclipse.jdt.core.prefs b/app/.settings/org.eclipse.jdt.core.prefs index da7176c57..bd0342e50 100644 --- a/app/.settings/org.eclipse.jdt.core.prefs +++ b/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 diff --git a/core/todo.txt b/core/todo.txt index bb5f08b62..ed5bcf741 100644 --- a/core/todo.txt +++ b/core/todo.txt @@ -1,4 +1,7 @@ 0223 core +X add PMatrix.preApply(PMatrix) +X https://github.com/processing/processing/pull/2146 +X https://github.com/processing/processing/issues/2145 opengl X Using sketchQuality() does not work properly with P3D, OPENGL, P2D @@ -6,6 +9,13 @@ 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 updated to another version of JOGL +_ what version is this? high _ Sort out blending differences with P2D/P3D diff --git a/todo.txt b/todo.txt index 2b03264cc..f0d2cfeb8 100644 --- a/todo.txt +++ b/todo.txt @@ -6,11 +6,12 @@ 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 +_ 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 @@ -36,6 +37,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 From 55ffd815f6e9dec6252885c7a0c24d16876bee0c Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Fri, 25 Oct 2013 09:53:02 -0400 Subject: [PATCH 3/4] more 1.7 notes --- core/build.xml | 4 ++-- core/todo.txt | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/build.xml b/core/build.xml index 833acaa4e..0c2628197 100755 --- a/core/build.xml +++ b/core/build.xml @@ -13,8 +13,8 @@ - Date: Fri, 25 Oct 2013 10:04:44 -0400 Subject: [PATCH 4/4] additional font tweaks (#2135) --- build/shared/lib/theme.txt | 8 +++----- todo.txt | 7 ++++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build/shared/lib/theme.txt b/build/shared/lib/theme.txt index 95bcad988..70f11e26f 100755 --- a/build/shared/lib/theme.txt +++ b/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 diff --git a/todo.txt b/todo.txt index f0d2cfeb8..124965e5c 100644 --- a/todo.txt +++ b/todo.txt @@ -8,6 +8,10 @@ X https://github.com/processing/processing/issues/2160 X Add option to not embed the Java runtime (saves space, but breakage) 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 @@ -17,9 +21,6 @@ _ 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