diff options
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/include/common.h b/include/common.h index cbfc507..557e582 100644 --- a/include/common.h +++ b/include/common.h @@ -54,6 +54,11 @@ extern GLuint colorIndex; */ typedef struct { + int x; + int y; +} ivec2; + +typedef struct { float x; float y; } vec2; @@ -75,7 +80,7 @@ typedef struct { vec2 end; } Ray; -struct col{ +struct col { float red; float green; float blue; @@ -184,23 +189,6 @@ extern unsigned int loops; extern GLuint shaderProgram; /** - * This class contains a string for identification and a value. It can be used to - * save certain events for and decisions so that they can be recalled later. - */ - -class Condition { -private: - char *id; - void *value; -public: - Condition(const char *_id,void *val); - ~Condition(); - - bool sameID(const char *s); - void *getValue(void); -}; - -/** * Prints a formatted debug message to the console, along with the callee's file and line * number. */ @@ -242,6 +230,4 @@ int strCreateFunc(const char *equ); template<typename N, size_t s> size_t arrAmt(N (&)[s]){return s;} -extern void *NULLPTR; - #endif // COMMON_H |