LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.5.0: refactoring and optimization to fog of war

Browse Source 
Also made doors more visible
This commit is contained in:
Evan Debenham 2017-02-06 19:23:54 -05:00
parent f6af7951ed
commit 02fbae7fec
1 changed files with 41 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/tiles/FogOfWar.java
View File

@ -24,6 +24,7 @@ import android.opengl.GLES20;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.watabou.gltextures.SmartTexture; import com.watabou.gltextures.SmartTexture;
import com.watabou.gltextures.TextureCache; import com.watabou.gltextures.TextureCache;
import com.watabou.glwrap.Texture; import com.watabou.glwrap.Texture;
@ -146,96 +147,75 @@ public class FogOfWar extends Image {
moveToUpdating(); moveToUpdating();
boolean fullUpdate = updating.height() == mapHeight && updating.width() == mapWidth;
FogTexture fog = (FogTexture)texture; FogTexture fog = (FogTexture)texture;
int cellIndex; int cell;
int[] colorArray = new int[PIX_PER_TILE*PIX_PER_TILE]; int[] colorArray = new int[PIX_PER_TILE*PIX_PER_TILE];
for (int i=updating.top; i < updating.bottom; i++) { for (int i=updating.top; i < updating.bottom; i++) {
int cell = mapWidth * i + updating.left; cell = mapWidth * i + updating.left;
for (int j=updating.left; j < updating.right; j++) { for (int j=updating.left; j < updating.right; j++) {
if (cell >= Dungeon.level.length()) continue; //do nothing if (cell >= Dungeon.level.length()) continue; //do nothing
if (!visible[cell] && !visited[cell] && !mapped[cell]){ if (!Level.discoverable[cell]
fillCell(j, i, FOG_COLORS[INVISIBLE][brightness]); || (!visible[cell] && !visited[cell] && !mapped[cell])){
//we skip filling cells here if it isn't a full update
// because they must already be dark
if (fullUpdate)
fillCell(j, i, FOG_COLORS[INVISIBLE][brightness]);
cell++; cell++;
continue; continue;
} }
//triggers on wall tiles or sideways doors //wall tiles
if (DungeonTileSheet.wallStitcheable(Dungeon.level.map[cell]) || if (DungeonTileSheet.wallStitcheable(Dungeon.level.map[cell])){
( DungeonTileSheet.doorTile(Dungeon.level.map[cell])
&& cell + mapWidth < mapLength
&& DungeonTileSheet.wallStitcheable(Dungeon.level.map[cell + mapWidth]))) {
cellIndex = getColorIndexForCell(cell);
if (cell + mapWidth < mapLength){ //internal wall tiles
if (!DungeonTileSheet.wallStitcheable(Dungeon.level.map[cell + mapWidth]) if (cell + mapWidth >= mapLength
&& !DungeonTileSheet.doorTile(Dungeon.level.map[cell + mapWidth])){ || DungeonTileSheet.wallStitcheable(Dungeon.level.map[cell + mapWidth])){
if (getColorIndexForCell(cell + mapWidth) > cellIndex)
cellIndex = getColorIndexForCell(cell + mapWidth);
fillCell(j, i, FOG_COLORS[cellIndex][brightness]);
cell++;
continue;
}
//these tiles need to check both the left and right side, to account for only one half of them being seen
if (cell % mapWidth != 0){ if (cell % mapWidth != 0){
if (DungeonTileSheet.wallStitcheable(Dungeon.level.map[cell - 1])
|| DungeonTileSheet.doorTile(Dungeon.level.map[cell - 1])){ //picks the darkest fog between current tile, left, and below-left(if left is a wall).
if (getColorIndexForCell(cell - 1 + mapWidth) > cellIndex) if (cell + mapWidth < mapLength && DungeonTileSheet.wallStitcheable(Dungeon.level.map[cell - 1])){
colorArray[0] = colorArray[2] = FOG_COLORS[getColorIndexForCell(cell - 1 + mapWidth)][brightness]; colorArray[0] = colorArray[2] = FOG_COLORS[Math.max(getCellFog(cell), Math.max(getCellFog(cell + mapWidth - 1), getCellFog(cell - 1)))][brightness];
else
colorArray[0] = colorArray[2] = FOG_COLORS[cellIndex][brightness];
} else { } else {
if (getColorIndexForCell(cell - 1) > cellIndex) colorArray[0] = colorArray[2] = FOG_COLORS[Math.max(getCellFog(cell), getCellFog(cell - 1))][brightness];
colorArray[0] = colorArray[2] = FOG_COLORS[getColorIndexForCell(cell - 1)][brightness];
else
colorArray[0] = colorArray[2] = FOG_COLORS[cellIndex][brightness];
} }
} else { } else {
colorArray[0] = colorArray[2] = FOG_COLORS[cellIndex][brightness]; colorArray[0] = colorArray [2] = FOG_COLORS[INVISIBLE][brightness];
} }
if ((cell+1) % mapWidth != 0){ if ((cell+1) % mapWidth != 0){
if (DungeonTileSheet.wallStitcheable(Dungeon.level.map[cell + 1])
|| DungeonTileSheet.doorTile(Dungeon.level.map[cell + 1])){ //picks the darkest fog between current tile, right, and below-right(if right is a wall).
if (getColorIndexForCell(cell + 1 + mapWidth) > cellIndex) if (cell + mapWidth < mapLength && DungeonTileSheet.wallStitcheable(Dungeon.level.map[cell + 1])){
colorArray[1] = colorArray[3] = FOG_COLORS[getColorIndexForCell(cell + 1 + mapWidth)][brightness]; colorArray[1] = colorArray[3] = FOG_COLORS[Math.max(getCellFog(cell), Math.max(getCellFog(cell + mapWidth + 1), getCellFog(cell + 1)))][brightness];
else
colorArray[1] = colorArray[3] = FOG_COLORS[cellIndex][brightness];
} else { } else {
if (getColorIndexForCell(cell + 1) > cellIndex) colorArray[1] = colorArray[3] =
colorArray[1] = colorArray[3] = FOG_COLORS[getColorIndexForCell(cell + 1)][brightness]; FOG_COLORS[Math.max(getCellFog(cell), getCellFog(cell + 1))][brightness];
else
colorArray[1] = colorArray[3] = FOG_COLORS[cellIndex][brightness];
} }
} else { } else {
colorArray[1] = colorArray[3] = FOG_COLORS[cellIndex][brightness]; colorArray[1] = colorArray [3] = FOG_COLORS[INVISIBLE][brightness];
} }
fillCell(j, i, colorArray);
//camera-facing wall tiles
} else { } else {
if (cell % mapWidth != 0 && getColorIndexForCell(cell - 1) > cellIndex) { fillCell(j, i, FOG_COLORS[Math.max(getCellFog(cell), getCellFog(cell + mapWidth))][brightness]);
colorArray[0] = colorArray[2] = FOG_COLORS[getColorIndexForCell(cell - 1)][brightness];
} else {
colorArray[0] = colorArray[2] = FOG_COLORS[cellIndex][brightness];
}
if ((cell+1) % mapWidth != 0 && getColorIndexForCell(cell + 1) > cellIndex) {
colorArray[1] = colorArray[3] = FOG_COLORS[getColorIndexForCell(cell + 1)][brightness];
} else {
colorArray[1] = colorArray[3] = FOG_COLORS[cellIndex][brightness];
}
} }
fillCell(j, i, colorArray); //other tiles
} else if (DungeonTileSheet.doorTile(Dungeon.level.map[cell])) {
colorArray[0] = colorArray[1] = FOG_COLORS[getColorIndexForCell(cell)][brightness];
colorArray[2] = colorArray[3] = FOG_COLORS[getColorIndexForCell(cell + mapWidth)][brightness];
fillCell(j, i, colorArray);
} else { } else {
fillCell(j, i, FOG_COLORS[getColorIndexForCell(cell)][brightness]); fillCell(j, i, FOG_COLORS[getCellFog(cell)][brightness]);
} }
cell++; cell++;
@ -249,7 +229,7 @@ public class FogOfWar extends Image {
} }
private int getColorIndexForCell( int cell ){ private int getCellFog( int cell ){
if (visible[cell]) { if (visible[cell]) {
return VISIBLE; return VISIBLE;