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

Image loading changed during textures loading (using AssetManager now).

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8074 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Kae..pl 2011-08-24 18:17:23 +00:00
parent b5e4914ac7
commit 9a44e32fb2
1 changed files with 32 additions and 76 deletions

108
engine/src/blender/com/jme3/scene/plugins/blender/textures/TextureHelper.java

@ -34,22 +34,21 @@ package com.jme3.scene.plugins.blender.textures;
import java.awt.color.ColorSpace; import java.awt.color.ColorSpace;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.ColorConvertOp; import java.awt.image.ColorConvertOp;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import jme3tools.converters.ImageToAwt; import jme3tools.converters.ImageToAwt;
import com.jme3.asset.AssetManager;
import com.jme3.asset.AssetNotFoundException; import com.jme3.asset.AssetNotFoundException;
import com.jme3.asset.BlenderKey;
import com.jme3.asset.BlenderKey.FeaturesToLoad; import com.jme3.asset.BlenderKey.FeaturesToLoad;
import com.jme3.asset.GeneratedTextureKey; import com.jme3.asset.GeneratedTextureKey;
import com.jme3.asset.TextureKey; import com.jme3.asset.TextureKey;
@ -931,83 +930,40 @@ public class TextureHelper extends AbstractBlenderHelper {
* @return the loaded image or null if the image cannot be found * @return the loaded image or null if the image cannot be found
*/ */
protected Texture loadTextureFromFile(String name, DataRepository dataRepository) { protected Texture loadTextureFromFile(String name, DataRepository dataRepository) {
Image image = null; AssetManager assetManager = dataRepository.getAssetManager();
ImageLoader imageLoader = new ImageLoader(); name = name.replaceAll("\\\\", "\\/");
BufferedInputStream bis = null; Texture result = null;
ImageType[] imageTypes = ImageType.values();
// TODO: would be nice to have the model asset key here to getthe models older in the assetmanager List<String> assetNames = new ArrayList<String>();
if (name.startsWith("//")) { if (name.startsWith("//")) {
File modelFolder = new File(dataRepository.getBlenderKey().getName()); String relativePath = name.substring(1);
File textureFolder = modelFolder.getParentFile(); assetNames.add(relativePath);//use relative path to the asset root folder
//augument the path with blender key path
if (textureFolder != null) { BlenderKey blenderKey = dataRepository.getBlenderKey();
name = textureFolder.getPath() + "/." + name.substring(1); // replace the // that means "relative" for blender (hopefully) String blenderAssetFolder = blenderKey.getName().substring(0, blenderKey.getName().lastIndexOf('/'));
// with assetNames.add(blenderAssetFolder+'/'+relativePath);
} else { } else {//use every path from the asset name to the root (absolute path)
name = name.substring(1); String[] paths = name.split("\\/");
StringBuilder sb = new StringBuilder(paths[paths.length-1]);//the asset name
assetNames.add(paths[paths.length-1]);
for(int i=paths.length-2;i>=0;--i) {
sb.insert(0, '/');
sb.insert(0, paths[i]);
assetNames.add(sb.toString());
} }
}
TextureKey texKey = new TextureKey(name, true);
//now try to locate the asset
for(String assetName : assetNames) {
try { try {
Texture tex = dataRepository.getAssetManager().loadTexture(texKey); result = assetManager.loadTexture(new TextureKey(assetName));
image = tex.getImage(); break;//if no exception is thrown then accept the located asset and break the loop
} catch (AssetNotFoundException e) { } catch(AssetNotFoundException e) {
LOGGER.log(Level.WARNING, "Asset not found: {0}", e.getLocalizedMessage()); LOGGER.fine(e.getLocalizedMessage());
} }
} }
return result;
// 2. Try using the direct path from the blender file
if (image == null) {
File textureFile = new File(name);
if (textureFile.exists() && textureFile.isFile()) {
LOGGER.log(Level.INFO, "Trying with: {0}", name);
try {
for (int i = 0; i < imageTypes.length && image == null; ++i) {
FileInputStream fis = new FileInputStream(textureFile);
bis = new BufferedInputStream(fis);
image = imageLoader.loadImage(bis, imageTypes[i], false);
this.closeStream(fis);
}
} catch (FileNotFoundException e) {
assert false : e;// this should NEVER happen
} finally {
this.closeStream(bis);
}
}
}
// 3. if 2 failed we start including the parent folder(s) to see if the texture
// can be found
if (image == null) {
String baseName = File.separatorChar != '/' ? name.replace(File.separatorChar, '/') : name;
int idx = baseName.lastIndexOf('/');
while (idx != -1 && image == null) {
String texName = baseName.substring(idx + 1);
File textureFile = new File(texName);
if (textureFile.exists() && textureFile.isFile()) {
LOGGER.info("Trying with: " + texName);
try {
for (int i = 0; i < imageTypes.length && image == null; ++i) {
FileInputStream fis = new FileInputStream(textureFile);
bis = new BufferedInputStream(fis);
image = imageLoader.loadImage(bis, imageTypes[i], false);
}
} catch (FileNotFoundException e) {
assert false : e;// this should NEVER happen
} finally {
this.closeStream(bis);
}
}
if (idx > 1) {
idx = baseName.lastIndexOf('/', idx - 1);
} else {
idx = -1;
}
}
}
return image == null ? null : new Texture2D(image);
} }
/** /**