angular-three-soba 4.0.0-next.97 → 4.0.0-next.99

package/fesm2022/angular-three-soba-misc.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
-import { computed, isSignal, signal, effect, untracked, Directive, input, viewChild, Component, CUSTOM_ELEMENTS_SCHEMA, ChangeDetectionStrategy, inject, DestroyRef, TemplateRef, ViewContainerRef, output, ElementRef, Renderer2, model } from '@angular/core';
-import { injectBeforeRender, resolveRef, injectStore, getInstanceState, NgtArgs, omit, pick, extend, is, applyProps, NgtHTML, addEffect, addAfterEffect, checkUpdate } from 'angular-three';
+import { computed, isSignal, inject, DestroyRef, effect, Directive, input, viewChild, Component, CUSTOM_ELEMENTS_SCHEMA, ChangeDetectionStrategy, untracked, TemplateRef, ViewContainerRef, output, ElementRef, Renderer2, signal, model } from '@angular/core';
+import { beforeRender, resolveRef, injectStore, getInstanceState, NgtArgs, omit, pick, extend, is, applyProps, NgtHTML, addEffect, addAfterEffect, checkUpdate } from 'angular-three';
 import { assertInjector } from 'ngxtension/assert-injector';
 import * as THREE from 'three';
 import { REVISION, Mesh, BoxGeometry, MeshNormalMaterial, AxesHelper, Group, PlaneGeometry, ShaderMaterial } from 'three';
@@ -11,10 +11,10 @@ import { NgTemplateOutlet } from '@angular/common';
 /**
  * Use afterNextRender
  */
