Fixes to Doxygen files from Neil.
Removed unused set/getReportMode() methods and member variables from IntersectVisitor. Added deep copy construction of Geometry objects.
This commit is contained in:
@@ -17,6 +17,8 @@ class StateSet;
|
||||
class StateAttribute;
|
||||
class Node;
|
||||
class Drawable;
|
||||
class Array;
|
||||
class Primitive;
|
||||
|
||||
/** Copy Op(erator) used to control the whether shallow or deep copy is used
|
||||
* during copy construction and clone operation.*/
|
||||
@@ -35,6 +37,8 @@ class SG_EXPORT CopyOp
|
||||
DEEP_COPY_STATEATTRIBUTES = 16,
|
||||
DEEP_COPY_TEXTURES = 32,
|
||||
DEEP_COPY_IMAGES = 64,
|
||||
DEEP_COPY_ARRAYS = 128,
|
||||
DEEP_COPY_PRIMITIVES = 256,
|
||||
DEEP_COPY_ALL = 0xffffffff
|
||||
};
|
||||
|
||||
@@ -51,6 +55,8 @@ class SG_EXPORT CopyOp
|
||||
virtual StateAttribute* operator() (const StateAttribute* attr) const;
|
||||
virtual Texture* operator() (const Texture* text) const;
|
||||
virtual Image* operator() (const Image* image) const;
|
||||
virtual Array* operator() (const Array* image) const;
|
||||
virtual Primitive* operator() (const Primitive* image) const;
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
@@ -76,17 +76,6 @@ class OSGUTIL_EXPORT IntersectVisitor : public osg::NodeVisitor
|
||||
/** Add a line segment to use for intersection testing during scene traversal.*/
|
||||
void addLineSegment(osg::LineSegment* seg);
|
||||
|
||||
/** Modes to control how IntersectVisitor reports hits. */
|
||||
enum HitReportingMode {
|
||||
ONLY_NEAREST_HIT,
|
||||
ALL_HITS
|
||||
};
|
||||
|
||||
/** Set the mode of how hits should reported back from a traversal.*/
|
||||
void setHitReportingMode(HitReportingMode hrm) { _hitReportingMode = hrm; }
|
||||
/** Get the mode of how hits should reported back from a traversal.*/
|
||||
HitReportingMode getHitReportingMode() { return _hitReportingMode; }
|
||||
|
||||
//typedef std::multiset<Hit> HitList;
|
||||
typedef std::vector<Hit> HitList;
|
||||
typedef std::map<osg::LineSegment*,HitList > LineSegmentHitListMap;
|
||||
@@ -151,8 +140,6 @@ class OSGUTIL_EXPORT IntersectVisitor : public osg::NodeVisitor
|
||||
IntersectStateStack _intersectStateStack;
|
||||
|
||||
osg::NodePath _nodePath;
|
||||
|
||||
HitReportingMode _hitReportingMode;
|
||||
LineSegmentHitListMap _segHitList;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user