aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2015-10-22 09:27:55 -0400
committerClyne Sullivan <tullivan99@gmail.com>2015-10-22 09:27:55 -0400
commitc99d7fb5e5c047709ccd4823e39ccb16c153eecb (patch)
tree9b77ae63cd8876e8d449ba4cb6ad82ad88b16b55 /include
parent95f1817ebf57e54ca43181198c1782838f424492 (diff)
parentd15062f7f2563761660e665d0940d9c0d1a7883c (diff)
screw npcs
Diffstat (limited to 'include')
-rw-r--r--include/Texture.h22
-rw-r--r--include/common.h7
-rw-r--r--include/entities.h1
3 files changed, 29 insertions, 1 deletions
diff --git a/include/Texture.h b/include/Texture.h
new file mode 100644
index 0000000..45c8df1
--- /dev/null
+++ b/include/Texture.h
@@ -0,0 +1,22 @@
+#ifndef TEXTURE_H
+#define TEXTURE_H
+
+#include <common.h>
+
+namespace Texture{
+ GLuint loadTexture(const char *fileName);
+}
+
+class Texturec{
+public:
+ Texturec(uint amt, ...);
+ void bindNext();
+ void bindPrev();
+
+ GLuint *image;
+private:
+ int texState;
+
+};
+
+#endif //TEXTURE_H \ No newline at end of file
diff --git a/include/common.h b/include/common.h
index d5f1456..e46cf86 100644
--- a/include/common.h
+++ b/include/common.h
@@ -22,6 +22,11 @@
#include <SDL2/SDL_mixer.h>
/*
+ * Include file headers
+*/
+#include <Texture.h>
+
+/*
* Create a basic 2-point structure for coordinate saving
*/
@@ -88,7 +93,7 @@ extern unsigned int deltaTime;
*
*/
-GLuint loadTexture(const char *fileName);
+//GLuint loadTexture(const char *fileName);
/*
* Prints a formatted debug message to the console, along with the callee's file and line
diff --git a/include/entities.h b/include/entities.h
index 30a0b0c..e71789a 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -59,6 +59,7 @@ public:
char* name;
GENDER gender;
GLuint texture[3]; //TODO: ADD TEXTURES
+ Texturec* tex;
void spawn(float, float);