Stars and Stripes forevahh!

4 files changed, 108 insertions, 7 deletions

diff --git a/src/entities.cpp b/src/entities.cpp
index 8dc32e2..ff8dd5d 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -349,14 +349,23 @@ void NPC::drawThingy(void) const
 			c[2], c[3], z, c[0], c[3], z, c[0], c[1], z
 		};
 		
+		// TODO use texture made for this
+		static GLuint thingyColor = Texture::genColor(Color(236, 238, 15));
+	
 		glUseProgram(worldShader);
+		
 		glEnableVertexAttribArray(worldShader_attribute_coord);
 		glEnableVertexAttribArray(worldShader_attribute_tex);
+		
+		glBindTexture(GL_TEXTURE_2D, thingyColor);
+			
 		glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, coords);
 		glVertexAttribPointer(worldShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 0, tex_coord);
 		glDrawArrays(GL_TRIANGLES, 0, 6);
+		
 		glDisableVertexAttribArray(worldShader_attribute_coord);
 		glDisableVertexAttribArray(worldShader_attribute_tex);
+		
 		glUseProgram(0);
 	}
 }
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 29e2dc9..8c662c4 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -104,7 +104,9 @@ void items(void)
 		ItemMap.back()->tex = new Texturec(1, exml->Attribute("sprite"));
 
 		// get the width and height of the object based off of its sprite
-		ItemMap.back()->dim = Texture::imageDim(exml->Attribute("sprite"));
+		dim2 tmpDim = Texture::imageDim(exml->Attribute("sprite"));
+		ItemMap.back()->dim.x = HLINES(tmpDim.x/2);
+		ItemMap.back()->dim.y = HLINES(tmpDim.y/2);
 
 		ItemMap.back()->name = exml->Attribute("name");
 
diff --git a/src/items.cpp b/src/items.cpp
index 21484b4..99c143b 100644
--- a/src/items.cpp
+++ b/src/items.cpp
@@ -60,20 +60,45 @@ int Sword::useItem()
 					float dist = 0.0f;
 					while (dist < dim.y) {
 						hitbox.end = hitbox.start;
-						hitbox.end.x += dist * cos(rotation*PI/180);
+						if (player->left)
+							hitbox.end.x -= dist * cos(rotation*PI/180);
+						else 
+							hitbox.end.x += dist * cos(rotation*PI/180);
+
 						hitbox.end.y += dist * sin(rotation*PI/180);
 
 						if (hitbox.end.x > e->loc.x && hitbox.end.x < e->loc.x + e->width) {
 							if (hitbox.end.y > e->loc.y && hitbox.end.y < e->loc.y + e->height) {
 								e->takeHit(damage, 600);
 
+						static GLuint sColor = Texture::genColor(Color(255,0,0));
+
+						GLfloat t[] = {0.0, 0.0,
+									   1.0, 1.0};
+
+						GLfloat v[] = {hitbox.start.x, 	hitbox.start.y, 1.0,
+									   hitbox.end.x,	hitbox.end.y,	1.0};
+
+					
+						glBindTexture(GL_TEXTURE_2D, sColor);
+						glUseProgram(worldShader);
+						glEnableVertexAttribArray(worldShader_attribute_coord);
+						glEnableVertexAttribArray(worldShader_attribute_tex);
+						
+						glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, v);
+						glVertexAttribPointer(worldShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 0, t);
+						glDrawArrays(GL_LINES, 0, 2);
+
+						glDisableVertexAttribArray(worldShader_attribute_coord);
+						glDisableVertexAttribArray(worldShader_attribute_tex);
+						glUseProgram(0);
 								// add some blood
 								// for(int r = 0; r < (rand()%5);r++)
 								// 	currentWorld->addParticle(rand()%game::HLINE*3 + e->loc.x - .05f,e->loc.y + e->height*.5, game::HLINE,game::HLINE, -(rand()%10)*.01,((rand()%4)*.001-.002), {(rand()%75+10)/100.0f,0,0}, 10000);
 							}
 						}
 
-						dist += HLINES(1);
+						dist += HLINES(0.5f);
 					}
 				}
 			}
