diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-27 14:35:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-27 14:35:39 +0400 |
| commit | 47c373c7a970fa4bd26453a6e35a4b066f2b77e4 (patch) | |
| tree | 43d916fb86bcf797afa834649706669694225fe8 /source/gameengine | |
| parent | 120297734b4a01d93e5223e02f255b5aef01e281 (diff) | |
style cleanup (mostly whitespace)
Diffstat (limited to 'source/gameengine')
21 files changed, 131 insertions, 131 deletions
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h index 184cc45f103..0da5301ed5d 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h +++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h @@ -106,11 +106,11 @@ public: int GetWidth( - ) const ; + ) const; int GetHeight( - ) const ; + ) const; int GetMouseX(int x diff --git a/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp b/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp index 718db0bf0e3..5cd2038163c 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp @@ -98,7 +98,7 @@ void KX_BlenderMouseDevice::NextFrame() if (oldevent.m_status == SCA_InputEvent::KX_JUSTRELEASED) { - m_eventStatusTables[m_currentTable][mousemove].m_status = SCA_InputEvent::KX_NO_INPUTSTATUS ; + m_eventStatusTables[m_currentTable][mousemove].m_status = SCA_InputEvent::KX_NO_INPUTSTATUS; } } } diff --git a/source/gameengine/Expressions/Operator2Expr.cpp b/source/gameengine/Expressions/Operator2Expr.cpp index f11d0670d15..e34e40d55eb 100644 --- a/source/gameengine/Expressions/Operator2Expr.cpp +++ b/source/gameengine/Expressions/Operator2Expr.cpp @@ -127,14 +127,14 @@ bool COperator2Expr::IsInside(float x, float y, float z,bool bBorderInclude) bool second;//first ;//,second; - //first = m_lhs->IsInside(x,y,z) ; - second = m_rhs->IsInside(x,y,z,bBorderInclude) ; + //first = m_lhs->IsInside(x,y,z); + second = m_rhs->IsInside(x,y,z,bBorderInclude); if (second) return true; //early out - // second = m_rhs->IsInside(x,y,z) ; + // second = m_rhs->IsInside(x,y,z); - return m_lhs->IsInside(x,y,z,bBorderInclude) ; + return m_lhs->IsInside(x,y,z,bBorderInclude); break; } @@ -144,7 +144,7 @@ bool COperator2Expr::IsInside(float x, float y, float z,bool bBorderInclude) // todo: same as with add_operator: calc smallest leaf first bool second;//first ;//,second; - //first = m_lhs->IsInside(x,y,z) ; + //first = m_lhs->IsInside(x,y,z); second = m_rhs->IsInside(x,y,z,bBorderInclude); if (second) return false; @@ -170,7 +170,7 @@ bool COperator2Expr::IsInside(float x, float y, float z,bool bBorderInclude) bool COperator2Expr::IsRightInside(float x, float y, float z,bool bBorderInclude) { - return m_rhs->IsInside(x,y,z,bBorderInclude) ; + return m_rhs->IsInside(x,y,z,bBorderInclude); } bool COperator2Expr::IsLeftInside(float x, float y, float z,bool bBorderInclude) diff --git a/source/gameengine/GamePlayer/common/GPC_Engine.cpp b/source/gameengine/GamePlayer/common/GPC_Engine.cpp index 6548310b99c..171ea266f49 100644 --- a/source/gameengine/GamePlayer/common/GPC_Engine.cpp +++ b/source/gameengine/GamePlayer/common/GPC_Engine.cpp @@ -239,7 +239,7 @@ float GPC_Engine::DetermineProgress(void) progress = 0.f; } progress *= 100.f; - return (unsigned int) progress ; + return (unsigned int) progress; #endif return m_previousProgress + 0.01; // temporary TODO } diff --git a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp index fc436abf6e0..ecb58eda78e 100644 --- a/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp +++ b/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp @@ -53,7 +53,7 @@ void GPC_KeyboardDevice::NextFrame() { m_eventStatusTables[m_currentTable][keyevent] = oldevent; m_eventStatusTables[m_currentTable][keyevent].m_status = SCA_InputEvent::KX_ACTIVE; - //m_eventStatusTables[m_currentTable][keyevent].m_status = SCA_InputEvent::KX_JUSTACTIVATED ; + //m_eventStatusTables[m_currentTable][keyevent].m_status = SCA_InputEvent::KX_JUSTACTIVATED; } } } diff --git a/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp b/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp index 6146be1d333..a38bba7788b 100644 --- a/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp +++ b/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp @@ -81,7 +81,7 @@ void GPC_MouseDevice::NextFrame() } else { if (oldevent.m_status == SCA_InputEvent::KX_JUSTRELEASED) { - m_eventStatusTables[m_currentTable][mousemove].m_status = SCA_InputEvent::KX_NO_INPUTSTATUS ; + m_eventStatusTables[m_currentTable][mousemove].m_status = SCA_InputEvent::KX_NO_INPUTSTATUS; } } } diff --git a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp index 1d67ce080cc..b31803b761e 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp @@ -35,71 +35,71 @@ GPG_KeyboardDevice::GPG_KeyboardDevice(void) { - m_reverseKeyTranslateTable[GHOST_kKeyA ] = KX_AKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyB ] = KX_BKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyC ] = KX_CKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyD ] = KX_DKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyE ] = KX_EKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyF ] = KX_FKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyG ] = KX_GKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyH ] = KX_HKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyI ] = KX_IKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyJ ] = KX_JKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyK ] = KX_KKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyL ] = KX_LKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyM ] = KX_MKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyN ] = KX_NKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyO ] = KX_OKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyP ] = KX_PKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyQ ] = KX_QKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyR ] = KX_RKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyS ] = KX_SKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyT ] = KX_TKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyU ] = KX_UKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyV ] = KX_VKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyW ] = KX_WKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyX ] = KX_XKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyY ] = KX_YKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyZ ] = KX_ZKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyA ] = KX_AKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyB ] = KX_BKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyC ] = KX_CKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyD ] = KX_DKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyE ] = KX_EKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF ] = KX_FKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyG ] = KX_GKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyH ] = KX_HKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyI ] = KX_IKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyJ ] = KX_JKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyK ] = KX_KKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyL ] = KX_LKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyM ] = KX_MKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyN ] = KX_NKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyO ] = KX_OKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyP ] = KX_PKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyQ ] = KX_QKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyR ] = KX_RKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyS ] = KX_SKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyT ] = KX_TKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyU ] = KX_UKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyV ] = KX_VKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyW ] = KX_WKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyX ] = KX_XKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyY ] = KX_YKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyZ ] = KX_ZKEY ; - m_reverseKeyTranslateTable[GHOST_kKey0 ] = KX_ZEROKEY ; - m_reverseKeyTranslateTable[GHOST_kKey1 ] = KX_ONEKEY ; - m_reverseKeyTranslateTable[GHOST_kKey2 ] = KX_TWOKEY ; - m_reverseKeyTranslateTable[GHOST_kKey3 ] = KX_THREEKEY ; - m_reverseKeyTranslateTable[GHOST_kKey4 ] = KX_FOURKEY ; - m_reverseKeyTranslateTable[GHOST_kKey5 ] = KX_FIVEKEY ; - m_reverseKeyTranslateTable[GHOST_kKey6 ] = KX_SIXKEY ; - m_reverseKeyTranslateTable[GHOST_kKey7 ] = KX_SEVENKEY ; - m_reverseKeyTranslateTable[GHOST_kKey8 ] = KX_EIGHTKEY ; + m_reverseKeyTranslateTable[GHOST_kKey0 ] = KX_ZEROKEY ; + m_reverseKeyTranslateTable[GHOST_kKey1 ] = KX_ONEKEY ; + m_reverseKeyTranslateTable[GHOST_kKey2 ] = KX_TWOKEY ; + m_reverseKeyTranslateTable[GHOST_kKey3 ] = KX_THREEKEY ; + m_reverseKeyTranslateTable[GHOST_kKey4 ] = KX_FOURKEY ; + m_reverseKeyTranslateTable[GHOST_kKey5 ] = KX_FIVEKEY ; + m_reverseKeyTranslateTable[GHOST_kKey6 ] = KX_SIXKEY ; + m_reverseKeyTranslateTable[GHOST_kKey7 ] = KX_SEVENKEY ; + m_reverseKeyTranslateTable[GHOST_kKey8 ] = KX_EIGHTKEY ; m_reverseKeyTranslateTable[GHOST_kKey9 ] = KX_NINEKEY ; // Middle keyboard area keys - m_reverseKeyTranslateTable[GHOST_kKeyPause ] = KX_PAUSEKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyInsert ] = KX_INSERTKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyDelete ] = KX_DELKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyHome ] = KX_HOMEKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyEnd ] = KX_ENDKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyUpPage ] = KX_PAGEUPKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyDownPage ] = KX_PAGEDOWNKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyPause ] = KX_PAUSEKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyInsert ] = KX_INSERTKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyDelete ] = KX_DELKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyHome ] = KX_HOMEKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyEnd ] = KX_ENDKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyUpPage ] = KX_PAGEUPKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyDownPage ] = KX_PAGEDOWNKEY ; // Arrow keys - m_reverseKeyTranslateTable[GHOST_kKeyUpArrow ] = KX_UPARROWKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyDownArrow ] = KX_DOWNARROWKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyLeftArrow ] = KX_LEFTARROWKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyRightArrow ] = KX_RIGHTARROWKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyUpArrow ] = KX_UPARROWKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyDownArrow ] = KX_DOWNARROWKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyLeftArrow ] = KX_LEFTARROWKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyRightArrow ] = KX_RIGHTARROWKEY ; // Function keys - m_reverseKeyTranslateTable[GHOST_kKeyF1 ] = KX_F1KEY ; - m_reverseKeyTranslateTable[GHOST_kKeyF2 ] = KX_F2KEY ; - m_reverseKeyTranslateTable[GHOST_kKeyF3 ] = KX_F3KEY ; - m_reverseKeyTranslateTable[GHOST_kKeyF4 ] = KX_F4KEY ; - m_reverseKeyTranslateTable[GHOST_kKeyF5 ] = KX_F5KEY ; - m_reverseKeyTranslateTable[GHOST_kKeyF6 ] = KX_F6KEY ; - m_reverseKeyTranslateTable[GHOST_kKeyF7 ] = KX_F7KEY ; - m_reverseKeyTranslateTable[GHOST_kKeyF8 ] = KX_F8KEY ; - m_reverseKeyTranslateTable[GHOST_kKeyF9 ] = KX_F9KEY ; - m_reverseKeyTranslateTable[GHOST_kKeyF10 ] = KX_F10KEY ; - m_reverseKeyTranslateTable[GHOST_kKeyF11 ] = KX_F11KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF1 ] = KX_F1KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF2 ] = KX_F2KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF3 ] = KX_F3KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF4 ] = KX_F4KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF5 ] = KX_F5KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF6 ] = KX_F6KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF7 ] = KX_F7KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF8 ] = KX_F8KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF9 ] = KX_F9KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF10 ] = KX_F10KEY ; + m_reverseKeyTranslateTable[GHOST_kKeyF11 ] = KX_F11KEY ; m_reverseKeyTranslateTable[GHOST_kKeyF12 ] = KX_F12KEY ; m_reverseKeyTranslateTable[GHOST_kKeyF13 ] = KX_F13KEY ; m_reverseKeyTranslateTable[GHOST_kKeyF14 ] = KX_F14KEY ; @@ -111,49 +111,49 @@ GPG_KeyboardDevice::GPG_KeyboardDevice(void) // Numpad keys - m_reverseKeyTranslateTable[GHOST_kKeyNumpad0 ] = KX_PAD0 ; - m_reverseKeyTranslateTable[GHOST_kKeyNumpad1 ] = KX_PAD1 ; - m_reverseKeyTranslateTable[GHOST_kKeyNumpad2 ] = KX_PAD2 ; - m_reverseKeyTranslateTable[GHOST_kKeyNumpad3 ] = KX_PAD3 ; - m_reverseKeyTranslateTable[GHOST_kKeyNumpad4 ] = KX_PAD4 ; - m_reverseKeyTranslateTable[GHOST_kKeyNumpad5 ] = KX_PAD5 ; - m_reverseKeyTranslateTable[GHOST_kKeyNumpad6 ] = KX_PAD6 ; - m_reverseKeyTranslateTable[GHOST_kKeyNumpad7 ] = KX_PAD7 ; - m_reverseKeyTranslateTable[GHOST_kKeyNumpad8 ] = KX_PAD8 ; - m_reverseKeyTranslateTable[GHOST_kKeyNumpad9 ] = KX_PAD9 ; - m_reverseKeyTranslateTable[GHOST_kKeyNumpadAsterisk ] = KX_PADASTERKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyNumpadPlus ] = KX_PADPLUSKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyNumpadPeriod ] = KX_PADPERIOD ; - m_reverseKeyTranslateTable[GHOST_kKeyNumpadMinus ] = KX_PADMINUS ; - m_reverseKeyTranslateTable[GHOST_kKeyNumpadSlash ] = KX_PADSLASHKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyNumpadEnter ] = KX_PADENTER ; + m_reverseKeyTranslateTable[GHOST_kKeyNumpad0 ] = KX_PAD0 ; + m_reverseKeyTranslateTable[GHOST_kKeyNumpad1 ] = KX_PAD1 ; + m_reverseKeyTranslateTable[GHOST_kKeyNumpad2 ] = KX_PAD2 ; + m_reverseKeyTranslateTable[GHOST_kKeyNumpad3 ] = KX_PAD3 ; + m_reverseKeyTranslateTable[GHOST_kKeyNumpad4 ] = KX_PAD4 ; + m_reverseKeyTranslateTable[GHOST_kKeyNumpad5 ] = KX_PAD5 ; + m_reverseKeyTranslateTable[GHOST_kKeyNumpad6 ] = KX_PAD6 ; + m_reverseKeyTranslateTable[GHOST_kKeyNumpad7 ] = KX_PAD7 ; + m_reverseKeyTranslateTable[GHOST_kKeyNumpad8 ] = KX_PAD8 ; + m_reverseKeyTranslateTable[GHOST_kKeyNumpad9 ] = KX_PAD9 ; + m_reverseKeyTranslateTable[GHOST_kKeyNumpadAsterisk ] = KX_PADASTERKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyNumpadPlus ] = KX_PADPLUSKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyNumpadPeriod ] = KX_PADPERIOD ; + m_reverseKeyTranslateTable[GHOST_kKeyNumpadMinus ] = KX_PADMINUS ; + m_reverseKeyTranslateTable[GHOST_kKeyNumpadSlash ] = KX_PADSLASHKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyNumpadEnter ] = KX_PADENTER ; // Other keys - m_reverseKeyTranslateTable[GHOST_kKeyCapsLock ] = KX_CAPSLOCKKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyEsc ] = KX_ESCKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyTab ] = KX_TABKEY ; - m_reverseKeyTranslateTable[GHOST_kKeySpace ] = KX_SPACEKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyEnter ] = KX_RETKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyBackSpace ] = KX_BACKSPACEKEY ; - m_reverseKeyTranslateTable[GHOST_kKeySemicolon ] = KX_SEMICOLONKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyPeriod ] = KX_PERIODKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyComma ] = KX_COMMAKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyQuote ] = KX_QUOTEKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyAccentGrave ] = KX_ACCENTGRAVEKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyMinus ] = KX_MINUSKEY ; - m_reverseKeyTranslateTable[GHOST_kKeySlash ] = KX_SLASHKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyBackslash ] = KX_BACKSLASHKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyEqual ] = KX_EQUALKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyLeftBracket ] = KX_LEFTBRACKETKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyRightBracket ] = KX_RIGHTBRACKETKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyCapsLock ] = KX_CAPSLOCKKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyEsc ] = KX_ESCKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyTab ] = KX_TABKEY ; + m_reverseKeyTranslateTable[GHOST_kKeySpace ] = KX_SPACEKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyEnter ] = KX_RETKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyBackSpace ] = KX_BACKSPACEKEY ; + m_reverseKeyTranslateTable[GHOST_kKeySemicolon ] = KX_SEMICOLONKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyPeriod ] = KX_PERIODKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyComma ] = KX_COMMAKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyQuote ] = KX_QUOTEKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyAccentGrave ] = KX_ACCENTGRAVEKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyMinus ] = KX_MINUSKEY ; + m_reverseKeyTranslateTable[GHOST_kKeySlash ] = KX_SLASHKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyBackslash ] = KX_BACKSLASHKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyEqual ] = KX_EQUALKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyLeftBracket ] = KX_LEFTBRACKETKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyRightBracket ] = KX_RIGHTBRACKETKEY ; // Modifier keys. - m_reverseKeyTranslateTable[GHOST_kKeyLeftControl ] = KX_LEFTCTRLKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyRightControl ] = KX_RIGHTCTRLKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyLeftAlt ] = KX_LEFTALTKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyRightAlt ] = KX_RIGHTALTKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyLeftShift ] = KX_LEFTSHIFTKEY ; - m_reverseKeyTranslateTable[GHOST_kKeyRightShift ] = KX_RIGHTSHIFTKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyLeftControl ] = KX_LEFTCTRLKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyRightControl ] = KX_RIGHTCTRLKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyLeftAlt ] = KX_LEFTALTKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyRightAlt ] = KX_RIGHTALTKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyLeftShift ] = KX_LEFTSHIFTKEY ; + m_reverseKeyTranslateTable[GHOST_kKeyRightShift ] = KX_RIGHTSHIFTKEY ; } diff --git a/source/gameengine/Ketsji/KX_Camera.h b/source/gameengine/Ketsji/KX_Camera.h index 2f5fe112de6..082d363fed6 100644 --- a/source/gameengine/Ketsji/KX_Camera.h +++ b/source/gameengine/Ketsji/KX_Camera.h @@ -145,7 +145,7 @@ protected: public: - enum { INSIDE, INTERSECT, OUTSIDE } ; + enum { INSIDE, INTERSECT, OUTSIDE }; KX_Camera(void* sgReplicationInfo,SG_Callbacks callbacks,const RAS_CameraData& camdata, bool frustum_culling = true, bool delete_node = false); virtual ~KX_Camera(); diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp index f21a7f815e5..ac83200cb2e 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp @@ -353,7 +353,7 @@ void KX_ConvertBulletObject( class KX_GameObject* gameobj, ////////// //do Fh, do Rot Fh ci.m_do_fh = shapeprops->m_do_fh; - ci.m_do_rot_fh = shapeprops->m_do_rot_fh ; + ci.m_do_rot_fh = shapeprops->m_do_rot_fh; ci.m_fh_damping = smmaterial->m_fh_damping; ci.m_fh_distance = smmaterial->m_fh_distance; ci.m_fh_normal = smmaterial->m_fh_normal; diff --git a/source/gameengine/Ketsji/KX_Dome.cpp b/source/gameengine/Ketsji/KX_Dome.cpp index 4f959d9d2f9..6bd30685696 100644 --- a/source/gameengine/Ketsji/KX_Dome.cpp +++ b/source/gameengine/Ketsji/KX_Dome.cpp @@ -1415,13 +1415,13 @@ void KX_Dome::SplitFace(vector <DomeFace>& face, int *nfaces) face[n2+2].v[1] = (face[i].v[1] + face[i].v[2]) /2; face[n2+2].v[2] = (face[i].v[2] + face[i].v[0]) /2; - //face[i].verts[0] = face[i].verts[0] ; + //face[i].verts[0] = face[i].verts[0]; face[i].verts[1] = (face[i].verts[0] + face[i].verts[1]) /2; face[i].verts[2] = (face[i].verts[0] + face[i].verts[2]) /2; //face[i].u[0] = face[i].u[0]; face[i].u[1] = (face[i].u[0] + face[i].u[1]) /2; face[i].u[2] = (face[i].u[0] + face[i].u[2]) /2; - //face[i].v[0] = face[i].v[0] ; + //face[i].v[0] = face[i].v[0]; face[i].v[1] = (face[i].v[0] + face[i].v[1]) /2; face[i].v[2] = (face[i].v[0] + face[i].v[2]) /2; @@ -1812,13 +1812,13 @@ void KX_Dome::DrawDomeFisheye(void) else if(m_mode == DOME_TRUNCATED_FRONT) { ortho_width = 1.0; - ortho_height = 2 * ((float)can_height/can_width) - 1.0 ; + ortho_height = 2 * ((float)can_height / can_width) - 1.0; glOrtho((-ortho_width), ortho_width, (-ortho_height), ortho_width, -20.0, 10.0); } else { //m_mode == DOME_TRUNCATED_REAR ortho_width = 1.0; - ortho_height = 2 * ((float)can_height/can_width) - 1.0 ; + ortho_height = 2 * ((float)can_height / can_width) - 1.0; glOrtho((-ortho_width), ortho_width, (-ortho_width), ortho_height, -20.0, 10.0); } diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h index 895140528e8..ea721d19179 100644 --- a/source/gameengine/Ketsji/KX_GameObject.h +++ b/source/gameengine/Ketsji/KX_GameObject.h @@ -431,7 +431,7 @@ public: * @return a pointer to the physics controller owned by this class. */ - KX_IPhysicsController* GetPhysicsController() ; + KX_IPhysicsController* GetPhysicsController(); void SetPhysicsController(KX_IPhysicsController* physicscontroller,bool isDynamic) { diff --git a/source/gameengine/Ketsji/KX_MeshProxy.h b/source/gameengine/Ketsji/KX_MeshProxy.h index dfaf1eba009..58b5c87e494 100644 --- a/source/gameengine/Ketsji/KX_MeshProxy.h +++ b/source/gameengine/Ketsji/KX_MeshProxy.h @@ -51,7 +51,7 @@ public: void SetMeshModified(bool v); // stuff for cvalue related things - virtual CValue* Calc(VALUE_OPERATOR op, CValue *val) ; + virtual CValue* Calc(VALUE_OPERATOR op, CValue *val); virtual CValue* CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val); virtual const STR_String & GetText(); virtual double GetNumber(); diff --git a/source/gameengine/Ketsji/KX_PolyProxy.h b/source/gameengine/Ketsji/KX_PolyProxy.h index 44945e58c2a..83c3bff0ee2 100644 --- a/source/gameengine/Ketsji/KX_PolyProxy.h +++ b/source/gameengine/Ketsji/KX_PolyProxy.h @@ -47,7 +47,7 @@ public: virtual ~KX_PolyProxy(); // stuff for cvalue related things - CValue* Calc(VALUE_OPERATOR op, CValue *val) ; + CValue* Calc(VALUE_OPERATOR op, CValue *val); CValue* CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val); const STR_String & GetText(); double GetNumber(); diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h index d9cd1b5ff24..40136f429a2 100644 --- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h +++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h @@ -93,7 +93,7 @@ public: CValue* GetReplica( - ) ; + ); virtual void ProcessReplica(); @@ -114,7 +114,7 @@ public: SCA_IObject* GetLastCreatedObject( - ) const ; + ) const; void InstantAddObject(); diff --git a/source/gameengine/Ketsji/KX_SteeringActuator.cpp b/source/gameengine/Ketsji/KX_SteeringActuator.cpp index 232b907d9a8..bc8c5ec92a8 100644 --- a/source/gameengine/Ketsji/KX_SteeringActuator.cpp +++ b/source/gameengine/Ketsji/KX_SteeringActuator.cpp @@ -338,7 +338,7 @@ static bool barDistSqPointToTri(const float* p, const float* a, const float* b, float ud = u<0.f ? -u : (u>1.f ? u-1.f : 0.f); float vd = v<0.f ? -v : (v>1.f ? v-1.f : 0.f); - return ud*ud+vd*vd ; + return ud * ud + vd * vd; } inline void flipAxes(float* vec) diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h index 1ce1742ed46..df96b75084a 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.h +++ b/source/gameengine/Ketsji/KX_TouchSensor.h @@ -79,7 +79,7 @@ public: class KX_GameObject* gameobj, bool bFindMaterial, bool bTouchPulse, - const STR_String& touchedpropname) ; + const STR_String& touchedpropname); virtual ~KX_TouchSensor(); virtual CValue* GetReplica(); diff --git a/source/gameengine/Ketsji/KX_VertexProxy.h b/source/gameengine/Ketsji/KX_VertexProxy.h index baed5330f7e..3084e5fac93 100644 --- a/source/gameengine/Ketsji/KX_VertexProxy.h +++ b/source/gameengine/Ketsji/KX_VertexProxy.h @@ -48,7 +48,7 @@ public: virtual ~KX_VertexProxy(); // stuff for cvalue related things - CValue* Calc(VALUE_OPERATOR op, CValue *val) ; + CValue* Calc(VALUE_OPERATOR op, CValue *val); CValue* CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val); const STR_String & GetText(); double GetNumber(); diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h index 33b30758ff0..b9e78d9ff1f 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h @@ -525,7 +525,7 @@ protected: return m_cci.m_collisionFilterMask; } - virtual void calcXform() {} ; + virtual void calcXform() {} virtual void SetMargin(float margin) { if (m_collisionShape) diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index 39b2022a1f4..ba9724f34ab 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -122,7 +122,7 @@ public: for (i=0;i<numWheels;i++) { btWheelInfo& info = m_vehicle->getWheelInfo(i); - PHY_IMotionState* motionState = (PHY_IMotionState*)info.m_clientInfo ; + PHY_IMotionState* motionState = (PHY_IMotionState*)info.m_clientInfo; // m_vehicle->updateWheelTransformsWS(info,false); m_vehicle->updateWheelTransform(i,false); btTransform trans = m_vehicle->getWheelInfo(i).m_worldTransform; @@ -873,7 +873,7 @@ void CcdPhysicsEnvironment::setSolverType(int solverType) }; - m_solverType = solverType ; + m_solverType = solverType; } diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h index 1315bc732a2..dba76c8d5fa 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h @@ -106,19 +106,19 @@ protected: m_numTimeSubSteps = numTimeSubSteps; } virtual void setDeactivationTime(float dTime); - virtual void setDeactivationLinearTreshold(float linTresh) ; - virtual void setDeactivationAngularTreshold(float angTresh) ; - virtual void setContactBreakingTreshold(float contactBreakingTreshold) ; + virtual void setDeactivationLinearTreshold(float linTresh); + virtual void setDeactivationAngularTreshold(float angTresh); + virtual void setContactBreakingTreshold(float contactBreakingTreshold); virtual void setCcdMode(int ccdMode); virtual void setSolverType(int solverType); virtual void setSolverSorConstant(float sor); virtual void setSolverTau(float tau); virtual void setSolverDamping(float damping); virtual void setLinearAirDamping(float damping); - virtual void setUseEpa(bool epa) ; + virtual void setUseEpa(bool epa); virtual void beginFrame(); - virtual void endFrame() {}; + virtual void endFrame() {} /// Perform an integration step of duration 'timeStep'. virtual bool proceedDeltaTime(double curTime,float timeStep,float interval); diff --git a/source/gameengine/Rasterizer/RAS_TexVert.cpp b/source/gameengine/Rasterizer/RAS_TexVert.cpp index 1e8630c72d8..454fd8ecc69 100644 --- a/source/gameengine/Rasterizer/RAS_TexVert.cpp +++ b/source/gameengine/Rasterizer/RAS_TexVert.cpp @@ -129,7 +129,7 @@ bool RAS_TexVert::closeTo(const RAS_TexVert* other) MT_fuzzyEqual(MT_Vector3(m_tangent), MT_Vector3(other->m_tangent)) && MT_fuzzyEqual(MT_Vector2(m_uv1), MT_Vector2(other->m_uv1)) && MT_fuzzyEqual(MT_Vector2(m_uv2), MT_Vector2(other->m_uv2)) /* && - MT_fuzzyEqual(MT_Vector3(m_localxyz), MT_Vector3(other->m_localxyz))*/) ; + MT_fuzzyEqual(MT_Vector3(m_localxyz), MT_Vector3(other->m_localxyz))*/); /* dont bother comparing m_localxyz since we know there from the same vert */ } |