fix(cannon): clean up physics

Author: nartc

libs/cannon/body/src/lib/body.ts

@@ -48,15 +48,19 @@ function injectBody<TShape extends BodyShapeType, TObject extends Object3D>(
 		const debug = inject(NgtcDebug, { optional: true });
 
 		const transform = transformArgs ?? defaultTransformArgs[type];
-		const bodyRef = isSignal(ref) ? ref : signal(ref);
+		const isRefSignal = isSignal(ref);
+		const bodyRef = (isRefSignal ? ref : signal(ref)) as WritableSignal<TObject | undefined>;
 		const body = computed(() => resolveRef(bodyRef()));
 
 		const api = computed(() => {
 			const _body = body();
 			if (!_body) return null;
+
 			const { worker, ...rest } = physics.api;
-			if (!worker()) return null;
-			return makeBodyApi(_body, worker(), rest);
+			const _worker = worker();
+			if (!_worker) return null;
+
+			return makeBodyApi(_body, _worker, rest);
 		});
 
 		effect((onCleanup) => {
@@ -65,9 +69,10 @@ function injectBody<TShape extends BodyShapeType, TObject extends Object3D>(
 
 			const object = body();
 
-			if (!isSignal(ref) && !object) {
+			if (!isRefSignal && !object) {
+				// TODO (signal): find a better way to handle this. no setting signal
 				untracked(() => {
-					(bodyRef as WritableSignal<TObject | undefined>).set(resolveRef(ref));
+					bodyRef.set(resolveRef(ref));
 				});
 				return;
 			}
@@ -103,6 +108,7 @@ function injectBody<TShape extends BodyShapeType, TObject extends Object3D>(
 					}),
 				];
 			})();
+
 			// Register on mount, unregister on unmount
 			currentWorker.addBodies({
 				props: props.map(({ onCollide, onCollideBegin, onCollideEnd, ...serializableProps }) => {

libs/cannon/debug/src/lib/debug.ts

@@ -48,8 +48,6 @@ export class NgtcDebug {
 
 	private cannonDebugger!: ReturnType<typeof CannonDebugger>;
 
-	api = {};
-
 	constructor() {
 		afterNextRender(() => {
 			this.defaultScene().add(this.scene);
@@ -61,6 +59,8 @@ export class NgtcDebug {
 
 		injectBeforeRender(() => {
 			if (!this.cannonDebugger) return;
+
+			const enabled = this.debug().enabled;
 			const refs = this.physics.api.refs;
 			for (const uuid in this.bodyMap) {
 				const ref = refs[uuid];
@@ -71,13 +71,9 @@ export class NgtcDebug {
 					body.quaternion.copy(q as unknown as CQuarternion);
 				}
 			}
-			for (const child of this.scene.children) {
-				child.visible = this.debug().enabled;
-			}
 
-			if (this.debug().enabled) {
-				this.cannonDebugger.update();
-			}
+			for (const child of this.scene.children) child.visible = enabled;
+			if (enabled) this.cannonDebugger.update();
 		});
 	}
 

libs/cannon/src/lib/physics.ts

@@ -1,12 +1,9 @@
 import {
 	ChangeDetectionStrategy,
 	Component,
-	DestroyRef,
-	EmbeddedViewRef,
 	Signal,
 	afterNextRender,
 	effect,
-	inject,
 	input,
 	signal,
 	untracked,
@@ -152,8 +149,6 @@ export class NgtcPhysics {
 		worker: this.worker.asReadonly(),
 	};
 
-	private ref?: EmbeddedViewRef<{ $implicit: NgtcPhysicsApi }>;
-
 	constructor() {
 		afterNextRender(() => {
 			this.worker.set(new CannonWorkerAPI(this.options()));
@@ -180,10 +175,6 @@ export class NgtcPhysics {
 			worker.step({ maxSubSteps, stepSize, timeSinceLastCalled });
 			timeSinceLastCalled = 0;
 		});
-
-		inject(DestroyRef).onDestroy(() => {
-			this.ref?.destroy();
-		});
 	}
 
 	private connectWorkerEffect() {