FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

osgAnimation now stores times as doubles

Browse Source
This commit is contained in:
Michael PLATINGS
2010-04-12 16:35:15 +00:00
parent 5d64318597
commit 25cd2970c5
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgPlugins/fbx/fbxRAnimation.cpp
View File

@@ -27,8 +27,8 @@ void readKeys(KFCurve* curveX, KFCurve* curveY, KFCurve* curveZ,
{
KFCurve* curves[3] = {curveX, curveY, curveZ};
typedef std::set<float> TimeSet;
typedef std::map<float, float> TimeFloatMap;
typedef std::set<double> TimeSet;
typedef std::map<double, float> TimeFloatMap;
TimeSet times;
TimeFloatMap curveTimeMap[3];
@@ -40,14 +40,14 @@ void readKeys(KFCurve* curveX, KFCurve* curveY, KFCurve* curveZ,
if (!nKeys)
{
times.insert(0.0f);
curveTimeMap[nCurve][0.0f] = static_cast<float>(pCurve->GetValue()) * scalar;
times.insert(0.0);
curveTimeMap[nCurve][0.0] = static_cast<float>(pCurve->GetValue()) * scalar;
}
for (int i = 0; i < nKeys; ++i)
{
KFCurveKey key = pCurve->KeyGet(i);
float fTime = static_cast<float>(key.GetTime().GetSecondDouble());
double fTime = key.GetTime().GetSecondDouble();
times.insert(fTime);
curveTimeMap[nCurve][fTime] = static_cast<float>(key.GetValue()) * scalar;
}
@@ -55,7 +55,7 @@ void readKeys(KFCurve* curveX, KFCurve* curveY, KFCurve* curveZ,
for (TimeSet::iterator it = times.begin(); it != times.end(); ++it)
{
float fTime = *it;
double fTime = *it;
osg::Vec3 val;
for (int i = 0; i < 3; ++i)
{

2
src/osgPlugins/fbx/fbxRMesh.cpp
View File

@@ -263,7 +263,7 @@ void readAnimation(KFbxNode* pNode, const std::string& targetName,
for (int k = 0; k < nKeys; ++k)
{
KFCurveKey key = pCurve->KeyGet(k);
float fTime = static_cast<float>(key.GetTime().GetSecondDouble());
double fTime = key.GetTime().GetSecondDouble();
float fValue = static_cast<float>(key.GetValue() * 0.01);
keyFrameCntr.push_back(osgAnimation::FloatKeyframe(fTime,fValue));
}