added mview and mpview apps

pmp-library · Oct 6, 2017 · 8ddf027 · 8ddf027
1 parent fa8b3bb
commit 8ddf027
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 10 deletions.
diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt
@@ -2,28 +2,35 @@ find_package(OpenGL REQUIRED)
 
 if (EMSCRIPTEN)
 
-    add_executable(mview mview.cpp MeshProcessingViewer.cpp MeshProcessingViewer.h)
+    add_executable(mview mview.cpp data/shell.html)
     target_link_libraries(mview pmp_gl pmp imgui)
-    set_target_properties(mview PROPERTIES LINK_FLAGS "--shell-file ${CMAKE_CURRENT_SOURCE_DIR}/data/shell.html --preload-file ${PROJECT_SOURCE_DIR}/external/pmp-data/obj/suzanne.obj@input.obj")
+    set_target_properties(mview PROPERTIES LINK_FLAGS "--shell-file ${CMAKE_CURRENT_SOURCE_DIR}/data/shell.html --preload-file ${PROJECT_SOURCE_DIR}/external/pmp-data/obj/bunny.off@input.off")
 
-    add_executable(subdiv subdiv.cpp)
+    add_executable(mpview mpview.cpp MeshProcessingViewer.cpp MeshProcessingViewer.h data/shell.html)
+    target_link_libraries(mpview pmp_gl pmp imgui)
+    set_target_properties(mpview PROPERTIES LINK_FLAGS "--shell-file ${CMAKE_CURRENT_SOURCE_DIR}/data/shell.html --preload-file ${PROJECT_SOURCE_DIR}/external/pmp-data/obj/bunny.off@input.off")
+
+    add_executable(subdiv subdiv.cpp data/shell.html)
     target_link_libraries(subdiv pmp_gl pmp imgui)
     set_target_properties(subdiv PROPERTIES LINK_FLAGS "--shell-file ${CMAKE_CURRENT_SOURCE_DIR}/data/shell.html --preload-file ${PROJECT_SOURCE_DIR}/external/pmp-data/obj/suzanne.obj@input.obj")
 
-    add_executable(remeshing remeshing.cpp)
+    add_executable(remeshing remeshing.cpp data/shell.html)
     target_link_libraries(remeshing pmp_gl pmp imgui)
     set_target_properties(remeshing PROPERTIES LINK_FLAGS "--shell-file ${CMAKE_CURRENT_SOURCE_DIR}/data/shell.html --preload-file ${PROJECT_SOURCE_DIR}/external/pmp-data/off/bunny.off@input.off")
 
 else()
 
   if(OpenGL_FOUND)
-    add_executable(mview mview.cpp MeshProcessingViewer.cpp MeshProcessingViewer.h data/shell.html)
+    add_executable(mview mview.cpp)
     target_link_libraries(mview pmp_gl glew)
 
-    add_executable(eview eview.cpp EdgeSetProcessingViewer.cpp EdgeSetProcessingViewer.h data/shell.html)
+    add_executable(mpview mpview.cpp MeshProcessingViewer.cpp MeshProcessingViewer.h)
+    target_link_libraries(mpview pmp_gl glew)
+
+    add_executable(eview eview.cpp EdgeSetProcessingViewer.cpp EdgeSetProcessingViewer.h)
     target_link_libraries(eview pmp_gl glew)
 
-    add_executable(pview pview.cpp PointSetProcessingViewer.cpp PointSetProcessingViewer.h data/shell.html)
+    add_executable(pview pview.cpp PointSetProcessingViewer.cpp PointSetProcessingViewer.h)
     target_link_libraries(pview pmp_gl glew)
   endif()
 

diff --git a/src/apps/mpview.cpp b/src/apps/mpview.cpp
@@ -0,0 +1,21 @@
+//=============================================================================
+
+#include "MeshProcessingViewer.h"
+
+//=============================================================================
+
+int main(int argc, char **argv)
+{
+    MeshProcessingViewer window("MeshProcessingViewer", 800, 600);
+
+    if (argc == 2)
+        window.loadMesh(argv[1]);
+#ifdef __EMSCRIPTEN__
+    else
+        window.loadMesh("input.off");
+#endif
+
+    return window.run();
+}
+
+//=============================================================================
diff --git a/src/apps/mview.cpp b/src/apps/mview.cpp
@@ -1,18 +1,18 @@
 //=============================================================================
 
-#include "MeshProcessingViewer.h"
+#include <pmp/gl/MeshViewer.h>
 
 //=============================================================================
 
 int main(int argc, char **argv)
 {
-    MeshProcessingViewer window("MeshProcessingViewer", 800, 600);
+    pmp::MeshViewer window("MeshViewer", 800, 600);
 
     if (argc == 2)
         window.loadMesh(argv[1]);
 #ifdef __EMSCRIPTEN__
     else
-        window.loadMesh("input.obj");
+        window.loadMesh("input.off");
 #endif
 
     return window.run();