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

* TGA loader now supports loading colormapped (non-RLE only) images

Browse Source 
* A non-supported format now yields correct message in TGA loader 

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9379 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
3.0
Sha..rd 13 years ago
parent cac820803b
commit 30dfa52f51
1 changed files with 7 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      engine/src/core-plugins/com/jme3/texture/plugins/TGALoader.java

14
engine/src/core-plugins/com/jme3/texture/plugins/TGALoader.java
Unescape View File

@ -157,7 +157,7 @@ public final class TGALoader implements AssetLoader {
// Skip image ID // Skip image ID
if (idLength > 0) { if (idLength > 0) {
in.skip(idLength); dis.skip(idLength);
} }
ColorMapEntry[] cMapEntries = null; ColorMapEntry[] cMapEntries = null;
@ -167,7 +167,7 @@ public final class TGALoader implements AssetLoader {
int bitsPerColor = Math.min(cMapDepth / 3, 8); int bitsPerColor = Math.min(cMapDepth / 3, 8);
byte[] cMapData = new byte[bytesInColorMap]; byte[] cMapData = new byte[bytesInColorMap];
in.read(cMapData); dis.read(cMapData);
// Only go to the trouble of constructing the color map // Only go to the trouble of constructing the color map
// table if this is declared a color mapped image. // table if this is declared a color mapped image.
@ -423,9 +423,9 @@ public final class TGALoader implements AssetLoader {
} }
ColorMapEntry entry = cMapEntries[index]; ColorMapEntry entry = cMapEntries[index];
rawData[rawDataIndex++] = entry.red;
rawData[rawDataIndex++] = entry.green;
rawData[rawDataIndex++] = entry.blue; rawData[rawDataIndex++] = entry.blue;
rawData[rawDataIndex++] = entry.green;
rawData[rawDataIndex++] = entry.red;
if (dl == 4) { if (dl == 4) {
rawData[rawDataIndex++] = entry.alpha; rawData[rawDataIndex++] = entry.alpha;
} }
@ -444,9 +444,9 @@ public final class TGALoader implements AssetLoader {
} }
ColorMapEntry entry = cMapEntries[index]; ColorMapEntry entry = cMapEntries[index];
rawData[rawDataIndex++] = entry.red;
rawData[rawDataIndex++] = entry.green;
rawData[rawDataIndex++] = entry.blue; rawData[rawDataIndex++] = entry.blue;
rawData[rawDataIndex++] = entry.green;
rawData[rawDataIndex++] = entry.red;
if (dl == 4) { if (dl == 4) {
rawData[rawDataIndex++] = entry.alpha; rawData[rawDataIndex++] = entry.alpha;
} }
@ -458,7 +458,7 @@ public final class TGALoader implements AssetLoader {
format = dl == 4 ? Format.RGBA8 : Format.RGB8; format = dl == 4 ? Format.RGBA8 : Format.RGB8;
} else { } else {
throw new IOException("Grayscale TGA not supported"); throw new IOException("Monochrome and RLE colormapped images are not supported");
} }

Write Preview
Loading…
Cancel
Save