clean up svgz handling, remove fake objz file format

benfry · benfry · commit f7d6f99a5097 · 2015-05-13T22:32:37.000-04:00
diff --git a/core/src/processing/core/PGraphicsJava2D.java b/core/src/processing/core/PGraphicsJava2D.java
@@ -1753,25 +1753,11 @@ public void update(PImage source, boolean tint, int tintColor) {
   @Override
   public PShape loadShape(String filename, String options) {
     String extension = PApplet.getExtension(filename);
-
-    PShapeSVG svg = null;
-
     if (extension.equals("svg") || extension.equals("svgz")) {
-      svg = new PShapeSVG(parent.loadXML(filename));
-
-//    } else if (extension.equals("svgz")) {
-//      try {
-//        InputStream input = new GZIPInputStream(parent.createInput(filename));
-//        XML xml = new XML(PApplet.createReader(input), options);
-//        svg = new PShapeSVG(xml);
-//      } catch (Exception e) {
-//        e.printStackTrace();
-//      }
-    } else {
-      PGraphics.showWarning("Unsupported format: " + filename);
+      return new PShapeSVG(parent.loadXML(filename));
     }
-
-    return svg;
+    PGraphics.showWarning("Unsupported format: " + filename);
+    return null;
   }
 
 
diff --git a/core/src/processing/opengl/PGraphics2D.java b/core/src/processing/opengl/PGraphics2D.java
@@ -22,15 +22,11 @@
 
 package processing.opengl;
 
-import java.io.InputStream;
-import java.util.zip.GZIPInputStream;
-
-import processing.core.PApplet;
 import processing.core.PGraphics;
 import processing.core.PMatrix3D;
 import processing.core.PShape;
 import processing.core.PShapeSVG;
-import processing.data.XML;
+
 
 public class PGraphics2D extends PGraphicsOpenGL {
 
@@ -232,6 +228,7 @@ public void shape(PShape shape, float x, float y, float z,
   }
 
 
+
   //////////////////////////////////////////////////////////////
 
   // SHAPE I/O
@@ -242,33 +239,17 @@ static protected boolean isSupportedExtension(String extension) {
   }
 
 
-  static protected PShape loadShapeImpl(PGraphics pg, String filename,
-                                                      String extension) {
-    PShapeSVG svg = null;
-
-    if (extension.equals("svg")) {
-      svg = new PShapeSVG(pg.parent.loadXML(filename));
-
-    } else if (extension.equals("svgz")) {
-      try {
-        InputStream input =
-          new GZIPInputStream(pg.parent.createInput(filename));
-        XML xml = new XML(PApplet.createReader(input));
-        svg = new PShapeSVG(xml);
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
-    }
-
-    if (svg != null) {
-      PShapeOpenGL p2d = PShapeOpenGL.createShape2D((PGraphicsOpenGL)pg, svg);
-      return p2d;
-    } else {
-      return null;
+  static protected PShape loadShapeImpl(PGraphics pg,
+                                        String filename, String extension) {
+    if (extension.equals("svg") || extension.equals("svgz")) {
+      PShapeSVG svg = new PShapeSVG(pg.parent.loadXML(filename));
+      return PShapeOpenGL.createShape2D((PGraphicsOpenGL) pg, svg);
     }
+    return null;
   }
 
 
+
   //////////////////////////////////////////////////////////////
 
   // SHAPE CREATION
diff --git a/core/src/processing/opengl/PGraphics3D.java b/core/src/processing/opengl/PGraphics3D.java
@@ -110,6 +110,7 @@ protected void end2D() {
   }
 
 
+
   //////////////////////////////////////////////////////////////
 
   // SHAPE I/O
@@ -126,32 +127,17 @@ static protected PShape loadShapeImpl(PGraphics pg, String filename,
 
     if (extension.equals("obj")) {
       obj = new PShapeOBJ(pg.parent, filename);
-
-    } else if (extension.equals("objz")) {
-      try {
-        // TODO: The obj file can be read from the gzip, but if it refers to
-        // a materials file and texture images, those must be contained in the
-        // data folder, cannot be inside the gzip.
-        InputStream input =
-          new GZIPInputStream(pg.parent.createInput(filename));
-        obj = new PShapeOBJ(pg.parent, PApplet.createReader(input));
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
-    }
-
-    if (obj != null) {
       int prevTextureMode = pg.textureMode;
       pg.textureMode = NORMAL;
       PShapeOpenGL p3d = PShapeOpenGL.createShape3D((PGraphicsOpenGL)pg, obj);
       pg.textureMode = prevTextureMode;
       return p3d;
-    } else {
-      return null;
     }
+    return null;
   }
 
 
+
   //////////////////////////////////////////////////////////////
 
   // SHAPE CREATION
