Working on getting tiles to load

game/dist/.gitignore

@@ -0,0 +1 @@
+!**/env/

game/dist/assets/env/env_beachTile/beachTile.tsx

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.8" tiledversion="1.8.4" name="beach" tilewidth="128" tileheight="128" tilecount="1" columns="0">
+ <grid orientation="orthogonal" width="1" height="1"/>
+ <tile id="0">
+  <image width="128" height="128" source="env_beachTile.png"/>
+ </tile>
+</tileset>

game/dist/assets/env/env_beachTile/beachTileSwirly.tsx

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.8" tiledversion="1.8.4" name="beachTileSwirly" tilewidth="128" tileheight="128" tilecount="1" columns="0">
+ <grid orientation="orthogonal" width="1" height="1"/>
+ <tile id="0">
+  <image width="128" height="128" source="env_beachTileSwirly.png"/>
+ </tile>
+</tileset>

game/dist/map_gameMap.tmx

@@ -2,7 +2,7 @@
 <map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="128" tileheight="128" infinite="1" nextlayerid="2" nextobjectid="1">
  <tileset firstgid="1" source="assets/env/env_beachTile/beachTile.tsx"/>
  <tileset firstgid="2" source="assets/env/env_beachTile/beachTileSwirly.tsx"/>
- <layer id="1" name="Tile Layer 1" width="30" height="20">
+ <layer id="1" name="Floor" width="30" height="20">
   <data encoding="csv">
    <chunk x="-16" y="-16" width="16" height="16">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,

game/game_logic/Cargo.toml

@@ -25,4 +25,5 @@ thiserror = "1.0.30"
 approx = "0.5.1"
 poll-promise = { version = "0.1.0", features = ["tokio"] }
 tempfile = "3.3.0"
-nalgebra = "0.30.1"
+nalgebra = "0.30.1"
+tiled = "0.10.1"

game/game_logic/src/coord_convert.rs

@@ -0,0 +1,11 @@
+use nalgebra as na;
+
+/// Converts from the tiled coordinate system to the game coordinate system.
+pub fn tiled_to_game(vec: na::Vector2<f32>) -> na::Vector2<f32> {
+    na::Vector2::new(vec.x, vec.y * -1.0)
+}
+
+/// Converts from the game coordinate system to the tiled coordinate system.
+pub fn game_to_tiled(vec: na::Vector2<f32>) -> na::Vector2<f32> {
+    tiled_to_game(vec)
+}

game/game_logic/src/lib.rs

@@ -40,6 +40,7 @@ pub(crate) mod project_constants;
 pub(crate) mod rendering;
 pub(crate) mod scenes;
 pub(crate) mod model;
+pub(crate) mod coord_convert;
 
 /// This is the game logic entrypoint. Despite being async,
 /// this is expected to block the main thread for rendering and stuff.

game/game_logic/src/rendering/utilities/map_render.rs

