Included some bug fixes and performance improvements

tobitailor · Jan 30, 2010 · 5896327 · 5896327
1 parent 9baa8b2
commit 5896327
Show file tree

Hide file tree

Showing 12 changed files with 1,342 additions and 1,312 deletions.
diff --git a/demos/trip.html b/demos/trip.html
@@ -4,7 +4,6 @@
   <head>
     <title>Gordon: An open source Flash™ runtime written in pure JavaScript</title>
     <script type="text/javascript" src="../gordon.js"></script>
-    <script type="text/javascript" src="../src/Movie.js"></script>
   </head>
   <body onload="new Gordon.Movie('trip.swf', {id: 'stage', width: 500, height: 400})">
     <div id="stage"></div>

diff --git a/gordon.js b/gordon.js
@@ -9,11 +9,14 @@
 	var _g = Gordon = {};
 	var _loadedUrls = {};
 
-	var scripts = document.getElementsByTagName("script");
-	var i = scripts.length;
-	while(i--){
-		var match = scripts[i].src.match(/(^|.*\/)gordon\.js$/);
-		if(match){ _g.ROOT = match[1]; }
+	if(self.importScripts){ _g.ROOT = "../"; }
+	else{
+		var scripts = document.getElementsByTagName("script");
+		var i = scripts.length;
+		while(i--){
+			var match = scripts[i].src.match(/(^|.*\/)gordon\.js$/);
+			if(match){ _g.ROOT = match[1]; }
+		}
 	}
 
 	_g.xhr = function(){
@@ -25,17 +28,20 @@
 	_g.require = function(url){
 		if(!url.match(/\.([^\/]*)$/)){ url += ".js"; }
 		if(!_loadedUrls[url]){
-			with(_g.xhr("GET", _g.ROOT + url, false)){
-				send(null);
-				if(status == 200){
-					eval(responseText);
-					_loadedUrls[url] = true;
+			if(self.importScripts){ importScripts(_g.ROOT + url); }
+			else{
+				with(_g.xhr("GET", _g.ROOT + url, false)){
+					send(null);
+					if(200 == status){
+						eval(responseText);
+						_loadedUrls[url] = true;
+					}else{ throw new Error("Unable to load " + url + " status: " + status); }
 				}
-				else{ throw new Error("Unable to load " + url + " status: " + status); }
 			}
 		}
 	}
 })();
 
 Gordon.require("src/_base");
+Gordon.require("src/worker");
 Gordon.require("src/Movie");
diff --git a/src/Color.js b/src/Color.js
diff --git a/src/Cxform.js b/src/Cxform.js
diff --git a/src/Matrix.js b/src/Matrix.js