- Transformation stuff

src/Phim/Canvas/LayerInterface.php

@@ -32,42 +32,4 @@ public function add(ShapeInterface $shape);
      * @return $this
      */
     public function remove(ShapeInterface $shape);
-
-    /**
-     * @return TransformationInterface[]
-     */
-    public function getTransformations();
-
-    /**
-     * @param TransformationInterface $transformation
-     *
-     * @return $this
-     */
-    public function addTransformation(TransformationInterface $transformation);
-
-    /**
-     * @param TransformationInterface $transformation
-     *
-     * @return $this
-     */
-    public function removeTransformation(TransformationInterface $transformation);
-
-    /**
-     * @return FilterInterface[]
-     */
-    public function getFilters();
-
-    /**
-     * @param FilterInterface $filter
-     *
-     * @return $this
-     */
-    public function addFilter(FilterInterface $filter);
-
-    /**
-     * @param FilterInterface $filter
-     *
-     * @return $this
-     */
-    public function removeFilter(FilterInterface $filter);
 }

src/Phim/Canvas/LayerTrait.php

@@ -10,8 +10,6 @@ trait LayerTrait
 {
 
     private $shapes = [];
-    private $transformations = [];
-    private $filters = [];
 
     public function getShapes()
     {
@@ -37,54 +35,4 @@ public function remove(ShapeInterface $shape)
 
         return $this;
     }
-
-    public function getTransformations()
-    {
-
-        return $this->transformations;
-    }
-
-    public function addTransformation(TransformationInterface $transformation)
-    {
-
-        $this->transformations[] = $transformation;
-
-        return $this;
-    }
-
-    public function removeTransformation(TransformationInterface $transformation)
-    {
-
-        $this->transformations = array_filter($this->transformations, function (TransformationInterface $t) use ($transformation) {
-
-            return $t !== $transformation;
-        });
-
-        return $this;
-    }
-
-    public function getFilters()
-    {
-
-        return $this->filters;
-    }
-
-    public function addFilter(FilterInterface $filter)
-    {
-
-        $this->filters[] = $filter;
-
-        return $this;
-    }
-
-    public function removeFilter(FilterInterface $filter)
-    {
-
-        $this->filters = array_filter($this->filters, function (FilterInterface $f) use ($filter) {
-
-            return $f !== $filter;
-        });
-
-        return $this;
-    }
 }

src/Phim/CanvasTrait.php

@@ -3,31 +3,58 @@
 namespace Phim;
 
 use Phim\Canvas\Layer;
+use Phim\Canvas\LayerInterface;
 
