angular-three 2.0.0-beta.264 → 2.0.0-beta.266

package/fesm2022/angular-three.mjs

@@ -1,9 +1,9 @@
 import * as i0 from '@angular/core';
-import { untracked, computed, signal, ElementRef, input, inject, ViewContainerRef, NgZone, TemplateRef, afterNextRender, DestroyRef, Directive, effect, InjectionToken, getDebugNode, RendererFactory2, Injectable, makeEnvironmentProviders, EnvironmentInjector, Injector, booleanAttribute, output, viewChild, createEnvironmentInjector, Component, ChangeDetectionStrategy, CUSTOM_ELEMENTS_SCHEMA, contentChild } from '@angular/core';
+import { untracked, computed, signal, ElementRef, input, inject, ViewContainerRef, NgZone, TemplateRef, afterNextRender, DestroyRef, Directive, effect, InjectionToken, getDebugNode, RendererFactory2, Injectable, makeEnvironmentProviders, EnvironmentInjector, Injector, booleanAttribute, output, viewChild, createEnvironmentInjector, Component, ChangeDetectionStrategy, CUSTOM_ELEMENTS_SCHEMA, contentChild, Renderer2 } from '@angular/core';
 import { outputFromObservable, takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { injectAutoEffect } from 'ngxtension/auto-effect';
 import { provideResizeOptions, NgxResize } from 'ngxtension/resize';
-import { MathUtils, WebGLRenderer, OrthographicCamera, PerspectiveCamera, Vector3, Layers, Color, ColorManagement, Texture, RGBAFormat, UnsignedByteType, Raycaster, Scene, PCFSoftShadowMap, BasicShadowMap, PCFShadowMap, VSMShadowMap, NoToneMapping, ACESFilmicToneMapping, Vector2, Clock } from 'three';
+import { MathUtils, WebGLRenderer, OrthographicCamera, PerspectiveCamera, Vector3, Layers, Color, BufferAttribute, ColorManagement, Texture, RGBAFormat, UnsignedByteType, Raycaster, Scene, PCFSoftShadowMap, BasicShadowMap, PCFShadowMap, VSMShadowMap, NoToneMapping, ACESFilmicToneMapping, Vector2, Clock } from 'three';
 import { DOCUMENT } from '@angular/common';
 import { Subject, filter } from 'rxjs';
 import { createInjectionToken } from 'ngxtension/create-injection-token';
@@ -876,7 +876,12 @@ function applyProps(instance, props) {
                 value &&
                 value.constructor &&
                 targetProp.constructor.name === value.constructor.name) {
-                targetProp['copy'](value);
+                if (value instanceof BufferAttribute && !value.array) {
+                    currentInstance[key] = value;
+                }
+                else {
+                    targetProp['copy'](value);
+                }
                 if (!ColorManagement && !rootState.linear && isColor)
                     targetProp['convertSRGBToLinear']();
             } // if nothing else fits, just set the single value, ignore undefined
@@ -1563,23 +1568,26 @@ function removeChild(node, child) {
     }
 }
 
