mage-engine 3.25.1 → 3.25.3

package/.claude/worktrees/fix-onstart-error-handling/eslint.config.js

@@ -0,0 +1,73 @@
+const eslint = require("@eslint/js");
+const prettier = require("eslint-plugin-prettier/recommended");
+const globals = require("globals");
+
+module.exports = [
+    {
+        ignores: [
+            "dist/",
+            "node_modules/",
+            "__mocks__/",
+            "config/",
+            "src/loaders/ColladaLoader.js",
+            "src/loaders/GLTFLoader.js",
+            "src/loaders/FBXLoader.js",
+            "src/lib/fflate.js",
+            "src/models/SkeletonUtils.js",
+            "src/controls/Orbit.js",
+            "src/controls/Transform.js",
+            "src/controls/TransformGizmo.js",
+            "src/fx/materials/Ocean.js",
+            "src/fx/materials/Water.old.js",
+            "src/fx/materials/Mirror.js",
+            "src/scripts/builtin/SmoothCameraFollow.js",
+        ],
+    },
+    eslint.configs.recommended,
+    prettier,
+    {
+        languageOptions: {
+            ecmaVersion: 2022,
+            sourceType: "module",
+            globals: {
+                ...globals.browser,
+                requestNextFrame: "readonly",
+                global: "readonly",
+            },
+        },
+        rules: {
+            "no-unused-vars": ["warn", { argsIgnorePattern: "^_", varsIgnorePattern: "^_" }],
+            "no-console": "off",
+            "no-dupe-class-members": "warn",
+            "no-empty": ["error", { allowEmptyCatch: true }],
+            "prettier/prettier": ["error", { endOfLine: "auto" }],
+        },
+    },
+    {
+        files: ["**/__tests__/**/*.js", "**/*.test.js"],
+        languageOptions: {
+            globals: {
+                ...globals.jest,
+                ...globals.commonjs,
+            },
+        },
+    },
+    {
+        files: ["src/physics/worker/**/*.js"],
+        languageOptions: {
+            globals: {
+                Ammo: "readonly",
+                postMessage: "readonly",
+                importScripts: "readonly",
+            },
+        },
+    },
+    {
+        files: ["src/lib/features.js"],
+        languageOptions: {
+            globals: {
+                ActiveXObject: "readonly",
+            },
+        },
+    },
+];

package/.claude/worktrees/fix-onstart-error-handling/jest.config.js

@@ -0,0 +1,31 @@
+"use strict";
+
+module.exports = {
+    roots: ["<rootDir>/src"],
+
+    testMatch: [
+        "**/__tests__/**/*.test.js",
+        "**/*.test.js",
+    ],
+
+    transform: {
+        "^.+\\.js$": "babel-jest",
+    },
+
+    transformIgnorePatterns: [
+        "/node_modules/(?!three/)",
+    ],
+
+    collectCoverageFrom: [
+        "src/lib/**/*.js",
+        "src/entities/**/*.js",
+        "src/models/**/*.js",
+        "src/physics/**/*.js",
+        "src/images/**/*.js",
+        "!src/lib/fflate.js",
+        "!src/lib/workers.js",
+        "!src/physics/worker/index.js",
+    ],
+
+    testEnvironment: "node",
+};

package/.claude/worktrees/fix-onstart-error-handling/package.json

