benkyd/Aeon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

maybe if the engine was the master of layers

Browse Source
This commit is contained in:
Ben
2021-09-27 14:53:37 +01:00
parent 0a4bf9f3e8
commit 1b494f45e0
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aeon/Aeon.cpp
View File

@@ -56,6 +56,8 @@ void App::Run()
mDisplay.EndFrame();
}
mDisplay.Destroy();
}
const Display& App::GetDisplay()
@@ -65,6 +67,8 @@ const Display& App::GetDisplay()
void App::PushLayer( GameLayer* layer )
{
mGameLayers.push_back( layer );
}

2
Aeon/Aeon.hpp
View File

@@ -23,6 +23,8 @@ public:
const Display& GetDisplay();
// Layers, once assigned, until poped are assumed to
// never change their spot in the layer hierarchy
void PushLayer( GameLayer* layer );
void PushTopLayer( GameLayer* layer );
void PushDebugLayer( GameLayer* layer );

4
Aeon/Core/Events.cpp
View File

@@ -28,10 +28,6 @@ void EventListener::DeRegisterAsSink( std::string system )
}
void EventListener::UpdateLayer( int layer )
{
}
EventDispatcher::EventDispatcher()

7
Aeon/Core/Events.hpp
View File

@@ -82,10 +82,11 @@ public:
EventListener();
virtual ~EventListener();
void RegisterAsSink( std::string system, int layer = 0 );
void DeRegisterAsSink( std::string system );
void PushRegisterAsSink( std::string system );
void PushStickyRegisterAsSink( std::string system );
void EmplaceRegisterAsSink( std::string system );
void UpdateLayer( int layer );
void DeRegisterAsSink( std::string system );
// return true = event handled
virtual bool EventRecieved( GenericEvent& e ) = 0;

2
Aeon/ThirdParty/ImGui/imgui.cpp vendored
View File

@@ -7280,7 +7280,7 @@ static void ImGui::ErrorCheckEndFrameSanityChecks()
// We silently accommodate for this case by ignoring/ the case where all io.KeyXXX modifiers were released (aka key_mod_flags == 0),
// while still correctly asserting on mid-frame key press events.
const ImGuiKeyModFlags key_mod_flags = GetMergedKeyModFlags();
//IM_ASSERT((key_mod_flags == 0 || g.IO.KeyMods == key_mod_flags) && "Mismatching io.KeyCtrl/io.KeyShift/io.KeyAlt/io.KeySuper vs io.KeyMods");
// IM_ASSERT((key_mod_flags == 0 || g.IO.KeyMods == key_mod_flags) && "Mismatching io.KeyCtrl/io.KeyShift/io.KeyAlt/io.KeySuper vs io.KeyMods");
IM_UNUSED(key_mod_flags);
// Recover from errors

2
Game/ExampleGame.cpp
View File

@@ -81,7 +81,7 @@ public:
Level* level = new Level;
TopLevel* topLevel = new TopLevel;
PushLayer( (Aeon::Core::GameLayer*)level );
PushDebugLayer( (Aeon::Core::GameLayer*)topLevel );
PushLayer( (Aeon::Core::GameLayer*)topLevel );
Run();
delete level;
}