Get shadertoy header and footer sources from table instead of file fo…

…r release, adding a prototype to ShaderFunctions.h so it is accessible.
jimbo00000 · Sep 18, 2014 · f7cce7e · f7cce7e
1 parent 53a710a
commit f7cce7e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Scene/ShaderToy.cpp b/src/Scene/ShaderToy.cpp
@@ -40,9 +40,9 @@ void ShaderToy::CompileShader()
 
     const GLuint vertSrc = loadShaderFile(vs.c_str(), GL_VERTEX_SHADER);
     const std::string shaderToyDir = "../shaders/";
-    const std::string src1 = GetShaderSourceFromFile("rwwtt_header.glsl");
+    const std::string src1 = GetShaderSourceFromTable("rwwtt_header.glsl");
     const std::string src2 = GetShaderSourceFromFile(m_sourceFile.c_str(), shaderToyDir);
-    const std::string src3 = GetShaderSourceFromFile("rwwtt_footer.glsl");
+    const std::string src3 = GetShaderSourceFromTable("rwwtt_footer.glsl");
 
     GLuint fragSrc = 0;
     GLuint shaderId = glCreateShader(GL_FRAGMENT_SHADER);

diff --git a/src/Util/GL/ShaderFunctions.h b/src/Util/GL/ShaderFunctions.h
@@ -11,6 +11,7 @@ void  printProgramInfoLog(GLuint obj);
 const std::string GetShaderSourceFromFile(
     const char* filename,
     const std::string path=std::string("../hardcoded_shaders/"));
+const GLchar* GetShaderSourceFromTable(const char* filename);
 const std::string GetShaderSource(const char* filename);
 GLuint loadShaderFile(const char* filename, const unsigned long Type);