Skip to content

Commit

Permalink
Merge branch 'JNB-1'
Browse files Browse the repository at this point in the history
  • Loading branch information
natebeck committed Dec 25, 2010
2 parents b8704c1 + 98f7661 commit 657a8b9
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
4 changes: 4 additions & 0 deletions src/com/pblabs/engine/ns_pbe.as
@@ -0,0 +1,4 @@
package com.pblabs.engine
{
public namespace ns_pbe = "http://www.pblabs.com/2010";
}
13 changes: 10 additions & 3 deletions src/com/pblabs/engine/resource/ResourceManager.as
Expand Up @@ -11,13 +11,14 @@ package com.pblabs.engine.resource
import com.pblabs.engine.PBE;
import com.pblabs.engine.PBUtil;
import com.pblabs.engine.debug.Logger;
import com.pblabs.engine.ns_pbe;
import com.pblabs.engine.resource.provider.EmbeddedResourceProvider;
import com.pblabs.engine.resource.provider.FallbackResourceProvider;
import com.pblabs.engine.resource.provider.IResourceProvider;
import com.pblabs.engine.serialization.TypeUtility;

import flash.events.Event;
import flash.utils.Dictionary;
import flash.utils.Dictionary;

/**
* The resource manager handles all tasks related to using asset files (images, xml, etc)
Expand All @@ -39,7 +40,7 @@ package com.pblabs.engine.resource
* as via a dialog box ;). Passed the filename of the requested resource.
*/
public var onEmbeddedFail:Function;

/**
* Loads a resource from a file. If the resource has already been loaded or is embedded, a
* reference to the existing resource will be given. The resource is not returned directly
Expand Down Expand Up @@ -240,7 +241,7 @@ package com.pblabs.engine.resource
var resourceIdentifier:String = filename.toLowerCase() + resourceType;
return _resources[resourceIdentifier];
}

/**
* Properly mark a resource as failed-to-load.
*/
Expand All @@ -263,5 +264,11 @@ package com.pblabs.engine.resource
* List of resource providers used to get resources.
*/
private var resourceProviders:Array = new Array();

/*** Helper methods for PBE not externally exposed ***/
ns_pbe function getResources():Dictionary
{
return _resources;
}
}
}

0 comments on commit 657a8b9

Please sign in to comment.