angular-three 1.7.0 → 1.7.2

package/fesm2020/angular-three.mjs

@@ -894,6 +894,27 @@ class NgtStore extends NgtRxStore {
             this.set({ ready: true });
         this.invalidate();
     }
+    destroy(canvas) {
+        this.set((state) => ({
+            internal: { ...state.internal, active: false },
+        }));
+        setTimeout(() => {
+            const { gl, xr, events } = this.get();
+            if (gl) {
+                if (events.disconnect) {
+                    events.disconnect();
+                }
+                gl.renderLists.dispose();
+                gl.forceContextLoss();
+                if (gl.xr && gl.xr.enabled) {
+                    gl.xr.setAnimationLoop(null);
+                    xr.disconnect();
+                }
+                dispose(this.get());
+                rootStateMap.delete(canvas);
+            }
+        }, 500);
+    }
     resize() {
         const state = this.get();
         let oldSize = state.size;
@@ -937,6 +958,15 @@ function computeInitialSize(canvas, defaultSize) {
     }
     return { width: 0, height: 0, top: 0, left: 0 };
 }
+// Disposes an object and all its properties
+function dispose(obj) {
+    if (obj.dispose && !is.scene(obj))
+        obj.dispose();
+    for (const p in obj) {
+        p.dispose?.();
+        delete obj[p];
+    }
+}
 
 const NGT_COMPOUND_PREFIXES = new InjectionToken('NgtCompoundPrefixes');
 
@@ -1933,34 +1963,21 @@ class NgtRendererFactory {
         this.document = inject(DOCUMENT);
         this.rendererMap = new Map();
         this.portals = [];
+        this.rendererStore = new NgtRendererStore({
+            store: this.store,
+            cdr: this.cdr,
+            portals: this.portals,
+            compoundPrefixes: this.compoundPrefixes,
+            document: this.document,
+        });
     }
     createRenderer(hostElement, type) {
         const delegateRenderer = this.delegateRendererFactory.createRenderer(hostElement, type);
         if (!type)
             return delegateRenderer;
         let renderer = this.rendererMap.get(type.id);
-        if (renderer)
-            return renderer;
-        if (!hostElement) {
-            const store = new NgtRendererStore({
-                store: this.store,
-                cdr: this.cdr,
-                portals: this.portals,
-                compoundPrefixes: this.compoundPrefixes,
-                document: this.document,
-            });
-            renderer = new NgtRenderer(delegateRenderer, store, this.catalogue);
-            this.rendererMap.set(type.id, renderer);
-        }
         if (!renderer) {
-            const store = new NgtRendererStore({
-                store: this.store,
-                cdr: this.cdr,
-                portals: this.portals,
-                compoundPrefixes: this.compoundPrefixes,
-                document: this.document,
-            });
-            renderer = new NgtRenderer(delegateRenderer, store, this.catalogue, false);
+            renderer = new NgtRenderer(delegateRenderer, this.rendererStore, this.catalogue, !hostElement);
             this.rendererMap.set(type.id, renderer);
         }
         return renderer;
@@ -1980,7 +1997,6 @@ class NgtRenderer {
         this.store = store;
         this.catalogue = catalogue;
         this.root = root;
-        this.first = false;
         this.createText = this.delegate.createText.bind(this.delegate);
         this.destroy = this.delegate.destroy.bind(this.delegate);
         this.destroyNode = null;
@@ -1996,8 +2012,8 @@ class NgtRenderer {
     createElement(name, namespace) {
         const element = this.delegate.createElement(name, namespace);
         // on first pass, we return the Root Scene as the root node
-        if (this.root && !this.first) {
-            this.first = true;
+        if (this.root) {
+            this.root = false;
             const node = this.store.createNode('three', this.store.rootScene);
             node.__ngt_renderer__[13 /* NgtRendererClassId.injectorFactory */] = () => getDebugNode(element).injector;
             return node;
@@ -2491,6 +2507,7 @@ class NgtCanvas extends NgtRxStore {
         if (this.glEnvInjector)
             this.glEnvInjector.destroy();
         injectNgtLoader.destroy();
+        this.store.destroy(this.glCanvas.nativeElement);
         super.ngOnDestroy();
     }
     overrideDetectChanges() {