fixed regression in the texture resource management

[laserbrain_demo] / src / texture.cc

diff --git a/src/texture.cc b/src/texture.cc
index cbbd11d..b3c17fe 100644 (file)
--- a/src/texture.cc
+++ b/src/texture.cc
@@ -1,6 +1,7 @@
 #include <math.h>
 #include <assert.h>
 #include "texture.h"
+#include "datamap.h"
 #include "image.h"
 #include "opengl.h"
 #include "imago2.h"
@@ -201,7 +202,6 @@ void Texture::create_default(TextureType type)
                                pixels += 4;
                        }
                }
-               default_img->save("/tmp/foo.png");
        }
 
        switch(type) {
@@ -470,15 +470,24 @@ TextureSet::TextureSet()
 
 Texture *TextureSet::get_texture(const char *name, TextureType type) const
 {
-       std::map<std::string, Texture*>::const_iterator iter = data.find(name);
+       char *fname;
+       int nsize = datamap_path_size(name);
+       if(nsize) {
+               fname = (char*)alloca(nsize);
+               datamap_lookup(name, fname, nsize);
+       } else {
+               fname = (char*)name;
+       }
+
+       std::map<std::string, Texture*>::const_iterator iter = data.find(fname);
        if(iter != data.end()) {
                return iter->second;
        }
 
        Texture *res = create();
-       data[name] = res;
+       data[fname] = res;
        res->create_default(type);
-       resman_lookup(rman, name, res);
+       resman_lookup(rman, fname, res);
        return res;
 }