[misc] multiple daily accumullated fixes for editor ui/ux and car simulation

Author: PanosK92

source/editor/ImGui/ImGui_Extension.h

@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 //= INCLUDES ======================
 #include <string>
-#include <variant>
+#include <cstring>
 #include <unordered_map>
 #include "Definitions.h"
 #include "Logging/Log.h"
@@ -198,18 +198,28 @@ namespace ImGuiSp
         );
     }
 
+    // self contained drag drop payload, paths are embedded directly so the
+    // payload survives any reallocation or refresh of the source asset list
     struct DragDropPayload
     {
-        using DataVariant = std::variant<const char*, uint64_t>;
-        DragDropPayload(const DragPayloadType type = DragPayloadType::Undefined, const DataVariant data = nullptr, const char* path_relative = nullptr)
+        static constexpr size_t max_path_length = 512;
+        DragPayloadType type                    = DragPayloadType::Undefined;
+        char path[max_path_length]              = {};
+        char path_relative[max_path_length]     = {};
+
+        void set_paths(const char* full, const char* relative)
         {
-            this->type          = type;
-            this->data          = data;
-            this->path_relative = path_relative;
+            path[0]          = '\0';
+            path_relative[0] = '\0';
+            if (full)
+            {
+                strncpy_s(path, max_path_length, full, _TRUNCATE);
+            }
+            if (relative)
+            {
+                strncpy_s(path_relative, max_path_length, relative, _TRUNCATE);
+            }
         }
-        DragPayloadType type;
-        DataVariant data;               // full/absolute path (for backward compatibility)
-        const char* path_relative;      // relative path
     };
 
     static void create_drag_drop_payload(const DragDropPayload& payload)
@@ -221,11 +231,12 @@ namespace ImGuiSp
     {
         if (ImGui::BeginDragDropTarget())
         {
-            if (const ImGuiPayload* payload_imgui = ImGui::AcceptDragDropPayload(GDragDropTypes[(int)type].data()))
+            const ImGuiPayload* payload_imgui = ImGui::AcceptDragDropPayload(GDragDropTypes[(int)type].data());
+            ImGui::EndDragDropTarget();
+            if (payload_imgui && payload_imgui->DataSize >= static_cast<int>(sizeof(DragDropPayload)))
             {
                 return static_cast<DragDropPayload*>(payload_imgui->Data);
             }
-            ImGui::EndDragDropTarget();
         }
 
         return nullptr;
@@ -306,14 +317,13 @@ namespace ImGuiSp
         // drop target
         if (auto payload = receive_drag_drop_payload(DragPayloadType::Texture))
         {
-            try
+            if (payload->path[0] != '\0')
             {
-                if (const auto tex = spartan::ResourceCache::Load<spartan::RHI_Texture>(std::get<const char*>(payload->data)).get())
+                if (const auto tex = spartan::ResourceCache::Load<spartan::RHI_Texture>(payload->path).get())
                 {
                     setter(tex);
                 }
             }
-            catch (const std::bad_variant_access& e) { SP_LOG_ERROR("%s", e.what()); }
         }
 
         return clicked_for_browse;

source/editor/Widgets/FileDialog.cpp

@@ -160,6 +160,7 @@ FileDialog::FileDialog(const bool standalone_window, const FileDialog_Type type,
     m_hover_animation                 = 0.0f;
     m_is_renaming                     = false;
     m_rename_request_focus            = false;
+    m_rename_select_pending           = false;
     m_rename_item_id                  = UINT32_MAX;
     m_context_menu_id                 = 0;
 }
@@ -291,6 +292,8 @@ void FileDialog::ShowOverwriteDialog(string* directory, string* file_path)
     ImGui::SetNextWindowSize(ImVec2(420, 0), ImGuiCond_Appearing);
     ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(16, 16));
     ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 8.0f);
+    // suppress the dim overlay that imgui draws behind modal popups so the rest of the editor stays visible
+    ImGui::PushStyleColor(ImGuiCol_ModalWindowDimBg, ImVec4(0, 0, 0, 0));
 
     if (ImGui::BeginPopupModal("##overwrite_dialog", nullptr, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar))
     {
@@ -337,6 +340,7 @@ void FileDialog::ShowOverwriteDialog(string* directory, string* file_path)
         ImGui::EndPopup();
     }
 
+    ImGui::PopStyleColor();
     ImGui::PopStyleVar(2);
 }
 
