1 files changed, 46 insertions, 118 deletions

diff --git a/src/opengl/shaders.cpp b/src/opengl/shaders.cpp
index 34d4e8f..41d5a90 100644
--- a/src/opengl/shaders.cpp
+++ b/src/opengl/shaders.cpp
@@ -1,42 +1,63 @@
 #include "shaders.hpp"
 
-GLuint CompileShader(std::string shader_name){
-  std::ifstream shader_file;
-  shader_file.open(std::string(SHADERS_RESOURCES) + "/" + shader_name);
-  if(!shader_file.is_open()) {
-     std::cout << "Failed to open: " << shader_name << std::endl;
-     exit(EXIT_FAILURE);
-  }
+/**
+ * Default Ray Marching Shader
+ * Any change is forbidden :P
+ */
+std::string VertexShader="\
+#version 330 core \n\
+layout(location = 0) in vec3 position; \n\
+uniform mat4 projection; \n\
+uniform mat4 model; \n\
+void main(){ \n\
+  gl_Position =  projection * model * vec4(position,1); \n\
+}";
+
+
+/**
+ * Read shaders and handle #include directive
+ * @param shader_name
+ * @return string containing shader source code
+ */
+std::string ReadShader(std::string shader_name){
+	std::string shader_path=std::string(SHADERS_RESOURCES) + "/" + shader_name;
+	std::ifstream shader_file;
+	shader_file.open(shader_path);
+	if(!shader_file.is_open()) {
+		std::cout << "Failed to open: " << shader_path << std::endl;
+		exit(EXIT_FAILURE);
+	}
+	std::string line;
+	std::stringstream src;
+	while(getline(shader_file, line)){
+		if(line.find("#include")!=std::string::npos){
+			int from=line.find("\"")+1;
+			if(from !=std::string::npos){
+				int until=line.size()-from-1;
+				src << ReadShader(line.substr(from,until)) << std::endl;
+				continue;
+			}
+		}
+		src << line << std::endl;
+	}
+	return(src.str());
+}
 
-  std::string line;
-  char type='\0';
-  std::stringstream ss[2];
-  while(getline(shader_file, line)) {
-    if(line.find("- Vertex Shader -") != std::string::npos){
-    	type='v';
-    } else if(line.find("- Fragment Shader -") != std::string::npos){
-    	type='f';
-    }
 
-    if(type=='v')
-    	ss[0] << line << std::endl;
-    else if(type=='f')
-    	ss[1] << line << std::endl;
-   }
+GLuint CompileShader(std::string shader_name){
 
   // Create ids
   GLuint VertexShaderID = glCreateShader(GL_VERTEX_SHADER);
   GLuint FragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER);
 
   // Compile vertex shader
-  std::string vsrc=ss[0].str();
-  char const * vsrc_c = vsrc.c_str();
+  char const * vsrc_c = VertexShader.c_str();
   glShaderSource(VertexShaderID, 1, &vsrc_c, NULL);
   glCompileShader(VertexShaderID);
 
   // Compile fragment shader
-  std::string fsrc=ss[1].str();
-  char const * fsrc_c = fsrc.c_str();
+  std::string fsrc_cpp=ReadShader(shader_name);
+  char const * fsrc_c = fsrc_cpp.c_str();
   glShaderSource(FragmentShaderID, 1, &fsrc_c, NULL);
   glCompileShader(FragmentShaderID);
 
@@ -54,96 +75,3 @@ GLuint CompileShader(std::string shader_name){
 
   return ProgramID;
 }
-
-
-GLuint LoadShaders(const char * vertex_file_path,const char * fragment_file_path){
-
-	// Create the shaders
-	GLuint VertexShaderID = glCreateShader(GL_VERTEX_SHADER);
-	GLuint FragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER);
-
-	// Read the Vertex Shader code from the file
-	std::string VertexShaderCode;
-	std::ifstream VertexShaderStream(vertex_file_path, std::ios::in);
-	if(VertexShaderStream.is_open()){
-		std::stringstream sstr;
-		sstr << VertexShaderStream.rdbuf();
-		VertexShaderCode = sstr.str();
-		VertexShaderStream.close();
-	}else{
-		printf("Impossible to open %s. Are you in the right directory ? Don't forget to read the FAQ !\n", vertex_file_path);
-		getchar();
-		return 0;
-	}
-
-	// Read the Fragment Shader code from the file
-	std::string FragmentShaderCode;
-	std::ifstream FragmentShaderStream(fragment_file_path, std::ios::in);
-	if(FragmentShaderStream.is_open()){
-		std::stringstream sstr;
-		sstr << FragmentShaderStream.rdbuf();
-		FragmentShaderCode = sstr.str();
-		FragmentShaderStream.close();
-	}
-    
-	GLint Result = GL_FALSE;
-	int InfoLogLength;
-
-
-	// Compile Vertex Shader
-	printf("Compiling shader : %s\n", vertex_file_path);
-	char const * VertexSourcePointer = VertexShaderCode.c_str();
-	glShaderSource(VertexShaderID, 1, &VertexSourcePointer , NULL);
-	glCompileShader(VertexShaderID);
-
-	// Check Vertex Shader
-	glGetShaderiv(VertexShaderID, GL_COMPILE_STATUS, &Result);
-	glGetShaderiv(VertexShaderID, GL_INFO_LOG_LENGTH, &InfoLogLength);
-	if ( InfoLogLength > 0 ){
-		std::vector<char> VertexShaderErrorMessage(InfoLogLength+1);
-		glGetShaderInfoLog(VertexShaderID, InfoLogLength, NULL, &VertexShaderErrorMessage[0]);
-		printf("%s\n", &VertexShaderErrorMessage[0]);
-	}
-
-
-
-	// Compile Fragment Shader
-	printf("Compiling shader : %s\n", fragment_file_path);
-	char const * FragmentSourcePointer = FragmentShaderCode.c_str();
-	glShaderSource(FragmentShaderID, 1, &FragmentSourcePointer , NULL);
-	glCompileShader(FragmentShaderID);
-
-	// Check Fragment Shader
-	glGetShaderiv(FragmentShaderID, GL_COMPILE_STATUS, &Result);
-	glGetShaderiv(FragmentShaderID, GL_INFO_LOG_LENGTH, &InfoLogLength);
-	if ( InfoLogLength > 0 ){
-		std::vector<char> FragmentShaderErrorMessage(InfoLogLength+1);
-		glGetShaderInfoLog(FragmentShaderID, InfoLogLength, NULL, &FragmentShaderErrorMessage[0]);
-		printf("%s\n", &FragmentShaderErrorMessage[0]);
-	}
-
-	// Link the program
-	printf("Linking program\n");
-	GLuint ProgramID = glCreateProgram();
-	glAttachShader(ProgramID, VertexShaderID);
-	glAttachShader(ProgramID, FragmentShaderID);
-	glLinkProgram(ProgramID);
-
-	// Check the program
-	glGetProgramiv(ProgramID, GL_LINK_STATUS, &Result);
-	glGetProgramiv(ProgramID, GL_INFO_LOG_LENGTH, &InfoLogLength);
-	if ( InfoLogLength > 0 ){
-		std::vector<char> ProgramErrorMessage(InfoLogLength+1);
-		glGetProgramInfoLog(ProgramID, InfoLogLength, NULL, &ProgramErrorMessage[0]);
-		printf("%s\n", &ProgramErrorMessage[0]);
-	}
-
-	
-	glDetachShader(ProgramID, VertexShaderID);
-	glDetachShader(ProgramID, FragmentShaderID);
-	
-	glDeleteShader(VertexShaderID);
-	glDeleteShader(FragmentShaderID);
-
-	return ProgramID;
-}