1 files changed, 102 insertions, 21 deletions

diff --git a/src/proxyWorker.js b/src/proxyWorker.js
index cfe0c26e..4c397cbb 100644
--- a/src/proxyWorker.js
+++ b/src/proxyWorker.js
@@ -1,3 +1,7 @@
+function PropertyBag() {
+  this.addProperty = function(){};
+  this.removeProperty = function(){};
+};
 
 function EventListener() {
   this.listeners = {};
@@ -7,6 +11,14 @@ function EventListener() {
     this.listeners[event].push(func);
   };
 
+  this.removeEventListener = function(event, func) {
+    var list = this.listeners[event];
+    if (!list) return;
+    var me = list.indexOf(func);
+    if (me < 0) return;
+    list.splice(me, 1);
+  };
+
   this.fireEvent = function fireEvent(event) {
     event.preventDefault = function(){};
 
@@ -26,6 +38,10 @@ window.close = function window_close() {
   postMessage({ target: 'window', method: 'close' });
 };
 
+window.scrollX = window.scrollY = 0; // TODO: proxy these
+
+var webGLWorker = new WebGLWorker();
+
 var document = new EventListener();
 
 document.createElement = function document_createElement(what) {
@@ -39,28 +55,38 @@ document.createElement = function document_createElement(what) {
             height: canvas.height,
             data: new Uint8Array(canvas.width*canvas.height*4)
           };
-          postMessage({ target: 'canvas', op: 'resize', width: canvas.width, height: canvas.height });
+          if (canvas === Module['canvas']) {
+            postMessage({ target: 'canvas', op: 'resize', width: canvas.width, height: canvas.height });
+          }
         }
       };
-      canvas.getContext = function canvas_getContext(type) {
-        assert(type == '2d');
-        return {
-          getImageData: function(x, y, w, h) {
-            assert(x == 0 && y == 0 && w == canvas.width && h == canvas.height);
-            canvas.ensureData();
-            return {
-              width: canvas.data.width,
-              height: canvas.data.height,
-              data: new Uint8Array(canvas.data.data) // TODO: can we avoid this copy?
-            };
-          },
-          putImageData: function(image, x, y) {
-            canvas.ensureData();
-            assert(x == 0 && y == 0 && image.width == canvas.width && image.height == canvas.height);
-            canvas.data.data.set(image.data); // TODO: can we avoid this copy?
-            postMessage({ target: 'canvas', op: 'render', image: canvas.data });
-          }
-        };
+      canvas.getContext = function canvas_getContext(type, attributes) {
+        if (canvas === Module['canvas']) {
+          postMessage({ target: 'canvas', op: 'getContext', type: type, attributes: attributes });
+        }
+        if (type === '2d') {
+          return {
+            getImageData: function(x, y, w, h) {
+              assert(x == 0 && y == 0 && w == canvas.width && h == canvas.height);
+              canvas.ensureData();
+              return {
+                width: canvas.data.width,
+                height: canvas.data.height,
+                data: new Uint8Array(canvas.data.data) // TODO: can we avoid this copy?
+              };
+            },
+            putImageData: function(image, x, y) {
+              canvas.ensureData();
+              assert(x == 0 && y == 0 && image.width == canvas.width && image.height == canvas.height);
+              canvas.data.data.set(image.data); // TODO: can we avoid this copy?
+              if (canvas === Module['canvas']) {
+                postMessage({ target: 'canvas', op: 'render', image: canvas.data });
+              }
+            }
+          };
+        } else {
+          return webGLWorker;
+        }
       };
       canvas.boundingClientRect = {};
       canvas.getBoundingClientRect = function canvas_getBoundingClientRect() {
@@ -73,17 +99,42 @@ document.createElement = function document_createElement(what) {
           right: canvas.boundingClientRect.right
         };
       };
+      canvas.style = new PropertyBag();
+      canvas.exitPointerLock = function(){};
       return canvas;
     }
     default: throw 'document.createElement ' + what;
   }
 };
 
+document.documentElement = {};
+
+document.styleSheets = [{
+  cssRules: [], // TODO: forward to client
+  insertRule: function(rule, i) {
+    this.cssRules.splice(i, 0, rule);
+  }
+}];
+
+function Audio() {
+  Runtime.warnOnce('faking Audio elements, no actual sound will play');
+}
+
+Audio.prototype.play = function(){};
+Audio.prototype.pause = function(){};
+
+Audio.prototype.cloneNode = function() {
+  return new Audio;
+}
+
 if (typeof console === 'undefined') {
   var console = {
     log: function(x) {
       Module.printErr(x);
-    }
+    },
+    error: function(x) {
+      Module.printErr(x);
+    },
   };
 }
 
@@ -92,12 +143,33 @@ Module.canvas = document.createElement('canvas');
 Module.setStatus = function(){};
 
 Module.print = function Module_print(x) {
+  //dump('OUT: ' + x + '\n');
   postMessage({ target: 'stdout', content: x });
 };
 Module.printErr = function Module_printErr(x) {
+  //dump('ERR: ' + x + '\n');
   postMessage({ target: 'stderr', content: x });
 };
 
+// Browser hooks
+
+Browser.resizeListeners.push(function(width, height) {
+  postMessage({ target: 'canvas', op: 'resize', width: width, height: height });
+});
+
+// Frame throttling
+
+var frameId = 0;
+var clientFrameId = 0;
+
+var postMainLoop = Module['postMainLoop'];
+Module['postMainLoop'] = function() {
+  if (postMainLoop) postMainLoop();
+  // frame complete, send a frame id
+  postMessage({ target: 'tick', id: frameId++ });
+  commandBuffer = [];
+};
+
 // buffer messages until the program starts to run
 
 var messageBuffer = null;
@@ -122,6 +194,7 @@ onmessage = function onmessage(message) {
     }
     messageBuffer.push(message);
   }
+  //dump('worker got ' + JSON.stringify(message.data) + '\n');
   switch (message.data.target) {
     case 'document': {
       document.fireEvent(message.data.event);
@@ -139,6 +212,14 @@ onmessage = function onmessage(message) {
       } else throw 'ey?';
       break;
     }
+    case 'gl': {
+      webGLWorker.onmessage(message.data);
+      break;
+    }
+    case 'tock': {
+      clientFrameId = message.data.id;
+      break;
+    }
     default: throw 'wha? ' + message.data.target;
   }
 };