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

v0.6.3: moved opengl code out of fog of war class, into BufferTexture

Browse Source
This commit is contained in:
Evan Debenham 2017-12-28 00:33:56 -05:00
parent 902caaafc7
commit 2b342dfe89
3 changed files with 139 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
SPD-classes/src/main/java/com/watabou/gltextures/BufferTexture.java Normal file
View File

@ -0,0 +1,93 @@
/*
* Pixel Dungeon
* Copyright (C) 2012-2015 Oleg Dolya
*
* Shattered Pixel Dungeon
* Copyright (C) 2014-2017 Evan Debenham
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package com.watabou.gltextures;
import android.opengl.GLES20;
import com.watabou.glwrap.Texture;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.IntBuffer;
//provides a native intbuffer implementation because android.graphics.bitmap is too slow
public class BufferTexture extends SmartTexture {
public IntBuffer pixels;
public BufferTexture(int w, int h) {
super();
width = w;
height = h;
pixels = ByteBuffer.
allocateDirect( w * h * 4 ).
order( ByteOrder.nativeOrder() ).
asIntBuffer();
}
@Override
protected void generate() {
int[] ids = new int[1];
GLES20.glGenTextures( 1, ids, 0 );
id = ids[0];
}
@Override
public void reload() {
super.reload();
update();
}
public void update(){
bind();
filter( Texture.LINEAR, Texture.LINEAR );
wrap( Texture.CLAMP, Texture.CLAMP);
pixels.position(0);
GLES20.glTexImage2D(
GLES20.GL_TEXTURE_2D,
0,
GLES20.GL_RGBA,
width,
height,
0,
GLES20.GL_RGBA,
GLES20.GL_UNSIGNED_BYTE,
pixels );
}
//allows partially updating the texture
public void update(int top, int bottom){
bind();
filter( Texture.LINEAR, Texture.LINEAR );
wrap( Texture.CLAMP, Texture.CLAMP);
pixels.position(top*width);
GLES20.glTexSubImage2D(GLES20.GL_TEXTURE_2D,
0,
0,
top,
width,
bottom - top,
GLES20.GL_RGBA,
GLES20.GL_UNSIGNED_BYTE,
pixels);
}
}

20
SPD-classes/src/main/java/com/watabou/gltextures/TextureCache.java
View File

@ -87,6 +87,26 @@ public class TextureCache {
} }
//creates a smarttexture backed by a native intbuffer, not a bitmap.
//This is much faster is the texture needs to be frequently edited.
//texture is all black by default
public static SmartTexture createBufferTex( String key, int w, int h ){
key += "w" + w + "h" + h;
if (all.containsKey( key )){
return all.get( key );
} else {
BufferTexture tx = new BufferTexture(w, h);
all.put( key, tx);
return tx;
}
}
public static void add( Object key, SmartTexture tx ) { public static void add( Object key, SmartTexture tx ) {
all.put( key, tx ); all.put( key, tx );
} }

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

@ -21,21 +21,15 @@
package com.shatteredpixel.shatteredpixeldungeon.tiles; package com.shatteredpixel.shatteredpixeldungeon.tiles;
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.watabou.gltextures.SmartTexture; import com.watabou.gltextures.BufferTexture;
import com.watabou.gltextures.TextureCache; import com.watabou.gltextures.TextureCache;
import com.watabou.glwrap.Texture;
import com.watabou.noosa.Image; import com.watabou.noosa.Image;
import com.watabou.noosa.NoosaScript; import com.watabou.noosa.NoosaScript;
import com.watabou.noosa.NoosaScriptNoLighting; import com.watabou.noosa.NoosaScriptNoLighting;
import com.watabou.utils.Rect; import com.watabou.utils.Rect;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.IntBuffer;
import java.util.ArrayList; import java.util.ArrayList;
public class FogOfWar extends Image { public class FogOfWar extends Image {
@ -116,7 +110,7 @@ public class FogOfWar extends Image {
width = width2 * size; width = width2 * size;
height = height2 * size; height = height2 * size;
texture( new FogTexture(width2, height2) ); texture( TextureCache.createBufferTex("fog", width2, height2) );
scale.set( scale.set(
DungeonTilemap.SIZE / PIX_PER_TILE, DungeonTilemap.SIZE / PIX_PER_TILE,
@ -186,7 +180,7 @@ public class FogOfWar extends Image {
} }
} }
FogTexture fog = (FogTexture)texture; BufferTexture fog = (BufferTexture) texture;
int cell; int cell;
@ -202,7 +196,7 @@ public class FogOfWar extends Image {
//we skip filling cells here if it isn't a full update //we skip filling cells here if it isn't a full update
// because they must already be dark // because they must already be dark
if (fullUpdate) if (fullUpdate)
fillCell(j, i, FOG_COLORS[INVISIBLE][brightness]); fillCell(fog, j, i, FOG_COLORS[INVISIBLE][brightness]);
cell++; cell++;
continue; continue;
} }
@ -212,7 +206,7 @@ public class FogOfWar extends Image {
//always dark if nothing is beneath them //always dark if nothing is beneath them
if (cell + mapWidth >= mapLength) { if (cell + mapWidth >= mapLength) {
fillCell(j, i, FOG_COLORS[INVISIBLE][brightness]); fillCell(fog, j, i, FOG_COLORS[INVISIBLE][brightness]);
//internal wall tiles, need to check both the left and right side, //internal wall tiles, need to check both the left and right side,
// to account for only one half of them being seen // to account for only one half of them being seen
@ -226,17 +220,17 @@ public class FogOfWar extends Image {
//if below-left is also a wall, then we should be dark no matter what. //if below-left is also a wall, then we should be dark no matter what.
if (wall(cell + mapWidth - 1)) { if (wall(cell + mapWidth - 1)) {
fillLeft(j, i, FOG_COLORS[INVISIBLE][brightness]); fillLeft(fog, j, i, FOG_COLORS[INVISIBLE][brightness]);
} else { } else {
fillLeft(j, i, FOG_COLORS[Math.max(getCellFog(cell), Math.max(getCellFog(cell + mapWidth - 1), getCellFog(cell - 1)))][brightness]); fillLeft(fog, j, i, FOG_COLORS[Math.max(getCellFog(cell), Math.max(getCellFog(cell + mapWidth - 1), getCellFog(cell - 1)))][brightness]);
} }
} else { } else {
fillLeft(j, i, FOG_COLORS[Math.max(getCellFog(cell), getCellFog(cell - 1))][brightness]); fillLeft(fog, j, i, FOG_COLORS[Math.max(getCellFog(cell), getCellFog(cell - 1))][brightness]);
} }
} else { } else {
fillLeft(j, i, FOG_COLORS[INVISIBLE][brightness]); fillLeft(fog, j, i, FOG_COLORS[INVISIBLE][brightness]);
} }
//right side //right side
@ -247,28 +241,28 @@ public class FogOfWar extends Image {
//if below-right is also a wall, then we should be dark no matter what. //if below-right is also a wall, then we should be dark no matter what.
if (wall(cell + mapWidth + 1)) { if (wall(cell + mapWidth + 1)) {
fillRight(j, i, FOG_COLORS[INVISIBLE][brightness]); fillRight(fog, j, i, FOG_COLORS[INVISIBLE][brightness]);
} else { } else {
fillRight(j, i, FOG_COLORS[Math.max(getCellFog(cell), Math.max(getCellFog(cell + mapWidth + 1), getCellFog(cell + 1)))][brightness]); fillRight(fog, j, i, FOG_COLORS[Math.max(getCellFog(cell), Math.max(getCellFog(cell + mapWidth + 1), getCellFog(cell + 1)))][brightness]);
} }
} else { } else {
fillRight(j, i, FOG_COLORS[Math.max(getCellFog(cell), getCellFog(cell + 1))][brightness]); fillRight(fog, j, i, FOG_COLORS[Math.max(getCellFog(cell), getCellFog(cell + 1))][brightness]);
} }
} else { } else {
fillRight(j, i, FOG_COLORS[INVISIBLE][brightness]); fillRight(fog, j, i, FOG_COLORS[INVISIBLE][brightness]);
} }
//camera-facing wall tiles //camera-facing wall tiles
//darkest between themselves and the tile below them //darkest between themselves and the tile below them
} else { } else {
fillCell(j, i, FOG_COLORS[Math.max(getCellFog(cell), getCellFog(cell + mapWidth))][brightness]); fillCell(fog, j, i, FOG_COLORS[Math.max(getCellFog(cell), getCellFog(cell + mapWidth))][brightness]);
} }
//other tiles, just their direct value //other tiles, just their direct value
} else { } else {
fillCell(j, i, FOG_COLORS[getCellFog(cell)][brightness]); fillCell(fog, j, i, FOG_COLORS[getCellFog(cell)][brightness]);
} }
cell++; cell++;
@ -302,8 +296,7 @@ public class FogOfWar extends Image {
} }
} }
private void fillLeft( int x, int y, int color){ private void fillLeft( BufferTexture fog, int x, int y, int color){
FogTexture fog = (FogTexture)texture;
for (int i = 0; i < PIX_PER_TILE; i++){ for (int i = 0; i < PIX_PER_TILE; i++){
fog.pixels.position(((y * PIX_PER_TILE)+i)*width2 + x * PIX_PER_TILE); fog.pixels.position(((y * PIX_PER_TILE)+i)*width2 + x * PIX_PER_TILE);
for (int j = 0; j < PIX_PER_TILE/2; j++) { for (int j = 0; j < PIX_PER_TILE/2; j++) {
@ -312,8 +305,7 @@ public class FogOfWar extends Image {
} }
} }
private void fillRight( int x, int y, int color){ private void fillRight( BufferTexture fog, int x, int y, int color){
FogTexture fog = (FogTexture)texture;
for (int i = 0; i < PIX_PER_TILE; i++){ for (int i = 0; i < PIX_PER_TILE; i++){
fog.pixels.position(((y * PIX_PER_TILE)+i)*width2 + x * PIX_PER_TILE + PIX_PER_TILE/2); fog.pixels.position(((y * PIX_PER_TILE)+i)*width2 + x * PIX_PER_TILE + PIX_PER_TILE/2);
for (int j = PIX_PER_TILE/2; j < PIX_PER_TILE; j++) { for (int j = PIX_PER_TILE/2; j < PIX_PER_TILE; j++) {
@ -322,8 +314,7 @@ public class FogOfWar extends Image {
} }
} }
private void fillCell( int x, int y, int color){ private void fillCell( BufferTexture fog, int x, int y, int color){
FogTexture fog = (FogTexture)texture;
for (int i = 0; i < PIX_PER_TILE; i++){ for (int i = 0; i < PIX_PER_TILE; i++){
fog.pixels.position(((y * PIX_PER_TILE)+i)*width2 + x * PIX_PER_TILE); fog.pixels.position(((y * PIX_PER_TILE)+i)*width2 + x * PIX_PER_TILE);
for (int j = 0; j < PIX_PER_TILE; j++) { for (int j = 0; j < PIX_PER_TILE; j++) {
@ -332,77 +323,6 @@ public class FogOfWar extends Image {
} }
} }
//provides a native intbuffer implementation because android.graphics.bitmap is too slow
//TODO perhaps should spin this off into something like FastEditTexture in SPD-classes
private class FogTexture extends SmartTexture {
private IntBuffer pixels;
public FogTexture(int w, int h) {
super();
width = w;
height = h;
pixels = ByteBuffer.
allocateDirect( w * h * 4 ).
order( ByteOrder.nativeOrder() ).
asIntBuffer();
TextureCache.add( FogOfWar.class, this );
}
@Override
protected void generate() {
int[] ids = new int[1];
GLES20.glGenTextures( 1, ids, 0 );
id = ids[0];
}
@Override
public void reload() {
generate();
update();
}
public void update(){
bind();
filter( Texture.LINEAR, Texture.LINEAR );
wrap( Texture.CLAMP, Texture.CLAMP);
pixels.position(0);
GLES20.glTexImage2D(
GLES20.GL_TEXTURE_2D,
0,
GLES20.GL_RGBA,
width,
height,
0,
GLES20.GL_RGBA,
GLES20.GL_UNSIGNED_BYTE,
pixels );
}
//allows partially updating the texture
public void update(int top, int bottom){
bind();
filter( Texture.LINEAR, Texture.LINEAR );
wrap( Texture.CLAMP, Texture.CLAMP);
pixels.position(top*width);
GLES20.glTexSubImage2D(GLES20.GL_TEXTURE_2D,
0,
0,
top,
width,
bottom - top,
GLES20.GL_RGBA,
GLES20.GL_UNSIGNED_BYTE,
pixels);
}
@Override
public void delete() {
super.delete();
}
}
@Override @Override
protected NoosaScript script() { protected NoosaScript script() {
return NoosaScriptNoLighting.get(); return NoosaScriptNoLighting.get();
@ -417,4 +337,12 @@ public class FogOfWar extends Image {
super.draw(); super.draw();
} }
@Override
public void destroy() {
super.destroy();
if (texture != null){
texture.delete();
}
}
} }