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: Fix a problem of muliple
	texturre transform not finding the correct configuration.
This commit is contained in:
frohlich
2006-12-05 06:14:41 +00:00
parent 2df1da4226
commit c093841336
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
simgear/scene/model/animation.cxx
View File

@@ -2015,9 +2015,9 @@ SGTexTransformAnimation::appendTexTranslate(const SGPropertyNode* config,
value->setMax(config->getDoubleValue("max", SGLimitsd::max()));
animationValue = value;
}
SGVec3d axis(getConfig()->getDoubleValue("axis/x", 0),
getConfig()->getDoubleValue("axis/y", 0),
getConfig()->getDoubleValue("axis/z", 0));
SGVec3d axis(config->getDoubleValue("axis/x", 0),
config->getDoubleValue("axis/y", 0),
config->getDoubleValue("axis/z", 0));
Translation* translation;
translation = new Translation(normalize(axis));
translation->setValue(config->getDoubleValue("starting-position", 0));
@@ -2051,12 +2051,12 @@ SGTexTransformAnimation::appendTexRotate(const SGPropertyNode* config,
value->setMax(config->getDoubleValue("max-deg", SGLimitsd::max()));
animationValue = value;
}
SGVec3d axis(getConfig()->getDoubleValue("axis/x", 0),
getConfig()->getDoubleValue("axis/y", 0),
getConfig()->getDoubleValue("axis/z", 0));
SGVec3d center(getConfig()->getDoubleValue("center/x", 0),
getConfig()->getDoubleValue("center/y", 0),
getConfig()->getDoubleValue("center/z", 0));
SGVec3d axis(config->getDoubleValue("axis/x", 0),
config->getDoubleValue("axis/y", 0),
config->getDoubleValue("axis/z", 0));
SGVec3d center(config->getDoubleValue("center/x", 0),
config->getDoubleValue("center/y", 0),
config->getDoubleValue("center/z", 0));
Rotation* rotation;
rotation = new Rotation(normalize(axis), center);
rotation->setValue(config->getDoubleValue("starting-position-deg", 0));