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

Fixed FlattenStaticTransformVisitor bug which related to incorrect handling

Browse Source 
of objects which were transformed by multiple matrices at one time - this
cannot be handled in the flattening process (since we only have one piece
of geometry to transform).  This visitor now handles this case by disabling
flattening of any objects and transforms associated in this way.
This commit is contained in:
Robert Osfield
2002-01-22 19:30:51 +00:00
parent d115e143b5
commit f16776da22
2 changed files with 264 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
include/osgUtil/Optimizer
View File

@@ -48,13 +48,7 @@ class OSGUTIL_EXPORT Optimizer
{
public:
typedef std::vector<osg::Matrix> MatrixStack;
typedef std::set<osg::Transform*> TransformList;
MatrixStack _matrixStack;
TransformList _transformList;
bool _ignoreDynamicTransforms;
FlattenStaticTransformsVisitor(bool ignoreDynamicTransforms=true):
osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN),
@@ -67,6 +61,74 @@ class OSGUTIL_EXPORT Optimizer
void removeTransforms();
protected:
typedef std::vector<osg::Transform*> TransformStack;
typedef std::vector<osg::Matrix> MatrixStack;
struct TransformStruct
{
typedef std::set<osg::Object*> ObjectSet;
TransformStruct():_canBeApplied(true) {}
void add(osg::Object* obj) { _objectSet.insert(obj); }
bool _canBeApplied;
ObjectSet _objectSet;
};
struct ObjectStruct
{
typedef std::set<osg::Transform*> TransformSet;
ObjectStruct():_canBeApplied(true),_matrixSet(false),_moreThanOneMatrixRequired(false) {}
void add(TransformStack& transforms,osg::Matrix& matrix)
{
_transformSet.insert(transforms.begin(),transforms.end());
if (!_matrixSet)
{
_matrixSet = true;
_moreThanOneMatrixRequired = false;
_matrix = matrix;
}
else if (_matrix!=matrix)
{
_moreThanOneMatrixRequired = true;
}
}
bool _canBeApplied;
bool _matrixSet;
bool _moreThanOneMatrixRequired;
osg::Matrix _matrix;
TransformSet _transformSet;
};
typedef std::map<osg::Transform*,TransformStruct> TransformMap;
typedef std::map<osg::Object*,ObjectStruct> ObjectMap;
void disableObject(osg::Object* object)
{
disableObject(_objectMap.find(object));
}
void disableObject(ObjectMap::iterator itr);
void disableTransform(osg::Transform* transform);
void doTransform(osg::Object* obj,osg::Matrix& matrix);
bool _ignoreDynamicTransforms;
MatrixStack _matrixStack;
TransformStack _transformStack;
TransformMap _transformMap;
ObjectMap _objectMap;
};
/** Remove rendundent nodes, such as groups with one single child.*/