Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-06-07 02:38:39 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-07 02:38:39 +0400
commitd5032657edd365ded8b98500536ecdbe1b54df5a (patch)
tree73bb5897da4b67ff37b9639471520bdcdeef16f7 /source/gameengine/GameLogic
parent379c4ae4d8b92ae444c0372dc54872c72b10c199 (diff)
style cleanup
Diffstat (limited to 'source/gameengine/GameLogic')
-rw-r--r--source/gameengine/GameLogic/Joystick/SCA_Joystick.h14
-rw-r--r--source/gameengine/GameLogic/SCA_JoystickSensor.cpp12
-rw-r--r--source/gameengine/GameLogic/SCA_JoystickSensor.h2
3 files changed, 16 insertions, 12 deletions
diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.h b/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
index a6809716e32..685cc3fcc48 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
+++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
@@ -99,7 +99,7 @@ class SCA_Joystick
void OnButtonDown(SDL_Event *sdl_event);
void OnNothing(SDL_Event *sdl_event);
#if 0 /* not used yet */
- void OnBallMotion(SDL_Event *sdl_event){}
+ void OnBallMotion(SDL_Event *sdl_event) {}
#endif
#endif /* WITH_SDL */
@@ -156,27 +156,27 @@ public:
void cSetPrecision(int val);
- int GetAxisPosition(int index){
+ int GetAxisPosition(int index) {
return m_axis_array[index];
}
- int GetHat(int index){
+ int GetHat(int index) {
return m_hat_array[index];
}
- int GetThreshold(void){
+ int GetThreshold(void) {
return m_prec;
}
- bool IsTrigAxis(void){
+ bool IsTrigAxis(void) {
return m_istrig_axis;
}
- bool IsTrigButton(void){
+ bool IsTrigButton(void) {
return m_istrig_button;
}
- bool IsTrigHat(void){
+ bool IsTrigHat(void) {
return m_istrig_hat;
}
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
index 07fad3bfe37..c82e015919d 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
@@ -137,7 +137,8 @@ bool SCA_JoystickSensor::Evaluate()
if (js->aAxisPairIsPositive(m_axis-1)) { /* use zero based axis index internally */
m_istrig = 1;
result = true;
- }else{
+ }
+ else {
if (m_istrig) {
m_istrig = 0;
result = true;
@@ -148,7 +149,8 @@ bool SCA_JoystickSensor::Evaluate()
if (js->aAxisPairDirectionIsPositive(m_axis-1, m_axisf)) { /* use zero based axis index internally */
m_istrig = 1;
result = true;
- }else{
+ }
+ else {
if (m_istrig) {
m_istrig = 0;
result = true;
@@ -168,7 +170,8 @@ bool SCA_JoystickSensor::Evaluate()
if (js->aAxisIsPositive(m_axis-1)) { /* use zero based axis index internally */
m_istrig = 1;
result = true;
- }else{
+ }
+ else {
if (m_istrig) {
m_istrig = 0;
result = true;
@@ -209,7 +212,8 @@ bool SCA_JoystickSensor::Evaluate()
if ((m_bAllEvents && js->GetHat(m_hat-1)) || js->aHatIsPositive(m_hat-1, m_hatf)) {
m_istrig = 1;
result = true;
- }else{
+ }
+ else {
if (m_istrig) {
m_istrig = 0;
result = true;
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.h b/source/gameengine/GameLogic/SCA_JoystickSensor.h
index eecbf2c4183..5dc35faf244 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.h
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.h
@@ -117,7 +117,7 @@ public:
virtual bool IsPositiveTrigger();
virtual void Init();
- short int GetJoyIndex(void){
+ short int GetJoyIndex(void) {
return m_joyindex;
}