diff options
Diffstat (limited to 'include/Texture.h')
| -rw-r--r-- | include/Texture.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/Texture.h b/include/Texture.h index c6376cb..7201a4c 100644 --- a/include/Texture.h +++ b/include/Texture.h @@ -27,13 +27,13 @@ namespace Texture{ * later referencing of the texture. */ - GLuint loadTexture(const char *fileName); + GLuint loadTexture(std::string fileName); void freeTextures(void); void initColorIndex(); vec2 getIndex(Color c); - dim2 imageDim(const char *fileName); + dim2 imageDim(std::string fileName); } /** @@ -58,7 +58,7 @@ public: * Contains an array of the GLuints returned from Texture::loadTexture(). */ - GLuint *image = NULL; + std::vector<GLuint> image; /** * Populates the image array from a list of strings, with each string as a @@ -73,6 +73,7 @@ public: Texturec(uint amt,const char **paths); Texturec(std::vector<std::string>vec); + Texturec( std::initializer_list<std::string> l ); /** * Frees memory taken by the image array. |