BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AndersTest misc small mergefixes

Browse Source
This commit is contained in:
verysecrethero
2015-12-15 13:48:14 +01:00
parent f9508657f5
commit 1910ab705b
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Core/InputController.h
+1 -1
View File
@@ -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; }
src/Engine/Core/ConfigFile.cpp
+3
View File
@@ -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);
}
}
src/Tests/OctTreeTestGameClass.cpp
+1 -1
View File
@@ -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<bool>("Video.Fullscreen", false));
m_Renderer->SetVSYNC(m_Config->Get<bool>("Video.VSYNC", false));
m_Renderer->SetResolution(Rectangle(