Skip to content

Commit

Permalink
Move to imgui submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
apache-hb committed Aug 1, 2024
1 parent 44898e9 commit 5643b46
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 171 deletions.
7 changes: 7 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,10 @@
[submodule "data/doxygen-awesome-css"]
path = data/doxygen-awesome-css
url = https://github.com/jothepro/doxygen-awesome-css
[submodule "src/frontend/gui/vendor/imgui"]
path = src/frontend/gui/vendor/imgui
url = https://github.com/apache-hb/imgui
branch = docking
[submodule "src/frontend/gui/vendor/implot"]
path = src/frontend/gui/vendor/implot
url = https://github.com/epezent/implot
2 changes: 1 addition & 1 deletion src/frontend/gui/editor/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@ int main(int argc, const char **argv)

while (draw::begin_frame())
{
ImGui::DockSpaceOverViewport(ImGui::GetMainViewport());
ImGui::DockSpaceOverViewport();
DrawMainMenuBar("Cthulhu");
DrawEditorWidgets();
draw::end_frame();
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/gui/editor/src/stdafx.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// dear imgui + widgets
#include "imgui.h"
#include "imgui_internal.h"
#include "imgui_stdlib.h"
#include "imgui/misc/cpp/imgui_stdlib.h"
#include "implot.h"
#include "imfilebrowser.h"
#include "imgui_memory_editor.h"
Expand Down
18 changes: 18 additions & 0 deletions src/frontend/gui/vendor/ctuconfig.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#pragma once

#include "base/panic.h"

#define IM_ASSERT(EXPR) CTASSERT(EXPR)

#if CTU_PARANOID
# define IMGUI_DEBUG_PARANOID
#endif

#if CTU_STB_SPRINTF
# define IMGUI_USE_STB_SPRINTF
# define IMGUI_DISABLE_STB_SPRINTF_IMPLEMENTATION
#endif

#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
#define IMGUI_DISABLE_OBSOLETE_KEYIO
#define IMGUI_DEFINE_MATH_OPERATORS
2 changes: 1 addition & 1 deletion src/frontend/gui/vendor/imfilebrowser/imfilebrowser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ void ImGui::FileBrowser::Display()
const bool selected = selectedFilenames_.find(rsc.name)
!= selectedFilenames_.end();
if(Selectable(rsc.showName.c_str(), selected,
ImGuiSelectableFlags_DontClosePopups))
ImGuiSelectableFlags_NoAutoClosePopups))
{
const bool wantDir = flags_ & ImGuiFileBrowserFlags_SelectDirectory;
const bool canSelect = rsc.name != ".." && rsc.isDir == wantDir;
Expand Down
1 change: 1 addition & 0 deletions src/frontend/gui/vendor/imgui
Submodule imgui added at f157b5
1 change: 1 addition & 0 deletions src/frontend/gui/vendor/implot
Submodule implot added at f15659
11 changes: 0 additions & 11 deletions subprojects/imgui.wrap

This file was deleted.

12 changes: 0 additions & 12 deletions subprojects/implot.wrap

This file was deleted.

126 changes: 0 additions & 126 deletions subprojects/packagefiles/imgui/meson.build

This file was deleted.

19 changes: 0 additions & 19 deletions subprojects/packagefiles/imgui/meson_options.txt

This file was deleted.

Empty file.

0 comments on commit 5643b46

Please sign in to comment.