fix ci

nobuyuki83 · May 13, 2024 · 33c7b88 · 33c7b88
1 parent c42eeb2
commit 33c7b88
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/util_opengl.h b/src/util_opengl.h
@@ -12,8 +12,8 @@
 namespace acg {
 
 std::string load_file_as_string(
-    const std::string &fname) {
-  std::ifstream inputFile1(fname.c_str());
+    const char* fname) {
+  std::ifstream inputFile1(fname);
   std::istreambuf_iterator<char> vdataBegin(inputFile1);
   std::istreambuf_iterator<char> vdataEnd;
   return {vdataBegin, vdataEnd};

diff --git a/task04/main.cpp b/task04/main.cpp
@@ -69,10 +69,10 @@ int main() {
 
   int shaderProgram;
   { // compile shader program
-    std::string vrt_path = std::filesystem::path(PROJECT_SOURCE_DIR) / "shader.vert";
-    std::string frg_path = std::filesystem::path(PROJECT_SOURCE_DIR) / "shader.frag";
-    std::string vrt = acg::load_file_as_string(vrt_path); // read source code of vertex shader program
-    std::string frg = acg::load_file_as_string(frg_path); // read source code of fragment shader program
+    const auto vrt_path = std::filesystem::path(PROJECT_SOURCE_DIR) / "shader.vert";
+    const auto frg_path = std::filesystem::path(PROJECT_SOURCE_DIR) / "shader.frag";
+    std::string vrt = acg::load_file_as_string(vrt_path.string().c_str()); // read source code of vertex shader program
+    std::string frg = acg::load_file_as_string(frg_path.string().c_str()); // read source code of fragment shader program
     shaderProgram = acg::create_shader_program(vrt, frg); // compile the shader on GPU
   }
   ::glUseProgram(shaderProgram); // use the shader program