[render] fix clang build error

cnr-isti-vclab · Jan 9, 2025 · 49a5784 · 49a5784
1 parent 4675a86
commit 49a5784
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 45 deletions.
diff --git a/tests/render/000-static-asserts/drawers.h b/tests/render/000-static-asserts/drawers.h
@@ -45,9 +45,6 @@
 #include <vclib/bgfx/drawers/text_drawer.h>
 #endif
 
-template<typename DR>
-using BlockEventDrawer = vcl::EventDrawer<DR, true>;
-
 #ifdef VCLIB_WITH_QT
 template<typename DR>
 using WMQ = vcl::qt::WidgetManager<DR>;
@@ -65,7 +62,7 @@ void drawersStaticAssertsWM()
 
     using RendererTypePD  = Renderer<WM, Canvas, PlainDrawer>;
     using RendererTypeED  = Renderer<WM, Canvas, EventDrawer>;
-    using RendererTypeBED = Renderer<WM, Canvas, BlockEventDrawer>;
+    using RendererTypeBED = Renderer<WM, Canvas, BlockerEventDrawer>;
     using RendererTypeVD  = Renderer<WM, Canvas, ViewerDrawer>;
 
     // PlainDrawer
@@ -166,70 +163,70 @@ void drawersStaticAssertsWM()
         !CanBlockEventDrawerConcept<EventDrawer<RendererTypeED>&&>,
         "EventDrawer&& does satisfy the CanBlockEventDrawerConcept");
 
