Revision: 1540
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1540&view=rev
Author: rorthomas
Date: 2010-09-12 09:02:51 +0000 (Sun, 12 Sep 2010)
Log Message:
-----------
improved code: using enums instead of magic numbers
Modified Paths:
--------------
trunk/source/main/InputEngine.h
trunk/source/main/RoRFrameListener.cpp
Modified: trunk/source/main/InputEngine.h
===================================================================
--- trunk/source/main/InputEngine.h 2010-09-05 22:53:54 UTC (rev 1539)
+++ trunk/source/main/InputEngine.h 2010-09-12 09:02:51 UTC (rev 1540)
@@ -427,8 +427,11 @@
public:
static InputEngine & Instance();
void Capture();
- //valueSource: 0=digital and analog devices, 1=only digital, 2=only
analog
- float getEventValue(int eventID, bool pure=false, int valueSource=0);
+
+ enum {ET_ANY, ET_DIGITAL, ET_ANALOG};
+ //valueSource: ET_ANY=digital and analog devices, ET_DIGITAL=only
digital, ET_ANALOG=only analog
+ float getEventValue(int eventID, bool pure = false, int valueSource =
ET_ANY);
+
bool getEventBoolValue(int eventID);
bool isEventAnalog(int eventID);
bool getEventBoolValueBounce(int eventID, float time=0.2f);
Modified: trunk/source/main/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/RoRFrameListener.cpp 2010-09-05 22:53:54 UTC (rev
1539)
+++ trunk/source/main/RoRFrameListener.cpp 2010-09-12 09:02:51 UTC (rev
1540)
@@ -2942,10 +2942,10 @@
else // this else part is called
when we are NOT in replaymode
{
// steering
- float tmp_left_digital =
INPUTENGINE.getEventValue(EV_TRUCK_STEER_LEFT,false,1);
- float tmp_right_digital =
INPUTENGINE.getEventValue(EV_TRUCK_STEER_RIGHT,false,1);
- float tmp_left_analog =
INPUTENGINE.getEventValue(EV_TRUCK_STEER_LEFT,false,2);
- float tmp_right_analog =
INPUTENGINE.getEventValue(EV_TRUCK_STEER_RIGHT,false,2);
+ float tmp_left_digital =
INPUTENGINE.getEventValue(EV_TRUCK_STEER_LEFT, false, InputEngine::ET_DIGITAL);
+ float tmp_right_digital =
INPUTENGINE.getEventValue(EV_TRUCK_STEER_RIGHT, false, InputEngine::ET_DIGITAL);
+ float tmp_left_analog =
INPUTENGINE.getEventValue(EV_TRUCK_STEER_LEFT, false, InputEngine::ET_ANALOG);
+ float tmp_right_analog =
INPUTENGINE.getEventValue(EV_TRUCK_STEER_RIGHT, false, InputEngine::ET_ANALOG);
float sum =
-max(tmp_left_digital,tmp_left_analog)+ max(tmp_right_digital,tmp_right_analog);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
