projects
/
demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
backup before trying terrain change
[demo]
/
src
/
texture.h
diff --git
a/src/texture.h
b/src/texture.h
index
bcf9a92
..
a1b52d8
100644
(file)
--- a/
src/texture.h
+++ b/
src/texture.h
@@
-2,15
+2,16
@@
#define TEXTURE_H_
#include <string>
#define TEXTURE_H_
#include <string>
+#include <vector>
+
+#include "image.h"
class Texture {
private:
virtual void update() = 0;
protected:
class Texture {
private:
virtual void update() = 0;
protected:
- int w;
- int h;
- unsigned char *pixels;
+ std::vector<Image> images;
public:
std::string name;
public:
std::string name;
@@
-19,7
+20,12
@@
public:
virtual ~Texture();
virtual bool load(const char *fname);
virtual ~Texture();
virtual bool load(const char *fname);
- virtual void bind() = 0;
+ virtual bool load_cubemap(const char *fname);
+
+ virtual bool is_cubemap() const;
+
+ virtual void bind(int texture_unit = 0) = 0;
+ virtual void unbind() = 0;
};
#endif // TEXTURE_H_
\ No newline at end of file
};
#endif // TEXTURE_H_
\ No newline at end of file