X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Fsprite.hh;h=b88b007f5ffe697dab5d1942b551a1cc5f496363;hp=3cee87281382c85800ead800267bd0190172ad18;hb=HEAD;hpb=382626aad0a683ed8642a6a807eea743db45f7f8 diff --git a/src/moof/sprite.hh b/src/moof/sprite.hh index 3cee872..b88b007 100644 --- a/src/moof/sprite.hh +++ b/src/moof/sprite.hh @@ -1,28 +1,26 @@ -/*] Copyright (c) 2009-2010, Charles McGarvey [************************** +/*] Copyright (c) 2009-2011, Charles McGarvey [***************************** **] All rights reserved. * -* vi:ts=4 sw=4 tw=75 -* * Distributable under the terms and conditions of the 2-clause BSD license; * see the file COPYING for a complete text of the license. * -**************************************************************************/ +*****************************************************************************/ #ifndef _MOOF_SPRITE_HH_ #define _MOOF_SPRITE_HH_ -/** - * \file sprite.hh - * Image-loading and OpenGL texture loading. - */ - #include #include #include +/** + * \file sprite.hh + * Image-loading and OpenGL texture loading. + */ + namespace moof { @@ -31,11 +29,11 @@ class sprite public: sprite() {} - explicit sprite(const std::string& path, int tile = image::no_tile); + explicit sprite(const std::string& name, int tile = image::no_tile); explicit sprite(const image_handle& image, int tile = image::no_tile); explicit sprite(const sprite& sprite, int tile = image::no_tile); - void image(const std::string& path); + void image(const std::string& name); void tile(int tile); void bind() const; @@ -43,11 +41,10 @@ public: void draw(const vector3 vertices[4]) const; - private: image_handle image_; - scalar tile_[8]; + scalar tile_[8]; };