eaglercraft/eaglercraft-1.5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replaced baislsl's PNG decoder with the browser's native PNG decoder

Browse Source
This commit is contained in:
LAX1DUDE 2022-05-15 22:27:31 -07:00
parent 2c8ca1ec60
commit fb890d77f5
23 changed files with 117 additions and 736 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lwjgl/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java
View File

@ -13,6 +13,7 @@ import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.StringSelection;
import java.awt.datatransfer.UnsupportedFlavorException;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
@ -34,6 +35,7 @@ import java.util.LinkedList;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import javax.imageio.ImageIO;
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
@ -65,6 +67,7 @@ import org.lwjgl.util.glu.GLU;
import de.cuina.fireandfuel.CodecJLayerMP3;
import net.lax1dude.eaglercraft.AssetRepository;
import net.lax1dude.eaglercraft.EaglerImage;
import net.lax1dude.eaglercraft.EarlyLoadScreen;
import net.lax1dude.eaglercraft.ServerQuery;
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.ProgramGL;
@ -607,6 +610,18 @@ public class EaglerAdapterImpl2 {
return GL20.glGetAttribLocation(p1.obj, p2);
}
public static final EaglerImage loadPNG(byte[] data) {
try {
BufferedImage img = ImageIO.read(new ByteArrayInputStream(data));
int[] pxls = img.getRGB(0, 0, img.getWidth(), img.getHeight(), null, 0, img.getWidth());
return new EaglerImage(pxls, img.getWidth(), img.getHeight(), true);
} catch (IOException e) {
System.err.println("Could not load PNG file:");
e.printStackTrace();
return null;
}
}
public static final boolean isVideoSupported() {
return false;
}

62
src/main/java/com/baislsl/png/chunk/Chunk.java
View File

@ -1,62 +0,0 @@
package com.baislsl.png.chunk;
import com.baislsl.png.util.ByteHandler;
/**
* Created by baislsl on 17-7-9.
*/
public class Chunk {
protected long length;
protected ChunkType type;
protected byte[] data;
protected byte[] crc = new byte[4];
public byte[] dump() {
byte[] output = new byte[4 + 4 + data.length + 4];
Byte[] lengthBytes = new Byte[4];
for (int i = 0; i < 4; i++) {
output[3 - i] = (byte) (length & 0xff);
}
String typeName = type.name().toUpperCase();
for (int i = 0; i < 4; i++) {
output[4 + i] = (byte) typeName.charAt(i);
}
System.arraycopy(data, 0, output, 8, data.length);
System.arraycopy(crc, 0, output, output.length - crc.length, crc.length);
return output;
}
protected Chunk(byte[] length, byte[] type, byte[] data, byte[] crc) {
this.length = ByteHandler.byteToLong(length);
this.data = data;
this.crc = crc;
for (ChunkType chunkType : ChunkType.values()) {
if (chunkType.name().equals(ByteHandler.byteToString(type))) {
this.type = chunkType;
break;
}
}
}
public long dataLength() {
return data.length;
}
public long getLength() {
return length;
}
public ChunkType getType() {
return type;
}
public byte[] getData() {
return data;
}
public byte[] getCrc() {
return crc;
}
}

44
src/main/java/com/baislsl/png/chunk/ChunkType.java
View File

@ -1,44 +0,0 @@
package com.baislsl.png.chunk;
import com.baislsl.png.decode.DecodeException;
import com.baislsl.png.decode.PNG;
/**
* Created by baislsl on 17-7-9.
*/
public enum ChunkType {
IHDR {
@Override
public void apply(PNG png, byte[] length, byte[] type, byte[] data, byte[] crc) throws DecodeException {
png.setIhdr(new IHDR(length, type, data, crc));
}
},
tRNS {
@Override
public void apply(PNG png, byte[] length, byte[] type, byte[] data, byte[] crc) throws DecodeException {
png.setTrns(new tRNS(length, type, data, crc));
}
},
PLTE {
@Override
public void apply(PNG png, byte[] length, byte[] type, byte[] data, byte[] crc) throws DecodeException {
png.setPlte(new PLTE(length, type, data, crc));
}
},
IDAT {
@Override
public void apply(PNG png, byte[] length, byte[] type, byte[] data, byte[] crc) throws DecodeException {
png.add(new IDAT(length, type, data, crc));
}
},
IEND {
@Override
public void apply(PNG png, byte[] length, byte[] type, byte[] data, byte[] crc) throws DecodeException {
png.setIend(new IEND(length, type, data, crc));
}
};
public abstract void apply(PNG png, byte[] length, byte[] type, byte[] data, byte[] crc) throws DecodeException;
}

