Revision: 2613
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2613&view=rev
Author: ulteq
Date: 2012-05-20 18:48:17 +0000 (Sun, 20 May 2012)
Log Message:
-----------
-Feature: merged theshark's speedlimiter patch - thanks
+cruise control target speed now limited by the trucks speed limit
+cruise control target rpm now limited by Idle- and Max-RPM
Modified Paths:
--------------
trunk/source/main/gameplay/RoRFrameListener.cpp
trunk/source/main/physics/Beam.cpp
trunk/source/main/physics/BeamData.h
trunk/source/main/physics/input_output/SerializedRig.cpp
Modified: trunk/source/main/gameplay/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.cpp 2012-05-20 15:41:04 UTC
(rev 2612)
+++ trunk/source/main/gameplay/RoRFrameListener.cpp 2012-05-20 18:48:17 UTC
(rev 2613)
@@ -1850,9 +1850,11 @@
void updateCruiseControl(Beam* curr_truck, float dt)
{
- if (INPUTENGINE.getEventValue(EV_TRUCK_BRAKE) > 0.05 ||
INPUTENGINE.getEventValue(EV_TRUCK_MANUAL_CLUTCH) > 0.05
- || (curr_truck->parkingbrake && curr_truck->engine->getGear() >
0)
- || !curr_truck->engine->running || !curr_truck->engine->contact)
+ if (INPUTENGINE.getEventValue(EV_TRUCK_BRAKE) > 0.05f ||
+ INPUTENGINE.getEventValue(EV_TRUCK_MANUAL_CLUTCH) > 0.05f ||
+ (curr_truck->parkingbrake && curr_truck->engine->getGear() > 0)
||
+ !curr_truck->engine->running ||
+ !curr_truck->engine->contact)
{
curr_truck->cruisecontrolToggle();
return;
@@ -1863,9 +1865,9 @@
// Try to maintain the target speed
if (curr_truck->cc_target_speed > curr_truck->WheelSpeed)
{
- float accl = (curr_truck->cc_target_speed -
curr_truck->WheelSpeed);
+ float accl = (curr_truck->cc_target_speed -
curr_truck->WheelSpeed) * 2.0f;
+ accl = std::max(curr_truck->engine->getAcc(), accl);
accl = std::min(accl, 1.0f);
- accl =
std::max(INPUTENGINE.getEventValue(EV_TRUCK_ACCELERATE), accl);
curr_truck->engine->setAcc(accl);
}
} else if (curr_truck->engine->getGear() == 0) // out of gear
@@ -1873,9 +1875,9 @@
// Try to maintain the target rpm
if (curr_truck->cc_target_rpm > curr_truck->engine->getRPM())
{
- float accl = (curr_truck->cc_target_rpm -
curr_truck->engine->getRPM()) * 0.01;
+ float accl = (curr_truck->cc_target_rpm -
curr_truck->engine->getRPM()) * 0.01f;
+ accl = std::max(curr_truck->engine->getAcc(), accl);
accl = std::min(accl, 1.0f);
- accl =
std::max(INPUTENGINE.getEventValue(EV_TRUCK_ACCELERATE), accl);
curr_truck->engine->setAcc(accl);
}
}
@@ -1884,38 +1886,54 @@
{
if (curr_truck->engine->getGear() > 0)
{
- curr_truck->cc_target_speed += 5 * dt;
+ curr_truck->cc_target_speed += 5.0f * dt;
+ curr_truck->cc_target_speed = std::max(0.0f,
curr_truck->cc_target_speed);
+ curr_truck->cc_target_speed =
std::min(curr_truck->cc_target_speed, curr_truck->sl_speed_limit);
} else if (curr_truck->engine->getGear() == 0) // out of gear
{
curr_truck->cc_target_rpm += 1000.0f * dt;
+ curr_truck->cc_target_rpm =
std::min(curr_truck->cc_target_rpm, curr_truck->engine->getMaxRPM());
}
}
if (INPUTENGINE.getEventBoolValue(EV_TRUCK_CRUISE_CONTROL_DECL))
{
if (curr_truck->engine->getGear() > 0)
{
- curr_truck->cc_target_speed -= 5 * dt;
+ curr_truck->cc_target_speed -= 5.0f * dt;
+ curr_truck->cc_target_speed = std::max(0.0f,
curr_truck->cc_target_speed);
} else if (curr_truck->engine->getGear() == 0) // out of gear
{
curr_truck->cc_target_rpm -= 1000.0f * dt;
+ curr_truck->cc_target_rpm =
std::max(curr_truck->engine->getIdleRPM(), curr_truck->cc_target_rpm);
}
}
if (INPUTENGINE.getEventBoolValue(EV_TRUCK_CRUISE_CONTROL_READJUST))
{
- curr_truck->cc_target_speed = curr_truck->WheelSpeed;
+ curr_truck->cc_target_speed = std::min(curr_truck->WheelSpeed,
curr_truck->sl_speed_limit);
curr_truck->cc_target_rpm = curr_truck->engine->getRPM();
}
#if 0
if (curr_truck->WheelSpeed > curr_truck->cc_target_speed + 0.5f &&
!INPUTENGINE.getEventValue(EV_TRUCK_ACCELERATE))
{
- float brake = (curr_truck->WheelSpeed -
curr_truck->cc_target_speed) * 0.5;
+ float brake = (curr_truck->WheelSpeed -
curr_truck->cc_target_speed) * 0.5f;
brake = std::min(brake, 1.0f);
curr_truck->brake = curr_truck->brakeforce * brake;
}
#endif
}
+void checkSpeedlimit(Beam* curr_truck, float dt)
+{
+ if (curr_truck->engine->getGear() > 0)
+ {
+ float accl = (curr_truck->sl_speed_limit -
curr_truck->WheelSpeed) * 2.0f;
+ accl = std::max(0.0f, accl);
+ accl = std::min(accl, curr_truck->engine->getAcc());
+ curr_truck->engine->setAcc(accl);
+ }
+}
+
bool RoRFrameListener::updateEvents(float dt)
{
if (dt==0.0f) return true;
@@ -2108,14 +2126,14 @@
}
// camera FOV settings
- if (INPUTENGINE.getEventBoolValueBounce(EV_COMMON_FOV_LESS) ||
INPUTENGINE.getEventBoolValueBounce(EV_COMMON_FOV_MORE))
+ if (INPUTENGINE.getEventBoolValueBounce(EV_COMMON_FOV_LESS, 0.1f) ||
INPUTENGINE.getEventBoolValueBounce(EV_COMMON_FOV_MORE, 0.1f))
{
int fov = mCamera->getFOVy().valueDegrees();
if (INPUTENGINE.getEventBoolValue(EV_COMMON_FOV_LESS))
- fov -= 2;
+ fov--;
else
- fov += 2;
+ fov++;
if (fov >= 10 && fov <= 160)
{
@@ -2698,7 +2716,7 @@
updateCruiseControl(curr_truck,dt);
}
-
+ checkSpeedlimit(curr_truck, dt);
}
if (curr_truck->driveable==AIRPLANE)
{
Modified: trunk/source/main/physics/Beam.cpp
===================================================================
--- trunk/source/main/physics/Beam.cpp 2012-05-20 15:41:04 UTC (rev 2612)
+++ trunk/source/main/physics/Beam.cpp 2012-05-20 18:48:17 UTC (rev 2613)
@@ -200,9 +200,9 @@
cablight = 0;
cablightNode = 0;
- cc_mode = 0;
- cc_target_rpm = 0;
- cc_target_speed = 0;
+ cc_mode = false;
+ cc_target_rpm = 0.0f;
+ cc_target_speed = 0.0f;
debugVisuals = 0;
@@ -256,7 +256,10 @@
previousCrank = 0.0f;
+ sl_speed_limit = std::numeric_limits<float>::max();
+
state = SLEEPING;
+
tc_fade = 0.0f;
tc_mode = 0;
tc_present = false;
Modified: trunk/source/main/physics/BeamData.h
===================================================================
--- trunk/source/main/physics/BeamData.h 2012-05-20 15:41:04 UTC (rev
2612)
+++ trunk/source/main/physics/BeamData.h 2012-05-20 18:48:17 UTC (rev
2613)
@@ -892,10 +892,13 @@
float animTimer;
// Cruise Control
- int cc_mode;
+ bool cc_mode;
float cc_target_rpm;
float cc_target_speed;
+ // Speed Limiter
+ float sl_speed_limit;
+
float beam_creak;
char uniquetruckid[256];
int categoryid;
Modified: trunk/source/main/physics/input_output/SerializedRig.cpp
===================================================================
--- trunk/source/main/physics/input_output/SerializedRig.cpp 2012-05-20
15:41:04 UTC (rev 2612)
+++ trunk/source/main/physics/input_output/SerializedRig.cpp 2012-05-20
18:48:17 UTC (rev 2613)
@@ -843,7 +843,7 @@
} else
{
-
parser_warning(c,"TractionControl Mode: missing " + String(fname) +" line " +
StringConverter::toString(c.linecounter) + ". TractionControl Mode = ON.",
PARSER_ERROR);
+ parser_warning(c,
"TractionControl Mode: missing " + String(fname) +" line " +
StringConverter::toString(c.linecounter) + ". TractionControl Mode = ON.",
PARSER_ERROR);
tc_present = true;
tc_mode = 1;
}
@@ -851,6 +851,17 @@
}
continue;
}
+ if (c.line.size() > 12 && c.line.substr(0, 12) ==
"speedlimiter")
+ {
+ parse_args(c, args, 2);
+ sl_speed_limit = PARSEREAL(args[1]);
+ if (sl_speed_limit <= 0.0f)
+ {
+ parser_warning(c, "SpeedLimiter:
Parameter must be a decimal and greater than zero (e.g. 69.445)");
+ continue;
+ }
+ continue;
+ }
if (c.line.size() > 17 && c.line.substr(0, 17) ==
"fileformatversion")
{
parse_args(c, args, 2);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Rigsofrods-devel mailing list
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
