버그픽스 오브젝트 추가할대 버그 수정

python8965 · python8965 · commit 15a667b43e15 · 2023-05-03T23:59:04.000+09:00
diff --git a/src/app/simulations/classic_simulation.rs b/src/app/simulations/classic_simulation.rs
@@ -182,6 +182,7 @@ impl Simulation for ClassicSimulation {
                                 position: vector![pointer_pos.x, pointer_pos.y],
                                 ..CSObjectState::default()
                             })
+                            .at(state.current_step)
                             .build(),
                         );
                     }
@@ -207,9 +208,8 @@ impl Simulation for ClassicSimulation {
 
         let length = self.objects.len();
 
-        for i in 1..length+1 {
-
-            let (front, end) = self.objects.split_at_mut(i-1);
+        for i in 1..length + 1 {
+            let (front, end) = self.objects.split_at_mut(i - 1);
 
             let Some((obj, rest)) = end.split_first_mut() else {panic!("Cannot Reach")};
 
@@ -224,10 +224,13 @@ impl Simulation for ClassicSimulation {
             physics_system(obj, self.global_acc_list.iter().sum());
 
             for obj2 in rest {
-
                 let obj2_state = &mut obj2.current_state();
 
-                if let Some(contact) = obj_state.shape.contact(obj_state.position, &obj2_state.shape, obj2_state.position){
+                if let Some(contact) = obj_state.shape.contact(
+                    obj_state.position,
+                    &obj2_state.shape,
+                    obj2_state.position,
+                ) {
                     info!("{:?}", contact);
                 }
             }
diff --git a/src/app/simulations/classic_simulation/object/builder.rs b/src/app/simulations/classic_simulation/object/builder.rs
@@ -1,8 +1,7 @@
-
-use crate::app::simulations::classic_simulation::CSimObject;
-use crate::app::simulations::classic_simulation::object::AttachedFn;
 use crate::app::simulations::classic_simulation::object::shape::ObjectShape;
 use crate::app::simulations::classic_simulation::object::state::CSObjectState;
+use crate::app::simulations::classic_simulation::object::AttachedFn;
+use crate::app::simulations::classic_simulation::CSimObject;
 
 pub struct CSimObjectBuilder {
     init_state: Option<CSObjectState>,
@@ -21,7 +20,7 @@ impl CSimObjectBuilder {
         }
     }
 
-    pub fn init_timestep(mut self, init_timestep: usize) -> Self {
+    pub fn at(mut self, init_timestep: usize) -> Self {
         self.init_timestep = Some(init_timestep);
         self
     }

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`		`-`
`2`		`-use crate::app::simulations::classic_simulation::CSimObject;`
`3`		`-use crate::app::simulations::classic_simulation::object::AttachedFn;`
`4`	`1`	`use crate::app::simulations::classic_simulation::object::shape::ObjectShape;`
`5`	`2`	`use crate::app::simulations::classic_simulation::object::state::CSObjectState;`
	`3`	`+use crate::app::simulations::classic_simulation::object::AttachedFn;`
	`4`	`+use crate::app::simulations::classic_simulation::CSimObject;`
`6`	`5`
`7`	`6`	`pub struct CSimObjectBuilder {`
`8`	`7`	`init_state: Option<CSObjectState>,`
`@@ -21,7 +20,7 @@ impl CSimObjectBuilder {`
`21`	`20`	`}`
`22`	`21`	`}`
`23`	`22`
`24`		`- pub fn init_timestep(mut self, init_timestep: usize) -> Self {`
	`23`	`+ pub fn at(mut self, init_timestep: usize) -> Self {`
`25`	`24`	`self.init_timestep = Some(init_timestep);`
`26`	`25`	`self`
`27`	`26`	`}`