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

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, Renderer2 } from '@angular/core';
-import { outputFromObservable, takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { untracked, computed, signal, ElementRef, input, inject, ViewContainerRef, NgZone, TemplateRef, afterNextRender, DestroyRef, Directive, effect, InjectionToken, getDebugNode, RendererFactory2, Injectable, makeEnvironmentProviders, Component, EnvironmentInjector, Injector, booleanAttribute, output, viewChild, createEnvironmentInjector, ChangeDetectionStrategy, CUSTOM_ELEMENTS_SCHEMA, contentChild, Renderer2 } from '@angular/core';
+import { takeUntilDestroyed, outputFromObservable } 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, BufferAttribute, ColorManagement, Texture, RGBAFormat, UnsignedByteType, Raycaster, Scene, PCFSoftShadowMap, BasicShadowMap, PCFShadowMap, VSMShadowMap, NoToneMapping, ACESFilmicToneMapping, Vector2, Clock } from 'three';
+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 { DOCUMENT } from '@angular/common';
 import { Subject, filter } from 'rxjs';
 import { createInjectionToken } from 'ngxtension/create-injection-token';
@@ -876,12 +876,7 @@ function applyProps(instance, props) {
                 value &&
                 value.constructor &&
                 targetProp.constructor.name === value.constructor.name) {
-                if (value instanceof BufferAttribute && !value.array) {
-                    currentInstance[key] = value;
-                }
-                else {
-                    targetProp['copy'](value);
-                }
+                targetProp['copy'](value);
                 if (!ColorManagement && !rootState.linear && isColor)
                     targetProp['convertSRGBToLinear']();
             } // if nothing else fits, just set the single value, ignore undefined
@@ -2319,6 +2314,32 @@ function provideNgtRenderer(store) {
     return makeEnvironmentProviders(providers);
 }
 
+var _a$1;
+class NgtRoutedScene {
+    static { _a$1 = ROUTED_SCENE; }
+    static { this[_a$1] = true; }
+    constructor(router, cdr) {
+        router.events
+            .pipe(filter((event) => event instanceof ActivationEnd), takeUntilDestroyed())
+            .subscribe(cdr.detectChanges.bind(cdr));
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.0", ngImport: i0, type: NgtRoutedScene, deps: [{ token: i1.Router }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.0", type: NgtRoutedScene, isStandalone: true, selector: "ngt-routed-scene", ngImport: i0, template: `
+		<router-outlet />
+	`, isInline: true, dependencies: [{ kind: "directive", type: RouterOutlet, selector: "router-outlet", inputs: ["name"], outputs: ["activate", "deactivate", "attach", "detach"], exportAs: ["outlet"] }] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.0", ngImport: i0, type: NgtRoutedScene, decorators: [{
+            type: Component,
+            args: [{
+                    standalone: true,
+                    selector: 'ngt-routed-scene',
+                    template: `
+		<router-outlet />
+	`,
+                    imports: [RouterOutlet],
+                }]
+        }], ctorParameters: () => [{ type: i1.Router }, { type: i0.ChangeDetectorRef }] });
+
 class NgtCanvas {
     constructor() {
         this.store = injectStore();
@@ -2329,7 +2350,13 @@ class NgtCanvas {
         this.zone = inject(NgZone);
         this.environmentInjector = inject(EnvironmentInjector);
         this.injector = inject(Injector);
-        this.sceneGraph = input.required();
+        this.sceneGraph = input.required({
+            transform: (value) => {
+                if (value === 'routed')
+                    return NgtRoutedScene;
+                return value;
+            },
+        });
         this.gl = input();
         this.size = input();
         this.shadows = input(false, {
@@ -2488,7 +2515,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.0", ngImpor
                 }]
         }], ctorParameters: () => [] });
 
