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

From Cedric Pinson, Fix osgAnimation warning and errors

Browse Source
This commit is contained in:
Cedric Pinson
2009-06-16 12:32:02 +00:00
parent a6e57f6e46
commit 93cafb2292
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgAnimation/Action.cpp
View File

@@ -170,7 +170,7 @@ osgAnimation::StripAnimation::StripAnimation(Animation* animation, double blendI
_blendIn = new BlendIn(animation, blendInDuration, blendInWeightTarget);
_animation = new ActionAnimation(animation);
unsigned int start = static_cast<unsigned int>(floor((_animation->getDuration() - blendOutDuration) * _fps));
_blendOut = FrameAction(start, new BlendOut(animation, blendOutDuration));
_blendOut = FrameBlendOut(start, new BlendOut(animation, blendOutDuration));
setName(animation->getName() + "_Strip");
_blendIn->setName(_animation->getName() + "_" + _blendIn->getName());
_blendOut.second->setName(_animation->getName() + "_" + _blendOut.second->getName());
@@ -188,7 +188,7 @@ void osgAnimation::StripAnimation::setLoop(unsigned int loop)
// duration changed re evaluate the blendout duration
unsigned int start = static_cast<unsigned int>(floor((getDuration() - _blendOut.second->getDuration()) * _fps));
_blendOut = FrameAction(start, _blendOut.second);
_blendOut = FrameBlendOut(start, _blendOut.second);
}
void osgAnimation::StripAnimation::computeWeightAndUpdateAnimation(unsigned int frame)

8
src/osgAnimation/StatsHandler.cpp
View File

@@ -343,7 +343,7 @@ struct ValueTextDrawCallback : public virtual osg::Drawable::DrawCallback
osg::Vec4 backgroundColor(0.0, 0.0, 0.0f, 0.3);
float backgroundMargin = 5;
float backgroundSpacing = 3;
//float backgroundSpacing = 3;
osg::Vec4 color(1.0, 1.0, 1.0, 1.0);
@@ -352,7 +352,7 @@ struct ValueTextDrawCallback : public virtual osg::Drawable::DrawCallback
{
osg::Vec3 pos(leftPos, _statsHeight-24.0f,0.0f);
float topOfViewerStats = pos.y() + characterSize;
//float topOfViewerStats = pos.y() + characterSize;
osg::ref_ptr<osg::Stats> stats = _timeline->getStats();
pos.y() -= characterSize + backgroundMargin;
@@ -382,7 +382,7 @@ struct ValueTextDrawCallback : public virtual osg::Drawable::DrawCallback
}
{
osg::Vec3 pos(leftPos, _statsHeight - 24.0f ,0.0f);
float topOfViewerStats = pos.y();
//float topOfViewerStats = pos.y();
osg::Geode* geode = new osg::Geode;
_background = createBackgroundRectangle(
pos + osg::Vec3(-backgroundMargin, backgroundMargin, 0),
@@ -415,7 +415,7 @@ struct ValueTextDrawCallback : public virtual osg::Drawable::DrawCallback
float characterSize = 20.0f;
float backgroundMargin = 5;
float backgroundSpacing = 3;
//float backgroundSpacing = 3;
float graphSpacing = 5;
float width = _statsWidth - 4 * backgroundMargin;