gh-87: support ui loading from xml files with code behind auto binding (like in WPF)

Author: EgorOrachyov

.vscode/settings.json

@@ -101,6 +101,7 @@
         "**/*.asset": "yaml",
         "**/*.shader": "yaml",
         "**/*.scene": "yaml",
+        "**/*.style": "yaml",
         "*.moc": "cpp",
         "coroutine": "cpp",
         "resumable": "cpp",

CMakeLists.txt

@@ -81,15 +81,13 @@ function(wmoge_plugin name)
     if (NOT arg_SOURCES)
         message(FATAL_ERROR "[wmoge_game(${name})]: SOURCES is a required argument")
     endif()
-    if (NOT arg_DEPENDENCIES)
-        message(FATAL_ERROR "[wmoge_game(${name})]: DEPENDENCIES is a required argument")
-    endif()
+
     if (NOT arg_TYPE)
         set(arg_TYPE STATIC) 
     endif()
 
     add_library(${name} ${arg_TYPE} ${arg_SOURCES})
-    target_link_libraries(${name} PUBLIC ${arg_DEPENDENCIES})
+    target_link_libraries(${name} PUBLIC wmoge_engine ${arg_DEPENDENCIES})
     target_include_directories(${name} PUBLIC ${arg_INCLUDES})
     message(STATUS "Configure engine plugin '${name}' type ${arg_TYPE}")
 endfunction(wmoge_plugin name sources)
@@ -107,15 +105,12 @@ function(wmoge_game name)
     if (NOT arg_SOURCES)
         message(FATAL_ERROR "[wmoge_game(${name})]: SOURCES is a required argument")
     endif()
-    if (NOT arg_DEPENDENCIES)
-        message(FATAL_ERROR "[wmoge_game(${name})]: DEPENDENCIES is a required argument")
-    endif()
 
     set(EXE_GAME "game")
     set(EXE_EDITOR "editor")
 
     add_executable(${EXE_GAME} ${arg_SOURCES} ${arg_ICON_GAME})
-    target_link_libraries(${EXE_GAME} PRIVATE wmoge ${arg_DEPENDENCIES})
+    target_link_libraries(${EXE_GAME} PRIVATE wmoge_engine ${arg_DEPENDENCIES})
     target_include_directories(${EXE_GAME} PRIVATE ${arg_INCLUDES})
     target_compile_definitions(${EXE_GAME} PRIVATE WMOGE_BUILD_TYPE_GAME)
     message(STATUS "Configure ${name} game exe '${EXE_GAME}' type APPLICATION")

deps/imgui/imgui.cpp

@@ -1348,6 +1348,7 @@ ImGuiStyle::ImGuiStyle()
     FramePadding                = ImVec2(4,3);      // Padding within a framed rectangle (used by most widgets)
     FrameRounding               = 0.0f;             // Radius of frame corners rounding. Set to 0.0f to have rectangular frames (used by most widgets).
     FrameBorderSize             = 0.0f;             // Thickness of border around frames. Generally set to 0.0f or 1.0f. Other values not well tested.
+    MenuItemTabSize             = 0.0f;             // Tabbing of menu items (menu item and sub menu elements). Set to 0.0f to do no tab
     ItemSpacing                 = ImVec2(8,4);      // Horizontal and vertical spacing between widgets/lines
     ItemInnerSpacing            = ImVec2(4,4);      // Horizontal and vertical spacing between within elements of a composed widget (e.g. a slider and its label)
     CellPadding                 = ImVec2(4,2);      // Padding within a table cell. Cellpadding.x is locked for entire table. CellPadding.y may be altered between different rows.
@@ -3566,6 +3567,7 @@ const char* ImGui::GetStyleColorName(ImGuiCol idx)
     case ImGuiCol_TitleBgActive: return "TitleBgActive";
     case ImGuiCol_TitleBgCollapsed: return "TitleBgCollapsed";
     case ImGuiCol_MenuBarBg: return "MenuBarBg";
+    case ImGuiCol_MenuBarBorder: return "MenuBarBorder";
     case ImGuiCol_ScrollbarBg: return "ScrollbarBg";
     case ImGuiCol_ScrollbarGrab: return "ScrollbarGrab";
     case ImGuiCol_ScrollbarGrabHovered: return "ScrollbarGrabHovered";
@@ -5789,9 +5791,12 @@ static void ImGui::RenderDimmedBackgrounds()
         ImGuiViewport* viewport = window->Viewport;
         float distance = g.FontSize;
         ImRect bb = window->Rect();
-        bb.Expand(distance);
-        if (bb.GetWidth() >= viewport->Size.x && bb.GetHeight() >= viewport->Size.y)
-            bb.Expand(-distance - 1.0f); // If a window fits the entire viewport, adjust its highlight inward
+        
+        // EORACHEV: do not use expand, it looks wiered (like some thing is broken in calculating window size)
+        // bb.Expand(distance);
+        // if (bb.GetWidth() >= viewport->Size.x && bb.GetHeight() >= viewport->Size.y)
+        //    bb.Expand(-distance - 1.0f); // If a window fits the entire viewport, adjust its highlight inward
+        
         window->DrawList->ChannelsMerge();
         if (window->DrawList->CmdBuffer.Size == 0)
             window->DrawList->AddDrawCmd();
