geomerative 1.1.0-java → 2.0.0-java

data/src/geomerative/RRectangle.java

@@ -1,91 +1,82 @@
 /**
-    Copyright 2004-2008 Ricard Marxer  <email@ricardmarxer.com>
+ * Copyright 2004-2008 Ricard Marxer  <email@ricardmarxer.com>
+ *
+ * This file is part of Geomerative.
+ *
+ * Geomerative is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * Geomerative is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * Geomerative. If not, see <http://www.gnu.org/licenses/>.
+ */
+package geomerative;
 
-    This file is part of Geomerative.
+public class RRectangle {
 
-    Geomerative is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Geomerative is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License
-    along with Geomerative.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package geomerative ;
-
-public class RRectangle
-{
   RPoint topLeft;
   RPoint bottomRight;
-  
-  public RRectangle()
-  {
+
+  public RRectangle() {
     topLeft = new RPoint();
     bottomRight = new RPoint();
   }
-  
-  public RRectangle(float x,float y,float w,float h)
-  {
-    topLeft = new RPoint(x,y);
-    bottomRight = new RPoint(x+w,y+h);
-    
+
+  public RRectangle(float x, float y, float w, float h) {
+    topLeft = new RPoint(x, y);
+    bottomRight = new RPoint(x + w, y + h);
+
   }
-  
-  public RRectangle(RPoint _topLeft,RPoint _bottomRight)
-  {
+
+  public RRectangle(RPoint _topLeft, RPoint _bottomRight) {
     this.topLeft = _topLeft;
     this.bottomRight = _bottomRight;
-  } 
+  }
 
   RPoint[] getPoints() {
     RPoint[] ps = new RPoint[4];
 
     ps[0] = new RPoint(topLeft);
-    
+
     ps[1] = new RPoint(topLeft);
     ps[1].x = bottomRight.x;
-    
+
     ps[2] = new RPoint(bottomRight);
-    
+
     ps[3] = new RPoint(bottomRight);
     ps[3].x = topLeft.x;
-    
+
     return ps;
   }
-  
-  float getMaxX()
-  {
+
+  float getMaxX() {
     //return (topLeft.x > bottomRight.x) ? topLeft.x : bottomRight.x;
     return bottomRight.x;
   }
-  
-  float getMaxY()
-  {
+
+  float getMaxY() {
     //return (topLeft.y > bottomRight.y) ? topLeft.y : bottomRight.y;
     return bottomRight.y;
   }
-  
-  float getMinX()
-  {
+
+  float getMinX() {
     //return (topLeft.x < bottomRight.x) ? topLeft.x : bottomRight.x;
     return topLeft.x;
   }
-  
-  float getMinY()
-  {
+
+  float getMinY() {
     //return (topLeft.y < bottomRight.y) ? topLeft.y : bottomRight.y;
     return topLeft.y;
   }
-  
+
   @Override
-  public String toString()
-  {
+  public String toString() {
     return "";
   }
 }

data/src/geomerative/RSVG.java

@@ -1,47 +1,42 @@
 /**
-    Copyright 2004-2008 Ricard Marxer  <email@ricardmarxer.com>
-
-    This file is part of Geomerative.
-
-    Geomerative is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Geomerative is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Geomerative.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ * Copyright 2004-2008 Ricard Marxer  <email@ricardmarxer.com>
+ *
+ * This file is part of Geomerative.
+ *
+ * Geomerative is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * Geomerative is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * Geomerative. If not, see <http://www.gnu.org/licenses/>.
+ */
 package geomerative;
 
-
 import processing.core.PApplet;
 import processing.core.PConstants;
 import processing.core.PGraphics;
 import processing.data.XML;
 
 /**
- * @extended
+
  */
-public class RSVG
-{
-  public void draw(String filename, PGraphics g)
-  {
+public class RSVG {
+
+  public void draw(String filename, PGraphics g) {
     this.toGroup(filename).draw(g);
   }
 
-  public void draw(String filename, PApplet p)
-  {
+  public void draw(String filename, PApplet p) {
     this.toGroup(filename).draw(p);
   }
 
-  public void draw(String filename)
-  {
+  public void draw(String filename) {
     this.toGroup(filename).draw();
   }
 
@@ -69,24 +64,22 @@ public class RSVG
     return header + groupToString(group) + "</svg>";
   }
 
-  
-
-  public RGroup toGroup(String filename)
-  {
+  public RGroup toGroup(String filename) {
     XML svg;
 
-       svg = RG.parent().loadXML(filename);
-    
-    
-    if (svg == null) return new RGroup();
-    
+    svg = RG.parent().loadXML(filename);
+
+    if (svg == null) {
+      return new RGroup();
+    }
+
     if (!svg.getName().equals("svg")) {
       throw new RuntimeException("root is not <svg>, it's <" + svg.getName() + ">");
     }
 
     return elemToGroup(svg);
   }
-  
+
   public float unitsToPixels(String units, float originalPxSize) {
     // TODO: check if it is possible to know the dpi of a given PGraphics or device
     return unitsToPixels(units, originalPxSize, 72.0f/*Toolkit.getDefaultToolkit().getScreenResolution()*/);
@@ -128,20 +121,19 @@ public class RSVG
       multiplier = 1.0f;
     }
 
-    return Float.parseFloat(units.substring(0, units.length()-chars)) * multiplier;
+    return Float.parseFloat(units.substring(0, units.length() - chars)) * multiplier;
   }
 
-  public RShape toShape(String filename)
-  {
-      XML svg;
+  public RShape toShape(String filename) {
+    XML svg;
 
-       svg = RG.parent().loadXML(filename);
+    svg = RG.parent().loadXML(filename);
 
-    
-    if (svg == null) return new RShape();
+    if (svg == null) {
+      return new RShape();
+    }
 
-    if ( !svg.getName().equals("svg") )
-	{
+    if (!svg.getName().equals("svg")) {
       throw new RuntimeException("root is not <svg>, it's <" + svg.getName() + ">");
     }
 
@@ -153,24 +145,22 @@ public class RSVG
     if (svg.hasAttribute("width") && svg.hasAttribute("height")) {
       String widthStr = svg.getString("width").trim();
       String heightStr = svg.getString("height").trim();
-            
+
       result.width = unitsToPixels(widthStr, result.origWidth);
       result.height = unitsToPixels(heightStr, result.origHeight);
     } else {
       result.width = result.origWidth;
       result.height = result.origHeight;
     }
-    
+
     return result;
   }
 
-  public RPolygon toPolygon(String filename)
-  {
+  public RPolygon toPolygon(String filename) {
     return toGroup(filename).toPolygon();
   }
 
-  public RMesh toMesh(String filename)
-  {
+  public RMesh toMesh(String filename) {
     return toGroup(filename).toMesh();
   }
 
@@ -180,19 +170,19 @@ public class RSVG
     result += styleToString(grp.getStyle());
     result += ">\n";
 
-    for(int i=0;i<grp.countElements();i++) {
-      switch(grp.elements[i].getType()){
-      case RGeomElem.GROUP:
-        result += groupToString((RGroup)grp.elements[i]);
-        break;
+    for (int i = 0; i < grp.countElements(); i++) {
+      switch (grp.elements[i].getType()) {
+        case RGeomElem.GROUP:
+          result += groupToString((RGroup) grp.elements[i]);
+          break;
 
-      case RGeomElem.POLYGON:
-        result += polygonToString((RPolygon)grp.elements[i]);
-        break;
+        case RGeomElem.POLYGON:
+          result += polygonToString((RPolygon) grp.elements[i]);
+          break;
 
-      case RGeomElem.SHAPE:
-        result += shapeToString((RShape)grp.elements[i]);
-        break;
+        case RGeomElem.SHAPE:
+          result += shapeToString((RShape) grp.elements[i]);
+          break;
 
       }
     }
@@ -219,10 +209,10 @@ public class RSVG
       result += "<path ";
       result += "d=\"";
 
-      for(int i=0; i<shp.countPaths(); i++) {
+      for (int i = 0; i < shp.countPaths(); i++) {
         RPath sushp = shp.paths[i];
         boolean init = true;
-        for ( int j = 0; j < sushp.countCommands(); j++ ) {
+        for (int j = 0; j < sushp.countCommands(); j++) {
           RCommand cmd = sushp.commands[j];
 
           if (init) {
@@ -230,8 +220,7 @@ public class RSVG
             init = false;
           }
 
-          switch( cmd.getCommandType() )
-            {
+          switch (cmd.getCommandType()) {
             case RCommand.LINETO:
               result += "L" + cmd.endPoint.x + " " + cmd.endPoint.y + " ";
               break;
@@ -243,7 +232,7 @@ public class RSVG
             case RCommand.CUBICBEZIERTO:
               result += "C" + cmd.controlPoints[0].x + " " + cmd.controlPoints[0].y + " " + cmd.controlPoints[1].x + " " + cmd.controlPoints[1].y + " " + cmd.endPoint.x + " " + cmd.endPoint.y + " ";
               break;
-            }
+          }
         }
 
         if (sushp.closed) {
@@ -254,8 +243,8 @@ public class RSVG
       result += "\"/>\n";
     }
 
-    for (int i=0; i<shp.countChildren(); i++) {
-      result+=shapeToString(shp.children[i]);
+    for (int i = 0; i < shp.countChildren(); i++) {
+      result += shapeToString(shp.children[i]);
     }
 
     result += "</g>\n";
@@ -274,7 +263,7 @@ public class RSVG
     }
 
     if (style.fillAlphaDef) {
-      result += "fill-opacity:" + style.fillAlpha/255.0f + ";";
+      result += "fill-opacity:" + style.fillAlpha / 255.0f + ";";
     }
 
     if (style.strokeDef) {
@@ -286,51 +275,50 @@ public class RSVG
     }
 
     if (style.strokeAlphaDef) {
-      result += "stroke-opacity:" + style.strokeAlpha/255.0f + ";";
+      result += "stroke-opacity:" + style.strokeAlpha / 255.0f + ";";
     }
 
     if (style.strokeWeightDef) {
       result += "stroke-width:" + style.strokeWeight + ";";
     }
 
-
-    if(style.strokeCapDef) {
+    if (style.strokeCapDef) {
       result += "stroke-linecap:";
 
       switch (style.strokeCap) {
-      case PConstants.PROJECT:
-        result += "butt";
-        break;
-      case PConstants.ROUND:
-        result += "round";
-        break;
-      case PConstants.SQUARE:
-        result += "square";
-        break;
-
-      default:
-        break;
+        case PConstants.PROJECT:
+          result += "butt";
+          break;
+        case PConstants.ROUND:
+          result += "round";
+          break;
+        case PConstants.SQUARE:
+          result += "square";
+          break;
+
+        default:
+          break;
       }
 
       result += ";";
     }
 
-    if(style.strokeJoinDef) {
+    if (style.strokeJoinDef) {
       result += "stroke-linejoin:";
 
       switch (style.strokeJoin) {
-      case PConstants.MITER:
-        result += "miter";
-        break;
-      case PConstants.ROUND:
-        result += "round";
-        break;
-      case PConstants.BEVEL:
-        result += "bevel";
-        break;
-
-      default:
-        break;
+        case PConstants.MITER:
+          result += "miter";
+          break;
+        case PConstants.ROUND:
+          result += "round";
+          break;
+        case PConstants.BEVEL:
+          result += "bevel";
+          break;
+
+        default:
+          break;
       }
 
       result += ";";
@@ -341,16 +329,15 @@ public class RSVG
   }
 
   /**
-     * @param elem
-     * @return 
-   * @invisible
+   * @param elem
+   * @return
+   *
    */
-  public RGroup elemToGroup(XML elem)
-  {
+  public RGroup elemToGroup(XML elem) {
     RGroup grp = new RGroup();
 
     // Set the defaults SVG styles for the root
-    if(elem.getName().toLowerCase().equals("svg")){
+    if (elem.getName().toLowerCase().equals("svg")) {
       grp.setFill(0);  // By default in SVG it's black
       grp.setFillAlpha(255);  // By default in SVG it's 1
       grp.setStroke(false);  // By default in SVG it's none
@@ -362,106 +349,106 @@ public class RSVG
     }
 
     XML elems[] = elem.getChildren();
-      for (XML elem1 : elems) {
-          String name = elem1.getName().toLowerCase();
-          XML element = elem1;
-          // Parse and create the geometrical element
-          RGeomElem geomElem = null;
-        switch (name) {
-            case "g":
-                geomElem = elemToGroup(element);
-                break;
-            case "path":
-                geomElem = elemToShape(element);
-                break;
-            case "polygon":
-                geomElem = elemToPolygon(element);
-                break;
-            case "polyline":
-                geomElem = elemToPolyline(element);
-                break;
-            case "circle":
-                geomElem = elemToCircle(element);
-                break;
-            case "ellipse":
-                geomElem = elemToEllipse(element);
-                break;
-            case "rect":
-                geomElem = elemToRect(element);
-                break;
-            case "line":
-                geomElem = elemToLine(element);
-                break;
-            case "defs":
-                break;
-            case "#text":
-                break;    
-            default:
-                PApplet.println("Element '" + name + "' not know. Ignoring it.");
-                break; // If the geometrical element has been correctly created
+    for (XML elem1 : elems) {
+      String name = elem1.getName().toLowerCase();
+      XML element = elem1;
+      // Parse and create the geometrical element
+      RGeomElem geomElem = null;
+      switch (name) {
+        case "g":
+          geomElem = elemToGroup(element);
+          break;
+        case "path":
+          geomElem = elemToShape(element);
+          break;
+        case "polygon":
+          geomElem = elemToPolygon(element);
+          break;
+        case "polyline":
+          geomElem = elemToPolyline(element);
+          break;
+        case "circle":
+          geomElem = elemToCircle(element);
+          break;
+        case "ellipse":
+          geomElem = elemToEllipse(element);
+          break;
+        case "rect":
+          geomElem = elemToRect(element);
+          break;
+        case "line":
+          geomElem = elemToLine(element);
+          break;
+        case "defs":
+          break;
+        case "#text":
+          break;
+        default:
+          PApplet.println("Element '" + name + "' not know. Ignoring it.");
+          break; // If the geometrical element has been correctly created
         }
-          if((geomElem != null)){
-              // Transform geometrical element
-              if(element.hasAttribute("transform")){
-                  String transformString = element.getString("transform");
-                  RMatrix transf = new RMatrix(transformString);
-                  geomElem.transform(transf);
-              }
-              
-              // Get the id for the geometrical element
-              if(element.hasAttribute("id")){
-                  geomElem.name = element.getString("id");
-              }
-              
-              // Get the style for the geometrical element
-              if(element.hasAttribute("style")){
-                  geomElem.setStyle(element.getString("style"));
-              }
-              
-              // Get the fill for the geometrical element
-              if(element.hasAttribute("fill")){
-                  geomElem.setFill(element.getString("fill"));
-              }
-              
-              // Get the fill-linejoin for the geometrical element
-              if(element.hasAttribute("fill-opacity")){
-                  geomElem.setFillAlpha(element.getString("fill-opacity"));
-              }
-              
-              // Get the stroke for the geometrical element
-              if(element.hasAttribute("stroke")){
-                  geomElem.setStroke(element.getString("stroke"));
-              }
-              
-              // Get the stroke-width for the geometrical element
-              if(element.hasAttribute("stroke-width")){
-                  geomElem.setStrokeWeight(element.getString("stroke-width"));
-              }
-              
-              // Get the stroke-linecap for the geometrical element
-              if(element.hasAttribute("stroke-linecap")){
-                  geomElem.setStrokeCap(element.getString("stroke-linecap"));
-              }
-              
-              // Get the stroke-linejoin for the geometrical element
-              if(element.hasAttribute("stroke-linejoin")){
-                  geomElem.setStrokeJoin(element.getString("stroke-linejoin"));
-              }
-              
-              // Get the stroke-linejoin for the geometrical element
-              if(element.hasAttribute("stroke-opacity")){
-                  geomElem.setStrokeAlpha(element.getString("stroke-opacity"));
-              }
-              
-              // Get the opacity for the geometrical element
-        if(element.hasAttribute("opacity")){
+      if ((geomElem != null)) {
+        // Transform geometrical element
+        if (element.hasAttribute("transform")) {
+          String transformString = element.getString("transform");
+          RMatrix transf = new RMatrix(transformString);
+          geomElem.transform(transf);
+        }
+
+        // Get the id for the geometrical element
+        if (element.hasAttribute("id")) {
+          geomElem.name = element.getString("id");
+        }
+
+        // Get the style for the geometrical element
+        if (element.hasAttribute("style")) {
+          geomElem.setStyle(element.getString("style"));
+        }
+
+        // Get the fill for the geometrical element
+        if (element.hasAttribute("fill")) {
+          geomElem.setFill(element.getString("fill"));
+        }
+
+        // Get the fill-linejoin for the geometrical element
+        if (element.hasAttribute("fill-opacity")) {
+          geomElem.setFillAlpha(element.getString("fill-opacity"));
+        }
+
+        // Get the stroke for the geometrical element
+        if (element.hasAttribute("stroke")) {
+          geomElem.setStroke(element.getString("stroke"));
+        }
+
+        // Get the stroke-width for the geometrical element
+        if (element.hasAttribute("stroke-width")) {
+          geomElem.setStrokeWeight(element.getString("stroke-width"));
+        }
+
+        // Get the stroke-linecap for the geometrical element
+        if (element.hasAttribute("stroke-linecap")) {
+          geomElem.setStrokeCap(element.getString("stroke-linecap"));
+        }
+
+        // Get the stroke-linejoin for the geometrical element
+        if (element.hasAttribute("stroke-linejoin")) {
+          geomElem.setStrokeJoin(element.getString("stroke-linejoin"));
+        }
+
+        // Get the stroke-linejoin for the geometrical element
+        if (element.hasAttribute("stroke-opacity")) {
+          geomElem.setStrokeAlpha(element.getString("stroke-opacity"));
+        }
+
+        // Get the opacity for the geometrical element
+        if (element.hasAttribute("opacity")) {
           geomElem.setAlpha(element.getString("opacity"));
         }
 
         // Get the style for the geometrical element
         grp.addElement(geomElem);
       }
-      }
+    }
 
     // Set the original width and height
     grp.updateOrigParams();
@@ -470,17 +457,15 @@ public class RSVG
   }
 
   /**
-     * @param elem
-     * @return 
-   * @invisible
+   * @param elem
+   * @return
+   *
    */
-  public RShape elemToCompositeShape( XML elem )
-  {
+  public RShape elemToCompositeShape(XML elem) {
     RShape shp = new RShape();
 
     // Set the defaults SVG styles for the root
-    if (elem.getName().toLowerCase().equals("svg"))
-    {
+    if (elem.getName().toLowerCase().equals("svg")) {
       shp.setFill(0);  // By default in SVG it's black
       shp.setFillAlpha(255);  // By default in SVG it's 1
       shp.setStroke(false);  // By default in SVG it's none
@@ -493,108 +478,110 @@ public class RSVG
 
     XML elems[] = elem.getChildren();
 
-      for (XML elem1 : elems) {
-          String name = elem1.getName();
-          if ( name == null ) continue;
-          name = name.toLowerCase();
-          XML element = elem1;
-          // Parse and create the geometrical element
-          RShape geomElem = null;
-        switch (name) {
-            case "g":
-                geomElem = elemToCompositeShape(element);
-                break;
-            case "path":
-                geomElem = elemToShape(element);
-                break;
-            case "polygon":
-                geomElem = elemToPolygon(element);
-                break;
-            case "polyline":
-                geomElem = elemToPolyline(element);
-                break;
-            case "circle":
-                geomElem = elemToCircle(element);
-                break;
-            case "ellipse":
-                geomElem = elemToEllipse(element);
-                break;
-            case "rect":
-                geomElem = elemToRect(element);
-                break;
-            case "line":
-                geomElem = elemToLine(element);
-                break;
-            case "#text":
-                break;  
-            case "defs":
-                break;
-            default:
-                PApplet.println("Element '" + name + "' not know. Ignoring it.");
-                break; // If the geometrical element has been correctly created
+    for (XML elem1 : elems) {
+      String name = elem1.getName();
+      if (name == null) {
+        continue;
+      }
+      name = name.toLowerCase();
+      XML element = elem1;
+      // Parse and create the geometrical element
+      RShape geomElem = null;
+      switch (name) {
+        case "g":
+          geomElem = elemToCompositeShape(element);
+          break;
+        case "path":
+          geomElem = elemToShape(element);
+          break;
+        case "polygon":
+          geomElem = elemToPolygon(element);
+          break;
+        case "polyline":
+          geomElem = elemToPolyline(element);
+          break;
+        case "circle":
+          geomElem = elemToCircle(element);
+          break;
+        case "ellipse":
+          geomElem = elemToEllipse(element);
+          break;
+        case "rect":
+          geomElem = elemToRect(element);
+          break;
+        case "line":
+          geomElem = elemToLine(element);
+          break;
+        case "#text":
+          break;
+        case "defs":
+          break;
+        default:
+          PApplet.println("Element '" + name + "' not know. Ignoring it.");
+          break; // If the geometrical element has been correctly created
+        }
+      if ((geomElem != null)) {
+        // Transform geometrical element
+        if (element.hasAttribute("transform")) {
+          String transformString = element.getString("transform");
+          RMatrix transf = new RMatrix(transformString);
+          geomElem.transform(transf);
+        }
+
+        // Get the id for the geometrical element
+        if (element.hasAttribute("id")) {
+          geomElem.name = element.getString("id");
+        }
+
+        // Get the style for the geometrical element
+        if (element.hasAttribute("style")) {
+          geomElem.setStyle(element.getString("style"));
+        }
+
+        // Get the fill for the geometrical element
+        if (element.hasAttribute("fill")) {
+          geomElem.setFill(element.getString("fill"));
+        }
+
+        // Get the fill-linejoin for the geometrical element
+        if (element.hasAttribute("fill-opacity")) {
+          geomElem.setFillAlpha(element.getString("fill-opacity"));
+        }
+
+        // Get the stroke for the geometrical element
+        if (element.hasAttribute("stroke")) {
+          geomElem.setStroke(element.getString("stroke"));
+        }
+
+        // Get the stroke-width for the geometrical element
+        if (element.hasAttribute("stroke-width")) {
+          geomElem.setStrokeWeight(element.getString("stroke-width"));
+        }
+
+        // Get the stroke-linecap for the geometrical element
+        if (element.hasAttribute("stroke-linecap")) {
+          geomElem.setStrokeCap(element.getString("stroke-linecap"));
+        }
+
+        // Get the stroke-linejoin for the geometrical element
+        if (element.hasAttribute("stroke-linejoin")) {
+          geomElem.setStrokeJoin(element.getString("stroke-linejoin"));
         }
-          if((geomElem != null)){
-              // Transform geometrical element
-              if(element.hasAttribute("transform")){
-                  String transformString = element.getString("transform");
-                  RMatrix transf = new RMatrix(transformString);
-                  geomElem.transform(transf);
-              }
-              
-              // Get the id for the geometrical element
-              if(element.hasAttribute("id")){
-                  geomElem.name = element.getString("id");
-              }
-              
-              // Get the style for the geometrical element
-              if(element.hasAttribute("style")){
-                  geomElem.setStyle(element.getString("style"));
-              }
-              
-              // Get the fill for the geometrical element
-              if(element.hasAttribute("fill")){
-                  geomElem.setFill(element.getString("fill"));
-              }
-              
-              // Get the fill-linejoin for the geometrical element
-              if(element.hasAttribute("fill-opacity")){
-                  geomElem.setFillAlpha(element.getString("fill-opacity"));
-              }
-              
-              // Get the stroke for the geometrical element
-              if(element.hasAttribute("stroke")){
-                  geomElem.setStroke(element.getString("stroke"));
-              }
-              
-              // Get the stroke-width for the geometrical element
-              if(element.hasAttribute("stroke-width")){
-                  geomElem.setStrokeWeight(element.getString("stroke-width"));
-              }
-              
-              // Get the stroke-linecap for the geometrical element
-              if(element.hasAttribute("stroke-linecap")){
-                  geomElem.setStrokeCap(element.getString("stroke-linecap"));
-              }
-              
-              // Get the stroke-linejoin for the geometrical element
-              if(element.hasAttribute("stroke-linejoin")){
-                  geomElem.setStrokeJoin(element.getString("stroke-linejoin"));
-              }
-              
-              // Get the stroke-linejoin for the geometrical element
-              if(element.hasAttribute("stroke-opacity")){
-                  geomElem.setStrokeAlpha(element.getString("stroke-opacity"));
-              }
-              
-              // Get the opacity for the geometrical element
-        if(element.hasAttribute("opacity")){
+
+        // Get the stroke-linejoin for the geometrical element
+        if (element.hasAttribute("stroke-opacity")) {
+          geomElem.setStrokeAlpha(element.getString("stroke-opacity"));
+        }
+
+        // Get the opacity for the geometrical element
+        if (element.hasAttribute("opacity")) {
           geomElem.setAlpha(element.getString("opacity"));
         }
 
         // Get the style for the geometrical element
         shp.addChild(geomElem);
       }
-      }
+    }
 
     shp.updateOrigParams();
 
@@ -602,12 +589,11 @@ public class RSVG
   }
 
   /**
-     * @param elem
-     * @return 
-   * @invisible
+   * @param elem
+   * @return
+   *
    */
-  public RShape elemToPolyline(XML elem)
-  {
+  public RShape elemToPolyline(XML elem) {
     RShape shp = getPolyline(elem.getString("points").trim());
 
     shp.updateOrigParams();
@@ -616,12 +602,11 @@ public class RSVG
   }
 
   /**
-     * @param elem
-     * @return 
-   * @invisible
+   * @param elem
+   * @return
+   *
    */
-  public RShape elemToPolygon(XML elem)
-  {
+  public RShape elemToPolygon(XML elem) {
     RShape poly = elemToPolyline(elem);
 
     poly.addClose();
@@ -632,12 +617,11 @@ public class RSVG
   }
 
   /**
-     * @param elem
-     * @return 
-   * @invisible
+   * @param elem
+   * @return
+   *
    */
-  public RShape elemToRect(XML elem)
-  {
+  public RShape elemToRect(XML elem) {
 
     RShape shp = getRect(elem.getFloat("x"), elem.getFloat("y"), elem.getFloat("width"), elem.getFloat("height"));
 
@@ -647,12 +631,11 @@ public class RSVG
   }
 
   /**
-     * @param elem
-     * @return 
-   * @invisible
+   * @param elem
+   * @return
+   *
    */
-  public RShape elemToLine(XML elem)
-  {
+  public RShape elemToLine(XML elem) {
     RShape shp = getLine(elem.getFloat("x1"), elem.getFloat("y1"), elem.getFloat("x2"), elem.getFloat("y2"));
 
     shp.updateOrigParams();
@@ -660,14 +643,12 @@ public class RSVG
     return shp;
   }
 
-
   /**
-     * @param elem
-     * @return 
-   * @invisible
+   * @param elem
+   * @return
+   *
    */
-  public RShape elemToEllipse(XML elem)
-  {
+  public RShape elemToEllipse(XML elem) {
     RShape shp = getEllipse(elem.getFloat("cx"), elem.getFloat("cy"), elem.getFloat("rx"), elem.getFloat("ry"));
 
     shp.updateOrigParams();
@@ -675,14 +656,12 @@ public class RSVG
     return shp;
   }
 
-
   /**
-     * @param elem
-     * @return 
-   * @invisible
+   * @param elem
+   * @return
+   *
    */
-  public RShape elemToCircle(XML elem)
-  {
+  public RShape elemToCircle(XML elem) {
     float r = elem.getFloat("r");
     RShape shp = getEllipse(elem.getFloat("cx"), elem.getFloat("cy"), r, r);
 
@@ -692,12 +671,11 @@ public class RSVG
   }
 
   /**
-     * @param elem
-     * @return 
-   * @invisible
+   * @param elem
+   * @return
+   *
    */
-  public RShape elemToShape(XML elem)
-  {
+  public RShape elemToShape(XML elem) {
     RShape shp = getShape(elem.getString("d"));
 
     shp.updateOrigParams();
@@ -706,10 +684,9 @@ public class RSVG
   }
 
   /**
-   * @invisible
+   *
    */
-  private RShape getRect(float x, float y, float w, float h)
-  {
+  private RShape getRect(float x, float y, float w, float h) {
     RShape shp = RShape.createRectangle(x, y, w, h);
 
     shp.updateOrigParams();
@@ -718,10 +695,9 @@ public class RSVG
   }
 
   /**
-   * @invisible
+   *
    */
-  private RShape getLine(float x1, float y1, float x2, float y2)
-  {
+  private RShape getLine(float x1, float y1, float x2, float y2) {
     RShape shp = new RShape();
 
     shp.addMoveTo(x1, y1);
@@ -730,119 +706,110 @@ public class RSVG
     return shp;
   }
 
-
   /**
-   * @invisible
+   *
    */
-  private RShape getEllipse(float cx, float cy, float rx, float ry)
-  {
+  private RShape getEllipse(float cx, float cy, float rx, float ry) {
     // RShape createEllipse takes as input the width and height of the ellipses
-    return RShape.createEllipse(cx, cy, rx*2F, ry*2F);
+    return RShape.createEllipse(cx, cy, rx * 2F, ry * 2F);
   }
 
   /**
-   * @invisible
+   *
    */
-  private RShape getPolyline(String s)
-  {
+  private RShape getPolyline(String s) {
     RShape poly = new RShape();
     boolean first = true;
 
     //format string to usable format
-    char charline[]=s.toCharArray();
-    for(int i=0;i<charline.length;i++)
-      {
-        switch(charline[i])
-          {
-          case '-':
-            if(charline[i-1] != 'e' && charline[i-1] != 'E'){
-              charline=PApplet.splice(charline,' ',i);
-              i++;
-            }
-            break;
-          case ',':
-          case '\n':
-          case '\r':
-          case '\t':
-            charline[i]=' ';
-            break;
+    char charline[] = s.toCharArray();
+    for (int i = 0; i < charline.length; i++) {
+      switch (charline[i]) {
+        case '-':
+          if (charline[i - 1] != 'e' && charline[i - 1] != 'E') {
+            charline = PApplet.splice(charline, ' ', i);
+            i++;
           }
+          break;
+        case ',':
+        case '\n':
+        case '\r':
+        case '\t':
+          charline[i] = ' ';
+          break;
       }
-    String formatted=new String(charline);
-    String tags[]=PApplet.splitTokens(formatted,", ");
-    for(int i=0;i<tags.length;i++){
+    }
+    String formatted = new String(charline);
+    String tags[] = PApplet.splitTokens(formatted, ", ");
+    for (int i = 0; i < tags.length; i++) {
       float x = PApplet.parseFloat(tags[i]);
-      float y = PApplet.parseFloat(tags[i+1]);
+      float y = PApplet.parseFloat(tags[i + 1]);
       i++;
-      if(first){
-        poly.addMoveTo(x,y);
+      if (first) {
+        poly.addMoveTo(x, y);
         first = false;
-      }else{
-        poly.addLineTo(x,y);
+      } else {
+        poly.addLineTo(x, y);
       }
     }
     return poly;
   }
 
   /**
-   * @invisible
+   *
    */
-  private RShape getShape(String s)
-  {
+  private RShape getShape(String s) {
     RShape shp = new RShape();
 
-    if(s == null){
+    if (s == null) {
       return shp;
     }
 
     //format string to usable format
     char charline[] = s.toCharArray();
-    for( int i = 0 ; i < charline.length ; i++)
-      {
-        switch(charline[i])
-          {
-          case 'M':
-          case 'm':
-          case 'Z':
-          case 'z':
-          case 'C':
-          case 'c':
-          case 'S':
-          case 's':
-          case 'L':
-          case 'l':
-          case 'H':
-          case 'h':
-          case 'V':
-          case 'v':
-            charline = PApplet.splice(charline,' ',i);
-            i ++;
-            charline = PApplet.splice(charline,' ',i+1);
-            i ++;
-            break;
-
-          case '-':
-            if(i>0 && charline[i-1] != 'e' && charline[i-1] != 'E'){
-              charline=PApplet.splice(charline,' ',i);
-              i++;
-            }
-            break;
-          case ',':
-          case '\n':
-          case '\r':
-          case '\t':
-            charline[i] = ' ';
-            break;
-
+    for (int i = 0; i < charline.length; i++) {
+      switch (charline[i]) {
+        case 'M':
+        case 'm':
+        case 'Z':
+        case 'z':
+        case 'C':
+        case 'c':
+        case 'S':
+        case 's':
+        case 'L':
+        case 'l':
+        case 'H':
+        case 'h':
+        case 'V':
+        case 'v':
+          charline = PApplet.splice(charline, ' ', i);
+          i++;
+          charline = PApplet.splice(charline, ' ', i + 1);
+          i++;
+          break;
+
+        case '-':
+          if (i > 0 && charline[i - 1] != 'e' && charline[i - 1] != 'E') {
+            charline = PApplet.splice(charline, ' ', i);
+            i++;
           }
+          break;
+        case ',':
+        case '\n':
+        case '\r':
+        case '\t':
+          charline[i] = ' ';
+          break;
+
       }
+    }
     String formatted = new String(charline);
     String[] tags = PApplet.splitTokens(formatted);
 
     //PApplet.println("formatted: " + formatted);
     //PApplet.println("tags: ");
     //PApplet.println(tags);
-    
     //build points
     RPoint curp = new RPoint();
     RPoint relp = new RPoint();
@@ -851,132 +818,129 @@ public class RSVG
 
     char command = 'a';
 
-    for (int i=0;i<tags.length;i++)
-      {
-        char nextChar = tags[i].charAt(0);
-        switch(nextChar)
-          {
-          case 'm':
-          case 'M':
-          case 'c':
-          case 'C':
-          case 's':
-          case 'S':
-          case 'l':
-          case 'L':
-          case 'h':
-          case 'H':
-          case 'v':
-          case 'V':
-            i += 1;
-          case 'z':
-          case 'Z':
-            command = nextChar;
-            break;
-          default:
-            if (command == 'm') {
-              command = 'l';
-            } else if (command == 'M') {
-              command = 'L';
-            }
-        }
-
-        relp.setLocation(0F, 0F);
-
-        switch(command)
-          {
-          case 'm':
-            relp.setLocation(curp.x, curp.y);
-          case 'M':
-            i = move(shp, curp, relp, refp, strp, tags, i);
-            break;
-
-          case 'z':
-            relp.setLocation(curp.x, curp.y);
-          case 'Z':
-            shp.addClose();
-            break;
-
-          case 'c':
-            relp.setLocation(curp.x, curp.y);
-          case 'C':
-            i = curve(shp, curp, relp, refp, strp, tags, i);
-            break;
-
-          case 's':
-            relp.setLocation(curp.x, curp.y);
-          case 'S':
-            i = smooth(shp, curp, relp, refp, strp, tags, i);
-            break;
-
-          case 'l':
-            relp.setLocation(curp.x, curp.y);
-          case 'L':
-            i = line(shp, curp, relp, refp, strp, tags, i);
-            break;
-
-          case 'h':
-            relp.setLocation(curp.x, curp.y);
-          case 'H':
-            i = horizontal(shp, curp, relp, refp, strp, tags, i);
-            break;
-
-          case 'v':
-            relp.setLocation(curp.x, curp.y);
-          case 'V':
-            i = vertical(shp, curp, relp, refp, strp, tags, i);
-            break;
+    for (int i = 0; i < tags.length; i++) {
+      char nextChar = tags[i].charAt(0);
+      switch (nextChar) {
+        case 'm':
+        case 'M':
+        case 'c':
+        case 'C':
+        case 's':
+        case 'S':
+        case 'l':
+        case 'L':
+        case 'h':
+        case 'H':
+        case 'v':
+        case 'V':
+          i += 1;
+        case 'z':
+        case 'Z':
+          command = nextChar;
+          break;
+        default:
+          if (command == 'm') {
+            command = 'l';
+          } else if (command == 'M') {
+            command = 'L';
           }
       }
+
+      relp.setLocation(0F, 0F);
+
+      switch (command) {
+        case 'm':
+          relp.setLocation(curp.x, curp.y);
+        case 'M':
+          i = move(shp, curp, relp, refp, strp, tags, i);
+          break;
+
+        case 'z':
+          relp.setLocation(curp.x, curp.y);
+        case 'Z':
+          shp.addClose();
+          break;
+
+        case 'c':
+          relp.setLocation(curp.x, curp.y);
+        case 'C':
+          i = curve(shp, curp, relp, refp, strp, tags, i);
+          break;
+
+        case 's':
+          relp.setLocation(curp.x, curp.y);
+        case 'S':
+          i = smooth(shp, curp, relp, refp, strp, tags, i);
+          break;
+
+        case 'l':
+          relp.setLocation(curp.x, curp.y);
+        case 'L':
+          i = line(shp, curp, relp, refp, strp, tags, i);
+          break;
+
+        case 'h':
+          relp.setLocation(curp.x, curp.y);
+        case 'H':
+          i = horizontal(shp, curp, relp, refp, strp, tags, i);
+          break;
+
+        case 'v':
+          relp.setLocation(curp.x, curp.y);
+        case 'V':
+          i = vertical(shp, curp, relp, refp, strp, tags, i);
+          break;
+      }
+    }
     return shp;
   }
 
-  private int move(RShape shp, RPoint curp, RPoint relp, RPoint refp, RPoint strp, String[] tags, int i){
-    shp.addMoveTo(PApplet.parseFloat(tags[i])+relp.x, PApplet.parseFloat(tags[i+1])+relp.y);
+  private int move(RShape shp, RPoint curp, RPoint relp, RPoint refp, RPoint strp, String[] tags, int i) {
+    shp.addMoveTo(PApplet.parseFloat(tags[i]) + relp.x, PApplet.parseFloat(tags[i + 1]) + relp.y);
 
-    curp.setLocation(PApplet.parseFloat(tags[i])+relp.x, PApplet.parseFloat(tags[i+1])+relp.y);
-    refp.setLocation(curp.x,curp.y);
-    strp.setLocation(curp.x,curp.y);
+    curp.setLocation(PApplet.parseFloat(tags[i]) + relp.x, PApplet.parseFloat(tags[i + 1]) + relp.y);
+    refp.setLocation(curp.x, curp.y);
+    strp.setLocation(curp.x, curp.y);
     //relp.setLocation(0F, 0F);
     return i + 1;
   }
 
-  private int curve(RShape shp, RPoint curp, RPoint relp, RPoint refp, RPoint strp, String[] tags, int i){
-    shp.addBezierTo(PApplet.parseFloat(tags[i])+relp.x, PApplet.parseFloat(tags[i+1])+relp.y, PApplet.parseFloat(tags[i+2])+relp.x, PApplet.parseFloat(tags[i+3])+relp.y, PApplet.parseFloat(tags[i+4])+relp.x, PApplet.parseFloat(tags[i+5])+relp.y);
+  private int curve(RShape shp, RPoint curp, RPoint relp, RPoint refp, RPoint strp, String[] tags, int i) {
+    shp.addBezierTo(PApplet.parseFloat(tags[i]) + relp.x, PApplet.parseFloat(tags[i + 1]) + relp.y, PApplet.parseFloat(tags[i + 2]) + relp.x, PApplet.parseFloat(tags[i + 3]) + relp.y, PApplet.parseFloat(tags[i + 4]) + relp.x, PApplet.parseFloat(tags[i + 5]) + relp.y);
 
-    curp.setLocation(PApplet.parseFloat(tags[i+4])+relp.x, PApplet.parseFloat(tags[i+5])+relp.y);
-    refp.setLocation(2.0f*curp.x-(PApplet.parseFloat(tags[i+2])+relp.x), 2.0f*curp.y-(PApplet.parseFloat(tags[i+3])+relp.y));
+    curp.setLocation(PApplet.parseFloat(tags[i + 4]) + relp.x, PApplet.parseFloat(tags[i + 5]) + relp.y);
+    refp.setLocation(2.0f * curp.x - (PApplet.parseFloat(tags[i + 2]) + relp.x), 2.0f * curp.y - (PApplet.parseFloat(tags[i + 3]) + relp.y));
     return i + 5;
   }
 
-  private int smooth(RShape shp, RPoint curp, RPoint relp, RPoint refp, RPoint strp, String[] tags, int i){
-    shp.addBezierTo(refp.x, refp.y, PApplet.parseFloat(tags[i])+relp.x, PApplet.parseFloat(tags[i+1])+relp.y, PApplet.parseFloat(tags[i+2])+relp.x, PApplet.parseFloat(tags[i+3])+relp.y);
+  private int smooth(RShape shp, RPoint curp, RPoint relp, RPoint refp, RPoint strp, String[] tags, int i) {
+    shp.addBezierTo(refp.x, refp.y, PApplet.parseFloat(tags[i]) + relp.x, PApplet.parseFloat(tags[i + 1]) + relp.y, PApplet.parseFloat(tags[i + 2]) + relp.x, PApplet.parseFloat(tags[i + 3]) + relp.y);
 
-    curp.setLocation(PApplet.parseFloat(tags[i+2])+relp.x, PApplet.parseFloat(tags[i+3])+relp.y);
-    refp.setLocation(2.0f*curp.x-(PApplet.parseFloat(tags[i])+relp.x), 2.0f*curp.y-(PApplet.parseFloat(tags[i+1])+relp.y));
+    curp.setLocation(PApplet.parseFloat(tags[i + 2]) + relp.x, PApplet.parseFloat(tags[i + 3]) + relp.y);
+    refp.setLocation(2.0f * curp.x - (PApplet.parseFloat(tags[i]) + relp.x), 2.0f * curp.y - (PApplet.parseFloat(tags[i + 1]) + relp.y));
     return i + 3;
   }
 
-  private int line(RShape shp, RPoint curp, RPoint relp, RPoint refp, RPoint strp, String[] tags, int i){
-    shp.addLineTo(PApplet.parseFloat(tags[i])+relp.x, PApplet.parseFloat(tags[i+1])+relp.y);
+  private int line(RShape shp, RPoint curp, RPoint relp, RPoint refp, RPoint strp, String[] tags, int i) {
+    shp.addLineTo(PApplet.parseFloat(tags[i]) + relp.x, PApplet.parseFloat(tags[i + 1]) + relp.y);
 
-    curp.setLocation(PApplet.parseFloat(tags[i])+relp.x, PApplet.parseFloat(tags[i+1])+relp.y);
+    curp.setLocation(PApplet.parseFloat(tags[i]) + relp.x, PApplet.parseFloat(tags[i + 1]) + relp.y);
     refp.setLocation(curp.x, curp.y);
     return i + 1;
   }
 
-  private int horizontal(RShape shp, RPoint curp, RPoint relp, RPoint refp, RPoint strp, String[] tags, int i){
-    shp.addLineTo(PApplet.parseFloat(tags[i])+relp.x, curp.y);
+  private int horizontal(RShape shp, RPoint curp, RPoint relp, RPoint refp, RPoint strp, String[] tags, int i) {
+    shp.addLineTo(PApplet.parseFloat(tags[i]) + relp.x, curp.y);
 
-    curp.setLocation(PApplet.parseFloat(tags[i])+relp.x, curp.y);
+    curp.setLocation(PApplet.parseFloat(tags[i]) + relp.x, curp.y);
     refp.setLocation(curp.x, curp.y);
     return i;
   }
 
-  private int vertical(RShape shp, RPoint curp, RPoint relp, RPoint refp, RPoint strp, String[] tags, int i){
-    shp.addLineTo(curp.x, PApplet.parseFloat(tags[i])+relp.y);
+  private int vertical(RShape shp, RPoint curp, RPoint relp, RPoint refp, RPoint strp, String[] tags, int i) {
+    shp.addLineTo(curp.x, PApplet.parseFloat(tags[i]) + relp.y);
 
-    curp.setLocation(curp.x, PApplet.parseFloat(tags[i])+relp.y);
+    curp.setLocation(curp.x, PApplet.parseFloat(tags[i]) + relp.y);
     refp.setLocation(curp.x, curp.y);
     return i;
   }