X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture.cpp;h=f1689145c8af9c5754569213a7561b0505e63b2c;hp=7ae1a2c2c5bda0e171e6f2ad171646afac48eab5;hb=HEAD;hpb=3d6188a7f48566398e7ad7548dbd47a68bc73bdc

diff --git a/source/texture.cpp b/source/texture.cpp
deleted file mode 100644
index 7ae1a2c2..00000000
--- a/source/texture.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-#include <msp/strings/format.h>
-#include "error.h"
-#include "texture.h"
-#include "texunit.h"
-
-using namespace std;
-
-namespace Msp {
-namespace GL {
-
-void operator>>(const LexicalConverter &c, TextureFilter &tf)
-{
-	if(c.get()=="NEAREST")
-		tf = NEAREST;
-	else if(c.get()=="LINEAR")
-		tf = LINEAR;
-	else if(c.get()=="NEAREST_MIPMAP_NEAREST")
-		tf = NEAREST_MIPMAP_NEAREST;
-	else if(c.get()=="NEAREST_MIPMAP_LINEAR")
-		tf = NEAREST_MIPMAP_LINEAR;
-	else if(c.get()=="LINEAR_MIPMAP_NEAREST")
-		tf = LINEAR_MIPMAP_NEAREST;
-	else if(c.get()=="LINEAR_MIPMAP_LINEAR")
-		tf = LINEAR_MIPMAP_LINEAR;
-	else
-		throw lexical_error(format("conversion of '%s' to TextureFilter", c.get()));
-}
-
-
-void operator>>(const LexicalConverter &c, TextureWrap &tw)
-{
-	if(c.get()=="REPEAT")
-		tw = REPEAT;
-	else if(c.get()=="CLAMP_TO_EDGE")
-		tw = CLAMP_TO_EDGE;
-	else if(c.get()=="MIRRORED_REPEAT")
-		tw = MIRRORED_REPEAT;
-	else
-		throw lexical_error(format("conversion of '%s' to TextureWrap", c.get()));
-}
-
-
-Texture::Texture(GLenum t):
-	target(t),
-	min_filter(NEAREST_MIPMAP_LINEAR),
-	mag_filter(LINEAR),
-	wrap_s(REPEAT),
-	wrap_t(REPEAT),
-	wrap_r(REPEAT),
-	gen_mipmap(false),
-	compare(false),
-	cmp_func(LEQUAL),
-	dirty_params(0)
-{
-	glGenTextures(1, &id);
-}
-
-Texture::~Texture()
-{
-	glDeleteTextures(1, &id);
-}
-
-void Texture::update_parameter(int mask) const
-{
-	if(current()==this)
-	{
-		if(mask&MIN_FILTER)
-			glTexParameteri(target, GL_TEXTURE_MIN_FILTER, min_filter);
-		if(mask&MAG_FILTER)
-			glTexParameteri(target, GL_TEXTURE_MAG_FILTER, mag_filter);
-		if(mask&WRAP_S)
-			glTexParameteri(target, GL_TEXTURE_WRAP_S, wrap_s);
-		if(mask&WRAP_T)
-			glTexParameteri(target, GL_TEXTURE_WRAP_T, wrap_t);
-		if(mask&WRAP_R)
-			glTexParameteri(target, GL_TEXTURE_WRAP_R, wrap_r);
-		if(mask&GENERATE_MIPMAP)
-			glTexParameteri(target, GL_GENERATE_MIPMAP_SGIS, gen_mipmap);
-		if(mask&COMPARE)
-			glTexParameteri(target, GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE));
-		if(mask&COMPARE_FUNC)
-			glTexParameteri(target, GL_TEXTURE_COMPARE_FUNC, cmp_func);
-	}
-	else
-		dirty_params |= mask;
-}
-
-void Texture::set_min_filter(TextureFilter f)
-{
-	min_filter = f;
-	update_parameter(MIN_FILTER);
-}
-
-void Texture::set_mag_filter(TextureFilter f)
-{
-	mag_filter = f;
-	update_parameter(MAG_FILTER);
-}
-
-void Texture::set_wrap(TextureWrap w)
-{
-	set_wrap_s(w);
-	set_wrap_t(w);
-	set_wrap_r(w);
-}
-
-void Texture::set_wrap_s(TextureWrap w)
-{
-	wrap_s = w;
-	update_parameter(WRAP_S);
-}
-
-void Texture::set_wrap_t(TextureWrap w)
-{
-	wrap_t = w;
-	update_parameter(WRAP_T);
-}
-
-void Texture::set_wrap_r(TextureWrap w)
-{
-	wrap_r = w;
-	update_parameter(WRAP_R);
-}
-
-void Texture::set_generate_mipmap(bool gm)
-{
-	gen_mipmap = gm;
-	update_parameter(GENERATE_MIPMAP);
-}
-
-void Texture::set_compare_enabled(bool c)
-{
-	compare = c;
-	update_parameter(COMPARE);
-}
-
-void Texture::set_compare_func(Predicate f)
-{
-	cmp_func = f;
-	update_parameter(COMPARE_FUNC);
-}
-
-void Texture::bind() const
-{
-	const Texture *cur = TexUnit::current().get_texture();
-	if(cur!=this)
-	{
-		if(cur && cur->target!=target)
-			glDisable(cur->target);
-		if(!cur || cur->target!=target)
-			glEnable(target);
-
-		glBindTexture(target, id);
-		TexUnit::current().set_texture(this);
-
-		if(dirty_params)
-		{
-			update_parameter(dirty_params);
-			dirty_params = 0;
-		}
-	}
-}
-
-void Texture::bind_to(unsigned i) const
-{
-	TexUnit::activate(i);
-	bind();
-}
-
-const Texture *Texture::current()
-{
-	return TexUnit::current().get_texture();
-}
-
-void Texture::unbind()
-{
-	const Texture *cur = TexUnit::current().get_texture();
-	if(!cur)
-		return;
-
-	glBindTexture(cur->target, 0);
-	glDisable(cur->target);
-	TexUnit::current().set_texture(0);
-}
-
-void Texture::unbind_from(unsigned i)
-{
-	TexUnit::activate(i);
-	unbind();
-}
-
-
-Texture::Loader::Loader(Texture &t):
-	DataFile::ObjectLoader<Texture>(t)
-{
-	add("generate_mipmap", &Loader::generate_mipmap);
-	add("mag_filter", &Loader::mag_filter);
-	add("min_filter", &Loader::min_filter);
-	add("wrap",       &Loader::wrap);
-	add("wrap_r",     &Loader::wrap_r);
-	add("wrap_s",     &Loader::wrap_s);
-	add("wrap_t",     &Loader::wrap_t);
-}
-
-void Texture::Loader::generate_mipmap(bool gm)
-{
-	obj.set_generate_mipmap(gm);
-}
-
-void Texture::Loader::mag_filter(TextureFilter f)
-{
-	obj.set_mag_filter(f);
-}
-
-void Texture::Loader::min_filter(TextureFilter f)
-{
-	obj.set_min_filter(f);
-}
-
-void Texture::Loader::wrap(TextureWrap w)
-{
-	obj.set_wrap(w);
-}
-
-void Texture::Loader::wrap_r(TextureWrap w)
-{
-	obj.set_wrap_r(w);
-}
-
-void Texture::Loader::wrap_s(TextureWrap w)
-{
-	obj.set_wrap_s(w);
-}
-
-void Texture::Loader::wrap_t(TextureWrap w)
-{
-	obj.set_wrap_t(w);
-}
-
-} // namespace GL
-} // namespace Msp