Add sprites for pipe rendering

Author: BloodStainedCrow

src/rendering/mod.rs

@@ -181,6 +181,8 @@ pub struct TextureAtlas {
 
     underground: enum_map::EnumMap<Dir, enum_map::EnumMap<UndergroundDir, EntitySprite>>,
 
+    pipe: Vec<enum_map::EnumMap<Dir, EntitySprite>>,
+
     accumulator: EntitySprite,
 
     mining_drill: EntitySprite,
@@ -303,6 +305,15 @@ fn texture_atlas() -> TextureAtlas {
         items: vec![sprite_from_path!("temp_assets/plate.png", 1); 200].into_boxed_slice(),
 
         player: sprite_from_path!("temp_assets/player.png", 1),
+        pipe: vec![
+            enum_map::EnumMap::from_array([
+                entity_sprite_from_path_scaled!("temp_assets/belt_north.png", 1, 1.0),
+                entity_sprite_from_path_scaled!("temp_assets/belt_east.png", 1, 1.0),
+                entity_sprite_from_path_scaled!("temp_assets/belt_south.png", 1, 1.0),
+                entity_sprite_from_path_scaled!("temp_assets/belt_west.png", 1, 1.0),
+            ]);
+            10
+        ],
         belt: belts,
 
         belt_corners: enum_map::EnumMap::from_array([
@@ -352,6 +363,75 @@ fn texture_atlas() -> TextureAtlas {
 
         no_power: entity_sprite_from_path_scaled!("temp_assets/no_power.png", 1, 1.0),
 
+        pipe: vec![
+            enum_map::EnumMap::from_array([
+                entity_sprite_from_path_scaled!(
+                    "temp_assets/krastorio/steel-pipe-cross.png",
+                    1,
+                    1.0
+                ),
+                entity_sprite_from_path_scaled!(
+                    "temp_assets/krastorio/steel-pipe-cross.png",
+                    1,
+                    1.0
+                ),
+                entity_sprite_from_path_scaled!(
+                    "temp_assets/krastorio/steel-pipe-cross.png",
+                    1,
+                    1.0
+                ),
+                entity_sprite_from_path_scaled!(
+                    "temp_assets/krastorio/steel-pipe-cross.png",
+                    1,
+                    1.0
+                ),
+            ]),
+            enum_map::EnumMap::from_array([
+                entity_sprite_from_path_scaled!(
+                    "temp_assets/krastorio/steel-pipe-to-ground-up.png",
+                    1,
+                    1.0
+                ),
+                entity_sprite_from_path_scaled!(
+                    "temp_assets/krastorio/steel-pipe-to-ground-right.png",
+                    1,
+                    1.0
+                ),
+                entity_sprite_from_path_scaled!(
+                    "temp_assets/krastorio/steel-pipe-to-ground-down.png",
+                    1,
+                    1.0
+                ),
+                entity_sprite_from_path_scaled!(
+                    "temp_assets/krastorio/steel-pipe-to-ground-left.png",
+                    1,
+                    1.0
+                ),
+            ]),
+            enum_map::EnumMap::from_array([
+                entity_sprite_from_path_scaled!(
+                    "temp_assets/krastorio/big-storage-tank.png",
+                    1,
+                    1.0
+                ),
+                entity_sprite_from_path_scaled!(
+                    "temp_assets/krastorio/big-storage-tank.png",
+                    1,
+                    1.0
+                ),
+                entity_sprite_from_path_scaled!(
+                    "temp_assets/krastorio/big-storage-tank.png",
+                    1,
+                    1.0
+                ),
+                entity_sprite_from_path_scaled!(
+                    "temp_assets/krastorio/big-storage-tank.png",
+                    1,
+                    1.0
+                ),
+            ]),
+        ],
+
         assembler: vec![
             // TODO: Add animation for assembling machine
             entity_sprite_from_path_tiling!(

src/rendering/render_world.rs

@@ -1370,7 +1370,7 @@ pub fn render_world<ItemIdxType: IdxTrait, RecipeIdxType: IdxTrait>(
                                             let size =
                                                 data_store.fluid_tank_infos[usize::from(*ty)].size;
 
-                                            texture_atlas.belt[*rotation].draw(
+                                            texture_atlas.pipe[*ty as usize][*rotation].draw(
                                                 [
                                                     draw_offset.0 + pos.x as f32,
                                                     draw_offset.1 + pos.y as f32,
@@ -1787,13 +1787,12 @@ pub fn render_world<ItemIdxType: IdxTrait, RecipeIdxType: IdxTrait>(
                         pos,
                         rotation,
                     } => {
-                        let size: [u16; 2] = [1, 1];
-                        texture_atlas.belt[*rotation].draw(
+                        let size = data_store.fluid_tank_infos[usize::from(*ty)].size;
+
+                        texture_atlas.pipe[*ty as usize][*rotation].draw(
                             [
-                                pos.x as f32 - camera_pos.0
-                                    + num_tiles_across_screen_horizontal / 2.0,
-                                pos.y as f32 - camera_pos.1
-                                    + num_tiles_across_screen_vertical / 2.0,
+                                draw_offset.0 + pos.x as f32,
+                                draw_offset.1 + pos.y as f32,
                             ],
                             size,
                             0,