more tweaks

benfry · benfry · commit 7260b00787be · 2012-09-02T20:37:37.000Z
diff --git a/core/src/processing/core/PGraphicsJava2D.java b/core/src/processing/core/PGraphicsJava2D.java
@@ -1167,7 +1167,7 @@ public PShape loadShape(String filename) {
         e.printStackTrace();
       }
     } else {
-      PGraphics.showWarning("Unsupported format");
+      PGraphics.showWarning("Unsupported format: " + filename);
     }
 
     return svg;
diff --git a/core/src/processing/core/PShape.java b/core/src/processing/core/PShape.java
@@ -397,6 +397,7 @@ public float getDepth() {
 
 
 
+  /*
   // TODO unapproved
   protected PVector getTop() {
     return getTop(null);
@@ -422,6 +423,7 @@ protected PVector getBottom(PVector bottom) {
     }
     return bottom;
   }
+  */
 
 
   /**
@@ -440,13 +442,13 @@ public boolean is3D() {
   }
 
 
-  /**
-   * Return true if this shape requires rendering through OpenGL. Defaults to false.
-   */
-  // TODO unapproved
-  public boolean isGL() {
-    return false;
-  }
+//  /**
+//   * Return true if this shape requires rendering through OpenGL. Defaults to false.
+//   */
+//  // TODO unapproved
+//  public boolean isGL() {
+//    return false;
+//  }
 
 
   ///////////////////////////////////////////////////////////
diff --git a/core/src/processing/core/PShapeSVG.java b/core/src/processing/core/PShapeSVG.java
@@ -214,7 +214,7 @@ public PShapeSVG(XML svg) {
   }
 
 
-  public PShapeSVG(PShapeSVG parent, XML properties, boolean parseKids) {
+  protected PShapeSVG(PShapeSVG parent, XML properties, boolean parseKids) {
     // Need to set this so that findChild() works.
     // Otherwise 'parent' is null until addChild() is called later.
     this.parent = parent;
diff --git a/core/src/processing/opengl/PShapeOpenGL.java b/core/src/processing/opengl/PShapeOpenGL.java
@@ -546,6 +546,7 @@ public float getDepth() {
   }
 
 
+  /*
   @Override
   public PVector getTop(PVector top) {
     if (top == null) {
@@ -568,6 +569,7 @@ public PVector getBottom(PVector bottom) {
     getVertexMax(bottom);
     return bottom;
   }
+  */
 
 
   protected void getVertexMin(PVector min) {

Original file line number	Diff line number	Diff line change
`@@ -1167,7 +1167,7 @@ public PShape loadShape(String filename) {`
`1167`	`1167`	`e.printStackTrace();`
`1168`	`1168`	`}`
`1169`	`1169`	`} else {`
`1170`		`- PGraphics.showWarning("Unsupported format");`
	`1170`	`+ PGraphics.showWarning("Unsupported format: " + filename);`
`1171`	`1171`	`}`
`1172`	`1172`
`1173`	`1173`	`return svg;`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ public PShapeSVG(XML svg) {`
`214`	`214`	`}`
`215`	`215`
`216`	`216`
`217`		`- public PShapeSVG(PShapeSVG parent, XML properties, boolean parseKids) {`
	`217`	`+ protected PShapeSVG(PShapeSVG parent, XML properties, boolean parseKids) {`
`218`	`218`	`// Need to set this so that findChild() works.`
`219`	`219`	`// Otherwise 'parent' is null until addChild() is called later.`
`220`	`220`	`this.parent = parent;`
Original file line number	Diff line number	Diff line change
`@@ -546,6 +546,7 @@ public float getDepth() {`
`546`	`546`	`}`
`547`	`547`
`548`	`548`
	`549`	`+ /*`
`549`	`550`	`@Override`
`550`	`551`	`public PVector getTop(PVector top) {`
`551`	`552`	`if (top == null) {`
`@@ -568,6 +569,7 @@ public PVector getBottom(PVector bottom) {`
`568`	`569`	`getVertexMax(bottom);`
`569`	`570`	`return bottom;`
`570`	`571`	`}`
	`572`	`+ */`
`571`	`573`
`572`	`574`
`573`	`575`	`protected void getVertexMin(PVector min) {`