drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[olympic/studio] Fix imguiutil.hpp name, add StudioContext::tctx

Browse Source
This commit is contained in:
Gary Talent 2024-01-19 00:15:28 -06:00
parent e367575974
commit 8a29c0952c
8 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/olympic/studio/applib/src/aboutpopup.cpp
View File

@ -4,7 +4,7 @@
#include <imgui.h> #include <imgui.h>
#include <studio/imguiuitl.hpp> #include <studio/imguiutil.hpp>
#include "aboutpopup.hpp" #include "aboutpopup.hpp"
namespace olympic { namespace olympic {

2
src/olympic/studio/applib/src/main.cpp
View File

@ -48,7 +48,7 @@ static ox::Error runApp(
turbine::setUpdateHandler(*ctx, updateHandler); turbine::setUpdateHandler(*ctx, updateHandler);
turbine::setKeyEventHandler(*ctx, keyEventHandler); turbine::setKeyEventHandler(*ctx, keyEventHandler);
turbine::setConstantRefresh(*ctx, false); turbine::setConstantRefresh(*ctx, false);
studio::StudioContext studioCtx; studio::StudioContext studioCtx(*ctx);
turbine::setApplicationData(*ctx, &studioCtx); turbine::setApplicationData(*ctx, &studioCtx);
StudioUI ui(*ctx, projectDataDir); StudioUI ui(*ctx, projectDataDir);
studioCtx.ui = &ui; studioCtx.ui = &ui;

2
src/olympic/studio/applib/src/newmenu.cpp
View File

@ -6,7 +6,7 @@
#include <imgui.h> #include <imgui.h>
#include <studio/imguiuitl.hpp> #include <studio/imguiutil.hpp>
#include "newmenu.hpp" #include "newmenu.hpp"

2
src/olympic/studio/applib/src/newproject.cpp
View File

@ -4,7 +4,7 @@
#include <imgui.h> #include <imgui.h>
#include <studio/imguiuitl.hpp> #include <studio/imguiutil.hpp>
#include <utility> #include <utility>
#include "filedialogmanager.hpp" #include "filedialogmanager.hpp"

4
src/olympic/studio/modlib/include/studio/context.hpp
View File

@ -6,6 +6,8 @@
#include <ox/event/signal.hpp> #include <ox/event/signal.hpp>
#include <turbine/context.hpp>
#include "project.hpp" #include "project.hpp"
namespace studio { namespace studio {
@ -13,6 +15,8 @@ namespace studio {
struct StudioContext { struct StudioContext {
class StudioUI *ui = nullptr; class StudioUI *ui = nullptr;
Project *project = nullptr; Project *project = nullptr;
turbine::Context &tctx;
inline explicit StudioContext(turbine::Context &pTctx) noexcept: tctx(pTctx) {}
}; };
} }

0
src/olympic/studio/modlib/include/studio/imguiuitl.hpp → src/olympic/studio/modlib/include/studio/imguiutil.hpp
View File

2
src/olympic/studio/modlib/include/studio/studio.hpp
View File

@ -7,7 +7,7 @@
#include <studio/context.hpp> #include <studio/context.hpp>
#include <studio/editor.hpp> #include <studio/editor.hpp>
#include <studio/filedialog.hpp> #include <studio/filedialog.hpp>
#include <studio/imguiuitl.hpp> #include <studio/imguiutil.hpp>
#include <studio/module.hpp> #include <studio/module.hpp>
#include <studio/itemmaker.hpp> #include <studio/itemmaker.hpp>
#include <studio/popup.hpp> #include <studio/popup.hpp>

2
src/olympic/studio/modlib/src/popup.cpp
View File

@ -2,7 +2,7 @@
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/ */
#include <studio/imguiuitl.hpp> #include <studio/imguiutil.hpp>
#include <studio/popup.hpp> #include <studio/popup.hpp>
namespace studio { namespace studio {