11
src/main/java/com/baislsl/png/chunk/IDAT.java
View File

@ -1,11 +0,0 @@
package com.baislsl.png.chunk;
/**
* Created by baislsl on 17-7-10.
*/
public class IDAT extends Chunk {
public IDAT(byte[] length, byte[] type, byte[] data, byte[] crc) {
super(length, type, data, crc);
}
}

10
src/main/java/com/baislsl/png/chunk/IEND.java
View File

@ -1,10 +0,0 @@
package com.baislsl.png.chunk;
/**
* Created by baislsl on 17-7-9.
*/
public class IEND extends Chunk {
public IEND(byte[] length, byte[] type, byte[] data, byte[] crc) {
super(length, type, data, crc);
}
}

119
src/main/java/com/baislsl/png/chunk/IHDR.java
View File

@ -1,119 +0,0 @@
package com.baislsl.png.chunk;
import com.baislsl.png.decode.DecodeException;
import com.baislsl.png.util.ByteHandler;
/**
* Created by baislsl on 17-7-9.
*/
public class IHDR extends Chunk {
private long width, height;
private int bitDepth, colorType, compressionMethod, filterMethod, interlaceMethod;
final private static int[] colorTypeValid = { 0, 2, 3, 4, 6 };
final private static int[][] mapColorBitDepth = { { 1, 2, 4, 8, 16 }, // color type = 0
{}, { 8, 16 }, // color type = 2
{ 1, 2, 4, 8 }, // color type = 3
{ 8, 16 }, // color type = 4
{}, { 8, 16 } // color type = 6
};
// the number of bytes per complete pixel, rounding up to one
public int getBpp() {
if (colorType == 2) { // Each pixel is an R,G,B triple.
return 3;
} else if (colorType == 6) { // Each pixel is an R,G,B triple, followed by an alpha sample.
return 4;
} else if (colorType == 3) { // palette index, roll up to 1
return 1;
} else {
// LOG.error("Error when find bpp");
return 0;
}
}
public IHDR(byte[] length, byte[] type, byte[] data, byte[] crc) throws DecodeException {
super(length, type, data, crc);
build();
checkLegal();
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("width=");
sb.append(width);
sb.append("height=");
sb.append(height);
sb.append("bitDepth=");
sb.append(bitDepth);
sb.append("colorType=");
sb.append(colorType);
sb.append("compressionMethod=");
sb.append(compressionMethod);
sb.append("filterMethod=");
sb.append(filterMethod);
sb.append("interlaceMethod=");
sb.append(interlaceMethod);
return sb.toString();
}
private void build() {
this.width = ByteHandler.byteToLong(data);
this.height = ByteHandler.byteToLong(data, 4);
this.bitDepth = ((int) data[8]) & 0xFF;
this.colorType = ((int) data[9]) & 0xFF;
this.compressionMethod = ((int) data[10]) & 0xFF;
this.filterMethod = ((int) data[11]) & 0xFF;
this.interlaceMethod = ((int) data[12]) & 0xFF;
}
private void checkLegal() throws DecodeException {
boolean legal = false;
for (int c : colorTypeValid) {
if (c == colorType) {
legal = true;
break;
}
}
if (!legal) {
throw new DecodeException("Initialize IHDR : color type not legal to be " + colorType);
}
for (int b : mapColorBitDepth[colorType]) {
if (b == bitDepth) {
return;
}
}
throw new DecodeException(
"Initialzie IHDR : bit depth " + bitDepth + " not valid matching color type " + colorType);
}
public long getWidth() {
return this.width;
}
public long getHeight() {
return this.height;
}
public int getBitDepth() {
return bitDepth;
}
public int getColorType() {
return colorType;
}
public int getCompressionMethod() {
return compressionMethod;
}
public int getFilterMethod() {
return filterMethod;
}
public int getInterlaceMethod() {
return interlaceMethod;
}
}

35
src/main/java/com/baislsl/png/chunk/PLTE.java
View File

