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

v0.4.2: added the ability for tilemaps to selectively not render certain tiles

Browse Source
This commit is contained in:
Evan Debenham 2016-08-19 19:34:04 -04:00
parent 0e7c12b61e
commit ca068c92b2
2 changed files with 71 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
SPD-classes/src/main/java/com/watabou/noosa/Tilemap.java
View File

@ -44,6 +44,8 @@ public class Tilemap extends Visual {
private float cellH; private float cellH;
protected float[] vertices; protected float[] vertices;
protected short[] bufferPositions;
protected short bufferLength;
protected FloatBuffer quads; protected FloatBuffer quads;
public Rect updated; public Rect updated;
@ -71,6 +73,9 @@ public class Tilemap extends Visual {
mapWidth = cols; mapWidth = cols;
mapHeight = data.length / cols; mapHeight = data.length / cols;
size = mapWidth * mapHeight; size = mapWidth * mapHeight;
bufferPositions = new short[size];
for (int i = 0; i < bufferPositions.length; i++)
bufferPositions[i] = -1;
width = cellW * mapWidth; width = cellW * mapWidth;
height = cellH * mapHeight; height = cellH * mapHeight;
@ -95,7 +100,15 @@ public class Tilemap extends Visual {
for (int j=updated.left; j < updated.right; j++) { for (int j=updated.left; j < updated.right; j++) {
RectF uv = tileset.get( data[pos++] ); if (needsRender(pos)) {
int bufferPos = bufferPositions[pos];
if (bufferPos == -1){
bufferPos = bufferPositions[pos] = bufferLength;
bufferLength ++;
}
quads.position(bufferPos*16);
RectF uv = tileset.get( data[pos] );
vertices[0] = x1; vertices[0] = x1;
vertices[1] = y1; vertices[1] = y1;
@ -122,7 +135,9 @@ public class Tilemap extends Visual {
vertices[15] = uv.bottom; vertices[15] = uv.bottom;
quads.put( vertices ); quads.put( vertices );
}
pos++;
x1 = x2; x1 = x2;
x2 += cellW; x2 += cellW;
@ -150,11 +165,17 @@ public class Tilemap extends Visual {
ra, ga, ba, aa ); ra, ga, ba, aa );
if (!updated.isEmpty()) { if (!updated.isEmpty()) {
quads.limit(quads.capacity());
updateVertices(); updateVertices();
quads.limit(bufferLength);
} }
script.camera( camera ); script.camera( camera );
script.drawQuadSet( quads, size ); script.drawQuadSet( quads, bufferLength );
} }
protected boolean needsRender(int pos){
return true;
}
} }

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/DungeonTilemap.java
View File

@ -21,6 +21,7 @@
package com.shatteredpixel.shatteredpixeldungeon; package com.shatteredpixel.shatteredpixeldungeon;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
import com.watabou.noosa.Image; import com.watabou.noosa.Image;
import com.watabou.noosa.TextureFilm; import com.watabou.noosa.TextureFilm;
import com.watabou.noosa.Tilemap; import com.watabou.noosa.Tilemap;
@ -99,4 +100,9 @@ public class DungeonTilemap extends Tilemap {
public boolean overlapsScreenPoint( int x, int y ) { public boolean overlapsScreenPoint( int x, int y ) {
return true; return true;
} }
@Override
protected boolean needsRender(int pos) {
return Level.discoverable[pos] && Dungeon.level.map[pos] != Terrain.WATER;
}
} }