Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improving data storage in TileMap #720

Merged
merged 5 commits into from
Jan 14, 2025
Merged

Improving data storage in TileMap #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e78f9e5
Creating the TileMapData resource.
b-guild Jan 7, 2025
038aa77
Merge branch 'master' into tilemapdata
b-guild Jan 13, 2025
5fd338c
Updating TileMapData for new Downcast trait system
b-guild Jan 13, 2025
c1d3ed2
Adding tile_handle method to TileMap, and simplifying
b-guild Jan 13, 2025
f9c8a50
Shrink to fit tilemap before writing.
b-guild Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions editor/src/plugins/tilemap/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,17 +842,19 @@ impl MoveMapTileCommand {
let tile_map = context.scene.graph[self.tile_map]
.cast_mut::<TileMap>()
.expect("Cast to TileMap failed!");
let Some(mut tiles) = tile_map.tiles().map(|r| r.data_ref()) else {
return;
};
let Some(tiles) = tiles.as_loaded_mut() else {
return;
};
for (i, p) in self.tiles.iter().enumerate() {
swap_hash_map_entry(
tile_map.tiles.entry(*p + self.start_offset),
&mut self.data[i],
);
let data = &mut self.data[i];
*data = tiles.replace(*p + self.start_offset, *data);
}
for (i, p) in self.tiles.iter().enumerate() {
swap_hash_map_entry(
tile_map.tiles.entry(*p + self.end_offset),
&mut self.data[i],
);
let data = &mut self.data[i];
*data = tiles.replace(*p + self.end_offset, *data);
}
std::mem::swap(&mut self.start_offset, &mut self.end_offset);
}
Expand Down Expand Up @@ -991,7 +993,13 @@ impl SetMapTilesCommand {
let tile_map = context.scene.graph[self.tile_map]
.cast_mut::<TileMap>()
.expect("Cast to TileMap failed!");
tile_map.tiles.swap_tiles(&mut self.tiles);
let Some(mut tiles) = tile_map.tiles().map(|r| r.data_ref()) else {
return;
};
let Some(tiles) = tiles.as_loaded_mut() else {
return;
};
tiles.swap_tiles(&mut self.tiles);
}
}

Expand Down
37 changes: 28 additions & 9 deletions editor/src/plugins/tilemap/interaction_mode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ use commands::{MoveMapTileCommand, SetMapTilesCommand};
use fyrox::{
fxhash::FxHashMap,
scene::tilemap::{
tileset::TileSetRef, OptionTileRect, TileCursorEffect, TileEraseEffect, TileOverlayEffect,
TileSelectionEffect, TileSource, TileUpdateEffect, TilesUpdate, TransTilesUpdate,
tileset::TileSetRef, OptionTileRect, TileCursorEffect, TileEraseEffect, TileMapData,
TileOverlayEffect, TileSelectionEffect, TileSource, TileUpdateEffect, TilesUpdate,
TransTilesUpdate,
},
};

Expand Down Expand Up @@ -250,14 +251,18 @@ fn update_select(
sel.extend(rect.iter());
}
selected.clone_from(sel);
state.update_stamp(tile_map.tile_set().cloned(), |p| {
tile_map.tiles().get(&p).copied()
});
let Some(tiles) = tile_map.tiles().map(|r| r.data_ref()) else {
return;
};
let Some(tiles) = tiles.as_loaded_ref() else {
return;
};
state.update_stamp(tile_map.tile_set().cloned(), |p| tiles.get(p));
}

