X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.h;h=012718528af72592039831c2a27c69b6a58aa728;hb=7e9e15a12fb398798f2719545cc8553354c1e389;hp=f1b76783f7e5c5a242c96bb3528d7e7a8929ec40;hpb=a5797c9babd17673285b3b15c7572c2d8fe1595c;p=libs%2Fgl.git diff --git a/source/texture2d.h b/source/texture2d.h index f1b76783..01271852 100644 --- a/source/texture2d.h +++ b/source/texture2d.h @@ -9,8 +9,8 @@ Distributed under the LGPL #define MSP_GL_TEXTURE2D_H_ #include -#include #include +#include "datatype.h" #include "pixelformat.h" #include "texture.h" @@ -35,8 +35,8 @@ public: private: PixelFormat ifmt; - sizei width; - sizei height; + unsigned width; + unsigned height; int border; public: @@ -46,7 +46,7 @@ public: Defines the texture storage. This function may only be successfully called once. */ - void storage(PixelFormat fmt, sizei wd, sizei ht, int brd); + void storage(PixelFormat fmt, unsigned wd, unsigned ht, int brd); /** Uploads an image to the texture. storage() must have been called prior to @@ -59,7 +59,7 @@ public: Uploads a sub-image into the texture. Unlike full image upload, there are no constraints on the size of the sub-image. */ - void sub_image(int level, int x, int y, sizei wd, sizei ht, PixelFormat fmt, DataType type, const void *data); + void sub_image(int level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data); /** Loads an image from a file and uploads it to the texture. If storage() has @@ -67,8 +67,8 @@ public: */ void load_image(const std::string &fn); - sizei get_width() const { return width; } - sizei get_height() const { return height; } + unsigned get_width() const { return width; } + unsigned get_height() const { return height; } private: void image(const Graphics::Image &);