Merge branch 'master' of github.com:BabylonJS/Babylon.js

BabylonJS · Jul 2, 2024 · e40be02 · e40be02
2 parents 884d0f0 + 5ba3edc
commit e40be02
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/packages/dev/buildTools/src/declarationsEs6.ts b/packages/dev/buildTools/src/declarationsEs6.ts
@@ -6,6 +6,7 @@ import * as glob from "glob";
 export const declarationsEs6 = () => {
     const root = checkArgs(["--root", "-r"]) as string;
     const appendToFile = checkArgs(["--append-to-file", "-atf"]) as string;
+    const constEnumToEnum = checkArgs(["--const-enum-to-enum", "-cete"]) as boolean;
     // eslint-disable-next-line no-console
     console.log(`Declarations ES6: root: ${root}`, appendToFile ? `append to file: ${appendToFile}` : "");
 
@@ -24,4 +25,16 @@ declare global{
 ${mixins}
 }`;
     fs.writeFileSync(path.join(".", appendToFile), newContent);
+
+    if (constEnumToEnum) {
+        // iterate over all files in the current directory and change const enum to enum
+        // This can be done since we are exporting the enums to js as well
+        const files = glob.sync(path.join("./**/*.d.ts"));
+
+        files.forEach((file) => {
+            let content = fs.readFileSync(file, "utf8");
+            content = content.replace(/const enum/g, "enum");
+            fs.writeFileSync(file, content);
+        });
+    }
 };
diff --git a/packages/dev/core/src/Cameras/Inputs/flyCameraMouseInput.ts b/packages/dev/core/src/Cameras/Inputs/flyCameraMouseInput.ts
@@ -67,7 +67,6 @@ export class FlyCameraMouseInput implements ICameraInput<FlyCamera> {
     private _rollObserver: Nullable<Observer<Scene>>;
     private _previousPosition: Nullable<{ x: number; y: number }> = null;
     private _noPreventDefault: boolean | undefined;
-    private _element: HTMLElement;
 
     /**
      * Listen to mouse events to control the camera.
@@ -166,7 +165,6 @@ export class FlyCameraMouseInput implements ICameraInput<FlyCamera> {
 
             if (!this._noPreventDefault) {
                 e.preventDefault();
-                this._element.focus();
             }
 
             // This is required to move while pointer button is down

diff --git a/packages/dev/core/src/Collisions/gpuPicker.ts b/packages/dev/core/src/Collisions/gpuPicker.ts
@@ -90,6 +90,7 @@ export class GPUPicker {
     /**
      * Set the list of meshes to pick from
      * Set that value to null to clear the list (and avoid leaks)
+     * The module will read and delete from the array provided by reference. Disposing the module or setting the value to null will clear the array.
      * @param list defines the list of meshes to pick from
      */
     public setPickingList(list: Nullable<Array<AbstractMesh>>) {

diff --git a/packages/public/@babylonjs/core/config.tasks.json b/packages/public/@babylonjs/core/config.tasks.json
@@ -2,7 +2,7 @@
     "commands": [
         {
             "command": "declarations-es6",
-            "args": ["-r", "../../../dev/core/src/LibDeclarations", "-atf", "./Engines/engine.d.ts"]
+            "args": ["-r", "../../../dev/core/src/LibDeclarations", "-atf", "./Engines/engine.d.ts", "-cete"]
         },
         {
             "command": "add-js-to-es6"