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

v0.4.2: improved tilemaps to selectively update and respect concurrency

Browse Source
This commit is contained in:
Evan Debenham 2016-08-26 18:17:59 -04:00 committed by Evan Debenham
parent 7a2e6c63c1
commit 6bcccba062
2 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,10 @@ public class Tilemap extends Visual {
protected FloatBuffer quads; protected FloatBuffer quads;
protected Vertexbuffer buffer; protected Vertexbuffer buffer;
public Rect updated; private volatile Rect updated;
private Rect updating;
private int topLeftUpdating;
private int bottomRightUpdating;
public Tilemap( Object tx, TextureFilm tileset ) { public Tilemap( Object tx, TextureFilm tileset ) {
@ -88,19 +91,34 @@ public class Tilemap extends Visual {
updated.set( 0, 0, mapWidth, mapHeight ); updated.set( 0, 0, mapWidth, mapHeight );
} }
public synchronized void updateMap(){
updated.set( 0, 0, mapWidth, mapHeight );
}
public synchronized void updateMapCell(int cell){
updated.union( cell % mapWidth, cell / mapWidth );
}
private synchronized void moveToUpdating(){
updating = new Rect(updated);
updated.setEmpty();
}
protected void updateVertices() { protected void updateVertices() {
float y1 = cellH * updated.top; moveToUpdating();
float y1 = cellH * updating.top;
float y2 = y1 + cellH; float y2 = y1 + cellH;
for (int i=updated.top; i < updated.bottom; i++) { for (int i=updating.top; i < updating.bottom; i++) {
float x1 = cellW * updated.left; float x1 = cellW * updating.left;
float x2 = x1 + cellW; float x2 = x1 + cellW;
int pos = i * mapWidth + updated.left; int pos = i * mapWidth + updating.left;
for (int j=updated.left; j < updated.right; j++) { for (int j=updating.left; j < updating.right; j++) {
//Currently if a none-rendered tile becomes rendered it will mess with culling in draw() //Currently if a none-rendered tile becomes rendered it will mess with culling in draw()
//However shifting the whole array is expensive, even with selective updating //However shifting the whole array is expensive, even with selective updating
@ -116,6 +134,11 @@ public class Tilemap extends Visual {
bufferLength ++; bufferLength ++;
} }
if (topLeftUpdating == 0)
topLeftUpdating = bufferPos;
bottomRightUpdating = bufferPos + 1;
quads.position(bufferPos*16); quads.position(bufferPos*16);
RectF uv = tileset.get( data[pos] ); RectF uv = tileset.get( data[pos] );
@ -155,8 +178,7 @@ public class Tilemap extends Visual {
y1 = y2; y1 = y2;
y2 += cellH; y2 += cellH;
} }
updated.setEmpty();
} }
int topLeft, bottomRight, length; int topLeft, bottomRight, length;
@ -175,7 +197,11 @@ public class Tilemap extends Visual {
if (buffer == null) if (buffer == null)
buffer = new Vertexbuffer(quads); buffer = new Vertexbuffer(quads);
else else
buffer.updateVertices(quads); buffer.updateVertices(quads,
topLeftUpdating*16,
bottomRightUpdating*16);
topLeftUpdating = 0;
updating.setEmpty();
} }
Camera c = Camera.main; Camera c = Camera.main;

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
View File

@ -681,15 +681,16 @@ public class GameScene extends PixelScene {
updateFog(); updateFog();
} }
//updates the whole map
public static void updateMap() { public static void updateMap() {
if (scene != null) { if (scene != null) {
scene.tiles.updated.set( 0, 0, Dungeon.level.width(), Dungeon.level.height() ); scene.tiles.updateMap();
} }
} }
public static void updateMap( int cell ) { public static void updateMap( int cell ) {
if (scene != null) { if (scene != null) {
scene.tiles.updated.union( cell % Dungeon.level.width(), cell / Dungeon.level.width() ); scene.tiles.updateMapCell( cell );
} }
} }