@ -1,35 +0,0 @@
package com.baislsl.png.chunk;
import com.baislsl.png.decode.DecodeException;
/**
* Created by baislsl on 17-7-9.
*/
public class PLTE extends Chunk {
private int[] color;
public PLTE(byte[] length, byte[] type, byte[] data, byte[] crc) throws DecodeException {
super(length, type, data, crc);
build();
}
private void build() throws DecodeException {
if (this.length % 3 != 0)
throw new DecodeException("PLTE length can not be divide by 3");
int size = (int) length / 3;
color = new int[size];
for (int i = 0; i < size; i++) {
color[i] = (((int) data[i * 3]) & 0xFF) << 16 | (((int) data[i * 3 + 1]) & 0xFF) << 8
| (((int) data[i * 3 + 2]) & 0xFF) | 0xFF000000;
}
}
public int getColor(int i) {
return color[i];
}
public int getPaletteSize() {
return color.length;
}
}

18
src/main/java/com/baislsl/png/chunk/tRNS.java
View File

@ -1,18 +0,0 @@
package com.baislsl.png.chunk;
import com.baislsl.png.decode.DecodeException;
/**
* Created by baislsl on 17-7-9.
*/
public class tRNS extends Chunk {
public tRNS(byte[] length, byte[] type, byte[] data, byte[] crc) throws DecodeException {
super(length, type, data, crc);
}
public int getAlpha() {
return (int)data[0] & 0xFF;
}
}

22
src/main/java/com/baislsl/png/decode/DecodeException.java
View File

@ -1,22 +0,0 @@
package com.baislsl.png.decode;
/**
* Created by baislsl on 17-7-9.
*/
public class DecodeException extends Exception {
public DecodeException() {
}
public DecodeException(String message) {
super(message);
}
public DecodeException(String message, Throwable cause) {
super(message, cause);
}
public DecodeException(Throwable cause) {
super(cause);
}
}

96
src/main/java/com/baislsl/png/decode/Decoder.java
View File

@ -1,96 +0,0 @@
package com.baislsl.png.decode;
import com.baislsl.png.chunk.ChunkType;
import com.baislsl.png.util.CRC;
import com.baislsl.png.util.ByteHandler;
import java.io.IOException;
import java.io.InputStream;
import static com.baislsl.png.util.ByteHandler.byteToLong;
/**
* Created by baislsl on 17-7-9.
*/
public class Decoder {
// private final static Logger LOG = LoggerFactory.getLogger(Decoder.class);
private final InputStream in;
private final static char[] head = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a };
public Decoder(InputStream in) {
this.in = in;
}
private void readHeader() throws DecodeException, IOException {
byte[] header = readBytes(8);
for (int i = 0; i < 8; i++) {
if ((header[i] & 0xff) != (int) head[i])
throw new DecodeException("It seems that this is not a PNG files");
}
// LOG.info(ByteHandler.byteToString(header));
}
private boolean readChunk(PNG png, String chunkName, byte[] length, byte[] type, byte[] data, byte[] crc)
throws IOException, DecodeException {
for (ChunkType chunkType : ChunkType.values()) {
if (chunkType.name().equalsIgnoreCase(chunkName)) {
chunkType.apply(png, length, type, data, crc);
return true;
}
}
return false;
}
private boolean checkCrc(byte[] data, long crcNumber) {
return crcNumber == CRC.crc(data, data.length);
}
private boolean checkCrc(byte[] type, byte[] data, byte[] crc) {
long crcNumber = byteToLong(crc);
byte[] crcData = new byte[4 + data.length];
System.arraycopy(type, 0, crcData, 0, 4);
System.arraycopy(data, 0, crcData, 4, data.length);
return checkCrc(crcData, crcNumber);
}
public PNG readInPNG() throws IOException, DecodeException {
PNG png = new PNG();
readHeader();
String chunkName;
do {
byte[] length = readBytes(4);
long size = byteToLong(length);
byte[] type = readBytes(4);
chunkName = ByteHandler.byteToString(type).toUpperCase();
if ("IEND".equals(chunkName)) {
break;
}
byte[] data = readBytes((int) size);
byte[] crc = readBytes(4);
// LOG.info(ByteHandler.byteToString(type));
boolean found = readChunk(png, chunkName, length, type, data, crc);
if (!found) {
// LOG.info("Not support chunk name {}", chunkName);
}
boolean crcMatch = checkCrc(type, data, crc);
if (!crcMatch) {
throw new DecodeException("Error data stream for incorrect crc");
}
} while (!"IEND".equals(chunkName));
return png;
}
private byte[] readBytes(int size) throws IOException {
byte[] result = new byte[size];
int ret = in.read(result, 0, size);
if (ret == -1)
return null;
return result;
}
}

