Fixed free cam viewport toggle bug

This commit is contained in:
2014-06-02 17:00:45 +02:00
parent 61fab09ceb
commit 27bfbd2025
+2 -4
View File
@@ -19,8 +19,6 @@ public:
GameFrame(Frame* parent, std::string name) GameFrame(Frame* parent, std::string name)
: Frame(parent, name) : Frame(parent, name)
{ {
EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &GameFrame::OnKeyUp);
m_World = std::make_shared<GameWorld>(EventBroker, ResourceManager); m_World = std::make_shared<GameWorld>(EventBroker, ResourceManager);
auto worldFrame = new WorldFrame(this, "GameWorldFrame", m_World); auto worldFrame = new WorldFrame(this, "GameWorldFrame", m_World);
{ {
@@ -36,7 +34,7 @@ public:
new PlayerHUD(vp2, "PlayerHUD", m_World, 2); new PlayerHUD(vp2, "PlayerHUD", m_World, 2);
m_FreeCamViewport = new Viewport(worldFrame, "ViewportFreeCam", m_World); m_FreeCamViewport = new Viewport(worldFrame, "ViewportFreeCam", m_World);
m_FreeCamViewport->Show(); m_FreeCamViewport->Hide();
} }
m_World->Initialize(); m_World->Initialize();
} }
@@ -49,7 +47,7 @@ private:
Viewport* vp2; Viewport* vp2;
Viewport* m_FreeCamViewport; Viewport* m_FreeCamViewport;
bool OnKeyUp(const Events::KeyUp &event) bool OnKeyUp(const Events::KeyUp &event) override
{ {
if (event.KeyCode == GLFW_KEY_1) if (event.KeyCode == GLFW_KEY_1)
{ {