T getValue(const simgear::expression::Binding* binding = 0) const
{ T value; eval(value, binding); return value; }
+ double getDoubleValue(const simgear::expression::Binding* binding = 0) const
+ { T value; eval(value, binding); return value; }
+
virtual bool isConst() const { return false; }
virtual SGExpression* simplify();
virtual simgear::expression::Type getType() const
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = acos(SGMisc<T>::clip(getOperand()->getValue(b), -1, 1)); }
+ { value = acos((double)SGMisc<T>::clip(getOperand()->getValue(b), -1, 1)); }
using SGUnaryExpression<T>::getOperand;
};
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = asin(SGMisc<T>::clip(getOperand()->getValue(b), -1, 1)); }
+ { value = asin((double)SGMisc<T>::clip(getOperand()->getValue(b), -1, 1)); }
using SGUnaryExpression<T>::getOperand;
};
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = atan(getOperand()->getValue(b)); }
+ { value = atan(getOperand()->getDoubleValue(b)); }
using SGUnaryExpression<T>::getOperand;
};
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = ceil(getOperand()->getValue(b)); }
+ { value = ceil(getOperand()->getDoubleValue(b)); }
using SGUnaryExpression<T>::getOperand;
};
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = cos(getOperand()->getValue(b)); }
+ { value = cos(getOperand()->getDoubleValue(b)); }
using SGUnaryExpression<T>::getOperand;
};
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = cosh(getOperand()->getValue(b)); }
+ { value = cosh(getOperand()->getDoubleValue(b)); }
using SGUnaryExpression<T>::getOperand;
};
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = exp(getOperand()->getValue(b)); }
+ { value = exp(getOperand()->getDoubleValue(b)); }
using SGUnaryExpression<T>::getOperand;
};
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = floor(getOperand()->getValue(b)); }
+ { value = floor(getOperand()->getDoubleValue(b)); }
using SGUnaryExpression<T>::getOperand;
};
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = log(getOperand()->getValue(b)); }
+ { value = log(getOperand()->getDoubleValue(b)); }
using SGUnaryExpression<T>::getOperand;
};
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = log10(getOperand()->getValue(b)); }
+ { value = log10(getOperand()->getDoubleValue(b)); }
using SGUnaryExpression<T>::getOperand;
};
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = sin(getOperand()->getValue(b)); }
+ { value = sin(getOperand()->getDoubleValue(b)); }
using SGUnaryExpression<T>::getOperand;
};
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = sinh(getOperand()->getValue(b)); }
+ { value = sinh(getOperand()->getDoubleValue(b)); }
using SGUnaryExpression<T>::getOperand;
};
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = sqrt(getOperand()->getValue(b)); }
+ { value = sqrt(getOperand()->getDoubleValue(b)); }
using SGUnaryExpression<T>::getOperand;
};
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = tan(getOperand()->getValue(b)); }
+ { value = tan(getOperand()->getDoubleValue(b)); }
using SGUnaryExpression<T>::getOperand;
};
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = tanh(getOperand()->getValue(b)); }
+ { value = tanh(getOperand()->getDoubleValue(b)); }
using SGUnaryExpression<T>::getOperand;
};
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;
- }
+ if( _step <= SGLimits<T>::min() ) return property;
+
+ // apply stepping of input value
+ T modprop = floor(property/_step)*_step;
+
+ // calculate scroll amount (for odometer like movement)
+ T remainder = property <= SGLimits<T>::min() ? -fmod(property,_step) : (_step - fmod(property,_step));
+ if( remainder > SGLimits<T>::min() && remainder < _scroll )
+ modprop += (_scroll - remainder) / _scroll * _step;
+
return modprop;
}
: SGBinaryExpression<T>(expr0, expr1)
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = atan2(getOperand(0)->getValue(b), getOperand(1)->getValue(b)); }
+ { value = atan2(getOperand(0)->getDoubleValue(b), getOperand(1)->getDoubleValue(b)); }
using SGBinaryExpression<T>::getOperand;
};
: SGBinaryExpression<T>(expr0, expr1)
{ }
virtual void eval(T& value, const simgear::expression::Binding* b) const
- { value = pow(getOperand(0)->getValue(b), getOperand(1)->getValue(b)); }
+ { value = pow(getOperand(0)->getDoubleValue(b), getOperand(1)->getDoubleValue(b)); }
using SGBinaryExpression<T>::getOperand;
};
using SGNaryExpression<T>::getOperand;
};
+template<typename T>
+class SGDifferenceExpression : public SGNaryExpression<T> {
+public:
+ SGDifferenceExpression()
+ { }
+ SGDifferenceExpression(SGExpression<T>* expr0, SGExpression<T>* expr1)
+ : SGNaryExpression<T>(expr0, expr1)
+ { }
+ virtual void eval(T& value, const simgear::expression::Binding* b) const
+ {
+ value = getOperand(0)->getValue(b);
+ unsigned sz = SGNaryExpression<T>::getNumOperands();
+ for (unsigned i = 1; i < sz; ++i)
+ value -= getOperand(i)->getValue(b);
+ }
+ using SGNaryExpression<T>::getValue;
+ using SGNaryExpression<T>::getOperand;
+};
+
template<typename T>
class SGProductExpression : public SGNaryExpression<T> {
public:
void eval(bool& value, const expression::Binding* b) const
{
value = false;
- for (int i = 0; i < getNumOperands(); ++i) {
+ for (int i = 0; i < (int)getNumOperands(); ++i) {
value = value || getOperand(i)->getValue(b);
if (value)
return;
void eval(bool& value, const expression::Binding* b) const
{
value = true;
- for (int i = 0; i < getNumOperands(); ++i) {
+ for (int i = 0; i < (int)getNumOperands(); ++i) {
value = value && getOperand(i)->getValue(b);
if (!value)
return;
ConvertExpression() {}
ConvertExpression(::SGExpression<OpType>* expr0)
{
- addOperand(expr0);
+ this->addOperand(expr0);
}
virtual void eval(T& value, const simgear::expression::Binding* b) const
{