|
@@ -407,7 +407,7 @@ class ModelLibrary extends Prefab {
|
|
@:s var autoLod : Bool = false;
|
|
@:s var autoLod : Bool = false;
|
|
@:s var sighash : String = "";
|
|
@:s var sighash : String = "";
|
|
|
|
|
|
- public static inline var CURRENT_VERSION = 2;
|
|
|
|
|
|
+ public static inline var CURRENT_VERSION = 3;
|
|
|
|
|
|
var cache : ModelLibraryCache;
|
|
var cache : ModelLibraryCache;
|
|
var shaderKeyCache : Map<String, String>;
|
|
var shaderKeyCache : Map<String, String>;
|
|
@@ -807,12 +807,11 @@ class ModelLibrary extends Prefab {
|
|
var lods : Array<Model> = null;
|
|
var lods : Array<Model> = null;
|
|
var hasLod = m.lods != null;
|
|
var hasLod = m.lods != null;
|
|
if ( hasLod ) {
|
|
if ( hasLod ) {
|
|
- var isLod = m.name.indexOf("LOD0") < 0;
|
|
|
|
- if ( isLod )
|
|
|
|
|
|
+ if ( m.isLOD() )
|
|
continue;
|
|
continue;
|
|
lods = [for ( lod in m.lods) lib.header.models[lod]];
|
|
lods = [for ( lod in m.lods) lib.header.models[lod]];
|
|
} else {
|
|
} else {
|
|
- var lodInfos = lib.getLODInfos(m);
|
|
|
|
|
|
+ var lodInfos = m.getLODInfos();
|
|
if ( lodInfos.lodLevel > 0 )
|
|
if ( lodInfos.lodLevel > 0 )
|
|
continue;
|
|
continue;
|
|
|
|
|
|
@@ -841,7 +840,7 @@ class ModelLibrary extends Prefab {
|
|
}
|
|
}
|
|
if ( ignoreModel )
|
|
if ( ignoreModel )
|
|
break;
|
|
break;
|
|
- var mat = addMaterial(mid, root ? "root" : m.name);
|
|
|
|
|
|
+ var mat = addMaterial(mid, root ? "root" : m.getObjectName());
|
|
if ( mat != null ) {
|
|
if ( mat != null ) {
|
|
mat.geomId = m2.geometry;
|
|
mat.geomId = m2.geometry;
|
|
mat.indexCount = lib.header.geometries[m.geometry].indexCounts[index];
|
|
mat.indexCount = lib.header.geometries[m.geometry].indexCounts[index];
|