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.h
diff --git
a/src/texture.h
b/src/texture.h
index
09b2c91
..
5e18e7a
100644
(file)
--- a/
src/texture.h
+++ b/
src/texture.h
@@
-2,6
+2,7
@@
#define TEXTURE_H_
#include "dataset.h"
#define TEXTURE_H_
#include "dataset.h"
+#include "datamap.h"
#include "opengl.h"
class Image;
#include "opengl.h"
class Image;
@@
-68,7
+69,7
@@
private:
public:
TextureSet();
public:
TextureSet();
- Texture *get_texture(const char *name, TextureType type = TEX_2D) const;
+ Texture *get_texture(const char *name, TextureType type = TEX_2D, const DataMap *dmap = 0) const;
};
#endif // TEXTURE_H_
};
#endif // TEXTURE_H_