From c42eeb20aea4a9daeac1c0561352c3ea2074e0ce Mon Sep 17 00:00:00 2001 From: Nobuyuki Date: Mon, 13 May 2024 09:19:11 +0900 Subject: [PATCH] fix ci --- .github/workflows/ubuntu.yml | 1 + src/util_triangle_mesh.h | 2 +- task04/main.cpp | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index d7c2eca..6dc160a 100644 --- 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 index 14c5922..835a682 100644 --- 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::Matrix3Xf> { using myMatrix3Xui = Eigen::Matrix; std::ifstream fin; diff --git a/task04/main.cpp b/task04/main.cpp index cc83753..de11e42 100644 --- 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();