@@ -766,13 +770,17 @@ void FileDialog::RenderGridView()
 
         ImGui::PushID(static_cast<int>(i));
 
+        // wrap the whole cell in a group so the rename input text (if any) cannot
+        // become the trailing item that SameLine() snaps to, which would break tiling
+        ImGui::BeginGroup();
+
         ImVec2 screen_pos = ImGui::GetCursorScreenPos();
 
         // card dimensions
         ImVec2 card_min = screen_pos;
         ImVec2 card_max = ImVec2(screen_pos.x + item_width - 4, screen_pos.y + item_height - 4);
 
-        // invisible button for interaction - this is the only item we submit
+        // invisible button for interaction
         ImGui::InvisibleButton("##card", ImVec2(item_width - 4, item_height - 4));
         bool is_hovered  = ImGui::IsItemHovered();
         bool is_selected = (m_selected_item_id == item.GetId());
@@ -919,6 +927,8 @@ void FileDialog::RenderGridView()
         ItemClick(&item);
         ItemContextMenu(&item);
 
+        ImGui::EndGroup();
+
         ImGui::PopID();
 
         // layout: new row when columns are full
@@ -1170,9 +1180,8 @@ void FileDialog::ItemDrag(FileDialogItem* item)
         m_was_dragging = true;
         const auto set_payload = [this](const ImGuiSp::DragPayloadType type, const string& path_full, const string& path_relative)
         {
-            m_drag_drop_payload.type          = type;
-            m_drag_drop_payload.data          = path_full.c_str();
-            m_drag_drop_payload.path_relative = path_relative.c_str();
+            m_drag_drop_payload.type = type;
+            m_drag_drop_payload.set_paths(path_full.c_str(), path_relative.c_str());
             ImGuiSp::create_drag_drop_payload(m_drag_drop_payload);
         };
 
@@ -1227,10 +1236,11 @@ void FileDialog::ItemContextMenu(FileDialogItem* item)
 
         if (ImGui::MenuItem("Rename"))
         {
-            m_is_renaming          = true;
-            m_rename_request_focus = true;
-            m_rename_buffer        = item->GetLabel();
-            m_rename_item_id       = item->GetId();
+            m_is_renaming           = true;
+            m_rename_request_focus  = true;
+            m_rename_select_pending = true;
+            m_rename_buffer         = item->GetLabel();
+            m_rename_item_id        = item->GetId();
         }
 
         if (FileSystem::IsEngineLuaFile(item->GetPath()))
@@ -1288,10 +1298,11 @@ void FileDialog::DialogUpdateFromDirectory(const string& file_path)
 
     lock_guard<mutex> lock(m_mutex_items);
     m_items.clear();
-    m_selected_item_id     = UINT32_MAX;
-    m_is_renaming          = false;
-    m_rename_request_focus = false;
-    m_rename_item_id       = UINT32_MAX;
+    m_selected_item_id      = UINT32_MAX;
+    m_is_renaming           = false;
+    m_rename_request_focus  = false;
+    m_rename_select_pending = false;
+    m_rename_item_id        = UINT32_MAX;
 
     // directories first
     auto directories = FileSystem::GetDirectoriesInDirectory(file_path);
@@ -1420,8 +1431,32 @@ void FileDialog::RenameItemInline(FileDialogItem* item, float width)
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(4, 2));
     ImGui::SetNextItemWidth(width);
 
-    const ImGuiInputTextFlags flags = ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_AutoSelectAll;
-    const bool committed            = ImGui::InputText("##rename_inline", &m_rename_buffer, flags);
+    // on first activation, select only the stem (filename without the extension)
+    // so the user does not accidentally type over the dot extension
+    auto select_stem_callback = [](ImGuiInputTextCallbackData* data) -> int
+    {
+        bool* pending = static_cast<bool*>(data->UserData);
+        if (pending && *pending)
+        {
+            int stem_len = data->BufTextLen;
+            for (int i = data->BufTextLen - 1; i > 0; --i)
+            {
+                if (data->Buf[i] == '.')
+                {
+                    stem_len = i;
+                    break;
+                }
+            }
+            data->SelectionStart = 0;
+            data->SelectionEnd   = stem_len;
+            data->CursorPos      = stem_len;
+            *pending             = false;
+        }
+        return 0;
+    };
+
+    const ImGuiInputTextFlags flags = ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_CallbackAlways;
+    const bool committed            = ImGui::InputText("##rename_inline", &m_rename_buffer, flags, select_stem_callback, &m_rename_select_pending);
     const bool deactivated          = ImGui::IsItemDeactivated();
     const bool escape_pressed       = ImGui::IsKeyPressed(ImGuiKey_Escape);
 

