aboutsummaryrefslogtreecommitdiffstats
path: root/include/Texture.h
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-02-12 08:48:50 -0500
committerClyne Sullivan <tullivan99@gmail.com>2016-02-12 08:48:50 -0500
commit51b0b214967ca4770b1674431cffa15777b0ec06 (patch)
tree2165f359d803bbc1944f5bcc10a377b06f6676e7 /include/Texture.h
parentba7df965e73e121820f20e3a0e57631d078c11db (diff)
parent2a4a514b654ef0e08134a116c658d49a8f16cfe7 (diff)
mergge
Diffstat (limited to 'include/Texture.h')
-rw-r--r--include/Texture.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/Texture.h b/include/Texture.h
index 50681bf..c6376cb 100644
--- a/include/Texture.h
+++ b/include/Texture.h
@@ -33,6 +33,7 @@ namespace Texture{
void initColorIndex();
vec2 getIndex(Color c);
+ dim2 imageDim(const char *fileName);
}
/**
@@ -71,6 +72,7 @@ public:
*/
Texturec(uint amt,const char **paths);
+ Texturec(std::vector<std::string>vec);
/**
* Frees memory taken by the image array.