handful of bug fixes and tweaks

benfry · benfry · commit 64bb15b3cd28 · 2011-09-02T00:53:28.000Z
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -5190,7 +5190,7 @@ public PShape createGeometry(String name, int type) {
 
 // ???
   // NODE I/O (XML, JSON, etc.)
-  public XML loadNode(String filename) {
+  public XML loadXML(String filename) {
     return new XML(this, filename);
   }
 
diff --git a/core/src/processing/core/PGraphicsJava2D.java b/core/src/processing/core/PGraphicsJava2D.java
@@ -1305,12 +1305,12 @@ public void scale(float sx, float sy, float sz) {
   }
   
 
-  public void skewX(float angle) {
+  public void shearX(float angle) {
     g2.shear(Math.tan(angle), 0);
   }
 
 
-  public void skewY(float angle) {
+  public void shearY(float angle) {
     g2.shear(0, Math.tan(angle));
   }
 
diff --git a/core/src/processing/core/PImage.java b/core/src/processing/core/PImage.java
@@ -3049,18 +3049,22 @@ protected boolean saveImageIO(String path) throws IOException {
   public boolean save(String filename) {  // ignore
     boolean success = false;
 
-//    File file = new File(filename);
-//    if (!file.isAbsolute()) {
-    // always use savePath(), so that the intermediate directories are created
     if (parent != null) {
-      //file = new File(parent.savePath(filename));
+      // use savePath(), so that the intermediate directories are created
       filename = parent.savePath(filename);
+      
     } else {
-      String msg = "PImage.save() requires an absolute path. " +
-      "Use createImage(), or pass savePath() to save().";
-      PGraphics.showException(msg);
+      File file = new File(filename);
+      if (file.isAbsolute()) {
+        // make sure that the intermediate folders have been created
+        PApplet.createPath(file);
+      } else {
+        String msg = 
+          "PImage.save() requires an absolute path. " +
+          "Use createImage(), or pass savePath() to save().";
+        PGraphics.showException(msg);
+      }
     }
-//    }
 
     // Make sure the pixel data is ready to go
     loadPixels();
diff --git a/core/src/processing/core/PShapeSVG.java b/core/src/processing/core/PShapeSVG.java
@@ -163,7 +163,7 @@ public class PShapeSVG extends PShape {
   public PShapeSVG(PApplet parent, String filename) {
     // this will grab the root document, starting <svg ...>
     // the xml version and initial comments are ignored
-    this(parent.loadNode(filename));
+    this(parent.loadXML(filename));
   }
 
 
diff --git a/core/todo.txt b/core/todo.txt
@@ -1,6 +1,8 @@
 0200 core
 X remove textMode(SCREEN)
 X added expand(long) and expand(double) because of Table
+X PImage.save() with full path raises exception
+X   http://code.google.com/p/processing/issues/detail?id=808
 
 _ change how beginRecord() works.. passing around PApplet vs PGraphics is gross
 _   have to pass PApplet just to make the rendering work to both renderers
@@ -11,12 +13,10 @@ _   for more options, just integrate the fs library?
 _   http://www.superduper.org/processing/fullscreen_api/
 _   https://github.com/kritzikratzi/jAppleMenuBar/blob/master/src/native/jAppleMenuBar.m
 
-_ update wiki re: PNode... also include notes about the changes
+X update wiki re: PNode... also include notes about the changes
 _ add note about textMode(SCREEN) to the wiki
 SCREEN was a super fast/efficient way of rendering text with P2D and P3D, but since they're going bye-bye and it's actually slower in the remaining renderers, it's going away.
 
-_ PImage.save() with full path raises exception
-_   http://code.google.com/p/processing/issues/detail?id=808
 _ if save() returns boolean, does saveFrame()?
 _   also need to copy this over to android
 
diff --git a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
@@ -1878,8 +1878,8 @@ protected void vertexTexture(float u, float v, int t) {
                                    "using u and v coordinates with vertex()");
       }
       if (textureMode == IMAGE) {
-        u /= (float) img.width;
-        v /= (float) img.height;
+        u /= img.width;
+        v /= img.height;
       }
 
       texturesU[t] = u;
diff --git a/java/libraries/opengl/src/processing/opengl/PShape3D.java b/java/libraries/opengl/src/processing/opengl/PShape3D.java
@@ -2111,7 +2111,7 @@ public void setColor(int idx, float[] c) {
   
   
   protected void setColorImpl(float[] c) {
-    PShape3D p = (PShape3D)root;
+    PShape3D p = root;
     p.loadColors();
     for (int i = firstVertex; i <= lastVertex; i++) {
       p.set(i, c);
@@ -2150,7 +2150,7 @@ public void setNormal(int idx, float[] n) {
     
   
   protected void setNormalImpl(float[] n) {
-    PShape3D p = (PShape3D)root;
+    PShape3D p = root;
     p.loadNormals();
     for (int i = firstVertex; i <= lastVertex; i++) {
       p.set(i, n);
@@ -2166,9 +2166,9 @@ protected void optimizeChildren(ArrayList<PShape3D> childList) {
     // Expanding identical, contiguous shapes. Names are taken into account (two
     // shapes with different names are considered to be different, even though the
     // rest of their parameters are identical).
-    child0 = (PShape3D)childList.get(0);
+    child0 = childList.get(0);
     for (int i = 1; i < childList.size(); i++) {
-      child1 = (PShape3D)childList.get(i);
+      child1 = childList.get(i);
       if (child0.equalTo(child1, false)) {
         child0.lastVertex = child1.lastVertex;       // Extending child0.
         child0.lastIndex = child1.lastIndex;
@@ -2184,16 +2184,16 @@ protected void optimizeChildren(ArrayList<PShape3D> childList) {
       
     // Deleting superfluous shapes.
     for (int i = childList.size() - 1; i >= 0; i--) {
-      if (((PShape3D)childList.get(i)).lastVertex == -1) {
+      if (childList.get(i).lastVertex == -1) {
         childList.remove(i);
       }
     }
     
     // Making sure the names are unique.
     for (int i = 1; i < childList.size(); i++) {
-      child1 = (PShape3D)childList.get(i);
+      child1 = childList.get(i);
       for (int j = i - 1; j >= 0; j--) {
-        child0 = (PShape3D)childList.get(j);
+        child0 = childList.get(j);
         if (child1.name.equals(child0.name)) {
           int pos = child0.name.indexOf(':');
           if (-1 < pos) {
@@ -2288,7 +2288,7 @@ public void setVertices(ArrayList<PVector> vertexList) {
   public void setVertices(ArrayList<PVector> vertexList, int offset) {
     loadVertices();
     for (int i = firstVertex; i <= lastVertex; i++) {
-      PVector v = (PVector)vertexList.get(i - firstVertex + offset);
+      PVector v = vertexList.get(i - firstVertex + offset);
       set(i, v.x, v.y, v.z);
     }
     updateVertices();
@@ -2301,7 +2301,7 @@ public void setColors(ArrayList<float[]> colorList) {
   public void setColors(ArrayList<float[]> colorList, int offset) {
     loadColors();
     for (int i = firstVertex; i <= lastVertex; i++) {
-      float[] c = (float[])colorList.get(i - firstVertex + offset);
+      float[] c = colorList.get(i - firstVertex + offset);
       set(i, c);
     }
     updateColors();    
@@ -2315,7 +2315,7 @@ public void setNormals(ArrayList<PVector> normalList) {
   public void setNormals(ArrayList<PVector> normalList, int offset) {
     loadNormals();
     for (int i = firstVertex; i <= lastVertex; i++) {
-      PVector n = (PVector)normalList.get(i - firstVertex + offset);
+      PVector n = normalList.get(i - firstVertex + offset);
       set(i, n.x, n.y, n.z);
     }
     updateNormals();    
@@ -2337,7 +2337,7 @@ public void setTexcoords(int unit, ArrayList<PVector> tcoordList) {
   public void setTexcoords(int unit, ArrayList<PVector> tcoordList, int offset) {
     loadTexcoords(unit);
     for (int i = firstVertex; i <= lastVertex; i++) {
-      PVector tc = (PVector)tcoordList.get(i - firstVertex + offset);
+      PVector tc = tcoordList.get(i - firstVertex + offset);
       set(i, tc.x, tc.y);
     }
     updateTexcoords();     
@@ -2349,7 +2349,7 @@ public void setChildren(ArrayList<PShape3D> who) {
     
     childCount = 0;
     for (int i = 0; i < who.size(); i++) {
-      PShape child = (PShape)who.get(i);
+      PShape child = who.get(i);
       addChild(child);   
     }
   }  
@@ -2599,7 +2599,7 @@ public void setIndices(ArrayList<Integer> recordedIndices) {
     indexBuffer = getGl().glMapBuffer(GL.GL_ELEMENT_ARRAY_BUFFER, GL.GL_WRITE_ONLY).asIntBuffer();
     
     for (int i = 0; i < indexCount; i++) {
-      indices[i] = (Integer)recordedIndices.get(i);
+      indices[i] = recordedIndices.get(i);
     }    
     indexBuffer.put(indices);    
     
@@ -3521,13 +3521,13 @@ protected void recordOBJ(ArrayList<PVector> vertices, ArrayList<PVector> normals
     
     ogl.beginShapeRecorderImpl();    
     for (int i = 0; i < faces.size(); i++) {
-      OBJFace face = (OBJFace) faces.get(i);
+      OBJFace face = faces.get(i);
       
       // Getting current material.
       if (mtlIdxCur != face.matIdx) {
         mtlIdxCur = PApplet.max(0, face.matIdx); // To make sure that at least we get the default material.
         
-        mtl = (OBJMaterial) materials.get(mtlIdxCur);
+        mtl = materials.get(mtlIdxCur);
 
         // Setting colors.
         ogl.specular(mtl.ks.x * 255.0f, mtl.ks.y * 255.0f, mtl.ks.z * 255.0f);
@@ -3561,12 +3561,12 @@ protected void recordOBJ(ArrayList<PVector> vertices, ArrayList<PVector> normals
         vert = norms = null;
         
         vertIdx = face.vertIdx.get(j).intValue() - 1;
-        vert = (PVector) vertices.get(vertIdx);
+        vert = vertices.get(vertIdx);
         
         if (j < face.normIdx.size()) {
           normIdx = face.normIdx.get(j).intValue() - 1;
           if (-1 < normIdx) {
-            norms = (PVector) normals.get(normIdx);  
+            norms = normals.get(normIdx);  
           }
         }
         
@@ -3578,7 +3578,7 @@ protected void recordOBJ(ArrayList<PVector> vertices, ArrayList<PVector> normals
           if (j < face.texIdx.size()) {
             texIdx = face.texIdx.get(j).intValue() - 1;
             if (-1 < texIdx) {
-              tex = (PVector) textures.get(texIdx);  
+              tex = textures.get(texIdx);  
             }
           }
           
diff --git a/todo.txt b/todo.txt
@@ -3,14 +3,22 @@ X update to java 6u26
 X   re-upload with new version to include javac
 X HTML escapes for < and > not working properly
 X   http://code.google.com/p/processing/issues/detail?id=771
+X code to quit if multiple instances are running from peter
+X another problem with missing shearX/Y() in JAVA2D
+X   http://code.google.com/p/processing/issues/detail?id=784
+
+
+_ work on code to quit if multiple instances are running
+_   need to bring the other instance to front
+_   and/or open a new window
 
 _ --bgcolor shouldn't be in main() unless 'present' is turned on
 _ also add option for FSEM or not
 
 _ library imports failing for libs that define the same packages in 1.5.1
 _   http://code.google.com/p/processing/issues/detail?id=725
 
-_ make application the correct one instead of applet
+_ make application the default instead of applet
 
 _ renaming a normal tab to same name with ".java" fails with ".pde" version already exists
 _   http://code.google.com/p/processing/issues/detail?id=776

Original file line number	Diff line number	Diff line change
`@@ -5190,7 +5190,7 @@ public PShape createGeometry(String name, int type) {`
`5190`	`5190`
`5191`	`5191`	`// ???`
`5192`	`5192`	`// NODE I/O (XML, JSON, etc.)`
`5193`		`- public XML loadNode(String filename) {`
	`5193`	`+ public XML loadXML(String filename) {`
`5194`	`5194`	`return new XML(this, filename);`
`5195`	`5195`	`}`
`5196`	`5196`
Original file line number	Diff line number	Diff line change
`@@ -1305,12 +1305,12 @@ public void scale(float sx, float sy, float sz) {`
`1305`	`1305`	`}`
`1306`	`1306`
`1307`	`1307`
`1308`		`- public void skewX(float angle) {`
	`1308`	`+ public void shearX(float angle) {`
`1309`	`1309`	`g2.shear(Math.tan(angle), 0);`
`1310`	`1310`	`}`
`1311`	`1311`
`1312`	`1312`
`1313`		`- public void skewY(float angle) {`
	`1313`	`+ public void shearY(float angle) {`
`1314`	`1314`	`g2.shear(0, Math.tan(angle));`
`1315`	`1315`	`}`
`1316`	`1316`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ public class PShapeSVG extends PShape {`
`163`	`163`	`public PShapeSVG(PApplet parent, String filename) {`
`164`	`164`	`// this will grab the root document, starting <svg ...>`
`165`	`165`	`// the xml version and initial comments are ignored`
`166`		`- this(parent.loadNode(filename));`
	`166`	`+ this(parent.loadXML(filename));`
`167`	`167`	`}`
`168`	`168`
`169`	`169`
Original file line number	Diff line number	Diff line change
`@@ -1878,8 +1878,8 @@ protected void vertexTexture(float u, float v, int t) {`
`1878`	`1878`	`"using u and v coordinates with vertex()");`
`1879`	`1879`	`}`
`1880`	`1880`	`if (textureMode == IMAGE) {`
`1881`		`- u /= (float) img.width;`
`1882`		`- v /= (float) img.height;`
	`1881`	`+ u /= img.width;`
	`1882`	`+ v /= img.height;`
`1883`	`1883`	`}`
`1884`	`1884`
`1885`	`1885`	`texturesU[t] = u;`