X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FTexture.hh;h=5aa38e1dc85e04ea70aa5f910c6c91992b688a0f;hp=e858093e1a44afa06b44d50dcc5eac80503855e7;hb=a31d65a998121df0651c57bfb68782e2a07d2e2f;hpb=c2321281bf12a7efaedde930422c7ddbc92080d4

diff --git a/src/Moof/Texture.hh b/src/Moof/Texture.hh
index e858093..5aa38e1 100644
--- a/src/Moof/Texture.hh
+++ b/src/Moof/Texture.hh
@@ -38,42 +38,73 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Resource.hh>
+#include <Moof/Exception.hh>
 #include <Moof/OpenGL.hh>
+#include <Moof/Resource.hh>
 
 
 namespace Mf {
 
 
+class Texture;
+typedef boost::shared_ptr<Texture> TextureP;
+
+
 class Texture : public Resource
 {
+	class Impl;
+	boost::shared_ptr<Impl> mImpl;
+
 public:
+
+	static TextureP alloc(const std::string& name)
+	{
+		return TextureP(new Texture(name));
+	}
+
 	Texture(const std::string& name);
 
-	void bind();
-	GLuint getObject();
+	void bind() const;
+	GLuint getObject() const;
 
-	unsigned getWidth();
-	unsigned getHeight();
+	static void resetBind();
+
+	unsigned getWidth() const;
+	unsigned getHeight() const;
 
 	void setMinFilter(GLuint filter);
-	void setMaxFilter(GLuint filter);
-	void setWrapU(GLuint wrap);
-	void setWrapV(GLuint wrap);
+	void setMagFilter(GLuint filter);
+	void setWrapS(GLuint wrap);
+	void setWrapT(GLuint wrap);
 
-	void applyChanges();
+	static std::string getPath(const std::string& name);
 
-	static std::string getPathToResource(const std::string& name);
 
-	struct Exception : std::runtime_error
+	struct Exception : public Mf::Exception
 	{
-		explicit Exception(const std::string& what_arg) :
-			std::runtime_error(what_arg) {}
+		enum
+		{
+			BAD_IMAGE_FORMAT	= 1024
+		};
+
+		explicit Exception(unsigned error) :
+			Mf::Exception(error) {}
+
+		void raise()
+		{
+			throw *this;
+		}
+
+		const char* what() const throw()
+		{
+			switch (code)
+			{
+				case BAD_IMAGE_FORMAT:
+					return "unknown image format";
+			}
+			return Mf::Exception::what();
+		}
 	};
-
-private:
-	class TextureImpl;
-	boost::shared_ptr<TextureImpl> impl_;
 };