diff --git a/src/world.cpp b/src/world.cpp
index 0c5007d..70ba967 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -254,7 +254,6 @@ void World::drawBackgrounds(void)
         alpha = 255 - worldShade * 4;
         break;
     }
-    (void)alpha;
 
     glActiveTexture(GL_TEXTURE0);
     glUniform1i(worldShader_uniform_texture, 0);
@@ -276,7 +275,6 @@ void World::drawBackgrounds(void)
                             vec2(0.0f, 1.0f),
                             vec2(0.0f, 0.0f)};
 
-    bgTex(0);
     GLfloat back_tex_coord[] = {offset.x - backgroundOffset.x - 5, offset.y + backgroundOffset.y, 10.0f,
                                 offset.x + backgroundOffset.x + 5, offset.y + backgroundOffset.y, 10.0f,
                                 offset.x + backgroundOffset.x + 5, offset.y - backgroundOffset.y, 10.0f,
@@ -290,18 +288,85 @@ void World::drawBackgrounds(void)
     glEnableVertexAttribArray(worldShader_attribute_coord);
     glEnableVertexAttribArray(worldShader_attribute_tex);
 
+    bgTex(0);
+	glUniform4f(worldShader_uniform_color, 1.0, 1.0, 1.0, 1.0);
     glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, back_tex_coord);
     glVertexAttribPointer(worldShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 0, tex_coord);
     glDrawArrays(GL_TRIANGLES, 0 , 6);
 
+	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_tex, 2, GL_FLOAT, GL_FALSE, 0, tex_coord);
+    glDrawArrays(GL_TRIANGLES, 0 , 6);
+
+		
+	static GLuint starTex = Texture::genColor(Color(255, 255, 255));
+	const static float stardim = 2;
+	GLfloat star_coord[star.size() * 5 * 6 + 1];
+    GLfloat *si = &star_coord[0];		
+
+	if (worldShade > 0) {
+
+		auto xcoord = offset.x * 0.9f;
+		
+		for (auto &s : star) {
+			*(si++) = s.x + xcoord;
+			*(si++) = s.y,
+			*(si++) = 9.8;
+
+			*(si++) = 0.0;
+			*(si++) = 0.0;
+			
+			*(si++) = s.x + xcoord + stardim;
+			*(si++) = s.y,
+			*(si++) = 9.8;
+			
+			*(si++) = 1.0;
+			*(si++) = 0.0;
+			
+			*(si++) = s.x + xcoord + stardim;
+			*(si++) = s.y + stardim,
+			*(si++) = 9.8;
+			
+			*(si++) = 1.0;
+			*(si++) = 1.0;
+			
+			*(si++) = s.x + xcoord + stardim;
+			*(si++) = s.y + stardim,
+			*(si++) = 9.8;
+			
+			*(si++) = 1.0;
+			*(si++) = 1.0;
+			
+			*(si++) = s.x + xcoord;
+			*(si++) = s.y + stardim,
+			*(si++) = 9.8;
+			
+			*(si++) = 0.0;
+			*(si++) = 1.0;
+			
+			*(si++) = s.x + xcoord;
+			*(si++) = s.y,
+			*(si++) = 9.8;
+			
+			*(si++) = 0.0;
+			*(si++) = 0.0;
+		}
+		glBindTexture(GL_TEXTURE_2D, starTex);
+		glUniform4f(worldShader_uniform_color, 1.0, 1.0, 1.0, (255.0f - (randGet() % 200 - 100)) / 255.0f);
+	
+		glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), &star_coord[0]);
+		glVertexAttribPointer(worldShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), &star_coord[3]);
+		glDrawArrays(GL_TRIANGLES, 0, star.size() * 6);
+	}
     glDisableVertexAttribArray(worldShader_attribute_coord);
     glDisableVertexAttribArray(worldShader_attribute_tex);
 
+	glUniform4f(worldShader_uniform_color, 1.0, 1.0, 1.0, 1.0);
     glUseProgram(0);
 
 
-	bgTex++;
-
     std::vector<vec3> bg_items;
 
 	bgTex++;