Compare commits

..

No commits in common. "2358d53b7a060a323c25882ff1b61ac15586973d" and "9d82ddbf0956555fd21dbcb0f1b6bb6523c90a9a" have entirely different histories.

3 changed files with 19 additions and 16 deletions

View File

@ -157,31 +157,28 @@ fn wheels_helper(
}; };
let xform = Transform::from_translation(position); let xform = Transform::from_translation(position);
let hub_mesh: Mesh = Sphere::new(0.1).into();
let hub = commands let hub = commands
.spawn(( .spawn((
Name::new("hub"), Name::new("hub"),
SpatialBundle::from_transform(xform),
RigidBody::Dynamic, RigidBody::Dynamic,
MassPropertiesBundle::new_computed(&Collider::sphere(0.1), 200.0), MassPropertiesBundle::new_computed(&Collider::sphere(0.1), 200.0),
PbrBundle {
mesh: meshes.add(hub_mesh),
material: materials.add(wheel_material.clone()),
transform: xform,
..Default::default()
},
)) ))
.with_children(|parent| {
let mesh: Mesh = Sphere::new(0.1).into();
parent.spawn(PbrBundle {
mesh: meshes.add(mesh),
material: materials.add(wheel_material.clone()),
..Default::default()
});
})
.id(); .id();
let tire = commands let tire = commands
.spawn(( .spawn((
Name::new("tire"), Name::new("tire"),
PbrBundle { SpatialBundle::from_transform(xform),
mesh: meshes.add(tire_mesh),
material: materials.add(wheel_material.clone()),
transform: xform,
..Default::default()
},
CyberWheel, CyberWheel,
RigidBody::Dynamic, RigidBody::Dynamic,
collider, collider,
@ -193,6 +190,13 @@ fn wheels_helper(
CollisionMargin(0.05), CollisionMargin(0.05),
SweptCcd::NON_LINEAR, SweptCcd::NON_LINEAR,
)) ))
.with_children(|p| {
p.spawn(PbrBundle {
mesh: meshes.add(tire_mesh),
material: materials.add(wheel_material.clone()),
..Default::default()
});
})
.id(); .id();
// connect hubs and tires to make wheels // connect hubs and tires to make wheels

View File

@ -43,7 +43,6 @@ fn ground_and_light(
) { ) {
commands commands
.spawn(( .spawn((
SpatialBundle::default(),
RigidBody::Static, RigidBody::Static,
Collider::cuboid(50.0, 0.5, 50.0), Collider::cuboid(50.0, 0.5, 50.0),
CollisionMargin(0.1), CollisionMargin(0.1),
@ -54,7 +53,7 @@ fn ground_and_light(
p.spawn(PbrBundle { p.spawn(PbrBundle {
mesh: meshes.add(Plane3d::default().mesh().size(50.0, 50.0)), mesh: meshes.add(Plane3d::default().mesh().size(50.0, 50.0)),
material: materials.add(Color::from(SILVER)), material: materials.add(Color::from(SILVER)),
transform: Transform::from_xyz(0.0, 0.4, 0.0), transform: Transform::from_xyz(0.0, 1.0, 0.0),
..default() ..default()
}); });
}); });

View File

@ -18,7 +18,7 @@ pub struct CatControllerSettings {
impl Default for CatControllerSettings { impl Default for CatControllerSettings {
fn default() -> Self { fn default() -> Self {
Self { Self {
kp: 1200.0, kp: 950.0,
kd: 10.0, kd: 10.0,
ki: 50.0, ki: 50.0,
} }