FIX improve aspectRatio hack so that it's set in reload

Author: kikonen

src/registry/NodeRegistry.cpp

@@ -228,8 +228,8 @@ void NodeRegistry::prepare(
 
     {
         m_layerInfos.resize(assets.layers.size());
-        for (auto& layerInfo : m_layerInfos) {
-            layerInfo = { glm::uvec2{0}, false };
+        for (int index = 0; auto& layerInfo : m_layerInfos) {
+            layerInfo = { index++, glm::uvec2{1, 1} };
         }
     }
 
@@ -256,8 +256,6 @@ void NodeRegistry::updateWT(const UpdateContext& ctx)
             state.updateRootMatrix();
         }
 
-        const auto layerCount = m_layerInfos.size();
-
         //std::lock_guard lock(m_lock);
         // NOTE KI nodes are in DAG order
         for (int sortedIndex = ID_NODE_INDEX + 1; sortedIndex < m_sortedNodes.size(); sortedIndex++)
@@ -274,13 +272,6 @@ void NodeRegistry::updateWT(const UpdateContext& ctx)
             const auto& parentState = m_states[m_parentIndeces[entityIndex]];
             auto* generator = node->m_generator.get();
 
-            if (node->m_layer < layerCount) {
-                const auto& layerInfo = m_layerInfos[node->m_layer];
-                if (layerInfo.second) {
-                    state.setAspectRatio(layerInfo.first);
-                }
-            }
-
             state.updateModelMatrix(parentState);
 
             if (generator) {
@@ -299,10 +290,6 @@ void NodeRegistry::updateWT(const UpdateContext& ctx)
             }
         }
     }
-
-    for (auto& layerInfo : m_layerInfos) {
-        layerInfo.second = false;
-    }
 }
 
 void NodeRegistry::postUpdateWT(const UpdateContext& ctx)
@@ -1027,6 +1014,10 @@ void NodeRegistry::bindNode(
         m_parentIndeces[entityIndex] = 0;
         m_states[entityIndex] = state;
 
+        if (node->m_layer < m_layerInfos.size()) {
+            m_states[entityIndex].setAspectRatio(m_layerInfos[node->m_layer].m_aspectRatio);
+        }
+
         m_nodeLevel++;
 
         if (nodeHandle == m_rootHandle) {
@@ -1284,10 +1275,19 @@ void NodeRegistry::viewportChanged(
     if (layer >= m_layerInfos.size()) return;
 
     auto& info = m_layerInfos[layer];
-    if (info.first != aspectRatio)
+    info.m_aspectRatio = aspectRatio;
+
+    for (int sortedIndex = ID_NODE_INDEX + 1; sortedIndex < m_sortedNodes.size(); sortedIndex++)
     {
-        info.first = aspectRatio;
-        info.second = true;
+        auto entityIndex = m_sortedNodes[sortedIndex];
+        auto& state = m_states[entityIndex];
+
+        auto* node = getCachedNodesWT()[entityIndex];
+        if (!node) continue;
+
+        if (node->m_layer == info.m_index) {
+            state.setAspectRatio(info.m_aspectRatio);
+        }
     }
 }
 

src/registry/NodeRegistry.h

@@ -43,6 +43,12 @@ namespace mesh
     class MeshYype;
 }
 
+struct NodeLayerInfo
+{
+    int m_index;
+    glm::uvec2 m_aspectRatio;
+};
+
 class NodeRegistry final
 {
     friend class model::Node;
@@ -329,5 +335,5 @@ class NodeRegistry final
 
     pool::NodeHandle m_activeNode{};
 
-    std::vector<std::pair<glm::uvec2, bool>> m_layerInfos;
+    std::vector<NodeLayerInfo> m_layerInfos;
 };

src/scene/Scene.cpp

@@ -152,7 +152,7 @@ void Scene::prepareRT()
         event::Type::scene_loaded,
         dispatcherView,
         [this](const event::Event& e) {
-            m_loaded = true;
+            handleLoaded();
         });
 
     m_listen_node_added.listen(
@@ -488,6 +488,25 @@ void Scene::updateViewRT(const UpdateViewContext& ctx)
     }
 }
 
+void Scene::handleLoaded()
+{
+    m_loaded = true;
+
+    //const auto& spec = m_uiRenderer->m_buffer->m_spec;
+    //const glm::uvec2 aspectRatio = { spec.width, spec.height };
+    //m_uiRenderer->m_aspectRatio = aspectRatio;
+
+    //const auto* layer = LayerInfo::findLayer(LAYER_UI);
+    //if (layer && layer->m_enabled) {
+    //    event::Event evt{ event::Type::viewport_changed };
+    //    auto& body = evt.body.view = {
+    //        .layer = layer->m_index,
+    //        .aspectRatio = aspectRatio,
+    //    };
+    //    m_engine.getRegistry()->m_dispatcherWorker->send(evt);
+    //}
+}
+
 void Scene::handleNodeAdded(model::Node* node)
 {
     if (!node) return;

src/scene/Scene.h

@@ -125,6 +125,8 @@ class Scene final
         const render::RenderContext& ctx,
         LayerRenderer* layerRenderer);
 
+    void handleLoaded();
+
     void handleNodeAdded(model::Node* node);
     void handleNodeRemoved(model::Node* node);