diff --git a/doc/doc++/osg/AlphaFunc.html b/doc/doc++/osg/AlphaFunc.html
index 4d3273c36..6e2834e3f 100644
--- a/doc/doc++/osg/AlphaFunc.html
+++ b/doc/doc++/osg/AlphaFunc.html
@@ -109,9 +109,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Array.html b/doc/doc++/osg/Array.html
index a6025d6b8..4881d7671 100644
--- a/doc/doc++/osg/Array.html
+++ b/doc/doc++/osg/Array.html
@@ -79,9 +79,9 @@
-
virtual Object* clone(const CopyOp&) const
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/BlendFunc.html b/doc/doc++/osg/BlendFunc.html
index 6256c0b74..863159e93 100644
--- a/doc/doc++/osg/BlendFunc.html
+++ b/doc/doc++/osg/BlendFunc.html
@@ -113,9 +113,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Box.html b/doc/doc++/osg/Box.html
index 0e2c8c52f..cca3a6fe2 100644
--- a/doc/doc++/osg/Box.html
+++ b/doc/doc++/osg/Box.html
@@ -90,9 +90,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/ClipPlane.html b/doc/doc++/osg/ClipPlane.html
index 19a145091..7b7a82630 100644
--- a/doc/doc++/osg/ClipPlane.html
+++ b/doc/doc++/osg/ClipPlane.html
@@ -132,9 +132,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/CollectOccludersVisitor.html b/doc/doc++/osg/CollectOccludersVisitor.html
index 5b982e175..ad07e56ba 100644
--- a/doc/doc++/osg/CollectOccludersVisitor.html
+++ b/doc/doc++/osg/CollectOccludersVisitor.html
@@ -30,9 +30,9 @@
-
virtual void reset()
-
-
virtual float getDistanceToEyePoint(const Vec3& pos, bool withLODBias) const
+
virtual float getDistanceToEyePoint(const Vec3& pos, bool withLODScale) const
-
-
virtual float getDistanceFromEyePoint(const Vec3& pos, bool withLODBias) const
+
virtual float getDistanceFromEyePoint(const Vec3& pos, bool withLODScale) const
-
virtual void apply(osg::Node&)
-
@@ -118,7 +118,7 @@
-
inline bool validNodeMask(const osg::Node& node) const
-
-
void setTraversalMode(const TraversalMode mode)
+
void setTraversalMode(TraversalMode mode)
-
inline TraversalMode getTraversalMode() const
-
@@ -223,9 +223,9 @@
-
CullingMode getCullingMode() const
-
-
void setLODBias(float bias)
+
void setLODScale(float bias)
-
-
float getLODBias() const
+
float getLODScale() const
-
void setSmallFeatureCullingPixelSize(float value)
-
@@ -303,7 +303,7 @@
Protected Fields
-
CullingMode _cullingMode
-
-
float _LODBias
+
float _LODScale
-
float _smallFeatureCullingPixelSize
-
@@ -389,11 +389,11 @@
-
virtual float getDistanceToEyePoint(const Vec3& pos, bool withLODBias) const
+
virtual float getDistanceToEyePoint(const Vec3& pos, bool withLODScale) const
-
virtual float getDistanceFromEyePoint(const Vec3& pos, bool withLODBias) const
+
virtual float getDistanceFromEyePoint(const Vec3& pos, bool withLODScale) const
diff --git a/doc/doc++/osg/ColorMask.html b/doc/doc++/osg/ColorMask.html
index 0c39f0ef8..cf5e15b8f 100644
--- a/doc/doc++/osg/ColorMask.html
+++ b/doc/doc++/osg/ColorMask.html
@@ -112,9 +112,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/ColorMatrix.html b/doc/doc++/osg/ColorMatrix.html
index 4c46ad4d3..c620af6ad 100644
--- a/doc/doc++/osg/ColorMatrix.html
+++ b/doc/doc++/osg/ColorMatrix.html
@@ -106,9 +106,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/CompositeShape.html b/doc/doc++/osg/CompositeShape.html
index 84b05f799..3854ba83b 100644
--- a/doc/doc++/osg/CompositeShape.html
+++ b/doc/doc++/osg/CompositeShape.html
@@ -49,7 +49,7 @@
void removeChild(unsigned int i)
- remove a child from the list
-
-
unsigned int findChildNo(Shape* shape)
+
unsigned int findChildNo(Shape* shape) const
- find the index number of child, if child is not found then it returns getNumChildren(), so should be used in similar sytle of STL's result!=end()
@@ -95,9 +95,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
@@ -207,7 +207,7 @@
-
unsigned int findChildNo(Shape* shape)
+
unsigned int findChildNo(Shape* shape) const
- find the index number of child, if child is not found then it returns getNumChildren(),
so should be used in similar sytle of STL's result!=end()
diff --git a/doc/doc++/osg/Cone.html b/doc/doc++/osg/Cone.html
index aaf663957..7a6f4833d 100644
--- a/doc/doc++/osg/Cone.html
+++ b/doc/doc++/osg/Cone.html
@@ -98,9 +98,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/ConvexHull.html b/doc/doc++/osg/ConvexHull.html
index 697bd1a32..971ee2b36 100644
--- a/doc/doc++/osg/ConvexHull.html
+++ b/doc/doc++/osg/ConvexHull.html
@@ -79,9 +79,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/ConvexPlanarOccluder.html b/doc/doc++/osg/ConvexPlanarOccluder.html
index 2a8c9386c..9aad4b821 100644
--- a/doc/doc++/osg/ConvexPlanarOccluder.html
+++ b/doc/doc++/osg/ConvexPlanarOccluder.html
@@ -78,9 +78,9 @@
-
virtual const char* className() const
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/CullFace.html b/doc/doc++/osg/CullFace.html
index 22cd61027..ff02d3756 100644
--- a/doc/doc++/osg/CullFace.html
+++ b/doc/doc++/osg/CullFace.html
@@ -105,9 +105,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/CullStack.html b/doc/doc++/osg/CullStack.html
index a6db44a34..21fb3e878 100644
--- a/doc/doc++/osg/CullStack.html
+++ b/doc/doc++/osg/CullStack.html
@@ -55,9 +55,9 @@
CullingMode getCullingMode() const
- Returns the current CullingMode
-
-
void setLODBias(float bias)
+
void setLODScale(float bias)
-
-
float getLODBias() const
+
float getLODScale() const
-
void setSmallFeatureCullingPixelSize(float value)
-
@@ -137,7 +137,7 @@
Protected Fields
-
CullingMode _cullingMode
-
-
float _LODBias
+
float _LODScale
-
float _smallFeatureCullingPixelSize
-
@@ -307,13 +307,13 @@ and the CullingSet.
CullingMode getCullingMode() const
- Returns the current CullingMode
-
+
-
void setLODBias(float bias)
+
void setLODScale(float bias)
-
+
-
float getLODBias() const
+
float getLODScale() const
@@ -429,9 +429,9 @@ and the CullingSet.
CullingMode _cullingMode
-
+
-
float _LODBias
+
float _LODScale
diff --git a/doc/doc++/osg/Cylinder.html b/doc/doc++/osg/Cylinder.html
index 08340571a..291c949a2 100644
--- a/doc/doc++/osg/Cylinder.html
+++ b/doc/doc++/osg/Cylinder.html
@@ -94,9 +94,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Depth.html b/doc/doc++/osg/Depth.html
index 7ecc8095b..94e83f160 100644
--- a/doc/doc++/osg/Depth.html
+++ b/doc/doc++/osg/Depth.html
@@ -121,9 +121,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/DisplaySettings.html b/doc/doc++/osg/DisplaySettings.html
index e39b7d1be..599586801 100644
--- a/doc/doc++/osg/DisplaySettings.html
+++ b/doc/doc++/osg/DisplaySettings.html
@@ -263,6 +263,14 @@ have been set up, and the status of stereo viewing
VERTICAL_SPLIT
+
+
+
+
LEFT_EYE
+
+
+
+
RIGHT_EYE
diff --git a/doc/doc++/osg/DrawArrayLengths.html b/doc/doc++/osg/DrawArrayLengths.html
index cb2a77c2a..ac26eb41b 100644
--- a/doc/doc++/osg/DrawArrayLengths.html
+++ b/doc/doc++/osg/DrawArrayLengths.html
@@ -95,9 +95,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/DrawArrays.html b/doc/doc++/osg/DrawArrays.html
index 68030ed61..48ec22d08 100644
--- a/doc/doc++/osg/DrawArrays.html
+++ b/doc/doc++/osg/DrawArrays.html
@@ -99,9 +99,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/DrawElementsUByte.html b/doc/doc++/osg/DrawElementsUByte.html
index e348ff149..1b561ffa1 100644
--- a/doc/doc++/osg/DrawElementsUByte.html
+++ b/doc/doc++/osg/DrawElementsUByte.html
@@ -86,9 +86,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/DrawElementsUInt.html b/doc/doc++/osg/DrawElementsUInt.html
index 51f7d35e5..4b0d50ed6 100644
--- a/doc/doc++/osg/DrawElementsUInt.html
+++ b/doc/doc++/osg/DrawElementsUInt.html
@@ -86,9 +86,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/DrawElementsUShort.html b/doc/doc++/osg/DrawElementsUShort.html
index 36ca2cb1a..89fba63bc 100644
--- a/doc/doc++/osg/DrawElementsUShort.html
+++ b/doc/doc++/osg/DrawElementsUShort.html
@@ -86,9 +86,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/DrawPixels.html b/doc/doc++/osg/DrawPixels.html
index 48f806677..5f5736757 100644
--- a/doc/doc++/osg/DrawPixels.html
+++ b/doc/doc++/osg/DrawPixels.html
@@ -238,9 +238,9 @@ class PrimitiveFunctor
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Drawable.html b/doc/doc++/osg/Drawable.html
index 2a8318d64..3519aec81 100644
--- a/doc/doc++/osg/Drawable.html
+++ b/doc/doc++/osg/Drawable.html
@@ -236,9 +236,9 @@ class PrimitiveFunctor
-
virtual Object* clone(const CopyOp&) const
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Fog.html b/doc/doc++/osg/Fog.html
index f7ac3e2f5..198d882fe 100644
--- a/doc/doc++/osg/Fog.html
+++ b/doc/doc++/osg/Fog.html
@@ -35,7 +35,7 @@
-
virtual void getAssociatedModes(std::vector<GLMode>& modes) const
-
-
inline void setMode( const Mode mode )
+
inline void setMode( Mode mode )
-
inline Mode getMode() const
-
@@ -137,9 +137,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
@@ -239,7 +239,7 @@
-
inline void setMode( const Mode mode )
+
inline void setMode( Mode mode )
diff --git a/doc/doc++/osg/FrontFace.html b/doc/doc++/osg/FrontFace.html
index 59ae44265..45178ecb0 100644
--- a/doc/doc++/osg/FrontFace.html
+++ b/doc/doc++/osg/FrontFace.html
@@ -105,9 +105,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/GeoSet.html b/doc/doc++/osg/GeoSet.html
index 719d5c56d..e8cc8b14e 100644
--- a/doc/doc++/osg/GeoSet.html
+++ b/doc/doc++/osg/GeoSet.html
@@ -480,9 +480,9 @@ class PrimitiveFunctor
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Geometry.html b/doc/doc++/osg/Geometry.html
index 7d3201ffd..43243d1f2 100644
--- a/doc/doc++/osg/Geometry.html
+++ b/doc/doc++/osg/Geometry.html
@@ -372,9 +372,9 @@ class PrimitiveFunctor
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Grid.html b/doc/doc++/osg/Grid.html
index 90a5ad3af..2356e2472 100644
--- a/doc/doc++/osg/Grid.html
+++ b/doc/doc++/osg/Grid.html
@@ -120,9 +120,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/HeightField.html b/doc/doc++/osg/HeightField.html
index df8255e44..bc97f356e 100644
--- a/doc/doc++/osg/HeightField.html
+++ b/doc/doc++/osg/HeightField.html
@@ -100,9 +100,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Image.html b/doc/doc++/osg/Image.html
index bd5d38a71..20638397b 100644
--- a/doc/doc++/osg/Image.html
+++ b/doc/doc++/osg/Image.html
@@ -179,9 +179,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/ImpostorSprite.html b/doc/doc++/osg/ImpostorSprite.html
index b0819cf1d..46d88ca6a 100644
--- a/doc/doc++/osg/ImpostorSprite.html
+++ b/doc/doc++/osg/ImpostorSprite.html
@@ -284,9 +284,9 @@ class PrimitiveFunctor
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/IndexArray.html b/doc/doc++/osg/IndexArray.html
index 84204858b..c1f097d17 100644
--- a/doc/doc++/osg/IndexArray.html
+++ b/doc/doc++/osg/IndexArray.html
@@ -87,9 +87,9 @@
-
virtual Object* clone(const CopyOp&) const
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/InfinitePlane.html b/doc/doc++/osg/InfinitePlane.html
index dff966fb4..5fc55b27e 100644
--- a/doc/doc++/osg/InfinitePlane.html
+++ b/doc/doc++/osg/InfinitePlane.html
@@ -41,9 +41,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Light.html b/doc/doc++/osg/Light.html
index e150e7141..4b2c762ec 100644
--- a/doc/doc++/osg/Light.html
+++ b/doc/doc++/osg/Light.html
@@ -189,9 +189,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/LightModel.html b/doc/doc++/osg/LightModel.html
index 408f507e1..54e6bf7a2 100644
--- a/doc/doc++/osg/LightModel.html
+++ b/doc/doc++/osg/LightModel.html
@@ -122,9 +122,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/LineStipple.html b/doc/doc++/osg/LineStipple.html
index c79683da9..74a51aa8f 100644
--- a/doc/doc++/osg/LineStipple.html
+++ b/doc/doc++/osg/LineStipple.html
@@ -105,9 +105,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/LineWidth.html b/doc/doc++/osg/LineWidth.html
index 117677582..6119227ab 100644
--- a/doc/doc++/osg/LineWidth.html
+++ b/doc/doc++/osg/LineWidth.html
@@ -100,9 +100,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Material.html b/doc/doc++/osg/Material.html
index 4222ae302..cb5df2cc5 100644
--- a/doc/doc++/osg/Material.html
+++ b/doc/doc++/osg/Material.html
@@ -182,9 +182,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Matrix.html b/doc/doc++/osg/Matrix.html
index 7edf3108e..5569071fc 100644
--- a/doc/doc++/osg/Matrix.html
+++ b/doc/doc++/osg/Matrix.html
@@ -225,9 +225,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/NodeVisitor.html b/doc/doc++/osg/NodeVisitor.html
index 36c9af0d6..00ec95afe 100644
--- a/doc/doc++/osg/NodeVisitor.html
+++ b/doc/doc++/osg/NodeVisitor.html
@@ -65,7 +65,7 @@
inline bool validNodeMask(const osg::Node& node) const
- Method to called by Node and its subclass' Node::accept() method, if the result is true to be used to cull operations of nodes and their subgraphs.
-
-
void setTraversalMode(const TraversalMode mode)
+
void setTraversalMode(TraversalMode mode)
- Set the traversal mode for Node::traverse() to use when deciding which children of a node to traverse.
-
inline TraversalMode getTraversalMode() const
@@ -359,7 +359,7 @@ and osg::Node::_nodeMask is 0xffffffff.
-
void setTraversalMode(const TraversalMode mode)
+
void setTraversalMode(TraversalMode mode)
- Set the traversal mode for Node::traverse() to use when
deciding which children of a node to traverse. If a
NodeVisitor has been attached via setTraverseVisitor()
diff --git a/doc/doc++/osg/Object.html b/doc/doc++/osg/Object.html
index c1861e94b..682c11db2 100644
--- a/doc/doc++/osg/Object.html
+++ b/doc/doc++/osg/Object.html
@@ -43,10 +43,10 @@
virtual const char* className() const = 0
- return the name of the object's class type.
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
- Set the data variance of this object.
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
- Get the data variance of this object
-
inline void setUserData(Referenced* obj)
@@ -175,7 +175,7 @@ by derived classes.
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
- Set the data variance of this object.
Can be set to either STATIC for values that do not change over the lifetime of the object,
or DYNAMIC for values that vary over the lifetime of the object. The DataVariance value
@@ -183,7 +183,7 @@ can be used be routines such as optimzation codes that wish to share static data
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
- Get the data variance of this object
diff --git a/doc/doc++/osg/Point.html b/doc/doc++/osg/Point.html
index 284caf5e4..c59e931b9 100644
--- a/doc/doc++/osg/Point.html
+++ b/doc/doc++/osg/Point.html
@@ -114,9 +114,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/PolygonMode.html b/doc/doc++/osg/PolygonMode.html
index 4dd907475..0097395ab 100644
--- a/doc/doc++/osg/PolygonMode.html
+++ b/doc/doc++/osg/PolygonMode.html
@@ -113,9 +113,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/PolygonOffset.html b/doc/doc++/osg/PolygonOffset.html
index 6cbea4774..da113342b 100644
--- a/doc/doc++/osg/PolygonOffset.html
+++ b/doc/doc++/osg/PolygonOffset.html
@@ -106,9 +106,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/PolygonStipple.html b/doc/doc++/osg/PolygonStipple.html
index 6fe0a1d8b..28a695cec 100644
--- a/doc/doc++/osg/PolygonStipple.html
+++ b/doc/doc++/osg/PolygonStipple.html
@@ -101,9 +101,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/PrimitiveSet.html b/doc/doc++/osg/PrimitiveSet.html
index 9c84ac61c..c68b53ca6 100644
--- a/doc/doc++/osg/PrimitiveSet.html
+++ b/doc/doc++/osg/PrimitiveSet.html
@@ -74,9 +74,9 @@
-
virtual Object* clone(const CopyOp&) const
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/ShadeModel.html b/doc/doc++/osg/ShadeModel.html
index d05b4eb0f..58e937d89 100644
--- a/doc/doc++/osg/ShadeModel.html
+++ b/doc/doc++/osg/ShadeModel.html
@@ -33,9 +33,9 @@
virtual int compare(const StateAttribute& sa) const
- return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
-
-
inline void setMode(const Mode mode)
+
inline void setMode(Mode mode)
-
-
inline const Mode getMode() const
+
inline Mode getMode() const
-
virtual void apply(State& state) const
@@ -105,9 +105,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
@@ -199,11 +199,11 @@
-
inline void setMode(const Mode mode)
+
inline void setMode(Mode mode)
-
inline const Mode getMode() const
+
inline Mode getMode() const
diff --git a/doc/doc++/osg/Shape.html b/doc/doc++/osg/Shape.html
index 29a9e88c2..6a8878e1c 100644
--- a/doc/doc++/osg/Shape.html
+++ b/doc/doc++/osg/Shape.html
@@ -54,9 +54,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/ShapeDrawable.html b/doc/doc++/osg/ShapeDrawable.html
index 4a0b74d75..8ff1f7c37 100644
--- a/doc/doc++/osg/ShapeDrawable.html
+++ b/doc/doc++/osg/ShapeDrawable.html
@@ -217,9 +217,9 @@ class PrimitiveFunctor
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Sphere.html b/doc/doc++/osg/Sphere.html
index af397522f..cad4d4ef9 100644
--- a/doc/doc++/osg/Sphere.html
+++ b/doc/doc++/osg/Sphere.html
@@ -78,9 +78,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/State.html b/doc/doc++/osg/State.html
index 35c1fafc4..cb3525b7e 100644
--- a/doc/doc++/osg/State.html
+++ b/doc/doc++/osg/State.html
@@ -131,90 +131,94 @@
-
inline void dirtyColorPointer()
-
-
void setSecondaryColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
+
inline bool isSecondaryColorSupported() const
+-
+
void setSecondaryColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
- wrapper around glEnableClientState(GL_SECONDARY_COLOR_ARRAY);glSecondayColorPointer(); note, only updates values that change
-
-
inline void disableSecondaryColorPointer()
+
inline void disableSecondaryColorPointer()
- wrapper around glDisableClientState(GL_SECONDARY_COLOR_ARRAY); note, only updates values that change
-
-
inline void dirtySecondaryColorPointer()
+
inline void dirtySecondaryColorPointer()
-
-
inline void setIndexPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
+
inline void setIndexPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
- wrapper around glEnableClientState(GL_INDEX_ARRAY);glIndexPointer(); note, only updates values that change
-
-
inline void disableIndexPointer()
+
inline void disableIndexPointer()
- wrapper around glDisableClientState(GL_INDEX_ARRAY); note, only updates values that change
-
-
inline void dirtyIndexPointer()
+
inline void dirtyIndexPointer()
-
-
void setFogCoordPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
+
inline bool isFogCoordSupported() const
+-
+
void setFogCoordPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
- wrapper around glEnableClientState(GL_FOG_COORDINATE_ARRAY);glFogCoordPointer(); note, only updates values that change
-
-
inline void disableFogCoordPointer()
+
inline void disableFogCoordPointer()
- wrapper around glDisableClientState(GL_FOG_COORDINATE_ARRAY); note, only updates values that change
-
-
inline void dirtyFogCoordPointer()
+
inline void dirtyFogCoordPointer()
-
-
inline void setTexCoordPointer( unsigned int unit, GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
+
inline void setTexCoordPointer( unsigned int unit, GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
- wrapper around glEnableClientState(GL_TEXTURE_COORD_ARRAY);glTexCoordPointer(); note, only updates values that change
-
-
inline void disableTexCoordPointer( unsigned int unit )
+
inline void disableTexCoordPointer( unsigned int unit )
- wrapper around glDisableClientState(GL_TEXTURE_COORD_ARRAY); note, only updates values that change
-
-
inline void dirtyTexCoordPointer( unsigned int unit )
+
inline void dirtyTexCoordPointer( unsigned int unit )
-
-
inline void disableTexCoordPointersAboveAndIncluding( unsigned int unit )
+
inline void disableTexCoordPointersAboveAndIncluding( unsigned int unit )
-
-
inline void dirtyTexCoordPointersAboveAndIncluding( unsigned int unit )
+
inline void dirtyTexCoordPointersAboveAndIncluding( unsigned int unit )
-
-
bool setClientActiveTextureUnit( unsigned int unit )
+
bool setClientActiveTextureUnit( unsigned int unit )
- set the current tex coord array texture unit, return true if selected, false if selection failed such as when multitexturing is not supported.
-
-
bool setActiveTextureUnit( unsigned int unit )
+
bool setActiveTextureUnit( unsigned int unit )
- set the current texture unit, return true if selected, false if selection failed such as when multitexturing is not supported.
-
-
inline void setContextID(unsigned int contextID)
+
inline void setContextID(unsigned int contextID)
- Set the current OpenGL context uniqueID.
-
-
inline unsigned int getContextID() const
+
inline unsigned int getContextID() const
- Get the current OpenGL context unique ID
-
-
inline void setFrameStamp(FrameStamp* fs)
+
inline void setFrameStamp(FrameStamp* fs)
- Set the frame stamp for the current frame
-
-
inline const FrameStamp* getFrameStamp() const
+
inline const FrameStamp* getFrameStamp() const
- Set the frame stamp for the current frame
-
-
inline void setDisplaySettings(DisplaySettings* vs)
+
inline void setDisplaySettings(DisplaySettings* vs)
- Set the DisplaySettings.
-
-
inline const DisplaySettings* getDisplaySettings() const
+
inline const DisplaySettings* getDisplaySettings() const
- Get the DisplaySettings
-
-
inline void pushModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
+
inline void pushModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
-
-
inline void pushAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
+
inline void pushAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
-
-
inline void popModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
+
inline void popModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
-
-
inline void popAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
+
inline void popAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
-
-
inline void applyModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
+
inline void applyModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
-
-
inline void applyAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
+
inline void applyAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
-
-
inline void applyModeMap(ModeMap& modeMap)
+
inline void applyModeMap(ModeMap& modeMap)
-
-
inline void applyAttributeMap(AttributeMap& attributeMap)
+
inline void applyAttributeMap(AttributeMap& attributeMap)
Public Members
-
-
typedef std::pair<const StateAttribute*,StateAttribute::OverrideValue> AttributePair
+
typedef std::pair<const StateAttribute*,StateAttribute::OverrideValue> AttributePair
-
-
typedef std::vector<AttributePair> AttributeVec
+
typedef std::vector<AttributePair> AttributeVec
-
-
typedef std::vector<StateAttribute::GLModeValue> ValueVec
+
typedef std::vector<StateAttribute::GLModeValue> ValueVec
@@ -463,92 +467,100 @@ note, only updates values that change
inline void dirtyColorPointer()
-
+
+
inline bool isSecondaryColorSupported() const
+
+
+
void setSecondaryColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
- wrapper around glEnableClientState(GL_SECONDARY_COLOR_ARRAY);glSecondayColorPointer();
note, only updates values that change
-
+
inline void disableSecondaryColorPointer()
- wrapper around glDisableClientState(GL_SECONDARY_COLOR_ARRAY);
note, only updates values that change
-
+
inline void dirtySecondaryColorPointer()
-
+
inline void setIndexPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
- wrapper around glEnableClientState(GL_INDEX_ARRAY);glIndexPointer();
note, only updates values that change
-
+
inline void disableIndexPointer()
- wrapper around glDisableClientState(GL_INDEX_ARRAY);
note, only updates values that change
-
+
inline void dirtyIndexPointer()
+
+
+
inline bool isFogCoordSupported() const
+
-
+
void setFogCoordPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
- wrapper around glEnableClientState(GL_FOG_COORDINATE_ARRAY);glFogCoordPointer();
note, only updates values that change
-
+
inline void disableFogCoordPointer()
- wrapper around glDisableClientState(GL_FOG_COORDINATE_ARRAY);
note, only updates values that change
-
+
inline void dirtyFogCoordPointer()
-
+
inline void setTexCoordPointer( unsigned int unit, GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
- wrapper around glEnableClientState(GL_TEXTURE_COORD_ARRAY);glTexCoordPointer();
note, only updates values that change
-
+
inline void disableTexCoordPointer( unsigned int unit )
- wrapper around glDisableClientState(GL_TEXTURE_COORD_ARRAY);
note, only updates values that change
-
+
inline void dirtyTexCoordPointer( unsigned int unit )
-
+
inline void disableTexCoordPointersAboveAndIncluding( unsigned int unit )
-
+
inline void dirtyTexCoordPointersAboveAndIncluding( unsigned int unit )
-
+
bool setClientActiveTextureUnit( unsigned int unit )
- set the current tex coord array texture unit, return true if selected, false if selection failed such as when multitexturing is not supported.
note, only updates values that change.
-
+
bool setActiveTextureUnit( unsigned int unit )
- set the current texture unit, return true if selected, false if selection failed such as when multitexturing is not supported.
note, only updates values that change.
-
+
inline void setContextID(unsigned int contextID)
- Set the current OpenGL context uniqueID.
Note, it is the application developers responsibility to
@@ -562,146 +574,146 @@ number of graphics contexts you have setup.
By default contextID is 0.
-
+
inline unsigned int getContextID() const
- Get the current OpenGL context unique ID
-
+
inline void setFrameStamp(FrameStamp* fs)
- Set the frame stamp for the current frame
-
+
inline const FrameStamp* getFrameStamp() const
- Set the frame stamp for the current frame
-
+
inline void setDisplaySettings(DisplaySettings* vs)
- Set the DisplaySettings. Note, nothing is applied, the visual settings are just used
used in the State object to pass the current visual settings to Drawables
during rendering.
-
+
inline const DisplaySettings* getDisplaySettings() const
- Get the DisplaySettings
-
+
typedef std::pair<const StateAttribute*,StateAttribute::OverrideValue> AttributePair
-
-
typedef std::vector<AttributePair> AttributeVec
+
+
typedef std::vector<AttributePair> AttributeVec
-
+
typedef std::vector<StateAttribute::GLModeValue> ValueVec
-
+
ModeStack()
-
+
bool changed
-
+
bool last_applied_value
-
+
bool global_default_value
-
-
ValueVec valueVec
+
+
ValueVec valueVec
-
+
AttributeStack()
-
+
bool changed
- apply an attribute if required, passing in attribute and appropriate attribute stack
-
+
const StateAttribute* last_applied_attribute
-
+
ref_ptr<StateAttribute> global_default_attribute
-
-
AttributeVec attributeVec
+
+
AttributeVec attributeVec
-
+
EnabledArrayPair()
-
-
EnabledArrayPair(const EnabledArrayPair& eap)
+
+
EnabledArrayPair(const EnabledArrayPair& eap)
-
-
EnabledArrayPair& operator = (const EnabledArrayPair& eap)
+
+
EnabledArrayPair& operator = (const EnabledArrayPair& eap)
-
+
bool _dirty
-
+
bool _enabled
-
+
const GLvoid* _pointer
-
-
inline void pushModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
+
+
inline void pushModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
-
-
inline void pushAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
+
+
inline void pushAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
-
-
inline void popModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
+
+
inline void popModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
-
-
inline void popAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
+
+
inline void popAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
-
-
inline void applyModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
+
+
inline void applyModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
-
-
inline void applyAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
+
+
inline void applyAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
-
-
inline void applyModeMap(ModeMap& modeMap)
+
+
inline void applyModeMap(ModeMap& modeMap)
-
-
inline void applyAttributeMap(AttributeMap& attributeMap)
+
+
inline void applyAttributeMap(AttributeMap& attributeMap)
- This class has no child classes.
diff --git a/doc/doc++/osg/StateAttribute.html b/doc/doc++/osg/StateAttribute.html
index a9a5651c9..3291dfe2f 100644
--- a/doc/doc++/osg/StateAttribute.html
+++ b/doc/doc++/osg/StateAttribute.html
@@ -98,9 +98,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/StateSet.html b/doc/doc++/osg/StateSet.html
index 99f03cdae..a0396fc9e 100644
--- a/doc/doc++/osg/StateSet.html
+++ b/doc/doc++/osg/StateSet.html
@@ -242,9 +242,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Stencil.html b/doc/doc++/osg/Stencil.html
index 779a11a61..c010c25af 100644
--- a/doc/doc++/osg/Stencil.html
+++ b/doc/doc++/osg/Stencil.html
@@ -35,29 +35,29 @@
-
virtual void getAssociatedModes(std::vector<GLMode>& modes) const
-
-
inline void setFunction(const Function func, int ref, uint mask)
+
inline void setFunction(Function func, int ref, uint mask)
-
-
inline const Function getFunction() const
+
inline Function getFunction() const
-
inline int getFunctionRef() const
-
-
inline const uint getFunctionMask() const
+
inline uint getFunctionMask() const
-
-
inline void setOperation(const Operation sfail, const Operation zfail, const Operation zpass)
+
inline void setOperation(Operation sfail, Operation zfail, Operation zpass)
- set the operations to apply when the various stencil and depth tests fail or pass.
-
-
inline const Operation getStencilFailOperation() const
+
inline Operation getStencilFailOperation() const
- get the operation when the stencil test fails
-
-
inline const Operation getStencilPassAndDepthFailOperation() const
+
inline Operation getStencilPassAndDepthFailOperation() const
- get the operation when the stencil test passes but the depth test fails
-
-
inline const Operation getStencilPassAndDepthPassOperation() const
+
inline Operation getStencilPassAndDepthPassOperation() const
- get the operation when both the stencil test and the depth test pass
-
inline void setWriteMask(uint mask)
-
-
inline const uint getWriteMask() const
+
inline uint getWriteMask() const
-
virtual void apply(State& state) const
@@ -139,9 +139,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
@@ -261,11 +261,11 @@
-
inline void setFunction(const Function func, int ref, uint mask)
+
inline void setFunction(Function func, int ref, uint mask)
-
inline const Function getFunction() const
+
inline Function getFunction() const
@@ -273,7 +273,7 @@
-
inline const uint getFunctionMask() const
+
inline uint getFunctionMask() const
@@ -307,7 +307,7 @@
-
inline void setOperation(const Operation sfail, const Operation zfail, const Operation zpass)
+
inline void setOperation(Operation sfail, Operation zfail, Operation zpass)
- set the operations to apply when the various stencil and depth
tests fail or pass. First parameter is to control the operation
when the stencil test fails. The second parameter is to control the
@@ -318,17 +318,17 @@ glStencilOp(,,).
-
inline const Operation getStencilFailOperation() const
+
inline Operation getStencilFailOperation() const
- get the operation when the stencil test fails
-
inline const Operation getStencilPassAndDepthFailOperation() const
+
inline Operation getStencilPassAndDepthFailOperation() const
- get the operation when the stencil test passes but the depth test fails
-
inline const Operation getStencilPassAndDepthPassOperation() const
+
inline Operation getStencilPassAndDepthPassOperation() const
- get the operation when both the stencil test and the depth test pass
@@ -337,7 +337,7 @@ glStencilOp(,,).
-
inline const uint getWriteMask() const
+
inline uint getWriteMask() const
diff --git a/doc/doc++/osg/TemplateArray.html b/doc/doc++/osg/TemplateArray.html
index 8a30800ae..7fdc8556e 100644
--- a/doc/doc++/osg/TemplateArray.html
+++ b/doc/doc++/osg/TemplateArray.html
@@ -91,9 +91,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/TemplateIndexArray.html b/doc/doc++/osg/TemplateIndexArray.html
index 5318dbc53..b1eb88e87 100644
--- a/doc/doc++/osg/TemplateIndexArray.html
+++ b/doc/doc++/osg/TemplateIndexArray.html
@@ -99,9 +99,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/TessellationHints.html b/doc/doc++/osg/TessellationHints.html
index d43b432b8..de4d55322 100644
--- a/doc/doc++/osg/TessellationHints.html
+++ b/doc/doc++/osg/TessellationHints.html
@@ -106,9 +106,9 @@
-
virtual const char* className() const
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/TexEnv.html b/doc/doc++/osg/TexEnv.html
index e53e4707c..b44386893 100644
--- a/doc/doc++/osg/TexEnv.html
+++ b/doc/doc++/osg/TexEnv.html
@@ -35,9 +35,9 @@
virtual int compare(const StateAttribute& sa) const
- return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
-
-
void setMode( const Mode mode )
+
void setMode( Mode mode )
-
-
const Mode getMode() const
+
Mode getMode() const
-
void setColor( const Vec4& color )
-
@@ -113,9 +113,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
@@ -223,11 +223,11 @@
-
void setMode( const Mode mode )
+
void setMode( Mode mode )
-
const Mode getMode() const
+
Mode getMode() const
diff --git a/doc/doc++/osg/TexEnvCombine.html b/doc/doc++/osg/TexEnvCombine.html
index a76fa1791..5a99558d3 100644
--- a/doc/doc++/osg/TexEnvCombine.html
+++ b/doc/doc++/osg/TexEnvCombine.html
@@ -211,9 +211,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/TexGen.html b/doc/doc++/osg/TexGen.html
index 48931b40e..13f6f3039 100644
--- a/doc/doc++/osg/TexGen.html
+++ b/doc/doc++/osg/TexGen.html
@@ -120,9 +120,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/TexMat.html b/doc/doc++/osg/TexMat.html
index 15ea3ad8d..3d41314bb 100644
--- a/doc/doc++/osg/TexMat.html
+++ b/doc/doc++/osg/TexMat.html
@@ -106,9 +106,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Texture.html b/doc/doc++/osg/Texture.html
index f848dfe3b..f0d30a424 100644
--- a/doc/doc++/osg/Texture.html
+++ b/doc/doc++/osg/Texture.html
@@ -84,7 +84,7 @@
-
inline uint& getModifiedTag(uint contextID) const
-
-
inline uint& getTextureParameterDity(uint contextID) const
+
inline uint& getTextureParameterDirty(uint contextID) const
-
void dirtyTextureObject()
- Force a recompile on next apply() of associated OpenGL texture objects
@@ -221,9 +221,9 @@ class Extensions: public inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
@@ -522,9 +522,9 @@ Also sets the internalFormatMode to USE_USER_DEFINED_FORMAT.
inline uint& getModifiedTag(uint contextID) const
-
+
-
inline uint& getTextureParameterDity(uint contextID) const
+
inline uint& getTextureParameterDirty(uint contextID) const
diff --git a/doc/doc++/osg/Texture1D.html b/doc/doc++/osg/Texture1D.html
index 1bae71c33..c11d96a43 100644
--- a/doc/doc++/osg/Texture1D.html
+++ b/doc/doc++/osg/Texture1D.html
@@ -147,7 +147,7 @@ class SubloadCallback: public
inline uint& getModifiedTag(uint contextID) const
-
-
inline uint& getTextureParameterDity(uint contextID) const
+
inline uint& getTextureParameterDirty(uint contextID) const
-
void dirtyTextureObject()
-
@@ -263,9 +263,9 @@ class Extensions: public inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Texture2D.html b/doc/doc++/osg/Texture2D.html
index d444d135e..e2662725b 100644
--- a/doc/doc++/osg/Texture2D.html
+++ b/doc/doc++/osg/Texture2D.html
@@ -146,7 +146,7 @@ class SubloadCallback: public <
-
inline uint& getModifiedTag(uint contextID) const
-
-
inline uint& getTextureParameterDity(uint contextID) const
+
inline uint& getTextureParameterDirty(uint contextID) const
-
void dirtyTextureObject()
-
@@ -262,9 +262,9 @@ class Extensions: public inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Texture3D.html b/doc/doc++/osg/Texture3D.html
index 65334b567..4b8ebfde1 100644
--- a/doc/doc++/osg/Texture3D.html
+++ b/doc/doc++/osg/Texture3D.html
@@ -156,7 +156,7 @@ class Extensions: public inline uint& getModifiedTag(uint contextID) const
-
-
inline uint& getTextureParameterDity(uint contextID) const
+
inline uint& getTextureParameterDirty(uint contextID) const
-
void dirtyTextureObject()
-
@@ -265,9 +265,9 @@ class Extensions: public inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/TextureCubeMap.html b/doc/doc++/osg/TextureCubeMap.html
index 2db0bc9ae..f6ca5e034 100644
--- a/doc/doc++/osg/TextureCubeMap.html
+++ b/doc/doc++/osg/TextureCubeMap.html
@@ -153,7 +153,7 @@ class Extensions: public inline uint& getModifiedTag(uint contextID) const
-
-
inline uint& getTextureParameterDity(uint contextID) const
+
inline uint& getTextureParameterDirty(uint contextID) const
-
void dirtyTextureObject()
-
@@ -262,9 +262,9 @@ class Extensions: public inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/TriangleMesh.html b/doc/doc++/osg/TriangleMesh.html
index 249ed7449..41fbf75f3 100644
--- a/doc/doc++/osg/TriangleMesh.html
+++ b/doc/doc++/osg/TriangleMesh.html
@@ -76,9 +76,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osg/Viewport.html b/doc/doc++/osg/Viewport.html
index a7ca299a3..190b3c803 100644
--- a/doc/doc++/osg/Viewport.html
+++ b/doc/doc++/osg/Viewport.html
@@ -122,9 +122,9 @@
Public Methods
-
-
inline void setDataVariance(const DataVariance dv)
+
inline void setDataVariance(DataVariance dv)
-
-
inline const DataVariance getDataVariance() const
+
inline DataVariance getDataVariance() const
-
inline void setUserData(Referenced* obj)
-
diff --git a/doc/doc++/osgUtil/CullVisitor.html b/doc/doc++/osgUtil/CullVisitor.html
index ae363c079..983fbfdd5 100644
--- a/doc/doc++/osgUtil/CullVisitor.html
+++ b/doc/doc++/osgUtil/CullVisitor.html
@@ -31,9 +31,9 @@
-
virtual void reset()
-
-
virtual float getDistanceToEyePoint(const osg::Vec3& pos, bool withLODBias) const
+
virtual float getDistanceToEyePoint(const osg::Vec3& pos, bool withLODScale) const
-
-
virtual float getDistanceFromEyePoint(const osg::Vec3& pos, bool withLODBias) const
+
virtual float getDistanceFromEyePoint(const osg::Vec3& pos, bool withLODScale) const
-
virtual void apply(osg::Node&)
-
@@ -237,11 +237,11 @@ from the eye to the one nearest the eye.
-
virtual float getDistanceToEyePoint(const osg::Vec3& pos, bool withLODBias) const
+
virtual float getDistanceToEyePoint(const osg::Vec3& pos, bool withLODScale) const
-
virtual float getDistanceFromEyePoint(const osg::Vec3& pos, bool withLODBias) const
+
virtual float getDistanceFromEyePoint(const osg::Vec3& pos, bool withLODScale) const
diff --git a/doc/doc++/osgUtil/SceneView.html b/doc/doc++/osgUtil/SceneView.html
index 969208ae6..91ef4f035 100644
--- a/doc/doc++/osgUtil/SceneView.html
+++ b/doc/doc++/osgUtil/SceneView.html
@@ -153,10 +153,10 @@
-
const osg::Node::NodeMask getCullMaskRight() const
-
-
void setLODBias(float bias)
+
void setLODScale(float bias)
- Set the LOD bias for the CullVisitor to use
-
-
float getLODBias() const
+
float getLODScale() const
- Get the LOD bias
-
void setSmallFeatureCullingPixelSize(float value)
@@ -284,7 +284,7 @@
-
osg::CullStack::CullingMode _cullingMode
-
-
float _LODBias
+
float _LODScale
-
float _smallFeatureCullingPixelSize
-
@@ -591,14 +591,14 @@ via setModelViewMatrix(..), see below.
const osg::Node::NodeMask getCullMaskRight() const
-
+
-
void setLODBias(float bias)
+
void setLODScale(float bias)
- Set the LOD bias for the CullVisitor to use
-
+
-
float getLODBias() const
+
float getLODScale() const
- Get the LOD bias
@@ -869,9 +869,9 @@ graphics context.
osg::CullStack::CullingMode _cullingMode
-
+
-
float _LODBias
+
float _LODScale