*/
#include <cmath>
+#include <msp/gbase/image.h>
#include "except.h"
#include "extension.h"
-#include "ilwrap.h"
#include "texture3d.h"
#include "version_1_2.h"
height(0),
depth(0)
{
- require_version(1, 3);
+ static RequireVersion _ver(1, 3);
target=GL_TEXTURE_3D;
bind();
ifmt=f;
border=b;
- image(0, ifmt, GL_UNSIGNED_BYTE, 0);
+ image(0, ifmt, UNSIGNED_BYTE, 0);
}
-void Texture3D::image(int level, PixelFormat fmt, GLenum type, const void *data)
+void Texture3D::image(int level, PixelFormat fmt, DataType type, const void *data)
{
maybe_bind();
glTexImage3D(target, level, ifmt, width, height, depth, border, fmt, type, data);
void Texture3D::load_image(const string &fn, int dp)
{
- Image img;
- img.load(fn);
+ Graphics::Image img;
+ img.load_file(fn);
unsigned w=img.get_width();
unsigned h=img.get_height();
}
else if(dp==-2)
{
- for(d=h; d*d>h; d>>=2);
- for(; d*d<h; ++d);
+ for(d=h; d*d>h; d>>=2) ;
+ for(; d*d<h; ++d) ;
if(d*d!=h)
throw IncompatibleData("Could not find a square root of texture height");
h=d;
else if(dp>0)
d=dp;
- PixelFormat fmt=img.get_format();
+ PixelFormat fmt=pixelformat_from_graphics(img.get_format());
if(width==0)
storage(fmt, w, h, d, 0);
else if(w!=width || h!=height || d!=depth)
throw IncompatibleData("Image does not match texture storage");
- image(0, fmt, GL_UNSIGNED_INT, img.get_data());
+ image(0, fmt, UNSIGNED_INT, img.get_data());
}
} // namespace GL