@@ -0,0 +1,96 @@
+{
+    "name": "mage-engine",
+    "version": "3.25.1",
+    "description": "A WebGL Javascript Game Engine, built on top of THREE.js and many other libraries.",
+    "main": "dist/mage.js",
+    "author": {
+        "name": "Marco Stagni",
+        "email": "marco@mage.studio"
+    },
+    "scripts": {
+        "preversion": "npm test",
+        "version": "npm run build",
+        "dev": "concurrently 'npm:build:live' 'npm:start'",
+        "start": "http-server ./ -p 8085",
+        "postversion:push": "git push --no-verify && git push --tags --no-verify",
+        "postversion": "npm run postversion:push && npm publish",
+        "prebuild": "rimraf dist/mage.js",
+        "build": "rollup --config config/index.js",
+        "build:live": "rollup --config config/index.js --watch",
+        "test": "jest",
+        "test:watch": "jest --watch",
+        "test:coverage": "jest --coverage",
+        "lint": "eslint src",
+        "lint:fix": "eslint src --fix"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/MageStudio/Mage.git"
+    },
+    "license": "BSD-3-Clause",
+    "keywords": [
+        "mage",
+        "marco",
+        "stagni",
+        "three.js",
+        "webgl",
+        "game",
+        "engine",
+        "game engine",
+        "javascript",
+        "browser",
+        "shader"
+    ],
+    "dependencies": {
+        "@babel/plugin-transform-classes": "^7.9.5",
+        "@babel/plugin-transform-runtime": "7.5.0",
+        "@babel/runtime": "7.5.0",
+        "between.js": "0.1.2-fix.2",
+        "hotkeys-js": "^3.13.7",
+        "html-to-image": "^1.9.0",
+        "html2canvas": "^1.4.1",
+        "inferno": "7.3.2",
+        "inferno-create-element": "7.3.3",
+        "inferno-redux": "7.4.2",
+        "redux": "4.0.5",
+        "redux-thunk": "^2.3.0",
+        "rxjs": "6.5.3",
+        "three": "0.126.0",
+        "three.proton": "npm:three.proton.js@0.2.3",
+        "vivifyjs": "*",
+        "whatwg-fetch": "3.0.0",
+        "xstate": "^4.8.0"
+    },
+    "devDependencies": {
+        "@babel/cli": "7.17.3",
+        "@babel/core": "^7.29.0",
+        "@babel/node": "7.16.8",
+        "@babel/plugin-proposal-class-properties": "^7.18.6",
+        "@babel/polyfill": "7.12.1",
+        "@babel/preset-env": "^7.29.0",
+        "@babel/register": "7.17.0",
+        "@eslint/js": "^9.39.3",
+        "@rollup/plugin-babel": "5.3.1",
+        "@rollup/plugin-commonjs": "21.0.2",
+        "@rollup/plugin-json": "4.1.0",
+        "@rollup/plugin-node-resolve": "13.1.3",
+        "@rollup/plugin-replace": "^2.3.4",
+        "babel-jest": "^29.7.0",
+        "babel-loader": "8.2.3",
+        "babel-plugin-inferno": "6.3.0",
+        "babel-plugin-syntax-jsx": "^6.18.0",
+        "concurrently": "^5.3.0",
+        "eslint": "^9.39.3",
+        "eslint-config-prettier": "^10.1.8",
+        "eslint-plugin-prettier": "^5.5.5",
+        "globals": "^17.4.0",
+        "http-server": "^0.12.3",
+        "jest": "^29.7.0",
+        "madge": "^5.0.1",
+        "prettier": "^3.8.1",
+        "rimraf": "^3.0.0",
+        "rollup": "2.69.0",
+        "rollup-plugin-terser": "7.0.2",
+        "rollup-plugin-web-worker-loader": "1.6.1"
+    }
+}

package/dist/mage.js

@@ -53720,7 +53720,8 @@ const LIGHT_NOT_FOUND = `${PREFIX} This light was not created properly.`;
 const LIGHT_HOLDER_MODEL_NOT_FOUND = `${PREFIX} This light holder model can't be found.`;
 const SOUND_HOLDER_MODEL_NOT_FOUND = `${PREFIX} This sound holder model can't be found.`;
 const LABEL_DOMELEMENT_MISSING = `${PREFIX} Could not create Label, domElement is missing. Did you forget to set the this.element ref on your component?`;