@@ -7130,7 +7135,7 @@ void ImGui::RenderWindowDecorations(ImGuiWindow* window, const ImRect& title_bar
             menu_bar_rect.ClipWith(window->Rect());  // Soft clipping, in particular child window don't have minimum size covering the menu bar so this is useful for them.
             window->DrawList->AddRectFilled(menu_bar_rect.Min + ImVec2(window_border_size, 0), menu_bar_rect.Max - ImVec2(window_border_size, 0), GetColorU32(ImGuiCol_MenuBarBg), (flags & ImGuiWindowFlags_NoTitleBar) ? window_rounding : 0.0f, ImDrawFlags_RoundCornersTop);
             if (style.FrameBorderSize > 0.0f && menu_bar_rect.Max.y < window->Pos.y + window->Size.y)
-                window->DrawList->AddLine(menu_bar_rect.GetBL(), menu_bar_rect.GetBR(), GetColorU32(ImGuiCol_Border), style.FrameBorderSize);
+                window->DrawList->AddLine(menu_bar_rect.GetBL(), menu_bar_rect.GetBR(), GetColorU32(ImGuiCol_MenuBarBorder), style.FrameBorderSize);
         }
 
         // Docking: Unhide tab bar (small triangle in the corner), drag from small triangle to quickly undock

deps/imgui/imgui.h

@@ -1701,6 +1701,7 @@ enum ImGuiCol_
     ImGuiCol_TitleBgActive,         // Title bar when focused
     ImGuiCol_TitleBgCollapsed,      // Title bar when collapsed
     ImGuiCol_MenuBarBg,
+    ImGuiCol_MenuBarBorder,
     ImGuiCol_ScrollbarBg,
     ImGuiCol_ScrollbarGrab,
     ImGuiCol_ScrollbarGrabHovered,
@@ -2224,6 +2225,7 @@ struct ImGuiStyle
     ImVec2      FramePadding;               // Padding within a framed rectangle (used by most widgets).
     float       FrameRounding;              // Radius of frame corners rounding. Set to 0.0f to have rectangular frame (used by most widgets).
     float       FrameBorderSize;            // Thickness of border around frames. Generally set to 0.0f or 1.0f. (Other values are not well tested and more CPU/GPU costly).
+    float       MenuItemTabSize;			// Tabbing of menu items (menu item and sub menu elements). Set to 0.0f to do no tab
     ImVec2      ItemSpacing;                // Horizontal and vertical spacing between widgets/lines.
     ImVec2      ItemInnerSpacing;           // Horizontal and vertical spacing between within elements of a composed widget (e.g. a slider and its label).
     ImVec2      CellPadding;                // Padding within a table cell. Cellpadding.x is locked for entire table. CellPadding.y may be altered between different rows.

deps/imgui/imgui_draw.cpp

