npc world walking

6 files changed, 144 insertions, 66 deletions

diff --git a/frig.frag b/frig.frag
index 07b4a8a..f750f2d 100644
--- a/frig.frag
+++ b/frig.frag
@@ -3,29 +3,33 @@ uniform sampler2D sampler;
 

 uniform int numLight;

 uniform vec2 lightLocation[64];

+uniform float fireFlicker[64];

 uniform vec3 lightColor;

 uniform float amb;

 

-float b = .0005;

-float minLight = .05;

-float radius = sqrt(1.0 / (b * minLight));

-

+float b = .0005f;

+float minLight = .05f;

+float radius = sqrt(1.0f / (b * minLight));

 //float radius = b*minlight;

 

+float rand(vec2 co){

+    return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);

+}

+

 void main(){

-	vec4 color = vec4(0.0,0.0,0.0,0.0);

+	vec4 color = vec4(0.0f, 0.0f, 0.0f, 0.0f);

 	for(int i = 0; i < numLight; i++){

 		vec2 loc = lightLocation[i];

 		float dist = length(loc - gl_FragCoord.xy);

 		//float attenuation=1.0/(1.0+0.01*dist+0.00000000001*dist*dist);

-		float attenuation = clamp(1.0 - dist*dist/(radius*radius), 0.0, 1.0); attenuation *= attenuation;

+		float attenuation = clamp(1.0f - dist*dist/(radius*radius), 0.0f, 1.0f); attenuation *= attenuation;

 

-		color += vec4(attenuation, attenuation, attenuation, 1.0) * vec4(lightColor, 1.0);

+		color += vec4(attenuation, attenuation, attenuation, 1.0f) * vec4(lightColor, 1.0f) * fireFlicker[i];

 	}

 	vec2 coords = gl_TexCoord[0].st;

 	vec4 tex = texture2D(sampler, coords);

 

-	color += vec4(amb,amb,amb,1.0+amb);

+	color += vec4(amb,amb,amb,1.0f+amb);

 	gl_FragColor = tex * vec4(color)*tex.a;

 }

 

