-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/io/memory.h>
#include "bindable.h"
-#include "except.h"
+#include "error.h"
#include "texture2d.h"
using namespace std;
void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
{
if(width>0)
- throw InvalidState("Texture storage may only be specified once");
+ throw invalid_operation("Texture2D::storage");
if(wd==0 || ht==0)
- throw InvalidParameterValue("Invalid texture dimensions");
+ throw invalid_argument("Texture2D::storage");
+ require_pixelformat(fmt);
ifmt = fmt;
width = wd;
void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
{
- require_storage();
+ if(width==0 || height==0)
+ throw invalid_operation("Texture2D::image");
unsigned w = width;
unsigned h = height;
void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
{
- require_storage();
+ if(width==0 || height==0)
+ throw invalid_operation("Texture2D::sub_image");
+
allocate(level);
Bind _bind(this, true);
if(width==0)
storage(fmt, w, h);
else if(w!=width || h!=height)
- throw IncompatibleData("Image does not match texture storage");
+ throw incompatible_data("Texture2D::image");
image(0, fmt, UNSIGNED_BYTE, img.get_data());
}
-void Texture2D::require_storage()
-{
- if(width==0 || height==0)
- throw InvalidState("Texture storage has not been specified");
-}
-
void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
{
w >>= level;
Texture2D::Loader::Loader(Texture2D &t):
- Texture::Loader(t)
+ DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>(t)
{
add("image_data", &Loader::image_data);
add("raw_data", &Loader::raw_data);
void Texture2D::Loader::image_data(const string &data)
{
Graphics::Image img;
- img.load_memory(data.data(), data.size());
+ IO::Memory mem(data.data(), data.size());
+ img.load_io(mem);
- static_cast<Texture2D &>(obj).image(img);
+ obj.image(img);
}
void Texture2D::Loader::raw_data(const string &data)
{
- Texture2D &t2d = static_cast<Texture2D &>(obj);
- t2d.image(0, t2d.ifmt, UNSIGNED_BYTE, data.data());
+ obj.image(0, obj.ifmt, UNSIGNED_BYTE, data.data());
}
void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
{
- static_cast<Texture2D &>(obj).storage(fmt, w, h);
+ obj.storage(fmt, w, h);
}
void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsigned)