@woosh/meep-engine 2.31.4 → 2.31.5

package/core/process/worker/WorkerBuilder.js

@@ -5,19 +5,19 @@
 
 import { convertPathToURL } from "../../../engine/network/convertPathToURL.js";
 import WorkerProxy from "./WorkerProxy.js";
-import { extractTransferables } from "./extractTransferables.js";
+import LineBuilder from "../../codegen/LineBuilder.js";
 
 const RxMatchFunctionName = /(function\s*)([a-zA-Z0-9_]+)?(\s*\([^\]]*\)\s*\{.*)/g;
 
-const builtin_functions = [{
-    f: extractTransferables,
-    name: 'extractTransferables'
-}];
-
 const WorkerBuilder = function () {
     this.imports = [];
     this.methods = {};
     this.functions = [];
+    this.preable = new LineBuilder();
+};
+
+WorkerBuilder.prototype.addCode = function (code) {
+    this.preable.add(code);
 };
 
 /**
@@ -78,8 +78,10 @@ WorkerBuilder.prototype.build = function () {
         codeLines.push("globalScope.importScripts('" + url + "');");
     });
 
+    codeLines.push(this.preable.build());
+
     //handle functions
-    builtin_functions.concat(this.functions).forEach(function (spec) {
+    this.functions.forEach(function (spec) {
         const f = spec.f;
 
         const function_string = f.toString();
@@ -102,7 +104,23 @@ WorkerBuilder.prototype.build = function () {
 
     //api handler
     Array.prototype.push.apply(codeLines, [
-
+        `function extractTransferables(obj, result) {
+            if (typeof obj !== "object") {
+                return; //not an object, skip
+            } else if (obj instanceof ArrayBuffer) {
+                result.push(obj);
+            } else if (obj.buffer instanceof ArrayBuffer) {
+                result.push(obj.buffer);
+            } else if (obj instanceof ImageBitmap) {
+                result.push(obj);
+            } else {
+                for (var i in obj) {
+                    if (obj.hasOwnProperty(i)) {
+                        extractTransferables(obj[i], result);
+                    }
+                }
+            }
+        }`,
         'globalScope.onmessage = function(event){',
         '   var eventData = event.data;',
         '   var requestId = eventData.id',

package/engine/ecs/terrain/ecs/makeTerrainWorkerProxy.js

@@ -8,19 +8,19 @@ export function makeTerrainWorkerProxy() {
     const workerBuilder = new WorkerBuilder();
     workerBuilder.importScript('bundle-worker-terrain.js');
 
-    function useSampler(callback) {
-        if (globalScope.samplerHeight !== undefined) {
-            callback(globalScope.samplerHeight);
-        } else {
-            if (globalScope.useSampleCallbacks === undefined) {
-                globalScope.useSampleCallbacks = [callback];
+    workerBuilder.addCode(`
+        function useSampler(callback) {
+            if (globalScope.samplerHeight !== undefined) {
+                callback(globalScope.samplerHeight);
             } else {
-                globalScope.useSampleCallbacks.push(callback);
+                if (globalScope.useSampleCallbacks === undefined) {
+                    globalScope.useSampleCallbacks = [callback];
+                } else {
+                    globalScope.useSampleCallbacks.push(callback);
+                }
             }
         }
-    }
-
-    workerBuilder.importFunction('useSampler', useSampler);
+    `);
 
     workerBuilder.addMethod('computeHeightRange', function () {
         return new Promise(function (resolve, reject) {

package/package.json

@@ -4,7 +4,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.31.4",
+  "version": "2.31.5",
   "dependencies": {
     "fast-levenshtein": "2.0.6",
     "opentype.js": "1.3.3",