Add basemap datadir

iMilchshake · Sep 9, 2024 · 86f3cc6 · 86f3cc6
1 parent 9bb0510
commit 86f3cc6
Show file tree

Hide file tree

Showing 22 changed files with 21 additions and 8 deletions.
diff --git a/automap_out.map b/automap_out.map
diff --git a/automapper/amazing_freeze.rules → data/automapper/amazing_freeze.rules b/automapper/amazing_freeze.rules → data/automapper/amazing_freeze.rules
diff --git a/automapper/basic_freeze.rules → data/automapper/basic_freeze.rules b/automapper/basic_freeze.rules → data/automapper/basic_freeze.rules
diff --git a/automapper/ddmax_freeze.rules → data/automapper/ddmax_freeze.rules b/automapper/ddmax_freeze.rules → data/automapper/ddmax_freeze.rules
diff --git a/automapper/ddnet_tiles.rules → data/automapper/ddnet_tiles.rules b/automapper/ddnet_tiles.rules → data/automapper/ddnet_tiles.rules
diff --git a/automapper/ddnet_walls.rules → data/automapper/ddnet_walls.rules b/automapper/ddnet_walls.rules → data/automapper/ddnet_walls.rules
diff --git a/automapper/desert_main.rules → data/automapper/desert_main.rules b/automapper/desert_main.rules → data/automapper/desert_main.rules
diff --git a/automapper/fadeout.rules → data/automapper/fadeout.rules b/automapper/fadeout.rules → data/automapper/fadeout.rules
diff --git a/automapper/generic_clear.rules → data/automapper/generic_clear.rules b/automapper/generic_clear.rules → data/automapper/generic_clear.rules
diff --git a/automapper/generic_unhookable.rules → data/automapper/generic_unhookable.rules b/automapper/generic_unhookable.rules → data/automapper/generic_unhookable.rules
diff --git a/automapper/generic_unhookable_0.7.rules → data/automapper/generic_unhookable_0.7.rules b/automapper/generic_unhookable_0.7.rules → data/automapper/generic_unhookable_0.7.rules
diff --git a/automapper/grass_main.rules → data/automapper/grass_main.rules b/automapper/grass_main.rules → data/automapper/grass_main.rules
diff --git a/automapper/grass_main_0.7.rules → data/automapper/grass_main_0.7.rules b/automapper/grass_main_0.7.rules → data/automapper/grass_main_0.7.rules
diff --git a/automapper/jungle_main.rules → data/automapper/jungle_main.rules b/automapper/jungle_main.rules → data/automapper/jungle_main.rules
diff --git a/automapper/jungle_midground.rules → data/automapper/jungle_midground.rules b/automapper/jungle_midground.rules → data/automapper/jungle_midground.rules
diff --git a/automapper/round_tiles.rules → data/automapper/round_tiles.rules b/automapper/round_tiles.rules → data/automapper/round_tiles.rules
diff --git a/automapper/water.rules → data/automapper/water.rules b/automapper/water.rules → data/automapper/water.rules
diff --git a/automapper/winter_main.rules → data/automapper/winter_main.rules b/automapper/winter_main.rules → data/automapper/winter_main.rules
diff --git a/data/basemaps/grass.map b/data/basemaps/grass.map
diff --git a/automap_test.map → data/basemaps/minimalistic_blue.map b/automap_test.map → data/basemaps/minimalistic_blue.map
diff --git a/src/twmap_export.rs b/src/twmap_export.rs
@@ -9,9 +9,13 @@ use twmap::{
 };
 
 #[derive(RustEmbed)]
-#[folder = "automapper/"]
+#[folder = "data/automapper/"]
 pub struct AutoMapperConfigs;
 
+#[derive(RustEmbed)]
+#[folder = "data/basemaps/"]
+pub struct BaseMaps;
+
 impl AutoMapperConfigs {
     pub fn get_config(name: String) -> Automapper {
         let file = AutoMapperConfigs::get(&(name.clone() + ".rules"))
@@ -22,6 +26,17 @@ impl AutoMapperConfigs {
     }
 }
 
+impl BaseMaps {
+    // TODO: add support for custom name or random
+    pub fn get_base_map() -> TwMap {
+        let file = BaseMaps::get("grass.map").expect("base map not found");
+        let mut tw_map = TwMap::parse(&file.data).expect("parsing failed");
+        tw_map.load().expect("map loading failed");
+
+        tw_map
+    }
+}
+
 pub struct TwExport;
 
 impl TwExport {
@@ -36,7 +51,7 @@ impl TwExport {
         automapper_config.clone()
     }
 
-    pub fn process_layer(
+    pub fn process_tile_layer(
         tw_map: &mut TwMap,
         map: &Map,
         layer_index: &usize,
@@ -90,14 +105,12 @@ impl TwExport {
     }
 
     pub fn export(map: &Map, path: &PathBuf) {
-        let mut tw_map =
-            TwMap::parse(&std::fs::read("automap_test.map").expect("map file couldn't be read"))
-                .expect("parsing failed");
-        tw_map.load().expect("loading failed");
+        let mut tw_map = BaseMaps::get_base_map();
 
-        TwExport::process_layer(&mut tw_map, map, &0, "Freeze", &BlockTypeTW::Freeze);
-        TwExport::process_layer(&mut tw_map, map, &1, "Hookable", &BlockTypeTW::Hookable);
+        TwExport::process_tile_layer(&mut tw_map, map, &0, "Freeze", &BlockTypeTW::Freeze);
+        TwExport::process_tile_layer(&mut tw_map, map, &1, "Hookable", &BlockTypeTW::Hookable);
 
+        // TODO: move into function
         // get game layer
         let game_layer = tw_map
             .find_physics_layer_mut::<GameLayer>()

diff --git a/test.map b/test.map