Simple mesh viewer with thick points and lines (#1006)

xelatihy · Aug 15, 2020 · 731539d · 731539d
1 parent fb150cc
commit 731539d
Show file tree

Hide file tree

Showing 10 changed files with 5,768 additions and 15 deletions.
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
@@ -12,6 +12,7 @@ add_subdirectory(ysceneitrace)
 add_subdirectory(ysceneitraces)
 add_subdirectory(yimageview)
 add_subdirectory(yimageviews)
+add_subdirectory(yshapeview)
 endif(YOCTO_OPENGL)
 
 if(YOCTO_DENOISE)

diff --git a/apps/ysceneview/ysceneview.cpp b/apps/ysceneview/ysceneview.cpp
@@ -249,7 +249,7 @@ void init_glscene(ogl_scene* glscene, scene_model* ioscene,
   // shapes
   for (auto ioinstance : ioscene->instances) {
     if (progress_cb) progress_cb("convert instance", progress.x++, progress.y);
-    auto globject = add_object(glscene);
+    auto globject = add_instance(glscene);
     set_frame(globject, ioinstance->frame);
     set_shape(globject, shape_map.at(ioinstance->shape));
     set_material(globject, material_map.at(ioinstance->material));

diff --git a/apps/ysceneviews/ysceneviews.cpp b/apps/ysceneviews/ysceneviews.cpp
@@ -210,7 +210,7 @@ void init_glscene(ogl_scene* glscene, scene_model* ioscene,
   // shapes
   for (auto ioobject : ioscene->instances) {
     if (progress_cb) progress_cb("convert instance", progress.x++, progress.y);
-    auto globject = add_object(glscene);
+    auto globject = add_instance(glscene);
     set_frame(globject, ioobject->frame);
     set_shape(globject, shape_map.at(ioobject->shape));
     set_material(globject, material_map.at(ioobject->material));

diff --git a/apps/yshapeview/CMakeLists.txt b/apps/yshapeview/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_executable(yshapeview  yshapeview.cpp)
+
+set_target_properties(yshapeview  PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED YES)
+target_include_directories(yshapeview  PRIVATE ${CMAKE_SOURCE_DIR}/libs)
+target_link_libraries(yshapeview  yocto yocto_gui)
+