X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Ftexture.h;h=41749f838ee7fdae74ffc87fa36d842c03ec7c06;hp=09b2c916ede20141bf4f65d342bccad59fd525e0;hb=92e1b315a32da123b2f8d7bb633375033a10c66d;hpb=ccc1a688b59e25bb934a0d3e2bbf477960068d4f

diff --git a/src/texture.h b/src/texture.h
index 09b2c91..41749f8 100644
--- a/src/texture.h
+++ b/src/texture.h
@@ -2,6 +2,7 @@
 #define TEXTURE_H_
 
 #include "dataset.h"
+#include "datamap.h"
 #include "opengl.h"
 
 class Image;
@@ -41,6 +42,8 @@ public:
 	unsigned int get_format() const;
 
 	int get_size(int dim) const;
+	int get_width() const;
+	int get_height() const;
 
 	void create(int xsz, int ysz, TextureType type = TEX_2D, unsigned int ifmt = GL_RGBA);
 	void create_default(TextureType type = TEX_2D);
@@ -57,6 +60,7 @@ public:
 };
 
 void bind_texture(Texture *tex, int tunit = 0);
+int next_pow2(int x);
 
 class TextureSet : public DataSet<Texture*> {
 private:
@@ -68,7 +72,7 @@ private:
 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_