Jeck - Cache and resource manager merged, streamlined.

This is pretty major, so there'll probably be something wrong with it... even though I did spend a few hours looking.
NOTES:
 * If you've Retrieved it, don't delete it--- Use resources.Release(Whatever). 
    Textures automatically release subordinate quads.
 * Most of the time, use resources.RetrieveQuad to grab a quad. Should handle everything for you.
    RetrieveQuad will load the required texture, if needed.
    Only managed resources have a resource name ("back", "simon", etc). 
    Managed resources can be retrieved with GetTexture/GetQuad/GetWhatever.
    Non managed quads lookup by position/dimensions, defaulting to the whole texture.
 * Use resources.RetrieveTexture only when you need to do something special to it. 
    Calling retrieve texture with RETRIEVE_MANAGE will permanently add a texture to the manager
    RETRIEVE_LOCK and RETRIEVE_VRAM will lock a texture. It will not leave the cache until
    Release(JTexture*) is called, or as a last resort during cache overflow.
 * Try to only store (as a class member) pointers to textures retrieved with RETRIEVE_MANAGE. 
    All others may become invalid, although locked textures do have a high degree of stability. It's
    pretty safe to store a locked texture if you're not going to load much between uses.

There's a lot going on here, so I might have missed something... but it runs through the test suite alright.

TODO: 
 * When called without any arguments, RetrieveQuad sometimes leaves a thin border around the image. 
    This can be bypassed by specifying a quad one or two pixels less than the image size. Why?
 * I've had a crash while runing the Demo mode, something to do with receiveEventMinus? 
    This hasn't exactly reproduced on a clean SVN copy, (being a hang, rather than a crash) so 
    I've probably done something to worsen the problem somehow? I'll look into it tomorrow.
 * Clean up lock/unlock system, memory usage. Streamline interface, consider phasing out calls using GetWhatever() format.

projects/mtg/src/WResourceManager.cpp

@@ -6,39 +6,582 @@
 #include <string>
 #include <stdlib.h>
 #include <JGE.h>
+#include <JFileSystem.h>
 #include "../include/WResourceManager.h"
 
 
