Fix ignored entity pivot

src/utils.rs

@@ -85,11 +85,9 @@ pub fn calculate_transform_from_entity_instance(
 
     let size = IVec2::new(entity_instance.width, entity_instance.height);
 
-    let translation = ldtk_pixel_coords_to_translation_pivoted(
+    let translation = ldtk_pixel_coords_to_translation(
         entity_instance.px,
         level_height,
-        size,
-        entity_instance.pivot,
     );
     let scale = size.as_vec2() / def_size.as_vec2();
 
@@ -227,13 +225,16 @@ pub fn ldtk_pixel_coords_to_translation_pivoted(
     entity_size: IVec2,
     pivot: Vec2,
 ) -> Vec2 {
-    let pivot_point = ldtk_coord_conversion(ldtk_coords, ldtk_pixel_height).as_vec2();
+	// Find entity's LDtk-defined position.
+    let translation = ldtk_coord_conversion(ldtk_coords, ldtk_pixel_height).as_vec2();
 
+	// Adjust entity pivot so that 0.5 is the center.
     let adjusted_pivot = Vec2::new(0.5 - pivot.x, pivot.y - 0.5);
 
+	// Find the spot on the entity which the pivot corresponds to.
     let offset = entity_size.as_vec2() * adjusted_pivot;
 
-    pivot_point + offset
+    translation + offset
 }
 
 /// Similar to [LayerBuilder::new_batch], except it doesn't consume the [LayerBuilder]
@@ -462,22 +463,22 @@ mod tests {
         };
         let result =
             calculate_transform_from_entity_instance(&entity_instance, &entity_definition_map, 320);
-        assert_eq!(result, Transform::from_xyz(272., 48., 0.));
+        assert_eq!(result, Transform::from_xyz(256., 64., 0.));
 
         // difficult case
         let entity_instance = EntityInstance {
             px: IVec2::new(40, 50),
-            def_uid: 2,
-            width: 30,
-            height: 50,
+            def_uid: 2, // default size: (10, 25)
+            width: 30, // spawned with triple size on X
+            height: 50, // double size on Y
             pivot: Vec2::new(1., 1.),
             ..Default::default()
         };
         let result =
             calculate_transform_from_entity_instance(&entity_instance, &entity_definition_map, 100);
         assert_eq!(
             result,
-            Transform::from_xyz(25., 75., 0.).with_scale(Vec3::new(3., 2., 1.))
+            Transform::from_xyz(40., 50., 0.).with_scale(Vec3::new(3., 2., 1.))
         );
     }
 
@@ -517,7 +518,7 @@ mod tests {
             calculate_transform_from_entity_instance(&entity_instance, &entity_definition_map, 100);
         assert_eq!(
             result,
-            Transform::from_xyz(32., 68., 0.).with_scale(Vec3::new(4., 2., 1.))
+            Transform::from_xyz(64., 36., 0.).with_scale(Vec3::new(4., 2., 1.))
         );
     }