X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=94224147c70434b53bcb8ef9ea78328e9f81284b;hp=96da77d1b9aba0400805461f0706c84d017ab60e;hb=HEAD;hpb=e37851b98dde5082ee92570354746f2f92e21940

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
deleted file mode 100644
index 96da77d1..00000000
--- a/source/texture2d.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-#include <msp/io/memory.h>
-#include "bindable.h"
-#include "error.h"
-#include "pixelstore.h"
-#include "resources.h"
-#include "texture2d.h"
-
-using namespace std;
-
-namespace Msp {
-namespace GL {
-
-Texture2D::Texture2D():
-	Texture(GL_TEXTURE_2D),
-	width(0),
-	height(0),
-	allocated(0)
-{ }
-
-void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
-{
-	if(width>0)
-		throw invalid_operation("Texture2D::storage");
-	if(wd==0 || ht==0)
-		throw invalid_argument("Texture2D::storage");
-	require_pixelformat(fmt);
-
-	ifmt = fmt;
-	width = wd;
-	height = ht;
-}
-
-void Texture2D::allocate(unsigned level)
-{
-	if(allocated&(1<<level))
-		return;
-
-	image(level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
-}
-
-void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
-{
-	if(width==0 || height==0)
-		throw invalid_operation("Texture2D::image");
-
-	unsigned w = width;
-	unsigned h = height;
-	get_level_size(level, w, h);
-
-	BindRestore _bind(this);
-	glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
-
-	allocated |= 1<<level;
-	if(gen_mipmap && level==0)
-	{
-		for(; (w || h); w>>=1, h>>=1, ++level) ;
-		allocated |= (1<<level)-1;
-	}
-}
-
-void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
-{
-	if(width==0 || height==0)
-		throw invalid_operation("Texture2D::sub_image");
-
-	allocate(level);
-
-	BindRestore _bind(this);
-	glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
-}
-
-void Texture2D::load_image(const string &fn, bool srgb)
-{
-	Graphics::Image img;
-	img.load_file(fn);
-
-	image(img, srgb);
-}
-
-void Texture2D::image(const Graphics::Image &img, bool srgb)
-{
-	unsigned w = img.get_width();
-	unsigned h = img.get_height();
-	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
-	if(width==0)
-	{
-		PixelFormat f = storage_pixelformat_from_graphics(img.get_format());
-		if(srgb)
-			f = get_srgb_pixelformat(f);
-		storage(f, w, h);
-	}
-	else if(w!=width || h!=height)
-		throw incompatible_data("Texture2D::image");
-
-	PixelStore pstore = PixelStore::from_image(img);
-	BindRestore _bind_ps(pstore);
-
-	image(0, fmt, UNSIGNED_BYTE, img.get_data());
-}
-
-void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
-{
-	w >>= level;
-	h >>= level;
-
-	if(!w && h)
-		w = 1;
-	else if(!h && w)
-		h = 1;
-}
-
-
-Texture2D::Loader::Loader(Texture2D &t):
-	DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>(t)
-{
-	init();
-}
-
-Texture2D::Loader::Loader(Texture2D &t, Collection &c):
-	DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>(t, c)
-{
-	init();
-}
-
-void Texture2D::Loader::init()
-{
-	add("image_data", &Loader::image_data);
-	add("raw_data", &Loader::raw_data);
-	add("storage", &Loader::storage);
-	add("storage", &Loader::storage_b);
-}
-
-void Texture2D::Loader::image_data(const string &data)
-{
-	Graphics::Image img;
-	IO::Memory mem(data.data(), data.size());
-	img.load_io(mem);
-
-	obj.image(img, srgb);
-}
-
-void Texture2D::Loader::raw_data(const string &data)
-{
-	obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
-}
-
-void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
-{
-	if(srgb)
-		fmt = get_srgb_pixelformat(fmt);
-	obj.storage(fmt, w, h);
-}
-
-void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsigned)
-{
-	storage(fmt, w, h);
-}
-
-} // namespace GL
-} // namespace Msp