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

Disabling loading all assets by default. Now unlinked assets or those being on inactive layers will not be loaded if they are not requested to.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8042 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Kae..pl 2011-08-20 10:20:46 +00:00
parent b3a37f93b7
commit daa86cfec7
2 changed files with 719 additions and 682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1525
engine/src/blender/com/jme3/asset/BlenderKey.java
View File

File diff suppressed because it is too large Load Diff

4
engine/src/blender/com/jme3/scene/plugins/blender/BlenderLoader.java
View File

@ -153,7 +153,7 @@ public class BlenderLoader implements AssetLoader {
}
break;
case FileBlockHeader.BLOCK_MA00://Material
if ((blenderKey.getFeaturesToLoad() & FeaturesToLoad.MATERIALS) != 0) {
if (blenderKey.isLoadUnlinkedAssets() && (blenderKey.getFeaturesToLoad() & FeaturesToLoad.MATERIALS) != 0) {
loadingResults.addMaterial(converter.toMaterial(block.getStructure(dataRepository)));
}
break;
@ -163,7 +163,7 @@ public class BlenderLoader implements AssetLoader {
}
break;
case FileBlockHeader.BLOCK_WO00://World
if (worldData == null) {//onlu one world data is used
if (blenderKey.isLoadUnlinkedAssets() && worldData == null) {//onlu one world data is used
Structure worldStructure = block.getStructure(dataRepository);
String worldName = worldStructure.getName();
if (blenderKey.getUsedWorld() == null || blenderKey.getUsedWorld().equals(worldName)) {