1 files changed, 14 insertions(+), 10 deletions(-)

M server/src/main.rs

@@ 968,16 968,20 @@ fn load_savefile(
             let mut offset = Vec2::ZERO;
             let mut angle_offset = 0.;
             if i == 2 {
-                offset = Vec2::new(53., -53.);
+                //offset = Vec2::new(53., -53.);
+                offset = Vec2::new(0., -53.);
                 angle_offset = 0.;
             } else if i == 0 {
-                offset = Vec2::new(-53., 53.);
+                //offset = Vec2::new(-53., 53.);
+                offset = Vec2::new(0., 53.);
                 angle_offset = PI;
             } else if i == 1 {
-                offset = Vec2::new(53., 53.);
+                //offset = Vec2::new(53., 53.);
+                offset = Vec2::new(53., 0.);
                 angle_offset = PI / 2.;
             } else if i == 3 {
-                offset = Vec2::new(-53., -53.);
+                //offset = Vec2::new(-53., 53.);
+                offset = Vec2::new(-53., 0.);
                 angle_offset = -PI / 2.;
             }
 


@@ 985,8 989,8 @@ fn load_savefile(
                 let module = commands.spawn(PartBundle {
                     transform: TransformBundle::from(
                         Transform::from_xyz(
-                            p_pos.x + offset.x / SCALE * angle.cos(),
-                            p_pos.y + offset.y / SCALE * angle.sin(),
+                            (p_pos.x + offset.x * angle.cos()) / SCALE,
+                            (p_pos.y + offset.y * angle.sin()) / SCALE,
                             0.,
                         )
                         .with_rotation(Quat::from_euler(


@@ 1048,8 1052,8 @@ fn load_savefile(
                 .insert(ReadMassProperties::default());
 
             let joint = FixedJointBuilder::new()
-                .local_anchor1(vec2(-53. / SCALE, 0. / SCALE))
-                .local_basis2(-PI / 2.);
+                .local_anchor1(vec2(offset.x / SCALE, offset.y / SCALE))
+                .local_basis2(angle_offset);
 
             module.insert(ImpulseJoint::new(parent, joint));
 


@@ 1065,8 1069,8 @@ fn load_savefile(
                     .insert(PartBundle {
                         transform: TransformBundle::from(
                             Transform::from_xyz(
-                                p_pos.x + offset.x / SCALE * angle.cos(),
-                                p_pos.y + offset.y / SCALE * angle.sin(),
+                                (p_pos.x + offset.x * angle.cos()) / SCALE,
+                                (p_pos.y + offset.y * angle.sin()) / SCALE,
                                 0.,
                             )
                             .with_rotation(Quat::from_euler(