[render] remove useless distinctions between opengl and bgfx in some …

…examples
cnr-isti-vclab · Jan 8, 2025 · 2b8fd3e · 2b8fd3e
1 parent 3f7e7de
commit 2b8fd3e
Show file tree

Hide file tree

Showing 24 changed files with 20 additions and 422 deletions.
diff --git a/examples/render/01-viewer/CMakeLists.txt b/examples/render/01-viewer/CMakeLists.txt
@@ -22,9 +22,9 @@
 
 cmake_minimum_required(VERSION 3.24)
 
-if (VCLIB_RENDER_BACKEND STREQUAL "bgfx")
-    add_subdirectory(bgfx)
+if (TARGET vclib-3rd-qt)
+    add_subdirectory(qt)
 endif()
-if (VCLIB_RENDER_BACKEND STREQUAL "opengl2")
-    add_subdirectory(opengl2)
+if (TARGET vclib-3rd-glfw)
+    add_subdirectory(glfw)
 endif()
diff --git a/examples/render/01-viewer/bgfx/CMakeLists.txt b/examples/render/01-viewer/bgfx/CMakeLists.txt
diff --git a/examples/render/01-viewer/bgfx/qt/main.cpp b/examples/render/01-viewer/bgfx/qt/main.cpp
diff --git a/...render/01-viewer/bgfx/glfw/CMakeLists.txt → ...ples/render/01-viewer/glfw/CMakeLists.txt b/...render/01-viewer/bgfx/glfw/CMakeLists.txt → ...ples/render/01-viewer/glfw/CMakeLists.txt
diff --git a/examples/render/01-viewer/bgfx/glfw/main.cpp → examples/render/01-viewer/glfw/main.cpp b/examples/render/01-viewer/bgfx/glfw/main.cpp → examples/render/01-viewer/glfw/main.cpp
diff --git a/examples/render/01-viewer/opengl2/CMakeLists.txt b/examples/render/01-viewer/opengl2/CMakeLists.txt
diff --git a/examples/render/01-viewer/opengl2/glfw/CMakeLists.txt b/examples/render/01-viewer/opengl2/glfw/CMakeLists.txt
diff --git a/examples/render/01-viewer/opengl2/qt/CMakeLists.txt b/examples/render/01-viewer/opengl2/qt/CMakeLists.txt
diff --git a/examples/render/01-viewer/opengl2/qt/main.cpp b/examples/render/01-viewer/opengl2/qt/main.cpp
diff --git a/...s/render/01-viewer/bgfx/qt/CMakeLists.txt → examples/render/01-viewer/qt/CMakeLists.txt b/...s/render/01-viewer/bgfx/qt/CMakeLists.txt → examples/render/01-viewer/qt/CMakeLists.txt
diff --git a/...es/render/01-viewer/opengl2/glfw/main.cpp → examples/render/01-viewer/qt/main.cpp b/...es/render/01-viewer/opengl2/glfw/main.cpp → examples/render/01-viewer/qt/main.cpp
@@ -22,11 +22,14 @@
 
 #include "get_drawable_mesh.h"
 
-#include <vclib/glfw/viewer_window.h>
+#include <QApplication>
+#include <vclib/qt/viewer_widget.h>
 
 int main(int argc, char** argv)
 {
-    vcl::glfw::ViewerWindow tw("Viewer GLFW");
+    QApplication app(argc, argv);
+
+    vcl::qt::ViewerWidget tw("Viewer Qt");
 
     // load and set up a drawable mesh
     vcl::DrawableMesh<vcl::TriMesh> drawable = getDrawableMesh<vcl::TriMesh>();
@@ -47,5 +50,5 @@ int main(int argc, char** argv)
 
     tw.show();
 
-    return 0;
+    return app.exec();
 }
diff --git a/examples/render/02-mesh-viewer/CMakeLists.txt b/examples/render/02-mesh-viewer/CMakeLists.txt
@@ -22,9 +22,8 @@
 
 cmake_minimum_required(VERSION 3.24)
 
-if (VCLIB_RENDER_BACKEND STREQUAL "bgfx")
-    add_subdirectory(bgfx)
-endif()
-if (VCLIB_RENDER_BACKEND STREQUAL "opengl2")
-    add_subdirectory(opengl2)
+if (TARGET vclib-3rd-qt)
+    add_subdirectory(qt)
 endif()
+
+
diff --git a/examples/render/02-mesh-viewer/bgfx/CMakeLists.txt b/examples/render/02-mesh-viewer/bgfx/CMakeLists.txt
diff --git a/examples/render/02-mesh-viewer/opengl2/CMakeLists.txt b/examples/render/02-mesh-viewer/opengl2/CMakeLists.txt
diff --git a/examples/render/02-mesh-viewer/opengl2/qt/CMakeLists.txt b/examples/render/02-mesh-viewer/opengl2/qt/CMakeLists.txt