[render] some render examples use generic getDrawableMesh function im…

…plemented in common
cnr-isti-vclab · Jan 8, 2025 · 2ceb50e · 2ceb50e
1 parent 676f8e8
commit 2ceb50e
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 263 deletions.
diff --git a/examples/render/01-viewer/bgfx/glfw/CMakeLists.txt b/examples/render/01-viewer/bgfx/glfw/CMakeLists.txt
@@ -28,13 +28,10 @@ project(vclib-render-example-${EXAMPLE_NAME})
 ### Build settings
 set(CMAKE_CXX_STANDARD 20)
 
-set(HEADERS
-    common.h)
-
 set(SOURCES
     main.cpp)
 
 # will create a target called 'vclib-render-example-${EXAMPLE_NAME}'
 vclib_add_example(${EXAMPLE_NAME}
     VCLIB_MODULE render
-    SOURCES ${HEADERS} ${SOURCES})
+    SOURCES ${SOURCES})
diff --git a/examples/render/01-viewer/bgfx/glfw/main.cpp b/examples/render/01-viewer/bgfx/glfw/main.cpp
@@ -20,7 +20,7 @@
  * (https://www.mozilla.org/en-US/MPL/2.0/) for more details.                *
  ****************************************************************************/
 
-#include "common.h"
+#include "get_drawable_mesh.h"
 
 #include <vclib/glfw/viewer_window.h>
 

diff --git a/examples/render/01-viewer/bgfx/qt/CMakeLists.txt b/examples/render/01-viewer/bgfx/qt/CMakeLists.txt
@@ -28,13 +28,10 @@ project(vclib-render-example-${EXAMPLE_NAME})
 ### Build settings
 set(CMAKE_CXX_STANDARD 20)
 
-set(HEADERS
-    common.h)
-
 set(SOURCES
     main.cpp)
 
 # will create a target called 'vclib-render-example-${EXAMPLE_NAME}'
 vclib_add_example(${EXAMPLE_NAME}
     VCLIB_MODULE render
-    SOURCES ${HEADERS} ${SOURCES})
+    SOURCES ${SOURCES})
diff --git a/examples/render/01-viewer/bgfx/qt/common.h b/examples/render/01-viewer/bgfx/qt/common.h
diff --git a/examples/render/01-viewer/bgfx/qt/main.cpp b/examples/render/01-viewer/bgfx/qt/main.cpp
@@ -20,7 +20,7 @@
  * (https://www.mozilla.org/en-US/MPL/2.0/) for more details.                *
  ****************************************************************************/
 
-#include "common.h"
+#include "get_drawable_mesh.h"
 
 #include <QApplication>
 #include <vclib/qt/viewer_widget.h>

diff --git a/examples/render/01-viewer/opengl2/glfw/CMakeLists.txt b/examples/render/01-viewer/opengl2/glfw/CMakeLists.txt
@@ -28,13 +28,10 @@ project(vclib-render-example-${EXAMPLE_NAME})
 ### Build settings
 set(CMAKE_CXX_STANDARD 20)
 
-set(HEADERS
-    common.h)
-
 set(SOURCES
     main.cpp)
 
 # will create a target called 'vclib-render-example-${EXAMPLE_NAME}'
 vclib_add_example(${EXAMPLE_NAME}
     VCLIB_MODULE render
-    SOURCES ${HEADERS} ${SOURCES})
+    SOURCES ${SOURCES})
diff --git a/examples/render/01-viewer/opengl2/glfw/common.h b/examples/render/01-viewer/opengl2/glfw/common.h
diff --git a/examples/render/01-viewer/opengl2/glfw/main.cpp b/examples/render/01-viewer/opengl2/glfw/main.cpp
@@ -20,7 +20,7 @@
  * (https://www.mozilla.org/en-US/MPL/2.0/) for more details.                *
  ****************************************************************************/
 
-#include "common.h"
+#include "get_drawable_mesh.h"
 
 #include <vclib/glfw/viewer_window.h>
 
@@ -31,6 +31,9 @@ int main(int argc, char** argv)
     // load and set up a drawable mesh
     vcl::DrawableMesh<vcl::TriMesh> drawable = getDrawableMesh();
 
+    drawable.color() = vcl::Color::Yellow;
+    drawable.updateBuffers();
+
     auto mrs = drawable.renderSettings();
     mrs.setSurfaceColorPerMesh();
     mrs.setSurfaceShadingFlat();

diff --git a/examples/render/01-viewer/opengl2/qt/CMakeLists.txt b/examples/render/01-viewer/opengl2/qt/CMakeLists.txt
@@ -28,13 +28,10 @@ project(vclib-render-example-${EXAMPLE_NAME})
 ### Build settings
 set(CMAKE_CXX_STANDARD 20)
 
-set(HEADERS
-    common.h)
-
 set(SOURCES
     main.cpp)
 
 # will create a target called 'vclib-render-example-${EXAMPLE_NAME}'
 vclib_add_example(${EXAMPLE_NAME}
     VCLIB_MODULE render
-    SOURCES ${HEADERS} ${SOURCES})
+    SOURCES ${SOURCES})
diff --git a/examples/render/01-viewer/opengl2/qt/common.h b/examples/render/01-viewer/opengl2/qt/common.h
diff --git a/examples/render/01-viewer/opengl2/qt/main.cpp b/examples/render/01-viewer/opengl2/qt/main.cpp
@@ -20,7 +20,7 @@
  * (https://www.mozilla.org/en-US/MPL/2.0/) for more details.                *
  ****************************************************************************/
 
-#include "common.h"
+#include "get_drawable_mesh.h"
 
 #include <QApplication>
 #include <vclib/qt/viewer_widget.h>

diff --git a/examples/render/910-viewer-imgui/CMakeLists.txt b/examples/render/910-viewer-imgui/CMakeLists.txt
@@ -28,13 +28,10 @@ project(vclib-render-example-${EXAMPLE_NAME})
 ### Build settings
 set(CMAKE_CXX_STANDARD 20)
 
-set(HEADERS
-    common.h)
-
 set(SOURCES
     main.cpp)
 
 # will create a target called 'vclib-render-example-${EXAMPLE_NAME}'
 vclib_add_example(${EXAMPLE_NAME}
     VCLIB_MODULE render
-    SOURCES ${HEADERS} ${SOURCES})
+    SOURCES ${SOURCES})
diff --git a/examples/render/910-viewer-imgui/common.h b/examples/render/910-viewer-imgui/common.h
diff --git a/examples/render/910-viewer-imgui/main.cpp b/examples/render/910-viewer-imgui/main.cpp
@@ -20,7 +20,7 @@
  * for more details.                                                         *
  ****************************************************************************/
 
-#include "common.h"
+#include "get_drawable_mesh.h"
 
 #include <vclib/glfw_imgui/viewer_window_imgui.h>
 #include <imgui.h>

diff --git a/examples/render/common/CMakeLists.txt b/examples/render/common/CMakeLists.txt
@@ -24,6 +24,7 @@ cmake_minimum_required(VERSION 3.24)
 project(common)
 
 set(HEADERS
+    get_drawable_mesh.h
     default_viewer.h)
 
 add_library(vclib-render-examples-common INTERFACE)

diff --git a/examples/render/01-viewer/bgfx/glfw/common.h → examples/render/common/get_drawable_mesh.h b/examples/render/01-viewer/bgfx/glfw/common.h → examples/render/common/get_drawable_mesh.h