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

NPE fix when no image texture was found.

Browse Source 
A method to convert an image to normal map now accepts and returns an Image instead of Texture.

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9527 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Kae..pl 2012-06-25 21:39:38 +00:00
parent 4a596c8082
commit 1d6fc2f9d6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureHelper.java
View File

@ -137,8 +137,10 @@ public class TextureHelper extends AbstractBlenderHelper {
if (pImage.isNotNull()) { if (pImage.isNotNull()) {
Structure image = pImage.fetchData(blenderContext.getInputStream()).get(0); Structure image = pImage.fetchData(blenderContext.getInputStream()).get(0);
result = this.getTextureFromImage(image, blenderContext); result = this.getTextureFromImage(image, blenderContext);
if(result != null) {
this.applyColorbandAndColorFactors(tex, result.getImage(), blenderContext); this.applyColorbandAndColorFactors(tex, result.getImage(), blenderContext);
} }
}
break; break;
case TEX_CLOUDS: case TEX_CLOUDS:
case TEX_WOOD: case TEX_WOOD:
@ -188,9 +190,8 @@ public class TextureHelper extends AbstractBlenderHelper {
* the normal strength factor * the normal strength factor
* @return normal-map texture * @return normal-map texture
*/ */
public Texture convertToNormalMapTexture(Texture source, float strengthFactor) { public Image convertToNormalMapTexture(Image source, float strengthFactor) {
Image image = source.getImage(); BufferedImage sourceImage = ImageToAwt.convert(source, false, false, 0);
BufferedImage sourceImage = ImageToAwt.convert(image, false, false, 0);
BufferedImage heightMap = new BufferedImage(sourceImage.getWidth(), sourceImage.getHeight(), BufferedImage.TYPE_INT_ARGB); BufferedImage heightMap = new BufferedImage(sourceImage.getWidth(), sourceImage.getHeight(), BufferedImage.TYPE_INT_ARGB);
BufferedImage bumpMap = new BufferedImage(sourceImage.getWidth(), sourceImage.getHeight(), BufferedImage.TYPE_INT_ARGB); BufferedImage bumpMap = new BufferedImage(sourceImage.getWidth(), sourceImage.getHeight(), BufferedImage.TYPE_INT_ARGB);
ColorConvertOp gscale = new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_GRAY), null); ColorConvertOp gscale = new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_GRAY), null);
@ -220,9 +221,9 @@ public class TextureHelper extends AbstractBlenderHelper {
bumpMap.setRGB(x, y, this.vectorToColor(N.x, N.y, N.z)); bumpMap.setRGB(x, y, this.vectorToColor(N.x, N.y, N.z));
} }
} }
ByteBuffer byteBuffer = BufferUtils.createByteBuffer(image.getWidth() * image.getHeight() * 3); ByteBuffer byteBuffer = BufferUtils.createByteBuffer(source.getWidth() * source.getHeight() * 3);
ImageToAwt.convert(bumpMap, Format.RGB8, byteBuffer); ImageToAwt.convert(bumpMap, Format.RGB8, byteBuffer);
return new Texture2D(new Image(Format.RGB8, image.getWidth(), image.getHeight(), byteBuffer)); return new Image(Format.RGB8, source.getWidth(), source.getHeight(), byteBuffer);
} }
/** /**