X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.h;h=6c089ed2fc675c27ed40edf9d07f85cffe1dd019;hb=8aea0f65f9ab7d603e47cf4479388af246cc8400;hp=35346e0091e2bbc8a24bf827bec4a96d921cbbd8;hpb=edd2a01b3c696df8630ac6a97e9b55a95fe7e112;p=libs%2Fgl.git diff --git a/source/texture2d.h b/source/texture2d.h index 35346e00..6c089ed2 100644 --- a/source/texture2d.h +++ b/source/texture2d.h @@ -45,7 +45,7 @@ public: /** Allocates storage for the texture. The contents are initially undefined. If storage has already been allocated, does nothing. */ void allocate(unsigned level); - + /** Uploads an image to the texture. Storage must be defined beforehand. The image data must have dimensions and format compatible with the defined storage. */ @@ -62,11 +62,12 @@ public: the image must be compatible with the defined storage. */ void load_image(const std::string &fn); -private: + /** Uploads an image to the texture. If storage has not been defined, it + will be set to match the image. Otherwise the image must be compatible with + the defined storage. */ void image(const Graphics::Image &); -public: - unsigned get_width() const { return width; } + unsigned get_width() const { return width; } unsigned get_height() const { return height; } private: