AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 13:44:56 +00:00
Code Issues Projects Releases Wiki Activity

ImGuiEngine updates & use ImGui stdlib functions

Browse Source
This commit is contained in:
Luke Street
2021-06-02 07:49:03 -04:00
parent 89f58beeb1
commit 281da0bfd4
6 changed files with 52 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
imgui/CMakeLists.txt
View File

@@ -4,6 +4,7 @@ add_library(imgui
../extern/imgui/imgui_draw.cpp
../extern/imgui/imgui_tables.cpp
../extern/imgui/imgui_widgets.cpp
../extern/imgui/misc/cpp/imgui_stdlib.cpp
ImGuiEngine.cpp
ImGuiEngine.hpp
NotoMono.cpp

31
imgui/ImGuiEngine.cpp
View File

@@ -34,6 +34,8 @@ static boo::ObjToken<boo::IGraphicsBufferD> UniformBuffer;
static std::array<boo::ObjToken<boo::IShaderDataBinding>, ImGuiUserTextureID_MAX> ShaderDataBindings;
static std::array<boo::ObjToken<boo::ITextureS>, ImGuiUserTextureID_MAX> Textures;
static boo::SWindowRect WindowRect;
static std::string IniFilePath;
static std::string LogFilePath;
struct Uniform {
zeus::CMatrix4f xf;
@@ -59,11 +61,16 @@ void setClipboardText(void* userData, const char* text) {
ImFont* ImGuiEngine::fontNormal;
ImFont* ImGuiEngine::fontLarge;
void ImGuiEngine::Initialize(boo::IGraphicsDataFactory* factory, boo::IWindow* window, float scale) {
void ImGuiEngine::Initialize(boo::IGraphicsDataFactory* factory, boo::IWindow* window, float scale,
std::string_view configDir) {
m_factory = factory;
m_window = window;
WindowRect = window->getWindowFrame();
std::string dir{configDir};
IniFilePath = dir + "/imgui.ini";
LogFilePath = dir + "/imgui.log";
ImGui::CreateContext();
ImGuiIO& io = ImGui::GetIO();
io.BackendFlags |= ImGuiBackendFlags_RendererHasVtxOffset;
@@ -71,6 +78,10 @@ void ImGuiEngine::Initialize(boo::IGraphicsDataFactory* factory, boo::IWindow* w
io.GetClipboardTextFn = getClipboardText;
io.SetClipboardTextFn = setClipboardText;
io.ClipboardUserData = window;
io.IniFilename = IniFilePath.c_str();
io.LogFilename = LogFilePath.c_str();
io.BackendPlatformName = "Boo";
io.BackendRendererName = "Boo";
io.KeyMap[ImGuiKey_Tab] = 256 + static_cast<int>(boo::ESpecialKey::Tab);
io.KeyMap[ImGuiKey_LeftArrow] = 256 + static_cast<int>(boo::ESpecialKey::Left);
@@ -150,6 +161,8 @@ void ImGuiEngine::Shutdown() {
IndexBuffer.reset();
UniformBuffer.reset();
ShaderPipeline.reset();
IniFilePath.clear();
LogFilePath.clear();
}
void ImGuiEngine::Begin(float dt, float scale) {
@@ -256,17 +269,21 @@ void ImGuiEngine::End() {
m_factory->commitTransaction([&](boo::IGraphicsDataFactory::Context& ctx) {
bool rebind = false;
if (drawData->TotalIdxCount > IndexBufferSize) {
Log.report(logvisor::Info, FMT_STRING(_SYS_STR("Resizing index buffer from {} to {}")), IndexBufferSize,
#if 0
Log.report(logvisor::Info, FMT_STRING(_SYS_STR("Resizing index buffer ({} < {})")), IndexBufferSize,
drawData->TotalIdxCount);
IndexBuffer = ctx.newDynamicBuffer(boo::BufferUse::Index, sizeof(ImDrawIdx), drawData->TotalIdxCount);
IndexBufferSize = drawData->TotalIdxCount;
#endif
IndexBufferSize = drawData->TotalIdxCount + 1000;
IndexBuffer = ctx.newDynamicBuffer(boo::BufferUse::Index, sizeof(ImDrawIdx), IndexBufferSize);
rebind = true;
}
if (drawData->TotalVtxCount > VertexBufferSize) {
Log.report(logvisor::Info, FMT_STRING(_SYS_STR("Resizing vertex buffer from {} to {}")), VertexBufferSize,
#if 0
Log.report(logvisor::Info, FMT_STRING(_SYS_STR("Resizing vertex buffer ({} < {})")), VertexBufferSize,
drawData->TotalVtxCount);
VertexBuffer = ctx.newDynamicBuffer(boo::BufferUse::Vertex, sizeof(ImDrawVert), drawData->TotalVtxCount);
VertexBufferSize = drawData->TotalVtxCount;
#endif
VertexBufferSize = drawData->TotalVtxCount + 1000;
VertexBuffer = ctx.newDynamicBuffer(boo::BufferUse::Vertex, sizeof(ImDrawVert), VertexBufferSize);
rebind = true;
}
if (rebind) {

6
imgui/ImGuiEngine.hpp
View File

@@ -1,6 +1,7 @@
#pragma once
#include "imgui.h"
#include "misc/cpp/imgui_stdlib.h"
#include <boo/IWindow.hpp>
#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
@@ -20,7 +21,8 @@ public:
static ImFont* fontNormal;
static ImFont* fontLarge;
static void Initialize(boo::IGraphicsDataFactory* factory, boo::IWindow* window, float scale);
static void Initialize(boo::IGraphicsDataFactory* factory, boo::IWindow* window, float scale,
std::string_view configDir);
static void Shutdown();
static void Begin(float dt, float scale);
@@ -45,6 +47,6 @@ struct ImGuiWindowCallback : boo::IWindowCallback {
void charKeyUp(unsigned long charCode, boo::EModifierKey mods) override;
void specialKeyDown(boo::ESpecialKey key, boo::EModifierKey mods, bool isRepeat) override;
void specialKeyUp(boo::ESpecialKey key, boo::EModifierKey mods) override;
void resized(const boo::SWindowRect &rect, bool sync) override;
void resized(const boo::SWindowRect& rect, bool sync) override;
};
} // namespace metaforce