FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug #285 textranslate and scroll animation with negative numbers

Browse Source 
rewrite SGStepExpression::apply_mods so it creates the same step
for negative numbers as it does for positive numbers.
This commit is contained in:
Torsten Dreyer
2011-05-25 19:14:09 +02:00
parent 5181aecc7b
commit ca668f8a37
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
simgear/structure/SGExpression.hxx
View File

@@ -665,24 +665,14 @@ public:
private:
T apply_mods(T property) const
{
T modprop;
if (_step > 0) {
T scrollval = 0;
if(_scroll > 0) {
// calculate scroll amount (for odometer like movement)
T remainder = _step - fmod(fabs(property), _step);
if (remainder < _scroll) {
scrollval = (_scroll - remainder) / _scroll * _step;
}
}
// apply stepping of input value
if(property > 0)
modprop = ((floor(property/_step) * _step) + scrollval);
else
modprop = ((ceil(property/_step) * _step) + scrollval);
} else {
modprop = property;
}
// apply stepping of input value
T modprop = floor(property/_step)*_step;
// calculate scroll amount (for odometer like movement)
T remainder = property < 0 ? -fmod(property,_step) : (_step - fmod(property,_step));
if( remainder > 0.0 && remainder < _scroll )
modprop += (_scroll - remainder) / _scroll * _step;
return modprop;
}