From 89ca54ab74bfe78dbea764c2bb16e74da0652dec Mon Sep 17 00:00:00 2001 From: benfry Date: Fri, 16 May 2008 03:33:09 +0000 Subject: [PATCH] fix bugs for setting smooth(), and space after OPENGL in export --- app/src/processing/app/Sketch.java | 41 ++++++++++--------- core/src/processing/core/PApplet.java | 2 +- core/src/processing/core/PGraphicsJava2D.java | 2 + core/todo.txt | 12 ++++++ net/.settings/org.eclipse.jdt.core.prefs | 4 +- opengl/.settings/org.eclipse.jdt.core.prefs | 4 +- todo.txt | 8 ++++ 7 files changed, 48 insertions(+), 25 deletions(-) diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java index 6de73022b..eac4a417d 100644 --- a/app/src/processing/app/Sketch.java +++ b/app/src/processing/app/Sketch.java @@ -84,11 +84,11 @@ public class Sketch { // all these set each time build() is called String mainClassName; String classPath; - /** + /** * This is *not* the "Processing" libraries path, this is the Java libraries * path, as in java.library.path=BlahBlah, which identifies search paths for * DLLs or JNILIBs. - */ + */ String libraryPath; boolean externalRuntime; Vector importedLibraries; // vec of File objects @@ -350,7 +350,7 @@ public class Sketch { "before trying to rename it?"); return; } - + // if read-only, give an error if (isReadOnly()) { // if the files are read-only, need to first do a "save as". @@ -831,7 +831,7 @@ public class Sketch { public boolean saveAs() throws IOException { String newParentDir = null; String newName = null; - + if (PApplet.platform == PConstants.LINUX) { JFileChooser fc = new JFileChooser(); fc.setDialogTitle("Save sketch folder as..."); @@ -1396,11 +1396,11 @@ public class Sketch { String codeFolderClassPath = Compiler.contentsToClassPath(codeFolder); // prepend the jar files in the code folder to the class path - classPath = codeFolderClassPath + File.pathSeparator + classPath; + classPath = codeFolderClassPath + File.pathSeparator + classPath; // get list of packages found in those jars codeFolderPackages = Compiler.packageListFromClassPath(codeFolderClassPath); - + //PApplet.println(libraryPath); //PApplet.println("packages:"); //PApplet.printarr(codeFolderPackages); @@ -1756,7 +1756,7 @@ public class Sketch { // modified for 83 to match size(XXX, ddd so that it'll // properly handle size(200, 200) and size(200, 200, P3D) String sizing = - // match the renderer string as well + // match width, height and renderer string as well "[\\s\\;]size\\s*\\(\\s*(\\S+)\\s*,\\s*(\\d+),?\\s*([^\\)]*)\\s*\\)"; // match just the width and height //"[\\s\\;]size\\s*\\(\\s*(\\S+)\\s*,\\s*(\\d+)(.*)\\)"; @@ -1774,7 +1774,8 @@ public class Sketch { wide = Integer.parseInt(result.group(1).toString()); high = Integer.parseInt(result.group(2).toString()); - renderer = result.group(3).toString(); //.trim(); + // Adding back the trim() for 0136 to handle Bug #769 + renderer = result.group(3).toString().trim(); } catch (NumberFormatException e) { // found a reference to size, but it didn't @@ -2805,34 +2806,34 @@ public class Sketch { public void nextCode() { setCurrent((currentIndex + 1) % codeCount); } - - + + // ................................................................. // Additional accessors added in 0136 because of package work. // These will also be helpful for tool developers. - - + + public String getClassPath() { return classPath; } - - + + public String getLibraryPath() { return libraryPath; } - - + + public int getCodeCount() { return codeCount; } - - + + public SketchCode getCode(int index) { return code[index]; } - - + + public String getMainClassName() { return mainClassName; } diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java index 029324c89..fb3492779 100644 --- a/core/src/processing/core/PApplet.java +++ b/core/src/processing/core/PApplet.java @@ -2366,7 +2366,7 @@ in */ /** * Attempt to open a file using the platform's shell. */ - public void open(String filename) { + static public void open(String filename) { open(new String[] { filename }); } diff --git a/core/src/processing/core/PGraphicsJava2D.java b/core/src/processing/core/PGraphicsJava2D.java index f0b18e0a9..ba893e11e 100644 --- a/core/src/processing/core/PGraphicsJava2D.java +++ b/core/src/processing/core/PGraphicsJava2D.java @@ -1211,6 +1211,7 @@ public class PGraphicsJava2D extends PGraphics { public void smooth() { + smooth = true; g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, @@ -1219,6 +1220,7 @@ public class PGraphicsJava2D extends PGraphics { public void noSmooth() { + smooth = false; g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, diff --git a/core/todo.txt b/core/todo.txt index 781d003d9..4467c5584 100644 --- a/core/todo.txt +++ b/core/todo.txt @@ -24,10 +24,20 @@ X PImage mask doesn't work after first call X http://dev.processing.org/bugs/show_bug.cgi?id=744 X load and save tga results in upside down tga X http://dev.processing.org/bugs/show_bug.cgi?id=742 +X fix problem with g.smooth always returning false in JAVA2D +X http://dev.processing.org/bugs/show_bug.cgi?id=762 + +_ should we do joins when alpha is turned off? +_ http://processing.org/discourse/yabb_beta/YaBB.cgi?board=OpenGL;action=display;num=1210007450 _ textures truly did get worse in P3D _ http://processing.org/discourse/yabb_beta/YaBB.cgi?board=Programs;action=display;num=1205171649 +_ PGraphicsOpenGL.java: +_ directionalLight() and .pointLight() are both calling +_ glLightNoAmbient() which then creates a new FloatBuffer +_ http://processing.org/discourse/yabb_beta/YaBB.cgi?board=SoftwareBugs;action=display;num=1199376364 + _ repeating texture support _ bezierVertex YZ Plane fill problem @@ -51,6 +61,8 @@ _ http://dev.processing.org/bugs/show_bug.cgi?id=737 _ textFont() used in setup() is null once draw() arrives _ http://dev.processing.org/bugs/show_bug.cgi?id=726 +_ colorMode() set inside setup() sometimes not set once draw() arrives +_ http://dev.processing.org/bugs/show_bug.cgi?id=767 _ for begin/endRecord, use a piggyback mechanism _ that way won't have to pass a PApplet around diff --git a/net/.settings/org.eclipse.jdt.core.prefs b/net/.settings/org.eclipse.jdt.core.prefs index e668e55b4..3cbb2e563 100644 --- a/net/.settings/org.eclipse.jdt.core.prefs +++ b/net/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Tue Feb 19 14:23:49 EST 2008 +#Mon May 05 22:36:11 EDT 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1 org.eclipse.jdt.core.compiler.compliance=1.3 @@ -16,7 +16,7 @@ org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=36 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=18 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18 diff --git a/opengl/.settings/org.eclipse.jdt.core.prefs b/opengl/.settings/org.eclipse.jdt.core.prefs index d388f8d4f..a3b0015dd 100644 --- a/opengl/.settings/org.eclipse.jdt.core.prefs +++ b/opengl/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Thu Jan 10 10:50:38 PST 2008 +#Mon May 05 22:36:11 EDT 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 org.eclipse.jdt.core.compiler.compliance=1.4 @@ -16,7 +16,7 @@ org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=36 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=18 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18 diff --git a/todo.txt b/todo.txt index 05293e952..a9e35588b 100644 --- a/todo.txt +++ b/todo.txt @@ -25,7 +25,10 @@ o prolly need to have a param for this guy X switch to nanoxml instead of nanoxml-lite (29k vs. 5k) X check against ods X http://dev.processing.org/bugs/show_bug.cgi?id=757 +X Space after OPENGL param breaks export +X http://dev.processing.org/bugs/show_bug.cgi?id=769 +_ change export to point to java 1.5 installation _ make.sh creating work/lib dirs.. no longer necessary? _ don't copy hidden files (.svn especially) on export/save as @@ -49,6 +52,9 @@ _ make the run button highlight immediately _ or maybe show an animation for starting up _ rather than post-compile +_ occasional exception in "copy for discourse" +_ http://processing.org/discourse/yabb_beta/YaBB.cgi?board=SoftwareBugs;action=display;num=1193068786 + _ synchronized (something) { } is horking up the preproc _ http://dev.processing.org/bugs/show_bug.cgi?id=136 @@ -240,6 +246,8 @@ _ http://dev.processing.org/bugs/show_bug.cgi?id=562 _ can't get documents/prefs folder on vista _ http://dev.processing.org/bugs/show_bug.cgi?id=585 +_ vista disables aero theme when p5 is run +_ http://processing.org/discourse/yabb_beta/YaBB.cgi?board=SoftwareBugs;action=display;num=1196016889 _ ocd is broken in 0125 - do a better error message for this