-WResourceManager::WResourceManager(){
-  jrm = NEW JResourceManager();
+WResourceManager resources;
+
+WCachedResource::WCachedResource(){
+  locks = 0;
+  lastTime = resources.nowTime();
+}
+
+bool WCachedResource::isLocked(){
+  return (locks != 0);
+}
+
+void WCachedResource::lock(){
+  if(locks < 255)
+    locks++;
+}
+
+void WCachedResource::unlock(bool force){
+  if(force)
+    locks = 0;
+  else if(locks > 0)
+    locks--;
+}
+
+void WCachedResource::hit(){
+  lastTime = resources.nowTime();
+}
+
+WCachedTexture::WCachedTexture(){
+  texture = NULL;
+}
+
+WCachedTexture::~WCachedTexture(){
+  SAFE_DELETE(texture);
+  for(vector<JQuad*>::iterator i = trackedQuads.begin();i!=trackedQuads.end();i++)
+    SAFE_DELETE((*i));
+}
+
+JTexture * WCachedTexture::GetTexture(){
+  return texture;
+}
+
+bool WCachedTexture::ReleaseQuad(JQuad* quad){
+ SAFE_DELETE(texture);
+ for(vector<JQuad*>::iterator i = trackedQuads.begin();i!=trackedQuads.end();i++){
+   if((*i) == quad){
+     SAFE_DELETE(quad);
+     trackedQuads.erase(i);
+     return true;
+   }
+ }
+ return false;
+}
+
+JQuad * WCachedTexture::GetQuad(float offX, float offY, float width, float height){
+  if(texture == NULL)
+    return NULL;
+
+ if(width == 0.0f)
+      width = texture->mWidth;
+ if(height == 0.0f)
+      height = texture->mHeight;
+
+  vector<JQuad*>::iterator it;
+  for(it = trackedQuads.begin();it!=trackedQuads.end();it++)
+    if((*it)->mHeight == height && (*it)->mWidth == width
+      && (*it)->mX == offX && (*it)->mY == offY)
+      return (*it);
+
+  JQuad * jq = NEW JQuad(texture,offX,offY,width,height);
+  trackedQuads.push_back(jq);
+  return jq;
+}
+
+JQuad * WCachedTexture::GetCard(float offX, float offY, float width, float height){
+ if(texture == NULL)
+    return NULL;
+
+ if(width == 0.0f)
+      width = texture->mWidth;
+ if(height == 0.0f)
+      height = texture->mHeight;
+
+  vector<JQuad*>::iterator it;
+  for(it = trackedQuads.begin();it!=trackedQuads.end();it++)
+    if((*it)->mHeight == height && (*it)->mWidth == width
+      && (*it)->mX == offX && (*it)->mY == offY)
+      return (*it);
+
+  JQuad * jq = NEW JQuad(texture,offX,offY,width,height);
+  jq->SetHotSpot(jq->mTex->mWidth / 2, jq->mTex->mHeight / 2);
+  trackedQuads.push_back(jq);
+  return jq;
+}
+
+WCachedSample::WCachedSample(){
+  sample = NULL;
+}
+
+WCachedSample::~WCachedSample(){
+  SAFE_DELETE(sample);
+}
+
+JSample * WCachedSample::GetSample(){
+  return sample;
+}
+
+bool WResourceManager::cleanup(){
+  int maxSize = options[Options::CACHESIZE].number * 100000;
+  if (!maxSize) maxSize = CACHE_SIZE_PIXELS;
+  while (totalsize > maxSize){
+    int result = RemoveOldestTexture();
+    if (!result) return false;
+  }
+  return true;
+}
+
+
+unsigned int WResourceManager::nowTime(){
+  if(lastTime == 65535)
+    FlattenTimes();
+  
+  return ++lastTime;
+}
+
+WCachedSample * WResourceManager::getCachedSample(string filename, bool makenew){
+  WCachedSample * csample = sampleCache[filename];
+
+  //Failed to cache it!
+  if(!csample && makenew){
+    csample = NEW WCachedSample();
+
+    //Space in cache, make new sample
+    if(cleanup()){
+      csample->sample = ssLoadSample(filename.c_str());
+      //Failed.
+      if(!csample->sample){
+        for(map<string,WCachedSample*>::iterator it=sampleCache.begin();it!=sampleCache.end();it++)
+          if(it->second == NULL){
+            sampleCache.erase(it);
+            break;
+          }
+        SAFE_DELETE(csample);
+        return NULL;
+      }
+      csample->hit();
+      sampleCache[filename] = csample;
+    }
+    else
+      return NULL; //Error.
+  }
+
+  return csample;
+}
+
+WCachedTexture * WResourceManager::getCachedTexture(string filename, bool makenew, int mode, int format){
+  WCachedTexture * ctex = textureCache[filename];
+  //Failed to cache it!
+  if(!ctex && makenew){
+    ctex = NEW WCachedTexture();
+    //Space in cache, make new texture
+    if(cleanup()){
+     ctex->texture = JRenderer::GetInstance()->LoadTexture(graphicsFile(filename).c_str(),mode,format);
+ 
+      //Couldn't create texture, so fail.
+     if(!ctex->texture){
+        for(map<string,WCachedTexture*>::iterator it=textureCache.begin();it!=textureCache.end();it++)
+          if(it->second == NULL){
+            textureCache.erase(it);
+            break;
+          }
+          
+        SAFE_DELETE(ctex);
+        return NULL;
+      }
+      ctex->hit();
+      textureCache[filename] = ctex;
+    }
+    else
+      return NULL; //Error.
+  }
+
+  return ctex;
+}
+
+WCachedTexture * WResourceManager:: getCachedCard(MTGCard * card, int type, bool makenew){
+  string filename = card->getImageName();
+  if(type == CACHE_THUMB)
+    filename = "thumbnails/"+filename;
+
+  WCachedTexture * ctex = textureCache[filename];
+  //Failed to cache it!
+  if(!ctex && makenew){
+    ctex = NEW WCachedTexture();
+    //Space in cache, make new texture
+    if(cleanup()){
+      ctex->texture = JRenderer::GetInstance()->LoadTexture(cardFile(filename,card->getSetName()).c_str());
+ 
+      //Couldn't create texture, so fail.
+      if(!ctex->texture){
+        for(map<string,WCachedTexture*>::iterator it=textureCache.begin();it!=textureCache.end();it++)
+          if(it->second == NULL){
+            textureCache.erase(it);
+            break;
+          }
+          
+        SAFE_DELETE(ctex);
+        return NULL;
+      }
+      ctex->hit();
+      textureCache[filename] = ctex;
+    }
+    else
+      return NULL; //Error.
+  }
+
+  return ctex;
+}
+
+void WResourceManager::FlattenTimes(){
+  unsigned int youngest = 65535;
+  unsigned int oldest = 0;
+
+  for (map<string,WCachedTexture*>::iterator it = textureCache.begin(); it != textureCache.end(); ++it){
+    if(!it->second) continue;
+    if(it->second->lastTime < youngest) youngest = it->second->lastTime;
+    if(it->second->lastTime > oldest) oldest = it->second->lastTime;
+  }
+  for (map<string,WCachedSample*>::iterator it = sampleCache.begin(); it != sampleCache.end(); ++it){
+    if(!it->second) continue;
+    if(it->second->lastTime < youngest) youngest = it->second->lastTime;
+    if(it->second->lastTime > oldest) oldest = it->second->lastTime;
+  }
+
+  for (map<string,WCachedSample*>::iterator it = sampleCache.begin(); it != sampleCache.end(); ++it){
+    if(!it->second) continue;
+    it->second->lastTime -= youngest;
+  }
+  for (map<string,WCachedTexture*>::iterator it = textureCache.begin(); it != textureCache.end(); ++it){
+    if(!it->second) continue;
+    it->second->lastTime -= youngest;
+  }
+
+  lastTime = oldest;
+}
+
+bool WResourceManager::RemoveOldestTexture(){
+  map<string,WCachedTexture*>::iterator oldest;
+  for(map<string,WCachedTexture*>::iterator it = textureCache.begin();it!=textureCache.end();it++){
+    if(it->second && (it->second->lastTime < oldest->second->lastTime 
+      || (oldest->second->isLocked() && !it->second->isLocked())))
+      oldest = it;
+  }
+
+  if(oldest != textureCache.end()){
+    SAFE_DELETE(oldest->second)
+    textureCache.erase(oldest);
+    return true;
+  }
+
+  return false;
+}
+
+bool WResourceManager::RemoveOldestSample(){
+  map<string,WCachedSample*>::iterator it, saved;
+  saved = sampleCache.begin();
+
+  for(it = sampleCache.begin();it!=sampleCache.end();it++){
+    if(it->second->lastTime < saved->second->lastTime)
+      saved = it;
+  }
+
+  if(saved != sampleCache.end()){
+    SAFE_DELETE(saved->second);
+    sampleCache.erase(saved);
+    return true;
+  }
+  return false;
+}
+WResourceManager::WResourceManager(){	
+
+  #ifdef WIN32
+  char buf [4096];
+  sprintf(buf, " Init WResourceManager : %p\n", this);
+  OutputDebugString(buf);
+  #endif
+
+  mTextureList.clear();
+	mTextureList.reserve(16);
+	mTextureMap.clear();
+
+	mQuadList.clear();
+	mQuadList.reserve(128);
+	mQuadMap.clear();
+
+	mFontList.clear();
+	mFontList.reserve(4);
+	mFontMap.clear();
+
+	mMusicList.clear();
+	mMusicList.reserve(4);
+	mMusicMap.clear();
+
+	mSampleList.clear();
+	mSampleList.reserve(8);
+	mSampleMap.clear();
+
+  nb_textures = 0;
+  totalsize = 0;
+  lastTime = 0;
 }
 WResourceManager::~WResourceManager(){
-  SAFE_DELETE(jrm);
+
+  LOG("==Destroying WResourceManager==");
+  for (map<string,WCachedTexture*>::iterator it = textureCache.begin(); it != textureCache.end(); ++it){
+    delete it->second;
+  }
+  for (map<string,WCachedSample*>::iterator it = sampleCache.begin(); it != sampleCache.end(); ++it){
+    delete it->second;
+  }
+
+  textureCache.clear();
+  sampleCache.clear();
+
+  RemoveAll();
+  LOG("==Successfully Destroyed WResourceManager==");
+
 }
 
-string WResourceManager::graphicsFile(const string filename, const string specific, bool bFont){
-    char buf[512];
-    char file[512];
-    char lookup[512];
-   
-    if(bFont)
-      sprintf(file,"%s.dat",filename.c_str());
+JQuad * WResourceManager::RetrieveCard(MTGCard * card, int type, int style){
+  //Cards are never, ever resource managed, so just check cache.
+  WCachedTexture * tc;
+  if(style == RETRIEVE_EXISTING)
+    tc = getCachedCard(card,type,false);
+  else
+    tc = getCachedCard(card,type,true);
+  
+  //Perform lock or unlock on entry.
+  if(style == RETRIEVE_LOCK) tc->lock();
+  else if(style == RETRIEVE_UNLOCK) tc->unlock();
+
+  //Texture exists! Get quad.
+  if(tc && tc->texture != NULL){
+    tc->hit();
+    return tc->GetCard();  
+  }
+
+  return NULL;
+}
+
+JQuad * WResourceManager::RetrieveQuad(string filename, float offX, float offY, float width, float height, string resname, int style){
+//Check our resources.
+  if(resname == "")
+    resname = filename;
+
+  //No exactly existant quad
+  JQuad * retval = GetQuad(resname);
+  if(retval != NULL || style == RETRIEVE_RESOURCE)
+    return retval;
+
+  //We have a managed resource named this!
+  JTexture * jtex = GetTexture(filename);
+  if(jtex){
+     //Check for an existing quad with this name and stats
+     JQuad * jq = GetQuad(resname);
+     if(jq && jq->mHeight == height && jq->mWidth == width && jq->mX == offX && jq->mY == offY)
+       return jq;
+
+     //Find a quad with these stats, regardless of name
+     for(vector<JQuad*>::iterator it=mQuadList.begin();it!=mQuadList.end();it++){
+       if((*it)->mHeight == height && (*it)->mWidth == width && (*it)->mX == offX && (*it)->mY == offY)
+         return (*it);
+     }
+
+     //Overwrite the existing quad, if any.
+     CreateQuad(resname,filename,offX,offY,width,height);
+     return GetQuad(resname);
+  }
+
+  //If we don't have an existing texture, check cache.
+  WCachedTexture * tc = NULL;
+  if(style != RETRIEVE_MANAGE){
+  if(style == RETRIEVE_EXISTING)
+    tc = getCachedTexture(filename,false);
+  else if(style == RETRIEVE_VRAM)
+    tc = getCachedTexture(filename,true,TEX_TYPE_USE_VRAM);
+  else
+    tc = getCachedTexture(filename);
+  }
+  
+  //Quads never mess with locks. Ever.
+  if(style == RETRIEVE_MANAGE){
+    //Remove cache hit from cache
+    map<string,WCachedTexture*>::iterator it = textureCache.end();
+    tc = textureCache[filename];
+    for(it = textureCache.begin();it!=textureCache.end();it++){
+      if(it->second == tc)
+        break;
+    }
+    
+    SAFE_DELETE(tc);
+    if(it != textureCache.end())
+      textureCache.erase(it);
+    //Pop texture & quad into resource manager
+    CreateQuad(resname,filename,offX,offY,width,height);
+    return GetQuad(resname);
+  }
+
+  //Texture exists! Get quad.
+  if(tc && tc->texture != NULL){
+    tc->hit();
+    return tc->GetQuad(offX,offY,width,height);  
+  }
+
+  return NULL;
+}
+void WResourceManager::Release(JTexture * tex){
+  if(tex == NULL)
+    return;
+  map<string,WCachedTexture*>::iterator it;
+  for(it = textureCache.begin();it!=textureCache.end();it++){
+    if(it->second && it->second->texture == tex)
+      break;
+  }
+
+  if(it != textureCache.end()){
+    it->second->unlock();
+    if(!it->second->isLocked()){
+      SAFE_DELETE(it->second);
+      textureCache.erase(it);
+    }
+  }
+}
+
+void WResourceManager::Release(JQuad * quad){
+  map<string,WCachedTexture*>::iterator it;
+    if(quad == NULL)
+    return;
+
+  for(it = textureCache.begin();it!=textureCache.end();it++){
+    if(it->second && it->second->ReleaseQuad(quad))
+      break;
+  }
+
+  if(it != textureCache.end()){
+    it->second->unlock();
+    if(!it->second->isLocked()){
+      SAFE_DELETE(it->second);
+      textureCache.erase(it);
+    }
+  }
+}
+
+void WResourceManager::Release(JSample * sample){
+  if(sample == NULL)
+    return;
+
+  map<string,WCachedSample*>::iterator it;
+  for(it = sampleCache.begin();it!=sampleCache.end();it++){
+    if(it->second && it->second->sample == sample)
+      break;
+  }
+
+  if(it != sampleCache.end()){
+    it->second->unlock();
+    if(!it->second->isLocked()){
+      SAFE_DELETE(it->second);
+      sampleCache.erase(it);
+    }
+  }
+}
+
+JTexture * WResourceManager::RetrieveTexture(string filename, int style){
+//Check our resources.
+  JTexture * retval = GetTexture(filename);
+  if(retval != NULL || style == RETRIEVE_RESOURCE)
+    return retval;
+
+  //Check cache.
+  WCachedTexture * tc = NULL;
+  if(style != RETRIEVE_MANAGE){
+  if(style == RETRIEVE_EXISTING)
+    tc = getCachedTexture(filename,false);
+  else if(style == RETRIEVE_VRAM)
+    tc = getCachedTexture(filename,true,TEX_TYPE_USE_VRAM);
+  else
+    tc = getCachedTexture(filename);
+  }
+  
+  //Perform lock or unlock on entry.
+  if(style == RETRIEVE_LOCK || style == RETRIEVE_VRAM) tc->lock();
+  else if(style == RETRIEVE_UNLOCK) tc->unlock();
+  //Make a new managed resource
+  else if(style == RETRIEVE_MANAGE){
+    //Remove cache hit from cache
+    tc = textureCache[filename];
+    map<string,WCachedTexture*>::iterator it = textureCache.end();
+      for(it = textureCache.begin();it!=textureCache.end();it++){
+        if(it->second == tc)
+          break;
+    }
+
+    SAFE_DELETE(tc);
+    if(it != textureCache.end())
+      textureCache.erase(it);
+    //Pop texture into resource manager
+    CreateTexture(filename);
+    return GetTexture(filename);
+  }
+
+  //Texture exists! Get it.
+  if(tc->texture != NULL){
+    tc->hit();
+    return tc->GetTexture();  
+  }
+
+  return retval;
+}
+
+JSample * WResourceManager::RetrieveSample(string filename, int style){
+//Check our resources.
+  JSample * retval = GetSample(filename);
+  if(retval != NULL || style == RETRIEVE_RESOURCE)
+    return retval;
+
+  //Check cache.
+  WCachedSample * tc;
+
+  if(style != RETRIEVE_MANAGE){
+    if(style == RETRIEVE_EXISTING)
+      tc = getCachedSample(filename,false);
     else
-      sprintf(file,"%s",filename.c_str());
+      tc = getCachedSample(filename);
+  }
 
+  //Perform lock or unlock on entry.
+  if(style == RETRIEVE_LOCK) tc->lock();
+  else if(style == RETRIEVE_UNLOCK) tc->unlock();
+  //Make a new managed resource
+  else if(style == RETRIEVE_MANAGE){
+    //Remove cache hit from cache
+    tc = sampleCache[filename];
+    map<string,WCachedSample*>::iterator it;
+      for(it = sampleCache.begin();it!=sampleCache.end();it++){
+        if(it->second == tc)
+          break;
+      }
 
-    if(stopgap.find(filename) != stopgap.end())
-      return stopgap[filename];
+    SAFE_DELETE(tc);
+    if(it != sampleCache.end())
+    sampleCache.erase(it);
+    //Pop sample into resource manager
+    LoadSample(filename);
+    return GetSample(filename);
+  }
 
+  //Sample exists! Get it.
+  if(tc->sample != NULL){
+    tc->hit();
+    return tc->GetSample();  
+  }
 
+  return retval;
+}
+
+string WResourceManager::graphicsFile(const string filename, const string specific){
+    char buf[512];
+   
     //Check the specific location, if any.
     if(specific != ""){
-      sprintf(buf,"%s/%s",specific.c_str(),file);
-      sprintf(lookup,"%s/%s",specific.c_str(),file);
-      if(fileOK(lookup,true)){
-        stopgap[filename] = buf;
+      sprintf(buf,"%s/%s",specific.c_str(),filename.c_str());
+      if(fileOK(buf,true))
         return buf;
-      }
     }
 
     //Check the theme folder.
@@ -46,12 +589,9 @@ string WResourceManager::graphicsFile(const string filename, const string specif
     std::transform(theme.begin(), theme.end(), theme.begin(), ::tolower);
 
     if(theme != "" || theme != "default"){
-       sprintf(buf,"themes/%s/%s",theme.c_str(),filename.c_str());
-      sprintf(lookup,"themes/%s/%s",theme.c_str(),file);
-      if(fileOK(lookup,true)){
-        stopgap[filename] = buf;
+      sprintf(buf,"themes/%s/%s",theme.c_str(),filename.c_str());
+     if(fileOK(buf,true))
         return buf;
-      }
     }
 
     //Failure. Check mode graphics     
@@ -60,34 +600,82 @@ string WResourceManager::graphicsFile(const string filename, const string specif
 
     if(mode != "" && mode != "defualt"){
       sprintf(buf,"modes/%s/graphics/%s",mode.c_str(),filename.c_str());
-      sprintf(lookup,"modes/%s/graphics/%s",mode.c_str(),file);
-      if(fileOK(lookup,true)){
-        stopgap[filename] = buf;
+      if(fileOK(buf,true))
         return buf;
-      }  
     }
        
      //Failure. Check graphics       
      char graphdir[512];
      sprintf(graphdir,"graphics/%s",filename.c_str());
-     sprintf(lookup,"graphics/%s",file);
-      if(fileOK(lookup,true)){
-        stopgap[filename] = graphdir;
+      if(fileOK(graphdir,true))
         return graphdir;
-      }
     
      //Failure. Check sets.       
      sprintf(buf,"sets/%s",filename.c_str());
-     sprintf(lookup,"sets/%s",file);
-      if(fileOK(lookup,true)){
-        stopgap[filename] = buf;
+      if(fileOK(buf,true))
         return buf;
-      }    
 
      //Complete abject failure. Probably a crash...
      return graphdir;
 }
 
+string WResourceManager::cardFile(const string filename, const string setname, const string specific){
+    JFileSystem* fs = JFileSystem::GetInstance();
+    char buf[512];
+    char sets[512];
+
+    fs->DetachZipFile();
+
+    if(setname != "")
+      sprintf(sets,"sets/%s",setname.c_str());
+    else
+      sprintf(sets,"sets");
+
+    //Check the specific location, if any.
+    if(specific != ""){
+      sprintf(buf,"%s/%s/%s",specific.c_str(),sets,filename.c_str());
+      if(fileOK(buf,true))
+        return buf;
+    }
+
+    //Check the theme folder.
+    string theme = options[Options::ACTIVE_THEME].str;
+    std::transform(theme.begin(), theme.end(), theme.begin(), ::tolower);
+
+    if(theme != "" || theme != "default"){
+       sprintf(buf,"themes/%s/%s/%s",theme.c_str(),sets,filename.c_str());
+       if(fileOK(buf,true))
+         return buf;
+    }
+
+    //Failure. Check mode     
+    string mode = options[Options::ACTIVE_MODE].str;
+    std::transform(mode.begin(), mode.end(), mode.begin(), ::tolower);
+
+    if(mode != "" && mode != "defualt"){
+      sprintf(buf,"modes/%s/%s/%s",mode.c_str(),sets,filename.c_str());
+    if(fileOK(buf,true))
+       return buf;      
+    }
+       
+     //Failure. Check sets       
+     char defdir[512];
+     sprintf(defdir,"%s/%s",sets,filename.c_str());
+     if(fileOK(defdir,true))
+       return defdir;      
+
+     //Failure. Assume it's in a zip file?
+      char zipname[100];
+      sprintf(zipname, "Res/sets/%s/%s.zip", setname.c_str(),setname.c_str());
+      if (fileExists(zipname)){
+        fs->AttachZipFile(zipname);
+        return filename;
+      }
+    
+     //Complete abject failure. Probably a crash...
+     return defdir;
+}
+
 string WResourceManager::musicFile(const string filename, const string specific){
     char buf[512];
 
@@ -179,58 +767,95 @@ int WResourceManager::fileOK(string filename, bool relative){
 }
 
 int WResourceManager::CreateTexture(const string &textureName) {
-  return jrm->CreateTexture(graphicsFile(textureName));
-}
-JTexture* WResourceManager::GetTexture(const string &textureName) {
-  return jrm->GetTexture(graphicsFile(textureName));
-}
-JTexture* WResourceManager::GetTexture(int id) {
-  return jrm->GetTexture(id);
-}
+	map<string, int>::iterator itr = mTextureMap.find(textureName);
 
-int WResourceManager::CreateQuad(const string &quadName, const string &textureName, float x, float y, float width, float height){
-  return jrm->CreateQuad(quadName, graphicsFile(textureName), x, y, width, height);
-}
-JQuad* WResourceManager::GetQuad(const string &quadName){
-  return jrm->GetQuad(quadName);
-}
-JQuad* WResourceManager::GetQuad(int id){
-  return jrm->GetQuad(id);
+	if (itr == mTextureMap.end())
+	{
+		string path = graphicsFile(textureName);
+
+		printf("creating texture:%s\n", path.c_str());
+
+		JTexture *tex = JRenderer::GetInstance()->LoadTexture(path.c_str());
+
+		if (tex == NULL)
+			return INVALID_ID;
+
+		int id = mTextureList.size();
+		mTextureList.push_back(tex);
+		mTextureMap[textureName] = id;
+
+		return id;
+	}
+	else
+		return itr->second;
 }
 
 int WResourceManager::LoadJLBFont(const string &fontName, int height){
-  return jrm->LoadJLBFont(graphicsFile(fontName), height);
-}
-JLBFont* WResourceManager::GetJLBFont(const string &fontName){
-  return jrm->GetJLBFont(graphicsFile(fontName, "", true));
-}
+  map<string, int>::iterator itr = mFontMap.find(fontName);
 
-JLBFont* WResourceManager::GetJLBFont(int id){
-  return jrm->GetJLBFont(id);
+	if (itr == mFontMap.end())
+	{
+		string path = graphicsFile(fontName);
+
+		printf("creating font:%s\n", path.c_str());
+
+		int id = mFontList.size();
+		mFontList.push_back(NEW JLBFont(path.c_str(), height, true));
+
+		mFontMap[fontName] = id;
+
+		return id;
+	}
+	else
+		return itr->second;
 }
 
 int WResourceManager::LoadMusic(const string &musicName){
-  return jrm->LoadMusic(musicFile(musicName));
-}
-JMusic* WResourceManager::GetMusic(const string &musicName){
-  return jrm->GetMusic(musicFile(musicName));
-}
-JMusic* WResourceManager::GetMusic(int id){
-    return jrm->GetMusic(id);
+  	map<string, int>::iterator itr = mMusicMap.find(musicName);
+
+	if (itr == mMusicMap.end())
+	{
+		string path = musicFile(musicName);
+
+		printf("creating music:%s\n", path.c_str());
+
+		JMusic *music = JSoundSystem::GetInstance()->LoadMusic(path.c_str());
+		if (music == NULL)
+			return INVALID_ID;
+
+		int id = mMusicList.size();
+		mMusicList.push_back(music);
+
+		mMusicMap[musicName] = id;
+
+		return id;
+	}
+	else
+		return itr->second;
 }
 
 int WResourceManager::LoadSample(const string &sampleName){
-  return jrm->LoadSample(sfxFile(sampleName));
-}
-JSample* WResourceManager::GetSample(const string &sampleName){
-  return jrm->GetSample(sfxFile(sampleName));
-}
-JSample* WResourceManager::GetSample(int id){
-  return jrm->GetSample(id);
-}
+  map<string, int>::iterator itr = mSampleMap.find(sampleName);
 
-JTexture* WResourceManager::LoadTexture(const char* filename, int mode, int textureFormat){
-  return JRenderer::GetInstance()->LoadTexture(graphicsFile(filename).c_str(),mode,textureFormat);
+	if (itr == mSampleMap.end())
+	{
+		string path = sfxFile(sampleName);
+
+		printf("creating sample:%s\n", path.c_str());
+
+		JSample *sample = JSoundSystem::GetInstance()->LoadSample(path.c_str());
+		if (sample == NULL)
+			return INVALID_ID;
+
+		int id = mSampleList.size();
+		mSampleList.push_back(sample);
+
+		mSampleMap[sampleName] = id;
+
+		return id;
+	}
+	else
+		return itr->second;
 }
 
 JMusic * WResourceManager::ssLoadMusic(const char *fileName){
@@ -239,3 +864,40 @@ JMusic * WResourceManager::ssLoadMusic(const char *fileName){
 JSample * WResourceManager::ssLoadSample(const char *fileName){
   return JSoundSystem::GetInstance()->LoadSample(sfxFile(fileName).c_str());
 }
+
+
+//Unmodified from JResourceManager
+
+int WResourceManager::CreateQuad(const string &quadName, const string &textureName, float x, float y, float width, float height){
+  map<string, int>::iterator itr = mQuadMap.find(quadName);
+
+	if (itr == mQuadMap.end())
+	{
+		JTexture *tex = GetTexture(textureName);
+		if (tex == NULL)
+		{
+			int texId = CreateTexture(textureName);		// load texture if necessary
+			tex = GetTexture(texId);
+		}
+
+		if (tex == NULL)								// no texture, no quad...
+			return INVALID_ID;
+
+		printf("creating quad:%s\n", quadName.c_str());
+
+		int id = mQuadList.size();
+    if(width == 0.0f)
+      width = tex->mWidth;
+    if(height == 0.0f)
+      height = tex->mHeight;
+
+		mQuadList.push_back(NEW JQuad(tex, x, y, width, height));
+
+		mQuadMap[quadName] = id;
+
+		return id;
+
+	}
+	else
+		return itr->second;
+}