Persist Model Viewer view options across model switches; default Color by Bone Index Raw to off

Author: Jonathan-Greve

SourceFiles/ModelViewer/ModelViewer.cpp

@@ -60,9 +60,22 @@ void ActivateModelViewer(MapRenderer* mapRenderer)
     // Defer camera fit to first frame when viewport is properly set
     g_modelViewerState.needsCameraFit = true;
 
-    // Enable bone visualization by default in model viewer
-    g_animationState.visualization.showBones = true;
-    g_modelViewerState.options.showBones = true;
+    // Re-apply persistent model viewer visualization settings whenever a new model is loaded.
+    auto& vis = g_animationState.visualization;
+    const auto& options = g_modelViewerState.options;
+    vis.showMesh = options.showMesh;
+    vis.wireframeMode = options.showWireframe;
+    vis.meshAlpha = options.meshAlpha;
+    vis.showBones = options.showBones;
+    vis.jointRadius = options.boneRadius;
+    vis.lockRootPosition = options.lockRootPosition;
+    vis.colorByBoneIndex = options.colorByBoneIndex;
+    vis.showRawBoneIndex = options.showRawBoneIndex;
+
+    if (g_animationState.controller)
+    {
+        g_animationState.controller->SetLockRootPosition(vis.lockRootPosition);
+    }
 }
 
 void DeactivateModelViewer(MapRenderer* mapRenderer)

SourceFiles/ModelViewer/ModelViewer.h

@@ -38,6 +38,10 @@ struct ModelViewerOptions
     bool showWireframe = false;
     bool showBones = true;
     bool showBoneLabels = true;
+    float meshAlpha = 1.0f;
+    bool lockRootPosition = false;
+    bool colorByBoneIndex = false;
+    bool showRawBoneIndex = false; // Default to remapped skeleton bone indices.
 
     // Background color
     DirectX::XMFLOAT4 backgroundColor = { 0.1f, 0.1f, 0.15f, 1.0f };

SourceFiles/ModelViewer/ModelViewerPanel.cpp

@@ -130,6 +130,13 @@ void draw_model_viewer_panel(MapRenderer* mapRenderer, std::map<int, std::unique
     auto& options = state.options;
     auto& vis = g_animationState.visualization;
 
+    // Keep newly created animation controllers aligned with persisted model viewer settings.
+    if (g_animationState.controller &&
+        g_animationState.controller->IsRootPositionLocked() != vis.lockRootPosition)
+    {
+        g_animationState.controller->SetLockRootPosition(vis.lockRootPosition);
+    }
+
     // Sync bone info from animation state
     if (g_animationState.clip && g_animationState.clip->boneTracks.size() != state.bones.size())
     {
@@ -1042,7 +1049,10 @@ void draw_model_viewer_panel(MapRenderer* mapRenderer, std::map<int, std::unique
 
             // Mesh alpha
             ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-            ImGui::SliderFloat("##MeshAlpha", &vis.meshAlpha, 0.0f, 1.0f, "Mesh Alpha: %.2f");
+            if (ImGui::SliderFloat("##MeshAlpha", &vis.meshAlpha, 0.0f, 1.0f, "Mesh Alpha: %.2f"))
+            {
+                options.meshAlpha = vis.meshAlpha;
+            }
 
             // Lock root position option
             if (g_animationState.hasAnimation && g_animationState.controller)
@@ -1051,6 +1061,7 @@ void draw_model_viewer_panel(MapRenderer* mapRenderer, std::map<int, std::unique
                 if (ImGui::Checkbox("Lock Root Position", &lockRoot))
                 {
                     vis.lockRootPosition = lockRoot;
+                    options.lockRootPosition = lockRoot;
                     g_animationState.controller->SetLockRootPosition(lockRoot);
                 }
                 if (ImGui::IsItemHovered())
@@ -1064,7 +1075,10 @@ void draw_model_viewer_panel(MapRenderer* mapRenderer, std::map<int, std::unique
             ImGui::Spacing();
 
             // Debug: color by bone index
-            ImGui::Checkbox("Color by Bone Index", &vis.colorByBoneIndex);
+            if (ImGui::Checkbox("Color by Bone Index", &vis.colorByBoneIndex))
+            {
+                options.colorByBoneIndex = vis.colorByBoneIndex;
+            }
             if (ImGui::IsItemHovered())
             {
                 ImGui::SetTooltip("Color vertices by bone index.\nUseful for debugging bone assignments.");
@@ -1075,7 +1089,7 @@ void draw_model_viewer_panel(MapRenderer* mapRenderer, std::map<int, std::unique
                 ImGui::SameLine();
                 if (ImGui::Checkbox("Raw", &vis.showRawBoneIndex))
                 {
-                    // No rebuild needed, just changes shader mode
+                    options.showRawBoneIndex = vis.showRawBoneIndex;
                 }
                 if (ImGui::IsItemHovered())
                 {