projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datamap object passed around while loading
[laserbrain_demo]
/
src
/
texture.cc
diff --git
a/src/texture.cc
b/src/texture.cc
index
b3c17fe
..
3aebec3
100644
(file)
--- a/
src/texture.cc
+++ b/
src/texture.cc
@@
-468,13
+468,13
@@
TextureSet::TextureSet()
{
}
{
}
-Texture *TextureSet::get_texture(const char *name, TextureType type) const
+Texture *TextureSet::get_texture(const char *name, TextureType type, const DataMap *dmap) const
{
char *fname;
{
char *fname;
- int nsize = datamap_path_size(name);
+ int nsize = dmap ? dmap->path_size(name) : 0;
if(nsize) {
fname = (char*)alloca(nsize);
if(nsize) {
fname = (char*)alloca(nsize);
- datamap_lookup(name, fname, nsize);
+ dmap->lookup(name, fname, nsize);
} else {
fname = (char*)name;
}
} else {
fname = (char*)name;
}