fix(rapier): adjust rigidbody and collider input types

Author: nartc

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

@@ -83,11 +83,11 @@ const defaultOptions: NgtrRigidBodyOptions = rigidBodyDefaultOptions;
 	imports: [NgtrRigidBody, NgtrAnyCollider],
 })
 export class NgtrInstancedRigidBodies {
-	position = input<NgtVector3 | undefined>([0, 0, 0]);
-	rotation = input<NgtEuler | undefined>([0, 0, 0]);
-	scale = input<NgtVector3 | undefined>([1, 1, 1]);
-	quaternion = input<NgtQuaternion | undefined>([0, 0, 0, 1]);
-	userData = input<NgtThreeElements['ngt-object3D']['userData'] | undefined>({});
+	position = input<NgtVector3>([0, 0, 0]);
+	rotation = input<NgtEuler>();
+	scale = input<NgtVector3>([1, 1, 1]);
+	quaternion = input<NgtQuaternion>();
+	userData = input<NgtThreeElements['ngt-object3D']['userData']>();
 	instances = input([], {
 		alias: 'instancedRigidBodies',
 		transform: (value: Array<NgtrInstancedRigidBodyOptions> | '') => {
@@ -98,13 +98,25 @@ export class NgtrInstancedRigidBodies {
 	options = input(defaultOptions, { transform: mergeInputs(defaultOptions) });
 
 	private object3DParameters = computed(() => {
-		return {
-			position: this.position(),
-			rotation: this.rotation(),
-			scale: this.scale(),
-			quaternion: this.quaternion(),
-			userData: this.userData(),
-		};
+		const [position, rotation, scale, quaternion, userData] = [
+			this.position(),
+			this.rotation(),
+			this.scale(),
+			this.quaternion(),
+			this.userData(),
+		];
+
+		const parameters = { position, scale, userData };
+
+		if (quaternion) {
+			Object.assign(parameters, { quaternion });
+		} else if (rotation) {
+			Object.assign(parameters, { rotation });
+		} else {
+			Object.assign(parameters, { rotation: [0, 0, 0] });
+		}
+
+		return parameters;
 	});
 
 	private instanceWrapperRef = viewChild.required<ElementRef<THREE.Object3D>>('instanceWrapper');
@@ -156,7 +168,11 @@ export class NgtrInstancedRigidBodies {
 						},
 					},
 					key: `${instance.key}-${index}` + `${instancedMesh?.uuid || ''}`,
-				}) as Omit<NgtrInstancedRigidBodyOptions, 'options'> & { options: Partial<NgtrRigidBodyOptions> },
+				}) as Omit<NgtrInstancedRigidBodyOptions, 'options' | 'position' | 'scale'> & {
+					position: NgtVector3;
+					scale: NgtVector3;
+					options: Partial<NgtrRigidBodyOptions>;
+				},
 		);
 	});
 

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

@@ -35,7 +35,7 @@ import { createColliderOptions } from './utils';
 	imports: [NgtrAnyCollider],
 })
 export class NgtrMeshCollider {
-	colliders = input.required<NgtrRigidBodyAutoCollider>({ alias: 'ngtrMeshCollider' });
+	colliders = input.required<NgtrRigidBodyAutoCollider>({ alias: 'meshCollider' });
 
 	objectRef = inject<ElementRef<THREE.Object3D>>(ElementRef);
 	private rigidBody = inject(NgtrRigidBody);

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

@@ -52,12 +52,12 @@ const colliderDefaultOptions: NgtrColliderOptions = {
 
 @Directive({ selector: 'ngt-object3D[collider]' })
 export class NgtrAnyCollider {
-	position = input<NgtVector3 | undefined>([0, 0, 0]);
-	rotation = input<NgtEuler | undefined>();
-	scale = input<NgtVector3 | undefined>([1, 1, 1]);
-	quaternion = input<NgtQuaternion | undefined>();
-	userData = input<NgtThreeElements['ngt-object3D']['userData'] | undefined>(undefined);
-	name = input<NgtThreeElements['ngt-object3D']['name'] | undefined>(undefined);
+	position = input<NgtVector3>([0, 0, 0]);
+	rotation = input<NgtEuler>();
+	scale = input<NgtVector3>([1, 1, 1]);
+	quaternion = input<NgtQuaternion>();
+	userData = input<NgtThreeElements['ngt-object3D']['userData']>();
+	name = input<NgtThreeElements['ngt-object3D']['name']>();
 	options = input(colliderDefaultOptions, { transform: mergeInputs(rigidBodyDefaultOptions) });
 
 	private object3DParameters = computed(() => {
@@ -70,7 +70,7 @@ export class NgtrAnyCollider {
 			this.name(),
 		];
 
-		const parameters = { position, scale, userData, name };
+		const parameters = { position, scale, userData, name: name || `${untracked(this.shape)}-${Date.now()}` };
 
 		if (quaternion) {
 			Object.assign(parameters, { quaternion });
@@ -85,6 +85,7 @@ export class NgtrAnyCollider {
 
 	// TODO: change this to input required when Angular allows setting hostDirective input
 	shape = model<NgtrColliderShape | undefined>(undefined, { alias: 'collider' });
+	// NOTE: this will be typed by individual collider
 	args = model<unknown[]>([]);
 
 	collisionEnter = output<NgtrCollisionEnterPayload>();
@@ -442,11 +443,11 @@ export class NgtrRigidBody {
 			return value;
 		},
 	});
-	position = input<NgtVector3 | undefined>([0, 0, 0]);
-	rotation = input<NgtEuler | undefined>([0, 0, 0]);
-	scale = input<NgtVector3 | undefined>([1, 1, 1]);
-	quaternion = input<NgtQuaternion | undefined>([0, 0, 0, 1]);
-	userData = input<NgtThreeElements['ngt-object3D']['userData'] | undefined>(undefined);
+	position = input<NgtVector3>([0, 0, 0]);
+	rotation = input<NgtEuler>();
+	scale = input<NgtVector3>([1, 1, 1]);
+	quaternion = input<NgtQuaternion>();
+	userData = input<NgtThreeElements['ngt-object3D']['userData']>();
 	options = input(rigidBodyDefaultOptions, { transform: mergeInputs(rigidBodyDefaultOptions) });
 
 	private object3DParameters = computed(() => {