#include <osg/Texture2D>
#include <osg/Transform>
#include <osgDB/ReadFile>
+#include <osgDB/Registry>
+#include <osgDB/Input>
+#include <osgDB/ParameterOutput>
+
#include <simgear/math/interpolater.hxx>
#include <simgear/props/condition.hxx>
#include "SGMaterialAnimation.hxx"
#include "SGRotateTransform.hxx"
#include "SGScaleTransform.hxx"
+#include "SGInteractionAnimation.hxx"
+
+using OpenThreads::Mutex;
+using OpenThreads::ReentrantMutex;
+using OpenThreads::ScopedLock;
\f
////////////////////////////////////////////////////////////////////////
matrix(3, 2) = xyz[2];
}
-/**
- * Modify property value by step and scroll settings in texture translations
- */
-static double
-apply_mods(double property, double step, double scroll, double bias)
-{
-
- double modprop;
- property += bias;
- if(step > 0) {
- double scrollval = 0.0;
- if(scroll > 0) {
- // calculate scroll amount (for odometer like movement)
- double 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;
- }
- return modprop;
-
-}
-
/**
* Read an interpolation table from properties.
*/
return new SGInterpTable(table_node);
}
-////////////////////////////////////////////////////////////////////////
-// Utility value classes
-////////////////////////////////////////////////////////////////////////
-class SGScaleOffsetValue : public SGDoubleValue {
-public:
- SGScaleOffsetValue(SGPropertyNode const* propertyNode) :
- _propertyNode(propertyNode),
- _scale(1),
- _offset(0),
- _min(-SGLimitsd::max()),
- _max(SGLimitsd::max())
- { }
- void setScale(double scale)
- { _scale = scale; }
- void setOffset(double offset)
- { _offset = offset; }
- void setMin(double min)
- { _min = min; }
- void setMax(double max)
- { _max = max; }
-
- virtual double getValue() const
- {
- double value = _propertyNode ? _propertyNode->getDoubleValue() : 0;
- return std::min(_max, std::max(_min, _offset + _scale*value));
- }
-private:
- SGSharedPtr<SGPropertyNode const> _propertyNode;
- double _scale;
- double _offset;
- double _min;
- double _max;
-};
+static std::string
+unit_string(const char* value, const char* unit)
+{
+ return std::string(value) + unit;
+}
-class SGPersScaleOffsetValue : public SGDoubleValue {
+class SGPersonalityScaleOffsetExpression : public SGUnaryExpression<double> {
public:
- SGPersScaleOffsetValue(SGPropertyNode const* propertyNode,
- SGPropertyNode const* config,
- const char* scalename, const char* offsetname,
- double defScale = 1, double defOffset = 0) :
- _propertyNode(propertyNode),
- _scale(config, scalename, defScale),
- _offset(config, offsetname, defOffset),
- _min(-SGLimitsd::max()),
- _max(SGLimitsd::max())
+ SGPersonalityScaleOffsetExpression(SGExpression<double>* expr,
+ SGPropertyNode const* config,
+ const std::string& scalename,
+ const std::string& offsetname,
+ double defScale = 1,
+ double defOffset = 0) :
+ SGUnaryExpression<double>(expr),
+ _scale(config, scalename.c_str(), defScale),
+ _offset(config, offsetname.c_str(), defOffset)
{ }
void setScale(double scale)
{ _scale = scale; }
void setOffset(double offset)
{ _offset = offset; }
- void setMin(double min)
- { _min = min; }
- void setMax(double max)
- { _max = max; }
- virtual double getValue() const
+ virtual void eval(double& value, const simgear::expression::Binding* b) const
{
_offset.shuffle();
_scale.shuffle();
- double value = _propertyNode ? _propertyNode->getDoubleValue() : 0;
- return SGMiscd::clip(_offset + _scale*value, _min, _max);
+ value = _offset + _scale*getOperand()->getValue(b);
}
+
+ virtual bool isConst() const { return false; }
+
private:
- SGSharedPtr<SGPropertyNode const> _propertyNode;
mutable SGPersonalityParameter<double> _scale;
mutable SGPersonalityParameter<double> _offset;
- double _min;
- double _max;
};
-class SGInterpTableValue : public SGDoubleValue {
-public:
- SGInterpTableValue(SGPropertyNode const* propertyNode,
- SGInterpTable const* interpTable) :
- _propertyNode(propertyNode),
- _interpTable(interpTable)
- { }
- virtual double getValue() const
- { return _interpTable->interpolate(_propertyNode ? _propertyNode->getDoubleValue() : 0); }
-private:
- SGSharedPtr<SGPropertyNode const> _propertyNode;
- SGSharedPtr<SGInterpTable const> _interpTable;
-};
-class SGTexScaleOffsetValue : public SGDoubleValue {
-public:
- SGTexScaleOffsetValue(const SGPropertyNode* propertyNode) :
- _propertyNode(propertyNode),
- _scale(1),
- _offset(0),
- _step(0),
- _scroll(0),
- _bias(0),
- _min(-SGLimitsd::max()),
- _max(SGLimitsd::max())
- { }
- void setScale(double scale)
- { _scale = scale; }
- void setOffset(double offset)
- { _offset = offset; }
- void setStep(double step)
- { _step = step; }
- void setScroll(double scroll)
- { _scroll = scroll; }
- void setBias(double bias)
- { _bias = bias; }
- void setMin(double min)
- { _min = min; }
- void setMax(double max)
- { _max = max; }
-
- virtual double getValue() const
- {
- double value = _propertyNode ? _propertyNode->getDoubleValue() : 0;
- value = apply_mods(value, _step, _scroll, _bias);
- return SGMiscd::clip(_scale*(_offset + value), _min, _max);
- }
-private:
- SGSharedPtr<const SGPropertyNode> _propertyNode;
- double _scale;
- double _offset;
- double _step;
- double _scroll;
- double _bias;
- double _min;
- double _max;
-};
-
-class SGTexTableValue : public SGDoubleValue {
-public:
- SGTexTableValue(const SGPropertyNode* propertyNode,
- const SGInterpTable* interpTable) :
- _propertyNode(propertyNode),
- _interpTable(interpTable)
- { }
- void setStep(double step)
- { _step = step; }
- void setScroll(double scroll)
- { _scroll = scroll; }
- void setBias(double bias)
- { _bias = bias; }
- virtual double getValue() const
- {
- double value = _propertyNode ? _propertyNode->getDoubleValue() : 0;
- value = apply_mods(value, _step, _scroll, _bias);
- return _interpTable->interpolate(value);
- }
-private:
- SGSharedPtr<SGPropertyNode const> _propertyNode;
- SGSharedPtr<SGInterpTable const> _interpTable;
- double _step;
- double _scroll;
- double _bias;
-};
+static SGExpressiond*
+read_factor_offset(const SGPropertyNode* configNode, SGExpressiond* expr,
+ const std::string& factor, const std::string& offset)
+{
+ double factorValue = configNode->getDoubleValue(factor, 1);
+ if (factorValue != 1)
+ expr = new SGScaleExpression<double>(expr, factorValue);
+ double offsetValue = configNode->getDoubleValue(offset, 0);
+ if (offsetValue != 0)
+ expr = new SGBiasExpression<double>(expr, offsetValue);
+ return expr;
+}
-static std::string
-unit_string(const char* value, const char* unit)
+static SGExpressiond*
+read_offset_factor(const SGPropertyNode* configNode, SGExpressiond* expr,
+ const std::string& factor, const std::string& offset)
{
- return std::string(value) + unit;
+ double offsetValue = configNode->getDoubleValue(offset, 0);
+ if (offsetValue != 0)
+ expr = new SGBiasExpression<double>(expr, offsetValue);
+ double factorValue = configNode->getDoubleValue(factor, 1);
+ if (factorValue != 1)
+ expr = new SGScaleExpression<double>(expr, factorValue);
+ return expr;
}
-static SGDoubleValue*
+SGExpressiond*
read_value(const SGPropertyNode* configNode, SGPropertyNode* modelRoot,
const char* unit, double defMin, double defMax)
{
- std::string inputPropertyName;
- inputPropertyName = configNode->getStringValue("property", "");
- if (!inputPropertyName.empty()) {
+ SGExpression<double>* value = 0;
+
+ std::string inputPropertyName = configNode->getStringValue("property", "");
+ if (inputPropertyName.empty()) {
+ std::string spos = unit_string("starting-position", unit);
+ double initPos = configNode->getDoubleValue(spos, 0);
+ value = new SGConstExpression<double>(initPos);
+ } else {
SGPropertyNode* inputProperty;
- inputProperty = modelRoot->getNode(inputPropertyName.c_str(), true);
- SGInterpTable* interpTable = read_interpolation_table(configNode);
- if (interpTable) {
- SGInterpTableValue* value;
- value = new SGInterpTableValue(inputProperty, interpTable);
- return value;
+ inputProperty = modelRoot->getNode(inputPropertyName, true);
+ value = new SGPropertyExpression<double>(inputProperty);
+ }
+
+ SGInterpTable* interpTable = read_interpolation_table(configNode);
+ if (interpTable) {
+ return new SGInterpTableExpression<double>(value, interpTable);
+ } else {
+ std::string offset = unit_string("offset", unit);
+ std::string min = unit_string("min", unit);
+ std::string max = unit_string("max", unit);
+
+ if (configNode->getBoolValue("use-personality", false)) {
+ value = new SGPersonalityScaleOffsetExpression(value, configNode,
+ "factor", offset);
} else {
- std::string offset = unit_string("offset", unit);
- std::string min = unit_string("min", unit);
- std::string max = unit_string("max", unit);
-
- if (configNode->getBoolValue("use-personality", false)) {
- SGPersScaleOffsetValue* value;
- value = new SGPersScaleOffsetValue(inputProperty, configNode,
- "factor", offset.c_str());
- value->setMin(configNode->getDoubleValue(min.c_str(), defMin));
- value->setMax(configNode->getDoubleValue(max.c_str(), defMax));
- return value;
- } else {
- SGScaleOffsetValue* value = new SGScaleOffsetValue(inputProperty);
- value->setScale(configNode->getDoubleValue("factor", 1));
- value->setOffset(configNode->getDoubleValue(offset.c_str(), 0));
- value->setMin(configNode->getDoubleValue(min.c_str(), defMin));
- value->setMax(configNode->getDoubleValue(max.c_str(), defMax));
- return value;
- }
+ value = read_factor_offset(configNode, value, "factor", offset);
}
+
+ double minClip = configNode->getDoubleValue(min, defMin);
+ double maxClip = configNode->getDoubleValue(max, defMax);
+ if (minClip > SGMiscd::min(SGLimitsd::min(), -SGLimitsd::max()) ||
+ maxClip < SGLimitsd::max())
+ value = new SGClipExpression<double>(value, minClip, maxClip);
+
+ return value;
}
return 0;
}
using namespace osg;
using namespace std;
- for (int i = 0; i < geode.getNumDrawables(); ++i)
+ for (int i = 0; i < (int)geode.getNumDrawables(); ++i)
geode.getDrawable(i)->setUseDisplayList(false);
}
};
} else if (type == "flash") {
SGFlashAnimation animInst(configNode, modelRoot);
animInst.apply(node);
+ } else if (type == "interaction") {
+ SGInteractionAnimation animInst(configNode, modelRoot);
+ animInst.apply(node);
} else if (type == "material") {
SGMaterialAnimation animInst(configNode, modelRoot, options);
animInst.apply(node);
class SGTranslateAnimation::UpdateCallback : public osg::NodeCallback {
public:
UpdateCallback(SGCondition const* condition,
- SGDoubleValue const* animationValue) :
+ SGExpressiond const* animationValue) :
_condition(condition),
_animationValue(animationValue)
{ }
}
public:
SGSharedPtr<SGCondition const> _condition;
- SGSharedPtr<SGDoubleValue const> _animationValue;
+ SGSharedPtr<SGExpressiond const> _animationValue;
};
SGTranslateAnimation::SGTranslateAnimation(const SGPropertyNode* configNode,
SGAnimation(configNode, modelRoot)
{
_condition = getCondition();
- _animationValue = read_value(configNode, modelRoot, "-m",
- -SGLimitsd::max(), SGLimitsd::max());
- _axis[0] = configNode->getDoubleValue("axis/x", 0);
- _axis[1] = configNode->getDoubleValue("axis/y", 0);
- _axis[2] = configNode->getDoubleValue("axis/z", 0);
+ SGSharedPtr<SGExpressiond> value;
+ value = read_value(configNode, modelRoot, "-m",
+ -SGLimitsd::max(), SGLimitsd::max());
+ _animationValue = value->simplify();
+ if (_animationValue)
+ _initialValue = _animationValue->getValue();
+ else
+ _initialValue = 0;
+
+ if (configNode->hasValue("axis/x1-m")) {
+ SGVec3d v1, v2;
+ v1[0] = configNode->getDoubleValue("axis/x1-m", 0);
+ v1[1] = configNode->getDoubleValue("axis/y1-m", 0);
+ v1[2] = configNode->getDoubleValue("axis/z1-m", 0);
+ v2[0] = configNode->getDoubleValue("axis/x2-m", 0);
+ v2[1] = configNode->getDoubleValue("axis/y2-m", 0);
+ v2[2] = configNode->getDoubleValue("axis/z2-m", 0);
+ _axis = v2 - v1;
+ } else {
+ _axis[0] = configNode->getDoubleValue("axis/x", 0);
+ _axis[1] = configNode->getDoubleValue("axis/y", 0);
+ _axis[2] = configNode->getDoubleValue("axis/z", 0);
+ }
if (8*SGLimitsd::min() < norm(_axis))
_axis = normalize(_axis);
-
- _initialValue = configNode->getDoubleValue("starting-position-m", 0);
- _initialValue *= configNode->getDoubleValue("factor", 1);
- _initialValue += configNode->getDoubleValue("offset-m", 0);
}
osg::Group*
{
SGTranslateTransform* transform = new SGTranslateTransform;
transform->setName("translate animation");
- if (_animationValue) {
+ if (_animationValue && !_animationValue->isConst()) {
UpdateCallback* uc = new UpdateCallback(_condition, _animationValue);
transform->setUpdateCallback(uc);
}
class SGRotateAnimation::UpdateCallback : public osg::NodeCallback {
public:
UpdateCallback(SGCondition const* condition,
- SGDoubleValue const* animationValue) :
+ SGExpressiond const* animationValue) :
_condition(condition),
_animationValue(animationValue)
{ }
}
public:
SGSharedPtr<SGCondition const> _condition;
- SGSharedPtr<SGDoubleValue const> _animationValue;
+ SGSharedPtr<SGExpressiond const> _animationValue;
};
class SGRotateAnimation::SpinUpdateCallback : public osg::NodeCallback {
public:
SpinUpdateCallback(SGCondition const* condition,
- SGDoubleValue const* animationValue) :
+ SGExpressiond const* animationValue) :
_condition(condition),
_animationValue(animationValue),
_lastTime(-1)
}
public:
SGSharedPtr<SGCondition const> _condition;
- SGSharedPtr<SGDoubleValue const> _animationValue;
+ SGSharedPtr<SGExpressiond const> _animationValue;
double _lastTime;
};
-SGRotateAnimation::SGRotateAnimation(const SGPropertyNode* configNode, SGPropertyNode* modelRoot) :
+SGRotateAnimation::SGRotateAnimation(const SGPropertyNode* configNode,
+ SGPropertyNode* modelRoot) :
SGAnimation(configNode, modelRoot)
{
std::string type = configNode->getStringValue("type", "");
_isSpin = (type == "spin");
_condition = getCondition();
- _animationValue = read_value(configNode, modelRoot, "-deg",
- -SGLimitsd::max(), SGLimitsd::max());
- _initialValue = configNode->getDoubleValue("starting-position-deg", 0);
- _initialValue *= configNode->getDoubleValue("factor", 1);
- _initialValue += configNode->getDoubleValue("offset-deg", 0);
+ SGSharedPtr<SGExpressiond> value;
+ value = read_value(configNode, modelRoot, "-deg",
+ -SGLimitsd::max(), SGLimitsd::max());
+ _animationValue = value->simplify();
+ if (_animationValue)
+ _initialValue = _animationValue->getValue();
+ else
+ _initialValue = 0;
_center = SGVec3d::zeros();
if (configNode->hasValue("axis/x1-m")) {
SpinUpdateCallback* uc;
uc = new SpinUpdateCallback(_condition, _animationValue);
transform->setUpdateCallback(uc);
- } else if (_animationValue) {
+ } else if (_animationValue || !_animationValue->isConst()) {
UpdateCallback* uc = new UpdateCallback(_condition, _animationValue);
transform->setUpdateCallback(uc);
}
class SGScaleAnimation::UpdateCallback : public osg::NodeCallback {
public:
UpdateCallback(const SGCondition* condition,
- SGSharedPtr<const SGDoubleValue> animationValue[3]) :
+ SGSharedPtr<const SGExpressiond> animationValue[3]) :
_condition(condition)
{
_animationValue[0] = animationValue[0];
}
public:
SGSharedPtr<SGCondition const> _condition;
- SGSharedPtr<SGDoubleValue const> _animationValue[3];
+ SGSharedPtr<SGExpressiond const> _animationValue[3];
};
SGScaleAnimation::SGScaleAnimation(const SGPropertyNode* configNode,
double offset = configNode->getDoubleValue("offset", 0);
double factor = configNode->getDoubleValue("factor", 1);
+ SGSharedPtr<SGExpressiond> inPropExpr;
+
std::string inputPropertyName;
inputPropertyName = configNode->getStringValue("property", "");
- SGPropertyNode* inputProperty = 0;
- if (!inputPropertyName.empty()) {
- inputProperty = modelRoot->getNode(inputPropertyName.c_str(), true);
+ if (inputPropertyName.empty()) {
+ inPropExpr = new SGConstExpression<double>(0);
+ } else {
+ SGPropertyNode* inputProperty;
+ inputProperty = modelRoot->getNode(inputPropertyName, true);
+ inPropExpr = new SGPropertyExpression<double>(inputProperty);
}
+
SGInterpTable* interpTable = read_interpolation_table(configNode);
if (interpTable) {
- SGInterpTableValue* value;
- value = new SGInterpTableValue(inputProperty, interpTable);
- _animationValue[0] = value;
- _animationValue[1] = value;
- _animationValue[2] = value;
+ SGSharedPtr<SGExpressiond> value;
+ value = new SGInterpTableExpression<double>(inPropExpr, interpTable);
+ _animationValue[0] = value->simplify();
+ _animationValue[1] = value->simplify();
+ _animationValue[2] = value->simplify();
} else if (configNode->getBoolValue("use-personality", false)) {
- SGPersScaleOffsetValue* value;
- value = new SGPersScaleOffsetValue(inputProperty, configNode,
- "x-factor", "x-offset",
- factor, offset);
- value->setMin(configNode->getDoubleValue("x-min", 0));
- value->setMax(configNode->getDoubleValue("x-max", SGLimitsd::max()));
- _animationValue[0] = value;
- value = new SGPersScaleOffsetValue(inputProperty, configNode,
- "y-factor", "y-offset",
- factor, offset);
- value->setMin(configNode->getDoubleValue("y-min", 0));
- value->setMax(configNode->getDoubleValue("y-max", SGLimitsd::max()));
- _animationValue[1] = value;
- value = new SGPersScaleOffsetValue(inputProperty, configNode,
- "z-factor", "z-offset",
- factor, offset);
- value->setMin(configNode->getDoubleValue("z-min", 0));
- value->setMax(configNode->getDoubleValue("z-max", SGLimitsd::max()));
- _animationValue[2] = value;
+ SGSharedPtr<SGExpressiond> value;
+ value = new SGPersonalityScaleOffsetExpression(inPropExpr, configNode,
+ "x-factor", "x-offset",
+ factor, offset);
+ double minClip = configNode->getDoubleValue("x-min", 0);
+ double maxClip = configNode->getDoubleValue("x-max", SGLimitsd::max());
+ value = new SGClipExpression<double>(value, minClip, maxClip);
+ _animationValue[0] = value->simplify();
+
+ value = new SGPersonalityScaleOffsetExpression(inPropExpr, configNode,
+ "y-factor", "y-offset",
+ factor, offset);
+ minClip = configNode->getDoubleValue("y-min", 0);
+ maxClip = configNode->getDoubleValue("y-max", SGLimitsd::max());
+ value = new SGClipExpression<double>(value, minClip, maxClip);
+ _animationValue[1] = value->simplify();
+
+ value = new SGPersonalityScaleOffsetExpression(inPropExpr, configNode,
+ "z-factor", "z-offset",
+ factor, offset);
+ minClip = configNode->getDoubleValue("z-min", 0);
+ maxClip = configNode->getDoubleValue("z-max", SGLimitsd::max());
+ value = new SGClipExpression<double>(value, minClip, maxClip);
+ _animationValue[2] = value->simplify();
} else {
- SGScaleOffsetValue* value = new SGScaleOffsetValue(inputProperty);
- value->setScale(configNode->getDoubleValue("x-factor", factor));
- value->setOffset(configNode->getDoubleValue("x-offset", offset));
- value->setMin(configNode->getDoubleValue("x-min", 0));
- value->setMax(configNode->getDoubleValue("x-max", SGLimitsd::max()));
- _animationValue[0] = value;
- value = new SGScaleOffsetValue(inputProperty);
- value->setScale(configNode->getDoubleValue("y-factor", factor));
- value->setOffset(configNode->getDoubleValue("y-offset", offset));
- value->setMin(configNode->getDoubleValue("y-min", 0));
- value->setMax(configNode->getDoubleValue("y-max", SGLimitsd::max()));
- _animationValue[1] = value;
- value = new SGScaleOffsetValue(inputProperty);
- value->setScale(configNode->getDoubleValue("z-factor", factor));
- value->setOffset(configNode->getDoubleValue("z-offset", offset));
- value->setMin(configNode->getDoubleValue("z-min", 0));
- value->setMax(configNode->getDoubleValue("z-max", SGLimitsd::max()));
- _animationValue[2] = value;
+ SGSharedPtr<SGExpressiond> value;
+ value = read_factor_offset(configNode, inPropExpr, "x-factor", "x-offset");
+ double minClip = configNode->getDoubleValue("x-min", 0);
+ double maxClip = configNode->getDoubleValue("x-max", SGLimitsd::max());
+ value = new SGClipExpression<double>(value, minClip, maxClip);
+ _animationValue[0] = value->simplify();
+
+ value = read_factor_offset(configNode, inPropExpr, "y-factor", "y-offset");
+ minClip = configNode->getDoubleValue("y-min", 0);
+ maxClip = configNode->getDoubleValue("y-max", SGLimitsd::max());
+ value = new SGClipExpression<double>(value, minClip, maxClip);
+ _animationValue[1] = value->simplify();
+
+ value = read_factor_offset(configNode, inPropExpr, "z-factor", "z-offset");
+ minClip = configNode->getDoubleValue("z-min", 0);
+ maxClip = configNode->getDoubleValue("z-max", SGLimitsd::max());
+ value = new SGClipExpression<double>(value, minClip, maxClip);
+ _animationValue[2] = value->simplify();
}
_initialValue[0] = configNode->getDoubleValue("x-starting-scale", 1);
_initialValue[0] *= configNode->getDoubleValue("x-factor", factor);
namespace
{
-OpenThreads::Mutex normalizeMutex;
+Mutex normalizeMutex;
osg::StateSet* getNormalizeStateSet()
{
static osg::ref_ptr<osg::StateSet> normalizeStateSet;
- OpenThreads::ScopedLock<OpenThreads::Mutex> lock(normalizeMutex);
+ ScopedLock<Mutex> lock(normalizeMutex);
if (!normalizeStateSet.valid()) {
normalizeStateSet = new osg::StateSet;
normalizeStateSet->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
class SGDistScaleAnimation::Transform : public osg::Transform {
public:
+ Transform() : _min_v(0.0), _max_v(0.0), _factor(0.0), _offset(0.0) {}
+ Transform(const Transform& rhs,
+ const osg::CopyOp& copyOp = osg::CopyOp::SHALLOW_COPY)
+ : osg::Transform(rhs, copyOp), _table(rhs._table), _center(rhs._center),
+ _min_v(rhs._min_v), _max_v(rhs._max_v), _factor(rhs._factor),
+ _offset(rhs._offset)
+ {
+ }
+ META_Node(simgear, SGDistScaleAnimation::Transform);
Transform(const SGPropertyNode* configNode)
{
setName(configNode->getStringValue("name", "dist scale animation"));
return true;
}
+ static bool writeLocalData(const osg::Object& obj, osgDB::Output& fw)
+ {
+ const Transform& trans = static_cast<const Transform&>(obj);
+ fw.indent() << "center " << trans._center << "\n";
+ fw.indent() << "min_v " << trans._min_v << "\n";
+ fw.indent() << "max_v " << trans._max_v << "\n";
+ fw.indent() << "factor " << trans._factor << "\n";
+ fw.indent() << "offset " << trans._offset << "\n";
+ return true;
+ }
private:
double computeScaleFactor(osg::NodeVisitor* nv) const
{
if (!nv)
return 1;
- double scale_factor = (_center.osg() - nv->getEyePoint()).length();
+ double scale_factor = (toOsg(_center) - nv->getEyePoint()).length();
if (_table == 0) {
scale_factor = _factor * scale_factor + _offset;
} else {
return transform;
}
+namespace
+{
+ osgDB::RegisterDotOsgWrapperProxy distScaleAnimationTransformProxy
+ (
+ new SGDistScaleAnimation::Transform,
+ "SGDistScaleAnimation::Transform",
+ "Object Node Transform SGDistScaleAnimation::Transform Group",
+ 0,
+ &SGDistScaleAnimation::Transform::writeLocalData
+ );
+}
\f
////////////////////////////////////////////////////////////////////////
// Implementation of flash animation
class SGFlashAnimation::Transform : public osg::Transform {
public:
+ Transform() : _power(0.0), _factor(0.0), _offset(0.0), _min_v(0.0),
+ _max_v(0.0), _two_sides(false)
+ {}
+
+ Transform(const Transform& rhs,
+ const osg::CopyOp& copyOp = osg::CopyOp::SHALLOW_COPY)
+ : osg::Transform(rhs, copyOp), _center(rhs._center), _axis(rhs._axis),
+ _power(rhs._power), _factor(rhs._factor), _offset(rhs._offset),
+ _min_v(rhs._min_v), _max_v(rhs._max_v), _two_sides(rhs._two_sides)
+ {
+ }
+ META_Node(simgear, SGFlashAnimation::Transform);
+
Transform(const SGPropertyNode* configNode)
{
setReferenceFrame(RELATIVE_RF);
return true;
}
+ static bool writeLocalData(const osg::Object& obj, osgDB::Output& fw)
+ {
+ const Transform& trans = static_cast<const Transform&>(obj);
+ fw.indent() << "center " << trans._center[0] << " "
+ << trans._center[1] << " " << trans._center[2] << " " << "\n";
+ fw.indent() << "axis " << trans._axis[0] << " "
+ << trans._axis[1] << " " << trans._axis[2] << " " << "\n";
+ fw.indent() << "power " << trans._power << " \n";
+ fw.indent() << "min_v " << trans._min_v << "\n";
+ fw.indent() << "max_v " << trans._max_v << "\n";
+ fw.indent() << "factor " << trans._factor << "\n";
+ fw.indent() << "offset " << trans._offset << "\n";
+ fw.indent() << "twosides " << (trans._two_sides ? "true" : "false") << "\n";
+ return true;
+ }
private:
double computeScaleFactor(osg::NodeVisitor* nv) const
{
return transform;
}
+namespace
+{
+ osgDB::RegisterDotOsgWrapperProxy flashAnimationTransformProxy
+ (
+ new SGFlashAnimation::Transform,
+ "SGFlashAnimation::Transform",
+ "Object Node Transform SGFlashAnimation::Transform Group",
+ 0,
+ &SGFlashAnimation::Transform::writeLocalData
+ );
+}
\f
////////////////////////////////////////////////////////////////////////
-// Implementation of flash animation
+// Implementation of billboard animation
////////////////////////////////////////////////////////////////////////
class SGBillboardAnimation::Transform : public osg::Transform {
public:
+ Transform() : _spherical(true) {}
+ Transform(const Transform& rhs,
+ const osg::CopyOp& copyOp = osg::CopyOp::SHALLOW_COPY)
+ : osg::Transform(rhs, copyOp), _spherical(rhs._spherical) {}
+ META_Node(simgear, SGBillboardAnimation::Transform);
Transform(const SGPropertyNode* configNode) :
_spherical(configNode->getBoolValue("spherical", true))
{
// Hmm, don't yet know how to get that back ...
return false;
}
+ static bool writeLocalData(const osg::Object& obj, osgDB::Output& fw)
+ {
+ const Transform& trans = static_cast<const Transform&>(obj);
+ fw.indent() << (trans._spherical ? "true" : "false") << "\n";
+ return true;
+ }
private:
bool _spherical;
};
return transform;
}
+namespace
+{
+ osgDB::RegisterDotOsgWrapperProxy billboardAnimationTransformProxy
+ (
+ new SGBillboardAnimation::Transform,
+ "SGBillboardAnimation::Transform",
+ "Object Node Transform SGBillboardAnimation::Transform Group",
+ 0,
+ &SGBillboardAnimation::Transform::writeLocalData
+ );
+}
\f
////////////////////////////////////////////////////////////////////////
// Implementation of a range animation
class SGRangeAnimation::UpdateCallback : public osg::NodeCallback {
public:
UpdateCallback(const SGCondition* condition,
- const SGDoubleValue* minAnimationValue,
- const SGDoubleValue* maxAnimationValue,
+ const SGExpressiond* minAnimationValue,
+ const SGExpressiond* maxAnimationValue,
double minValue, double maxValue) :
_condition(condition),
_minAnimationValue(minAnimationValue),
private:
SGSharedPtr<const SGCondition> _condition;
- SGSharedPtr<const SGDoubleValue> _minAnimationValue;
- SGSharedPtr<const SGDoubleValue> _maxAnimationValue;
+ SGSharedPtr<const SGExpressiond> _minAnimationValue;
+ SGSharedPtr<const SGExpressiond> _maxAnimationValue;
double _minStaticValue;
double _maxStaticValue;
};
inputPropertyName = configNode->getStringValue("min-property", "");
if (!inputPropertyName.empty()) {
SGPropertyNode* inputProperty;
- inputProperty = modelRoot->getNode(inputPropertyName.c_str(), true);
- SGScaleOffsetValue* value = new SGScaleOffsetValue(inputProperty);
- value->setScale(configNode->getDoubleValue("min-factor", 1));
- _minAnimationValue = value;
+ inputProperty = modelRoot->getNode(inputPropertyName, true);
+ SGSharedPtr<SGExpressiond> value;
+ value = new SGPropertyExpression<double>(inputProperty);
+
+ value = read_factor_offset(configNode, value, "min-factor", "min-offset");
+ _minAnimationValue = value->simplify();
}
inputPropertyName = configNode->getStringValue("max-property", "");
if (!inputPropertyName.empty()) {
SGPropertyNode* inputProperty;
inputProperty = modelRoot->getNode(inputPropertyName.c_str(), true);
- SGScaleOffsetValue* value = new SGScaleOffsetValue(inputProperty);
- value->setScale(configNode->getDoubleValue("max-factor", 1));
- _maxAnimationValue = value;
+
+ SGSharedPtr<SGExpressiond> value;
+ value = new SGPropertyExpression<double>(inputProperty);
+
+ value = read_factor_offset(configNode, value, "max-factor", "max-offset");
+ _maxAnimationValue = value->simplify();
}
_initialValue[0] = configNode->getDoubleValue("min-m", 0);
namespace
{
// Keep one copy of the most common alpha test its state set.
-OpenThreads::ReentrantMutex alphaTestMutex;
+ReentrantMutex alphaTestMutex;
osg::ref_ptr<osg::AlphaFunc> standardAlphaFunc;
osg::ref_ptr<osg::StateSet> alphaFuncStateSet;
osg::AlphaFunc* makeAlphaFunc(float clamp)
{
- using namespace OpenThreads;
ScopedLock<ReentrantMutex> lock(alphaTestMutex);
if (osg::equivalent(clamp, 0.01f)) {
if (standardAlphaFunc.valid())
class SGBlendAnimation::UpdateCallback : public osg::NodeCallback {
public:
- UpdateCallback(const SGPropertyNode* configNode, const SGDoubleValue* v) :
+ UpdateCallback(const SGPropertyNode* configNode, const SGExpressiond* v) :
_prev_value(-1),
_animationValue(v)
{ }
}
public:
double _prev_value;
- SGSharedPtr<SGDoubleValue const> _animationValue;
+ SGSharedPtr<SGExpressiond const> _animationValue;
};
Translation(const SGVec3d& axis) :
_axis(axis)
{ }
- void setValue(double value)
- { _value = value; }
virtual void transform(osg::Matrix& matrix)
{
osg::Matrix tmp;
for (i = _transforms.begin(); i != _transforms.end(); ++i)
i->transform->transform(texMat->getMatrix());
}
- void appendTransform(Transform* transform, SGDoubleValue* value)
+ void appendTransform(Transform* transform, SGExpressiond* value)
{
Entry entry = { transform, value };
transform->transform(_matrix);
private:
struct Entry {
SGSharedPtr<Transform> transform;
- SGSharedPtr<const SGDoubleValue> value;
+ SGSharedPtr<const SGExpressiond> value;
};
typedef std::vector<Entry> TransformList;
TransformList _transforms;
osg::Group* group = new osg::Group;
group->setName("texture transform group");
osg::StateSet* stateSet = group->getOrCreateStateSet();
+ stateSet->setDataVariance(osg::Object::DYNAMIC);
osg::TexMat* texMat = new osg::TexMat;
UpdateCallback* updateCallback = new UpdateCallback(getCondition());
// interpret the configs ...
SGTexTransformAnimation::appendTexTranslate(const SGPropertyNode* config,
UpdateCallback* updateCallback)
{
- std::string propertyName = config->getStringValue("property", "/null");
- SGPropertyNode* inputNode;
- inputNode = getModelRoot()->getNode(propertyName.c_str(), true);
+ std::string propertyName = config->getStringValue("property", "");
+ SGSharedPtr<SGExpressiond> value;
+ if (propertyName.empty())
+ value = new SGConstExpression<double>(0);
+ else {
+ SGPropertyNode* inputProperty = getModelRoot()->getNode(propertyName, true);
+ value = new SGPropertyExpression<double>(inputProperty);
+ }
- SGDoubleValue* animationValue;
SGInterpTable* table = read_interpolation_table(config);
if (table) {
- SGTexTableValue* value;
- value = new SGTexTableValue(inputNode, table);
- value->setStep(config->getDoubleValue("step", 0));
- value->setScroll(config->getDoubleValue("scroll", 0));
- value->setBias(config->getDoubleValue("bias", 0));
- animationValue = value;
+ value = new SGInterpTableExpression<double>(value, table);
+ double biasValue = config->getDoubleValue("bias", 0);
+ if (biasValue != 0)
+ value = new SGBiasExpression<double>(value, biasValue);
+ value = new SGStepExpression<double>(value,
+ config->getDoubleValue("step", 0),
+ config->getDoubleValue("scroll", 0));
+ value = value->simplify();
} else {
- SGTexScaleOffsetValue* value;
- value = new SGTexScaleOffsetValue(inputNode);
- value->setScale(config->getDoubleValue("factor", 1));
- value->setOffset(config->getDoubleValue("offset", 0));
- value->setStep(config->getDoubleValue("step", 0));
- value->setScroll(config->getDoubleValue("scroll", 0));
- value->setBias(config->getDoubleValue("bias", 0));
- value->setMin(config->getDoubleValue("min", -SGLimitsd::max()));
- value->setMax(config->getDoubleValue("max", SGLimitsd::max()));
- animationValue = value;
+ double biasValue = config->getDoubleValue("bias", 0);
+ if (biasValue != 0)
+ value = new SGBiasExpression<double>(value, biasValue);
+ value = new SGStepExpression<double>(value,
+ config->getDoubleValue("step", 0),
+ config->getDoubleValue("scroll", 0));
+ value = read_offset_factor(config, value, "factor", "offset");
+
+ if (config->hasChild("min") || config->hasChild("max")) {
+ double minClip = config->getDoubleValue("min", -SGLimitsd::max());
+ double maxClip = config->getDoubleValue("max", SGLimitsd::max());
+ value = new SGClipExpression<double>(value, minClip, maxClip);
+ }
+ value = value->simplify();
}
SGVec3d axis(config->getDoubleValue("axis/x", 0),
config->getDoubleValue("axis/y", 0),
Translation* translation;
translation = new Translation(normalize(axis));
translation->setValue(config->getDoubleValue("starting-position", 0));
- updateCallback->appendTransform(translation, animationValue);
+ updateCallback->appendTransform(translation, value);
}
void
SGTexTransformAnimation::appendTexRotate(const SGPropertyNode* config,
UpdateCallback* updateCallback)
{
- std::string propertyName = config->getStringValue("property", "/null");
- SGPropertyNode* inputNode;
- inputNode = getModelRoot()->getNode(propertyName.c_str(), true);
+ std::string propertyName = config->getStringValue("property", "");
+ SGSharedPtr<SGExpressiond> value;
+ if (propertyName.empty())
+ value = new SGConstExpression<double>(0);
+ else {
+ SGPropertyNode* inputProperty = getModelRoot()->getNode(propertyName, true);
+ value = new SGPropertyExpression<double>(inputProperty);
+ }
- SGDoubleValue* animationValue;
SGInterpTable* table = read_interpolation_table(config);
if (table) {
- SGTexTableValue* value;
- value = new SGTexTableValue(inputNode, table);
- value->setStep(config->getDoubleValue("step", 0));
- value->setScroll(config->getDoubleValue("scroll", 0));
- value->setBias(config->getDoubleValue("bias", 0));
- animationValue = value;
+ value = new SGInterpTableExpression<double>(value, table);
+ double biasValue = config->getDoubleValue("bias", 0);
+ if (biasValue != 0)
+ value = new SGBiasExpression<double>(value, biasValue);
+ value = new SGStepExpression<double>(value,
+ config->getDoubleValue("step", 0),
+ config->getDoubleValue("scroll", 0));
+ value = value->simplify();
} else {
- SGTexScaleOffsetValue* value;
- value = new SGTexScaleOffsetValue(inputNode);
- value->setScale(config->getDoubleValue("factor", 1));
- value->setOffset(config->getDoubleValue("offset-deg", 0));
- value->setStep(config->getDoubleValue("step", 0));
- value->setScroll(config->getDoubleValue("scroll", 0));
- value->setBias(config->getDoubleValue("bias", 0));
- value->setMin(config->getDoubleValue("min-deg", -SGLimitsd::max()));
- value->setMax(config->getDoubleValue("max-deg", SGLimitsd::max()));
- animationValue = value;
+ double biasValue = config->getDoubleValue("bias", 0);
+ if (biasValue != 0)
+ value = new SGBiasExpression<double>(value, biasValue);
+ value = new SGStepExpression<double>(value,
+ config->getDoubleValue("step", 0),
+ config->getDoubleValue("scroll", 0));
+ value = read_offset_factor(config, value, "factor", "offset-deg");
+
+ if (config->hasChild("min-deg") || config->hasChild("max-deg")) {
+ double minClip = config->getDoubleValue("min-deg", -SGLimitsd::max());
+ double maxClip = config->getDoubleValue("max-deg", SGLimitsd::max());
+ value = new SGClipExpression<double>(value, minClip, maxClip);
+ }
+ value = value->simplify();
}
SGVec3d axis(config->getDoubleValue("axis/x", 0),
config->getDoubleValue("axis/y", 0),
Rotation* rotation;
rotation = new Rotation(normalize(axis), center);
rotation->setValue(config->getDoubleValue("starting-position-deg", 0));
- updateCallback->appendTransform(rotation, animationValue);
+ updateCallback->appendTransform(rotation, value);
}
public:
PickCallback(const SGPropertyNode* configNode,
SGPropertyNode* modelRoot) :
- _button(configNode->getIntValue("button", -1)),
_repeatable(configNode->getBoolValue("repeatable", false)),
_repeatInterval(configNode->getDoubleValue("interval-sec", 0.1))
{
SG_LOG(SG_INPUT, SG_DEBUG, "Reading all bindings");
std::vector<SGPropertyNode_ptr> bindings;
+
+ bindings = configNode->getChildren("button");
+ for (unsigned int i = 0; i < bindings.size(); ++i) {
+ _buttons.push_back( bindings[i]->getIntValue() );
+ }
bindings = configNode->getChildren("binding");
for (unsigned int i = 0; i < bindings.size(); ++i) {
_bindingsDown.push_back(new SGBinding(bindings[i], modelRoot));
}
virtual bool buttonPressed(int button, const Info&)
{
- if (0 <= _button && button != _button)
+ bool found = false;
+ for( std::vector<int>::iterator it = _buttons.begin(); it != _buttons.end(); it++ ) {
+ if( *it == button ) {
+ found = true;
+ break;
+ }
+ }
+ if (!found )
return false;
SGBindingList::const_iterator i;
for (i = _bindingsDown.begin(); i != _bindingsDown.end(); ++i)
(*i)->fire();
- _repeatTime = 0;
+ _repeatTime = -_repeatInterval; // anti-bobble: delay start of repeat
return true;
}
virtual void buttonReleased(void)
private:
SGBindingList _bindingsDown;
SGBindingList _bindingsUp;
- int _button;
+ std::vector<int> _buttons;
bool _repeatable;
double _repeatInterval;
double _repeatTime;
// Contains the normal geometry that is interactive
osg::ref_ptr<osg::Group> normalGroup = new osg::Group;
+ normalGroup->setName("pick normal group");
normalGroup->addChild(commonGroup);
// Used to render the geometry with just yellow edges
osg::Group* highlightGroup = new osg::Group;
+ highlightGroup->setName("pick highlight group");
highlightGroup->setNodeMask(SG_NODEMASK_PICK_BIT);
highlightGroup->addChild(commonGroup);
SGSceneUserData* ud;
- ud = SGSceneUserData::getOrCreateSceneUserData(highlightGroup);
+ ud = SGSceneUserData::getOrCreateSceneUserData(commonGroup);
std::vector<SGPropertyNode_ptr> actions;
actions = getConfig()->getChildren("action");
for (unsigned int i = 0; i < actions.size(); ++i)
projects / simgear.git / blobdiff