sigonasr2/RabiClone
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modifying of data tiles by clicking

Browse Source 
Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com>
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
This commit is contained in:
sigonasr2, Sig, Sigo 2022-06-13 18:19:59 +00:00 committed by GitHub
parent 489186c077
commit aa41f52bbd
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sig/map/Maps.java
View File

@ -37,6 +37,10 @@ public enum Maps {
//System.out.println("Tile "+(y*MAP_WIDTH+x)+" is now "+tiles[y*MAP_WIDTH+x]+"."); //System.out.println("Tile "+(y*MAP_WIDTH+x)+" is now "+tiles[y*MAP_WIDTH+x]+".");
} }
public void ModifyDataTile(int tileX, int tileY, DataTile selectedDataTile) {
map.ModifyDataTile(tileX, tileY, selectedDataTile);
}
public Tile getTile(int x,int y) { public Tile getTile(int x,int y) {
int index = y*Map.MAP_WIDTH+x; int index = y*Map.MAP_WIDTH+x;
if (index<0||index>=this.map.tiles.length) { if (index<0||index>=this.map.tiles.length) {

18
src/sig/objects/EditorRenderer.java
View File

@ -65,7 +65,11 @@ public class EditorRenderer extends LevelRenderer{
if(left_mb){ if(left_mb){
int tileX = (int)(RabiClone.MOUSE_POS.getX()+getX())/Tile.TILE_WIDTH; int tileX = (int)(RabiClone.MOUSE_POS.getX()+getX())/Tile.TILE_WIDTH;
int tileY = (int)(RabiClone.MOUSE_POS.getY()+getY())/Tile.TILE_HEIGHT; int tileY = (int)(RabiClone.MOUSE_POS.getY()+getY())/Tile.TILE_HEIGHT;
RabiClone.CURRENT_MAP.ModifyTile(tileX, tileY, selectedTile); if (dataTileView) {
RabiClone.CURRENT_MAP.ModifyDataTile(tileX, tileY, selectedDataTile);
} else {
RabiClone.CURRENT_MAP.ModifyTile(tileX, tileY, selectedTile);
}
} }
if(KeyHeld(Action.SLIDE)&&KeyHeld(Action.FALL)){ if(KeyHeld(Action.SLIDE)&&KeyHeld(Action.FALL)){
AddMessage("Saving map..."); AddMessage("Saving map...");
@ -94,9 +98,15 @@ public class EditorRenderer extends LevelRenderer{
public void MouseScrolled(MouseScrollValue scrolled) { public void MouseScrolled(MouseScrollValue scrolled) {
int up = scrolled==MouseScrollValue.UP?1:0; int up = scrolled==MouseScrollValue.UP?1:0;
int down = scrolled==MouseScrollValue.DOWN?1:0; int down = scrolled==MouseScrollValue.DOWN?1:0;
int tempIndex = selectedTile.ordinal()+down-up; if (dataTileView) {
int selectedIndex = tempIndex<0?Tile.values().length-1:tempIndex%Tile.values().length; int tempIndex = selectedDataTile.ordinal()+down-up;
selectedTile = Tile.values()[selectedIndex]; int selectedIndex = tempIndex<0?DataTile.values().length-1:tempIndex%DataTile.values().length;
selectedDataTile = DataTile.values()[selectedIndex];
} else {
int tempIndex = selectedTile.ordinal()+down-up;
int selectedIndex = tempIndex<0?Tile.values().length-1:tempIndex%Tile.values().length;
selectedTile = Tile.values()[selectedIndex];
}
} }
@Override @Override