Can now undo/redo grid operations
This commit is contained in:
parent
36253d8f23
commit
6b3ce01e94
5 changed files with 64 additions and 5 deletions
|
|
@ -14,6 +14,7 @@ void GridModifyTool::set_grid_id(ServerClientID newGridID) {
|
||||||
auto gridFoundIt = drawP.world.gridMan.grids.find(gridID);
|
auto gridFoundIt = drawP.world.gridMan.grids.find(gridID);
|
||||||
if(gridFoundIt != drawP.world.gridMan.grids.end()) {
|
if(gridFoundIt != drawP.world.gridMan.grids.end()) {
|
||||||
WorldGrid& g = gridFoundIt->second;
|
WorldGrid& g = gridFoundIt->second;
|
||||||
|
oldGrid = g;
|
||||||
CoordSpaceHelper newCam;
|
CoordSpaceHelper newCam;
|
||||||
newCam.inverseScale = g.size / WorldScalar(WorldGrid::GRID_UNIT_PIXEL_SIZE);
|
newCam.inverseScale = g.size / WorldScalar(WorldGrid::GRID_UNIT_PIXEL_SIZE);
|
||||||
newCam.pos = g.offset - drawP.world.main.window.size.cast<WorldScalar>() * newCam.inverseScale * WorldScalar(0.5);
|
newCam.pos = g.offset - drawP.world.main.window.size.cast<WorldScalar>() * newCam.inverseScale * WorldScalar(0.5);
|
||||||
|
|
@ -173,5 +174,5 @@ void GridModifyTool::draw(SkCanvas* canvas, const DrawData& drawData) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void GridModifyTool::switch_tool(DrawingProgramToolType newTool) {
|
void GridModifyTool::switch_tool(DrawingProgramToolType newTool) {
|
||||||
drawP.world.gridMan.send_grid_info(gridID);
|
drawP.world.gridMan.send_grid_info(oldGrid, gridID);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "DrawingProgramToolBase.hpp"
|
#include "DrawingProgramToolBase.hpp"
|
||||||
|
#include "../WorldGrid.hpp"
|
||||||
|
|
||||||
class DrawingProgram;
|
class DrawingProgram;
|
||||||
|
|
||||||
|
|
@ -14,6 +15,7 @@ class GridModifyTool : public DrawingProgramToolBase {
|
||||||
virtual bool prevent_undo_or_redo() override;
|
virtual bool prevent_undo_or_redo() override;
|
||||||
virtual void switch_tool(DrawingProgramToolType newTool) override;
|
virtual void switch_tool(DrawingProgramToolType newTool) override;
|
||||||
private:
|
private:
|
||||||
|
WorldGrid oldGrid;
|
||||||
ServerClientID gridID;
|
ServerClientID gridID;
|
||||||
unsigned selectionMode = 0;
|
unsigned selectionMode = 0;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -32,22 +32,77 @@ ServerClientID GridManager::add_default_grid(const std::string& newName) {
|
||||||
g.size = world.drawData.cam.c.inverseScale * WorldScalar(WorldGrid::GRID_UNIT_PIXEL_SIZE);
|
g.size = world.drawData.cam.c.inverseScale * WorldScalar(WorldGrid::GRID_UNIT_PIXEL_SIZE);
|
||||||
g.offset = world.drawData.cam.c.pos + world.drawData.cam.c.dir_from_space(world.main.window.size.cast<float>() * 0.5f);
|
g.offset = world.drawData.cam.c.pos + world.drawData.cam.c.dir_from_space(world.main.window.size.cast<float>() * 0.5f);
|
||||||
grids[newID] = g;
|
grids[newID] = g;
|
||||||
|
world.con.client_send_items_to_server(RELIABLE_COMMAND_CHANNEL, SERVER_SET_GRID, newID, g);
|
||||||
|
|
||||||
changed = true;
|
changed = true;
|
||||||
|
|
||||||
|
world.undo.push({[&world = world, &changed = changed, &grids = grids, newID]() {
|
||||||
|
grids.erase(newID);
|
||||||
|
world.con.client_send_items_to_server(RELIABLE_COMMAND_CHANNEL, SERVER_REMOVE_GRID, newID);
|
||||||
|
changed = true;
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
[&world = world, &changed = changed, &grids = grids, g, newID]() {
|
||||||
|
grids[newID] = g;
|
||||||
|
world.con.client_send_items_to_server(RELIABLE_COMMAND_CHANNEL, SERVER_SET_GRID, newID, g);
|
||||||
|
changed = true;
|
||||||
|
return true;
|
||||||
|
}});
|
||||||
|
|
||||||
return newID;
|
return newID;
|
||||||
}
|
}
|
||||||
|
|
||||||
void GridManager::send_grid_info(ServerClientID gridID) {
|
void GridManager::send_grid_info(WorldGrid oldGrid, ServerClientID gridID) {
|
||||||
auto gridFoundIt = grids.find(gridID);
|
auto gridFoundIt = grids.find(gridID);
|
||||||
if(gridFoundIt != grids.end()) {
|
if(gridFoundIt != grids.end()) {
|
||||||
WorldGrid& g = gridFoundIt->second;
|
WorldGrid& g = gridFoundIt->second;
|
||||||
world.con.client_send_items_to_server(RELIABLE_COMMAND_CHANNEL, SERVER_SET_GRID, gridID, g);
|
world.con.client_send_items_to_server(RELIABLE_COMMAND_CHANNEL, SERVER_SET_GRID, gridID, g);
|
||||||
|
|
||||||
|
world.undo.push({[&world = world, &changed = changed, &grids = grids, gridID, oldGrid]() {
|
||||||
|
auto gridFoundIt = grids.find(gridID);
|
||||||
|
if(gridFoundIt == grids.end())
|
||||||
|
return false;
|
||||||
|
gridFoundIt->second = oldGrid;
|
||||||
|
world.con.client_send_items_to_server(RELIABLE_COMMAND_CHANNEL, SERVER_SET_GRID, gridID, oldGrid);
|
||||||
|
changed = true;
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
[&world = world, &changed = changed, &grids = grids, gridID, g]() {
|
||||||
|
auto gridFoundIt = grids.find(gridID);
|
||||||
|
if(gridFoundIt == grids.end())
|
||||||
|
return false;
|
||||||
|
gridFoundIt->second = g;
|
||||||
|
world.con.client_send_items_to_server(RELIABLE_COMMAND_CHANNEL, SERVER_SET_GRID, gridID, g);
|
||||||
|
changed = true;
|
||||||
|
return true;
|
||||||
|
}});
|
||||||
|
|
||||||
|
changed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void GridManager::remove_grid(ServerClientID idToRemove) {
|
void GridManager::remove_grid(ServerClientID idToRemove) {
|
||||||
|
world.con.client_send_items_to_server(RELIABLE_COMMAND_CHANNEL, SERVER_REMOVE_GRID, idToRemove);
|
||||||
|
changed = true;
|
||||||
|
auto it = grids.find(idToRemove);
|
||||||
|
if(it == grids.end())
|
||||||
|
return;
|
||||||
|
|
||||||
|
WorldGrid g = it->second;
|
||||||
|
grids.erase(it);
|
||||||
|
|
||||||
|
world.undo.push({[&world = world, &changed = changed, &grids = grids, idToRemove, g]() {
|
||||||
|
grids[idToRemove] = g;
|
||||||
|
world.con.client_send_items_to_server(RELIABLE_COMMAND_CHANNEL, SERVER_SET_GRID, idToRemove, g);
|
||||||
|
changed = true;
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
[&world = world, &changed = changed, &grids = grids, idToRemove]() {
|
||||||
grids.erase(idToRemove);
|
grids.erase(idToRemove);
|
||||||
world.con.client_send_items_to_server(RELIABLE_COMMAND_CHANNEL, SERVER_REMOVE_GRID, idToRemove);
|
world.con.client_send_items_to_server(RELIABLE_COMMAND_CHANNEL, SERVER_REMOVE_GRID, idToRemove);
|
||||||
changed = true;
|
changed = true;
|
||||||
|
return true;
|
||||||
|
}});
|
||||||
}
|
}
|
||||||
|
|
||||||
const std::vector<ServerClientID>& GridManager::sorted_grid_ids() {
|
const std::vector<ServerClientID>& GridManager::sorted_grid_ids() {
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ class GridManager {
|
||||||
changed = true;
|
changed = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void send_grid_info(ServerClientID gridID);
|
void send_grid_info(WorldGrid oldGrid, ServerClientID gridID);
|
||||||
void remove_grid(ServerClientID idToRemove);
|
void remove_grid(ServerClientID idToRemove);
|
||||||
void draw_back(SkCanvas* canvas, const DrawData& drawData);
|
void draw_back(SkCanvas* canvas, const DrawData& drawData);
|
||||||
void draw_front(SkCanvas* canvas, const DrawData& drawData);
|
void draw_front(SkCanvas* canvas, const DrawData& drawData);
|
||||||
|
|
|
||||||
|
|
@ -690,8 +690,9 @@ void Toolbar::grid_menu(bool justOpened) {
|
||||||
}) {
|
}) {
|
||||||
if(gui.svg_icon_button_transparent("visibility eye", grid.visible ? "data/icons/eyeopen.svg" : "data/icons/eyeclose.svg", false, entryHeight, false)) {
|
if(gui.svg_icon_button_transparent("visibility eye", grid.visible ? "data/icons/eyeopen.svg" : "data/icons/eyeclose.svg", false, entryHeight, false)) {
|
||||||
miniButtonClicked = true;
|
miniButtonClicked = true;
|
||||||
|
WorldGrid oldGrid = grid;
|
||||||
grid.visible = !grid.visible;
|
grid.visible = !grid.visible;
|
||||||
main.world->gridMan.send_grid_info(gridID);
|
main.world->gridMan.send_grid_info(oldGrid, gridID);
|
||||||
}
|
}
|
||||||
if(gui.svg_icon_button_transparent("edit pencil", "data/icons/pencil.svg", false, entryHeight, false)) {
|
if(gui.svg_icon_button_transparent("edit pencil", "data/icons/pencil.svg", false, entryHeight, false)) {
|
||||||
miniButtonClicked = true;
|
miniButtonClicked = true;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue