diff options
| author | Andy Belle-Isle <abelleisle@roadrunner.com> | 2015-09-10 11:50:13 -0400 |
|---|---|---|
| committer | Andy Belle-Isle <abelleisle@roadrunner.com> | 2015-09-10 11:50:13 -0400 |
| commit | 1f769cf0e589001adc4a65d621f7968550209799 (patch) | |
| tree | 284f5dab7378970ad524b3aaaedac5266b068e8c /include | |
| parent | b6ee2b7c296abcfff1ae7f7ac4db976dc4d6fd8e (diff) | |
a
Diffstat (limited to 'include')
| -rw-r--r-- | include/World.h | 2 | ||||
| -rw-r--r-- | include/common.h | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/World.h b/include/World.h index 212fe38..6da0972 100644 --- a/include/World.h +++ b/include/World.h @@ -3,8 +3,6 @@ #include <common.h> -#define HLINE (2.0f/ 200 ) - class World { private: struct line_t { diff --git a/include/common.h b/include/common.h index 816de5a..e4de2c5 100644 --- a/include/common.h +++ b/include/common.h @@ -1,6 +1,8 @@ #ifndef COMMON_H #define COMMON_H +typedef struct{float x; float y;}vec2; + ///THIS FILE IS USED FOR VARIABLES THAT WILL BE ACCESED BY MULTIPLE CLASSES/FILES #include <iostream> @@ -9,18 +11,21 @@ #include <SDL2/SDL_image.h> #include <SDL2/SDL_opengl.h> #include <UIClass.h> +#include <entities.h> #include <World.h> -#define SCREEN_WIDTH 640 -#define SCREEN_HEIGHT 480 +#define SCREEN_WIDTH 1280 +#define SCREEN_HEIGHT 720 //#define FULLSCREEN +#define HLINE (2.0f / (SCREEN_WIDTH / 4)) + //SDL VARIABLES extern SDL_Window *window; extern SDL_Surface *renderSurface; extern SDL_GLContext mainGLContext; -//WINODWS VARIABLES +//WINDOW VARIABLES extern bool gameRunning; -#endif // COMMON_H +#endif // COMMON_H
\ No newline at end of file |