23
src/main/java/com/baislsl/png/decode/IDATManager.java
View File

@ -1,23 +0,0 @@
package com.baislsl.png.decode;
import com.baislsl.png.chunk.IDAT;
import java.util.ArrayList;
public class IDATManager extends ArrayList<IDAT> {
public byte[] getIDATData() {
int dataSize = 0;
for (IDAT idat : this) {
dataSize += idat.dataLength();
}
byte[] data = new byte[dataSize];
int curPos = 0;
for (IDAT idat : this) {
System.arraycopy(idat.getData(), 0, data, curPos, (int) idat.dataLength());
curPos += idat.dataLength();
}
return data;
}
}

132
src/main/java/com/baislsl/png/decode/PNG.java
View File

@ -1,132 +0,0 @@
package com.baislsl.png.decode;
import com.baislsl.png.chunk.*;
import com.baislsl.png.util.ReverseFilter;
import net.lax1dude.eaglercraft.EaglerInflater;
import java.io.IOException;
/**
* Created by baislsl on 17-7-9.
*/
public class PNG {
// private final static Logger LOG = LoggerFactory.getLogger(PNG.class);
public IHDR ihdr;
public IDATManager idats = new IDATManager();
public PLTE plte;
public tRNS trns;
public IEND iend;
public PNG() {
}
public boolean isAlpha() {
return this.trns != null || ihdr.getBpp() == 4;
}
public int[] getColor() throws DecodeException {
byte[] rawData = idats.getIDATData();
byte[] uncompressData = applyLZ77(rawData);
byte[][] transferData = applyReverseFilter(uncompressData);
int[] colors = applyColorTransfer(transferData);
return colors;
}
private int[] applyColorTransfer(byte[][] data) throws DecodeException {
int bpp = ihdr.getBpp();
int width = (int) ihdr.getWidth();
int height = (int) ihdr.getHeight();
int colorType = ihdr.getColorType();
int bitDepth = ihdr.getBitDepth();
int[] colors = new int[width * height];
for (int i = 0; i < height; i++) {
for (int j = 0; j < width; j++) {
int idx = i * width + j;
switch (colorType) {
case 2:
if (bitDepth == 8) { // bpp = 3
colors[idx] = ((int) data[i][bpp * j] & 0xff) << 16 | ((int) data[i][bpp * j + 1] & 0xff) << 8
| ((int) data[i][bpp * j + 2] & 0xff);
} else {
throw new DecodeException("not supported");
}
break;
case 6:
if (bitDepth == 8) { // bpp = 4
colors[idx] = ((int) data[i][bpp * j] & 0xff) << 16 | ((int) data[i][bpp * j + 1] & 0xff) << 8
| ((int) data[i][bpp * j + 2] & 0xff) | ((int) data[i][bpp * j + 3] & 0xff) << 24;
} else {
throw new DecodeException("not supported");
}
break;
case 3:
int gap = 8 / bitDepth;
int a = (1 << bitDepth) - 1;
int b = gap - (j % gap) - 1;
int pi = (data[i][j / gap] >> (b * bitDepth)) & a;
if (trns != null && trns.getAlpha() == pi) {
colors[idx] = 0;
}else {
colors[idx] = plte.getColor(pi);
}
break;
default:
throw new DecodeException("Do not support color type " + colorType);
}
}
}
return colors;
}
private byte[] applyLZ77(byte[] data) throws DecodeException {
byte[] result;
try {
result = EaglerInflater.uncompress(data);
} catch (IOException e) {
// LOG.error("LZ77 decode error", e);
throw new DecodeException(e);
}
// LOG.info("Size after decode={}", result.length);
return result;
}
private byte[][] applyReverseFilter(byte[] data) {
int width = (int) ihdr.getWidth(), height = (int) ihdr.getHeight();
return ReverseFilter.apply(data, width, height, ihdr.getBpp());
}
public void setIdats(IDATManager idats) {
this.idats = idats;
}
public void setIhdr(IHDR ihdr) {
this.ihdr = ihdr;
}
public void setPlte(PLTE plte) {
this.plte = plte;
}
public void setTrns(tRNS trns) {
this.trns = trns;
}
public void setIend(IEND iend) {
this.iend = iend;
}
public void add(IDAT idat) throws DecodeException {
idats.add(idat);
}
public long getWidth() {
return ihdr.getWidth();
}
public long getHeight() {
return ihdr.getHeight();
}
}

