sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DDSLoader: fix loading 16-bit images (as exported by PVRTexTool)

Browse Source
This commit is contained in:
shadowislord 2015-02-10 20:16:51 -05:00
parent badefdf4e4
commit 629c007cd4
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jme3-core/src/plugins/java/com/jme3/texture/plugins/DDSLoader.java
View File

@ -151,10 +151,10 @@ public class DDSLoader implements AssetLoader {
private void loadDX10Header() throws IOException { private void loadDX10Header() throws IOException {
int dxgiFormat = in.readInt(); int dxgiFormat = in.readInt();
if (dxgiFormat == 0) { if (dxgiFormat == 0) {
pixelFormat = Format.ETC1; pixelFormat = Format.ETC1;
bpp = 4; bpp = 4;
} else { } else {
throw new IOException("Unsupported DX10 format: " + dxgiFormat); throw new IOException("Unsupported DX10 format: " + dxgiFormat);
} }
compressed = true; compressed = true;
@ -327,9 +327,17 @@ public class DDSLoader implements AssetLoader {
if (is(pfFlags, DDPF_RGB)) { if (is(pfFlags, DDPF_RGB)) {
if (is(pfFlags, DDPF_ALPHAPIXELS)) { if (is(pfFlags, DDPF_ALPHAPIXELS)) {
pixelFormat = Format.RGBA8; if (bpp == 16) {
pixelFormat = Format.RGB5A1;
} else {
pixelFormat = Format.RGBA8;
}
} else { } else {
pixelFormat = Format.RGB8; if (bpp == 16) {
pixelFormat = Format.RGB565;
} else {
pixelFormat = Format.RGB8;
}
} }
} else if (is(pfFlags, DDPF_GRAYSCALE) && is(pfFlags, DDPF_ALPHAPIXELS)) { } else if (is(pfFlags, DDPF_GRAYSCALE) && is(pfFlags, DDPF_ALPHAPIXELS)) {
switch (bpp) { switch (bpp) {