-const NO_VALID_LEVEL_DATA_PROVIDED = `${PREFIX} No valid level data (json or url) provided`;/**! 
+const NO_VALID_LEVEL_DATA_PROVIDED = `${PREFIX} No valid level data (json or url) provided`;
+const THIRD_PERSON_CONTROL_TARGET_MISSING = `${PREFIX} ThirdPersonControl requires a target element. Please provide a valid target.`;/**! 
  * hotkeys-js v3.13.7 
  * A simple micro-library for defining and dispatching keyboard shortcuts. It has no dependencies. 
  * 
@@ -56475,10 +56476,16 @@ let Physics = /*#__PURE__*/function (_EventDispatcher) {
     value: function init() {
       if (Config$1.physics().enabled) {
         this.createWorker();
+
+        // Resolve ammo.js using MAGE_ASSETS_BASE_URL (same as models,
+        // images, and audio) so the path works identically in local
+        // preview and production.
+        const baseUrl = env.MAGE_ASSETS_BASE_URL;
+        const host = baseUrl ? `${getHostURL()}/${baseUrl}` : getHostURL();
         this.worker.postMessage({
           event: PHYSICS_EVENTS.LOAD.AMMO,
           ...Config$1.physics(),
-          host: getHostURL()
+          host
         });
         return new Promise(resolve => {
           const isWorkerReady = () => this.workerReady;
@@ -59038,6 +59045,10 @@ let ThirdPersonControl = /*#__PURE__*/function (_EventDispatcher) {
   return _createClass(ThirdPersonControl, [{
     key: "init",
     value: function init() {
+      if (!this.character) {
+        console.error(THIRD_PERSON_CONTROL_TARGET_MISSING);
+        return;
+      }
       this._onClick = this.onClick.bind(this);
       this._onMouseMove = this.onMouseMove.bind(this);
       this._onKeyDown = this.onKeyDown.bind(this);
@@ -59053,7 +59064,7 @@ let ThirdPersonControl = /*#__PURE__*/function (_EventDispatcher) {
 
       // In non-physics mode, use the character's starting Y as ground level
       // when no explicit value was provided, so it doesn't free-fall on start.
-      if (!this.hasPhysicsEnabled() && this.character) {
+      if (!this.hasPhysicsEnabled()) {
         const startY = this.character.getPosition().y;
         if (this.options.groundLevel === 0.5 && startY > 1) {
           this.options.groundLevel = startY;
@@ -59061,7 +59072,7 @@ let ThirdPersonControl = /*#__PURE__*/function (_EventDispatcher) {
         // Start grounded so the first jump works
         this.canJump = true;
       }
-      if (this.hasPhysicsEnabled() && this.character) {
+      if (this.hasPhysicsEnabled()) {
         this.addCharacterToPhysics();
       }
     }
@@ -59090,7 +59101,7 @@ let ThirdPersonControl = /*#__PURE__*/function (_EventDispatcher) {
   }, {
     key: "getCharacter",
     value: function getCharacter() {
-      return this.character || this.camera;
+      return this.character;
     }
 
     // --- Pointer Lock ---
@@ -59410,7 +59421,7 @@ let ThirdPersonControl = /*#__PURE__*/function (_EventDispatcher) {
   }, {
     key: "physicsUpdate",
     value: function physicsUpdate() {
-      if (this.hasPhysicsEnabled() && this.character) {
+      if (this.hasPhysicsEnabled()) {
         // Re-enable jumping when grounded AND space is released
         const grounded = this.character.getPhysicsState("grounded");
         if (grounded && !this.spaceHeld) {
@@ -59440,9 +59451,7 @@ let ThirdPersonControl = /*#__PURE__*/function (_EventDispatcher) {
       }
 
       // Always position camera relative to character
-      if (this.character) {
-        this.updateCameraPosition();
-      }
+      this.updateCameraPosition();
     }
   }]);
 }(EventDispatcher);let FlyControl = /*#__PURE__*/function (_EventDispatcher) {
@@ -59837,8 +59846,26 @@ let Controls = /*#__PURE__*/function (_EventDispatcher) {
     }
   }, {
     key: "setThirdPersonControls",
-    value: function setThirdPersonControls(options) {
+    value: async function setThirdPersonControls(options) {
       this.disposePreviousControls([CONTROLS.FPS, CONTROLS.FLY, CONTROLS.ORBIT]);
+
+      // Ensure the global physics system is initialised when the control
+      // requests physics.  The builder/preview config may not have enabled
+      // physics explicitly, so we enable it on-demand here.
+      if (options.physicsEnabled && !Config$1.physics().enabled) {
+        Config$1.physics().enabled = true;
+        await Physics$1.init();
+
+        // Entities loaded before physics was enabled had their
+        // enablePhysics() calls silently skipped.  Now that the
+        // worker is ready, add every entity that has pending
+        // physics options to the world.
+        Universe$1.forEach(element => {
+          if (element._physicsEnabled && !Physics$1.hasElement(element)) {
+            Physics$1.add(element, element.getPhysicsOptions());
+          }
+        });
+      }
       this.controls[CONTROLS.TPS] = new ThirdPersonControl(Scene$1.getCamera(), Scene$1.getDOMElement(), options);
       this.controls[CONTROLS.TPS].init();
       return this.controls[CONTROLS.TPS];
@@ -61268,7 +61295,7 @@ function applyMiddleware() {
 
 var thunk = createThunkMiddleware();
 thunk.withExtraArgument = createThunkMiddleware;var name = "mage-engine";
-var version$1 = "3.25.1";
+var version$1 = "3.25.3";
 var description = "A WebGL Javascript Game Engine, built on top of THREE.js and many other libraries.";
 var main = "dist/mage.js";
 var author$1 = {
@@ -64986,6 +65013,7 @@ let Element$1 = /*#__PURE__*/function (_Entity) {
     key: "enablePhysics",
     value: function enablePhysics(options = {}) {
       this.setPhysicsOptions(options);
+      this._physicsEnabled = true;
       if (Config$1.physics().enabled) {
         Physics$1.add(this, options);
       }
@@ -97047,7 +97075,7 @@ let Importer = /*#__PURE__*/function () {
                 }
                 resolve(this.getCurrentLevel());
               }).catch(reject);
-            });
+            }).catch(reject);
           });
         }
       });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mage-engine",
-    "version": "3.25.1",
+    "version": "3.25.3",
     "description": "A WebGL Javascript Game Engine, built on top of THREE.js and many other libraries.",
     "main": "dist/mage.js",
     "author": {