Fixed an issue where TextCoords weren't properly updating when set th…

…rough a conditional template path (Uninteractable, Hovered, Clicked... etc) FIxed an issue where NineSliceCoords would not be set additively from conditional template paths
novusengine · Sep 17, 2024 · a958dc7 · a958dc7
1 parent 16759a1
commit a958dc7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/Source/Game-Lib/Game-Lib/ECS/Systems/UI/UpdateBoundingRects.cpp b/Source/Game-Lib/Game-Lib/ECS/Systems/UI/UpdateBoundingRects.cpp
@@ -11,8 +11,6 @@ namespace ECS::Systems::UI
 {
     void UpdateBoundingRects::Update(entt::registry& registry, f32 deltaTime)
     {
-        registry.clear<Components::UI::DirtyWidgetTransform>();
-
         auto& transform2DSystem = ECS::Transform2DSystem::Get(registry);
 
         // Dirty transforms

diff --git a/Source/Game-Lib/Game-Lib/ECS/Util/UIUtil.cpp b/Source/Game-Lib/Game-Lib/ECS/Util/UIUtil.cpp
@@ -326,6 +326,11 @@ namespace ECS::Util
 
                 panelTemplateComp = panelTemplate;
 
+                if (panelTemplateComp.setFlags.texCoords)
+                {
+                    registry->get_or_emplace<ECS::Components::UI::DirtyWidgetTransform>(entity);
+                }
+
                 registry->get_or_emplace<ECS::Components::UI::DirtyWidgetData>(entity);
             }
             else if (widget.type == ECS::Components::UI::WidgetType::Text)
@@ -379,6 +384,11 @@ namespace ECS::Util
                 if (panelTemplate.setFlags.texCoords)
                 {
                     panelTemplateComp.texCoords = panelTemplate.texCoords;
+                    registry->get_or_emplace<ECS::Components::UI::DirtyWidgetTransform>(entity);
+                }
+                if (panelTemplate.setFlags.nineSliceCoords)
+                {
+                    panelTemplateComp.nineSliceCoords = panelTemplate.nineSliceCoords;
                 }
 
                 registry->get_or_emplace<ECS::Components::UI::DirtyWidgetData>(entity);

diff --git a/Source/Game-Lib/Game-Lib/Rendering/Canvas/CanvasRenderer.cpp b/Source/Game-Lib/Game-Lib/Rendering/Canvas/CanvasRenderer.cpp
@@ -44,6 +44,18 @@ void CanvasRenderer::Update(f32 deltaTime)
     entt::registry* registry = ServiceLocator::GetEnttRegistries()->uiRegistry;
     ECS::Singletons::UISingleton& uiSingleton = registry->ctx().get<ECS::Singletons::UISingleton>();
 
+    // Dirty widget flags
+    registry->view<Widget, EventInputInfo, DirtyWidgetFlags>().each([&](entt::entity entity, Widget& widget, EventInputInfo& eventInputInfo)
+    {
+        bool wasInteractable = eventInputInfo.isInteractable;
+        eventInputInfo.isInteractable = (widget.flags & WidgetFlags::Interactable) == WidgetFlags::Interactable;
+
+        if (wasInteractable != eventInputInfo.isInteractable)
+        {
+            ECS::Util::UI::RefreshTemplate(registry, entity, eventInputInfo);
+        }
+    });
+
     // Dirty transforms
     registry->view<DirtyWidgetTransform>().each([&](entt::entity entity)
     {
@@ -70,18 +82,7 @@ void CanvasRenderer::Update(f32 deltaTime)
             UpdateTextVertices(transform, text, textTemplate);
         }
     });
-
-    // Dirty widget flags
-    registry->view<Widget, EventInputInfo, DirtyWidgetFlags>().each([&](entt::entity entity, Widget& widget, EventInputInfo& eventInputInfo)
-    {
-        bool wasInteractable = eventInputInfo.isInteractable;
-        eventInputInfo.isInteractable = (widget.flags & WidgetFlags::Interactable) == WidgetFlags::Interactable;
-
-        if (wasInteractable != eventInputInfo.isInteractable)
-        {
-            ECS::Util::UI::RefreshTemplate(registry, entity, eventInputInfo);
-        }
-    });
+    registry->clear<DirtyWidgetTransform>();
 
     // Dirty widget datas
     registry->view<DirtyWidgetData>().each([&](entt::entity entity)