Added more matrix support to the Display abstraction

Author: jabbany

src/scripting/build/Host.js

@@ -611,6 +611,11 @@ var CCLScripting = function(workerUrl){
 			applyStroke(e, this);
 			defaultGroup.appendChild(e);
 		};
+		
+		this.clear = function(){
+			defaultGroup.innerHTML = "";
+		};
+		
 		this.__defineGetter__("filters", function(f){
 			return [];
 		});

src/scripting/src/Host.js

@@ -611,6 +611,11 @@ var CCLScripting = function(workerUrl){
 			applyStroke(e, this);
 			defaultGroup.appendChild(e);
 		};
+		
+		this.clear = function(){
+			defaultGroup.innerHTML = "";
+		};
+		
 		this.__defineGetter__("filters", function(f){
 			return [];
 		});

src/scripting/src/Host/Host.ts

@@ -0,0 +1,35 @@
+/**
+ * General Host Engine for CCLScripter
+ * Author: Jim Chen
+ */
+interface Logger{
+	log(msg:any):void;
+	error(msg:any):void;
+	warn(msg:any):void;
+}
+
+export class CCLScripting{
+	public version:number = 1;
+	public workerUrl:string;
+	public logger:Logger = {
+		log:(msg:any) => {console.log(msg);},
+		error:(msg:any) => {console.error(msg);},
+		warn:(msg:any) => {console.warn(msg);}
+	};
+
+	constructor(url:string){
+		this.workerUrl = url;
+	}
+
+	public getWorker():Worker{
+		return new Worker(this.workerUrl);
+	}
+
+	public getScriptingContext(){
+
+	}
+
+	public getSandbox(){
+
+	}
+}

src/scripting/src/Host/Unpacker/Button.ts

@@ -0,0 +1,8 @@
+/**
+ * Created by jim on 6/23/14.
+ */
+module Unpacker{
+	export class Button{
+
+	}
+}

src/scripting/src/Host/Unpacker/DisplayObject.ts

@@ -0,0 +1,3 @@
+/**
+ * Created by jim on 6/23/14.
+ */

src/scripting/src/Host/Unpacker/Shape.ts

@@ -0,0 +1,9 @@
+/**
+ * Created by jim on 6/23/14.
+ */
+
+module Unpacker{
+	export class Shape{
+
+	}
+}

src/scripting/src/Host/Unpacker/Sprite.ts

@@ -0,0 +1,8 @@
+/**
+ * Created by jim on 6/23/14.
+ */
+module Unpacker{
+	export class Sprite{
+
+	}
+}

src/scripting/src/Host/Unpacker/TextField.ts

@@ -0,0 +1,8 @@
+/**
+ * Created by jim on 6/23/14.
+ */
+module Unpacker{
+	export class TextField{
+
+	}
+}

src/scripting/src/api/Display/DisplayObject.ts

@@ -9,9 +9,10 @@
 module Display {
 	class Transform implements ISerializable {
 		private _parent:DisplayObject;
+		private _scaleX:number;
+		private _scaleY:number;
 		private _matrix:Display.Matrix = new Matrix();
 		private _matrix3d:Display.Matrix3D = null;
-		private _m;
 
 		constructor(parent:DisplayObject) {
 			this._parent = parent;
@@ -39,8 +40,31 @@ module Display {
 			this._parent.transform = this;
 		}
 
+		/**
+		 * Returns the working matrix as a serializable object
+		 * @returns {*} Serializable Matrix
+		 */
+		public getMatrix():Display.ISerializable{
+			if(this._matrix){
+				return this._matrix;
+			}else{
+				return this._matrix3d;
+			}
+		}
+
+		/**
+		 * Returns matrix type in use
+		 * @returns {string} - "2d" or "3d"
+		 */
+		public getMatrixType():string{
+			return this._matrix ? "2d" : "3d";
+		}
+
 		public serialize():Object {
-			return {};
+			return {
+				"mode":this.getMatrixType(),
+				"matrix":this.getMatrix()
+			};
 		}
 
 	}

src/scripting/src/api/Display/Matrix.ts

@@ -5,21 +5,63 @@
  */
 
 module Display {
-	export class Matrix {
+	export class Matrix implements Display.ISerializable {
 		private _data:Array<number>;
 
 		constructor(a:number = 1, b:number = 0, c:number = 0, d:number = 1, tx:number = 0, ty:number = 0) {
 			this._data = [a, c, tx, b, d, ty, 0, 0, 1];
 		}
 
+		private dotProduct(o:Array<number>):Array<number>{
+			if(other.length < 9){
+				throw new Error("Matrix dot product expects a matrix");
+			}
+			var res:Array<number> = [0,0,0,0,0,0,0,0,0];
+			for(var i = 0; i < 3; i++){
+				for(var j = 0; j < 3; j++){
+					for(var k = 0; k < 3; k++){
+						res[i * 3 + j] += this._data[i * 3 + k] * o[k * 3 + j];
+					}
+				}
+			}
+			return res;
+		}
+
 		public setTo(a:number = 1, b:number = 0, c:number = 0, d:number = 1, tx:number = 0, ty:number = 0):void {
 			this._data = [a, c, tx, b, d, ty, 0, 0, 1];
 		}
 
+		public translate(tX:number, tY:number):void{
+			this._data[2] += tX;
+			this._data[5] += tY;
+		}
+
+		public rotate(q:number):void{
+			this._data = this.dotProduct([
+				Math.cos(q), -Math.sin(q), 0,
+				Math.sin(q), Math.cos(q), 0,
+				0, 0, 1
+			]);
+		}
+
+		public scale(sx:number, sy:number):void{
+			this._data = this.dotProduct([
+				sx, 0, 0,
+				0, sy, 0,
+				0,  0, 1
+			]);
+		}
+
 		public identity():void {
 			this.setTo(1, 0, 0, 1, 0, 0);
 		}
 
+		public createBox(sX:number, sY:number, q:number, tX:number, tY:number):void{
+			this.identity();
+			this.rotate(q);
+			this.scale(sX, sY);
+			this.translate(tX,tY);
+		}
 		public clone():Matrix {
 			var a:number = this._data[0],
 				b:number = this._data[3],
@@ -29,9 +71,13 @@ module Display {
 				ty:number = this._data[5];
 			return new Matrix(a, b, c, d, tx, ty);
 		}
+
+		public serialize():Object{
+			return this._data;
+		}
 	}
 
-	export class Matrix3D {
+	export class Matrix3D implements Display.ISerializable {
 		private _data:Array<number>;
 
 		constructor(iv:Array<number> = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]) {
@@ -50,6 +96,10 @@ module Display {
 		public clone():Matrix3D {
 			return new Matrix3D(this._data);
 		}
+
+		public serialize():Object{
+			return this._data;
+		}
 	}
 
 	export function createMatrix():any {
@@ -68,6 +118,14 @@ module Display {
 		return null;
 	}
 
+	export function projectVector(matrix:Matrix3D, vector:Array<number>):any{
+		return [];
+	}
+
+	export function projectVectors(matrix:Matrix3D, verts:Array<number>, projectedVerts:Array<number>, uvts:Array<number>):void{
+		
+	}
+
 	/**
 	 * Transforms a JS Array into an AS3 Vector<int>.
 	 *   Nothing is actually done since the methods are very