+/**
+ * Class CanvasTrait
+ *
+ * @package Phim
+ */
 trait CanvasTrait
 {
     use SizeTrait;
-
+
+    /**
+     * @var LayerInterface[]
+     */
     private $layers = [];
-
+
+    /**
+     * @return LayerInterface[]
+     */
     public function getLayers()
     {
 
         return $this->layers;
     }
 
+    /**
+     * @param $name
+     *
+     * @return bool
+     */
     public function hasLayer($name)
     {
 
         return isset($this->layers[$name]);
     }
 
+    /**
+     * @param $name
+     *
+     * @return LayerInterface
+     */
     public function getLayer($name)
     {
 
         return $this->layers[$name];
     }
 
+    /**
+     * @param $name
+     *
+     * @return LayerInterface
+     */
     public function createLayer($name)
     {
 

src/Phim/Engine/GdEngine.php

@@ -8,6 +8,10 @@
 use Phim\Format\PngFormat;
 use Phim\FormatInterface;
 use Phim\Path\AnchorInterface;
+use Phim\PathInterface;
+use Phim\Point;
+use Phim\PointInterface;
+use Phim\StyleInterface;
 
 class GdEngine implements EngineInterface
 {
@@ -33,6 +37,40 @@ private function allocate($im, ColorInterface $color)
         return imagecolorallocatealpha($im, $color->getRed(), $color->getGreen(), $color->getBlue(), (int)((1 - $color->getAlpha()) * 127));
     }
 
+    /**
+     * @param PathInterface  $path
+     * @param StyleInterface $style
+     *
+     * @return AnchorInterface[]
+     *
+     */
+    private function transformPathAnchors(PathInterface $path, StyleInterface $style)
+    {
+
+        $anchors = $path->getAnchors();
+        $origin = $style->getTransformOrigin();
+        $transformations = $style->getTransformations();
+
+        if ($origin) {
+
+            $bounds = $path->getBounds();
+
+            //Map relative values to absolute values
+            $origin = new Point($bounds->getWidth() * $origin->getX(), $bounds->getHeight() * $origin->getY());
+        }
+
+        return array_map(function (AnchorInterface $anchor) use ($transformations, $origin) {
+
+            //Transform the anchor
+            foreach ($transformations as $transformation) {
+
+                $anchor = $transformation->transformAnchor($anchor, $origin);
+            }
+
+            return $anchor;
+        }, $anchors);
+    }
+
     public function render(CanvasInterface $canvas, FormatInterface $format)
     {
 
@@ -58,13 +96,13 @@ public function render(CanvasInterface $canvas, FormatInterface $format)
                 imagesetthickness($im, $style->getStrokeWidth());
 
                 $path = $shape->getPath();
+                $anchors = $this->transformPathAnchors($path, $style);
 
-                //Convert anchors to simple polygon points for starters
+                //Convert anchors to simple polygon points for GD for starters
                 $points = [];
-                $count = count($path->getAnchors());
-                foreach ($path->getAnchors() as $anchor) {
+                $count = count($anchors);
+                foreach ($anchors as $anchor) {
 
-                    //TODO: Apply transformations here
                     //TODO: Apply positionFilters here
                     $points[] = $anchor->getX();
                     $points[] = $anchor->getY();
@@ -84,7 +122,7 @@ public function render(CanvasInterface $canvas, FormatInterface $format)
                     //As imagepolygon doesn't draw open polygons and imageopenpolygon is too new, we iterate the anchors and draw lines
                     /** @var AnchorInterface $context */
                     $context = null;
-                    foreach ($path->getAnchors() as $anchor) {
+                    foreach ($anchors as $anchor) {
 
                         if ($context) {
 

src/Phim/FactoryInterface.php

@@ -52,7 +52,7 @@ public function size($width, $height);
      *
      * @return StyleInterface
      */
-    public function style(array $options);
+    public function style(array $options = null);
 
     /**
      * @param array               $points

src/Phim/FactoryTrait.php

@@ -34,7 +34,7 @@ public function image($path)
         //TODO: implement
     }
 
-    public function style(array $options)
+    public function style(array $options = null)
     {
 
         return new Style($options);

src/Phim/Geometry/RectangleInterface.php

@@ -27,4 +27,6 @@ public function getRightBottom();
     public function setRightBottom(PointInterface $rightBottom);
     public function getLeftBottom();
     public function setLeftBottom(PointInterface $leftBottom);
+
+    public function getCenter();
 }

src/Phim/Geometry/RectangleTrait.php

@@ -130,6 +130,12 @@ public function setLeftBottom(PointInterface $leftBottom)
         return $this;
     }
 
+    public function getCenter()
+    {
+
+        return new Point($this->getX() + $this->getWidth() / 2, $this->getY() + $this->getHeight() / 2);
+    }
+
     public function toPath()
     {
 

src/Phim/Path/Anchor.php

@@ -3,6 +3,7 @@
 namespace Phim\Path;
 
 use Phim\PointInterface;
+use Phim\TransformationInterface;
 
 class Anchor implements AnchorInterface
 {

src/Phim/PathInterface.php

@@ -2,6 +2,7 @@
 
 namespace Phim;
 
+use Phim\Geometry\RectangleInterface;
 use Phim\Path\AnchorInterface;
 
 /**
@@ -30,4 +31,9 @@ public function addAnchor(AnchorInterface $anchor);
      * @return $this
      */
     public function removeAnchor(AnchorInterface $anchor);
+
+    /**
+     * @return RectangleInterface
+     */
+    public function getBounds();
 }

src/Phim/PathTrait.php

@@ -2,11 +2,15 @@
 
 namespace Phim;
 
+use Phim\Geometry\Rectangle;
 use Phim\Path\AnchorInterface;
 
 trait PathTrait
 {
 
+    /**
+     * @var AnchorInterface[]
+     */
     private $anchors = [];
 
     public function getAnchors()
@@ -33,4 +37,32 @@ public function removeAnchor(AnchorInterface $anchor)
 
         return $this;
     }
+
+    public function getBounds()
+    {
+
+        $lowestX = $highestX = $lowestY = $highestY = null;
+
+        foreach ($this->anchors as $anchor) {
+
+            if ($lowestX === null || $anchor->getX() < $lowestX)
+                $lowestX = $anchor->getX();
+
+            if ($highestX === null || $anchor->getX() > $highestX)
+                $highestX = $anchor->getX();
+
+            if ($lowestY === null || $anchor->getY() < $lowestY)
+                $lowestY = $anchor->getY();
+
+            if ($highestY === null || $anchor->getY() > $highestY)
+                $highestY = $anchor->getY();
+        }
+
+        return new Rectangle(
+            $lowestX,
+            $lowestY,
+            $highestX - $lowestX,
+            $highestY - $lowestY
+        );
+    }
 }