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

Fixed NPE error when using a single 'None' texture type in the material definition.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9342 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Kae..pl 2012-05-02 16:45:38 +00:00
parent 2e704987b9
commit f9593adee1
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
engine/src/blender/com/jme3/scene/plugins/blender/materials/MaterialContext.java
View File

@ -126,23 +126,24 @@ public final class MaterialContext {
TextureHelper textureHelper = blenderContext.getHelper(TextureHelper.class); TextureHelper textureHelper = blenderContext.getHelper(TextureHelper.class);
for(Entry<Number, List<TextureData>> entry : textureDataMap.entrySet()) { for(Entry<Number, List<TextureData>> entry : textureDataMap.entrySet()) {
if(entry.getValue().size()>0) { if(entry.getValue().size()>0) {
CombinedTexture combinedTexture = loadedTextures.get(entry.getKey()); CombinedTexture combinedTexture = new CombinedTexture();
if(combinedTexture == null) {
combinedTexture = new CombinedTexture();
loadedTextures.put(entry.getKey(), combinedTexture);
}
for(TextureData textureData : entry.getValue()) { for(TextureData textureData : entry.getValue()) {
int texflag = ((Number) textureData.mtex.getFieldValue("texflag")).intValue(); int texflag = ((Number) textureData.mtex.getFieldValue("texflag")).intValue();
boolean negateTexture = (texflag & 0x04) != 0; boolean negateTexture = (texflag & 0x04) != 0;
Texture texture = textureHelper.getTexture(textureData.textureStructure, textureData.mtex, blenderContext); Texture texture = textureHelper.getTexture(textureData.textureStructure, textureData.mtex, blenderContext);
int blendType = ((Number) textureData.mtex.getFieldValue("blendtype")).intValue(); if(texture != null) {
float[] color = new float[] { ((Number) textureData.mtex.getFieldValue("r")).floatValue(), int blendType = ((Number) textureData.mtex.getFieldValue("blendtype")).intValue();
((Number) textureData.mtex.getFieldValue("g")).floatValue(), float[] color = new float[] { ((Number) textureData.mtex.getFieldValue("r")).floatValue(),
((Number) textureData.mtex.getFieldValue("b")).floatValue() }; ((Number) textureData.mtex.getFieldValue("g")).floatValue(),
float colfac = ((Number) textureData.mtex.getFieldValue("colfac")).floatValue(); ((Number) textureData.mtex.getFieldValue("b")).floatValue() };
TextureBlender textureBlender = TextureBlenderFactory.createTextureBlender(texture.getImage().getFormat(), float colfac = ((Number) textureData.mtex.getFieldValue("colfac")).floatValue();
texflag, negateTexture, blendType, diffuseColorArray, color, colfac); TextureBlender textureBlender = TextureBlenderFactory.createTextureBlender(texture.getImage().getFormat(),
combinedTexture.add(texture, textureBlender, textureData.uvCoordinatesType, textureData.projectionType, textureData.textureStructure, blenderContext); texflag, negateTexture, blendType, diffuseColorArray, color, colfac);
combinedTexture.add(texture, textureBlender, textureData.uvCoordinatesType, textureData.projectionType, textureData.textureStructure, blenderContext);
}
}
if(combinedTexture.getTexturesCount() > 0) {
loadedTextures.put(entry.getKey(), combinedTexture);
} }
} }
} }

7
engine/src/blender/com/jme3/scene/plugins/blender/textures/CombinedTexture.java
View File

@ -211,6 +211,13 @@ public class CombinedTexture {
return resultUVS; return resultUVS;
} }
/**
* @return the amount of added textures
*/
public int getTexturesCount() {
return textureDatas.size();
}
/** /**
* This method merges two given textures. The result is stored in the * This method merges two given textures. The result is stored in the
* 'target' texture. * 'target' texture.