X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=183bede5acf5d32389e8942fb9ceeb0c3c55153e;hb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;hp=a2d371e7856c108b6c7eac2de3284119bc735e1a;hpb=8f3ae497552ab7d3ddea7c34a411e7fdaa8722e4;p=libs%2Fgl.git

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index a2d371e7..183bede5 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -6,9 +6,9 @@ Distributed under the LGPL
 */
 
 #include <cmath>
+#include <msp/gbase/image.h>
 #include "except.h"
 #include "extension.h"
-#include "ilwrap.h"
 #include "texture3d.h"
 #include "version_1_2.h"
 
@@ -22,24 +22,24 @@ Texture3D::Texture3D():
 	height(0),
 	depth(0)
 {
-	require_version(1, 3);
+	static RequireVersion _ver(1, 3);
 
-	target=GL_TEXTURE_3D;
+	target = GL_TEXTURE_3D;
 	bind();
 }
 
-void Texture3D::storage(PixelFormat f, sizei w, sizei h, sizei d, int b)
+void Texture3D::storage(PixelFormat f, unsigned w, unsigned h, unsigned d, int b)
 {
 	if(width>0)
 		throw InvalidState("Textures may only be created once");
 	if(w==0 || h==0 || d==0)
 		throw InvalidParameterValue("Invalid texture dimensions");
 
-	width=w;
-	height=h;
-	depth=d;
-	ifmt=f;
-	border=b;
+	width = w;
+	height = h;
+	depth = d;
+	ifmt = f;
+	border = b;
 
 	image(0, ifmt, UNSIGNED_BYTE, 0);
 }
@@ -52,19 +52,19 @@ void Texture3D::image(int level, PixelFormat fmt, DataType type, const void *dat
 
 void Texture3D::load_image(const string &fn, int dp)
 {
-	Image img;
+	Graphics::Image img;
 	img.load_file(fn);
 
-	unsigned w=img.get_width();
-	unsigned h=img.get_height();
-	unsigned d=1;
+	unsigned w = img.get_width();
+	unsigned h = img.get_height();
+	unsigned d = 1;
 
 	if(dp==-1)
 	{
 		if(h%w)
 			throw IncompatibleData("Image height is not divisible by its width");
-		d=h/w;
-		h=w;
+		d = h/w;
+		h = w;
 	}
 	else if(dp==-2)
 	{
@@ -72,12 +72,12 @@ void Texture3D::load_image(const string &fn, int dp)
 		for(; d*d<h; ++d) ;
 		if(d*d!=h)
 			throw IncompatibleData("Could not find a square root of texture height");
-		h=d;
+		h = d;
 	}
 	else if(dp>0)
-		d=dp;
+		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)