Rebased on main

ManevilleF · Jul 13, 2023 · a7bad1d · a7bad1d
1 parent 1b08b6c
commit a7bad1d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -313,7 +313,12 @@ impl Plugin for ClothPlugin {
             Update,
             (
                 systems::cloth::init,
-                (systems::cloth::update, systems::cloth::render).chain(),
+                (
+                    systems::cloth::inflate,
+                    systems::cloth::update,
+                    systems::cloth::render,
+                )
+                    .chain(),
             ),
         );
         #[cfg(feature = "rapier_collisions")]

diff --git a/src/systems/cloth.rs b/src/systems/cloth.rs
@@ -71,12 +71,6 @@ pub fn render(
 
 pub fn init(
     mut commands: Commands,
-<<<<<<< HEAD
-    mut query: Query<(Entity, &ClothBuilder, &GlobalTransform, &Handle<Mesh>), Added<ClothBuilder>>,
-    meshes: Res<Assets<Mesh>>,
-) {
-    for (entity, builder, transform, handle) in query.iter_mut() {
-=======
     mut query: Query<
         (
             Entity,
@@ -90,7 +84,6 @@ pub fn init(
     meshes: Res<Assets<Mesh>>,
 ) {
     for (entity, builder, transform, handle, inflator) in query.iter_mut() {
->>>>>>> Sick based inflator
         if let Some(mesh) = meshes.get(handle) {
             let matrix = transform.compute_matrix();
             log::debug!("Initializing Cloth entity {:?}", entity);
@@ -115,7 +108,7 @@ pub fn init(
                     inflator.stick_mode(),
                     inflator.anchor,
                     &matrix,
-                    |_| true,
+                    |_, _| true,
                 );
                 inflator.sticks = sticks;
             }