Completely reworked transform system

1 files changed, 112 insertions, 2 deletions

diff --git a/src/matrix.js b/src/matrix.js
index 2202011..fb61bf0 100644
--- a/src/matrix.js
+++ b/src/matrix.js
@@ -1,3 +1,113 @@
-SVG.Matrix = function() {
+SVG.Matrix = SVG.invent({
+	// Initialize
+	create: function(source) {
+		var i, base = arrayToMatrix([1, 0, 0, 1, 0, 0])
 
-}
\ No newline at end of file
+		// Ensure source as object
+		source = source.node && source.node.getCTM ?
+			source.node.getCTM() :
+		typeof source === 'string' ?
+			arrayToMatrix(source.replace(/\s/g, '').split(',')) :
+		arguments.length == 6 ?
+			arrayToMatrix([].slice.call(arguments)) :
+		typeof source === 'object' ?
+			source : base
+
+		// Merge source
+		for (i = abcdef.length - 1; i >= 0; i--)
+			this[abcdef[i]] = typeof source[abcdef[i]] === 'number' ?
+				source[abcdef[i]] : base[abcdef[i]]
+		
+	}
+	
+	// Add methods
+, extend: {
+		// Extract individual transformations
+	  extract: function() {
+			// Find transform points
+			var px = deltaTransformPoint(this, { x: 0, y: 1 })
+				, py = deltaTransformPoint(this, { x: 1, y: 0 })
+	
+			return {
+				// Translation
+				x: 				this.e
+			, y: 				this.f
+				// Skew
+			, skewX: 		180 / Math.PI * Math.atan2(px.y, px.x) - 90
+			, skewY: 		180 / Math.PI * Math.atan2(py.y, py.x)
+				// Scale
+			, scaleX: 	Math.sqrt(this.a * this.a + this.b * this.b)
+			, scaleY: 	Math.sqrt(this.c * this.c + this.d * this.d)
+				// Rotation
+			, rotation: this.skewX
+			}
+		}
+		// Multiply
+	, multiply: function(matrix) {
+			return new SVG.Matrix(this.native().multiply(matrix.native()))
+		}
+		// Inverse
+	, inverse: function() {
+			return new SVG.Matrix(this.native().inverse())
+		}
+		// Translate
+	, translate: function(x, y) {
+			return new SVG.Matrix(this.native().translate(x || 0, y || 0))	
+		}
+		// Scale
+	, scale: function(x, y, cx, cy) {
+			if (y == null)
+				return new SVG.Matrix(this.native().scale(x))
+			else
+				return new SVG.Matrix(this.native().scaleNonUniform(x, y))
+		}
+		// Rotate
+	, rotate: function(d, x, y) {
+			// Fall back to native rotate method 
+			if (x == null) return new SVG.Matrix(this.native().rotate(d))
+
+			// Convert degrees to radians
+			d = SVG.utils.radians(d)
+
+			return new SVG.Matrix(1, 0, 0, 1, x, y)
+				//.multiply(new SVG.Matrix(Math.cos(d), Math.sin(d), -Math.sin(d), Math.cos(d), 0, 0))
+				//.multiply(new SVG.Matrix(1, 0, 0, 1, -x, -y))
+		}
+		// Flip
+	, flip: function(a) {
+			return new SVG.Matrix(this.native()['flip' + a.toUpperCase()]())
+		}
+		// Skew
+	, skew: function(x, y) {
+			return new SVG.Matrix(this.native().skewX(x || 0).skewY(y || 0))
+		}
+		// Convert this to SVGMatrix
+	, native: function() {
+			// Create new matrix
+			var i, matrix = SVG.parser.draw.node.createSVGMatrix()
+	
+			// Update with current values
+			for (i = abcdef.length - 1; i >= 0; i--)
+				matrix[abcdef[i]] = this[abcdef[i]]
+
+			return matrix
+		}
+		// Convert array to string
+	, toString: function() {
+			return 'matrix(' + [this.a, this.b, this.c, this.d, this.e, this.f].join() + ')'
+		}
+	}
+
+	// Define parent
+, parent: SVG.Element
+
+	// Add parent method
+, construct: {
+		// Get current matrix
+		ctm: function() {
+			return new SVG.Matrix(this)
+		}
+	
+	}
+
+})
\ No newline at end of file