Greatly improved support for matrices and matrix transformations.

Author: jabbany

.idea/workspace.xml

@@ -7,12 +7,20 @@ clean:
 definitions:
 	tsc -d --target ES5 src/api/Runtime/Runtime.ts --out src/api/Runtime.d.ts
 	tsc -d --target ES5 src/api/Player/Player.ts --out src/api/Player.d.ts
+
+compile: compile-ts compile-host
+	
+compile-host:
+	cp src/*.js build/
+	cp src/api/*.js build/api/
+	cp src/api/Tween/Tween.js build/api/
+	cat build/Host.js build/Unpacker.js > build/_Host.js
+	rm -f build/Unpacker.js
+	rm -f build/Host.js
+	mv build/_Host.js build/Host.js
 
-compile:
+compile-ts:
 	tsc --target ES5 src/api/Display/Display.ts --out build/api/Display.js
 	tsc --target ES5 src/api/Runtime/Runtime.ts --out build/api/Runtime.js
 	tsc --target ES5 src/api/Player/Player.ts --out build/api/Player.js
 	tsc --target ES5 src/api/Utils/Utils.ts --out build/api/Utils.js
-	cp src/*.js build/
-	cp src/api/*.js build/api/
-	cp src/api/Tween/Tween.js build/api/

build/CommentCoreLibrary.js

@@ -51,7 +51,7 @@ var CCLScripting = function(workerUrl){
 				scripter.logger.error("Object not found.");
 				return;
 			}
-			if(!objects[objectId][propName]){
+			if(objects[objectId][propName] === undefined){
 				scripter.logger.error("Property \"" + propName 
 					+ "\" not defined for object of type " + 
 					objects[objectId].getClass() +".");
@@ -276,6 +276,9 @@ var CCLScripting = function(workerUrl){
 			self.getContext().updateProperty(pl.id, pl.name, pl.value);
 		});
 	};
+})();
+/** Define some Unpackers **/
+(function(){
 	/** This is the DOM Manipulation Library **/
 	var _ = function (type, props, children, callback) {
 		var elem = null;
@@ -308,7 +311,6 @@ var CCLScripting = function(workerUrl){
 		}
 		return elem;
 	};
-	/** Define some unpackers **/
 	var ScriptingContext = CCLScripting.prototype.ScriptingContext;
 	ScriptingContext.prototype.Unpack.TextField = function(stage, data, ctx){
 		this.DOM = _("div",{
@@ -417,9 +419,9 @@ var CCLScripting = function(workerUrl){
 				"width":"100%",
 				"height":"100%"
 		}});
-		this.x = data.x ? data.x : 0;
-		this.y = data.y ? data.y : 0;
-		this.alpha = data.alpha ? data.alpha : 1;
+		this._x = data.x ? data.x : 0;
+		this._y = data.y ? data.y : 0;
+		this._alpha = data.alpha ? data.alpha : 1;
 		// Helpers
 		var __ = function(e, attr){
 			if(typeof e === "string"){
@@ -437,12 +439,28 @@ var CCLScripting = function(workerUrl){
 		};
 		var defaultEffects = __("defs");
 		var defaultGroup = __("g",{
-			"transform":"translate(" + this.x + "," + this.y + ")",
-			"opacity":this.alpha,
+			"transform":"translate(" + this._x + "," + this._y + ")",
+			"opacity":this._alpha,
 		});
+		var defaultGroupWithEffects = defaultGroup;
 		this.DOM.appendChild(defaultEffects);
 		this.DOM.appendChild(defaultGroup);
 
+		/** PROPS **/
+		this.__defineSetter__("x", function(f){
+			this.setX(f);
+		});
+		this.__defineSetter__("y", function(f){
+			this.setY(f);
+		});
+		this.__defineGetter__("x", function(f){
+			return this._x;
+		});
+		this.__defineGetter__("y", function(f){
+			return this._y;
+		});
+		/** /PROPS **/
+		
 		this.line = {
 			width:0,
 			color:"#ffffff",
@@ -489,17 +507,17 @@ var CCLScripting = function(workerUrl){
 		this.setX = function(x){
 			if(!x)
 				return;
-			this.x = x;
+			this._x = x;
 			__(defaultGroup,{
-				"transform":"translate(" + this.x + "," + this.y + ")"
+				"transform":"translate(" + this._x + "," + this._y + ")"
 			});
 		};
 		this.setY = function(y){
 			if(!y)
 				return;
-			this.y = y;
+			this._y = y;
 			__(defaultGroup,{
-				"transform":"translate(" + this.x + "," + this.y + ")"
+				"transform":"translate(" + this._x + "," + this._y + ")"
 			});
 		};
 		this.moveTo = function(params){
@@ -612,6 +630,24 @@ var CCLScripting = function(workerUrl){
 			defaultGroup.appendChild(e);
 		};
 
+		this.drawTriangles = function(params){
+			if(params[1].length % 3 !== 0){
+				throw new Error("Illegal drawTriangles index argument. Indices array size must be a multiple of 3.");
+			}
+			for(var i = 0; i < params[1].length / 3; i++){
+				var a = params[1][3 * i],
+					b = params[1][3 * i + 1],
+					c = params[1][3 * i + 2];
+				var ax = params[0][2 * a], ay = params[0][2 * a + 1];
+				var bx = params[0][2 * b], by = params[0][2 * b + 1];
+				var cx = params[0][2 * c], cy = params[0][2 * c + 1];
+				this.moveTo([ax,ay]);
+				this.lineTo([bx,by]);
+				this.lineTo([cx,cy]);
+				this.lineTo([ax,ay]);
+			}
+		};
+		
 		this.clear = function(){
 			defaultGroup.innerHTML = "";
 		};
@@ -653,7 +689,7 @@ var CCLScripting = function(workerUrl){
 							0,0,0,cR,0,
 							0,0,0,cG,0,
 							0,0,0,cB,0,
-							0,0,0,1,0
+							0,0,0,0,1,
 						];
 						dFilter.appendChild(__("feColorMatrix",{
 							"type":"matrix",
@@ -679,7 +715,7 @@ var CCLScripting = function(workerUrl){
 			// Add new filters
 			this.DOM.appendChild(defaultEffects);
 			// Apply filters
-			this.DOM.removeChild(defaultGroup);
+			this.DOM.removeChild(defaultGroupWithEffects);
 			var tGroup = defaultGroup;
 			for(var i = 0; i < filters.length; i++){
 				var layeredG = __("g",{
@@ -689,6 +725,7 @@ var CCLScripting = function(workerUrl){
 				tGroup = layeredG;
 			}
 			this.DOM.appendChild(tGroup);
+			defaultGroupWithEffects = tGroup;
 		};
 
 		this.unload = function(){