aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-02-25 09:26:45 -0500
committerClyne Sullivan <tullivan99@gmail.com>2016-02-25 09:26:45 -0500
commit8f4cada7bf1068a9a3063636f7008cbe52875924 (patch)
treefc88a82dc8221df9921ff341bd61a455dabcef48 /include
parent0396f428411eb015f796643f9e7e38ca97f8fd42 (diff)
ui.cpp neatinization
Diffstat (limited to 'include')
-rw-r--r--include/common.h7
-rw-r--r--include/ui.h1
2 files changed, 6 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h
index a99e352..ff8d361 100644
--- a/include/common.h
+++ b/include/common.h
@@ -53,6 +53,11 @@ extern GLuint colorIndex;
*/
typedef struct {
+ int x;
+ int y;
+} ivec2;
+
+typedef struct {
float x;
float y;
} vec2;
@@ -74,7 +79,7 @@ typedef struct {
vec2 end;
} Ray;
-struct col{
+struct col {
float red;
float green;
float blue;
diff --git a/include/ui.h b/include/ui.h
index 6a81ff8..3e4fc8a 100644
--- a/include/ui.h
+++ b/include/ui.h
@@ -186,7 +186,6 @@ namespace ui {
void toggleWhiteFast(void);
void waitForCover(void);
- void waitForNothing(unsigned int);
}
#endif // UI_H