32
src/main/java/com/baislsl/png/util/ByteHandler.java
View File

@ -1,32 +0,0 @@
package com.baislsl.png.util;
/**
* Created by baislsl on 17-7-10.
*/
public class ByteHandler {
public static long byteToLong(byte[] data, int offset, int size) {
long result = 0;
for (int i = 0; i < size; i++) {
result <<= 8;
result |= ((long) data[offset + i] & 0xff);
}
return result;
}
public static long byteToLong(byte[] data, int offset) {
return byteToLong(data, offset, 4);
}
public static long byteToLong(byte[] data) {
return byteToLong(data, 0, 4);
}
public static String byteToString(byte[] data) {
StringBuilder str = new StringBuilder();
for (byte b : data) {
str.append((char) (0x0ff & b));
}
return str.toString();
}
}

35
src/main/java/com/baislsl/png/util/CRC.java
View File

@ -1,35 +0,0 @@
package com.baislsl.png.util;
/**
* Created by baislsl on 17-7-9.
*/
public class CRC {
private final static long[] crcTable = new long[256];
static {
for (int i = 0; i < 256; i++) {
long c = i;
for (int k = 0; k < 8; k++) {
if ((c & 1) != 0) {
c = 0xedb88320L ^ (c >> 1);
} else {
c >>= 1;
}
}
crcTable[i] = c;
}
}
private static long updateCrc(long crc, byte[] buf, int size) {
long ans = crc;
for (int i = 0; i < size; i++) {
ans = crcTable[(int) ((ans ^ buf[i]) & 0xff)] ^ (ans >> 8);
}
return ans;
}
public static long crc(byte[] buf, int size) {
return updateCrc(0xffffffffL, buf, size) ^ 0xffffffffL;
}
}

64
src/main/java/com/baislsl/png/util/ReverseFilter.java
View File

@ -1,64 +0,0 @@
package com.baislsl.png.util;
public class ReverseFilter {
private ReverseFilter() {
}
private static int paethPredictor(int a, int b, int c) {
int p = a + b - c;
int pa = Math.abs(p - a), pb = Math.abs(p - b), pc = Math.abs(p - c);
if (pa <= pb && pa <= pc)
return a;
if (pb <= pc)
return b;
return c;
}
// apply reverse Filter Algorithms to byte data
// bpp = 3
public static byte[][] apply(byte[] data, int width, int height, int bpp) {
int[] filterType = new int[height];
int[][] blocks = new int[height][width * bpp];
int dataIndex = 0;
for (int i = 0; i < height; i++) {
filterType[i] = (int) (data[dataIndex++]) & 0xFF;
for (int j = 0; j < width * bpp; j++) {
blocks[i][j] = (int) (data[dataIndex++]) & 0xFF;
}
}
for (int i = 0; i < height; i++) {
for (int j = 0; j < width * bpp; j++) {
int prior = (i == 0) ? 0 : blocks[i - 1][j];
int rawBpp = (j < bpp) ? 0 : blocks[i][j - bpp];
int bppPrior = (i == 0 || j < bpp) ? 0 : blocks[i - 1][j - bpp];
switch (filterType[i]) {
case 0: // none
break;
case 1: // sub
blocks[i][j] = blocks[i][j] + rawBpp;
break;
case 2: // up
blocks[i][j] = blocks[i][j] + prior;
break;
case 3: // average
blocks[i][j] = blocks[i][j] + (rawBpp + prior) / 2;
break;
case 4: // paeth
blocks[i][j] = blocks[i][j] + paethPredictor(rawBpp, prior, bppPrior);
break;
default:
}
blocks[i][j] &= 0xff;
}
}
byte[][] result = new byte[height][width * bpp];
for (int i = 0; i < height; i++) {
for (int j = 0; j < width * bpp; j++) {
result[i][j] = (byte) blocks[i][j];
}
}
return result;
}
}

