Installed Jasmin 2.0.1

1 files changed, 148 insertions, 109 deletions

diff --git a/src/matrix.js b/src/matrix.js
index e2afbef..91bcd8a 100644
--- a/src/matrix.js
+++ b/src/matrix.js
@@ -1,121 +1,160 @@
 SVG.Matrix = SVG.invent({
-	// Initialize
-	create: function(source) {
-		var i, base = arrayToMatrix([1, 0, 0, 1, 0, 0])
+  // Initialize
+  create: function(source) {
+    var i, base = arrayToMatrix([1, 0, 0, 1, 0, 0])
 
-		// Ensure source as object
-		source = 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
+    // ensure source as object
+    source = source && source.node && source.node.getCTM ?
+      source.node.getCTM() :
+    typeof source === 'string' ?
+      stringToMatrix(source) :
+    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
+    // 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, 0, 1)
-				, py 		= deltaTransformPoint(this, 1, 0)
-				, skewX = 180 / Math.PI * Math.atan2(px.y, px.x) - 90
-	
-			return {
-				// Translation
-				x: 				this.e
-			, y: 				this.f
-				// Skew
-			, skewX: 		skewX
-			, 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: 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) {
-			// Support universal scale
-			if (arguments.length == 1 || arguments.length == 3)
-				y = x
-			if (arguments.length == 3) {
-				cy = cx
-				cx = y
-			}
+    // Extract individual transformations
+    extract: function() {
+      // find delta transform points
+      var px    = deltaTransformPoint(this, 0, 1)
+        , py    = deltaTransformPoint(this, 1, 0)
+        , skewX = 180 / Math.PI * Math.atan2(px.y, px.x) - 90
+  
+      return {
+        // translation
+        x:        this.e
+      , y:        this.f
+        // skew
+      , skewX:    -skewX
+      , 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: skewX
+      }
+    }
+    // Clone matrix
+  , clone: function() {
+      return new SVG.Matrix(this)
+    }
+    // Morph one matrix into another
+  , morph: function(matrix) {
+      // store new destination
+      this.destination = new SVG.Matrix(matrix)
 
-			return this
-				.multiply(new SVG.Matrix(1, 0, 0, 1, cx || 0, cy || 0))
-				.multiply(new SVG.Matrix(x, 0, 0, y, 0, 0))
-				.multiply(new SVG.Matrix(1, 0, 0, 1, -cx || 0, -cy || 0))
-		}
-		// Rotate
-	, rotate: function(d, cx, cy) {
-			// Convert degrees to radians
-			d = SVG.utils.radians(d)
-			
-			return this
-				.multiply(new SVG.Matrix(1, 0, 0, 1, cx || 0, cy || 0))
-				.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, -cx || 0, -cy || 0))
-		}
-		// Flip
-	, flip: function(a) {
-			return new SVG.Matrix(this.native()['flip' + a.toUpperCase()]())
-		}
-		// Skew
-	, skew: function(x, y, cx, cy) {
-			// IMPLEMENT SKEW CENTER POINT
-			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 this
+    }
+    // Get morphed matrix at a given position
+  , at: function(pos) {
+      // make sure a destination is defined
+      if (!this.destination) return this
 
-			return matrix
-		}
-		// Convert array to string
-	, toString: function() {
-			return 'matrix(' + [this.a, this.b, this.c, this.d, this.e, this.f].join() + ')'
-		}
-	}
+      // calculate morphed matrix at a given position
+      return new SVG.Matrix({
+        a: this.a + (this.destination.a - this.a) * pos
+      , b: this.b + (this.destination.b - this.b) * pos
+      , c: this.c + (this.destination.c - this.c) * pos
+      , d: this.d + (this.destination.d - this.d) * pos
+      , e: this.e + (this.destination.e - this.e) * pos
+      , f: this.f + (this.destination.f - this.f) * pos
+      })
+    }
+    // Multiplies by given matrix
+  , multiply: function(matrix) {
+      return new SVG.Matrix(this.native().multiply(parseMatrix(matrix).native()))
+    }
+    // Adds given matrix
+  , add: function(matrix) {
+      matrix = parseMatrix(matrix)
 
-	// Define parent
+      return new SVG.Matrix({
+        a: this.a + matrix.a - 1
+      , b: this.b + matrix.b
+      , c: this.c + matrix.c
+      , d: this.d + matrix.d - 1
+      , e: this.e + matrix.e
+      , f: this.f + matrix.f
+      })
+    }
+    // Inverses matrix
+  , inverse: function() {
+      return new SVG.Matrix(this.native().inverse())
+    }
+    // Translate matrix
+  , translate: function(x, y) {
+      return new SVG.Matrix(this.native().translate(x || 0, y || 0))  
+    }
+    // Scale matrix
+  , scale: function(x, y, cx, cy) {
+      // support universal scale
+      if (arguments.length == 1 || arguments.length == 3)
+        y = x
+      if (arguments.length == 3) {
+        cy = cx
+        cx = y
+      }
+
+      return this
+        .multiply(new SVG.Matrix(1, 0, 0, 1, cx || 0, cy || 0))
+        .multiply(new SVG.Matrix(x, 0, 0, y, 0, 0))
+        .multiply(new SVG.Matrix(1, 0, 0, 1, -cx || 0, -cy || 0))
+    }
+    // Rotate matrix
+  , rotate: function(d, cx, cy) {
+      // convert degrees to radians
+      d = SVG.utils.radians(d)
+      
+      return this
+        .multiply(new SVG.Matrix(1, 0, 0, 1, cx || 0, cy || 0))
+        .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, -cx || 0, -cy || 0))
+    }
+    // Flip matrix on x or y
+  , flip: function(a) {
+      return new SVG.Matrix(this.native()['flip' + a.toUpperCase()]())
+    }
+    // Skew
+  , skew: function(x, y, cx, cy) {
+      // IMPLEMENT SKEW CENTER POINT
+      return new SVG.Matrix(this.native().skewX(x || 0).skewY(y || 0))
+    }
+    // Convert to native 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 matrix 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
+  // Add parent method
 , construct: {
-		// Get current matrix
-		ctm: function() {
-			return new SVG.Matrix(this)
-		}
-	
-	}
+    // Get current matrix
+    ctm: function() {
+      return new SVG.Matrix(this)
+    }
+  
+  }
 
 })
\ No newline at end of file