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

- add size check for normal etc. maps, have to fit to main texture size

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9040 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2012-01-15 01:50:15 +00:00
parent c4b1205fda
commit 29b9a64e12
1 changed files with 4 additions and 2 deletions

6
engine/src/tools/jme3tools/optimize/TextureAtlas.java

@ -137,7 +137,7 @@ public class TextureAtlas {
rootMapName = mapName; rootMapName = mapName;
} }
if (sourceTextureName == null && !rootMapName.equals(mapName)) { if (sourceTextureName == null && !rootMapName.equals(mapName)) {
throw new IllegalStateException("Cannot add texture to new map without source texture"); throw new IllegalStateException("Cannot add texture " + name + " to new map without source texture.");
} }
TextureAtlasTile location = locationMap.get(name); TextureAtlasTile location = locationMap.get(name);
if (location != null) { if (location != null) {
@ -152,7 +152,9 @@ public class TextureAtlas {
} else { } else {
location = locationMap.get(sourceTextureName); location = locationMap.get(sourceTextureName);
if (location == null) { if (location == null) {
throw new IllegalStateException("Cannot find location for source texture"); throw new IllegalStateException("Cannot find source texture for " + name + ".");
} else if (location.width != image.getWidth() || location.height != image.getHeight()) {
throw new IllegalStateException("Secondary texture " + name + " does not fit main texture size.");
} }
} }
locationMap.put(name, location); locationMap.put(name, location);