diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-03-04 07:31:12 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-03-04 07:31:12 -0500 |
| commit | 6af8dcbaa41a7db52ff8f6074d2b113ec7eaf12d (patch) | |
| tree | 96be39f3670d5dd2d71b001340d7aff9b6164003 /include/Texture.h | |
| parent | b61bbe703a03d58dc660d05b4bb32f69a4c70436 (diff) | |
| parent | fe5ea7fe415857f49d6630f2b0f50e1246c38eee (diff) | |
Merge branch 'master' of http://github.com/tcsullivan/gamedev
Diffstat (limited to 'include/Texture.h')
| -rw-r--r-- | include/Texture.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/Texture.h b/include/Texture.h index 659c32d..7201a4c 100644 --- a/include/Texture.h +++ b/include/Texture.h @@ -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. |