source/editor/Widgets/FileDialog.h

@@ -190,6 +190,7 @@ class FileDialog
     // renaming
     bool m_is_renaming;
     bool m_rename_request_focus;
+    bool m_rename_select_pending;
     std::string m_rename_buffer;
     uint32_t m_rename_item_id;
 

source/editor/Widgets/MenuBar.cpp

@@ -89,6 +89,23 @@ namespace
             show_file_dialog = true;
         }
 
+        // save the current world to its existing path, falls back to the save-as dialog
+        // when there is no loaded world yet so the user can pick a destination
+        void SaveWorld()
+        {
+            const std::string& world_file_path = spartan::World::GetFilePath();
+            if (world_file_path.empty())
+            {
+                ShowWorldSaveDialog();
+                return;
+            }
+
+            spartan::ThreadPool::AddTask([world_file_path]()
+            {
+                spartan::World::SaveToFile(world_file_path);
+            });
+        }
+
         void ShowWorldLoadDialog()
         {
             file_dialog->SetOperation(FileDialog_Op_Load);
@@ -192,10 +209,10 @@ namespace
 
                 if (ImGui::MenuItem("Save", "Ctrl+S"))
                 {
-                    windows::ShowWorldSaveDialog();
+                    windows::SaveWorld();
                 }
 
-                if (ImGui::MenuItem("Save As...", "Ctrl+S"))
+                if (ImGui::MenuItem("Save As...", "Ctrl+Shift+S"))
                 {
                     windows::ShowWorldSaveDialog();
                 }
@@ -662,6 +679,24 @@ void MenuBar::Tick()
         {
             buttons_toolbar::toggle_paused();
         }
+
+        // world save shortcuts, gated on no text input so we don't hijack typing in fields
+        if (!ImGui::GetIO().WantTextInput)
+        {
+            const bool ctrl  = ImGui::GetIO().KeyCtrl;
+            const bool shift = ImGui::GetIO().KeyShift;
+            if (ctrl && ImGui::IsKeyPressed(ImGuiKey_S, false))
+            {
+                if (shift)
+                {
+                    windows::ShowWorldSaveDialog();
+                }
+                else
+                {
+                    windows::SaveWorld();
+                }
+            }
+        }
     }
 
     // menu bar

source/editor/Widgets/Properties.cpp

@@ -847,7 +847,10 @@ void Properties::ShowScript(spartan::Script* script) const
         // drag-drop support for lua files
         if (auto* payload = ImGuiSp::receive_drag_drop_payload(ImGuiSp::DragPayloadType::Lua))
         {
-            script->LoadScriptFile(std::get<const char*>(payload->data));
+            if (payload->path[0] != '\0')
+            {
+                script->LoadScriptFile(payload->path);
+            }
         }
 
         // status
@@ -1319,7 +1322,10 @@ void Properties::ShowRender(spartan::Render* renderable) const
             // drag drop for material
             if (auto payload = ImGuiSp::receive_drag_drop_payload(ImGuiSp::DragPayloadType::Material))
             {
-                renderable->SetMaterial(std::get<const char*>(payload->data));
+                if (payload->path[0] != '\0')
+                {
+                    renderable->SetMaterial(payload->path);
+                }
             }
 
             // browse
@@ -1561,7 +1567,8 @@ void Properties::ShowMaterial(Material* material, Render* renderable) const
         return;
     }
 
-    if (component_begin("Material", design::accent_material(), nullptr, false))
+    const bool default_open = renderable == nullptr;
+    if (component_begin("Material", design::accent_material(), nullptr, false, true, default_open))
     {
         // when shown with a renderable, uv edits go to the renderable's override, not the material asset,
         // so multiple renderables sharing this material can each have their own uv tweak
@@ -2565,7 +2572,10 @@ void Properties::ShowAudioSource(spartan::AudioSource* audio_source) const
 
         if (auto payload = ImGuiSp::receive_drag_drop_payload(ImGuiSp::DragPayloadType::Audio))
         {
-            audio_source->SetAudioClip(std::get<const char*>(payload->data));
+            if (payload->path[0] != '\0')
+            {
+                audio_source->SetAudioClip(payload->path);
+            }
         }
 
         layout::separator();