Merge branch 'main' into update-gfx-pipeline

src/graphics/ui/elements/ModelViewer.cpp

@@ -1,3 +1,4 @@
+#include <array>
 #include <glm/ext.hpp>
 #include "ModelViewer.hpp"
 

src/graphics/ui/elements/SplitBox.cpp

@@ -1,5 +1,7 @@
 #include "SplitBox.hpp"
 
+#include "util/stack_vector.hpp"
+
 using namespace gui;
 
 SplitBox::SplitBox(GUI& gui, const glm::vec2& size, float splitPos, Orientation orientation)
@@ -28,18 +30,31 @@ void SplitBox::mouseMove(int x, int y) {
 void SplitBox::refresh() {
     Container::refresh();
 
-    if (nodes.empty()) {
+    util::stack_vector<UINode*, 2> visibleNodes;
+
+    for (const auto& node : nodes) {
+        if (!node->isVisible()) {
+            continue;
+        }
+        visibleNodes.push_back(node.get());
+        if (visibleNodes.full()) {
+            break;
+        }
+    }
+
+    if (visibleNodes.empty()) {
         return;
     }
+
     glm::vec2 size = getSize();
-    if (nodes.size() == 1) {
-        auto node = nodes.at(0);
+    if (visibleNodes.size() == 1) {
+        auto node = visibleNodes.at(0);
         node->setPos(glm::vec2());
         node->setSize(size);
         return;
     }
-    auto nodeA = nodes.at(0);
-    auto nodeB = nodes.at(1);
+    auto nodeA = visibleNodes.at(0);
+    auto nodeB = visibleNodes.at(1);
 
     float sepRadius = interval / 2.0f;
     

src/graphics/ui/gui_xml.cpp

@@ -372,7 +372,7 @@ static std::shared_ptr<UINode> read_split_box(
 static std::shared_ptr<UINode> read_model_viewer(
     UiXmlReader& reader, const xml::xmlelement& element
 ) {
-    auto model = element.attr("model", "").getText();
+    auto model = element.attr("src", "").getText();
     auto viewer = std::make_shared<ModelViewer>(
         reader.getGUI(), glm::vec2(), model
     );