Embed shaders directly into executable

CMakeLists.txt

@@ -26,3 +26,14 @@ add_executable(perlin-shadows
         src/renderable.cpp
         src/renderable.h
 )
+
+file(READ src/phong.vert PHONG_VERT)
+file(READ src/phong.frag PHONG_FRAG)
+configure_file(src/renderer.in.cpp src/renderer.cpp @ONLY)
+
+file(READ src/shadow.vert SHADOW_VERT)
+file(READ src/shadow.frag SHADOW_FRAG)
+file(READ src/shadow.geom SHADOW_GEOM)
+configure_file(src/point_light.in.h src/point_light.h @ONLY)
+
+target_include_directories(perlin-shadows PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/src")

README.md

@@ -2,13 +2,6 @@
 
 Generates several tiles of grids containing Perlin noise, and then renders them with shadows.
 
-## Running
-
-The shader files (`src/*.{frag,vert,geom}`) are referenced within the code by assuming they are located in the current
-working directory.
-It is therefore necessary to set the CWD when running the program to the `src/` directory, or copy/symlink the files to
-whatever your actual CWD is.
-
 ## Control
 
 Sample from console output:

src/point_light.in.h

@@ -37,7 +37,7 @@ class PointLight final : public Renderable {
   float specularPower_{20};
   glm::vec3 pos_;
 
-  Shader shadow_{"shadow.vert", "shadow.frag", "shadow.geom"};
+  Shader shadow_{R"(@SHADOW_VERT@)", R"(@SHADOW_FRAG@)", R"(@SHADOW_GEOM@)"};
   GLuint fbo_{0};
   GLuint depth_{0};
 };

src/renderer.h

@@ -3,7 +3,7 @@
 #include <vector>
 
 #include "camera.h"
-#include "point_light.h"
+#include "point_light.in.h"
 #include "shader.h"
 
 constexpr auto kInitialWidth = 1280;

src/renderer.in.cpp

@@ -51,7 +51,12 @@ Renderer::Renderer(int argc, char *argv[]) {
   }
   CheckGLError();
 
-  shader_ = new Shader("phong.vert", "phong.frag");
+  shader_ = new Shader(R"(
+@PHONG_VERT@
+)",
+                       R"(
+@PHONG_FRAG@
+)");
   light_ = new PointLight({kGeographyShort * kGeographyCountShort / 2,
                            kGeographyLong * kGeographyCountLong / 2,
                            kHeightMultiplier * kGeographyCountShort / 2});

src/shader.cpp

@@ -8,11 +8,11 @@
 
 using namespace std;
 
-Shader::Shader(const string &vertexShaderFile, const string &fragmentShaderFile,
-               const string &geometryShaderFile) {
-  const auto vertexShaderId = CompileShader(vertexShaderFile, GL_VERTEX_SHADER);
+Shader::Shader(const string &vertexShader, const string &fragmentShader,
+               const string &geometryShader) {
+  const auto vertexShaderId = CompileShader(vertexShader, GL_VERTEX_SHADER);
   const auto fragmentShaderId =
-      CompileShader(fragmentShaderFile, GL_FRAGMENT_SHADER);
+      CompileShader(fragmentShader, GL_FRAGMENT_SHADER);
   GLuint geometryShaderId{0};
 
   id_ = glCreateProgram();
@@ -22,8 +22,8 @@ Shader::Shader(const string &vertexShaderFile, const string &fragmentShaderFile,
   glAttachShader(id_, fragmentShaderId);
   CheckGLError("Error in attaching the fragment shader");
 
-  if (!geometryShaderFile.empty()) {
-    geometryShaderId = CompileShader(geometryShaderFile, GL_GEOMETRY_SHADER);
+  if (!geometryShader.empty()) {
+    geometryShaderId = CompileShader(geometryShader, GL_GEOMETRY_SHADER);
     glAttachShader(id_, geometryShaderId);
     CheckGLError("Error in attaching the geometry shader");
   }
@@ -34,7 +34,7 @@ Shader::Shader(const string &vertexShaderFile, const string &fragmentShaderFile,
 
   glDeleteShader(vertexShaderId);
   glDeleteShader(fragmentShaderId);
-  if (!geometryShaderFile.empty()) {
+  if (geometryShaderId != 0) {
     glDeleteShader(geometryShaderId);
   }
 
@@ -114,33 +114,14 @@ bool Shader::CopyDataToUniform(const bool data, const string &name) const {
   return true;
 }
 
-string Shader::ReadFile(const string &filename) {
-  string data;
-  ifstream file;
-  file.open(filename, std::ios::binary);
-  if (file.is_open()) {
-    string line;
-    while (getline(file, line)) {
-      data += line + '\n';
-    }
-    if (data.empty()) {
-      data.pop_back();
-    }
-  } else {
-    throw runtime_error("Could not open " + filename);
-  }
-  return data;
-}
-
-GLuint Shader::CompileShader(const std::string &filename,
-                             const GLenum shader_type) {
-  const GLuint id = glCreateShader(shader_type);
-  const auto shaderString = ReadFile(filename);
-  const auto shaderC_str = shaderString.c_str();
+GLuint Shader::CompileShader(const std::string &shaderSource,
+                             const GLenum shaderType) {
+  const GLuint id = glCreateShader(shaderType);
+  const auto shaderC_str = shaderSource.c_str();
   glShaderSource(id, 1, &shaderC_str, nullptr);
   glCompileShader(id);
   CheckShaderivError(id, GL_COMPILE_STATUS,
-                     "Error when creating shader file " + filename);
+                     "Error when compiling shader file:\n" + shaderSource);
   return id;
 }
 

src/shader.h

@@ -30,7 +30,6 @@ class Shader {
  private:
   GLuint id_;
 
-  static std::string ReadFile(const std::string &);
   static GLuint CompileShader(const std::string &, GLenum);
 
   static void CheckGLError(const std::string &);