Skip to content

fix: implement undo/redo functionality for fill tool #45

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

Merged
jbuehler23 merged 1 commit into from
Apr 2, 2026
Merged

fix: implement undo/redo functionality for fill tool #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions crates/bevy_map_editor/src/tools/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ fn handle_viewport_input(
&mut editor_state,
&mut project,
&mut render_state,
&mut history,
world_pos,
);
}
Expand Down Expand Up @@ -1868,6 +1869,7 @@ fn fill_area(
editor_state: &mut EditorState,
project: &mut Project,
render_state: &mut RenderState,
history: &mut CommandHistory,
world_pos: Vec2,
) {
let Some(level_id) = editor_state.selected_level else {
Expand Down Expand Up @@ -1932,6 +1934,8 @@ fn fill_area(
let mut stack = vec![(start_x as u32, start_y as u32)];
let mut visited = std::collections::HashSet::new();

let mut tiles = HashMap::new();

while let Some((x, y)) = stack.pop() {
if visited.contains(&(x, y)) {
continue;
Expand All @@ -1942,7 +1946,7 @@ fn fill_area(
continue;
}

level.set_tile(layer_idx, x, y, Some(tile_index));
tiles.insert((x, y), (target_tile, Some(tile_index)));

if x > 0 {
stack.push((x - 1, y));
Expand All @@ -1958,8 +1962,8 @@ fn fill_area(
}
}

project.mark_dirty();
render_state.needs_rebuild = true;
let command = BatchTileCommand::new(level_id, layer_idx, tiles, "Fill area");
history.execute(Box::new(command), project, render_state);
}

/// Paint a terrain tile with autotiling at the given world position
Expand Down
Loading