18
src/main/java/net/lax1dude/eaglercraft/EaglerImage.java
View File

@ -1,12 +1,5 @@
package net.lax1dude.eaglercraft;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import com.baislsl.png.decode.DecodeException;
import com.baislsl.png.decode.Decoder;
import com.baislsl.png.decode.PNG;
public class EaglerImage {
public final int[] data;
@ -37,16 +30,7 @@ public class EaglerImage {
}
public static final EaglerImage loadImage(byte[] file) {
try {
PNG p = (new Decoder(new ByteArrayInputStream(file))).readInPNG();
return new EaglerImage(p.getColor(), (int)p.getWidth(), (int)p.getHeight(), p.isAlpha());
} catch (IOException e) {
e.printStackTrace();
return null;
} catch (DecodeException e) {
e.printStackTrace();
return null;
}
return EaglerAdapter.loadPNG(file);
}
public EaglerImage getSubImage(int x, int y, int pw, int ph) {

6
src/main/java/net/lax1dude/eaglercraft/EarlyLoadScreen.java
View File

@ -24,7 +24,8 @@ public class EarlyLoadScreen {
_wglTexParameteri(_wGL_TEXTURE_2D, _wGL_TEXTURE_MIN_FILTER, _wGL_NEAREST);
_wglTexParameteri(_wGL_TEXTURE_2D, _wGL_TEXTURE_WRAP_S, _wGL_CLAMP);
_wglTexParameteri(_wGL_TEXTURE_2D, _wGL_TEXTURE_WRAP_T, _wGL_CLAMP);
EaglerImage img = EaglerImage.loadImage(Base64.decodeBase64(loadScreen));
//EaglerImage img = EaglerImage.loadImage(Base64.decodeBase64(loadScreen));
EaglerImage img = EaglerAdapter.loadPNG(Base64.decodeBase64(loadScreen));
IntBuffer upload = GLAllocation.createDirectIntBuffer(192*192);
upload.put(img.data);
upload.flip();
@ -116,7 +117,8 @@ public class EarlyLoadScreen {
_wglTexParameteri(_wGL_TEXTURE_2D, _wGL_TEXTURE_MIN_FILTER, _wGL_NEAREST);
_wglTexParameteri(_wGL_TEXTURE_2D, _wGL_TEXTURE_WRAP_S, _wGL_CLAMP);
_wglTexParameteri(_wGL_TEXTURE_2D, _wGL_TEXTURE_WRAP_T, _wGL_CLAMP);
EaglerImage img = EaglerImage.loadImage(Base64.decodeBase64(enableScreen));
//EaglerImage img = EaglerImage.loadImage(Base64.decodeBase64(enableScreen));
EaglerImage img = EaglerAdapter.loadPNG(Base64.decodeBase64(enableScreen));
IntBuffer upload = GLAllocation.createDirectIntBuffer(128*128);
upload.put(img.data);
upload.flip();

3
src/main/java/net/lax1dude/eaglercraft/TextureTerrainMap.java
View File

@ -134,7 +134,8 @@ public class TextureTerrainMap implements IconRegister {
if(data == null) {
map.replaceTexture(this, map.missingData);
}else {
EaglerImage img = EaglerImage.loadImage(data);
//EaglerImage img = EaglerImage.loadImage(data);
EaglerImage img = EaglerAdapter.loadPNG(data);
if(img == null) {
map.replaceTexture(this, map.missingData);
}else {

3
src/main/java/net/minecraft/src/FontRenderer.java
View File

@ -130,7 +130,8 @@ public class FontRenderer {
}
private void readFontTexture(String par1Str) {
EaglerImage e = EaglerImage.loadImage(EaglerAdapter.loadResourceBytes(par1Str));
//EaglerImage e = EaglerImage.loadImage(EaglerAdapter.loadResourceBytes(par1Str));
EaglerImage e = EaglerAdapter.loadPNG(EaglerAdapter.loadResourceBytes(par1Str));
int[] var5 = e.data;
int var3 = e.w;
int var4 = e.h;

28
src/main/java/net/minecraft/src/RenderEngine.java
View File

@ -67,7 +67,8 @@ public class RenderEngine {
if (var7 == null) {
var4 = this.missingTextureImage.data;
} else {
var4 = EaglerImage.loadImage(var7).data;
//var4 = EaglerImage.loadImage(var7).data;
var4 = EaglerAdapter.loadPNG(var7).data;
}
this.textureContentsMap.put(par1Str, var4);
@ -124,7 +125,7 @@ public class RenderEngine {
if (var6 == null) {
this.setupTextureExt(this.missingTextureImage, var3, var9, var5);
} else {
this.setupTextureExt(this.readTextureImage(var6), var3, var9, var5);
this.setupTextureExt(EaglerImage.loadImage(var6), var3, var9, var5);
}
this.textureMap.put(var8, Integer.valueOf(var3));
@ -299,13 +300,16 @@ public class RenderEngine {
var11 = var11.substring(7);
}
byte[] b = var1.getResourceAsBytes(var11);
if(b != null) {
EaglerImage var5 = this.readTextureImage(b);
this.setupTextureExt(var5, var12, var6, var7);
}else {
System.err.println("could not reload: "+var11);
//byte[] b = var1.getResourceAsBytes(var11); //what the fuck
//if(b != null) {
EaglerImage var5 = EaglerAdapter.loadPNG(var1.getResourceAsBytes(var11));
if(var5 == null) {
throw new IOException("Could not load PNG");
}
this.setupTextureExt(var5, var12, var6, var7);
//}else {
// System.err.println("could not reload: "+var11);
//}
} catch (IOException var9) {
var9.printStackTrace();
}
@ -317,7 +321,10 @@ public class RenderEngine {
var11 = (String) var2.next();
try {
var4 = this.readTextureImage(var1.getResourceAsBytes(var11));
var4 = EaglerAdapter.loadPNG(var1.getResourceAsBytes(var11));
if(var4 == null) {
throw new IOException("Could not load PNG");
}
System.arraycopy(var4.data, 0, (int[]) this.textureContentsMap.get(var11), 0, var4.data.length);
} catch (IOException var8) {
var8.printStackTrace();
@ -332,7 +339,8 @@ public class RenderEngine {
* Returns a BufferedImage read off the provided input stream. Args: inputStream
*/
private EaglerImage readTextureImage(byte[] par1InputStream) throws IOException {
return EaglerImage.loadImage(par1InputStream);
return null;//EaglerImage.loadImage(par1InputStream);
//return EaglerAdapter.loadPNG(par1InputStream);
}
public void refreshTextureMaps() {

3
src/main/java/net/minecraft/src/TextureManager.java
View File

@ -52,7 +52,8 @@ public class TextureManager {
ITexturePack var3 = Minecraft.getMinecraft().texturePackList.getSelectedTexturePack();
byte[] b = var3.getResourceAsBytes("/" + par1Str);
if(b != null) {
EaglerImage var9 = EaglerImage.loadImage(b);
//EaglerImage var9 = EaglerImage.loadImage(b);
EaglerImage var9 = EaglerAdapter.loadPNG(b);
int var10 = var9.w;
int var11 = var9.h;
String var12 = this.getBasename(par1Str);

3
src/main/java/net/minecraft/src/TexturePackImplementation.java
View File

@ -62,7 +62,8 @@ public abstract class TexturePackImplementation implements ITexturePack {
* Load and initialize thumbnailImage from the the /pack.png file.
*/
private void loadThumbnailImage() {
this.thumbnailImage = EaglerImage.loadImage(EaglerAdapter.loadResourceBytes("/pack.png"));
//this.thumbnailImage = EaglerImage.loadImage(EaglerAdapter.loadResourceBytes("/pack.png"));
this.thumbnailImage = EaglerAdapter.loadPNG(EaglerAdapter.loadResourceBytes("/pack.png"));
}
/**

71
src/teavm/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java
View File

@ -25,6 +25,8 @@ import org.teavm.jso.ajax.ReadyStateChangeHandler;
import org.teavm.jso.ajax.XMLHttpRequest;
import org.teavm.jso.browser.TimerHandler;
import org.teavm.jso.browser.Window;
import org.teavm.jso.canvas.CanvasRenderingContext2D;
import org.teavm.jso.canvas.ImageData;
import org.teavm.jso.dom.events.Event;
import org.teavm.jso.dom.events.EventListener;
import org.teavm.jso.dom.events.KeyboardEvent;
@ -41,6 +43,7 @@ import org.teavm.jso.typedarrays.ArrayBuffer;
import org.teavm.jso.typedarrays.Float32Array;
import org.teavm.jso.typedarrays.Int32Array;
import org.teavm.jso.typedarrays.Uint8Array;
import org.teavm.jso.typedarrays.Uint8ClampedArray;
import org.teavm.jso.webaudio.AudioBuffer;
import org.teavm.jso.webaudio.AudioBufferSourceNode;
import org.teavm.jso.webaudio.AudioContext;
@ -63,6 +66,7 @@ import org.teavm.jso.websocket.WebSocket;
import net.lax1dude.eaglercraft.AssetRepository;
import net.lax1dude.eaglercraft.Base64;
import net.lax1dude.eaglercraft.EaglerImage;
import net.lax1dude.eaglercraft.EarlyLoadScreen;
import net.lax1dude.eaglercraft.LocalStorageManager;
import net.lax1dude.eaglercraft.ServerQuery;
@ -888,6 +892,73 @@ public class EaglerAdapterImpl2 {
return getString("window.navigator.platform").toLowerCase().contains("win");
}
private static HTMLCanvasElement imageLoadCanvas = null;
private static CanvasRenderingContext2D imageLoadContext = null;
@JSBody(params = { "buf", "mime" }, script = "return URL.createObjectURL(new Blob([buf], {type: mime}));")
private static native String getDataURL(ArrayBuffer buf, String mime);
@JSBody(params = { "url" }, script = "URL.revokeObjectURL(url);")
private static native void freeDataURL(String url);
public static final EaglerImage loadPNG(byte[] data) {
ArrayBuffer arr = ArrayBuffer.create(data.length);
Uint8Array.create(arr).set(data);
return loadPNG0(arr);
}
@Async
private static native EaglerImage loadPNG0(ArrayBuffer data);
private static void loadPNG0(ArrayBuffer data, final AsyncCallback<EaglerImage> ret) {
final HTMLImageElement toLoad = (HTMLImageElement) doc.createElement("img");
toLoad.addEventListener("load", new EventListener<Event>() {
@Override
public void handleEvent(Event evt) {
if(imageLoadCanvas == null) {
imageLoadCanvas = (HTMLCanvasElement) doc.createElement("canvas");
}
if(imageLoadCanvas.getWidth() < toLoad.getWidth()) {
imageLoadCanvas.setWidth(toLoad.getWidth());
}
if(imageLoadCanvas.getHeight() < toLoad.getHeight()) {
imageLoadCanvas.setHeight(toLoad.getHeight());
}
if(imageLoadContext == null) {
imageLoadContext = (CanvasRenderingContext2D) imageLoadCanvas.getContext("2d");
}
imageLoadContext.clearRect(0, 0, toLoad.getWidth(), toLoad.getHeight());
imageLoadContext.drawImage(toLoad, 0, 0, toLoad.getWidth(), toLoad.getHeight());
ImageData pxlsDat = imageLoadContext.getImageData(0, 0, toLoad.getWidth(), toLoad.getHeight());
Uint8ClampedArray pxls = pxlsDat.getData();
int totalPixels = pxlsDat.getWidth() * pxlsDat.getHeight();
freeDataURL(toLoad.getSrc());
if(pxls.getByteLength() < totalPixels * 4) {
ret.complete(null);
return;
}
int[] pixels = new int[totalPixels];
for(int i = 0; i < pixels.length; ++i) {
pixels[i] = (pxls.get(i * 4) << 16) | (pxls.get(i * 4 + 1) << 8) | pxls.get(i * 4 + 2) | (pxls.get(i * 4 + 3) << 24);
}
ret.complete(new EaglerImage(pixels, pxlsDat.getWidth(), pxlsDat.getHeight(), true));
}
});
toLoad.addEventListener("error", new EventListener<Event>() {
@Override
public void handleEvent(Event evt) {
freeDataURL(toLoad.getSrc());
ret.complete(null);
}
});
String src = getDataURL(data, "image/png");
if(src == null) {
ret.complete(null);
}else {
toLoad.setSrc(src);
}
}
private static HTMLVideoElement currentVideo = null;
private static TextureGL videoTexture = null;
private static boolean videoIsLoaded = false;