@@ -4336,7 +4336,7 @@ void ImGui::RenderArrow(ImDrawList* draw_list, ImVec2 pos, ImU32 col, ImGuiDir d
 {
     const float h = draw_list->_Data->FontSize * 1.00f;
     float r = h * 0.40f * scale;
-    ImVec2 center = pos + ImVec2(h * 0.50f, h * 0.50f * scale);
+    ImVec2 center = pos + ImVec2(h * 0.50f, h * 0.50f);
 
     ImVec2 a, b, c;
     switch (dir)

deps/imgui/imgui_widgets.cpp

@@ -1342,7 +1342,7 @@ bool ImGui::RadioButton(const char* label, bool active)
     ImVec2 center = check_bb.GetCenter();
     center.x = IM_ROUND(center.x);
     center.y = IM_ROUND(center.y);
-    const float radius = (square_sz - 1.0f) * 0.5f;
+    const float radius = (square_sz - 1.0f) * 0.4f;
 
     bool hovered, held;
     bool pressed = ButtonBehavior(total_bb, id, &hovered, &held);
@@ -6807,7 +6807,7 @@ bool ImGui::TreeNodeBehavior(ImGuiID id, ImGuiTreeNodeFlags flags, const char* l
             if (flags & ImGuiTreeNodeFlags_Bullet)
                 RenderBullet(window->DrawList, ImVec2(text_pos.x - text_offset_x * 0.5f, text_pos.y + g.FontSize * 0.5f), text_col);
             else if (!is_leaf)
-                RenderArrow(window->DrawList, ImVec2(text_pos.x - text_offset_x + padding.x, text_pos.y + g.FontSize * 0.15f), text_col, is_open ? ((flags & ImGuiTreeNodeFlags_UpsideDownArrow) ? ImGuiDir_Up : ImGuiDir_Down) : ImGuiDir_Right, 0.70f);
+                RenderArrow(window->DrawList, ImVec2(text_pos.x - text_offset_x + padding.x, text_pos.y), text_col, is_open ? ((flags & ImGuiTreeNodeFlags_UpsideDownArrow) ? ImGuiDir_Up : ImGuiDir_Down) : ImGuiDir_Right, 0.70f);
             if (g.LogEnabled)
                 LogSetNextTextDecoration(">", NULL);
         }
@@ -8930,15 +8930,15 @@ bool ImGui::BeginMenuEx(const char* label, const char* icon, bool enabled)
         popup_pos = ImVec2(pos.x, pos.y - style.WindowPadding.y);
         float icon_w = (icon && icon[0]) ? CalcTextSize(icon, NULL).x : 0.0f;
         float checkmark_w = IM_TRUNC(g.FontSize * 1.20f);
-        float min_w = window->DC.MenuColumns.DeclColumns(icon_w, label_size.x, 0.0f, checkmark_w); // Feedback to next frame
+        float min_w = window->DC.MenuColumns.DeclColumns(icon_w, label_size.x + style.MenuItemTabSize, 0.0f, checkmark_w); // Feedback to next frame
         float extra_w = ImMax(0.0f, GetContentRegionAvail().x - min_w);
-        ImVec2 text_pos(window->DC.CursorPos.x + offsets->OffsetLabel, window->DC.CursorPos.y + window->DC.CurrLineTextBaseOffset);
+        ImVec2 text_pos(window->DC.CursorPos.x + offsets->OffsetLabel + style.MenuItemTabSize, window->DC.CursorPos.y + window->DC.CurrLineTextBaseOffset);
         pressed = Selectable("", menu_is_open, selectable_flags | ImGuiSelectableFlags_SpanAvailWidth, ImVec2(min_w, label_size.y));
         LogSetNextTextDecoration("", ">");
         RenderText(text_pos, label);
         if (icon_w > 0.0f)
             RenderText(pos + ImVec2(offsets->OffsetIcon, 0.0f), icon);
-        RenderArrow(window->DrawList, pos + ImVec2(offsets->OffsetMark + extra_w + g.FontSize * 0.30f, 0.0f), GetColorU32(ImGuiCol_Text), ImGuiDir_Right);
+        RenderArrow(window->DrawList, pos + ImVec2(offsets->OffsetMark + extra_w + g.FontSize * 0.30f, 0.0f), GetColorU32(ImGuiCol_Text), ImGuiDir_Right, 0.8f);
     }
     if (!enabled)
         EndDisabled();
@@ -9142,7 +9142,7 @@ bool ImGui::MenuItemEx(const char* label, const char* icon, const char* shortcut
         pressed = Selectable("", false, selectable_flags | ImGuiSelectableFlags_SpanAvailWidth, ImVec2(min_w, label_size.y));
         if (g.LastItemData.StatusFlags & ImGuiItemStatusFlags_Visible)
         {
-            RenderText(pos + ImVec2(offsets->OffsetLabel, 0.0f), label);
+            RenderText(pos + ImVec2(offsets->OffsetLabel + style.MenuItemTabSize, 0.0f), label);
             if (icon_w > 0.0f)
                 RenderText(pos + ImVec2(offsets->OffsetIcon, 0.0f), icon);
             if (shortcut_w > 0.0f)

editor/code/CMakeLists.txt

@@ -15,7 +15,7 @@ add_library(wmoge_editor_headers INTERFACE)
 target_include_directories(wmoge_editor_headers INTERFACE ${CMAKE_CURRENT_LIST_DIR}/)
 
 # engine library target link to editor library
-target_link_libraries(wmoge_editor PUBLIC wmoge)
+target_link_libraries(wmoge_editor PUBLIC wmoge_engine)
 
 # editor headers target link to editor library
 target_link_libraries(wmoge_editor PUBLIC wmoge_editor_headers)

editor/fonts/roboto_black.asset editor/fonts/roboto_black.ttf.asseteditor/fonts/roboto_black.asset renamed to editor/fonts/roboto_black.ttf.asset

@@ -8,5 +8,5 @@ description: "font"
 import_data:
   rtti: FreetypeImportData
   source_files: [{file: "editor/fonts/roboto_black.ttf"}]
-  height: 32
+  height: 38
   glyphs_in_row: 16

editor/fonts/roboto_black_italic.asset …itor/fonts/roboto_black_italic.ttf.asseteditor/fonts/roboto_black_italic.asset renamed to editor/fonts/roboto_black_italic.ttf.asset editor/fonts/roboto_black_italic.asset renamed to editor/fonts/roboto_black_italic.ttf.asset

@@ -8,5 +8,5 @@ description: "font"
 import_data:
   rtti: FreetypeImportData
   source_files: [{file: "editor/fonts/roboto_black_italic.ttf"}]
-  height: 32
+  height: 38
   glyphs_in_row: 16

editor/fonts/roboto_bold.asset editor/fonts/roboto_bold.ttf.asseteditor/fonts/roboto_bold.asset renamed to editor/fonts/roboto_bold.ttf.asset

@@ -8,5 +8,5 @@ description: "font"
 import_data:
   rtti: FreetypeImportData
   source_files: [{file: "editor/fonts/roboto_bold.ttf"}]
-  height: 32
+  height: 38
   glyphs_in_row: 16