fix ci

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

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -21,6 +21,7 @@ jobs:
         sudo apt install -y \
           libwayland-dev libxkbcommon-dev wayland-protocols extra-cmake-modules \
           libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev
+        sudo apt install -y libegl1-mesa-dev
         git submodule update --init -- external/glfw
         cmake -S external/glfw -B external/glfwbuild
         cd external/glfwbuild

diff --git a/src/util_triangle_mesh.h b/src/util_triangle_mesh.h
@@ -16,7 +16,7 @@
 namespace acg {
 
 auto read_wavefrontobj_as_3d_triangle_mesh(
-    const std::filesystem::path &file_path)
+    const char* file_path)
 -> std::tuple<Eigen::Matrix<unsigned int, 3, Eigen::Dynamic>, Eigen::Matrix3Xf> {
   using myMatrix3Xui = Eigen::Matrix<unsigned int, 3, Eigen::Dynamic>;
   std::ifstream fin;

diff --git a/task04/main.cpp b/task04/main.cpp
@@ -6,6 +6,10 @@
 //
 #include "../src/util_opengl.h"
 #include "../src/util_triangle_mesh.h"
+//
+#ifndef  M_PI
+#define  M_PI  3.1415926535897932384626433
+#endif
 
 /***
  * draw triangle mesh
@@ -34,7 +38,7 @@ void draw(
 
 int main() {
   const auto file_path = std::filesystem::path(PROJECT_SOURCE_DIR) / ".." / "asset" / "armadillo.obj";
-  auto[tri2vtx, vtx2xyz] = acg::read_wavefrontobj_as_3d_triangle_mesh(file_path);
+  auto[tri2vtx, vtx2xyz] = acg::read_wavefrontobj_as_3d_triangle_mesh(file_path.string().c_str());
   // bounding box
   auto aabb_max = vtx2xyz.rowwise().maxCoeff();
   auto aabb_min = vtx2xyz.rowwise().minCoeff();