fix compilation (#13)

jiangzhongshi · Jun 21, 2021 · 1b85984 · 1b85984
1 parent c9c7869
commit 1b85984
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,7 +40,8 @@ download_project(
   SOURCE_DIR   ${CMAKE_SOURCE_DIR}/external/libigl
   DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/external/.cache/libigl
   QUIET
-  GIT_REPOSITORY https://github.com/jiangzhongshi/libigl.git
+  GIT_REPOSITORY https://github.com/libigl/libigl.git
+  GIT_TAG        682e4b9685d2737215f6629ecafcb318d714d556
 )
 set(LIBIGL_INCLUDE_DIR )
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/external/libigl/cmake")

diff --git a/src/UI/TextureGUI.cpp b/src/UI/TextureGUI.cpp
@@ -189,8 +189,8 @@ bool TextureGUI::post_draw() {
 bool TextureGUI::pre_draw() {
   if (re_draw_) {
     if (!viewer_cores_init) {
-      viewer_core_3d_ = v_.core;
-      viewer_core_2d_ = v_.core;
+      viewer_core_3d_ = v_.core();
+      viewer_core_2d_ = v_.core();
       viewer_cores_init = true;
 
       // viewer_core_3d_.show_texture = true;
@@ -207,7 +207,7 @@ bool TextureGUI::pre_draw() {
       viewer_core_2d_.lighting_factor = 0;
       viewer_core_2d_.align_camera_center(d_.w_uv, d_.surface_F);
 
-      v_.core = uv_space ? viewer_core_2d_ : viewer_core_3d_;
+      v_.core() = uv_space ? viewer_core_2d_ : viewer_core_3d_;
     }
 
     v_.data().clear();

diff --git a/src/UI/TextureGUI_extended_menu.cpp b/src/UI/TextureGUI_extended_menu.cpp
@@ -144,11 +144,11 @@ bool TextureGUI::extended_menu() {
         re_draw_ = true;
         if (viewer_cores_init) {
           if (!uv_space) {
-            viewer_core_2d_ = v_.core;
-            v_.core = viewer_core_3d_;
+            viewer_core_2d_ = v_.core();
+            v_.core() = viewer_core_3d_;
           } else {
-            viewer_core_3d_ = v_.core;
-            v_.core = viewer_core_2d_;
+            viewer_core_3d_ = v_.core();
+            v_.core() = viewer_core_2d_;
           }
         }
         if (continue_computing_) {