fix(soba): move makeDefault up for controls

Author: nartc

libs/soba/controls/src/lib/camera-controls.ts

@@ -7,7 +7,7 @@ import {
 	input,
 	output,
 } from '@angular/core';
-import { extend, injectBeforeRender, injectStore, NgtArgs, NgtCamera, omit, pick } from 'angular-three';
+import { injectBeforeRender, injectStore, NgtArgs, NgtCamera, omit, pick } from 'angular-three';
 import CameraControls from 'camera-controls';
 import { mergeInputs } from 'ngxtension/inject-inputs';
 import {
@@ -91,7 +91,16 @@ export class NgtsCameraControls {
 				Vector4,
 			},
 		});
-		extend({ CameraControls });
+
+		effect((onCleanup) => {
+			const makeDefault = this.makeDefault();
+			if (!makeDefault) return;
+
+			const controls = this.controls();
+			const oldControls = this.store.snapshot.controls;
+			this.store.update({ controls: controls as unknown as EventDispatcher });
+			onCleanup(() => void this.store.update({ controls: oldControls }));
+		});
 
 		injectBeforeRender(
 			({ delta }) => {
@@ -145,15 +154,5 @@ export class NgtsCameraControls {
 				controls.removeEventListener('wake', callback);
 			});
 		});
-
-		effect((onCleanup) => {
-			const makeDefault = this.makeDefault();
-			if (!makeDefault) return;
-
-			const controls = this.controls();
-			const oldControls = this.store.snapshot.controls;
-			this.store.update({ controls: controls as unknown as EventDispatcher });
-			onCleanup(() => void this.store.update({ controls: oldControls }));
-		});
 	}
 }

libs/soba/controls/src/lib/orbit-controls.ts

@@ -70,6 +70,18 @@ export class NgtsOrbitControls {
 			{ priority: -1 },
 		);
 
+		effect((onCleanup) => {
+			const makeDefault = this.makeDefault();
+			if (!makeDefault) return;
+
+			const controls = this.controls();
+			if (!controls) return;
+
+			const oldControls = this.store.get('controls');
+			this.store.update({ controls });
+			onCleanup(() => void this.store.update({ controls: oldControls }));
+		});
+
 		effect((onCleanup) => {
 			const [keyEvents, domElement, controls] = [
 				this.keyEvents(),
@@ -87,18 +99,6 @@ export class NgtsOrbitControls {
 			onCleanup(() => void controls.dispose());
 		});
 
-		effect((onCleanup) => {
-			const makeDefault = this.makeDefault();
-			if (!makeDefault) return;
-
-			const controls = this.controls();
-			if (!controls) return;
-
-			const oldControls = this.store.get('controls');
-			this.store.update({ controls });
-			onCleanup(() => void this.store.update({ controls: oldControls }));
-		});
-
 		effect((onCleanup) => {
 			const controls = this.controls();
 			if (!controls) return;

libs/soba/staging/src/lib/bounds.ts

@@ -106,7 +106,7 @@ export class NgtsBounds {
 			if (!controls) return;
 
 			const callback = () => {
-				if (controls && this.goal.target && this.animationState !== AnimationState.NONE) {
+				if (this.goal.target && this.animationState !== AnimationState.NONE) {
 					const front = new Vector3().setFromMatrixColumn(camera.matrix, 2);
 					const d0 = this.origin.camPos.distanceTo(controls.target);
 					const d1 = (this.goal.camPos || this.origin.camPos).distanceTo(this.goal.target);
@@ -131,8 +131,10 @@ export class NgtsBounds {
 				this.observe(),
 				this.size(),
 				this.camera(),
+				// TODO: (chau) for some reason, if this effect tracks controls changes, the initial bounds doesn't target properly
 				this.controls(),
 			];
+
 			if (observe || count++ === 0) {
 				this.refresh();
 				if (fit) this.reset().fit();