Use Transform instead of Position and Rotation in examples

README.md

@@ -94,25 +94,25 @@ fn setup(
 ) {
     // Plane
     commands.spawn((
+        RigidBody::Static,
+        Collider::cuboid(8.0, 0.002, 8.0),
         PbrBundle {
             mesh: meshes.add(Mesh::from(shape::Plane::from_size(8.0))),
             material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
             ..default()
         },
-        RigidBody::Static,
-        Collider::cuboid(8.0, 0.002, 8.0),
     ));
     // Cube
     commands.spawn((
+        RigidBody::Dynamic,
+        AngularVelocity(Vec3::new(2.5, 3.4, 1.6)),
+        Collider::cuboid(1.0, 1.0, 1.0),
         PbrBundle {
             mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
             material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+            transform: Transform::from_xyz(0.0, 4.0, 0.0),
             ..default()
         },
-        RigidBody::Dynamic,
-        Position(Vec3::Y * 4.0),
-        AngularVelocity(Vec3::new(2.5, 3.4, 1.6)),
-        Collider::cuboid(1.0, 1.0, 1.0),
     ));
     // Light
     commands.spawn(PointLightBundle {

crates/bevy_xpbd_2d/examples/chain_2d.rs

@@ -1,6 +1,10 @@
 #![allow(clippy::unnecessary_cast)]
 
-use bevy::{prelude::*, sprite::MaterialMesh2dBundle, window::PrimaryWindow};
+use bevy::{
+    prelude::*,
+    sprite::{MaterialMesh2dBundle, Mesh2dHandle},
+    window::PrimaryWindow,
+};
 use bevy_xpbd_2d::{math::*, prelude::*};
 use examples_common_2d::XpbdExamplePlugin;
 
@@ -27,27 +31,40 @@ fn setup(
 
     let particle_count = 100;
     let particle_radius = 1.2;
-    let particle_mesh = MaterialMesh2dBundle {
-        mesh: meshes
-            .add(shape::Circle::new(particle_radius as f32).into())
-            .into(),
-        material: materials.add(ColorMaterial::from(Color::rgb(0.2, 0.7, 0.9))),
-        ..default()
-    };
+    let particle_mesh: Mesh2dHandle = meshes
+        .add(shape::Circle::new(particle_radius as f32).into())
+        .into();
+    let particle_material = materials.add(ColorMaterial::from(Color::rgb(0.2, 0.7, 0.9)));
 
     // Spawn kinematic particle that can follow the mouse
     let mut previous_particle = commands
-        .spawn((particle_mesh.clone(), RigidBody::Kinematic, FollowMouse))
+        .spawn((
+            RigidBody::Kinematic,
+            FollowMouse,
+            MaterialMesh2dBundle {
+                mesh: particle_mesh.clone(),
+                material: particle_material.clone_weak(),
+                ..default()
+            },
+        ))
         .id();
 
     // Spawn the rest of the particles, connecting each one to the previous one with joints
     for i in 1..particle_count {
         let current_particle = commands
             .spawn((
-                particle_mesh.clone(),
                 RigidBody::Dynamic,
-                Position(i as Scalar * Vector::NEG_Y * (particle_radius * 2.0 + 1.0)),
                 MassPropertiesBundle::new_computed(&Collider::ball(particle_radius), 1.0),
+                MaterialMesh2dBundle {
+                    mesh: particle_mesh.clone(),
+                    material: particle_material.clone_weak(),
+                    transform: Transform::from_xyz(
+                        0.0,
+                        i as f32 * (particle_radius as f32 * 2.0 + 1.0),
+                        0.0,
+                    ),
+                    ..default()
+                },
             ))
             .id();
 
@@ -65,7 +82,7 @@ fn follow_mouse(
     buttons: Res<Input<MouseButton>>,
     windows: Query<&Window, With<PrimaryWindow>>,
     camera: Query<(&Camera, &GlobalTransform)>,
-    mut follower: Query<&mut Position, With<FollowMouse>>,
+    mut follower: Query<&mut Transform, With<FollowMouse>>,
 ) {
     if buttons.pressed(MouseButton::Left) {
         let window = windows.single();
@@ -76,7 +93,8 @@ fn follow_mouse(
             .cursor_position()
             .and_then(|cursor| camera.viewport_to_world_2d(camera_transform, cursor))
         {
-            follower_position.0 = cursor_world_pos.adjust_precision();
+            follower_position.translation =
+                cursor_world_pos.extend(follower_position.translation.z);
         }
     }
 }

crates/bevy_xpbd_2d/examples/collision_layers.rs

@@ -35,10 +35,10 @@ fn setup(
                 custom_size: Some(Vec2::new(500.0, 25.0)),
                 ..default()
             },
+            transform: Transform::from_xyz(0.0, -50.0, 0.0),
             ..default()
         },
         RigidBody::Static,
-        Position(Vector::NEG_Y * 50.0),
         Collider::cuboid(500.0, 25.0),
         CollisionLayers::new([Layer::Blue], [Layer::Blue]),
     ));
@@ -51,34 +51,34 @@ fn setup(
                 custom_size: Some(Vec2::new(500.0, 25.0)),
                 ..default()
             },
+            transform: Transform::from_xyz(0.0, -200.0, 0.0),
             ..default()
         },
         RigidBody::Static,
-        Position(Vector::NEG_Y * 200.0),
         Collider::cuboid(500.0, 25.0),
         CollisionLayers::new([Layer::Red], [Layer::Red]),
     ));
 
     let marble_radius = 7.5;
