Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix transparency handling in WEBP tile generation

This commit is contained in:
Mike Primm 2022-02-21 17:57:04 -06:00
parent 50e6317fa9
commit 9066fa0135
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DynmapCore/src/main/java/org/dynmap/MapType.java
View File

@ -30,13 +30,15 @@ public abstract class MapType {
}
public enum ImageEncoding {
PNG("png", "image/png"), JPG("jpg", "image/jpeg"), WEBP("webp", "image/webp");
PNG("png", "image/png", true), JPG("jpg", "image/jpeg", false), WEBP("webp", "image/webp", true);
public final String ext;
public final String mimetype;
public final boolean hasAlpha;
ImageEncoding(String ext, String mime) {
ImageEncoding(String ext, String mime, boolean has_alpha) {
this.ext = ext;
this.mimetype = mime;
this.hasAlpha = has_alpha;
}
public String getFileExt() { return ext; }
public String getContentType() { return mimetype; }

12
DynmapCore/src/main/java/org/dynmap/hdmap/IsoHDPerspective.java
View File

@ -1250,7 +1250,7 @@ public class IsoHDPerspective implements HDPerspective {
DynmapBufferedImage dayim[] = new DynmapBufferedImage[numshaders];
int[][] argb_buf = new int[numshaders][];
int[][] day_argb_buf = new int[numshaders][];
boolean isjpg[] = new boolean[numshaders];
boolean isOpaque[] = new boolean[numshaders];
int bgday[] = new int[numshaders];
int bgnight[] = new int[numshaders];
@ -1262,7 +1262,7 @@ public class IsoHDPerspective implements HDPerspective {
dayim[i] = DynmapBufferedImage.allocateBufferedImage(tileSize * sizescale, tileSize * sizescale);
day_argb_buf[i] = dayim[i].argb_buf;
}
isjpg[i] = shaderstate[i].getMap().getImageFormat() != ImageFormat.FORMAT_PNG;
isOpaque[i] = !shaderstate[i].getMap().getImageFormat().getEncoding().hasAlpha;
bgday[i] = shaderstate[i].getMap().getBackgroundARGBDay();
bgnight[i] = shaderstate[i].getMap().getBackgroundARGBNight();
}
@ -1325,17 +1325,17 @@ public class IsoHDPerspective implements HDPerspective {
}
shaderstate[i].getRayColor(rslt, 0);
int c_argb = rslt.getARGB();
if(c_argb != 0) rendered[i] = true;
if(isjpg[i] && (c_argb == 0)) {
if (c_argb != 0) rendered[i] = true;
if (isOpaque[i] && (c_argb == 0)) {
argb_buf[i][(tileSize*sizescale-y-1)*tileSize*sizescale + x] = bgnight[i];
}
else {
argb_buf[i][(tileSize*sizescale-y-1)*tileSize*sizescale + x] = c_argb;
}
if(day_argb_buf[i] != null) {
if (day_argb_buf[i] != null) {
shaderstate[i].getRayColor(rslt, 1);
c_argb = rslt.getARGB();
if(isjpg[i] && (c_argb == 0)) {
if (isOpaque[i] && (c_argb == 0)) {
day_argb_buf[i][(tileSize*sizescale-y-1)*tileSize*sizescale + x] = bgday[i];
}
else {