use new spawn api

src/player.rs

@@ -64,37 +64,33 @@ fn spawn(
     let gravity = Vector::NEG_Y * 40.0;
     let collider = Collider::capsule(0.9, 1.2);
 
-    commands
-        .spawn((
-            Name::from("player"),
-            Player,
-            ActiveHead(0),
-            ActiveHeads::new([
-                Some(HeadState::new(0, heads_db.as_ref())),
-                Some(HeadState::new(3, heads_db.as_ref())),
-                Some(HeadState::new(6, heads_db.as_ref())),
-                Some(HeadState::new(10, heads_db.as_ref())),
-                Some(HeadState::new(9, heads_db.as_ref())),
-            ]),
-            Hitpoints::new(100),
-            CameraTarget,
-            transform,
+    commands.spawn((
+        Name::from("player"),
+        Player,
+        ActiveHead(0),
+        ActiveHeads::new([
+            Some(HeadState::new(0, heads_db.as_ref())),
+            Some(HeadState::new(3, heads_db.as_ref())),
+            Some(HeadState::new(6, heads_db.as_ref())),
+            Some(HeadState::new(10, heads_db.as_ref())),
+            Some(HeadState::new(9, heads_db.as_ref())),
+        ]),
+        Hitpoints::new(100),
+        CameraTarget,
+        transform,
+        Visibility::default(),
+        // LockedAxes::ROTATION_LOCKED, todo
+        CollisionLayers::new(LayerMask(GameLayer::Player.to_bits()), LayerMask::ALL),
+        CharacterControllerBundle::new(collider, gravity),
+        children![(
+            Name::new("player-rig"),
+            Transform::default(),
             Visibility::default(),
-            // LockedAxes::ROTATION_LOCKED, todo
-            CollisionLayers::new(LayerMask(GameLayer::Player.to_bits()), LayerMask::ALL),
-            CharacterControllerBundle::new(collider, gravity),
-        ))
-        .with_children(|parent| {
-            parent
-                .spawn((
-                    Name::new("player-rig"),
-                    Transform::default(),
-                    Visibility::default(),
-                    PlayerBodyMesh,
-                    CameraArmRotation,
-                ))
-                .with_child(AnimatedCharacter(0));
-        });
+            PlayerBodyMesh,
+            CameraArmRotation,
+            children![AnimatedCharacter(0)]
+        )],
+    ));
 
     commands.spawn((
         AudioPlayer::new(asset_server.load("sfx/heads/angry demonstrator.ogg")),