diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-05-23 08:07:20 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-05-23 08:07:20 -0400 |
| commit | f6f6bf484081a3c0c877b35e522a5bfb3a12fdc7 (patch) | |
| tree | ee0349f8b0077644f7dcb9009dd8395559f36879 /include/common.hpp | |
| parent | 3d5820da8b91f676a6b5663ff19ccc68c30905ff (diff) | |
| parent | eff05df9465fbe052d028284143a6d3f69876476 (diff) | |
Merge branch 'master' of https://github.com/tcsullivan/gamedev
Diffstat (limited to 'include/common.hpp')
| -rw-r--r-- | include/common.hpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/common.hpp b/include/common.hpp index d080652..934ede5 100644 --- a/include/common.hpp +++ b/include/common.hpp @@ -218,9 +218,7 @@ constexpr const float PI = 3.1415926535f; // references the variable in main.cpp, used for drawing with the player extern vec2 offset; -// the shader program created in main.cpp -extern GLuint shaderProgram; - +// reference to the shader programs we use throughout extern GLuint textShader; extern GLint textShader_attribute_coord; extern GLint textShader_attribute_tex; @@ -231,8 +229,14 @@ extern GLuint worldShader; extern GLint worldShader_attribute_coord; extern GLint worldShader_attribute_tex; extern GLint worldShader_uniform_texture; +extern GLint worldShader_uniform_texture_normal; extern GLint worldShader_uniform_color; extern GLint worldShader_uniform_transform; +extern GLint worldShader_uniform_ambient; +extern GLint worldShader_uniform_light; +extern GLint worldShader_uniform_light_color; +extern GLint worldShader_uniform_light_impact; +extern GLint worldShader_uniform_light_amt; /** * Prints a formatted debug message to the console, along with the callee's file and line @@ -240,6 +244,7 @@ extern GLint worldShader_uniform_transform; */ void DEBUG_prints(const char* file, int line, const char *s,...); +// TODO make sure we don't use these. Then burn them. /** * Sets color using glColor3ub(), but handles potential overflow. */ |