-function attach(object, value, paths = []) {
+function attach(object, value, paths = [], useApplyProps = false) {
     const [base, ...remaining] = paths;
     if (!base)
         return;
     if (remaining.length === 0) {
-        applyProps(object, { [base]: value });
+        if (useApplyProps)
+            applyProps(object, { [base]: value });
+        else
+            object[base] = value;
     }
     else {
         assignEmpty(object, base);
-        attach(object[base], value, remaining);
+        attach(object[base], value, remaining, useApplyProps);
     }
 }
-function detach(parent, child, attachProp) {
+function detach(parent, child, attachProp, useApplyProps = false) {
     const childLocalState = getLocalState(child);
     if (childLocalState) {
         if (Array.isArray(attachProp))
-            attach(parent, childLocalState.previousAttach, attachProp);
+            attach(parent, childLocalState.previousAttach, attachProp, childLocalState.isRaw);
         else
             childLocalState.previousAttach();
     }
@@ -1663,7 +1671,7 @@ function attachThreeChild(parent, child) {
                 // at this point we don't have rawValue yet, so we bail and wait until the Renderer recalls attach
                 if (child.__ngt_renderer__[4 /* NgtRendererClassId.rawValue */] === undefined)
                     return;
-                attach(parent, child.__ngt_renderer__[4 /* NgtRendererClassId.rawValue */], attachProp);
+                attach(parent, child.__ngt_renderer__[4 /* NgtRendererClassId.rawValue */], attachProp, true);
             }
             else {
                 attach(parent, child, attachProp);
@@ -1982,9 +1990,10 @@ class NgtRenderer {
         }
     }
     insertBefore(parent, newChild) {
-        if (parent instanceof HTMLElement && (newChild instanceof HTMLElement || newChild instanceof Text)) {
-            return this.delegate.appendChild(parent, newChild);
-        }
+        // NOTE: not sure why this is here. investigate when we have time
+        // if (parent instanceof HTMLElement && (newChild instanceof HTMLElement || newChild instanceof Text)) {
+        // 	return this.delegate.appendChild(parent, newChild);
+        // }
         if (parent == null || !parent.__ngt_renderer__ || parent === newChild)
             return;
         this.appendChild(parent, newChild);
@@ -2066,7 +2075,9 @@ class NgtRenderer {
                 }
                 rS[4 /* NgtRendererClassId.rawValue */] = maybeCoerced;
             }
-            applyProps(el, { [name]: value });
+            else {
+                applyProps(el, { [name]: value });
+            }
             return false;
         }
         return true;
@@ -2855,6 +2866,38 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.0", ngImpor
                 }]
         }], ctorParameters: () => [{ type: i1.Router }, { type: i0.ChangeDetectorRef }] });
 
+function resolveRef(ref) {
+    if (is.ref(ref)) {
+        return ref.nativeElement;
+    }
+    return ref;
+}
+
+function injectObjectEvents(target, events, { injector } = {}) {
+    return assertInjector(injectObjectEvents, injector, () => {
+        const autoEffect = injectAutoEffect();
+        const renderer = inject(Renderer2);
+        const cleanUps = [];
+        afterNextRender(() => {
+            autoEffect(() => {
+                const targetRef = resolveRef(target());
+                if (!targetRef)
+                    return;
+                Object.entries(events).forEach(([eventName, eventHandler]) => {
+                    cleanUps.push(renderer.listen(targetRef, eventName, eventHandler));
+                });
+                return () => {
+                    cleanUps.forEach((cleanUp) => cleanUp());
+                };
+            });
+        });
+        inject(DestroyRef).onDestroy(() => {
+            cleanUps.forEach((cleanUp) => cleanUp());
+        });
+        return cleanUps;
+    });
+}
+
 function omit(objFn, keysToOmit) {
     return computed(() => {
         const obj = objFn();
@@ -2914,16 +2957,9 @@ function vector3(options, key, keepUndefined = false) {
     }, { equal: (a, b) => !!a && !!b && a.equals(b) });
 }
 
-function resolveRef(ref) {
-    if (is.ref(ref)) {
-        return ref.nativeElement;
-    }
-    return ref;
-}
-
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { HTML, NGT_STORE, NgtArgs, NgtCanvas, NgtHTML, NgtPortal, NgtPortalContent, NgtRenderer, NgtRendererFactory, NgtRoutedScene, ROUTED_SCENE, addAfterEffect, addEffect, addTail, applyProps, checkNeedsUpdate, checkUpdate, createAttachFunction, extend, getLocalState, injectBeforeRender, injectLoader, injectNextBeforeRender, injectStore, invalidateInstance, is, makeCameraInstance, makeDpr, makeId, makeObjectGraph, makeRendererInstance, merge, omit, pick, prepare, provideHTMLDomElement, provideNgtRenderer, provideStore, resolveRef, signalStore, updateCamera, vector2, vector3 };
+export { HTML, NGT_STORE, NgtArgs, NgtCanvas, NgtHTML, NgtPortal, NgtPortalContent, NgtRenderer, NgtRendererFactory, NgtRoutedScene, ROUTED_SCENE, addAfterEffect, addEffect, addTail, applyProps, checkNeedsUpdate, checkUpdate, createAttachFunction, extend, getLocalState, injectBeforeRender, injectLoader, injectNextBeforeRender, injectObjectEvents, injectStore, invalidateInstance, is, makeCameraInstance, makeDpr, makeId, makeObjectGraph, makeRendererInstance, merge, omit, pick, prepare, provideHTMLDomElement, provideNgtRenderer, provideStore, resolveRef, signalStore, updateCamera, vector2, vector3 };
 //# sourceMappingURL=angular-three.mjs.map