AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00
Code Issues Projects Releases Wiki Activity

New code style refactor

Browse Source
This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
Runtime/Input/CInputGenerator.cpp
View File

@@ -2,43 +2,38 @@
#include "../CArchitectureMessage.hpp"
#include "../CArchitectureQueue.hpp"
namespace urde
{
namespace urde {
void CInputGenerator::Update(float dt, CArchitectureQueue& queue)
{
if (m_firstFrame)
{
m_firstFrame = false;
return;
void CInputGenerator::Update(float dt, CArchitectureQueue& queue) {
if (m_firstFrame) {
m_firstFrame = false;
return;
}
/* Keyboard/Mouse first */
CFinalInput kbInput = getFinalInput(0, dt);
bool kbUsed = false;
/* Dolphin controllers next */
for (int i = 0; i < 4; ++i) {
bool connected;
EStatusChange change = m_dolphinCb.getStatusChange(i, connected);
if (change != EStatusChange::NoChange)
queue.Push(MakeMsg::CreateControllerStatus(EArchMsgTarget::Game, i, connected));
if (connected) {
CFinalInput input = m_dolphinCb.getFinalInput(i, dt, m_leftDiv, m_rightDiv);
if (i == 0) /* Merge KB input with first controller */
{
input |= kbInput;
kbUsed = true;
}
queue.Push(MakeMsg::CreateUserInput(EArchMsgTarget::Game, input));
}
}
/* Keyboard/Mouse first */
CFinalInput kbInput = getFinalInput(0, dt);
bool kbUsed = false;
/* Dolphin controllers next */
for (int i=0 ; i<4 ; ++i)
{
bool connected;
EStatusChange change = m_dolphinCb.getStatusChange(i, connected);
if (change != EStatusChange::NoChange)
queue.Push(MakeMsg::CreateControllerStatus(EArchMsgTarget::Game, i, connected));
if (connected)
{
CFinalInput input = m_dolphinCb.getFinalInput(i, dt, m_leftDiv, m_rightDiv);
if (i == 0) /* Merge KB input with first controller */
{
input |= kbInput;
kbUsed = true;
}
queue.Push(MakeMsg::CreateUserInput(EArchMsgTarget::Game, input));
}
}
/* Send straight keyboard input if no first controller present */
if (!kbUsed)
queue.Push(MakeMsg::CreateUserInput(EArchMsgTarget::Game, kbInput));
/* Send straight keyboard input if no first controller present */
if (!kbUsed)
queue.Push(MakeMsg::CreateUserInput(EArchMsgTarget::Game, kbInput));
}
}
} // namespace urde