NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Camera' into Camera-Merge-buffer

This commit is contained in:
Dander7BD 2014-02-14 10:32:56 +01:00
parent 5eec9fdd75 76f0b712b1
commit de6c5a1185
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Code/Game/DanBiasGame/GameClientState/MainState.cpp
View File

@ -67,6 +67,8 @@ bool MainState::Init( NetworkClient* nwClient )
return true;
}
float mouseX, mouseY; // debug test
GameClientState::ClientState MainState::Update(float deltaTime, InputClass* KeyInput)
{
MouseInput mouseState;
@ -78,6 +80,9 @@ GameClientState::ClientState MainState::Update(float deltaTime, InputClass* KeyI
EventHandler::Instance().Update( mouseState );
mouseX = mouseState.x; // debug test
mouseY = mouseState.y; // debug test
return this->privData->nextState;
}
@ -92,6 +97,9 @@ bool MainState::Render()
Graphics::API::StartTextRender();
this->privData->guiElements.RenderText();
Graphics::API::RenderText( ::std::to_wstring(mouseX), Float2(0.2f, 0.5f), Float2(0.2f, 0.05f) ); // debug test
Graphics::API::RenderText( ::std::to_wstring(mouseY), Float2(0.5f, 0.5f), Float2(0.2f, 0.05f) ); // debug test
Graphics::API::EndFrame();
return true;
}