diff --git a/include/Engine/Core/InputController.h b/include/Engine/Core/InputController.h index 513ff70a..0cad346f 100644 --- a/include/Engine/Core/InputController.h +++ b/include/Engine/Core/InputController.h @@ -18,7 +18,7 @@ public: virtual void Initialize() { EVENT_SUBSCRIBE_MEMBER( - _EInputCommand, &InputController::OnCommand); + m_EInputCommand, &InputController::OnCommand); } virtual bool OnCommand(const Events::InputCommand& e) { return false; } diff --git a/src/Engine/Core/ConfigFile.cpp b/src/Engine/Core/ConfigFile.cpp index 00ab4993..fbb03b14 100644 --- a/src/Engine/Core/ConfigFile.cpp +++ b/src/Engine/Core/ConfigFile.cpp @@ -27,6 +27,9 @@ ConfigFile::ConfigFile(std::string path) for (auto& topLevelNode : m_PTreeOverrides) { auto& mergedTopLevelNode = m_PTreeMerged.find(topLevelNode.first); for (auto& childOverrideNode : topLevelNode.second) { + //auto ttt = mergedTopLevelNode->second; + //auto ttt2 = childOverrideNode.first; + //auto ttt3 = childOverrideNode.second; mergedTopLevelNode->second.put_child(childOverrideNode.first, childOverrideNode.second); } } diff --git a/src/Tests/OctTreeTestGameClass.cpp b/src/Tests/OctTreeTestGameClass.cpp index 6b2e23bc..cb9ba9d6 100644 --- a/src/Tests/OctTreeTestGameClass.cpp +++ b/src/Tests/OctTreeTestGameClass.cpp @@ -15,7 +15,7 @@ Game::Game(int argc, char* argv[]) : someOctTree(AABB(-0.5f*worldSize, 0.5f*worl m_RenderQueueFactory = new RenderQueueFactory(); // Create the renderer - m_Renderer = new Renderer(); + m_Renderer = new Renderer(m_EventBroker); m_Renderer->SetFullscreen(m_Config->Get("Video.Fullscreen", false)); m_Renderer->SetVSYNC(m_Config->Get("Video.VSYNC", false)); m_Renderer->SetResolution(Rectangle(