fn draw(
update: &mut TransTilesUpdate,
tiles: &Tiles,
tiles: &TileMapData,
tool: DrawingMode,
state: &TileDrawStateGuard<'_>,
start: Vector2<i32>,
Expand Down Expand Up @@ -330,6 +335,12 @@ impl InteractionMode for TileMapInteractionMode {
let Some(tile_map) = scene.graph.try_get_mut_of_type::<TileMap>(self.tile_map) else {
return;
};
let Some(tiles_guard) = tile_map.tiles().map(|r| r.data_ref()) else {
return;
};
let Some(tiles) = tiles_guard.as_loaded_ref() else {
return;
};
let mut overlay = self.overlay_effect.lock();
let mut erase_overlay = self.erase_select_effect.lock();
if let Some(grid_coord) = grid_coord {
Expand All @@ -352,13 +363,14 @@ impl InteractionMode for TileMapInteractionMode {
erased_area.clear();
let selected = &self.select_effect.lock().positions;
for pos in selected.iter() {
let Some(&handle) = tile_map.tiles.get(pos) else {
let Some(handle) = tiles.get(*pos) else {
continue;
};
let _ = erased_area.insert(*pos);
let _ = overlay.tiles.insert(*pos - grid_coord, handle);
}
} else {
drop(tiles_guard);
self.mouse_mode = MouseMode::Drawing;
if !mods.shift {
self.selecting.clear();
Expand All @@ -379,7 +391,7 @@ impl InteractionMode for TileMapInteractionMode {
self.mouse_mode = MouseMode::Drawing;
draw(
&mut self.update_effect.lock().update,
&tile_map.tiles,
tiles,
mode,
&state,
grid_coord,
Expand Down Expand Up @@ -508,6 +520,12 @@ impl InteractionMode for TileMapInteractionMode {
let Some(tile_map) = scene.graph.try_get_mut_of_type::<TileMap>(tile_map_handle) else {
return;
};
let Some(tiles_guard) = tile_map.tiles().map(|r| r.data_ref()) else {
return;
};
let Some(tiles) = tiles_guard.as_loaded_ref() else {
return;
};

let state = self.state.lock();

Expand All @@ -516,6 +534,7 @@ impl InteractionMode for TileMapInteractionMode {
MouseMode::Dragging => (),
MouseMode::Drawing => {
if let DrawingMode::Pick = self.current_tool {
drop(tiles_guard);
update_select(
tile_map,
&mut self.select_effect.lock().positions,
Expand All @@ -527,7 +546,7 @@ impl InteractionMode for TileMapInteractionMode {
} else {
draw(
&mut self.update_effect.lock().update,
&tile_map.tiles,
tiles,
self.current_tool,
&state,
start,
Expand Down
2 changes: 1 addition & 1 deletion editor/src/plugins/tilemap/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ use crate::fyrox::{
tilemap::{
tileset::{TileSet, TileSetResource},
RandomTileSource, Stamp, TileBook, TileCollider, TileDefinitionHandle, TileMap,
TilePaletteStage, Tiles,
TilePaletteStage,
},
Scene,
},
Expand Down
3 changes: 2 additions & 1 deletion fyrox-impl/src/engine/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use crate::resource::texture::{
CompressionOptions, TextureImportOptions, TextureMinificationFilter, TextureResource,
TextureResourceExtension,
};
use crate::scene::tilemap::CustomTileCollider;
use crate::scene::tilemap::{CustomTileCollider, TileMapData};
use crate::{
asset::{
event::ResourceEvent,
Expand Down Expand Up @@ -1287,6 +1287,7 @@ pub(crate) fn initialize_resource_manager_loaders(
state.constructors_container.add::<SurfaceData>();
state.constructors_container.add::<TileSet>();
state.constructors_container.add::<TileMapBrush>();
state.constructors_container.add::<TileMapData>();
state.constructors_container.add::<CustomTileCollider>();
state.constructors_container.add::<AnimationTracksData>();
state.constructors_container.add::<Style>();
Expand Down
8 changes: 5 additions & 3 deletions fyrox-impl/src/scene/dim2/physics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,13 +343,15 @@ fn tile_map_to_collider_shape(
let mut triangles = Vec::new();

let collider_uuid = tile_set.collider_name_to_uuid(collider_name)?;
for tile in tile_map.iter() {
let Some(tile_definition) = tile_set.get_tile_data(tile.definition_handle.into()) else {
let tile_data = tile_map.tiles()?.data_ref();
let tile_data = tile_data.as_loaded_ref()?;
for (position, handle) in tile_data.iter() {
let Some(tile_definition) = tile_set.get_tile_data(handle.into()) else {
continue;
};

if let Some(collider) = tile_definition.colliders.get(&collider_uuid) {
let position = tile.position.cast::<f32>().to_homogeneous();
let position = position.cast::<f32>().to_homogeneous();
collider.build_collider_shape(
&global_transform,
position,
Expand Down
Loading
Loading