hodasemi/engine
1
0
Fork 0
Code Issues Pull requests Actions Projects Releases Wiki Activity

Fix tile query

Browse source
This commit is contained in:
hodasemi 2024-08-25 12:03:07 +02:00
parent 634115aa3d
commit 223df31478
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
gavania-core/src/game/game.rs
View file

@ -160,10 +160,7 @@ impl Game {
} }
let game_settings = settings.core_settings.game.clone(); let game_settings = settings.core_settings.game.clone();
let lua_scripts = settings.core_settings.lua_scripts.clone(); let lua_scripts = settings.core_settings.lua_scripts.clone();
let tile_directory = settings.core_settings.engine.tile_directory.full_path();
let map_info = settings.core_settings.map_info(); let map_info = settings.core_settings.map_info();
#[allow(unused_mut)] #[allow(unused_mut)]
@ -230,23 +227,6 @@ impl Game {
} }
} }
// ----------------- tiles --------------------
let tile_vector = search_dir_recursively(&tile_directory, ".png")?;
let mut tile_map = HashMap::new();
for file in &tile_vector {
let s = file.full_path();
let path = Path::new(s.as_str());
if let Some(name) = path.file_stem() {
if let Some(name_str) = name.to_str() {
let string = name_str.to_string();
tile_map.insert(string.clone(), file.clone());
}
}
}
let game = { let game = {
engine_create_info.gui_info.resource_directory = { engine_create_info.gui_info.resource_directory = {
let mut path = AssetPath::from(settings.data_path.as_str()); let mut path = AssetPath::from(settings.data_path.as_str());
@ -258,6 +238,26 @@ impl Game {
let engine = Engine::new(engine_create_info.clone())?; let engine = Engine::new(engine_create_info.clone())?;
// ----------------- tiles --------------------
let tile_vector = search_dir_recursively(
engine.settings().tiles_directory().full_path().as_str(),
".png",
)?;
let mut tile_map = HashMap::new();
for file in &tile_vector {
let s = file.full_path();
let path = Path::new(s.as_str());
if let Some(name) = path.file_stem() {
if let Some(name_str) = name.to_str() {
let string = name_str.to_string();
tile_map.insert(string.clone(), file.clone());
}
}
}
let item_system = Promise::new({ let item_system = Promise::new({
let engine = engine.clone(); let engine = engine.clone();
let item_settings = item_settings.clone(); let item_settings = item_settings.clone();