-var _a$1;
+var _a;
 const NGT_HTML_DOM_ELEMENT = new InjectionToken('NGT_HTML_DOM_ELEMENT');
 function provideHTMLDomElement(...args) {
     if (args.length === 0) {
@@ -2497,8 +2524,8 @@ function provideHTMLDomElement(...args) {
     return { provide: NGT_HTML_DOM_ELEMENT, useFactory: args.pop(), deps: args };
 }
 class NgtHTML {
-    static { _a$1 = HTML; }
-    static { this[_a$1] = true; }
+    static { _a = HTML; }
+    static { this[_a] = true; }
     constructor() {
         this.store = injectStore();
         this.destroyRef = inject(DestroyRef);
@@ -2532,7 +2559,7 @@ function normalizeInputs(input) {
         return [input];
     return Object.values(input);
 }
-function load(loaderConstructorFactory, inputs, { extensions, onProgress, } = {}) {
+function load(loaderConstructorFactory, inputs, { extensions, onLoad, onProgress, } = {}) {
     return () => {
         const urls = normalizeInputs(inputs());
         if (urls.some((url) => url.includes('undefined')))
@@ -2552,6 +2579,9 @@ function load(loaderConstructorFactory, inputs, { extensions, onProgress, } = {}
                         if ('scene' in data) {
                             Object.assign(data, makeObjectGraph(data['scene']));
                         }
+                        if (onLoad) {
+                            onLoad(data);
+                        }
                         resolve(data);
                     }, onProgress, (error) => reject(new Error(`[NGT] Could not load ${url}: ${error?.message}`)));
                 }));
@@ -2560,12 +2590,12 @@ function load(loaderConstructorFactory, inputs, { extensions, onProgress, } = {}
         });
     };
 }
-function _injectLoader(loaderConstructorFactory, inputs, { extensions, onProgress, injector, } = {}) {
+function _injectLoader(loaderConstructorFactory, inputs, { extensions, onProgress, onLoad, injector, } = {}) {
     return assertInjector(_injectLoader, injector, () => {
         const autoEffect = injectAutoEffect();
         const response = signal(null);
         afterNextRender(() => {
-            const effector = load(loaderConstructorFactory, inputs, { extensions, onProgress });
+            const effector = load(loaderConstructorFactory, inputs, { extensions, onProgress, onLoad });
             autoEffect(() => {
                 const originalUrls = inputs();
                 const cachedEffect = effector();
@@ -2617,17 +2647,6 @@ function injectBeforeRender(cb, { priority = 0, injector } = {}) {
         return sub;
     });
 }
-// TODO (chau): clean this up
-function injectNextBeforeRender(cb, { priority = 0, injector } = {}) {
-    return assertInjector(injectNextBeforeRender, injector, () => {
-        const assertedInjector = inject(Injector);
-        const sub = signal(null);
-        afterNextRender(() => {
-            sub.set(injectBeforeRender(cb, { priority, injector: assertedInjector }));
-        });
-        return sub.asReadonly();
-    });
-}
 
 class NgtPortalBeforeRender {
     constructor() {
@@ -2840,32 +2859,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.0", ngImpor
                 }]
         }], ctorParameters: () => [] });
 
-var _a;
-class NgtRoutedScene {
-    static { _a = ROUTED_SCENE; }
-    static { this[_a] = true; }
-    constructor(router, cdr) {
-        router.events
-            .pipe(filter((event) => event instanceof ActivationEnd), takeUntilDestroyed())
-            .subscribe(cdr.detectChanges.bind(cdr));
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.0", ngImport: i0, type: NgtRoutedScene, deps: [{ token: i1.Router }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.0", type: NgtRoutedScene, isStandalone: true, selector: "ngt-routed-scene", ngImport: i0, template: `
-		<router-outlet />
-	`, isInline: true, dependencies: [{ kind: "directive", type: RouterOutlet, selector: "router-outlet", inputs: ["name"], outputs: ["activate", "deactivate", "attach", "detach"], exportAs: ["outlet"] }] }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.0", ngImport: i0, type: NgtRoutedScene, decorators: [{
-            type: Component,
-            args: [{
-                    standalone: true,
-                    selector: 'ngt-routed-scene',
-                    template: `
-		<router-outlet />
-	`,
-                    imports: [RouterOutlet],
-                }]
-        }], ctorParameters: () => [{ type: i1.Router }, { type: i0.ChangeDetectorRef }] });
-
 function resolveRef(ref) {
     if (is.ref(ref)) {
         return ref.nativeElement;
@@ -2961,5 +2954,5 @@ function vector3(options, key, keepUndefined = false) {
  * 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, injectObjectEvents, 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, 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