Simplify model loading code.

This commit is contained in:
UnknownShadow200 2015-04-19 19:59:02 +10:00
parent 4929075212
commit 4de7be9e41

View File

@ -16,22 +16,18 @@ namespace ClassicalSharp.Model {
IModel model; IModel model;
byte blockId; byte blockId;
if( Byte.TryParse( modelName, out blockId ) ) { if( Byte.TryParse( modelName, out blockId ) ) {
if( !cache.TryGetValue( "block", out model ) ) { modelName = "block";
model = new BlockModel( window ); }
cache["block"] = model;
} if( !cache.TryGetValue( modelName, out model ) ) {
return model; model = InitModel( modelName );
} else { if( model != null ) {
if( !cache.TryGetValue( modelName, out model ) ) { cache[modelName] = model;
model = InitModel( modelName ); } else {
if( model != null ) { model = cache["humanoid"]; // fallback to default
cache[modelName] = model;
} else {
model = cache["humanoid"]; // fallback to default
}
} }
return model; }
} return model;
} }
IModel InitModel( string modelName ) { IModel InitModel( string modelName ) {
@ -49,6 +45,8 @@ namespace ClassicalSharp.Model {
return new SpiderModel( window ); return new SpiderModel( window );
} else if( modelName == "zombie" ) { } else if( modelName == "zombie" ) {
return new ZombieModel( window ); return new ZombieModel( window );
} else if( modelName == "block" ) {
return new BlockModel( window );
} }
return null; return null;
} }