curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-08 04:41:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

about issue #17

Browse Source
This commit is contained in:
Song Minjae
2017-04-19 21:15:09 +09:00
parent d8d4a062de
commit 261d78f1d2
234 changed files with 702 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/net/torvald/terrarum/mapdrawer/TilesDrawer.kt
View File

@@ -15,15 +15,9 @@ import net.torvald.terrarum.mapdrawer.MapCamera.x
import net.torvald.terrarum.mapdrawer.MapCamera.y
import net.torvald.terrarum.mapdrawer.MapCamera.height
import net.torvald.terrarum.mapdrawer.MapCamera.width
import net.torvald.terrarum.realestate.LandUtil
import org.lwjgl.opengl.GL11
import org.newdawn.slick.*
import org.newdawn.slick.opengl.*
import java.io.FileInputStream
import java.nio.ByteBuffer
import java.util.*
import java.util.zip.GZIPInputStream
import java.util.zip.InflaterInputStream
/**
* Created by minjaesong on 16-01-19.
@@ -35,7 +29,9 @@ object TilesDrawer {
val tilesTerrain = SpriteSheet(ModMgr.getPath("basegame", "tiles/terrain.tga.gz"), TILE_SIZE, TILE_SIZE)
// Slick has some weird quirks with PNG's transparency. I'm using 32-bit targa here.
val tilesWire = SpriteSheet(ModMgr.getPath("basegame", "tiles/wire.tga"), TILE_SIZE, TILE_SIZE)
// -> PNG transparency issue seems to be fixed (look at my customised ImageDataFactory), but
// tga.gz is smaller than png, so I'd rather keep it
val tilesWire = SpriteSheet(ModMgr.getPath("basegame", "tiles/wire.tga.gz"), TILE_SIZE, TILE_SIZE)
val breakAnimSteps = 10

4
src/org/newdawn/slick/opengl/ImageDataFactory.java
View File

@@ -21,7 +21,7 @@ public class ImageDataFactory {
/** True if we're going to use the native PNG loader - cached so it doesn't have
* the security check repeatedly
*/
private static boolean usePngLoader = true;
private static final boolean usePngLoader = false;
/** True if the PNG loader property has been checked */
private static boolean pngLoaderPropertyChecked = false;
@@ -41,7 +41,7 @@ public class ImageDataFactory {
public Object run() {
String val = System.getProperty(PNG_LOADER);
if ("false".equalsIgnoreCase(val)) {
usePngLoader = false;
//usePngLoader = false;
}
Log.info("Use Java PNG Loader = " + usePngLoader);