@@ -36,4 +40,4 @@ void main(){
 	.00008		500

 	.00002		1000

 	.00005		2000

-*/
\ No newline at end of file
+*/

diff --git a/include/entities.h b/include/entities.h
index acb2986..3b13ce3 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -195,7 +195,6 @@ public:
 class Player : public Entity{
 public:
 	QuestHandler qh;
-	bool light = false;
 
 	Player();
 	~Player();
diff --git a/include/world.h b/include/world.h
index 5b02c87..dd06469 100644
--- a/include/world.h
+++ b/include/world.h
@@ -47,16 +47,6 @@ enum class WorldWeather : unsigned char {
 };
 
 /**
- * The light structure, used to store light coordinates and color.
- */
-
-typedef struct {
-	vec2 loc;		/**< Light location */
-	Color color;	/**< Light color */
-	float radius;
-} Light;
-
-/**
  * The line structure.
  * This structure is used to store the world's ground, stored in vertical
  * lines. Dirt color and grass properties are also kept track of here.
@@ -86,6 +76,45 @@ extern std::string currentXML;
 class World;
 
 /**
+ * The light structure, used to store light coordinates and color.
+ */
+
+class Light{
+public:
+	vec2 loc;		/**< Light location */
+	Color color;	/**< Light color */
+	float radius;   /**< Light radius */
+
+	bool belongsTo;
+	Entity *following;
+
+	bool flame;
+	float fireFlicker;
+	vec2 fireLoc;
+
+	Light(vec2 l, Color c, float r){
+		loc = l;
+		color = c;
+		radius = r;
+
+		belongsTo = false;
+		following = nullptr;
+
+		flame = false;
+	}
+
+	void makeFlame(void){
+		flame = true;
+	}
+
+	void follow(Entity *f){
+		following=f;
+		belongsTo = true;
+	}
+};
+
+
+/**
  * The village class, used to group structures into villages.
  */
 
diff --git a/main.cpp b/main.cpp
index 210f36c..7b8f2d9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -343,7 +343,7 @@ int main(int argc, char *argv[]){
 
 	std::cout << "Initializing shaders!" << std::endl;
 
-	const GLchar *shaderSource = readFile("test.frag");
+	const GLchar *shaderSource = readFile("frig.frag");
 
 	GLint bufferln = GL_FALSE;
 	int logLength;
@@ -672,7 +672,7 @@ void render(){
 
 		ui::putText(offset.x-SCREEN_WIDTH/2,
 					(offset.y+SCREEN_HEIGHT/2)-ui::fontSize,
-					"FPS: %d\nG:%d\nRes: %ux%u\nE: %d\nPOS: (x)%+.2f\n     (y)%+.2f\nTc: %u\nHA: %+.2f\nPl: %d\n Vol: %f",
+					"FPS: %d\nG:%d\nRes: %ux%u\nE: %d\nPOS: (x)%+.2f\n     (y)%+.2f\nTc: %u\nHA: %+.2f\nVol: %f",
 					fps,
 					player->ground,
 					SCREEN_WIDTH,				// Window dimensions
@@ -682,7 +682,6 @@ void render(){
 					debugY,						// The player's y coordinate
 					tickCount,
 					handAngle,
-					player->light,
 					VOLUME_MASTER
 					);
 
diff --git a/src/ui.cpp b/src/ui.cpp
index 48bd2b6..e9b8067 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -878,8 +878,7 @@ namespace ui {
 
 	void quitGame(){
 		dialogBoxExists = false;
-		//delete[] currentMenu;
-		//currentMenu = NULL;
+		currentMenu = NULL;
 		gameRunning = false;
 		updateConfig();
 		saveConfig();
@@ -1488,7 +1487,9 @@ EXIT:
 					heyOhLetsGo = 0;
 					break;
 				case SDLK_l:
-					player->light ^= true;
+					currentWorld->addLight({player->loc.x + SCREEN_WIDTH/2, player->loc.y},{1.0f,1.0f,1.0f});
+					currentWorld->light.back().follow(player);
+					currentWorld->light.back().makeFlame();
 					break;
 				case SDLK_f:
 					currentWorld->addLight({player->loc.x + SCREEN_WIDTH/2, player->loc.y},{1.0f,1.0f,1.0f});
@@ -1508,13 +1509,14 @@ EXIT:
 				case SDLK_b:
 					currentWorld->addStructure(FIRE_PIT, player->loc.x, player->loc.y, "", "");
 					currentWorld->addLight({player->loc.x + SCREEN_WIDTH/2, player->loc.y},{1.0f,1.0f,1.0f});
+					currentWorld->light.back().follow(currentWorld->build.back());
+					currentWorld->light.back().makeFlame();
 					break;
 				case SDLK_F12:
 					// Make the BYTE array, factor of 3 because it's RBG.
 					static GLubyte* pixels;
 					pixels = new GLubyte[ 3 * SCREEN_WIDTH * SCREEN_HEIGHT];
 					glReadPixels(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, GL_RGB, GL_UNSIGNED_BYTE, pixels);
-
 					//static std::thread scr;
 					//scr = std::thread(takeScreenshot,pixels);
 					//scr.detach();
diff --git a/src/world.cpp b/src/world.cpp
index 357e527..ee2c33a 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -532,14 +532,41 @@ draw( Player *p )
 	glActiveTexture( GL_TEXTURE0 );
 	bgTex->bindNext();
 
-	std::unique_ptr<GLfloat[]> pointArrayBuf = std::make_unique<GLfloat[]> (2 * (light.size() + p->light));
-	auto pointArray = pointArrayBuf.get();
+    for(auto &l : light){
+        if(l.belongsTo){
+            l.loc.x = l.following->loc.x + SCREEN_WIDTH/2;
+            l.loc.y = l.following->loc.y;
+        }
+        if(l.flame){
+            l.fireFlicker = .9+((rand()%2)/10.0f);
+            l.fireLoc.x = l.loc.x + (rand()%2-1)*3;
+            l.fireLoc.y = l.loc.y + (rand()%2-1)*3;
+
+            //std::cout << l.fireLoc.x << "," << l.fireLoc.y << std::endl;
+            //std::cout << l.loc.x << "," << l.loc.y << std::endl << std::endl;
+        }else{
+            l.fireFlicker = 1.0f;
+        }
+    }
 
-	for ( i = 0; i < (int)light.size(); i++ ) {
-		pointArray[2 * i    ] = light[i].loc.x - offset.x;
-		pointArray[2 * i + 1] = light[i].loc.y;
+    std::unique_ptr<GLfloat[]> pointArrayBuf = std::make_unique<GLfloat[]> (2 * (light.size()));
+	auto pointArray = pointArrayBuf.get();
+    GLfloat flameArray[64];
+
+	for (uint i = 0; i < light.size(); i++) {
+        if(light[i].flame){
+    		pointArray[2 * i    ] = light[i].fireLoc.x - offset.x;
+    		pointArray[2 * i + 1] = light[i].fireLoc.y;
+        }else{
+            pointArray[2 * i    ] = light[i].loc.x - offset.x;
+            pointArray[2 * i + 1] = light[i].loc.y;
+        }
 	}
 
+    for(uint i = 0; i < light.size(); i++){
+        flameArray[i] = light[i].fireFlicker;
+    }
+
 	glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
 	glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
 
@@ -547,17 +574,13 @@ draw( Player *p )
 	glUniform1i( glGetUniformLocation( shaderProgram, "sampler"), 0 );
 	glUniform1f( glGetUniformLocation( shaderProgram, "amb"    ), shadeAmbient );
 
-	if ( p->light ) {
-		pointArray[2 * (light.size() + 1)    ] = (float)( p->loc.x + SCREEN_WIDTH / 2 );
-		pointArray[2 * (light.size() + 1) + 1] = (float)( p->loc.y );
-	}
-
-	if ( light.size() + (int)p->light == 0)
+	if ( light.size() == 0)
 		glUniform1i( glGetUniformLocation( shaderProgram, "numLight"), 0);
 	else {
-		glUniform1i ( glGetUniformLocation( shaderProgram, "numLight"     ), light.size() + (int)p->light );
-		glUniform2fv( glGetUniformLocation( shaderProgram, "lightLocation"), light.size() + (int)p->light, pointArray );
+		glUniform1i ( glGetUniformLocation( shaderProgram, "numLight"     ), light.size());
+		glUniform2fv( glGetUniformLocation( shaderProgram, "lightLocation"), light.size(), pointArray );
 		glUniform3f ( glGetUniformLocation( shaderProgram, "lightColor"   ), 1.0f, 1.0f, 1.0f );
+        glUniform1fv(glGetUniformLocation(shaderProgram,"fireFlicker"), light.size(),flameArray);
 	}
 
     /*
@@ -964,11 +987,8 @@ addParticle( float x, float y, float w, float h, float vx, float vy, Color color
 }
 
 void World::addLight(vec2 loc, Color color){
-	Light l;
-	if ( light.size() < 64 ) {
-		l.loc = loc;
-		l.color = color;
-		light.push_back(l);
+	if(light.size() < 64){
+		light.push_back(Light(loc,color,1));
 	}
 }
 
@@ -1236,36 +1256,61 @@ void IndoorWorld::draw(Player *p){
 	 *	Draw the background.
 	*/
 
-	glEnable(GL_TEXTURE_2D);
+	//glEnable(GL_TEXTURE_2D);
 
-	std::unique_ptr<GLfloat[]> pointArrayBuf = std::make_unique<GLfloat[]> (2 * (light.size() + p->light));
-	auto pointArray = pointArrayBuf.get();
+    for(auto &l : light){
+        if(l.belongsTo){
+            l.loc.x = l.following->loc.x + SCREEN_WIDTH/2;
+            l.loc.y = l.following->loc.y;
+        }
+        if(l.flame){
+            l.fireFlicker = .9+((rand()%2)/10.0f);
+            l.fireLoc.x = l.loc.x + (rand()%2-1)*3;
+            l.fireLoc.y = l.loc.y + (rand()%2-1)*3;
+
+            //std::cout << l.fireLoc.x << "," << l.fireLoc.y << std::endl;
+            //std::cout << l.loc.x << "," << l.loc.y << std::endl << std::endl;
+        }else{
+            l.fireFlicker = 1.0f;
+        }
+    }
 
-	for ( i = 0; i < light.size(); i++ ) {
-		pointArray[2 * i    ] = light[i].loc.x - offset.x;
-		pointArray[2 * i + 1] = light[i].loc.y;
+    std::unique_ptr<GLfloat[]> pointArrayBuf = std::make_unique<GLfloat[]> (2 * (light.size()));
+	auto pointArray = pointArrayBuf.get();
+    GLfloat flameArray[64];
+
+	for (i = 0; i < light.size(); i++) {
+        if(light[i].flame){
+    		pointArray[2 * i    ] = light[i].fireLoc.x - offset.x;
+    		pointArray[2 * i + 1] = light[i].fireLoc.y;
+        }else{
+            pointArray[2 * i    ] = light[i].loc.x - offset.x;
+            pointArray[2 * i + 1] = light[i].loc.y;
+        }
 	}
 
-	glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
-	glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
+    for(i = 0; i < light.size(); i++){
+        flameArray[i] = light[i].fireFlicker;
+    }
 
-	glUseProgram( shaderProgram );
-	glUniform1i( glGetUniformLocation( shaderProgram, "sampler"), 0 );
-	glUniform1f( glGetUniformLocation( shaderProgram, "amb"    ), 0.3f );
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
-	if ( p->light ) {
-		pointArray[2 * (light.size() + 1)    ] = (float)( p->loc.x + SCREEN_WIDTH / 2 );
-		pointArray[2 * (light.size() + 1) + 1] = (float)( p->loc.y );
-	}
+	glUseProgram( shaderProgram );
+	glUniform1i(glGetUniformLocation(shaderProgram, "sampler"), 0);
+	glUniform1f(glGetUniformLocation(shaderProgram, "amb"    ), 0.02f + light.size()/50.0f);
 
-	if ( light.size() + (int)p->light == 0)
-		glUniform1i( glGetUniformLocation( shaderProgram, "numLight"), 0);
+	if ( light.size() == 0)
+		glUniform1i(glGetUniformLocation(shaderProgram, "numLight"), 0);
 	else {
-		glUniform1i ( glGetUniformLocation( shaderProgram, "numLight"     ), light.size() + (int)p->light );
-		glUniform2fv( glGetUniformLocation( shaderProgram, "lightLocation"), light.size() + (int)p->light, pointArray );
-		glUniform3f ( glGetUniformLocation( shaderProgram, "lightColor"   ), 1.0f, 1.0f, 1.0f );
+		glUniform1i (glGetUniformLocation(shaderProgram, "numLight"     ), light.size());
+		glUniform2fv(glGetUniformLocation(shaderProgram, "lightLocation"), light.size(), pointArray);
+		glUniform3f (glGetUniformLocation(shaderProgram, "lightColor"   ), 1.0f, 1.0f, 1.0f);
+        glUniform1fv(glGetUniformLocation(shaderProgram, "fireFlicker"), light.size(), flameArray);
 	}
 
+    //delete[] flameArray;
+
 	bgTex->bind(0);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); //for the s direction
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); //for the t direction
@@ -1279,7 +1324,7 @@ void IndoorWorld::draw(Player *p){
 	glEnd();
 
 	glUseProgram(0);
-	glDisable(GL_TEXTURE_2D);
+	//glDisable(GL_TEXTURE_2D);
 
 	/*
 	 *	Calculate the starting and ending points to draw the ground from.