-    // BlockEventDrawer
+    // BlockerEventDrawer
     static_assert(
-        DrawerConcept<BlockEventDrawer<RendererTypeBED>>,
-        "BlockEventDrawer does not satisfy the DrawerConcept");
+        DrawerConcept<BlockerEventDrawer<RendererTypeBED>>,
+        "BlockerEventDrawer does not satisfy the DrawerConcept");
     static_assert(
-        DrawerConcept<const BlockEventDrawer<RendererTypeBED>>,
-        "const BlockEventDrawer does not satisfy the DrawerConcept");
+        DrawerConcept<const BlockerEventDrawer<RendererTypeBED>>,
+        "const BlockerEventDrawer does not satisfy the DrawerConcept");
     static_assert(
-        DrawerConcept<BlockEventDrawer<RendererTypeBED>&>,
-        "BlockEventDrawer& does not satisfy the DrawerConcept");
+        DrawerConcept<BlockerEventDrawer<RendererTypeBED>&>,
+        "BlockerEventDrawer& does not satisfy the DrawerConcept");
     static_assert(
-        DrawerConcept<const BlockEventDrawer<RendererTypeBED>&>,
-        "const BlockEventDrawer& does not satisfy the DrawerConcept");
+        DrawerConcept<const BlockerEventDrawer<RendererTypeBED>&>,
+        "const BlockerEventDrawer& does not satisfy the DrawerConcept");
     static_assert(
-        DrawerConcept<BlockEventDrawer<RendererTypeBED>&&>,
-        "BlockEventDrawer&& does not satisfy the DrawerConcept");
+        DrawerConcept<BlockerEventDrawer<RendererTypeBED>&&>,
+        "BlockerEventDrawer&& does not satisfy the DrawerConcept");
 
     static_assert(
-        EventDrawerConcept<BlockEventDrawer<RendererTypeBED>>,
-        "BlockEventDrawer does not satisfy the EventDrawerConcept");
+        EventDrawerConcept<BlockerEventDrawer<RendererTypeBED>>,
+        "BlockerEventDrawer does not satisfy the EventDrawerConcept");
     static_assert(
-        EventDrawerConcept<const BlockEventDrawer<RendererTypeBED>>,
-        "const BlockEventDrawer does not satisfy the EventDrawerConcept");
+        EventDrawerConcept<const BlockerEventDrawer<RendererTypeBED>>,
+        "const BlockerEventDrawer does not satisfy the EventDrawerConcept");
     static_assert(
-        EventDrawerConcept<BlockEventDrawer<RendererTypeBED>&>,
-        "BlockEventDrawer& does not satisfy the EventDrawerConcept");
+        EventDrawerConcept<BlockerEventDrawer<RendererTypeBED>&>,
+        "BlockerEventDrawer& does not satisfy the EventDrawerConcept");
     static_assert(
-        EventDrawerConcept<const BlockEventDrawer<RendererTypeBED>&>,
+        EventDrawerConcept<const BlockerEventDrawer<RendererTypeBED>&>,
         "const BlockEventDrawer& does not satisfy the EventDrawerConcept");
     static_assert(
-        EventDrawerConcept<BlockEventDrawer<RendererTypeBED>&&>,
-        "BlockEventDrawer&& does not satisfy the EventDrawerConcept");
+        EventDrawerConcept<BlockerEventDrawer<RendererTypeBED>&&>,
+        "BlockerEventDrawer&& does not satisfy the EventDrawerConcept");
 
     static_assert(
-        !CantBlockEventDrawerConcept<BlockEventDrawer<RendererTypeBED>>,
-        "BlockEventDrawer does satisfy the CantBlockEventDrawerConcept");
+        !CantBlockEventDrawerConcept<BlockerEventDrawer<RendererTypeBED>>,
+        "BlockerEventDrawer does satisfy the CantBlockEventDrawerConcept");
     static_assert(
-        !CantBlockEventDrawerConcept<const BlockEventDrawer<RendererTypeBED>>,
-        "const BlockEventDrawer does satisfy the CantBlockEventDrawerConcept");
+        !CantBlockEventDrawerConcept<const BlockerEventDrawer<RendererTypeBED>>,
+        "const BlockerEventDrawer does satisfy the CantBlockEventDrawerConcept");
     static_assert(
-        !CantBlockEventDrawerConcept<BlockEventDrawer<RendererTypeBED>&>,
-        "BlockEventDrawer& does satisfy the CantBlockEventDrawerConcept");
+        !CantBlockEventDrawerConcept<BlockerEventDrawer<RendererTypeBED>&>,
+        "BlockerEventDrawer& does satisfy the CantBlockEventDrawerConcept");
     static_assert(
-        !CantBlockEventDrawerConcept<const BlockEventDrawer<RendererTypeBED>&>,
-        "const BlockEventDrawer& does satisfy the CantBlockEventDrawerConcept");
+        !CantBlockEventDrawerConcept<const BlockerEventDrawer<RendererTypeBED>&>,
+        "const BlockerEventDrawer& does satisfy the CantBlockEventDrawerConcept");
     static_assert(
-        !CantBlockEventDrawerConcept<BlockEventDrawer<RendererTypeBED>&&>,
-        "BlockEventDrawer&& does satisfy the CantBlockEventDrawerConcept");
+        !CantBlockEventDrawerConcept<BlockerEventDrawer<RendererTypeBED>&&>,
+        "BlockerEventDrawer&& does satisfy the CantBlockEventDrawerConcept");
 
     static_assert(
-        CanBlockEventDrawerConcept<BlockEventDrawer<RendererTypeBED>>,
-        "BlockEventDrawer does not satisfy the CanBlockEventDrawerConcept");
+        CanBlockEventDrawerConcept<BlockerEventDrawer<RendererTypeBED>>,
+        "BlockerEventDrawer does not satisfy the CanBlockEventDrawerConcept");
     static_assert(
-        CanBlockEventDrawerConcept<const BlockEventDrawer<RendererTypeBED>>,
-        "const BlockEventDrawer does not satisfy the CanBlockEventDrawerConcept");
+        CanBlockEventDrawerConcept<const BlockerEventDrawer<RendererTypeBED>>,
+        "const BlockerEventDrawer does not satisfy the CanBlockEventDrawerConcept");
     static_assert(
-        CanBlockEventDrawerConcept<BlockEventDrawer<RendererTypeBED>&>,
-        "BlockEventDrawer& does not satisfy the CanBlockEventDrawerConcept");
+        CanBlockEventDrawerConcept<BlockerEventDrawer<RendererTypeBED>&>,
+        "BlockerEventDrawer& does not satisfy the CanBlockEventDrawerConcept");
     static_assert(
-        CanBlockEventDrawerConcept<const BlockEventDrawer<RendererTypeBED>&>,
-        "const BlockEventDrawer& does not satisfy the CanBlockEventDrawerConcept");
+        CanBlockEventDrawerConcept<const BlockerEventDrawer<RendererTypeBED>&>,
+        "const BlockerEventDrawer& does not satisfy the CanBlockEventDrawerConcept");
     static_assert(
-        CanBlockEventDrawerConcept<BlockEventDrawer<RendererTypeBED>&&>,
-        "BlockEventDrawer&& does not satisfy the CanBlockEventDrawerConcept");
+        CanBlockEventDrawerConcept<BlockerEventDrawer<RendererTypeBED>&&>,
+        "BlockerEventDrawer&& does not satisfy the CanBlockEventDrawerConcept");
 
     // ViewerDrawer
     static_assert(

diff --git a/vclib/render/include/vclib/imgui/imgui_drawer.h b/vclib/render/include/vclib/imgui/imgui_drawer.h
@@ -41,7 +41,7 @@
 namespace vcl::imgui {
 
 template<typename DerivedRenderer>
-class ImGuiDrawer : public EventDrawer<DerivedRenderer, true>
+class ImGuiDrawer : public BlockerEventDrawer<DerivedRenderer>
 {
 protected:
     using DRT = DerivedRenderer;

diff --git a/vclib/render/include/vclib/render/drawers/event_drawer.h b/vclib/render/include/vclib/render/drawers/event_drawer.h
@@ -29,6 +29,8 @@
 
 namespace vcl {
 
+namespace detail {
+
 /**
  * @brief The EventDrawer class is a base class for all drawers that handle
  * events.
@@ -186,6 +188,14 @@ class EventDrawer<DerivedRenderer, true> : public PlainDrawer<DerivedRenderer>
     }
 };
 
+} // namespace detail
+
+template<typename DerivedRenderer>
+using EventDrawer = detail::EventDrawer<DerivedRenderer, false>;
+
+template<typename DerivedRenderer>
+using BlockerEventDrawer = detail::EventDrawer<DerivedRenderer, true>;
+
 } // namespace vcl
 
 #endif // EVENT_DRAWER_H