fix(rapier): clean up rapier

Author: nartc

libs/rapier/src/lib/instanced-rigid-bodies.ts

@@ -77,7 +77,7 @@ const defaultOptions: NgtrRigidBodyOptions = rigidBodyDefaultOptions;
 		'[quaternion]': 'quaternion()',
 		'[userData]': 'userData()',
 	},
-	imports: [NgtrRigidBody, NgtrRigidBody, NgtrAnyCollider],
+	imports: [NgtrRigidBody, NgtrAnyCollider],
 })
 export class NgtrInstancedRigidBodies {
 	position = input<NgtVector3 | undefined>([0, 0, 0]);
@@ -161,22 +161,22 @@ export class NgtrInstancedRigidBodies {
 		if (!options.colliders) options.colliders = physicsColliders;
 
 		const objectLocalState = getLocalState(this.objectRef.nativeElement);
-		// track object's children
-		objectLocalState?.nonObjects();
+		if (!objectLocalState) return [];
+
+		// track object's parent and non-object children
+		const [parent] = [objectLocalState.parent(), objectLocalState.nonObjects()];
+		if (!parent || !(parent as Object3D).isObject3D) return [];
 
 		return createColliderOptions(this.objectRef.nativeElement, options);
 	});
 
 	constructor() {
 		extend({ Object3D });
+
 		effect(() => {
-			this.setInstancedMeshMatrixEffect();
+			const instancedMesh = this.instancedMesh();
+			if (!instancedMesh) return;
+			instancedMesh.instanceMatrix.setUsage(DynamicDrawUsage);
 		});
 	}
-
-	private setInstancedMeshMatrixEffect() {
-		const instancedMesh = this.instancedMesh();
-		if (!instancedMesh) return;
-		instancedMesh.instanceMatrix.setUsage(DynamicDrawUsage);
-	}
 }

libs/rapier/src/lib/mesh-collider.ts

@@ -47,18 +47,18 @@ export class NgtrMeshCollider {
 		rigidBodyOptions.colliders = this.colliders();
 
 		const objectLocalState = getLocalState(this.objectRef.nativeElement);
+		if (!objectLocalState) return [];
+
 		// track object's children
-		objectLocalState?.nonObjects();
-		objectLocalState?.objects();
+		objectLocalState.nonObjects();
+		objectLocalState.objects();
 
 		return createColliderOptions(this.objectRef.nativeElement, rigidBodyOptions, false);
 	});
 
 	constructor() {
 		extend({ Object3D });
-		if (!this.objectRef.nativeElement.userData) {
-			this.objectRef.nativeElement.userData = {};
-		}
+		this.objectRef.nativeElement.userData ??= {};
 		this.objectRef.nativeElement.userData['ngtrRapierType'] = 'MeshCollider';
 	}
 }

libs/rapier/src/lib/physics.ts

@@ -105,7 +105,8 @@ export class NgtrPhysics {
 	paused = pick(this.options, 'paused');
 	debug = pick(this.options, 'debug');
 	colliders = pick(this.options, 'colliders');
-	gravity = vector3(this.options, 'gravity');
+
+	private gravity = vector3(this.options, 'gravity');
 
 	private store = injectStore();
 	private destroyRef = inject(DestroyRef);
@@ -125,8 +126,8 @@ export class NgtrPhysics {
 	colliderStates: NgtrColliderStateMap = new Map();
 	rigidBodyEvents: NgtrEventMap = new Map();
 	colliderEvents: NgtrEventMap = new Map();
-	beforeStepCallbacks: NgtrWorldStepCallbackSet = new Set();
-	afterStepCallbacks: NgtrWorldStepCallbackSet = new Set();
+	private beforeStepCallbacks: NgtrWorldStepCallbackSet = new Set();
+	private afterStepCallbacks: NgtrWorldStepCallbackSet = new Set();
 
 	private eventQueue = computed(() => {
 		const rapier = this.rapier();

libs/rapier/src/lib/rigid-body.ts

@@ -486,12 +486,10 @@ export class NgtrRigidBody {
 		const objectLocalState = getLocalState(this.objectRef.nativeElement);
 		if (!objectLocalState) return [];
 
-		const parent = objectLocalState.parent();
+		// track object's parent and non-object children
+		const [parent] = [objectLocalState.parent(), objectLocalState.nonObjects()];
 		if (!parent || !(parent as Object3D).isObject3D) return [];
 
-		// track object's children
-		objectLocalState?.nonObjects();
-
 		return createColliderOptions(this.objectRef.nativeElement, options, true);
 	});