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

Modified Files:

Browse Source 
simgear/scene/model/animation.cxx:
	Change factor/offset order for texture animations.
	Fixes remaining bug with texture animations.
This commit is contained in:
frohlich
2008-01-07 22:05:48 +00:00
parent 605125c0e7
commit 22f2fac56b
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/animation.cxx
+15 -2
View File
@@ -173,6 +173,19 @@ read_factor_offset(const SGPropertyNode* configNode, SGExpressiond* expr,
return expr; return expr;
} }
static SGExpressiond*
read_offset_factor(const SGPropertyNode* configNode, SGExpressiond* expr,
const std::string& factor, const std::string& offset)
{
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 SGExpressiond* static SGExpressiond*
read_value(const SGPropertyNode* configNode, SGPropertyNode* modelRoot, read_value(const SGPropertyNode* configNode, SGPropertyNode* modelRoot,
const char* unit, double defMin, double defMax) const char* unit, double defMin, double defMax)
@@ -1866,7 +1879,7 @@ SGTexTransformAnimation::appendTexTranslate(const SGPropertyNode* config,
value = new SGStepExpression<double>(value, value = new SGStepExpression<double>(value,
config->getDoubleValue("step", 0), config->getDoubleValue("step", 0),
config->getDoubleValue("scroll", 0)); config->getDoubleValue("scroll", 0));
value = read_factor_offset(config, value, "factor", "offset"); value = read_offset_factor(config, value, "factor", "offset");
if (config->hasChild("min") || config->hasChild("max")) { if (config->hasChild("min") || config->hasChild("max")) {
double minClip = config->getDoubleValue("min", -SGLimitsd::max()); double minClip = config->getDoubleValue("min", -SGLimitsd::max());
@@ -1914,7 +1927,7 @@ SGTexTransformAnimation::appendTexRotate(const SGPropertyNode* config,
value = new SGStepExpression<double>(value, value = new SGStepExpression<double>(value,
config->getDoubleValue("step", 0), config->getDoubleValue("step", 0),
config->getDoubleValue("scroll", 0)); config->getDoubleValue("scroll", 0));
value = read_factor_offset(config, value, "factor", "offset-deg"); value = read_offset_factor(config, value, "factor", "offset-deg");
if (config->hasChild("min-deg") || config->hasChild("max-deg")) { if (config->hasChild("min-deg") || config->hasChild("max-deg")) {
double minClip = config->getDoubleValue("min-deg", -SGLimitsd::max()); double minClip = config->getDoubleValue("min-deg", -SGLimitsd::max());