From 193af27884fc910b4ffa7212ec772894c03e36ee Mon Sep 17 00:00:00 2001 From: drumsetmonkey Date: Wed, 28 Oct 2015 11:55:21 -0400 Subject: Locked camera to world bounds and added basic mountain backdrop --- include/common.h | 10 ++++++++-- include/world.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/common.h b/include/common.h index 1da279c..6d11c57 100644 --- a/include/common.h +++ b/include/common.h @@ -49,8 +49,9 @@ typedef struct { #define GAME_NAME "Independent Study v.0.2 alpha" -#define SCREEN_WIDTH 1280 -#define SCREEN_HEIGHT 720 +#define SCREEN_WIDTH 1920 +#define SCREEN_HEIGHT 1080 +#define FULLSCREEN //#define FULLSCREEN @@ -93,6 +94,11 @@ typedef struct { extern unsigned int deltaTime; +/* + * References the variable in main.cpp, used for drawing with the player +*/ +extern vec2 offset; + /* * Loads an image from the given file path and attempts to make a texture out of it. The * resulting GLuint is returned (used to recall the texture in glBindTexture). diff --git a/include/world.h b/include/world.h index 18e1878..03b0d96 100644 --- a/include/world.h +++ b/include/world.h @@ -36,6 +36,7 @@ protected: void singleDetect(Entity *e); // Handles an individual entity (gravity n' stuff) public: unsigned int lineCount; // Size of the array 'line' (aka the width of the world) + unsigned int worldWidth; World *toLeft,*toRight; // Pointers to areas to the left and right of this world. These are made public // so that they can easily be set without a function. World *infront; -- cgit v1.2.3