@@ -0,0 +1,96 @@
+use std::{collections::HashMap, sync::Arc};
+
+use crate::asset_manager::InternalData;
+use nalgebra as na;
+use tiled::{Loader, ResourceCache, ResourcePath, ResourcePathBuf, Tileset};
+
+/// Possible errors generated by the map loading process
+#[derive(Debug, thiserror::Error)]
+pub enum MapRenderError {
+    #[error("Could not load embedded asset: {0}")]
+    AssetNotFound(String),
+    #[error(transparent)]
+    TiledError(#[from] tiled::Error),
+}
+
+#[derive(Debug)]
+struct ProgramDataTileCache {
+    tilesets: HashMap<ResourcePathBuf, Arc<Tileset>>,
+    internal_loader: Loader,
+}
+
+impl ProgramDataTileCache {
+    fn new() -> Self {
+        Self {
+            tilesets: HashMap::new(),
+            internal_loader: Loader::new(),
+        }
+    }
+}
+
+impl ResourceCache for ProgramDataTileCache {
+    /// Load the tileset. First attempts to pull from an in-RAM cache, otherwise attempts to load from disk.
+    fn get_tileset(&self, path: impl AsRef<ResourcePath>) -> Option<Arc<Tileset>> {
+        let possibly_cached_tileset = self.tilesets.get(path.as_ref()).map(Clone::clone);
+        if let Some(tileset) = possibly_cached_tileset {
+            return Some(tileset);
+        } else {
+            // Pull the TSX from storage and parse it
+            InternalData::get(path.as_ref().to_str().unwrap()).map(|file| {
+                let data = file.data.into_owned();
+                Arc::new(
+                    self.internal_loader
+                        .load_tsx_tileset_from(data.as_slice(), path)
+                        .unwrap(),
+                )
+            })
+
+            // .ok_or(MapRenderError::AssetNotFound(path.to_string()))?
+            // .data
+            // .into_owned();
+        }
+    }
+
+    fn get_or_try_insert_tileset_with<F, E>(
+        &mut self,
+        path: ResourcePathBuf,
+        f: F,
+    ) -> Result<Arc<Tileset>, E>
+    where
+        F: FnOnce() -> Result<Tileset, E>,
+    {
+        Ok(match self.tilesets.entry(path) {
+            std::collections::hash_map::Entry::Occupied(o) => o.into_mut(),
+            std::collections::hash_map::Entry::Vacant(v) => v.insert(Arc::new(f()?)),
+        }
+        .clone())
+    }
+}
+
+#[derive(Debug)]
+pub struct MapRenderer {}
+
+impl MapRenderer {
+    /// Construct a new MapRenderer.
+    pub fn new(tmx_path: &str) -> Result<Self, MapRenderError> {
+        // Pull the TMX from storage
+        let data = InternalData::get(tmx_path)
+            .ok_or(MapRenderError::AssetNotFound(tmx_path.to_string()))?
+            .data
+            .into_owned();
+
+        // Attempt to parse the TMX file
+        let mut loader = Loader::with_cache(ProgramDataTileCache::new());
+        let map = loader.load_tmx_map_from(data.as_slice(), tmx_path)?;
+
+        Ok(Self {})
+    }
+
+    pub fn sample_friction_at(&self, position: na::Vector2<f32>) -> f32 {
+        todo!()
+    }
+
+    pub fn sample_temperature_at(&self, position: na::Vector2<f32>) -> f32 {
+        todo!()
+    }
+}

game/game_logic/src/rendering/utilities/mod.rs

@@ -1 +1,2 @@
-pub mod anim_texture;
+pub mod anim_texture;
+pub mod map_render;

game/game_logic/src/scenes/mod.rs

@@ -53,8 +53,8 @@ impl SceneRenderDelegate {
         constants: &ProjectConstants,
     ) {
         // For now, we will just render the game scene
-        self.scene_playable
-            .render_frame(raylib, rl_thread, &discord, global_resources, constants)
+        self.scene_test_fox
+            .render_frame(raylib, rl_thread, &discord, global_resources)
             .await;
     }
 }

game/game_logic/src/scenes/test_fox.rs

@@ -6,12 +6,13 @@ use nalgebra as na;
 
 use crate::{
     discord::DiscordChannel, global_resource_package::GlobalResources,
-    rendering::utilities::anim_texture::AnimatedTexture,
+    rendering::utilities::{anim_texture::AnimatedTexture, map_render::MapRenderer},
 };
 
 #[derive(Debug)]
 pub struct TestFoxScene {
     fox_animation: AnimatedTexture,
+    world_map: MapRenderer
 }
 
 impl TestFoxScene {
@@ -20,11 +21,14 @@ impl TestFoxScene {
         // Load the fox texture
         let fox = AnimatedTexture::new(raylib_handle, thread, "chr", "testFox").unwrap();
 
-        Self { fox_animation: fox }
+        // Load the map
+        let map_renderer = MapRenderer::new("map_gameMap.tmx").unwrap();
+
+        Self { fox_animation: fox, world_map: map_renderer }
     }
 
     /// Handler for each frame
-    pub fn render_frame(
+    pub async fn render_frame(
         &mut self,
         raylib: &mut RaylibHandle,
         rl_thread: &RaylibThread,