diff options
Diffstat (limited to 'source/gameengine/GamePlayer/common')
5 files changed, 25 insertions, 25 deletions
diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp index 2b355407d46..1ab64c592a4 100644 --- a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp +++ b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp @@ -43,7 +43,7 @@ GPC_Canvas::GPC_Canvas( int width, int height -) : +) : m_width(width), m_height(height) { @@ -88,13 +88,13 @@ void GPC_Canvas::SetViewPort(int x1, int y1, int x2, int y2) the width,height is calculated including both pixels therefore: max - min + 1 */ - + /* XXX, nasty, this needs to go somewhere else, * but where... definitely need to clean up this * whole canvas/rendertools mess. */ glEnable(GL_SCISSOR_TEST); - + m_viewport[0] = x1; m_viewport[1] = y1; m_viewport[2] = x2-x1 + 1; diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.h b/source/gameengine/GamePlayer/common/GPC_Canvas.h index 688ed8ac0f4..615e3eaaf9e 100644 --- a/source/gameengine/GamePlayer/common/GPC_Canvas.h +++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h @@ -74,20 +74,20 @@ public: /** * \section Methods inherited from abstract base class RAS_ICanvas. */ - - int + + int GetWidth( ) const { return m_width; } - - int + + int GetHeight( ) const { return m_height; } - const + const RAS_Rect & GetDisplayArea( ) const { @@ -100,24 +100,24 @@ public: ) { m_displayarea= *rect; }; - + RAS_Rect & GetWindowArea( ) { return m_displayarea; } - void + void BeginFrame( ) {}; /** * Draws overlay banners and progress bars. */ - void + void EndFrame( ) {}; - + void SetViewPort(int x1, int y1, int x2, int y2); void UpdateViewPort(int x1, int y1, int x2, int y2); const int *GetViewPort(); @@ -128,7 +128,7 @@ public: * \section Methods inherited from abstract base class RAS_ICanvas. * Semantics are not yet honored. */ - + void SetMouseState(RAS_MouseState mousestate) { // not yet diff --git a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp index 0821d1d3b23..a48540e2bdb 100644 --- a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp +++ b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp @@ -34,7 +34,7 @@ #include <cstdlib> -/** +/** * NextFrame toggles currentTable with previousTable, * and copies relevant event information from previous to current table * (pressed keys need to be remembered). @@ -60,7 +60,7 @@ void GPC_KeyboardDevice::NextFrame() -/** +/** * ConvertBPEvent translates Windows keyboard events into ketsji kbd events. * Extra event information is stored, like ramp-mode (just released/pressed) */ @@ -100,7 +100,7 @@ bool GPC_KeyboardDevice::ConvertEvent(int incode, int val, unsigned int unicode) m_eventStatusTables[m_currentTable][kxevent].m_status = SCA_InputEvent::KX_JUSTACTIVATED; } } - + } else { diff --git a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h index d9842a42e0a..dc517b6ec25 100644 --- a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h +++ b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h @@ -76,14 +76,14 @@ public: } virtual void NextFrame(); - + virtual KX_EnumInputs ToNative(int incode) { return m_reverseKeyTranslateTable[incode]; } virtual bool ConvertEvent(int incode, int val, unsigned int unicode); - + virtual void HookEscape(); }; diff --git a/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp b/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp index 94045d532af..df388d4f5db 100644 --- a/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp +++ b/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp @@ -47,13 +47,13 @@ GPC_MouseDevice::~GPC_MouseDevice() bool GPC_MouseDevice::IsPressed(SCA_IInputDevice::KX_EnumInputs inputcode) { const SCA_InputEvent & inevent = m_eventStatusTables[m_currentTable][inputcode]; - bool pressed = (inevent.m_status == SCA_InputEvent::KX_JUSTACTIVATED || + bool pressed = (inevent.m_status == SCA_InputEvent::KX_JUSTACTIVATED || inevent.m_status == SCA_InputEvent::KX_ACTIVE); return pressed; } -/** +/** * NextFrame toggles currentTable with previousTable, * and copies relevant event information from previous to current table * (pressed keys need to be remembered). @@ -61,7 +61,7 @@ bool GPC_MouseDevice::IsPressed(SCA_IInputDevice::KX_EnumInputs inputcode) void GPC_MouseDevice::NextFrame() { SCA_IInputDevice::NextFrame(); - + // Convert just pressed events into regular (active) events int previousTable = 1-m_currentTable; for (int mouseevent= KX_BEGINMOUSE; mouseevent< KX_ENDMOUSEBUTTONS; mouseevent++) { @@ -156,7 +156,7 @@ bool GPC_MouseDevice::ConvertMoveEvent(int x, int y) bool GPC_MouseDevice::ConvertEvent(KX_EnumInputs kxevent, int eventval, unsigned int unicode) { bool result = true; - + // Only process it, if it's a mouse event if (kxevent > KX_BEGINMOUSE && kxevent < KX_ENDMOUSE) { int previousTable = 1-m_currentTable; @@ -180,7 +180,7 @@ bool GPC_MouseDevice::ConvertEvent(KX_EnumInputs kxevent, int eventval, unsigned } else { m_eventStatusTables[m_currentTable][kxevent].m_status = SCA_InputEvent::KX_ACTIVE; - + } break; } @@ -189,8 +189,8 @@ bool GPC_MouseDevice::ConvertEvent(KX_EnumInputs kxevent, int eventval, unsigned m_eventStatusTables[m_currentTable][kxevent].m_status = SCA_InputEvent::KX_JUSTACTIVATED; } } - - } + + } else { switch (m_eventStatusTables[previousTable][kxevent].m_status) { |