X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=be4e1a112d08e8c02f189fbcd951dce4dfcdcf2c;hb=2e7f19b895424c3a77940e648639f8df2b395d0f;hp=e8e975926e62d683c9bc9c2f978654e796fc0ac7;hpb=7adcad3b40a03000a82e32db4523761c218309b8;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index e8e97592..be4e1a11 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,5 +1,5 @@
-#include <png.h>
-#include <msp/error.h>
+#include "bindable.h"
+#include "error.h"
 #include "texture2d.h"
 
 using namespace std;
@@ -7,109 +7,128 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Texture2D::Texture2D()
+Texture2D::Texture2D():
+	Texture(GL_TEXTURE_2D),
+	width(0),
+	height(0),
+	allocated(0)
+{ }
+
+void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
 {
-	target=GL_TEXTURE_2D;
+	if(width>0)
+		throw invalid_operation("Texture2D::storage");
+	if(wd==0 || ht==0)
+		throw invalid_argument("Texture2D::storage");
+
+	ifmt = fmt;
+	width = wd;
+	height = ht;
 }
 
-/**
-Uploads an image into the texture.  Direct wrapper for glTexImage2D.
-*/
-void Texture2D::image(int level, int ifmt, sizei width, sizei height, int border, GLenum fmt, GLenum type, void *data)
+void Texture2D::allocate(unsigned level)
 {
-	if(bound!=this) bind();
-	glTexImage2D(target, level, ifmt, width, height, border, fmt, type, data);
+	if(allocated&(1<<level))
+		return;
+
+	image(level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
 }
 
-/**
-Uploads an image into the texture.
-*/
-void Texture2D::image(int level, sizei width, sizei height, TextureFormat tfmt, void *data)
+void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
 {
-	int ifmt;
-	int fmt;
-	int type;
+	if(width==0 || height==0)
+		throw invalid_operation("Texture2D::image");
+
+	unsigned w = width;
+	unsigned h = height;
+	get_level_size(level, w, h);
+
+	Bind _bind(this, true);
+	glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
 
-	switch(tfmt)
+	allocated |= 1<<level;
+	if(gen_mipmap && level==0)
 	{
-	case LUMINANCE8:        ifmt=GL_LUMINANCE;       fmt=GL_LUMINANCE;       type=GL_UNSIGNED_BYTE; break;
-	case LUMINANCE8_ALPHA8: ifmt=GL_LUMINANCE_ALPHA; fmt=GL_LUMINANCE_ALPHA; type=GL_UNSIGNED_BYTE; break;
-	case RGB8:  ifmt=GL_RGB;  fmt=GL_RGB;  type=GL_UNSIGNED_BYTE;        break;
-	case RGBA8: ifmt=GL_RGBA; fmt=GL_RGBA; type=GL_UNSIGNED_INT_8_8_8_8; break;
-	case BGR8:  ifmt=GL_RGB;  fmt=GL_BGR;  type=GL_UNSIGNED_BYTE;        break;
-	case BGRA8: ifmt=GL_RGBA; fmt=GL_BGRA; type=GL_UNSIGNED_INT_8_8_8_8; break;
-	default: return;
+		for(; (w || h); w>>=1, h>>=1, ++level) ;
+		allocated |= (1<<level)-1;
 	}
-
-	image(level, ifmt, width, height, 0, fmt, type, data);
 }
 
-/**
-Loads an image from a file and uploads it into the texture.  Currently assumes
-the file to be a PNG image.
-*/
-void Texture2D::image(const string &fn)
+void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
 {
-	FILE *file=fopen(fn.c_str(), "r");
-	if(!file) throw Exception("Couldn't open "+fn);
+	if(width==0 || height==0)
+		throw invalid_operation("Texture2D::sub_image");
 
-	char sig[8];
-	fread(sig, 8, 1, file);
-	if(png_sig_cmp((png_byte *)sig, 0, 8))
-		 throw Exception("Not a PNG image");
+	allocate(level);
 
-	png_struct *pngs=png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
-	png_info   *pngi=png_create_info_struct(pngs);
+	Bind _bind(this, true);
+	glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
+}
 
-	if(setjmp(png_jmpbuf(pngs)))
-	{
-		png_destroy_read_struct(&pngs, &pngi, 0);
-		fclose(file);
-		throw Exception("PNG error");
-	}
-	png_init_io(pngs, file);
-	png_set_sig_bytes(pngs, 8);
+void Texture2D::load_image(const string &fn)
+{
+	Graphics::Image img;
+	img.load_file(fn);
 
-	png_read_info(pngs, pngi);
+	image(img);
+}
 
-	unsigned width=png_get_image_width(pngs, pngi);
-	unsigned height=png_get_image_height(pngs, pngi);
-	unsigned depth=png_get_bit_depth(pngs, pngi);
-	unsigned ctype=png_get_color_type(pngs, pngi);
+void Texture2D::image(const Graphics::Image &img)
+{
+	unsigned w = img.get_width();
+	unsigned h = img.get_height();
+	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+	if(width==0)
+		storage(fmt, w, h);
+	else if(w!=width || h!=height)
+		throw incompatible_data("Texture2D::image");
+
+	image(0, fmt, UNSIGNED_BYTE, img.get_data());
+}
 
-	if(ctype==PNG_COLOR_TYPE_PALETTE || depth<8)
-	{
-		png_destroy_read_struct(&pngs, &pngi, 0);
-		fclose(file);
-		throw Exception("Invalid color type or bit depth");
-	}
+void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
+{
+	w >>= level;
+	h >>= level;
 
-	if(depth==16)
-		png_set_strip_16(pngs);
+	if(!w && h)
+		w = 1;
+	else if(!h && w)
+		h = 1;
+}
 
-	TextureFormat fmt;
-	unsigned planes;
 
-	switch(ctype)
-	{
-	case PNG_COLOR_TYPE_GRAY: fmt=LUMINANCE8; planes=1; break;
-	case PNG_COLOR_TYPE_GRAY_ALPHA: fmt=LUMINANCE8_ALPHA8; planes=2; break;
-	case PNG_COLOR_TYPE_RGB: fmt=RGB8; planes=3; break;
-	case PNG_COLOR_TYPE_RGB_ALPHA: fmt=RGBA8; planes=4; break;
-	}
+Texture2D::Loader::Loader(Texture2D &t):
+	Texture::Loader(t)
+{
+	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;
+	img.load_memory(data.data(), data.size());
 
-	png_byte *data=(png_byte *)malloc(width*height*planes);
-	png_byte *row_ptrs[height];
-	for(unsigned i=0; i<height; ++i)
-		row_ptrs[i]=data+(height-1-i)*width*planes;
+	static_cast<Texture2D &>(obj).image(img);
+}
 
-	png_read_image(pngs, row_ptrs);
+void Texture2D::Loader::raw_data(const string &data)
+{
+	Texture2D &t2d = static_cast<Texture2D &>(obj);
+	t2d.image(0, t2d.ifmt, UNSIGNED_BYTE, data.data());
+}
 
-	image(0, width, height, fmt, data);
-	free(data);
+void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
+{
+	static_cast<Texture2D &>(obj).storage(fmt, w, h);
+}
 
-	png_destroy_read_struct(&pngs, &pngi, 0);
-	fclose(file);
+void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsigned)
+{
+	storage(fmt, w, h);
 }
 
 } // namespace GL