Added shader loading and running

4 files changed, 68 insertions, 13 deletions

diff --git a/include/common.h b/include/common.h
index ce176a6..359e825 100644
--- a/include/common.h
+++ b/include/common.h
@@ -20,6 +20,8 @@
 #include <SDL2/SDL_opengl.h>
 #include <SDL2/SDL_image.h>
 #include <SDL2/SDL_mixer.h>
+#include <string>
+#include <fstream>
 
 /*
  *	Include file headers
@@ -30,7 +32,7 @@
  *	This flag lets the compiler know that we are using shaders
 */
 
- #define SHADERS
+ #define SHADERSere
 
 /*
  *	Create a basic 2-point structure for coordinate saving
diff --git a/main.cpp b/main.cpp
index e7ecf37..f017023 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,7 +14,8 @@
  *	The call for rendering is made every time the main loop loops, and then
  *	uses interpolation for smooth drawing to the screen. However, the call
  *	for logic would be preferred to be run every set amount of time.
- * 
+ *  
+
  *	The logic loop is currently implemented to run at a certain interval
  *	that we call a 'tick'. As one may now guess, TICKS_PER_SEC defines the
  *	amount of ticks that should be made every second. MSEC_PER_TICK then
@@ -104,6 +105,12 @@ unsigned int tickCount = 0;
 unsigned int deltaTime = 0;
 
 /*
+ *
+*/
+GLuint fragShader;
+GLuint shaderProgram;
+
+/*
  *	names is used to open a file containing all possible NPC names. It is externally
  *	referenced in src/entities.cpp for getting random names.
  *
@@ -158,6 +165,25 @@ void logic(void);
 void render(void);
 void mainLoop(void);
 
+std::string readFile(const char *filePath) {
+    std::string content;
+    std::ifstream fileStream(filePath, std::ios::in);
+
+    if(!fileStream.is_open()) {
+        std::cerr << "Could not read file " << filePath << ". File does not exist." << std::endl;
+        return "";
+    }
+
+    std::string line = "";
+    while(!fileStream.eof()) {
+        std::getline(fileStream, line);
+        content.append(line + "\n");
+    }
+
+    fileStream.close();
+    return content;
+}
+
 /* 
  *	This offset is used as the player offset in the world drawing so
  *	everything can be moved according to the player
@@ -331,31 +357,41 @@ int main(int argc, char *argv[]){
 	/*
 	 *	Initializes our shaders so that the game has shadows.
 	*/
-
 	#ifdef SHADERS
 		std::cout << "Initializing shaders!" << std::endl;
 
-		GLuint fragShader;
-		GLuint shaderProgram;
+	 	fragShader = glCreateShader(GL_FRAGMENT_SHADER);
+
+		std::string shaderFileContents = readFile("test.frag");
+		const GLchar *shaderSource = shaderFileContents.c_str();
+
+		GLint bufferln = GL_FALSE;
+		int logLength;	
 
-		const GLchar *shaderSource = "shader.frag";
-		GLint bufferln = GL_FALSE;	
 
-		fragShader = glCreateShader(GL_FRAGMENT_SHADER);
 		glShaderSource(fragShader, 1, &shaderSource, NULL);
 		glCompileShader(fragShader);
 
-		shaderProgram = glCreateProgram();
-		
 		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){
 			std::cout << "Error compiling shader" << std::endl;
 		}
-		
+
+		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;
 	#endif //SHADERS
 	
 	//glEnable(GL_DEPTH_TEST); //THIS DOESN'T WORK ON LINUX
@@ -572,6 +608,7 @@ void render(){
 	glMatrixMode(GL_MODELVIEW); 					//set the matrix to modelview so we can draw objects
 	glPushMatrix(); 								//push the  matrix to the top of the matrix stack
 	glLoadIdentity(); 								//replace the entire matrix stack with the updated GL_MODELVIEW mode
+	glEnable(GL_STENCIL_TEST);
 	glPushMatrix();									//basically here we put a blank canvas (new matrix) on the screen to draw on
 	
 	/*
@@ -687,11 +724,23 @@ void render(){
 	*/
 
 	player->near=true;			// Draw the player's name
+
+	#ifdef SHADERS
+		glUseProgramObjectARB(shaderProgram);
+		glUniform2f(glGetUniformLocation(shaderProgram, "lightLocation"), 0,100);
+		glUniform3f(glGetUniformLocation(shaderProgram, "lightColor"), 255,255,255);
+		//glBlendFunc(GL_ONE, GL_ONE);
+	#endif //SHADERS
 	
 	currentWorld->draw(player);
+
+	#ifdef SHADERS
+		glUseProgramObjectARB(0);
+	#endif //SHADERS
 	
 	player->inv->draw();
 
+
 	/*
 	 *	Draw UI elements. As of 10/20/2015 this includes the player's health bar and the dialog box.
 	*/
diff --git a/shader.frag b/shader.frag
index 7627a12..83c8bdc 100644
--- a/shader.frag
+++ b/shader.frag
@@ -1,4 +1,4 @@
-#version 140

+#version 130

 

 uniform vec2 lightLocation;

 uniform vec3 lightColor;

@@ -6,7 +6,7 @@ uniform float screenHeight;
 

 void main(){

 	float distance = length(lightLocation - gl_FragCoord.xy);

-	float attenuation = 1.0 / distance;

+	float attenuation = 3.0 / distance;

 	vec4 color = vec4(attenuation, attenuation, attenuation, pow(attenuation, 3)) * vec4(lightColor, 1);

 	

 	gl_FragColor = color;

diff --git a/test.frag b/test.frag
new file mode 100644
index 0000000..131a3e6
--- /dev/null
+++ b/test.frag
@@ -0,0 +1,4 @@
+#version 130

+void main(){

+	gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);

+}
\ No newline at end of file