fix(soba): use texture params for progressive light maps

Author: nartc

libs/core/src/index.ts

@@ -24,3 +24,4 @@ export * from './lib/utils/make';
 export * from './lib/utils/safe-detect-changes';
 export * from './lib/utils/signal-store';
 export * from './lib/utils/update';
+import './lib/three-types';

libs/core/src/lib/utils/assert-injection-context.ts

@@ -1,13 +1,6 @@
 import { Injector, assertInInjectionContext, inject } from '@angular/core';
 
 export function assertInjectionContext(fn: Function, injector?: Injector): Injector {
-	try {
-		if (!injector) {
-			return inject(Injector);
-		}
-		return injector;
-	} catch {
-		!injector && assertInInjectionContext(fn);
-		return null!;
-	}
+	!injector && assertInInjectionContext(fn);
+	return injector ?? inject(Injector);
 }

libs/soba/src/misc/animations.stories.ts

@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+import { NgIf, NgTemplateOutlet } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, Component, Input, effect, signal, type Signal } from '@angular/core';
 import { NgtArgs } from 'angular-three';
 import { injectNgtsGLTFLoader, type NgtsGLTF } from 'angular-three-soba/loaders';
@@ -24,16 +24,18 @@ type YBotGLTF = NgtsGLTF<{
 		<ngt-group *ngIf="yBotGltf() as yBot" [dispose]="null" [position]="[0, -1, 0]" [ref]="animations.ref">
 			<ngt-group [rotation]="[Math.PI / 2, 0, 0]" [scale]="0.01">
 				<ngt-primitive *args="[yBot.nodes.mixamorigHips]" />
-				<ngt-skinned-mesh [geometry]="yBot.nodes.YB_Body.geometry" [skeleton]="yBot.nodes.YB_Body.skeleton">
-					<ngt-mesh-matcap-material [matcap]="matcapBody.texture()" [skinning]="true" />
-				</ngt-skinned-mesh>
-				<ngt-skinned-mesh [geometry]="yBot.nodes.YB_Joints.geometry" [skeleton]="yBot.nodes.YB_Joints.skeleton">
-					<ngt-mesh-matcap-material [matcap]="matcapJoints.texture()" [skinning]="true" />
-				</ngt-skinned-mesh>
+				<ng-container *ngTemplateOutlet="skin; context: { matcap: matcapBody, yb: yBot.nodes.YB_Body }" />
+				<ng-container *ngTemplateOutlet="skin; context: { matcap: matcapJoints, yb: yBot.nodes.YB_Joints }" />
 			</ngt-group>
 		</ngt-group>
+
+		<ng-template #skin let-matcap="matcap" let-yb="yb">
+			<ngt-skinned-mesh [geometry]="yb.geometry" [skeleton]="yb.skeleton">
+				<ngt-mesh-matcap-material [matcap]="matcap.texture()" [skinning]="true" />
+			</ngt-skinned-mesh>
+		</ng-template>
 	`,
-	imports: [NgtArgs, NgIf],
+	imports: [NgtArgs, NgIf, NgTemplateOutlet],
 	schemas: [CUSTOM_ELEMENTS_SCHEMA],
 })
 class DefaultAnimationsStory {

libs/soba/staging/src/accumulative-shadows/progressive-light-map.ts

@@ -39,13 +39,13 @@ export class ProgressiveLightMap {
 		this.clearAlpha = 0;
 
 		// Create the Progressive LightMap Texture
-		const format = /(Android|iPad|iPhone|iPod)/g.test(navigator.userAgent) ? THREE.HalfFloatType : THREE.FloatType;
-		this.progressiveLightMap1 = new THREE.WebGLRenderTarget(this.res, this.res, {
-			type: format,
-		});
-		this.progressiveLightMap2 = new THREE.WebGLRenderTarget(this.res, this.res, {
-			type: format,
-		});
+		const textureParams = {
+			type: THREE.HalfFloatType,
+			magFilter: THREE.NearestFilter,
+			minFilter: THREE.NearestFilter,
+		};
+		this.progressiveLightMap1 = new THREE.WebGLRenderTarget(this.res, this.res, textureParams);
+		this.progressiveLightMap2 = new THREE.WebGLRenderTarget(this.res, this.res, textureParams);
 
 		// Inject some spicy new logic into a standard phong material
 		this.discardMat = new DiscardMaterial();