Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

decoupling editor/MapEditor from editor/OperationStack (#504)

Browse Source
This commit is contained in:
Anuken
2019-05-31 09:11:16 -04:00
committed by GitHub
parent 581782af28 aa0ef529f5
commit 30a254e9be
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/io/anuke/mindustry/editor/DrawOperation.java
View File

@@ -12,8 +12,13 @@ import static io.anuke.mindustry.Vars.content;
import static io.anuke.mindustry.Vars.world; import static io.anuke.mindustry.Vars.world;
public class DrawOperation{ public class DrawOperation{
private MapEditor editor;
private LongArray array = new LongArray(); private LongArray array = new LongArray();
public DrawOperation(MapEditor editor) {
this.editor = editor;
}
public boolean isEmpty(){ public boolean isEmpty(){
return array.isEmpty(); return array.isEmpty();
} }
@@ -22,22 +27,22 @@ public class DrawOperation{
array.add(op); array.add(op);
} }
public void undo(MapEditor editor){ public void undo(){
for(int i = array.size - 1; i >= 0; i--){ for(int i = array.size - 1; i >= 0; i--){
updateTile(editor, i); updateTile(i);
} }
} }
public void redo(MapEditor editor){ public void redo(){
for(int i = 0; i < array.size; i++){ for(int i = 0; i < array.size; i++){
updateTile(editor, i); updateTile(i);
} }
} }
private void updateTile(MapEditor editor, int i) { private void updateTile(int i) {
long l = array.get(i); long l = array.get(i);
array.set(i, TileOp.get(TileOp.x(l), TileOp.y(l), TileOp.type(l), getTile(editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l)))); array.set(i, TileOp.get(TileOp.x(l), TileOp.y(l), TileOp.type(l), getTile(editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l))));
setTile(editor, editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l), TileOp.value(l)); setTile(editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l), TileOp.value(l));
} }
short getTile(Tile tile, byte type){ short getTile(Tile tile, byte type){
@@ -55,7 +60,7 @@ public class DrawOperation{
throw new IllegalArgumentException("Invalid type."); throw new IllegalArgumentException("Invalid type.");
} }
void setTile(MapEditor editor, Tile tile, byte type, short to){ void setTile(Tile tile, byte type, short to){
editor.load(() -> { editor.load(() -> {
if(type == OpType.floor.ordinal()){ if(type == OpType.floor.ordinal()){
tile.setFloor((Floor)content.block(to)); tile.setFloor((Floor)content.block(to));

6
core/src/io/anuke/mindustry/editor/MapEditor.java
View File

@@ -240,13 +240,13 @@ public class MapEditor{
public void undo(){ public void undo(){
if(stack.canUndo()){ if(stack.canUndo()){
stack.undo(this); stack.undo();
} }
} }
public void redo(){ public void redo(){
if(stack.canRedo()){ if(stack.canRedo()){
stack.redo(this); stack.redo();
} }
} }
@@ -267,7 +267,7 @@ public class MapEditor{
public void addTileOp(long data){ public void addTileOp(long data){
if(loading) return; if(loading) return;
if(currentOp == null) currentOp = new DrawOperation(); if(currentOp == null) currentOp = new DrawOperation(this);
currentOp.addOperation(data); currentOp.addOperation(data);
renderer.updatePoint(TileOp.x(data), TileOp.y(data)); renderer.updatePoint(TileOp.x(data), TileOp.y(data));

8
core/src/io/anuke/mindustry/editor/OperationStack.java
View File

@@ -34,18 +34,18 @@ public class OperationStack{
return !(index > -1 || stack.size + index < 0); return !(index > -1 || stack.size + index < 0);
} }
public void undo(MapEditor editor){ public void undo(){
if(!canUndo()) return; if(!canUndo()) return;
stack.get(stack.size - 1 + index).undo(editor); stack.get(stack.size - 1 + index).undo();
index--; index--;
} }
public void redo(MapEditor editor){ public void redo(){
if(!canRedo()) return; if(!canRedo()) return;
index++; index++;
stack.get(stack.size - 1 + index).redo(editor); stack.get(stack.size - 1 + index).redo();
} }
} }