@babylonjs-toolkit/next 9.34.100 → 9.35.0

package/lib/scenemanager.js

@@ -143,7 +143,7 @@ import { UnityScrollBar } from './unityscrollbar';
 import { UnityDropdownMenu } from './unitydropdownmenu';
 import { RectAreaLight } from '@babylonjs/core/Lights/rectAreaLight';
 export class SceneManager {
-    static get Version() { return "9.34.100 - R1"; }
+    static get Version() { return "9.35.0 - R1"; }
     static get Copyright() { return "All rights reserved (c) 2024 Mackey Kinard"; }
     static IsPrecompilingShaders() {
         return SceneManager.PrecompileShaders !== false;
@@ -91739,6 +91739,7 @@ export class LightProbeNetwork extends ScriptComponent {
         }
         if (this._dynCount === 0)
             return;
+        this.dropDisposedEntries();
         this._walker.maxWalkSteps = LightProbeNetwork.MaxWalkSteps;
         for (let i = 0; i < this._dynCount; i++)
             this.sampleDynamic(i);
@@ -91901,10 +91902,10 @@ export class LightProbeNetwork extends ScriptComponent {
         const meshState = LightProbeNetwork.MeshState(mesh);
         meshState._tkLightProbeOwner = this;
         if (mesh.onDisposeObservable != null && meshState._tkLightProbeDisposeObserver == null) {
-            meshState._tkLightProbeDisposeObserver = mesh.onDisposeObservable.addOnce(() => {
+            meshState._tkLightProbeDisposeObserver = mesh.onDisposeObservable.add(() => {
                 meshState._tkLightProbeDisposeObserver = null;
-                this.detach(mesh);
-            });
+                this.detachDisposed(mesh);
+            }, undefined, true, undefined, true);
         }
         return true;
     }
@@ -91960,6 +91961,16 @@ export class LightProbeNetwork extends ScriptComponent {
             return;
         LightProbeNetwork.SetRider(mesh, toolkitMetadata, null);
         toolkitMetadata.lightProbeOcclusion = null;
+        toolkitMetadata.lightProbeSlot = -1;
+        this.releaseMesh(mesh, registryIndex);
+    }
+    detachDisposed(mesh) {
+        this.detach(mesh);
+        if (LightProbeNetwork.MeshState(mesh)._tkLightProbeOwner !== this)
+            return;
+        this.releaseMesh(mesh, this._dynMeshes.indexOf(mesh));
+    }
+    releaseMesh(mesh, registryIndex) {
         if (this._noEnvironment === true)
             LightProbeAmbient.ExcludeFromAmbient(this.scene, mesh, false);
         for (let lightIndex = 0; lightIndex < this._bakedLights.length; lightIndex++) {
@@ -91968,26 +91979,11 @@ export class LightProbeNetwork extends ScriptComponent {
             if (excludedIndex >= 0)
                 excluded.splice(excludedIndex, 1);
         }
-        if (registryIndex >= 0) {
-            const lastIndex = this._dynCount - 1;
-            if (registryIndex !== lastIndex) {
-                const moved = this._dynMeshes[lastIndex];
-                this._dynMeshes[registryIndex] = moved;
-                this._dynTet[registryIndex] = this._dynTet[lastIndex];
-                this._dynHasAnchor[registryIndex] = this._dynHasAnchor[lastIndex];
-                for (let axis = 0; axis < 3; axis++) {
-                    this._dynLast[registryIndex * 3 + axis] = this._dynLast[lastIndex * 3 + axis];
-                    this._dynAnchor[registryIndex * 3 + axis] = this._dynAnchor[lastIndex * 3 + axis];
-                }
-                moved.metadata.toolkit.lightProbeSlot = registryIndex;
-            }
-            this._dynMeshes[lastIndex] = null;
-            this._dynCount--;
-        }
-        else {
+        if (registryIndex >= 0)
+            this.removeDynamicEntry(registryIndex);
+        else
             this._staticCount--;
-        }
-        toolkitMetadata.lightProbeSlot = -1;
+        const meshState = LightProbeNetwork.MeshState(mesh);
         meshState._tkLightProbeOwner = null;
         if (meshState._tkLightProbeDisposeObserver != null) {
             if (mesh.onDisposeObservable != null)
@@ -91995,6 +91991,33 @@ export class LightProbeNetwork extends ScriptComponent {
             meshState._tkLightProbeDisposeObserver = null;
         }
     }
+    removeDynamicEntry(registryIndex) {
+        const lastIndex = this._dynCount - 1;
+        if (registryIndex !== lastIndex) {
+            const moved = this._dynMeshes[lastIndex];
+            this._dynMeshes[registryIndex] = moved;
+            this._dynTet[registryIndex] = this._dynTet[lastIndex];
+            this._dynHasAnchor[registryIndex] = this._dynHasAnchor[lastIndex];
+            for (let axis = 0; axis < 3; axis++) {
+                this._dynLast[registryIndex * 3 + axis] = this._dynLast[lastIndex * 3 + axis];
+                this._dynAnchor[registryIndex * 3 + axis] = this._dynAnchor[lastIndex * 3 + axis];
+            }
+            const movedToolkit = (moved.metadata != null) ? moved.metadata.toolkit : null;
+            if (movedToolkit != null)
+                movedToolkit.lightProbeSlot = registryIndex;
+        }
+        this._dynMeshes[lastIndex] = null;
+        this._dynCount--;
+    }
+    dropDisposedEntries() {
+        for (let i = this._dynCount - 1; i >= 0; i--) {
+            const mesh = this._dynMeshes[i];
+            const hasToolkitMetadata = (mesh.metadata != null && mesh.metadata.toolkit != null);
+            if (hasToolkitMetadata && !mesh.isDisposed())
+                continue;
+            this.releaseMesh(mesh, i);
+        }
+    }
     sampleMeshNow(mesh) {
         const tk = (mesh != null && mesh.metadata != null) ? mesh.metadata.toolkit : null;
         if (tk == null || tk.lightProbeSH == null)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@babylonjs-toolkit/next",
-    "version": "9.34.100",
+    "version": "9.35.0",
     "description": "Babylon Toolkit Runtime Library (ES6)",
     "author": "MackeyK24 <mackeyk24@gmail.com>",
     "main": "lib/index.js",
@@ -141,6 +141,10 @@
             "import": "./lib/contentinstaller.js",
             "types": "./lib/contentinstaller.d.ts"
         },
+        "./leaderboardclient": {
+            "import": "./lib/leaderboardclient.js",
+            "types": "./lib/leaderboardclient.d.ts"
+        },
         "./workers/bt-content-worker.js": "./lib/workers/bt-content-worker.js",
         "./package.json": "./package.json"
     },
@@ -165,23 +169,23 @@
         "lib/**/*"
     ],
     "devDependencies": {
-        "@babylonjs/core": "9.34.0",
-        "@babylonjs/gui": "9.34.0",
+        "@babylonjs/core": "9.35.0",
+        "@babylonjs/gui": "9.35.0",
         "@babylonjs/havok": "^1.3.14",
-        "@babylonjs/addons": "9.34.0",
-        "@babylonjs/loaders": "9.34.0",
-        "@babylonjs/materials": "9.34.0",
-        "@babylonjs/inspector": "9.34.0",
+        "@babylonjs/addons": "9.35.0",
+        "@babylonjs/loaders": "9.35.0",
+        "@babylonjs/materials": "9.35.0",
+        "@babylonjs/inspector": "9.35.0",
         "rimraf": "^6.0.1",
         "typescript": "^6.0.3"
     },
     "peerDependencies": {
-        "@babylonjs/core": "9.34.0",
-        "@babylonjs/gui": "9.34.0",
+        "@babylonjs/core": "9.35.0",
+        "@babylonjs/gui": "9.35.0",
         "@babylonjs/havok": "^1.3.14",
-        "@babylonjs/addons": "9.34.0",
-        "@babylonjs/loaders": "9.34.0",
-        "@babylonjs/materials": "9.34.0",
-        "@babylonjs/inspector": "9.34.0"
+        "@babylonjs/addons": "9.35.0",
+        "@babylonjs/loaders": "9.35.0",
+        "@babylonjs/materials": "9.35.0",
+        "@babylonjs/inspector": "9.35.0"
     }
 }