diff --git a/candy/src/processing/candy/BaseObject.java b/candy/src/processing/candy/BaseObject.java index 5530265b1..cc024139b 100644 --- a/candy/src/processing/candy/BaseObject.java +++ b/candy/src/processing/candy/BaseObject.java @@ -83,7 +83,11 @@ public class BaseObject extends PShape { String transformStr = properties.getStringAttribute("transform"); if (transformStr != null) { float[] t = parseMatrix(transformStr); - matrix = new PMatrix3D(t[0], t[1], t[2], t[3], t[4], t[5]); + //matrix = new PMatrix2D(t[0], t[1], t[2], t[3], t[4], t[5]); + matrix = new PMatrix3D(t[0], t[2], 0, t[4], + t[1], t[3], 0, t[5], + 0, 0, 1, 0, + 0, 0, 0, 1); } parseColors(properties); diff --git a/candy/src/processing/candy/Circle.java b/candy/src/processing/candy/Circle.java index a075c0a42..aafe61ffb 100644 --- a/candy/src/processing/candy/Circle.java +++ b/candy/src/processing/candy/Circle.java @@ -11,8 +11,8 @@ public class Circle extends BaseObject { super(parent, properties); this.x = properties.getFloatAttribute("cx"); this.y = properties.getFloatAttribute("cy"); - float radius = properties.getFloatAttribute("r") * 2; - width = height = radius; + float radius = properties.getFloatAttribute("r"); + width = height = radius * 2; } diff --git a/candy/src/processing/candy/SVG.java b/candy/src/processing/candy/SVG.java index 8dd56fc65..ca05f31ca 100755 --- a/candy/src/processing/candy/SVG.java +++ b/candy/src/processing/candy/SVG.java @@ -190,6 +190,7 @@ public class SVG extends BaseObject { } //root = new Group(null, svg); + parseGroup(svg); // ? }