-    let marble_mesh = meshes.add(shape::Circle::new(marble_radius as f32).into());
+    let marble_mesh = meshes.add(shape::Circle::new(marble_radius).into());
 
     // Spawn blue marbles that belong on the blue layer and collide with blue
     let blue_material = materials.add(ColorMaterial::from(Color::rgb(0.2, 0.7, 0.9)));
     for x in -6..6 {
         for y in 0..4 {
-            let position = Vector::new(
-                x as Scalar * (2.5 * marble_radius),
-                (y as Scalar) * (2.5 * marble_radius),
-            );
             commands.spawn((
                 MaterialMesh2dBundle {
                     mesh: marble_mesh.clone().into(),
                     material: blue_material.clone(),
+                    transform: Transform::from_xyz(
+                        x as f32 * 2.5 * marble_radius,
+                        y as f32 * 2.5 * marble_radius + 200.0,
+                        0.0,
+                    ),
                     ..default()
                 },
                 RigidBody::Dynamic,
-                Position(position + Vector::Y * 200.0),
-                Collider::ball(marble_radius),
+                Collider::ball(marble_radius as Scalar),
                 CollisionLayers::new([Layer::Blue], [Layer::Blue]),
             ));
         }
@@ -88,19 +88,19 @@ fn setup(
     let red_material = materials.add(ColorMaterial::from(Color::rgb(0.9, 0.3, 0.3)));
     for x in -6..6 {
         for y in -4..0 {
-            let position = Vector::new(
-                x as Scalar * (2.5 * marble_radius),
-                (y as Scalar) * (2.5 * marble_radius),
-            );
             commands.spawn((
                 MaterialMesh2dBundle {
                     mesh: marble_mesh.clone().into(),
                     material: red_material.clone(),
+                    transform: Transform::from_xyz(
+                        x as f32 * 2.5 * marble_radius,
+                        y as f32 * 2.5 * marble_radius + 200.0,
+                        0.0,
+                    ),
                     ..default()
                 },
                 RigidBody::Dynamic,
-                Position(position + Vector::Y * 200.0),
-                Collider::ball(marble_radius),
+                Collider::ball(marble_radius as Scalar),
                 CollisionLayers::new([Layer::Red], [Layer::Red]),
             ));
         }

crates/bevy_xpbd_2d/examples/distance_joint_2d.rs

@@ -15,34 +15,42 @@ fn main() {
 fn setup(mut commands: Commands) {
     commands.spawn(Camera2dBundle::default());
 
-    let square = SpriteBundle {
-        sprite: Sprite {
-            color: Color::rgb(0.2, 0.7, 0.9),
-            custom_size: Some(Vec2::splat(50.0)),
-            ..default()
-        },
+    let square_sprite = Sprite {
+        color: Color::rgb(0.2, 0.7, 0.9),
+        custom_size: Some(Vec2::splat(50.0)),
         ..default()
     };
 
-    let anchor = commands.spawn((square.clone(), RigidBody::Kinematic)).id();
+    let anchor = commands
+        .spawn((
+            SpriteBundle {
+                sprite: square_sprite.clone(),
+                ..default()
+            },
+            RigidBody::Kinematic,
+        ))
+        .id();
 
     let object = commands
         .spawn((
-            square,
+            SpriteBundle {
+                sprite: square_sprite,
+                transform: Transform::from_xyz(0.0, -100.0, 0.0),
+                ..default()
+            },
             RigidBody::Dynamic,
-            Position(-Vector::Y * 100.0),
             MassPropertiesBundle::new_computed(&Collider::cuboid(50.0, 50.0), 1.0),
         ))
         .id();
 
     commands.spawn(
         DistanceJoint::new(anchor, object)
-            .with_local_anchor_1(-Vector::Y * 25.0)
-            .with_local_anchor_2(Vector::ONE * 25.0)
+            .with_local_anchor_1(Vector::ZERO)
+            .with_local_anchor_2(Vector::ZERO)
             .with_rest_length(100.0)
-            // .with_linear_velocity_damping(0.1)
+            .with_linear_velocity_damping(0.1)
             .with_angular_velocity_damping(1.0)
-            .with_limits(55.0, 150.0)
-            .with_compliance(1.0 / 50000.0),
+            .with_limits(140.0, 150.0)
+            .with_compliance(0.00000001),
     );
 }

crates/bevy_xpbd_2d/examples/fixed_joint_2d.rs

@@ -15,24 +15,31 @@ fn main() {
 fn setup(mut commands: Commands) {
     commands.spawn(Camera2dBundle::default());
 
-    let square = SpriteBundle {
-        sprite: Sprite {
-            color: Color::rgb(0.2, 0.7, 0.9),
-            custom_size: Some(Vec2::splat(50.0)),
-            ..default()
-        },
+    let square_sprite = Sprite {
+        color: Color::rgb(0.2, 0.7, 0.9),
+        custom_size: Some(Vec2::splat(50.0)),
         ..default()
     };
 
     let anchor = commands
-        .spawn((square.clone(), RigidBody::Kinematic, AngularVelocity(1.5)))
+        .spawn((
+            SpriteBundle {
+                sprite: square_sprite.clone(),
+                ..default()
+            },
+            RigidBody::Kinematic,
+            AngularVelocity(1.5),
+        ))
         .id();
 
     let object = commands
         .spawn((
-            square,
+            SpriteBundle {
+                sprite: square_sprite,
+                transform: Transform::from_xyz(100.0, 0.0, 0.0),
+                ..default()
+            },
             RigidBody::Dynamic,
-            Position(Vector::X * 100.0),
             MassPropertiesBundle::new_computed(&Collider::cuboid(50.0, 50.0), 1.0),
         ))
         .id();