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

Fixed handling of double precision bounding sphere type.

Browse Source
This commit is contained in:
Robert Osfield 2009-08-21 10:18:46 +00:00
parent aa85f18bbc
commit 8f0322d9d1
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/osgPresentation/SlideShowConstructor.cpp
View File

@ -868,7 +868,9 @@ void SlideShowConstructor::addImage(const std::string& filename, const PositionD
{ {
osg::notify(osg::INFO)<<"Have animation path for image"<<std::endl; osg::notify(osg::INFO)<<"Have animation path for image"<<std::endl;
osg::Vec3 pivot = positionData.absolute_path ? osg::Vec3(0.0f,0.0f,0.0f) : subgraph->getBound().center(); osg::BoundingSphere::vec_type pivot = positionData.absolute_path ?
osg::BoundingSphere::vec_type(0.0f,0.0f,0.0f) :
subgraph->getBound().center();
osg::PositionAttitudeTransform* animation_transform = new osg::PositionAttitudeTransform; osg::PositionAttitudeTransform* animation_transform = new osg::PositionAttitudeTransform;
animation_transform->setDataVariance(osg::Object::DYNAMIC); animation_transform->setDataVariance(osg::Object::DYNAMIC);
@ -1029,7 +1031,9 @@ void SlideShowConstructor::addStereoImagePair(const std::string& filenameLeft, c
{ {
osg::notify(osg::INFO)<<"Have animation path for image"<<std::endl; osg::notify(osg::INFO)<<"Have animation path for image"<<std::endl;
osg::Vec3 pivot = positionData.absolute_path ? osg::Vec3(0.0f,0.0f,0.0f) : subgraph->getBound().center(); osg::BoundingSphere::vec_type pivot = positionData.absolute_path ?
osg::BoundingSphere::vec_type(0.0f,0.0f,0.0f) :
subgraph->getBound().center();
osg::PositionAttitudeTransform* animation_transform = new osg::PositionAttitudeTransform; osg::PositionAttitudeTransform* animation_transform = new osg::PositionAttitudeTransform;
animation_transform->setDataVariance(osg::Object::DYNAMIC); animation_transform->setDataVariance(osg::Object::DYNAMIC);
@ -1167,7 +1171,9 @@ osg::Image* SlideShowConstructor::addInteractiveImage(const std::string& filenam
{ {
osg::notify(osg::INFO)<<"Have animation path for image"<<std::endl; osg::notify(osg::INFO)<<"Have animation path for image"<<std::endl;
osg::Vec3 pivot = positionData.absolute_path ? osg::Vec3(0.0f,0.0f,0.0f) : subgraph->getBound().center(); osg::BoundingSphere::vec_type pivot = positionData.absolute_path ?
osg::BoundingSphere::vec_type(0.0f,0.0f,0.0f) :
subgraph->getBound().center();
osg::PositionAttitudeTransform* animation_transform = new osg::PositionAttitudeTransform; osg::PositionAttitudeTransform* animation_transform = new osg::PositionAttitudeTransform;
animation_transform->setDataVariance(osg::Object::DYNAMIC); animation_transform->setDataVariance(osg::Object::DYNAMIC);
@ -1351,7 +1357,9 @@ void SlideShowConstructor::addModel(osg::Node* subgraph, const PositionData& pos
{ {
osg::notify(osg::INFO)<<"Have animation path for model"<<std::endl; osg::notify(osg::INFO)<<"Have animation path for model"<<std::endl;
osg::Vec3 pivot = positionData.absolute_path ? osg::Vec3(0.0f,0.0f,0.0f) : subgraph->getBound().center(); osg::BoundingSphere::vec_type pivot = positionData.absolute_path ?
osg::BoundingSphere::vec_type(0.0f,0.0f,0.0f) :
subgraph->getBound().center();
osg::AnimationPath* path = animation->getAnimationPath(); osg::AnimationPath* path = animation->getAnimationPath();
if (positionData.animation_name=="wheel" && (path->getTimeControlPointMap()).size()>=2) if (positionData.animation_name=="wheel" && (path->getTimeControlPointMap()).size()>=2)