Merge branch 'master' of https://github.com/tcsullivan/gamedev

8 files changed, 129 insertions, 101 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.
  */
diff --git a/include/entities.hpp b/include/entities.hpp
index a06a8bb..ca4ef2b 100644
--- a/include/entities.hpp
+++ b/include/entities.hpp
@@ -109,6 +109,7 @@ class Particles{
 public:
 	// the location of the particle
 	vec2 loc;
+	float zOffset;
 
 	// the width of the particle, in pixels
 	float width;
diff --git a/main.cpp b/main.cpp
index e90ba0a..d61acf1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -50,10 +50,6 @@ Menu *currentMenu;
 // the player object
 Player *player;
 
-// shaders for rendering
-GLuint fragShader;
-GLuint shaderProgram;
-
 /**
  * These are the source and index variables for our shader
  * used to draw text and ui elements
@@ -75,9 +71,15 @@ GLuint worldShader;
 GLint worldShader_attribute_coord;
 GLint worldShader_attribute_tex;
 GLint worldShader_uniform_texture;
+GLint worldShader_uniform_texture_normal;
 GLint worldShader_uniform_transform;
 GLint worldShader_uniform_ortho;
 GLint worldShader_uniform_color;
+GLint worldShader_uniform_ambient;
+GLint worldShader_uniform_light;
+GLint worldShader_uniform_light_color;
+GLint worldShader_uniform_light_impact;
+GLint worldShader_uniform_light_amt;
 
 // keeps a simple palette of colors for single-color draws
 GLuint colorIndex;
@@ -181,58 +183,36 @@ int main(int argc, char *argv[]){
 	// initialize shaders
 	std::cout << "Initializing shaders!\n";
 
-	const GLchar *shaderSource = readFile("frig.frag");
-	GLint bufferln = GL_FALSE;
-	int logLength;
-
-	fragShader = glCreateShader(GL_FRAGMENT_SHADER);
-	glShaderSource(fragShader, 1, &shaderSource, NULL);
-	glCompileShader(fragShader);
-
-	glGetShaderiv(fragShader, GL_COMPILE_STATUS, &bufferln);
-	glGetShaderiv(fragShader, GL_INFO_LOG_LENGTH, &logLength);
-
-	std::vector<char> fragShaderError ((logLength > 1) ? logLength : 1);
-
-	glGetShaderInfoLog(fragShader, logLength, NULL, &fragShaderError[0]);
-	std::cout << &fragShaderError[0] << std::endl;
-
-	if (bufferln == GL_FALSE)
-		UserError("Error compiling shader");
-
-	shaderProgram = glCreateProgram();
-	glAttachShader(shaderProgram, fragShader);
-	glLinkProgram(shaderProgram);
-	glValidateProgram(shaderProgram);
-
-	glGetProgramiv(shaderProgram, GL_LINK_STATUS, &bufferln);
-    glGetProgramiv(shaderProgram, GL_INFO_LOG_LENGTH, &logLength);
-    std::vector<char> programError((logLength > 1) ? logLength : 1);
-    glGetProgramInfoLog(shaderProgram, logLength, NULL, &programError[0]);
-    std::cout << &programError[0] << std::endl;
-
-	delete[] shaderSource;
-
 	/**
 	 *	Creating the text shader and its attributes/uniforms
 	 */
-	textShader = 					create_program("shaders/new.vert", "shaders/new.frag");
-	textShader_attribute_coord = 	get_attrib(textShader, "coord2d");
-	textShader_attribute_tex = 		get_attrib(textShader, "tex_coord");
-	textShader_uniform_texture = 	get_uniform(textShader, "sampler");
-	textShader_uniform_transform = 	get_uniform(textShader, "ortho");
-    textShader_uniform_color = 		get_uniform(textShader, "tex_color");
+	textShader = 							create_program("shaders/new.vert", "shaders/new.frag");
+
+	textShader_attribute_coord = 			get_attrib(textShader, "coord2d");
+	textShader_attribute_tex = 				get_attrib(textShader, "tex_coord");
+
+	textShader_uniform_texture = 			get_uniform(textShader, "sampler");
+	textShader_uniform_transform = 			get_uniform(textShader, "ortho");
+    textShader_uniform_color = 				get_uniform(textShader, "tex_color");
 
 	/**
 	 *	Creating the world's shader and its attributes/uniforms
 	 */
-	worldShader = 					create_program("shaders/world.vert", "shaders/world.frag");
-	worldShader_attribute_coord = 	get_attrib(worldShader, "coord2d");
-	worldShader_attribute_tex = 	get_attrib(worldShader, "tex_coord");
-	worldShader_uniform_texture = 	get_uniform(worldShader, "sampler");
-	worldShader_uniform_transform = get_uniform(worldShader, "transform");
-	worldShader_uniform_ortho = get_uniform(worldShader, "ortho");
-	worldShader_uniform_color = 	get_uniform(worldShader, "tex_color");
+	worldShader = 							create_program("shaders/world.vert", "shaders/world.frag");
+
+	worldShader_attribute_coord = 			get_attrib(worldShader, "coord2d");
+	worldShader_attribute_tex = 			get_attrib(worldShader, "tex_coord");
+
+	worldShader_uniform_texture = 			get_uniform(worldShader, "texture");
+	worldShader_uniform_texture_normal =	get_uniform(worldShader, "normalTex");
+	worldShader_uniform_transform = 		get_uniform(worldShader, "transform");
+	worldShader_uniform_ortho = 			get_uniform(worldShader, "ortho");
+	worldShader_uniform_color = 			get_uniform(worldShader, "tex_color");
+	worldShader_uniform_ambient =			get_uniform(worldShader, "ambient");
+	worldShader_uniform_light = 			get_uniform(worldShader, "light");
+	worldShader_uniform_light_color = 		get_uniform(worldShader, "lightColor");
+	worldShader_uniform_light_impact = 		get_uniform(worldShader, "lightImpact");
+	worldShader_uniform_light_amt = 		get_uniform(worldShader, "lightSize");
 
 	//glEnable(GL_MULTISAMPLE);
 
@@ -392,7 +372,11 @@ void render() {
     glUseProgram(worldShader);
 	glUniformMatrix4fv(worldShader_uniform_ortho, 1, GL_FALSE, glm::value_ptr(ortho));
 	glUniformMatrix4fv(worldShader_uniform_transform, 1, GL_FALSE, glm::value_ptr(glm::mat4(1.0f)));
+	
 	glUniform4f(worldShader_uniform_color, 1.0, 1.0, 1.0, 1.0);
+	glUniform1f(worldShader_uniform_ambient, 1.0);
+	glUniform1i(worldShader_uniform_light_amt, 0);
+	glUniform1f(worldShader_uniform_light_impact, 1.0);
 	/**************************
 	**** RENDER STUFF HERE ****
 	**************************/
@@ -407,6 +391,7 @@ void render() {
 	// draw the player's inventory
 	player->inv->draw();
 
+
 	// draw the fade overlay
 	ui::drawFade();
 
diff --git a/shaders/world.frag b/shaders/world.frag
index c103433..d50e01d 100644
--- a/shaders/world.frag
+++ b/shaders/world.frag
@@ -1,11 +1,25 @@
-uniform sampler2D sampler;
+uniform sampler2D texture;
+uniform sampler2D normalTex;
 
 varying vec2 texCoord;
 varying vec4 color;
 
-void main(){
-    vec4 pixTex = texture2D(sampler, vec2(texCoord.x, 1-texCoord.y));
-    if(pixTex.a == 0.0)
-        discard;
-    gl_FragColor = pixTex * color;
+uniform vec4 ambientLight;
+uniform vec4 light[128];
+uniform vec4 lightColor[128];
+uniform float lightImpact;
+uniform int lightSize;
+
+void main()
+{
+
+	vec4 pixTex = texture2D(texture, vec2(texCoord.x, 1-texCoord.y));
+    if (pixTex.a < 0.1) 
+		discard;
+    
+	if (lightSize > 0) {
+
+	}
+	
+	gl_FragColor = pixTex * color * pixTex.a;
 }
diff --git a/src/entities.cpp b/src/entities.cpp
index 9949c1f..b417f11 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -915,15 +915,18 @@ Particles::Particles(float x, float y, float w, float h, float vx, float vy, Col
 	behind = false;
 	bounce = false;
 	index = Texture::getIndex(c);
+	zOffset = ((rand()%20)-10)/1000.0f;
 }
 
 void Particles::draw(GLfloat*& p) const
 {
-	vec2 tc = vec2 {0.25f * index.x, 0.125f * (8-index.y)};
+	vec2 tc = vec2(0.25f * this->index.x, 0.125f * (8.0f - this->index.y));
 
-    float z = 0.0;
-    if (behind)
-        z = 2.0;
+    float z = 0.9;
+	if (behind)
+		z = 2.0;
+
+	z += zOffset;
 
 	// lower left
     *(p++) = loc.x;
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 9727dc0..a7c19da 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -665,13 +665,13 @@ void itemDraw(Player *p, Item *d) {
         itemTex[10] = 1.0;
     }
 
-    GLfloat itemCoords[] = {itemLoc.x,          itemLoc.y,          1.0,
-                            itemLoc.x+d->dim.x, itemLoc.y,          1.0,
-                            itemLoc.x+d->dim.x, itemLoc.y+d->dim.y, 1.0,
+    GLfloat itemCoords[] = {itemLoc.x,          itemLoc.y,          p->z,
+                            itemLoc.x+d->dim.x, itemLoc.y,          p->z,
+                            itemLoc.x+d->dim.x, itemLoc.y+d->dim.y, p->z,
 
-                            itemLoc.x+d->dim.x, itemLoc.y+d->dim.y, 1.0,
-                            itemLoc.x,          itemLoc.y+d->dim.y, 1.0,
-                            itemLoc.x,          itemLoc.y,          1.0};
+                            itemLoc.x+d->dim.x, itemLoc.y+d->dim.y, p->z,
+                            itemLoc.x,          itemLoc.y+d->dim.y, p->z,
+                            itemLoc.x,          itemLoc.y,          p->z};
 
 	glBindTexture(GL_TEXTURE_2D,d->tex->image[0]);
 
diff --git a/src/ui.cpp b/src/ui.cpp
index a687a35..6eca97d 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -1468,10 +1468,10 @@ EXIT:
                         0.0, 1.0,
                         1.0, 1.0};
 
-        GLfloat backdrop[] = {offset.x - SCREEN_WIDTH / 2 - 1, offset.y - SCREEN_HEIGHT / 2, -8.1,
-                              offset.x + SCREEN_WIDTH / 2, offset.y - SCREEN_HEIGHT / 2, 	 -8.1,
-                              offset.x - SCREEN_WIDTH / 2 - 1, offset.y + SCREEN_HEIGHT / 2, -8.1,
-                              offset.x + SCREEN_WIDTH / 2, offset.y + SCREEN_HEIGHT / 2, 	 -8.1};
+        GLfloat backdrop[] = {offset.x - SCREEN_WIDTH / 2 - 1, offset.y - SCREEN_HEIGHT / 2, -7.9,
+                              offset.x + SCREEN_WIDTH / 2, offset.y - SCREEN_HEIGHT / 2, 	 -7.9,
+                              offset.x - SCREEN_WIDTH / 2 - 1, offset.y + SCREEN_HEIGHT / 2, -7.9,
+                              offset.x + SCREEN_WIDTH / 2, offset.y + SCREEN_HEIGHT / 2, 	 -7.9};
 		
 		setFontZ(-8.2);
         glUniform1i(textShader_uniform_texture, 0);
diff --git a/src/world.cpp b/src/world.cpp
index 2931f81..e6c5f0d 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -283,7 +283,15 @@ void World::drawBackgrounds(void)
                                 offset.x - backgroundOffset.x - 5, offset.y - backgroundOffset.y, 9.9f,
                                 offset.x - backgroundOffset.x - 5, offset.y + backgroundOffset.y, 9.9f};
 
-    glUseProgram(worldShader);
+    GLfloat fron_tex_coord[] = {offset.x - backgroundOffset.x - 5, offset.y + backgroundOffset.y, 9.8f,
+                                offset.x + backgroundOffset.x + 5, offset.y + backgroundOffset.y, 9.8f,
+                                offset.x + backgroundOffset.x + 5, offset.y - backgroundOffset.y, 9.8f,
+
+                                offset.x + backgroundOffset.x + 5, offset.y - backgroundOffset.y, 9.8f,
+                                offset.x - backgroundOffset.x - 5, offset.y - backgroundOffset.y, 9.8f,
+                                offset.x - backgroundOffset.x - 5, offset.y + backgroundOffset.y, 9.8f};
+    
+	glUseProgram(worldShader);
 
     glEnableVertexAttribArray(worldShader_attribute_coord);
     glEnableVertexAttribArray(worldShader_attribute_tex);
@@ -296,7 +304,7 @@ void World::drawBackgrounds(void)
 
 	bgTex++;
 	glUniform4f(worldShader_uniform_color, .8, .8, .8, 1.3 - static_cast<float>(alpha)/255.0f);
-    glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, back_tex_coord);
+    glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, fron_tex_coord);
     glVertexAttribPointer(worldShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 0, tex_coord);
     glDrawArrays(GL_TRIANGLES, 0 , 6);
 
@@ -467,32 +475,6 @@ void World::draw(Player *p)
 
 	drawBackgrounds();
 
-	// draw particles and buildings
-    glBindTexture(GL_TEXTURE_2D, colorIndex);
-    glUniform1i(worldShader_uniform_texture, 0);
-    glUseProgram(worldShader);
-
-    glEnableVertexAttribArray(worldShader_attribute_coord);
-    glEnableVertexAttribArray(worldShader_attribute_tex);
-
-    uint ps = particles.size();
-	
-	GLfloat partVec[ps * 6 * 5 + 1];
-	GLfloat *pIndex = &partVec[0];
-
-    for (auto &p : particles) {
-        if (!p.behind)
-            p.draw(pIndex);
-    }
-
-    glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), &partVec[0]);
-    glVertexAttribPointer(worldShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), &partVec[3]);
-    glDrawArrays(GL_TRIANGLES, 0, ps * 6);
-
-    glDisableVertexAttribArray(worldShader_attribute_tex);
-    glDisableVertexAttribArray(worldShader_attribute_coord);
-
-    glUseProgram(0);
 
     for (auto &l : light) {
         if (l.belongsTo) {
@@ -716,6 +698,44 @@ void World::draw(Player *p)
 
     // draw the player
 	p->draw();
+
+	// draw particles like a MASTAH
+    glBindTexture(GL_TEXTURE_2D, colorIndex);
+    glUniform1i(worldShader_uniform_texture, 0);
+    glUseProgram(worldShader);
+
+	glUniform4f(worldShader_uniform_color, 1.0, 1.0, 1.0, .8);
+
+    glEnableVertexAttribArray(worldShader_attribute_coord);
+    glEnableVertexAttribArray(worldShader_attribute_tex);
+
+    uint ps = particles.size();
+    uint pss = ps * 6 * 5;	
+	uint pc = 0;
+	
+	std::vector<GLfloat> partVec(pss);
+	GLfloat *pIndex = &partVec[0];
+    
+	for (uint p = 0; p < ps; p++) {
+        pc += 30;
+		if (pc > pss) {
+			// TODO resize the vector or something better than breaking
+			std::cout << "Whoops:" << pc << "," << partVec.size() << std::endl;
+			break;
+		}
+		particles[p].draw(pIndex);
+    }
+
+    glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), &partVec[0]);
+    glVertexAttribPointer(worldShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), &partVec[3]);
+    glDrawArrays(GL_TRIANGLES, 0, ps * 6);
+
+    glDisableVertexAttribArray(worldShader_attribute_tex);
+    glDisableVertexAttribArray(worldShader_attribute_coord);
+
+	glUniform4f(worldShader_uniform_color, 1.0, 1.0, 1.0, 1.0);
+
+    glUseProgram(0);
 }
 
 /**
@@ -863,7 +883,7 @@ detect(Player *p)
 							HLINES(1.25),										// width
 							HLINES(1.25),										// height
 							randGet() % 7 * .01 * (randGet() % 2 == 0 ? -1 : 1),	// vel.x
-							(4 + randGet() % 6) * .05,							// vel.y
+							randGet() % 1 ? (8 + randGet() % 6) * .05 : (4 + randGet() % 6) * .05,							// vel.y
 							{ 0, 0, 255 },										// RGB color
 							2500												// duration (ms)
 							);