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

- TextureAtlas: move some things from static methods to object methods

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9047 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2012-01-15 03:59:24 +00:00
parent 14daceaabd
commit 3031875264
1 changed files with 34 additions and 23 deletions

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

@ -74,11 +74,41 @@ public class TextureAtlas {
locationMap = new TreeMap<String, TextureAtlasTile>(); locationMap = new TreeMap<String, TextureAtlasTile>();
} }
/**
* Add a geometries DiffuseMap (or ColorMap), NormalMap and SpecularMap to the atlas
* @param geometry
* @return false if the atlas is full
*/
public boolean addGeometry(Geometry geometry) {
Texture diffuse = getMaterialTexture(geometry, "DiffuseMap");
Texture normal = getMaterialTexture(geometry, "NormalMap");
Texture specular = getMaterialTexture(geometry, "SpecularMap");
if (diffuse == null) {
diffuse = getMaterialTexture(geometry, "ColorMap");
}
if (diffuse != null && diffuse.getKey() != null) {
String keyName = diffuse.getKey().getName();
if (!addTexture(diffuse, "DiffuseMap")) {
return false;
} else {
if (normal != null && normal.getKey() != null) {
addTexture(diffuse, "NormalMap", keyName);
}
if (specular != null && specular.getKey() != null) {
addTexture(specular, "SpecularMap", keyName);
}
}
return true;
}
return true;
}
/** /**
* Add a texture for a specific map name * Add a texture for a specific map name
* @param texture A texture to add to the atlas * @param texture A texture to add to the atlas
* @param mapName A freely chosen map name that can be later retrieved as a Texture. The first map name supplied will be the master map. * @param mapName A freely chosen map name that can be later retrieved as a Texture. The first map name supplied will be the master map.
* @return false If texture cannot be added to atlas because it does not fit * @return false if the atlas is full
*/ */
public boolean addTexture(Texture texture, String mapName) { public boolean addTexture(Texture texture, String mapName) {
if (texture == null) { if (texture == null) {
@ -97,7 +127,7 @@ public class TextureAtlas {
* @param texture A texture to add to the atlas. * @param texture A texture to add to the atlas.
* @param mapName A freely chosen map name that can be later retrieved as a Texture. * @param mapName A freely chosen map name that can be later retrieved as a Texture.
* @param sourceTexture The base texture for determining the location. * @param sourceTexture The base texture for determining the location.
* @return false If texture cannot be added to atlas because it does not fit * @return false if the atlas is full
*/ */
public void addTexture(Texture texture, String mapName, Texture sourceTexture) { public void addTexture(Texture texture, String mapName, Texture sourceTexture) {
String sourceTextureName = textureName(sourceTexture); String sourceTextureName = textureName(sourceTexture);
@ -113,7 +143,7 @@ public class TextureAtlas {
* @param texture A texture to add to the atlas. * @param texture A texture to add to the atlas.
* @param mapName A freely chosen map name that can be later retrieved as a Texture. * @param mapName A freely chosen map name that can be later retrieved as a Texture.
* @param sourceTextureName Name of the base texture for the location. * @param sourceTextureName Name of the base texture for the location.
* @return false If texture cannot be added to atlas because it does not fit * @return false if the atlas is full
*/ */
public void addTexture(Texture texture, String mapName, String sourceTextureName) { public void addTexture(Texture texture, String mapName, String sourceTextureName) {
if (texture == null) { if (texture == null) {
@ -318,26 +348,7 @@ public class TextureAtlas {
GeometryBatchFactory.gatherGeoms(root, geometries); GeometryBatchFactory.gatherGeoms(root, geometries);
TextureAtlas atlas = new TextureAtlas(atlasSize, atlasSize); TextureAtlas atlas = new TextureAtlas(atlasSize, atlasSize);
for (Geometry geometry : geometries) { for (Geometry geometry : geometries) {
Texture diffuse = getMaterialTexture(geometry, "DiffuseMap"); atlas.addGeometry(geometry);
Texture normal = getMaterialTexture(geometry, "NormalMap");
Texture specular = getMaterialTexture(geometry, "SpecularMap");
if (diffuse == null) {
diffuse = getMaterialTexture(geometry, "ColorMap");
}
if (diffuse != null && diffuse.getKey() != null) {
String keyName = diffuse.getKey().getName();
if (!atlas.addTexture(diffuse, "DiffuseMap")) {
return null;
} else {
if (normal != null && normal.getKey() != null) {
atlas.addTexture(diffuse, "NormalMap", keyName);
}
if (specular != null && specular.getKey() != null) {
atlas.addTexture(specular, "SpecularMap", keyName);
}
}
}
} }
return atlas; return atlas;
} }