-function injectAnimations(animations, object, { injector } = {}) {
-    return assertInjector(injectAnimations, injector, () => {
+function animations(animationsFactory, object, { injector } = {}) {
+    return assertInjector(animations, injector, () => {
         const mixer = new THREE.AnimationMixer(null);
-        injectBeforeRender(({ delta }) => {
+        beforeRender(({ delta }) => {
             if (!mixer.getRoot())
                 return;
             mixer.update(delta);
@@ -23,19 +23,13 @@ function injectAnimations(animations, object, { injector } = {}) {
         const actions = {};
         const clips = [];
         const names = [];
-        const actualObject = computed(() => {
-            if (isSignal(object) || typeof object === 'function') {
-                return resolveRef(object());
-            }
-            return resolveRef(object);
-        });
-        const ready = signal(false);
-        effect((onCleanup) => {
+        const actualObject = computed(() => isSignal(object) || typeof object === 'function' ? resolveRef(object()) : resolveRef(object));
+        const isReady = computed(() => {
             const obj = actualObject();
             if (!obj)
-                return;
+                return false;
             Object.assign(mixer, { _root: obj });
-            const maybeAnimationClips = animations();
+            const maybeAnimationClips = animationsFactory();
             if (!maybeAnimationClips)
                 return;
             const animationClips = Array.isArray(maybeAnimationClips)
@@ -57,25 +51,35 @@ function injectAnimations(animations, object, { injector } = {}) {
                     });
                 }
             }
-            if (!untracked(ready)) {
-                ready.set(true);
-            }
-            onCleanup(() => {
-                // clear cached
-                cached = {};
-                // stop all actions
-                mixer.stopAllAction();
-                // uncache actions
-                Object.values(actions).forEach((action) => {
-                    mixer.uncacheAction(action, obj);
-                });
+            return true;
+        });
+        inject(DestroyRef).onDestroy(() => {
+            const obj = actualObject();
+            // clear cached
+            cached = {};
+            // stop all actions
+            mixer.stopAllAction();
+            // uncache actions
+            Object.values(actions).forEach((action) => {
+                mixer.uncacheAction(action, obj);
             });
         });
-        const result = { ready, clips, mixer, actions, names };
-        Object.defineProperty(result, 'isReady', { get: ready });
-        return result;
+        return {
+            clips,
+            mixer,
+            actions,
+            names,
+            get isReady() {
+                return isReady();
+            },
+        };
     });
 }
+/**
+ * @deprecated use animations instead. Will be removed in v5.0.0
+ * @since v4.0.0
+ */
+const injectAnimations = animations;
 
 class NgtsBakeShadows {
     constructor() {
@@ -299,8 +303,8 @@ const setUpdateRange = (attribute, updateRange) => {
     }
 };
 
-function injectFBO(params = () => ({}), { injector } = {}) {
-    return assertInjector(injectFBO, injector, () => {
+function fbo(params = () => ({}), { injector } = {}) {
+    return assertInjector(fbo, injector, () => {
         const store = injectStore();
         const width = computed(() => {
             const { width } = params();
@@ -346,22 +350,24 @@ function injectFBO(params = () => ({}), { injector } = {}) {
         return target;
     });
 }
+/**
+ * @deprecated use fbo instead. Will be removed in v5.0.0
+ * @since v4.0.0
+ */
+const injectFBO = fbo;
 class NgtsFBO {
     constructor() {
         this.fbo = input({});
         this.template = inject(TemplateRef);
         this.viewContainerRef = inject(ViewContainerRef);
-        let ref;
-        const fboTarget = injectFBO(() => {
+        const fboTarget = fbo(() => {
             const { width, height, ...settings } = this.fbo();
             return { width, height, settings };
         });
-        effect(() => {
-            ref = this.viewContainerRef.createEmbeddedView(this.template, { $implicit: fboTarget });
+        effect((onCleanup) => {
+            const ref = this.viewContainerRef.createEmbeddedView(this.template, { $implicit: fboTarget });
             ref.detectChanges();
-        });
-        inject(DestroyRef).onDestroy(() => {
-            ref?.destroy();
+            onCleanup(() => void ref.destroy());
         });
     }
     static ngTemplateContextGuard(_, ctx) {
@@ -375,8 +381,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.1", ngImpor
             args: [{ selector: 'ng-template[fbo]' }]
         }], ctorParameters: () => [] });
 
-function injectDepthBuffer(params = () => ({}), { injector } = {}) {
-    return assertInjector(injectDepthBuffer, injector, () => {
+function depthBuffer(params = () => ({}), { injector } = {}) {
+    return assertInjector(depthBuffer, injector, () => {
         const size = computed(() => params().size || 256);
         const frames = computed(() => params().frames || Infinity);
         const store = injectStore();
@@ -388,9 +394,9 @@ function injectDepthBuffer(params = () => ({}), { injector } = {}) {
             depthTexture.type = THREE.UnsignedShortType;
             return { depthTexture };
         });
-        const depthFBO = injectFBO(() => ({ width: w(), height: h(), settings: depthConfig() }));
+        const depthFBO = fbo(() => ({ width: w(), height: h(), settings: depthConfig() }));
         let count = 0;
-        injectBeforeRender(({ gl, scene, camera }) => {
+        beforeRender(({ gl, scene, camera }) => {
             if (frames() === Infinity || count < frames()) {
                 gl.setRenderTarget(depthFBO);
                 gl.render(scene, camera);
@@ -401,6 +407,11 @@ function injectDepthBuffer(params = () => ({}), { injector } = {}) {
         return depthFBO.depthTexture;
     });
 }
+/**
+ * @deprecated use depthBuffer instead. Will be removed in v5.0.0
+ * @since v4.0.0
+ */
+const injectDepthBuffer = depthBuffer;
 
 const v1 = new THREE.Vector3();
 const v2 = new THREE.Vector3();
@@ -582,7 +593,7 @@ class NgtsHTMLContent extends NgtHTML {
         let visible = true;
         let oldZoom = 0;
         let oldPosition = [0, 0];
-        injectBeforeRender(({ camera: rootCamera }) => {
+        beforeRender(({ camera: rootCamera }) => {
             const [hostEl, transformOuterEl, transformInnerEl, group, occlusionMesh, occlusionGeometry, isRaycastOcclusion, { camera, size, viewport, raycaster, scene }, { calculatePosition, eps, zIndexRange, sprite, distanceFactor }, { transform, occlude, scale },] = [
                 this.host.nativeElement,
                 this.transformOuterRef()?.nativeElement,
@@ -717,8 +728,8 @@ class NgtsHTMLContent extends NgtHTML {
 			<div
 				#transformOuter
 				style="position: absolute; top: 0; left: 0; transform-style: preserve-3d; pointer-events: none;"
-				[style.width.px]="size().width"
-				[style.height.px]="size().height"
+				[style.width.px]="size.width()"
+				[style.height.px]="size.height()"
 			>
 				<div #transformInner style="position: absolute" [style.pointer-events]="pointerEvents()">
 					<div #container [class]="containerClass()" [style]="containerStyle()">
@@ -756,8 +767,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.1", ngImpor
 			<div
 				#transformOuter
 				style="position: absolute; top: 0; left: 0; transform-style: preserve-3d; pointer-events: none;"
-				[style.width.px]="size().width"
-				[style.height.px]="size().height"
+				[style.width.px]="size.width()"
+				[style.height.px]="size.height()"
 			>
 				<div #transformInner style="position: absolute" [style.pointer-events]="pointerEvents()">
 					<div #container [class]="containerClass()" [style]="containerStyle()">
@@ -914,8 +925,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.1", ngImpor
         }], ctorParameters: () => [] });
 const NgtsHTML = [NgtsHTMLImpl, NgtsHTMLContent];
 
-function injectIntersect(object, { injector, source = signal(false) } = {}) {
-    return assertInjector(injectIntersect, injector, () => {
+function intersect(object, { injector, source = signal(false) } = {}) {
+    return assertInjector(intersect, injector, () => {
         let check = false;
         let temp = false;
         effect((onCleanup) => {
@@ -945,11 +956,16 @@ function injectIntersect(object, { injector, source = signal(false) } = {}) {
         return source.asReadonly();
     });
 }
+/**
+ * @deprecated Use `intersect` instead. Will be removed in v5.0.0
+ * @since v4.0.0
+ */
+const injectIntersect = intersect;
 class NgtsIntersect {
     constructor() {
         this.intersect = model(false);
         const host = inject(ElementRef);
-        injectIntersect(() => host, { source: this.intersect });
+        intersect(() => host, { source: this.intersect });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: NgtsIntersect, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
     static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "19.2.1", type: NgtsIntersect, isStandalone: true, selector: "[intersect]", inputs: { intersect: { classPropertyName: "intersect", publicName: "intersect", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { intersect: "intersectChange" }, ngImport: i0 }); }
@@ -1165,5 +1181,5 @@ function calculateScaleFactor(point3, radiusPx, camera, size) {
  * Generated bundle index. Do not edit.
  */
 
-export { NgtsBakeShadows, NgtsComputedAttribute, NgtsDecal, NgtsFBO, NgtsHTML, NgtsHTMLContent, NgtsHTMLImpl, NgtsIntersect, NgtsPreload, NgtsSampler, calculateScaleFactor, getVersion, injectAnimations, injectDepthBuffer, injectFBO, injectIntersect, setUpdateRange, surfaceSampler };
+export { NgtsBakeShadows, NgtsComputedAttribute, NgtsDecal, NgtsFBO, NgtsHTML, NgtsHTMLContent, NgtsHTMLImpl, NgtsIntersect, NgtsPreload, NgtsSampler, animations, calculateScaleFactor, depthBuffer, fbo, getVersion, injectAnimations, injectDepthBuffer, injectFBO, injectIntersect, intersect, setUpdateRange, surfaceSampler };
 //# sourceMappingURL=angular-three-soba-misc.mjs.map