X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=0fa65eadaed0f7b31508c6e9e4fa55a2d6ba4cfe;hb=0ef8e620a008e92069b0dd9ae4e972bc69430fc7;hp=3bd1df67068123a256b7ff7b8067c71f8ff7a1ca;hpb=619aae12e01f25e79626a94c973927e5599e99a5;p=libs%2Fgl.git

diff --git a/source/texture.cpp b/source/texture.cpp
index 3bd1df67..0fa65ead 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -2,6 +2,8 @@
 #include <msp/gl/extensions/sgis_generate_mipmap.h>
 #include <msp/strings/format.h>
 #include "error.h"
+#include "resourcemanager.h"
+#include "resources.h"
 #include "texture.h"
 #include "texunit.h"
 
@@ -42,7 +44,8 @@ void operator>>(const LexicalConverter &c, TextureWrap &tw)
 }
 
 
-Texture::Texture(GLenum t):
+Texture::Texture(GLenum t, ResourceManager *m):
+	id(0),
 	target(t),
 	min_filter(NEAREST_MIPMAP_LINEAR),
 	mag_filter(LINEAR),
@@ -54,39 +57,53 @@ Texture::Texture(GLenum t):
 	cmp_func(LEQUAL),
 	dirty_params(0)
 {
-	glGenTextures(1, &id);
+	if(m)
+		set_manager(m);
+	else
+		glGenTextures(1, &id);
 }
 
 Texture::~Texture()
 {
-	glDeleteTextures(1, &id);
+	while(TexUnit *unit = TexUnit::find_unit(this))
+		unbind_from(unit->get_index());
+
+	if(id)
+		glDeleteTextures(1, &id);
 }
 
 void Texture::update_parameter(int mask) const
 {
-	if(current()==this)
+	if(TexUnit::current().get_texture()!=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&MAX_ANISOTROPY)
-			glTexParameteri(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, max_anisotropy);
-		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);
+		TexUnit *unit = TexUnit::find_unit(this);
+		if(!unit)
+		{
+			dirty_params |= mask;
+			return;
+		}
+
+		unit->bind();
 	}
-	else
-		dirty_params |= mask;
+
+	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&MAX_ANISOTROPY)
+		glTexParameteri(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, max_anisotropy);
+	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);
 }
 
 void Texture::set_min_filter(TextureFilter f)
@@ -101,6 +118,12 @@ void Texture::set_mag_filter(TextureFilter f)
 	update_parameter(MAG_FILTER);
 }
 
+void Texture::set_filter(TextureFilter f)
+{
+	set_min_filter(f);
+	set_mag_filter(f==NEAREST ? NEAREST : LINEAR);
+}
+
 void Texture::set_max_anisotropy(float a)
 {
 	if(a<1.0f)
@@ -156,18 +179,21 @@ void Texture::set_compare_func(Predicate f)
 	update_parameter(COMPARE_FUNC);
 }
 
-void Texture::bind() const
+void Texture::bind_to(unsigned i) const
 {
-	const Texture *cur = TexUnit::current().get_texture();
-	if(cur!=this)
+	TexUnit &unit = TexUnit::get_unit(i);
+	const Texture *cur = unit.get_texture();
+	if(unit.set_texture(this))
 	{
+		if(manager)
+			manager->resource_used(*this);
+
+		unit.bind();
 		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)
 		{
@@ -177,38 +203,44 @@ void Texture::bind() const
 	}
 }
 
-void Texture::bind_to(unsigned i) const
+const Texture *Texture::current(unsigned i)
 {
-	TexUnit::activate(i);
-	bind();
+	return TexUnit::get_unit(i).get_texture();
 }
 
-const Texture *Texture::current()
+void Texture::unbind_from(unsigned i)
 {
-	return TexUnit::current().get_texture();
+	TexUnit &unit = TexUnit::get_unit(i);
+	const Texture *cur = unit.get_texture();
+	if(unit.set_texture(0))
+	{
+		unit.bind();
+		glBindTexture(cur->target, 0);
+		glDisable(cur->target);
+	}
 }
 
-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);
+Texture::Loader::Loader(Texture &t):
+	DataFile::CollectionObjectLoader<Texture>(t, 0)
+{
+	init();
 }
 
-void Texture::unbind_from(unsigned i)
+Texture::Loader::Loader(Texture &t, Collection &c):
+	DataFile::CollectionObjectLoader<Texture>(t, &c)
 {
-	TexUnit::activate(i);
-	unbind();
+	init();
 }
 
-
-Texture::Loader::Loader(Texture &t):
-	DataFile::ObjectLoader<Texture>(t)
+void Texture::Loader::init()
 {
+	if(Resources *res = dynamic_cast<Resources *>(coll))
+		srgb = res->get_srgb_conversion();
+	else
+		srgb = false;
+
+	add("filter", &Loader::filter);
 	add("max_anisotropy", &Loader::max_anisotropy);
 	add("generate_mipmap", &Loader::generate_mipmap);
 	add("mag_filter", &Loader::mag_filter);
@@ -219,6 +251,11 @@ Texture::Loader::Loader(Texture &t):
 	add("wrap_t",     &Loader::wrap_t);
 }
 
+void Texture::Loader::filter(TextureFilter f)
+{
+	obj.set_filter(f);
+}
+
 void Texture::Loader::generate_mipmap(bool gm)
 {
 	obj.set_generate_mipmap(gm);