From c1bb54a65763af9daea7fc421b6ffddcf3a1f8e3 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 8 Nov 2002 14:15:17 +0000 Subject: [PATCH] Checking in updates to documentition for the 0.9.2 release. --- doc/doc++/osg/AlphaFunc.html | 38 +- doc/doc++/osg/AnimationPath.html | 59 +- doc/doc++/osg/AnimationPathCallback.2.html | 40 +- doc/doc++/osg/AnimationPathCallback.html | 40 +- doc/doc++/osg/Array.html | 85 +- doc/doc++/osg/ArrayVisitor.html | 78 +- doc/doc++/osg/AttributeFunctor.html | 70 +- doc/doc++/osg/Billboard.html | 181 ++-- doc/doc++/osg/BlendFunc.html | 120 +-- doc/doc++/osg/BoundingBox.html | 142 +-- doc/doc++/osg/BoundingSphere.html | 94 +- doc/doc++/osg/Camera.html | 416 ++++----- doc/doc++/osg/ClearNode.html | 67 +- doc/doc++/osg/ClipNode.html | 126 +-- doc/doc++/osg/ClipPlane.html | 116 +-- doc/doc++/osg/CollectOccludersVisitor.html | 237 +++-- doc/doc++/osg/ColorMask.html | 92 +- doc/doc++/osg/ColorMatrix.html | 64 +- doc/doc++/osg/ConvexPlanarOccluder.html | 93 +- doc/doc++/osg/ConvexPlanarPolygon.html | 37 +- doc/doc++/osg/CopyOp.html | 104 ++- doc/doc++/osg/CullFace.html | 80 +- doc/doc++/osg/CullStack.html | 388 ++++---- doc/doc++/osg/CullingSet.html | 158 ++-- doc/doc++/osg/DOFTransform.html | 309 ++++--- doc/doc++/osg/Depth.html | 132 +-- doc/doc++/osg/DisplaySettings.html | 344 +++---- doc/doc++/osg/DrawArrayLengths.html | 129 +-- doc/doc++/osg/DrawArrays.html | 120 ++- doc/doc++/osg/DrawElementsUByte.html | 109 ++- doc/doc++/osg/DrawElementsUInt.html | 109 ++- doc/doc++/osg/DrawElementsUShort.html | 109 ++- doc/doc++/osg/DrawPixels.html | 244 ++--- doc/doc++/osg/Drawable.html | 550 ++++++----- doc/doc++/osg/Fog.html | 160 ++-- doc/doc++/osg/FrameStamp.html | 96 +- doc/doc++/osg/FrontFace.html | 74 +- doc/doc++/osg/General.html | 30 +- doc/doc++/osg/GeoSet.html | 852 ++++++++++-------- doc/doc++/osg/Geode.html | 97 +- doc/doc++/osg/Geometry.html | 683 +++++++++----- doc/doc++/osg/Group.html | 111 ++- doc/doc++/osg/HIER.html | 67 +- doc/doc++/osg/HIERjava.html | 109 ++- doc/doc++/osg/Image.html | 325 +++---- doc/doc++/osg/Impostor.html | 145 +-- doc/doc++/osg/ImpostorSprite.html | 332 ++++--- doc/doc++/osg/ImpostorSpriteManager.html | 62 +- doc/doc++/osg/LOD.html | 244 ++--- doc/doc++/osg/Light.html | 216 ++--- doc/doc++/osg/LightModel.html | 118 +-- doc/doc++/osg/LightSource.html | 75 +- doc/doc++/osg/LineSegment.html | 114 +-- doc/doc++/osg/LineStipple.html | 88 +- doc/doc++/osg/LineWidth.html | 64 +- doc/doc++/osg/META_Object.html | 2 +- doc/doc++/osg/META_StateAttribute.html | 2 +- doc/doc++/osg/Material.html | 258 +++--- doc/doc++/osg/Matrix.html | 439 ++++----- doc/doc++/osg/MatrixTransform.html | 109 ++- doc/doc++/osg/NodeAcceptOp.html | 16 +- doc/doc++/osg/NodeCallback.html | 46 +- doc/doc++/osg/NodeVisitor.html | 294 +++--- doc/doc++/osg/NotifySeverity.html | 28 +- doc/doc++/osg/Object.html | 102 ++- doc/doc++/osg/OccluderNode.html | 59 +- doc/doc++/osg/Plane.html | 168 ++-- doc/doc++/osg/Point.html | 100 +- doc/doc++/osg/PolygonMode.html | 102 ++- doc/doc++/osg/PolygonOffset.html | 84 +- doc/doc++/osg/Polytope.html | 229 ++--- doc/doc++/osg/PositionAttitudeTransform.html | 105 ++- doc/doc++/osg/PrimitiveFunctor.html | 52 +- doc/doc++/osg/Projection.html | 63 +- doc/doc++/osg/QualifiedTestPrinter.html | 4 +- doc/doc++/osg/Quat.html | 234 ++--- doc/doc++/osg/Referenced.html | 81 +- doc/doc++/osg/Sequence.html | 183 ++-- doc/doc++/osg/ShadeModel.html | 74 +- doc/doc++/osg/ShadowVolumeOccluder.html | 129 +-- doc/doc++/osg/State.html | 443 +++++---- doc/doc++/osg/StateAttribute.html | 219 ++--- doc/doc++/osg/StateSet.html | 472 +++++----- doc/doc++/osg/Statistics.html | 206 +++-- doc/doc++/osg/Stencil.html | 188 ++-- doc/doc++/osg/SubloadCallback.2.html | 18 +- doc/doc++/osg/SubloadCallback.3.html | 18 +- doc/doc++/osg/SubloadCallback.4.html | 18 +- doc/doc++/osg/SubloadCallback.html | 18 +- doc/doc++/osg/Switch.html | 191 ++-- doc/doc++/osg/TemplateArray.html | 56 +- doc/doc++/osg/Test.html | 35 +- doc/doc++/osg/TestCase.html | 42 +- doc/doc++/osg/TestCase_.html | 32 +- doc/doc++/osg/TestContext.html | 40 +- doc/doc++/osg/TestErrorX.html | 6 +- doc/doc++/osg/TestFailureX.html | 6 +- doc/doc++/osg/TestGraph.html | 20 +- doc/doc++/osg/TestQualifier.html | 14 +- doc/doc++/osg/TestRecord.html | 32 +- doc/doc++/osg/TestReport.html | 6 +- doc/doc++/osg/TestRunner.html | 24 +- doc/doc++/osg/TestSuite.html | 35 +- .../osg/TestSuiteAutoRegistrationAgent.html | 4 +- doc/doc++/osg/TestVisitor.html | 26 +- doc/doc++/osg/TestX.html | 14 +- doc/doc++/osg/TexEnv.html | 100 +- doc/doc++/osg/TexEnvCombine.html | 332 +++---- doc/doc++/osg/TexGen.html | 128 +-- doc/doc++/osg/TexMat.html | 68 +- doc/doc++/osg/Texture.html | 406 +++++---- doc/doc++/osg/Texture1D.html | 199 ++-- doc/doc++/osg/Texture2D.html | 197 ++-- doc/doc++/osg/Texture3D.html | 218 +++-- doc/doc++/osg/TextureCubeMap.html | 242 +++-- doc/doc++/osg/Timer.html | 44 +- doc/doc++/osg/TraceStream.html | 28 +- doc/doc++/osg/Transform.html | 141 +-- doc/doc++/osg/TriangleFunctor.html | 76 +- doc/doc++/osg/UByte4.html | 130 +-- doc/doc++/osg/Vec2.html | 156 ++-- doc/doc++/osg/Vec3.html | 168 ++-- doc/doc++/osg/Vec4.html | 184 ++-- doc/doc++/osg/VectorSizei.html | 48 +- doc/doc++/osg/VectorUByte.html | 48 +- doc/doc++/osg/VectorUInt.html | 48 +- doc/doc++/osg/VectorUShort.html | 48 +- doc/doc++/osg/Viewport.html | 116 +-- doc/doc++/osg/clampArray3BetweenRange.html | 2 +- doc/doc++/osg/clampArray3GEQUAL.html | 2 +- doc/doc++/osg/clampArray3LEQUAL.html | 2 +- doc/doc++/osg/clampArray4BetweenRange.html | 2 +- doc/doc++/osg/clampArray4GEQUAL.html | 2 +- doc/doc++/osg/clampArray4LEQUAL.html | 2 +- .../osg/clampArrayElementBetweenRange.html | 2 +- doc/doc++/osg/clampArrayElementGEQUAL.html | 2 +- doc/doc++/osg/clampArrayElementLEQUAL.html | 2 +- .../osg/clampArrayElementsBetweenRange.html | 2 +- doc/doc++/osg/clampArrayElementsGEQUAL.html | 2 +- doc/doc++/osg/clampArrayElementsLEQUAL.html | 2 +- doc/doc++/osg/clampBetweenRange.html | 2 +- doc/doc++/osg/clampGEQUAL.html | 2 +- doc/doc++/osg/clampLEQUAL.html | 2 +- doc/doc++/osg/createGeodeForImage.2.html | 2 +- doc/doc++/osg/fast_back_stack.html | 76 +- doc/doc++/osg/for_each_triangle.html | 2 +- doc/doc++/osg/index.html | 8 +- doc/doc++/osg/isGLExtensionSupported.html | 4 +- doc/doc++/osg/isGLUExtensionSupported.html | 4 +- doc/doc++/osg/osg.html | 322 +++++-- doc/doc++/osg/ref_ptr.html | 128 +-- doc/doc++/osg/tag_au.html | 56 +- doc/doc++/osgDB/DotOsgWrapper.html | 98 +- doc/doc++/osgDB/DynamicLibrary.html | 77 +- doc/doc++/osgDB/Output.html | 126 +-- doc/doc++/osgDB/ReadResult.html | 28 +- doc/doc++/osgDB/WriteResult.html | 16 +- doc/doc++/osgGA/CameraManipulator.html | 63 +- doc/doc++/osgGA/CompositeGUIEventHandler.html | 55 +- doc/doc++/osgGA/DriveManipulator.html | 162 +++- doc/doc++/osgGA/FlightManipulator.html | 143 ++- doc/doc++/osgGA/GUIActionAdapter.html | 12 +- doc/doc++/osgGA/GUIEventAdapter.html | 84 +- doc/doc++/osgGA/GUIEventHandler.html | 16 +- doc/doc++/osgGA/GUIEventHandlerVisitor.html | 32 +- doc/doc++/osgGA/General.html | 3 + doc/doc++/osgGA/HIER.html | 1 + doc/doc++/osgGA/HIERjava.html | 10 +- .../osgGA/KeySwitchCameraManipulator.html | 44 +- doc/doc++/osgGA/SetSceneViewVisitor.html | 16 +- doc/doc++/osgGA/StateSetManipulator.html | 44 +- doc/doc++/osgGA/TrackballManipulator.html | 150 ++- doc/doc++/osgGA/index.html | 1 + doc/doc++/osgGA/osgGA.html | 2 + doc/doc++/osgGA/spaceosgGA.html | 11 +- doc/doc++/osgGLUT/Viewer.html | 321 ++++--- doc/doc++/osgParticle/Emitter.html | 2 +- doc/doc++/osgParticle/General.html | 3 + doc/doc++/osgParticle/ModularEmitter.html | 2 +- doc/doc++/osgParticle/ModularProgram.html | 22 +- doc/doc++/osgParticle/MultiSegmentPlacer.html | 28 +- doc/doc++/osgParticle/Particle.html | 16 +- doc/doc++/osgParticle/ParticleProcessor.html | 4 +- doc/doc++/osgParticle/ParticleSystem.html | 128 +-- .../osgParticle/ParticleSystemUpdater.html | 38 +- doc/doc++/osgParticle/Program.html | 2 +- doc/doc++/osgParticle/SectorPlacer.html | 50 +- doc/doc++/osgParticle/SegmentPlacer.html | 54 +- doc/doc++/osgParticle/Shooter.html | 34 +- .../osgParticle/VariableRateCounter.html | 34 +- doc/doc++/osgParticle/index.html | 2 +- doc/doc++/osgParticle/osgParticle.html | 3 + doc/doc++/osgText/BitmapFont.html | 4 +- doc/doc++/osgText/Font.html | 8 +- doc/doc++/osgText/OutlineFont.html | 4 +- doc/doc++/osgText/Paragraph.html | 4 +- doc/doc++/osgText/PixmapFont.html | 4 +- doc/doc++/osgText/PolygonFont.html | 4 +- doc/doc++/osgText/RasterFont.html | 4 +- doc/doc++/osgText/Text.html | 18 +- doc/doc++/osgText/TextureFont.html | 4 +- doc/doc++/osgText/VectorFont.html | 4 +- doc/doc++/osgUtil/CombineLODsVisitor.html | 27 +- .../ConvertGeoSetsToGeometryVisitor.html | 12 +- doc/doc++/osgUtil/CullVisitor.html | 374 ++++---- doc/doc++/osgUtil/DisplayListVisitor.html | 50 +- .../FlattenStaticTransformsVisitor.html | 169 +--- doc/doc++/osgUtil/General.html | 15 +- doc/doc++/osgUtil/HIER.html | 8 +- doc/doc++/osgUtil/HIERjava.html | 24 +- doc/doc++/osgUtil/Hit.html | 99 +- doc/doc++/osgUtil/InsertImpostorsVisitor.html | 88 +- doc/doc++/osgUtil/IntersectState.html | 68 +- doc/doc++/osgUtil/IntersectVisitor.html | 115 ++- doc/doc++/osgUtil/LeafDepthSortFunctor.html | 6 +- doc/doc++/osgUtil/MergeGeometryVisitor.html | 40 +- doc/doc++/osgUtil/Optimizer.html | 27 +- doc/doc++/osgUtil/RegisterRenderBinProxy.html | 20 +- .../osgUtil/RemoveEmptyNodesVisitor.html | 31 +- .../osgUtil/RemoveRedundentNodesVisitor.html | 31 +- doc/doc++/osgUtil/RenderBin.html | 379 ++++---- doc/doc++/osgUtil/RenderGraph.html | 138 +-- doc/doc++/osgUtil/RenderLeaf.html | 36 +- doc/doc++/osgUtil/RenderStage.html | 256 +++--- doc/doc++/osgUtil/RenderStageLighting.html | 63 +- doc/doc++/osgUtil/RenderToTextureStage.html | 138 +-- doc/doc++/osgUtil/SceneView.html | 527 ++++++----- doc/doc++/osgUtil/SmoothingVisitor.html | 12 +- doc/doc++/osgUtil/StateVisitor.html | 45 +- doc/doc++/osgUtil/Tesselator.html | 202 +++-- doc/doc++/osgUtil/TransformCallback.html | 28 +- doc/doc++/osgUtil/TriStripVisitor.html | 12 +- doc/doc++/osgUtil/index.html | 5 +- doc/doc++/osgUtil/osgUtil.html | 16 +- 234 files changed, 13069 insertions(+), 10032 deletions(-) diff --git a/doc/doc++/osg/AlphaFunc.html b/doc/doc++/osg/AlphaFunc.html index c72259f4e..4d3273c36 100644 --- a/doc/doc++/osg/AlphaFunc.html +++ b/doc/doc++/osg/AlphaFunc.html @@ -28,18 +28,18 @@ [more] AlphaFunc(const AlphaFunc& af, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy
-[more] META_StateAttribute(osg, AlphaFunc, ALPHAFUNC) +[more] META_StateAttribute(osg, AlphaFunc, ALPHAFUNC)
[more]virtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
-[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const
-[more]inline void setFunction(const ComparisonFunction func, const float ref) +[more]inline void setFunction(ComparisonFunction func, float ref)
-[more]inline const ComparisonFunction getFunction() const +[more]inline ComparisonFunction getFunction() const
-[more]inline const float getReferenceValue() const +[more]inline float getReferenceValue() const
[more]virtual void apply(State& state) const

@@ -76,7 +76,7 @@
ovirtual const char* className() const
-ovirtual const Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -109,9 +109,9 @@

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -127,7 +127,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -145,12 +145,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -172,7 +180,7 @@

-

o META_StateAttribute(osg, AlphaFunc, ALPHAFUNC) +
o META_StateAttribute(osg, AlphaFunc, ALPHAFUNC)

@@ -181,7 +189,7 @@

-

ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const +
ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const

@@ -223,15 +231,15 @@ -

oinline void setFunction(const ComparisonFunction func, const float ref) +
oinline void setFunction(ComparisonFunction func, float ref)

-

oinline const ComparisonFunction getFunction() const +
oinline ComparisonFunction getFunction() const

-

oinline const float getReferenceValue() const +
oinline float getReferenceValue() const

diff --git a/doc/doc++/osg/AnimationPath.html b/doc/doc++/osg/AnimationPath.html index 733fd7d0e..87807fb01 100644 --- a/doc/doc++/osg/AnimationPath.html +++ b/doc/doc++/osg/AnimationPath.html @@ -31,10 +31,10 @@ [more]bool getInverse(double time, Matrix& matrix) const

get the inverse transformation matrix for a point in time
-[more]virtual bool getInterpolatedControlPoint(double time, ControlPoint& ControlPoint) const +[more]virtual bool getInterpolatedControlPoint(double time, ControlPoint& controlPoint) const
get the local ControlPoint frame for a point in time
-[more]void insert(double time, const ControlPoint& ControlPoint) +[more]void insert(double time, const ControlPoint& controlPoint)
[more]double getFirstTime() const
@@ -45,6 +45,10 @@ [more]void setLoopMode(LoopMode lm)
[more]LoopMode getLoopMode() const +
+[more]TimeControlPointMap& getTimeControlPointMap() +
+[more]const TimeControlPointMap& getTimeControlPointMap() const

@@ -52,21 +56,20 @@ [more]struct ControlPoint
[more]enum LoopMode +
+[more]typedef std::map<double,ControlPoint> TimeControlPointMap

Protected Fields

-[more]LoopMode _loopMode +[more]TimeControlPointMap _timeControlPointMap +
+[more]LoopMode _loopMode

Protected Methods

-[more]virtual ~AnimationPath() -

- -

-

Protected Members

-[more]typedef std::map<double,ControlPoint> TimeControlPointMap TimeControlPointMap _timeControlPointMap +[more]virtual ~AnimationPath()

@@ -82,12 +85,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -123,7 +134,7 @@ be attached directly to Transform nodes to move subgraphs around the scene.

-

o ControlPoint(const osg::Vec3& position, const osg::Quat& rotation, const osg::Vec3& scale) +
o ControlPoint(const osg::Vec3& position, const osg::Quat& rotation, const osg::Vec3& scale)

@@ -139,7 +150,7 @@ be attached directly to Transform nodes to move subgraphs around the scene.

-

oinline void interpolate(const float ratio, const ControlPoint& first, const ControlPoint& second) +
oinline void interpolate(float ratio, const ControlPoint& first, const ControlPoint& second)

@@ -162,12 +173,12 @@ be attached directly to Transform nodes to move subgraphs around the scene.

-

ovirtual bool getInterpolatedControlPoint(double time, ControlPoint& ControlPoint) const +
ovirtual bool getInterpolatedControlPoint(double time, ControlPoint& controlPoint) const
get the local ControlPoint frame for a point in time

-

ovoid insert(double time, const ControlPoint& ControlPoint) +
ovoid insert(double time, const ControlPoint& controlPoint)

@@ -207,16 +218,28 @@ be attached directly to Transform nodes to move subgraphs around the scene.

oLoopMode getLoopMode() const

- + +

otypedef std::map<double,ControlPoint> TimeControlPointMap +

+ + +

oTimeControlPointMap& getTimeControlPointMap() +

+ + +

oconst TimeControlPointMap& getTimeControlPointMap() const +

+ +

ovirtual ~AnimationPath()

- -

otypedef std::map<double,ControlPoint> TimeControlPointMap TimeControlPointMap _timeControlPointMap + +
oTimeControlPointMap _timeControlPointMap

- +

oLoopMode _loopMode

diff --git a/doc/doc++/osg/AnimationPathCallback.2.html b/doc/doc++/osg/AnimationPathCallback.2.html index ee8f77c10..bcfd808aa 100644 --- a/doc/doc++/osg/AnimationPathCallback.2.html +++ b/doc/doc++/osg/AnimationPathCallback.2.html @@ -23,16 +23,20 @@

Public Fields

-[more]ref_ptr<AnimationPath> _animationPath +[more]ref_ptr<AnimationPath> _animationPath
-[more]double _firstTime +[more]double _timeOffset +
+[more]double _timeMultiplier +
+[more]double _firstTime

Public Methods

-[more] AnimationPathCallback(AnimationPath* ap) +[more] AnimationPathCallback(AnimationPath* ap, double timeOffset=0.0f, double timeMultiplier=1.0f)
-[more]virtual void operator()(Node* node, NodeVisitor* nv) +[more]virtual void operator()(Node* node, NodeVisitor* nv)
implements the callback

@@ -70,12 +74,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -89,20 +101,28 @@ AnimationPath
- -
o AnimationPathCallback(AnimationPath* ap) + +
o AnimationPathCallback(AnimationPath* ap, double timeOffset=0.0f, double timeMultiplier=1.0f)

- +

ovirtual void operator()(Node* node, NodeVisitor* nv)
implements the callback

- +

oref_ptr<AnimationPath> _animationPath

+ + +

odouble _timeOffset +

+ + +

odouble _timeMultiplier +

- +

odouble _firstTime

diff --git a/doc/doc++/osg/AnimationPathCallback.html b/doc/doc++/osg/AnimationPathCallback.html index 2fb863c76..0ce2bee00 100644 --- a/doc/doc++/osg/AnimationPathCallback.html +++ b/doc/doc++/osg/AnimationPathCallback.html @@ -23,16 +23,20 @@

Public Fields

-[more]ref_ptr<AnimationPath> _animationPath +[more]ref_ptr<AnimationPath> _animationPath
-[more]double _firstTime +[more]double _timeOffset +
+[more]double _timeMultiplier +
+[more]double _firstTime

Public Methods

-[more] AnimationPathCallback(AnimationPath* ap) +[more] AnimationPathCallback(AnimationPath* ap, double timeOffset=0.0f, double timeMultiplier=1.0f)
-[more]virtual void operator()(Node* node, NodeVisitor* nv) +[more]virtual void operator()(Node* node, NodeVisitor* nv)
implements the callback

@@ -70,12 +74,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -88,20 +100,28 @@ callback to allow it to follow the path defined by a AnimationPath
- -
o AnimationPathCallback(AnimationPath* ap) + +
o AnimationPathCallback(AnimationPath* ap, double timeOffset=0.0f, double timeMultiplier=1.0f)

- +

ovirtual void operator()(Node* node, NodeVisitor* nv)
implements the callback

- +

oref_ptr<AnimationPath> _animationPath

+ + +

odouble _timeOffset +

+ + +

odouble _timeMultiplier +

- +

odouble _firstTime

diff --git a/doc/doc++/osg/Array.html b/doc/doc++/osg/Array.html index 430f6d255..a6025d6b8 100644 --- a/doc/doc++/osg/Array.html +++ b/doc/doc++/osg/Array.html @@ -10,11 +10,11 @@

class SG_EXPORT osg::Array

Inheritance:

- - - - - + + + + +
@@ -32,17 +32,23 @@
[more]virtual const char* className() const
-[more]virtual void accept(ArrayVisitor&) +[more]virtual void accept(ArrayVisitor&) = 0
-[more]Type getType() const +[more]virtual void accept(ConstArrayVisitor&) const = 0
-[more]GLint getDataSize() const +[more]virtual void accept(unsigned int index, ValueVisitor&) = 0
-[more]GLenum getDataType() const +[more]virtual void accept(unsigned int index, ConstValueVisitor&) const = 0
-[more]virtual const GLvoid* getDataPointer() const = 0 +[more]Type getType() const
-[more]virtual unsigned int getNumElements() const = 0 +[more]GLint getDataSize() const +
+[more]GLenum getDataType() const +
+[more]virtual const GLvoid* getDataPointer() const = 0 +
+[more]virtual unsigned int getNumElements() const = 0

@@ -52,16 +58,16 @@

Protected Fields

-[more]Type _arrayType +[more]Type _arrayType
-[more]GLint _dataSize +[more]GLint _dataSize
-[more]GLenum _dataType +[more]GLenum _dataType

Protected Methods

-[more]virtual ~Array() +[more]virtual ~Array()

@@ -73,9 +79,9 @@
ovirtual Object* clone(const CopyOp&) const
-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -91,7 +97,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -109,12 +115,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -200,47 +214,60 @@

-

ovirtual void accept(ArrayVisitor&) +
ovirtual void accept(ArrayVisitor&) = 0 +

+ + +

ovirtual void accept(ConstArrayVisitor&) const = 0 +

+ + +

ovirtual void accept(unsigned int index, ValueVisitor&) = 0 +

+ + +

ovirtual void accept(unsigned int index, ConstValueVisitor&) const = 0

- +

oType getType() const

- +

oGLint getDataSize() const

- +

oGLenum getDataType() const

- +

ovirtual const GLvoid* getDataPointer() const = 0

- +

ovirtual unsigned int getNumElements() const = 0

- +

ovirtual ~Array()

- +

oType _arrayType

- +

oGLint _dataSize

- +

oGLenum _dataType

Direct child classes:
TemplateArray
+IndexArray

Alphabetic index HTML hierarchy of classes or Java

diff --git a/doc/doc++/osg/ArrayVisitor.html b/doc/doc++/osg/ArrayVisitor.html index 5206dbc6e..dd153869e 100644 --- a/doc/doc++/osg/ArrayVisitor.html +++ b/doc/doc++/osg/ArrayVisitor.html @@ -2,41 +2,41 @@ - typedef TemplateArray<Vec4,Array::Vec4ArrayType,4,GL_FLOAT> Vec4Arrayclass osg::ArrayVisitor + class osg::ArrayVisitor -

typedef TemplateArray<Vec4,Array::Vec4ArrayType,4,GL_FLOAT> Vec4Arrayclass osg::ArrayVisitor

+

class osg::ArrayVisitor

Public Methods

-[more] ArrayVisitor() +[more] ArrayVisitor()
-[more]virtual void apply(Array&) +[more]virtual void apply(Array&)
-[more]virtual void apply(ByteArray&) +[more]virtual void apply(ByteArray&)
-[more]virtual void apply(ShortArray&) +[more]virtual void apply(ShortArray&)
-[more]virtual void apply(IntArray&) +[more]virtual void apply(IntArray&)
-[more]virtual void apply(UByteArray&) +[more]virtual void apply(UByteArray&)
-[more]virtual void apply(UShortArray&) +[more]virtual void apply(UShortArray&)
-[more]virtual void apply(UIntArray&) +[more]virtual void apply(UIntArray&)
-[more]virtual void apply(UByte4Array&) +[more]virtual void apply(UByte4Array&)
-[more]virtual void apply(FloatArray&) +[more]virtual void apply(FloatArray&)
-[more]virtual void apply(Vec2Array&) +[more]virtual void apply(Vec2Array&)
-[more]virtual void apply(Vec3Array&) +[more]virtual void apply(Vec3Array&)
-[more]virtual void apply(Vec4Array&) +[more]virtual void apply(Vec4Array&)

@@ -47,56 +47,56 @@
- +
o ArrayVisitor()

- +

ovirtual void apply(Array&)

- -

ovirtual void apply(ByteArray&) + +
ovirtual void apply(ByteArray&)

- -

ovirtual void apply(ShortArray&) + +
ovirtual void apply(ShortArray&)

- -

ovirtual void apply(IntArray&) + +
ovirtual void apply(IntArray&)

- -

ovirtual void apply(UByteArray&) + +
ovirtual void apply(UByteArray&)

- -

ovirtual void apply(UShortArray&) + +
ovirtual void apply(UShortArray&)

- -

ovirtual void apply(UIntArray&) + +
ovirtual void apply(UIntArray&)

- -

ovirtual void apply(UByte4Array&) + +
ovirtual void apply(UByte4Array&)

- -

ovirtual void apply(FloatArray&) + +
ovirtual void apply(FloatArray&)

- -

ovirtual void apply(Vec2Array&) + +
ovirtual void apply(Vec2Array&)

- -

ovirtual void apply(Vec3Array&) + +
ovirtual void apply(Vec3Array&)

- -

ovirtual void apply(Vec4Array&) + +
ovirtual void apply(Vec4Array&)

This class has no child classes.
diff --git a/doc/doc++/osg/AttributeFunctor.html b/doc/doc++/osg/AttributeFunctor.html index 6cc9b2d9f..5552798ef 100644 --- a/doc/doc++/osg/AttributeFunctor.html +++ b/doc/doc++/osg/AttributeFunctor.html @@ -12,29 +12,29 @@

Public Methods

-[more]virtual ~AttributeFunctor() +[more]virtual ~AttributeFunctor()
-[more]virtual void apply(AttributeType, unsigned int, GLbyte*) +[more]virtual void apply(AttributeType, unsigned int, GLbyte*)
-[more]virtual void apply(AttributeType, unsigned int, GLshort*) +[more]virtual void apply(AttributeType, unsigned int, GLshort*)
-[more]virtual void apply(AttributeType, unsigned int, GLint*) +[more]virtual void apply(AttributeType, unsigned int, GLint*)
-[more]virtual void apply(AttributeType, unsigned int, GLubyte*) +[more]virtual void apply(AttributeType, unsigned int, GLubyte*)
-[more]virtual void apply(AttributeType, unsigned int, GLushort*) +[more]virtual void apply(AttributeType, unsigned int, GLushort*)
-[more]virtual void apply(AttributeType, unsigned int, GLuint*) +[more]virtual void apply(AttributeType, unsigned int, GLuint*)
-[more]virtual void apply(AttributeType, unsigned int, float*) +[more]virtual void apply(AttributeType, unsigned int, float*)
-[more]virtual void apply(AttributeType, unsigned int, Vec2*) +[more]virtual void apply(AttributeType, unsigned int, Vec2*)
-[more]virtual void apply(AttributeType, unsigned int, Vec3*) +[more]virtual void apply(AttributeType, unsigned int, Vec3*)
-[more]virtual void apply(AttributeType, unsigned int, Vec4*) +[more]virtual void apply(AttributeType, unsigned int, Vec4*)
-[more]virtual void apply(AttributeType, unsigned int, UByte4*) +[more]virtual void apply(AttributeType, unsigned int, UByte4*)

@@ -45,52 +45,52 @@
- +
ovirtual ~AttributeFunctor()

- -

ovirtual void apply(AttributeType, unsigned int, GLbyte*) + +
ovirtual void apply(AttributeType, unsigned int, GLbyte*)

- -

ovirtual void apply(AttributeType, unsigned int, GLshort*) + +
ovirtual void apply(AttributeType, unsigned int, GLshort*)

- -

ovirtual void apply(AttributeType, unsigned int, GLint*) + +
ovirtual void apply(AttributeType, unsigned int, GLint*)

- -

ovirtual void apply(AttributeType, unsigned int, GLubyte*) + +
ovirtual void apply(AttributeType, unsigned int, GLubyte*)

- -

ovirtual void apply(AttributeType, unsigned int, GLushort*) + +
ovirtual void apply(AttributeType, unsigned int, GLushort*)

- -

ovirtual void apply(AttributeType, unsigned int, GLuint*) + +
ovirtual void apply(AttributeType, unsigned int, GLuint*)

- -

ovirtual void apply(AttributeType, unsigned int, float*) + +
ovirtual void apply(AttributeType, unsigned int, float*)

- -

ovirtual void apply(AttributeType, unsigned int, Vec2*) + +
ovirtual void apply(AttributeType, unsigned int, Vec2*)

- -

ovirtual void apply(AttributeType, unsigned int, Vec3*) + +
ovirtual void apply(AttributeType, unsigned int, Vec3*)

- -

ovirtual void apply(AttributeType, unsigned int, Vec4*) + +
ovirtual void apply(AttributeType, unsigned int, Vec4*)

- -

ovirtual void apply(AttributeType, unsigned int, UByte4*) + +
ovirtual void apply(AttributeType, unsigned int, UByte4*)

This class has no child classes.
diff --git a/doc/doc++/osg/Billboard.html b/doc/doc++/osg/Billboard.html index 90452cc7b..f46c2980f 100644 --- a/doc/doc++/osg/Billboard.html +++ b/doc/doc++/osg/Billboard.html @@ -23,92 +23,92 @@

Public Methods

-[more] Billboard() +[more] Billboard()
-[more] Billboard(const Billboard&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Billboard(const Billboard&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy
-[more] META_Node(osg, Billboard) +[more] META_Node(osg, Billboard)
-[more]void setMode(const Mode mode) +[more]void setMode(Mode mode)
Set the billboard rotation mode.
-[more]inline const Mode getMode() const +[more]inline Mode getMode() const
Get the billboard rotation mode.
-[more]void setAxis(const Vec3& axis) +[more]void setAxis(const Vec3& axis)
Set the axis about which all the billboard's drawable rotate.
-[more]inline const Vec3& getAxis() const +[more]inline const Vec3& getAxis() const
Get the axis about which all the billboard's drawable rotate.
-[more]void setNormal(const Vec3& normal) +[more]void setNormal(const Vec3& normal)
Set the normal which defines the billboard's drawable front face, when unrotated.
-[more]inline const Vec3& getNormal() const +[more]inline const Vec3& getNormal() const
Get the normal of billboard's drawable front face.
-[more]inline void setPos(int i, const Vec3& pos) +[more]inline void setPos(unsigned int i, const Vec3& pos)
Set the position of specified drawable.
-[more]inline const Vec3& getPos(int i) const +[more]inline const Vec3& getPos(unsigned int i) const
Get the position of specified drawable.
-[more]inline PositionList& getPositionList() +[more]inline PositionList& getPositionList()
Get the PositionList from the billboard
-[more]inline const PositionList& getPositionList() const +[more]inline const PositionList& getPositionList() const
Get a const PositionList from the billboard
-[more]virtual const bool addDrawable( Drawable* gset ) +[more]virtual bool addDrawable( Drawable* gset )
Add Drawable to Billboard with default position(0,0,0); If gset not NULL and is not contained in Billboard then increment its reference count, and dirty the bounding box to cause it to recompute on next getBound() and return true for success.
-[more]virtual const bool addDrawable(Drawable* gset, const Vec3& pos) +[more]virtual bool addDrawable(Drawable* gset, const Vec3& pos)
Add Drawable to Geode at position pos.
-[more]virtual const bool removeDrawable( Drawable* gset ) +[more]virtual bool removeDrawable( Drawable* gset )
Remove Drawable and associated position from Billboard.
-[more]inline const bool getMatrix(Matrix& modelview, const Vec3& eye_local, const Vec3& pos_local) const +[more]inline bool getMatrix(Matrix& modelview, const Vec3& eye_local, const Vec3& pos_local) const
-[more]virtual const bool computeMatrix(Matrix& modelview, const Vec3& eye_local, const Vec3& pos_local) const +[more]virtual bool computeMatrix(Matrix& modelview, const Vec3& eye_local, const Vec3& pos_local) const

Public Members

-[more]enum Mode +[more]enum Mode
-[more]typedef std::vector<Vec3> PositionList +[more]typedef std::vector<Vec3> PositionList
PositionList represents a list of pivot points for each drawable

Protected Fields

-[more]Mode _mode +[more]Mode _mode
-[more]Vec3 _axis +[more]Vec3 _axis
-[more]Vec3 _normal +[more]Vec3 _normal
-[more]PositionList _positionList +[more]PositionList _positionList
-[more]int _cachedMode +[more]int _cachedMode
-[more]Vec3 _side +[more]Vec3 _side

Protected Methods

-[more]virtual ~Billboard() +[more]virtual ~Billboard()
-[more]virtual const bool computeBound() const +[more]virtual bool computeBound() const
-[more]void updateCache() +[more]void updateCache()

Protected Members

-[more]enum AxisAligned +[more]enum AxisAligned

@@ -116,15 +116,15 @@

Public Methods

-ovirtual const bool replaceDrawable( Drawable* origDraw, Drawable* newDraw ) +ovirtual bool replaceDrawable( Drawable* origDraw, Drawable* newDraw )
-oinline const unsigned int getNumDrawables() const +oinline unsigned int getNumDrawables() const
-oinline Drawable* getDrawable( const unsigned int i ) +oinline Drawable* getDrawable( unsigned int i )
-oinline const Drawable* getDrawable( const unsigned int i ) const +oinline const Drawable* getDrawable( unsigned int i ) const
-oinline const bool containsDrawable(const Drawable* gset) const +oinline bool containsDrawable(const Drawable* gset) const
oinline DrawableList::iterator findDrawable(const Drawable* gset)
@@ -133,9 +133,14 @@ ovoid compileDrawables(State& state)

+

+

Public Members

+otypedef std::vector< ref_ptr<Drawable> > DrawableList +

+

Protected Fields

-oDrawableList _drawables +oDrawableList _drawables

@@ -148,110 +153,110 @@ the eye point. Typical uses are for trees, or particle explosions.
- +
oenum Mode

- +
o POINT_ROT_EYE

- +

o POINT_ROT_WORLD

- +

o AXIAL_ROT

- +
o Billboard()

- -

o Billboard(const Billboard&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o Billboard(const Billboard&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy

- +

o META_Node(osg, Billboard)

- -

ovoid setMode(const Mode mode) + +
ovoid setMode(Mode mode)
Set the billboard rotation mode.

- -

oinline const Mode getMode() const + +
oinline Mode getMode() const
Get the billboard rotation mode.

- +

ovoid setAxis(const Vec3& axis)
Set the axis about which all the billboard's drawable rotate. Only utlized when mode==AXIAL_ROT

- +

oinline const Vec3& getAxis() const
Get the axis about which all the billboard's drawable rotate.

- +

ovoid setNormal(const Vec3& normal)
Set the normal which defines the billboard's drawable front face, when unrotated.

- +

oinline const Vec3& getNormal() const
Get the normal of billboard's drawable front face.

- -

oinline void setPos(int i, const Vec3& pos) + +
oinline void setPos(unsigned int i, const Vec3& pos)
Set the position of specified drawable.

- -

oinline const Vec3& getPos(int i) const + +
oinline const Vec3& getPos(unsigned int i) const
Get the position of specified drawable.

- +

otypedef std::vector<Vec3> PositionList
PositionList represents a list of pivot points for each drawable

- -

oinline PositionList& getPositionList() + +
oinline PositionList& getPositionList()
Get the PositionList from the billboard

- -

oinline const PositionList& getPositionList() const + +
oinline const PositionList& getPositionList() const
Get a const PositionList from the billboard

- -

ovirtual const bool addDrawable( Drawable* gset ) + +
ovirtual bool addDrawable( Drawable* gset )
Add Drawable to Billboard with default position(0,0,0); If gset not NULL and is not contained in Billboard then increment its reference count, and dirty the bounding box to cause it to recompute on next getBound() and return true for success. Otherwise return false.

- -

ovirtual const bool addDrawable(Drawable* gset, const Vec3& pos) + +
ovirtual bool addDrawable(Drawable* gset, const Vec3& pos)
Add Drawable to Geode at position pos. If gset not NULL and is not contained in Billboard then increment its reference count, and dirty the bounding box to cause it to recompute on next getBound() and return true for success. Otherwise return false.

- -

ovirtual const bool removeDrawable( Drawable* gset ) + +
ovirtual bool removeDrawable( Drawable* gset )
Remove Drawable and associated position from Billboard. If gset is contained in Billboard then remove it from the geoset list and decrement its reference count, and dirty the @@ -260,69 +265,69 @@ return true for success. If gset is not found then return false and do not the reference count of gset is left unchanged.

- -

oinline const bool getMatrix(Matrix& modelview, const Vec3& eye_local, const Vec3& pos_local) const + +
oinline bool getMatrix(Matrix& modelview, const Vec3& eye_local, const Vec3& pos_local) const

- -

ovirtual const bool computeMatrix(Matrix& modelview, const Vec3& eye_local, const Vec3& pos_local) const + +
ovirtual bool computeMatrix(Matrix& modelview, const Vec3& eye_local, const Vec3& pos_local) const

- +

ovirtual ~Billboard()

- -

ovirtual const bool computeBound() const + +
ovirtual bool computeBound() const

- +

oenum AxisAligned

- +
o AXIAL_ROT_X_AXIS

- +

o AXIAL_ROT_Y_AXIS

- +

o AXIAL_ROT_Z_AXIS

- +

o CACHE_DIRTY

- -
oMode _mode + +
oMode _mode

- +

oVec3 _axis

- +

oVec3 _normal

- -

oPositionList _positionList + +
oPositionList _positionList

- +

oint _cachedMode

- +

oVec3 _side

- +

ovoid updateCache()

diff --git a/doc/doc++/osg/BlendFunc.html b/doc/doc++/osg/BlendFunc.html index 3af76ce9d..6256c0b74 100644 --- a/doc/doc++/osg/BlendFunc.html +++ b/doc/doc++/osg/BlendFunc.html @@ -23,46 +23,46 @@

Public Methods

-[more] BlendFunc() +[more] BlendFunc()
-[more] BlendFunc(const BlendFunc& trans, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] BlendFunc(const BlendFunc& trans, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy
-[more] META_StateAttribute(osg, BlendFunc, BLENDFUNC) +[more] META_StateAttribute(osg, BlendFunc, BLENDFUNC)
-[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
-[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const
-[more]inline void setFunction( const int source, const int destination ) +[more]inline void setFunction( GLenum source, GLenum destination )
-[more]void setSource(const int source) +[more]void setSource(GLenum source)
-[more]inline const int getSource() const +[more]inline GLenum getSource() const
-[more]void setDestination(const int destination) +[more]void setDestination(GLenum destination)
-[more]inline const int getDestination() const +[more]inline GLenum getDestination() const
-[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

Public Members

-[more]enum BlendFuncMode +[more]enum BlendFuncMode

Protected Fields

-[more]int _source_factor +[more]GLenum _source_factor
-[more]int _destination_factor +[more]GLenum _destination_factor

Protected Methods

-[more]virtual ~BlendFunc() +[more]virtual ~BlendFunc()

@@ -80,7 +80,7 @@
ovirtual const char* className() const
-ovirtual const Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -113,9 +113,9 @@

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -131,7 +131,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -149,12 +149,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -166,112 +174,112 @@
- +
o BlendFunc()

- -

o BlendFunc(const BlendFunc& trans, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o BlendFunc(const BlendFunc& trans, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy

- -

o META_StateAttribute(osg, BlendFunc, BLENDFUNC) + +
o META_StateAttribute(osg, BlendFunc, BLENDFUNC)

- +

ovirtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

- -

ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const + +
ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const

- +

oenum BlendFuncMode

- +
o DST_ALPHA

- +

o DST_COLOR

- +

o ONE

- +

o ONE_MINUS_DST_ALPHA

- +

o ONE_MINUS_DST_COLOR

- +

o ONE_MINUS_SRC_ALPHA

- +

o ONE_MINUS_SRC_COLOR

- +

o SRC_ALPHA

- +

o SRC_ALPHA_SATURATE

- +

o SRC_COLOR

- +

o ZERO

- -
oinline void setFunction( const int source, const int destination ) + +
oinline void setFunction( GLenum source, GLenum destination )

- -

ovoid setSource(const int source) + +
ovoid setSource(GLenum source)

- -

oinline const int getSource() const + +
oinline GLenum getSource() const

- -

ovoid setDestination(const int destination) + +
ovoid setDestination(GLenum destination)

- -

oinline const int getDestination() const + +
oinline GLenum getDestination() const

- +

ovirtual void apply(State& state) const

- +

ovirtual ~BlendFunc()

- -

oint _source_factor + +
oGLenum _source_factor

- -

oint _destination_factor + +
oGLenum _destination_factor

This class has no child classes.
diff --git a/doc/doc++/osg/BoundingBox.html b/doc/doc++/osg/BoundingBox.html index 8aaa36d69..1ea69a721 100644 --- a/doc/doc++/osg/BoundingBox.html +++ b/doc/doc++/osg/BoundingBox.html @@ -13,83 +13,83 @@

Public Fields

-[more]Vec3 _min +[more]Vec3 _min
The corner with the smallest values for each coordinate of the bounding box
-[more]Vec3 _max +[more]Vec3 _max
The corner with the largest values for each coordinate of the bounding box

Public Methods

-[more]inline BoundingBox() +[more]inline BoundingBox()
construct to invalid values to represent an unset bounding box
-[more]inline BoundingBox(float xmin, float ymin, float zmin, float xmax, float ymax, float zmax) +[more]inline BoundingBox(float xmin, float ymin, float zmin, float xmax, float ymax, float zmax)
construct to with specified min and max values
-[more]inline BoundingBox(const Vec3& min, const Vec3& max) +[more]inline BoundingBox(const Vec3& min, const Vec3& max)
construct to with specified min and max values
-[more]inline void init() +[more]inline void init()
initialize to invalid values to represent an unset bounding box
-[more]inline const bool valid() const +[more]inline bool valid() const
-[more]inline void set(float xmin, float ymin, float zmin, float xmax, float ymax, float zmax) +[more]inline void set(float xmin, float ymin, float zmin, float xmax, float ymax, float zmax)
-[more]inline void set(const Vec3& min, const Vec3& max) +[more]inline void set(const Vec3& min, const Vec3& max)
construct to with specified min and max values
-[more]inline float& xMin() +[more]inline float& xMin()
-[more]inline const float xMin() const +[more]inline float xMin() const
-[more]inline float& yMin() +[more]inline float& yMin()
-[more]inline const float yMin() const +[more]inline float yMin() const
-[more]inline float& zMin() +[more]inline float& zMin()
-[more]inline const float zMin() const +[more]inline float zMin() const
-[more]inline float& xMax() +[more]inline float& xMax()
-[more]inline const float xMax() const +[more]inline float xMax() const
-[more]inline float& yMax() +[more]inline float& yMax()
-[more]inline const float yMax() const +[more]inline float yMax() const
-[more]inline float& zMax() +[more]inline float& zMax()
-[more]inline const float zMax() const +[more]inline float zMax() const
-[more]inline const Vec3 center() const +[more]inline const Vec3 center() const
Calculate and return the center of the bounding box
-[more]inline const float radius() const +[more]inline float radius() const
Calculate and return the radius of the bounding box
-[more]inline const float radius2() const +[more]inline float radius2() const
Calculate and return the radius squared of the bounding box.
-[more]inline const Vec3 corner(unsigned int pos) const +[more]inline const Vec3 corner(unsigned int pos) const
return the corner of the bounding box.
-[more]inline void expandBy(const Vec3& v) +[more]inline void expandBy(const Vec3& v)
If the vertex is out-with the box expand to encompass vertex.
-[more]inline void expandBy(float x, float y, float z) +[more]inline void expandBy(float x, float y, float z)
If the vertex is out-with the box expand to encompass vertex.
-[more]void expandBy(const BoundingBox& bb) +[more]void expandBy(const BoundingBox& bb)
If incoming box is out-with the box expand to encompass incoming box.
-[more]void expandBy(const BoundingSphere& sh) +[more]void expandBy(const BoundingSphere& sh)
If incoming sphere is out-with the box expand to encompass incoming sphere.
-[more]inline const bool contains(const Vec3& v) const +[more]inline bool contains(const Vec3& v) const
return true is vertex v is within the box

@@ -104,116 +104,116 @@ i.e. osg::Drawable's to assist in view frustum culling etc.
- +
oVec3 _min
The corner with the smallest values for each coordinate of the bounding box

- +

oVec3 _max
The corner with the largest values for each coordinate of the bounding box

- +

oinline BoundingBox()
construct to invalid values to represent an unset bounding box

- +

oinline BoundingBox(float xmin, float ymin, float zmin, float xmax, float ymax, float zmax)
construct to with specified min and max values

- +

oinline BoundingBox(const Vec3& min, const Vec3& max)
construct to with specified min and max values

- +

oinline void init()
initialize to invalid values to represent an unset bounding box

- -

oinline const bool valid() const + +
oinline bool valid() const

- +

oinline void set(float xmin, float ymin, float zmin, float xmax, float ymax, float zmax)

- +

oinline void set(const Vec3& min, const Vec3& max)
construct to with specified min and max values

- +

oinline float& xMin()

- -

oinline const float xMin() const + +
oinline float xMin() const

- +

oinline float& yMin()

- -

oinline const float yMin() const + +
oinline float yMin() const

- +

oinline float& zMin()

- -

oinline const float zMin() const + +
oinline float zMin() const

- +

oinline float& xMax()

- -

oinline const float xMax() const + +
oinline float xMax() const

- +

oinline float& yMax()

- -

oinline const float yMax() const + +
oinline float yMax() const

- +

oinline float& zMax()

- -

oinline const float zMax() const + +
oinline float zMax() const

- +

oinline const Vec3 center() const
Calculate and return the center of the bounding box

- -

oinline const float radius() const + +
oinline float radius() const
Calculate and return the radius of the bounding box

- -

oinline const float radius2() const + +
oinline float radius2() const
Calculate and return the radius squared of the bounding box. Note, radius2() is faster to calculate than radius().

- +

oinline const Vec3 corner(unsigned int pos) const
return the corner of the bounding box. Position (pos) is specified by a number between 0 and 7, @@ -222,32 +222,32 @@ bit toggles between y min and y max, third bit toggles between z min and z max.

- +

oinline void expandBy(const Vec3& v)
If the vertex is out-with the box expand to encompass vertex. If this box is empty then move set this box's min max to vertex.

- -

oinline void expandBy(float x, float y, float z) + +
oinline void expandBy(float x, float y, float z)
If the vertex is out-with the box expand to encompass vertex. If this box is empty then move set this box's min max to vertex.

- +

ovoid expandBy(const BoundingBox& bb)
If incoming box is out-with the box expand to encompass incoming box. If this box is empty then move set this box to incoming box.

- +

ovoid expandBy(const BoundingSphere& sh)
If incoming sphere is out-with the box expand to encompass incoming sphere. If this box is empty then move set this box to encompass the sphere.

- -

oinline const bool contains(const Vec3& v) const + +
oinline bool contains(const Vec3& v) const
return true is vertex v is within the box

diff --git a/doc/doc++/osg/BoundingSphere.html b/doc/doc++/osg/BoundingSphere.html index 84e9a30a5..cdd8b9d94 100644 --- a/doc/doc++/osg/BoundingSphere.html +++ b/doc/doc++/osg/BoundingSphere.html @@ -13,65 +13,65 @@

Public Fields

-[more]Vec3 _center +[more]Vec3 _center
-[more]float _radius +[more]float _radius

Public Methods

-[more] BoundingSphere() +[more] BoundingSphere()
construct to invalid values to represent an unset bounding sphere
-[more] BoundingSphere(const Vec3& center, float radius) +[more] BoundingSphere(const Vec3& center, float radius)
construct to specified bounding sphere
-[more]inline void init() +[more]inline void init()
initialize to invalid values to represent an unset bounding sphere
-[more]inline const bool valid() const +[more]inline bool valid() const
return true if the bounding sphere contains valid values, false if the bounding sphere is effectively unset
-[more]inline void set(const Vec3& center, float radius) +[more]inline void set(const Vec3& center, float radius)
set bounding sphere
-[more]inline Vec3& center() +[more]inline Vec3& center()
return the center of the bounding sphere
-[more]inline const Vec3& center() const +[more]inline const Vec3& center() const
return the const center of the bounding sphere
-[more]inline float& radius() +[more]inline float& radius()
return the radius of the bounding sphere
-[more]inline const float radius() const +[more]inline float radius() const
return the const radius of the bounding sphere
-[more]inline const float radius2() const +[more]inline float radius2() const
return the radius squared.
-[more]void expandBy(const Vec3& v) +[more]void expandBy(const Vec3& v)
If the vertex is out-with the sphere expand to encompass vertex.
-[more]void expandRadiusBy(const Vec3& v) +[more]void expandRadiusBy(const Vec3& v)
If the vertex is outwith the sphere expand radius to ecompass vertex.
-[more]void expandBy(const BoundingSphere& sh) +[more]void expandBy(const BoundingSphere& sh)
If incomming sphere is outwith the sphere expand to ecompass incomming sphere.
-[more]void expandRadiusBy(const BoundingSphere& sh) +[more]void expandRadiusBy(const BoundingSphere& sh)
If incomming sphere is outwith the sphere expand radius to ecompass incomming sphere.
-[more]void expandBy(const BoundingBox& bb) +[more]void expandBy(const BoundingBox& bb)
If incomming box is outwith the sphere expand to ecompass incomming box.
-[more]void expandRadiusBy(const BoundingBox& bb) +[more]void expandRadiusBy(const BoundingBox& bb)
If incomming box is outwith the sphere expand radius to ecompass incomming box.
-[more]inline const bool contains(const Vec3& v) const +[more]inline bool contains(const Vec3& v) const
return true is vertex v is within the sphere
-[more]inline const bool intersects( const BoundingSphere& bs ) const +[more]inline bool intersects( const BoundingSphere& bs ) const
return true if bounding sphere's intersect each other

@@ -88,69 +88,69 @@ than a BoundingBox so will not cull so aggressively.
- +
oVec3 _center

- +

ofloat _radius

- +

o BoundingSphere()
construct to invalid values to represent an unset bounding sphere

- -

o BoundingSphere(const Vec3& center, float radius) + +
o BoundingSphere(const Vec3& center, float radius)
construct to specified bounding sphere

- +

oinline void init()
initialize to invalid values to represent an unset bounding sphere

- -

oinline const bool valid() const + +
oinline bool valid() const
return true if the bounding sphere contains valid values, false if the bounding sphere is effectively unset

- -

oinline void set(const Vec3& center, float radius) + +
oinline void set(const Vec3& center, float radius)
set bounding sphere

- +

oinline Vec3& center()
return the center of the bounding sphere

- +

oinline const Vec3& center() const
return the const center of the bounding sphere

- +

oinline float& radius()
return the radius of the bounding sphere

- -

oinline const float radius() const + +
oinline float radius() const
return the const radius of the bounding sphere

- -

oinline const float radius2() const + +
oinline float radius2() const
return the radius squared. Note, for performance reasons, assumes the calling method has ensured that the sphere is valid before calling radius2(), i.e. has _radius>=0.0, as it does not check th validity of sphere and will erroneously return a positive value.

- +

ovoid expandBy(const Vec3& v)
If the vertex is out-with the sphere expand to encompass vertex. Calculates the combination of movement of center and radius which @@ -158,14 +158,14 @@ minimizes the radius increase. If this sphere is empty then move the center to v and set radius to 0.

- +

ovoid expandRadiusBy(const Vec3& v)
If the vertex is outwith the sphere expand radius to ecompass vertex. Unlike update, does not move the center, just increasing the radius. If this sphere is empty then move the centrer to v and set radius to 0

- +

ovoid expandBy(const BoundingSphere& sh)
If incomming sphere is outwith the sphere expand to ecompass incomming sphere. calculates the combination of movement of center and radius which @@ -173,14 +173,14 @@ minimizes the radius increase. If this sphere is empty then move the centrer to v and set radius to 0.

- +

ovoid expandRadiusBy(const BoundingSphere& sh)
If incomming sphere is outwith the sphere expand radius to ecompass incomming sphere. Unlike update, does not move the center, just increasing the radius. If this sphere is empty then move the centrer to v and set radius to 0.

- +

ovoid expandBy(const BoundingBox& bb)
If incomming box is outwith the sphere expand to ecompass incomming box. calculates the combination of movement of center and radius which @@ -188,20 +188,20 @@ minimizes the radius increase. If this boz is empty then move the centrer to v and set radius to 0.

- +

ovoid expandRadiusBy(const BoundingBox& bb)
If incomming box is outwith the sphere expand radius to ecompass incomming box. Unlike update, does not move the center, just increasing the radius. If this sphere is empty then move the centrer to v and set radius to 0.

- -

oinline const bool contains(const Vec3& v) const + +
oinline bool contains(const Vec3& v) const
return true is vertex v is within the sphere

- -

oinline const bool intersects( const BoundingSphere& bs ) const + +
oinline bool intersects( const BoundingSphere& bs ) const
return true if bounding sphere's intersect each other

diff --git a/doc/doc++/osg/Camera.html b/doc/doc++/osg/Camera.html index cf4878947..dfb61068b 100644 --- a/doc/doc++/osg/Camera.html +++ b/doc/doc++/osg/Camera.html @@ -23,200 +23,200 @@

Public Methods

-[more] Camera(DisplaySettings* ds=NULL) +[more] Camera(DisplaySettings* ds=NULL)
-[more] Camera(const Camera&) +[more] Camera(const Camera&)
-[more]Camera& operator=(const Camera&) +[more]Camera& operator=(const Camera&)
-[more]virtual ~Camera() +[more]virtual ~Camera()
-[more]const ProjectionType getProjectionType() const +[more]ProjectionType getProjectionType() const
Get the projection type set by setOtho,setOtho2D,setFrustum, and set perspective methods
-[more]void setOrtho(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) +[more]void setOrtho(double left, double right, double bottom, double top, double zNear, double zFar)
Set a orthographic projection.
-[more]void setOrtho2D(const double left, const double right, const double bottom, const double top) +[more]void setOrtho2D(double left, double right, double bottom, double top)
Set a 2D orthographic projection.
-[more]void setFrustum(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) +[more]void setFrustum(double left, double right, double bottom, double top, double zNear, double zFar)
Set a perspective projection.
-[more]void setPerspective(const double fovy, const double aspectRatio, const double zNear, const double zFar) +[more]void setPerspective(double fovy, double aspectRatio, double zNear, double zFar)
Set a symmetrical perspective projection, See gluPerspective for further details.
-[more]void setFOV(const double fovx, const double fovy, const double zNear, const double zFar) +[more]void setFOV(double fovx, double fovy, double zNear, double zFar)
Set a sysmmetical perspective projection using field of view
-[more]void setNearFar(const double zNear, const double zFar) +[more]void setNearFar(double zNear, double zFar)
Set the near and far clipping planes
-[more]void setAdjustAspectRatioMode(const AdjustAspectRatioMode aam) +[more]void setAdjustAspectRatioMode(AdjustAspectRatioMode aam)
Set the way that the vertical or horizontal dimensions of the window are adjusted on a resize.
-[more]const AdjustAspectRatioMode getAdjustAspectRatioMode() const +[more]AdjustAspectRatioMode getAdjustAspectRatioMode() const
Get the way that the vertical or horizontal dimensions of the window are adjusted on a resize.
-[more]void adjustAspectRatio(const double newAspectRatio) +[more]void adjustAspectRatio(double newAspectRatio)
Adjust the clipping planes to account for a new window aspect ratio.
-[more]void adjustAspectRatio(const double newAspectRatio, const AdjustAspectRatioMode aa) +[more]void adjustAspectRatio(double newAspectRatio, AdjustAspectRatioMode aa)
Adjust the clipping planes to account for a new window aspect ratio.
-[more]const double left() const +[more]double left() const
-[more]const double right() const +[more]double right() const
-[more]const double bottom() const +[more]double bottom() const
-[more]const double top() const +[more]double top() const
-[more]const double zNear() const +[more]double zNear() const
-[more]const double zFar() const +[more]double zFar() const
-[more]const double calc_fovy() const +[more]double calc_fovy() const
Calculate and return the equivalent fovx for the current project setting.
-[more]const double calc_fovx() const +[more]double calc_fovx() const
Calculate and return the equivalent fovy for the current project setting.
-[more]const double calc_aspectRatio() const +[more]double calc_aspectRatio() const
Calculate and return the projection aspect ratio.
-[more]const LookAtType getLookAtType() const +[more]LookAtType getLookAtType() const
-[more]void home() +[more]void home()
hardwired home view for now, looking straight down the Z axis at the origin, with 'up' being the y axis
-[more]void setView(const Vec3& eyePoint, const Vec3& lookPoint, const Vec3& upVector) +[more]void setView(const Vec3& eyePoint, const Vec3& lookPoint, const Vec3& upVector)
Set the View, the up vector should be orthogonal to the look vector.
-[more]void setLookAt(const Vec3& eye, const Vec3& center, const Vec3& up) +[more]void setLookAt(const Vec3& eye, const Vec3& center, const Vec3& up)
set the position and orientation of the camera, using the same convention as gluLookAt
-[more]void setLookAt(const double eyeX, const double eyeY, const double eyeZ, const double centerX, const double centerY, const double centerZ, const double upX, const double upY, const double upZ) +[more]void setLookAt(double eyeX, double eyeY, double eyeZ, double centerX, double centerY, double centerZ, double upX, double upY, double upZ)
set the position and orientation of the camera, using the same convention as gluLookAt
-[more]void transformLookAt(const Matrix& matrix) +[more]void transformLookAt(const Matrix& matrix)
post multiple the existing eye point and orientation by matrix.
-[more]void ensureOrthogonalUpVector() +[more]void ensureOrthogonalUpVector()
-[more]inline const Vec3& getEyePoint() const +[more]inline const Vec3& getEyePoint() const
get the eye point.
-[more]inline const Vec3& getCenterPoint() const +[more]inline const Vec3& getCenterPoint() const
get the center point.
-[more]inline const Vec3& getUpVector() const +[more]inline const Vec3& getUpVector() const
get the up vector
-[more]const Vec3 getLookVector() const +[more]Vec3 getLookVector() const
calculate look vector
-[more]const Vec3 getSideVector() const +[more]Vec3 getSideVector() const
calculate side vector
-[more]inline float getLookDistance() const +[more]inline float getLookDistance() const
calculate the look distance which is the distance between the eye and the center
-[more]void attachTransform(const TransformMode mode, Matrix* modelTransform=0) +[more]void attachTransform(TransformMode mode, Matrix* modelTransform=0)
Attach a transform matrix which is applied after the camera look at.
-[more]Matrix* getTransform(const TransformMode mode) +[more]Matrix* getTransform(TransformMode mode)
-[more]const Matrix* getTransform(const TransformMode mode) const +[more]const Matrix* getTransform(TransformMode mode) const
-[more]void setFusionDistanceMode(FusionDistanceMode mode) +[more]void setFusionDistanceMode(FusionDistanceMode mode)
Set the mode of the fusion distance function which in use to calculate the fusion distance used in stereo rendering.
-[more]FusionDistanceMode getFusionDistanceMode() const +[more]FusionDistanceMode getFusionDistanceMode() const
Get the mode of the fusion distance function
-[more]void setFusionDistanceRatio(float ratio) +[more]void setFusionDistanceRatio(float ratio)
Set the ratio of the fusion distance function which in use to calculate the fusion distance used in stereo rendering.
-[more]float getFusionDistanceRatio() const +[more]float getFusionDistanceRatio() const
Get the ratio of the fusion distance function
-[more]const float getFusionDistance() const +[more]float getFusionDistance() const
Calculate and return the fusion distance, using the FusionDistanceFunction
-[more]void setScreenDistance(float screenDistance) +[more]void setScreenDistance(float screenDistance)
Set the physical distance between the viewers eyes and the display system.
-[more]const float getScreenDistance() const +[more]float getScreenDistance() const
Get the physical distance between the viewers eyes and the display system
-[more]const Matrix getProjectionMatrix() const +[more]Matrix getProjectionMatrix() const
Get the Projection Matrix
-[more]const Matrix getModelViewMatrix() const +[more]Matrix getModelViewMatrix() const
Get the ModelView matrix.
-[more]inline Polytope getViewFrustum() const +[more]inline Polytope getViewFrustum() const
Get the camera view frustum

Public Members

-[more]enum ProjectionType +[more]enum ProjectionType
Range of projection types.
-[more]enum AdjustAspectRatioMode +[more]enum AdjustAspectRatioMode
Use in combination with adjustAspectRatio, to control the change in frustum clipping planes to account for changes in windows aspect ratio,
-[more]enum LookAtType +[more]enum LookAtType
-[more]enum TransformMode +[more]enum TransformMode
-[more]enum FusionDistanceMode +[more]enum FusionDistanceMode

Protected Fields

-[more]ProjectionType _projectionType +[more]ProjectionType _projectionType
-[more]AdjustAspectRatioMode _adjustAspectRatioMode +[more]AdjustAspectRatioMode _adjustAspectRatioMode
-[more]double _left +[more]double _left
-[more]double _right +[more]double _right
-[more]double _bottom +[more]double _bottom
-[more]double _top +[more]double _top
-[more]double _zNear +[more]double _zNear
-[more]double _zFar +[more]double _zFar
-[more]LookAtType _lookAtType +[more]LookAtType _lookAtType
-[more]Vec3 _eye +[more]Vec3 _eye
-[more]Vec3 _center +[more]Vec3 _center
-[more]Vec3 _up +[more]Vec3 _up
-[more]TransformMode _attachedTransformMode +[more]TransformMode _attachedTransformMode
-[more]ref_ptr<Matrix> _eyeToModelTransform +[more]ref_ptr<Matrix> _eyeToModelTransform
-[more]ref_ptr<Matrix> _modelToEyeTransform +[more]ref_ptr<Matrix> _modelToEyeTransform
-[more]float _screenDistance +[more]float _screenDistance
-[more]FusionDistanceMode _fusionDistanceMode +[more]FusionDistanceMode _fusionDistanceMode
-[more]float _fusionDistanceRatio +[more]float _fusionDistanceRatio

Protected Methods

-[more]void copy(const Camera&) +[more]void copy(const Camera&)

@@ -232,12 +232,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -252,23 +260,23 @@ respectively.
- +
o Camera(DisplaySettings* ds=NULL)

- -

o Camera(const Camera&) + +
o Camera(const Camera&)

- +

oCamera& operator=(const Camera&)

- +

ovirtual ~Camera()

- +

oenum ProjectionType
Range of projection types. ORTHO2D is a special case of ORTHO where the near and far planes @@ -278,61 +286,61 @@ and bottom and top and symmetrical.

- +
o ORTHO

- +

o ORTHO2D

- +

o FRUSTUM

- +

o PERSPECTIVE

- -
oconst ProjectionType getProjectionType() const + +
oProjectionType getProjectionType() const
Get the projection type set by setOtho,setOtho2D,setFrustum, and set perspective methods

- -

ovoid setOrtho(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) + +
ovoid setOrtho(double left, double right, double bottom, double top, double zNear, double zFar)
Set a orthographic projection. See glOrtho for further details.

- -

ovoid setOrtho2D(const double left, const double right, const double bottom, const double top) + +
ovoid setOrtho2D(double left, double right, double bottom, double top)
Set a 2D orthographic projection. See gluOrtho2D for further details.

- -

ovoid setFrustum(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) + +
ovoid setFrustum(double left, double right, double bottom, double top, double zNear, double zFar)
Set a perspective projection. See glFrustum for further details.

- -

ovoid setPerspective(const double fovy, const double aspectRatio, const double zNear, const double zFar) + +
ovoid setPerspective(double fovy, double aspectRatio, double zNear, double zFar)
Set a symmetrical perspective projection, See gluPerspective for further details. Aspect ratio is defined as width/height.

- -

ovoid setFOV(const double fovx, const double fovy, const double zNear, const double zFar) + +
ovoid setFOV(double fovx, double fovy, double zNear, double zFar)
Set a sysmmetical perspective projection using field of view

- -

ovoid setNearFar(const double zNear, const double zFar) + +
ovoid setNearFar(double zNear, double zFar)
Set the near and far clipping planes

- +

oenum AdjustAspectRatioMode
Use in combination with adjustAspectRatio, to control the change in frustum clipping planes to account for @@ -340,119 +348,119 @@ changes in windows aspect ratio,

- +
o ADJUST_VERTICAL

- +

o ADJUST_HORIZONTAL

- +

o ADJUST_NONE

- -
ovoid setAdjustAspectRatioMode(const AdjustAspectRatioMode aam) + +
ovoid setAdjustAspectRatioMode(AdjustAspectRatioMode aam)
Set the way that the vertical or horizontal dimensions of the window are adjusted on a resize.

- -

oconst AdjustAspectRatioMode getAdjustAspectRatioMode() const + +
oAdjustAspectRatioMode getAdjustAspectRatioMode() const
Get the way that the vertical or horizontal dimensions of the window are adjusted on a resize.

- -

ovoid adjustAspectRatio(const double newAspectRatio) + +
ovoid adjustAspectRatio(double newAspectRatio)
Adjust the clipping planes to account for a new window aspect ratio. Typically used after resizing a window. Aspect ratio is defined as width/height.

- -

ovoid adjustAspectRatio(const double newAspectRatio, const AdjustAspectRatioMode aa) + +
ovoid adjustAspectRatio(double newAspectRatio, AdjustAspectRatioMode aa)
Adjust the clipping planes to account for a new window aspect ratio. Typicall used after resizeing a window. Aspect ratio is defined as width/height.

- -

oconst double left() const + +
odouble left() const

- -

oconst double right() const + +
odouble right() const

- -

oconst double bottom() const + +
odouble bottom() const

- -

oconst double top() const + +
odouble top() const

- -

oconst double zNear() const + +
odouble zNear() const

- -

oconst double zFar() const + +
odouble zFar() const

- -

oconst double calc_fovy() const + +
odouble calc_fovy() const
Calculate and return the equivalent fovx for the current project setting. This value is only valid for when a symmetric perspective projection exists. i.e. getProjectionType()==PERSPECTIVE.

- -

oconst double calc_fovx() const + +
odouble calc_fovx() const
Calculate and return the equivalent fovy for the current project setting. This value is only valid for when a symmetric perspective projection exists. i.e. getProjectionType()==PERSPECTIVE.

- -

oconst double calc_aspectRatio() const + +
odouble calc_aspectRatio() const
Calculate and return the projection aspect ratio. Aspect ratio is defined as width/height.

- +

oenum LookAtType

- +
o USE_HOME_POSITON

- +

o USE_EYE_AND_QUATERNION

- +

o USE_EYE_CENTER_AND_UP

- -
oconst LookAtType getLookAtType() const + +
oLookAtType getLookAtType() const

- +

ovoid home()
hardwired home view for now, looking straight down the Z axis at the origin, with 'up' being the y axis

- +

ovoid setView(const Vec3& eyePoint, const Vec3& lookPoint, const Vec3& upVector)
Set the View, the up vector should be orthogonal to the look vector. @@ -460,78 +468,78 @@ setView is now mapped to setLookAt(eye,center,up), and is only kept for backwards compatibility.

- -

ovoid setLookAt(const Vec3& eye, const Vec3& center, const Vec3& up) + +
ovoid setLookAt(const Vec3& eye, const Vec3& center, const Vec3& up)
set the position and orientation of the camera, using the same convention as gluLookAt

- -

ovoid setLookAt(const double eyeX, const double eyeY, const double eyeZ, const double centerX, const double centerY, const double centerZ, const double upX, const double upY, const double upZ) + +
ovoid setLookAt(double eyeX, double eyeY, double eyeZ, double centerX, double centerY, double centerZ, double upX, double upY, double upZ)
set the position and orientation of the camera, using the same convention as gluLookAt

- +

ovoid transformLookAt(const Matrix& matrix)
post multiple the existing eye point and orientation by matrix. note, does not affect any ModelTransforms that are applied.

- +

ovoid ensureOrthogonalUpVector()

- +

oinline const Vec3& getEyePoint() const
get the eye point.

- +

oinline const Vec3& getCenterPoint() const
get the center point.

- +

oinline const Vec3& getUpVector() const
get the up vector

- -

oconst Vec3 getLookVector() const + +
oVec3 getLookVector() const
calculate look vector

- -

oconst Vec3 getSideVector() const + +
oVec3 getSideVector() const
calculate side vector

- +

oinline float getLookDistance() const
calculate the look distance which is the distance between the eye and the center

- +

oenum TransformMode

- +
o EYE_TO_MODEL

- +

o MODEL_TO_EYE

- +

o NO_ATTACHED_TRANSFORM

- -
ovoid attachTransform(const TransformMode mode, Matrix* modelTransform=0) + +
ovoid attachTransform(TransformMode mode, Matrix* modelTransform=0)
Attach a transform matrix which is applied after the camera look at. The attached matrix can work in two ways, either as transform of the eye into the model coordinates - EYE_TO_MODEL, or as a transform of the @@ -549,75 +557,75 @@ note: Camera internals maintains the both EYE_TO_MODEL and MODEL_TO_EYE internally and ensures that they are the inverse of one another.

- -

oMatrix* getTransform(const TransformMode mode) + +
oMatrix* getTransform(TransformMode mode)

- -

oconst Matrix* getTransform(const TransformMode mode) const + +
oconst Matrix* getTransform(TransformMode mode) const

- +

oenum FusionDistanceMode

- +
o PROPORTIONAL_TO_LOOK_DISTANCE

- +

o PROPORTIONAL_TO_SCREEN_DISTANCE

- -
ovoid setFusionDistanceMode(FusionDistanceMode mode) + +
ovoid setFusionDistanceMode(FusionDistanceMode mode)
Set the mode of the fusion distance function which in use to calculate the fusion distance used in stereo rendering. Default value is PROPORTIONAL_TO_LOOK_DISTANCE. Use in conjunction with setFusionDistanceRatio(float).

- -

oFusionDistanceMode getFusionDistanceMode() const + +
oFusionDistanceMode getFusionDistanceMode() const
Get the mode of the fusion distance function

- +

ovoid setFusionDistanceRatio(float ratio)
Set the ratio of the fusion distance function which in use to calculate the fusion distance used in stereo rendering. Default value is 1.0f Use in conjunction with setFusionDistanceMode(..).

- +

ofloat getFusionDistanceRatio() const
Get the ratio of the fusion distance function

- -

oconst float getFusionDistance() const + +
ofloat getFusionDistance() const
Calculate and return the fusion distance, using the FusionDistanceFunction

- +

ovoid setScreenDistance(float screenDistance)
Set the physical distance between the viewers eyes and the display system. Note, only used when rendering in stereo.

- -

oconst float getScreenDistance() const + +
ofloat getScreenDistance() const
Get the physical distance between the viewers eyes and the display system

- -

oconst Matrix getProjectionMatrix() const + +
oMatrix getProjectionMatrix() const
Get the Projection Matrix

- -

oconst Matrix getModelViewMatrix() const + +
oMatrix getModelViewMatrix() const
Get the ModelView matrix. If a ModelTransform is supplied then the ModelView matrix is created by multiplying the current LookAt by ModelTransform. @@ -625,84 +633,84 @@ Otherwise it is simply created by using the current LookAt, equivalent to using gluLookAt.

- +

oinline Polytope getViewFrustum() const
Get the camera view frustum

- +

ovoid copy(const Camera&)

- -

oProjectionType _projectionType + +
oProjectionType _projectionType

- -

oAdjustAspectRatioMode _adjustAspectRatioMode + +
oAdjustAspectRatioMode _adjustAspectRatioMode

- +

odouble _left

- +

odouble _right

- +

odouble _bottom

- +

odouble _top

- +

odouble _zNear

- +

odouble _zFar

- -

oLookAtType _lookAtType + +
oLookAtType _lookAtType

- +

oVec3 _eye

- +

oVec3 _center

- +

oVec3 _up

- -

oTransformMode _attachedTransformMode + +
oTransformMode _attachedTransformMode

- +

oref_ptr<Matrix> _eyeToModelTransform

- +

oref_ptr<Matrix> _modelToEyeTransform

- +

ofloat _screenDistance

- -

oFusionDistanceMode _fusionDistanceMode + +
oFusionDistanceMode _fusionDistanceMode

- +

ofloat _fusionDistanceRatio

diff --git a/doc/doc++/osg/ClearNode.html b/doc/doc++/osg/ClearNode.html index 5a4c0d34d..8e015b591 100644 --- a/doc/doc++/osg/ClearNode.html +++ b/doc/doc++/osg/ClearNode.html @@ -23,35 +23,35 @@

Public Methods

-[more] ClearNode() +[more] ClearNode()
-[more] ClearNode(const ClearNode& es, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] ClearNode(const ClearNode& es, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
-[more] META_Node(osg, ClearNode) +[more] META_Node(osg, ClearNode)
-[more]inline void setRequiresClear(const bool requiresClear) +[more]inline void setRequiresClear(bool requiresClear)
Sets the flag which control whether a glClear is required at the beginning of each frame.
-[more]inline const bool getRequiresClear() const +[more]inline bool getRequiresClear() const
Gets the flag which control whether a glClear is required at the beginning of each frame.
-[more]inline void setClearColor(const Vec4& color) +[more]inline void setClearColor(const Vec4& color)
Sets the clear color.
-[more]inline const Vec4& getClearColor() const +[more]inline const Vec4& getClearColor() const
Returns the clear color.

Protected Fields

-[more]bool _requiresClear +[more]bool _requiresClear
-[more]Vec4 _clearColor +[more]Vec4 _clearColor

Protected Methods

-[more]virtual ~ClearNode() +[more]virtual ~ClearNode()

@@ -59,6 +59,10 @@

Public Methods

+ovirtual Group* asGroup() +
+ovirtual const Group* asGroup() const +
ovirtual void traverse(NodeVisitor& nv)
ovirtual bool addChild( Node* child ) @@ -67,27 +71,34 @@
ovirtual bool replaceChild( Node* origChild, Node* newChild )
-oinline const unsigned int getNumChildren() const +oinline unsigned int getNumChildren() const
-oinline Node* getChild( const unsigned int i ) +oinline Node* getChild( unsigned int i )
-oinline const Node* getChild( const unsigned int i ) const +oinline const Node* getChild( unsigned int i ) const
oinline bool containsNode( const Node* node ) const
oinline ChildList::iterator findNode( const Node* node )
oinline ChildList::const_iterator findNode( const Node* node ) const +
+oinline unsigned int findChildNo( const Node* node ) const +

+ +

+

Public Members

+otypedef std::vector<ref_ptr<Node> > ChildList

Protected Fields

-oChildList _children +oChildList _children

Protected Methods

-ovirtual const bool computeBound() const +ovirtual bool computeBound() const

@@ -107,47 +118,47 @@ are rendered prior to standard opaque and transparent drawables.
- +
o ClearNode()

- -

o ClearNode(const ClearNode& es, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o ClearNode(const ClearNode& es, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

- +

o META_Node(osg, ClearNode)

- -

oinline void setRequiresClear(const bool requiresClear) + +
oinline void setRequiresClear(bool requiresClear)
Sets the flag which control whether a glClear is required at the beginning of each frame.

- -

oinline const bool getRequiresClear() const + +
oinline bool getRequiresClear() const
Gets the flag which control whether a glClear is required at the beginning of each frame.

- +

oinline void setClearColor(const Vec4& color)
Sets the clear color.

- +

oinline const Vec4& getClearColor() const
Returns the clear color.

- +

ovirtual ~ClearNode()

- +

obool _requiresClear

- +

oVec4 _clearColor

diff --git a/doc/doc++/osg/ClipNode.html b/doc/doc++/osg/ClipNode.html index 3dc0974d7..9b5dba4c2 100644 --- a/doc/doc++/osg/ClipNode.html +++ b/doc/doc++/osg/ClipNode.html @@ -23,58 +23,63 @@

Public Methods

-[more]typedef std::vector<ref_ptr<ClipPlane> > ClipPlaneList ClipNode() +[more] ClipNode()
-[more] ClipNode(const ClipNode& es, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] ClipNode(const ClipNode& es, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
-[more] META_Node(osg, ClipNode) +[more] META_Node(osg, ClipNode)
-[more]void createClipBox(const BoundingBox& bb, unsigned int clipPlaneNumberBase=0) +[more]void createClipBox(const BoundingBox& bb, unsigned int clipPlaneNumberBase=0)
Create a 6 clip planes to create a clip box
-[more]const bool addClipPlane(ClipPlane* clipplane) +[more]bool addClipPlane(ClipPlane* clipplane)
Add a ClipPlane to a ClipNode.
-[more]const bool removeClipPlane(ClipPlane* clipplane) +[more]bool removeClipPlane(ClipPlane* clipplane)
Remove ClipPlane from a ClipNode.
-[more]const bool removeClipPlane(unsigned int pos) +[more]bool removeClipPlane(unsigned int pos)
Remove ClipPlane, at specified index, from a ClipNode.
-[more]inline const unsigned int getNumClipPlanes() const +[more]inline unsigned int getNumClipPlanes() const
return the number of ClipPlanes
-[more]inline ClipPlane* getClipPlane(unsigned int pos) +[more]inline ClipPlane* getClipPlane(unsigned int pos)
Get ClipPlane at specificed index position
-[more]inline const ClipPlane* getClipPlane(unsigned int pos) const +[more]inline const ClipPlane* getClipPlane(unsigned int pos) const
Get const ClipPlane at specificed index position
-[more]inline ClipPlaneList& getClipPlaneList() +[more]inline ClipPlaneList& getClipPlaneList()
Get the ClipPlaneList
-[more]inline const ClipPlaneList& getClipPlaneList() const +[more]inline const ClipPlaneList& getClipPlaneList() const
Get the const ClipPlaneList
-[more]void setStateSetModes(StateSet&, const StateAttribute::GLModeValue) const +[more]void setStateSetModes(StateSet&, StateAttribute::GLModeValue) const
Set the GLModes on StateSet associated with the ClipPlanes
-[more]void setLocalStateSetModes(const StateAttribute::GLModeValue=StateAttribute::ON) +[more]void setLocalStateSetModes(StateAttribute::GLModeValue=StateAttribute::ON)
Set up the local StateSet

+

+

Public Members

+[more]typedef std::vector<ref_ptr<ClipPlane> > ClipPlaneList +

+

Protected Fields

-[more]StateAttribute::GLModeValue _value +[more]StateAttribute::GLModeValue _value
-[more]ClipPlaneList _planes +[more]ClipPlaneList _planes

Protected Methods

-[more]virtual ~ClipNode() +[more]virtual ~ClipNode()
-[more]virtual const bool computeBound() const +[more]virtual bool computeBound() const

@@ -82,6 +87,10 @@

Public Methods

+ovirtual Group* asGroup() +
+ovirtual const Group* asGroup() const +
ovirtual void traverse(NodeVisitor& nv)
ovirtual bool addChild( Node* child ) @@ -90,22 +99,29 @@
ovirtual bool replaceChild( Node* origChild, Node* newChild )
-oinline const unsigned int getNumChildren() const +oinline unsigned int getNumChildren() const
-oinline Node* getChild( const unsigned int i ) +oinline Node* getChild( unsigned int i )
-oinline const Node* getChild( const unsigned int i ) const +oinline const Node* getChild( unsigned int i ) const
oinline bool containsNode( const Node* node ) const
oinline ChildList::iterator findNode( const Node* node )
oinline ChildList::const_iterator findNode( const Node* node ) const +
+oinline unsigned int findChildNo( const Node* node ) const +

+ +

+

Public Members

+otypedef std::vector<ref_ptr<Node> > ChildList

Protected Fields

-oChildList _children +oChildList _children

@@ -116,91 +132,95 @@
Leaf Node for defining the position of ClipPlanes in the scene
- - -
otypedef std::vector<ref_ptr<ClipPlane> > ClipPlaneList ClipNode() + + +
otypedef std::vector<ref_ptr<ClipPlane> > ClipPlaneList

- -

o ClipNode(const ClipNode& es, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o ClipNode() +

+ + +

o ClipNode(const ClipNode& es, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

- +

o META_Node(osg, ClipNode)

- +

ovoid createClipBox(const BoundingBox& bb, unsigned int clipPlaneNumberBase=0)
Create a 6 clip planes to create a clip box

- -

oconst bool addClipPlane(ClipPlane* clipplane) + +
obool addClipPlane(ClipPlane* clipplane)
Add a ClipPlane to a ClipNode. Return true if plane is added, return false if plane already exists in ClipNode, or clipplane is false.

- -

oconst bool removeClipPlane(ClipPlane* clipplane) + +
obool removeClipPlane(ClipPlane* clipplane)
Remove ClipPlane from a ClipNode. Return true if plane is removed, return false if plane does not exists in ClipNode.

- -

oconst bool removeClipPlane(unsigned int pos) + +
obool removeClipPlane(unsigned int pos)
Remove ClipPlane, at specified index, from a ClipNode. Return true if plane is removed, return false if plane does not exists in ClipNode.

- -

oinline const unsigned int getNumClipPlanes() const + +
oinline unsigned int getNumClipPlanes() const
return the number of ClipPlanes

- +

oinline ClipPlane* getClipPlane(unsigned int pos)
Get ClipPlane at specificed index position

- +

oinline const ClipPlane* getClipPlane(unsigned int pos) const
Get const ClipPlane at specificed index position

- -

oinline ClipPlaneList& getClipPlaneList() + +
oinline ClipPlaneList& getClipPlaneList()
Get the ClipPlaneList

- -

oinline const ClipPlaneList& getClipPlaneList() const + +
oinline const ClipPlaneList& getClipPlaneList() const
Get the const ClipPlaneList

- -

ovoid setStateSetModes(StateSet&, const StateAttribute::GLModeValue) const + +
ovoid setStateSetModes(StateSet&, StateAttribute::GLModeValue) const
Set the GLModes on StateSet associated with the ClipPlanes

- -

ovoid setLocalStateSetModes(const StateAttribute::GLModeValue=StateAttribute::ON) + +
ovoid setLocalStateSetModes(StateAttribute::GLModeValue=StateAttribute::ON)
Set up the local StateSet

- +

ovirtual ~ClipNode()

- -

ovirtual const bool computeBound() const + +
ovirtual bool computeBound() const

- +

oStateAttribute::GLModeValue _value

- -

oClipPlaneList _planes + +
oClipPlaneList _planes

This class has no child classes.
diff --git a/doc/doc++/osg/ClipPlane.html b/doc/doc++/osg/ClipPlane.html index 58e2e45e6..19a145091 100644 --- a/doc/doc++/osg/ClipPlane.html +++ b/doc/doc++/osg/ClipPlane.html @@ -23,65 +23,65 @@

Public Methods

-[more] ClipPlane() +[more] ClipPlane()
-[more]inline ClipPlane(unsigned int no, const Vec4& plane) +[more]inline ClipPlane(unsigned int no, const Vec4& plane)
-[more]inline ClipPlane(unsigned int no, const Plane& plane) +[more]inline ClipPlane(unsigned int no, const Plane& plane)
-[more]inline ClipPlane(unsigned int no, const double a, const double b, const double c, const double d) +[more]inline ClipPlane(unsigned int no, double a, double b, double c, double d)
-[more] ClipPlane(const ClipPlane& cp, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] ClipPlane(const ClipPlane& cp, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy
-[more] META_StateAttribute(osg, ClipPlane, (Type)(CLIPPLANE+_clipPlaneNum)) +[more] META_StateAttribute(osg, ClipPlane, (Type)(CLIPPLANE+_clipPlaneNum))
-[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
-[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const
-[more]void setClipPlane(const Vec4& plane) +[more]void setClipPlane(const Vec4& plane)
Set the clip plane, using a Vec4 to define plane.
-[more]void setClipPlane(const Plane& plane) +[more]void setClipPlane(const Plane& plane)
Set the clip plane, using a Plane to define plane.
-[more]void setClipPlane(const double* plane) +[more]void setClipPlane(const double* plane)
Set the clip plane, using a double[4] to define plane.
-[more]void setClipPlane(const double a, const double b, const double c, const double d) +[more]void setClipPlane(double a, double b, double c, double d)
Set the clip plane, using a a to define plane.
-[more]void getClipPlane(Vec4& plane) const +[more]void getClipPlane(Vec4& plane) const
Get the clip plane, values entered into a Vec4 passed to the getClipPlane.
-[more]void getClipPlane(Plane& plane) const +[more]void getClipPlane(Plane& plane) const
Get the clip plane, values entered into a Plane passed to the getClipPlane.
-[more]void getClipPlane(double* plane) const +[more]void getClipPlane(double* plane) const
Get the clip plane, values entered into a double[4] passed to the getClipPlane.
-[more]void setClipPlaneNum(const unsigned int num) +[more]void setClipPlaneNum(unsigned int num)
Set the clip plane number.
-[more]const unsigned int getClipPlaneNum() const +[more]unsigned int getClipPlaneNum() const
Get the clip plane number.
-[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const
Apply the clip plane's state to the OpenGL state machine.

Protected Fields

-[more]double _clipPlane[4] +[more]double _clipPlane[4]
-[more]unsigned int _clipPlaneNum +[more]unsigned int _clipPlaneNum

Protected Methods

-[more]virtual ~ClipPlane() +[more]virtual ~ClipPlane()

@@ -99,7 +99,7 @@
ovirtual const char* className() const
-ovirtual const Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -132,9 +132,9 @@

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -150,7 +150,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -168,12 +168,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -185,99 +193,99 @@
- +
o ClipPlane()

- +

oinline ClipPlane(unsigned int no, const Vec4& plane)

- +

oinline ClipPlane(unsigned int no, const Plane& plane)

- -

oinline ClipPlane(unsigned int no, const double a, const double b, const double c, const double d) + +
oinline ClipPlane(unsigned int no, double a, double b, double c, double d)

- -

o ClipPlane(const ClipPlane& cp, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o ClipPlane(const ClipPlane& cp, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy

- -

o META_StateAttribute(osg, ClipPlane, (Type)(CLIPPLANE+_clipPlaneNum)) + +
o META_StateAttribute(osg, ClipPlane, (Type)(CLIPPLANE+_clipPlaneNum))

- +

ovirtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

- -

ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const + +
ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const

- +

ovoid setClipPlane(const Vec4& plane)
Set the clip plane, using a Vec4 to define plane.

- +

ovoid setClipPlane(const Plane& plane)
Set the clip plane, using a Plane to define plane.

- +

ovoid setClipPlane(const double* plane)
Set the clip plane, using a double[4] to define plane.

- -

ovoid setClipPlane(const double a, const double b, const double c, const double d) + +
ovoid setClipPlane(double a, double b, double c, double d)
Set the clip plane, using a a to define plane.

- +

ovoid getClipPlane(Vec4& plane) const
Get the clip plane, values entered into a Vec4 passed to the getClipPlane.

- +

ovoid getClipPlane(Plane& plane) const
Get the clip plane, values entered into a Plane passed to the getClipPlane.

- +

ovoid getClipPlane(double* plane) const
Get the clip plane, values entered into a double[4] passed to the getClipPlane.

- -

ovoid setClipPlaneNum(const unsigned int num) + +
ovoid setClipPlaneNum(unsigned int num)
Set the clip plane number.

- -

oconst unsigned int getClipPlaneNum() const + +
ounsigned int getClipPlaneNum() const
Get the clip plane number.

- +

ovirtual void apply(State& state) const
Apply the clip plane's state to the OpenGL state machine.

- +

ovirtual ~ClipPlane()

- +

odouble _clipPlane[4]

- +

ounsigned int _clipPlaneNum

diff --git a/doc/doc++/osg/CollectOccludersVisitor.html b/doc/doc++/osg/CollectOccludersVisitor.html index 58e699c88..5b982e175 100644 --- a/doc/doc++/osg/CollectOccludersVisitor.html +++ b/doc/doc++/osg/CollectOccludersVisitor.html @@ -22,64 +22,73 @@

Public Methods

-[more]typedef std::set<ShadowVolumeOccluder> ShadowVolumeOccluderSet CollectOccludersVisitor() +[more] CollectOccludersVisitor()
-[more]virtual ~CollectOccludersVisitor() +[more]virtual ~CollectOccludersVisitor()
-[more]virtual CollectOccludersVisitor* cloneType() const +[more]virtual CollectOccludersVisitor* cloneType() const
-[more]virtual void reset() +[more]virtual void reset()
-[more]virtual void apply(osg::Node&) +[more]virtual float getDistanceToEyePoint(const Vec3& pos, bool withLODBias) const
-[more]virtual void apply(osg::Transform& node) +[more]virtual float getDistanceFromEyePoint(const Vec3& pos, bool withLODBias) const
-[more]virtual void apply(osg::Projection& node) +[more]virtual void apply(osg::Node&)
-[more]virtual void apply(osg::Switch& node) +[more]virtual void apply(osg::Transform& node)
-[more]virtual void apply(osg::LOD& node) +[more]virtual void apply(osg::Projection& node)
-[more]virtual void apply(osg::OccluderNode& node) +[more]virtual void apply(osg::Switch& node)
-[more]void setMinimumShadowOccluderVolume(float vol) +[more]virtual void apply(osg::LOD& node)
-[more]float getMinimumShadowOccluderVolume() const +[more]virtual void apply(osg::OccluderNode& node)
-[more]void setCreateDrawablesOnOccludeNodes(bool flag) +[more]void setMinimumShadowOccluderVolume(float vol)
-[more]bool getCreateDrawablesOnOccludeNodes() const +[more]float getMinimumShadowOccluderVolume() const
-[more]void setCollectedOcculderList(const ShadowVolumeOccluderSet& svol) +[more]void setCreateDrawablesOnOccludeNodes(bool flag)
-[more]ShadowVolumeOccluderSet& getCollectedOccluderSet() +[more]bool getCreateDrawablesOnOccludeNodes() const
-[more]const ShadowVolumeOccluderSet& getCollectedOccluderSet() const +[more]void setCollectedOcculderList(const ShadowVolumeOccluderSet& svol)
-[more]void removeOccludedOccluders() +[more]ShadowVolumeOccluderSet& getCollectedOccluderSet() +
+[more]const ShadowVolumeOccluderSet& getCollectedOccluderSet() const +
+[more]void removeOccludedOccluders()
remove occluded occluders for the collected occluders list

+

+

Public Members

+[more]typedef std::set<ShadowVolumeOccluder> ShadowVolumeOccluderSet +

+

Protected Fields

-[more]float _minimumShadowOccluderVolume +[more]float _minimumShadowOccluderVolume
-[more]bool _createDrawables +[more]bool _createDrawables
-[more]ShadowVolumeOccluderSet _occluderSet +[more]ShadowVolumeOccluderSet _occluderSet

Protected Methods

-[more] CollectOccludersVisitor(const CollectOccludersVisitor&) +[more] CollectOccludersVisitor(const CollectOccludersVisitor&)
prevent unwanted copy construction
-[more]CollectOccludersVisitor& operator = (const CollectOccludersVisitor&) +[more]CollectOccludersVisitor& operator = (const CollectOccludersVisitor&)
prevent unwanted copy operator
-[more]inline void handle_cull_callbacks_and_traverse(osg::Node& node) +[more]inline void handle_cull_callbacks_and_traverse(osg::Node& node)
-[more]inline void handle_cull_callbacks_and_accept(osg::Node& node, osg::Node* acceptNode) +[more]inline void handle_cull_callbacks_and_accept(osg::Node& node, osg::Node* acceptNode)

@@ -87,31 +96,31 @@

Public Methods

-oinline void setVisitorType(VisitorType type) +oinline void setVisitorType(VisitorType type)
-oinline VisitorType getVisitorType() const +oinline VisitorType getVisitorType() const
-oinline void setTraversalNumber(const int fn) +oinline void setTraversalNumber(int fn)
-oinline const int getTraversalNumber() const +oinline int getTraversalNumber() const
oinline void setFrameStamp(FrameStamp* fs)
oinline const FrameStamp* getFrameStamp() const
-oinline void setTraversalMask(const Node::NodeMask mask) +oinline void setTraversalMask(Node::NodeMask mask)
-oinline const Node::NodeMask getTraversalMask() const +oinline Node::NodeMask getTraversalMask() const
-oinline void setNodeMaskOverride(const Node::NodeMask mask) +oinline void setNodeMaskOverride(Node::NodeMask mask)
-oinline const Node::NodeMask getNodeMaskOverride() const +oinline Node::NodeMask getNodeMaskOverride() const
-oinline const bool validNodeMask(const osg::Node& node) const +oinline bool validNodeMask(const osg::Node& node) const
-ovoid setTraversalMode(const TraversalMode mode) +ovoid setTraversalMode(const TraversalMode mode)
-oinline const TraversalMode getTraversalMode() const +oinline TraversalMode getTraversalMode() const
ovoid setTraversalVisitor(NodeVisitor* nv)
@@ -127,9 +136,9 @@
oconst NodePath& getNodePath() const
-oconst bool getLocalToWorldMatrix(Matrix& matrix, Node* node) +ovirtual bool getLocalToWorldMatrix(Matrix& matrix, Node* node)
-oconst bool getWorldToLocalMatrix(Matrix& matrix, Node* node) +ovirtual bool getWorldToLocalMatrix(Matrix& matrix, Node* node)

@@ -141,7 +150,7 @@

Protected Fields

-oVisitorType _visitorType +oVisitorType _visitorType
oint _traversalNumber
@@ -149,7 +158,7 @@
oref_ptr<NodeVisitor> _traversalVisitor
-oTraversalMode _traversalMode +oTraversalMode _traversalMode
oNode::NodeMask _traversalMask
@@ -169,12 +178,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -182,11 +199,11 @@

Public Methods

-ovoid setOccluderList(const ShadowVolumeOccluderList& svol) +ovoid setOccluderList(const ShadowVolumeOccluderList& svol)
-oShadowVolumeOccluderList& getOccluderList() +oShadowVolumeOccluderList& getOccluderList()
-oconst ShadowVolumeOccluderList& getOccluderList() const +oconst ShadowVolumeOccluderList& getOccluderList() const
ovoid pushViewport(osg::Viewport* viewport)
@@ -202,19 +219,19 @@
oinline float getFrustumVolume()
-ovoid setCullingMode(CullingMode mode) +ovoid setCullingMode(CullingMode mode)
-oCullingMode getCullingMode() const +oCullingMode getCullingMode() const
-ovoid setLODBias(const float bias) +ovoid setLODBias(float bias)
-oconst float getLODBias() const +ofloat getLODBias() const
ovoid setSmallFeatureCullingPixelSize(float value)
ofloat getSmallFeatureCullingPixelSize() const
-ofloat pixelSize(const Vec3& v, float radius) const +ofloat pixelSize(const Vec3& v, float radius) const
ofloat pixelSize(const BoundingSphere& bs) const
@@ -234,11 +251,11 @@
oinline void popCurrentMask()
-otypedef fast_back_stack<ref_ptr<CullingSet> > CullingStack CullingStack& getClipSpaceCullingStack() +oCullingStack& getClipSpaceCullingStack()
-oCullingStack& getProjectionCullingStack() +oCullingStack& getProjectionCullingStack()
-oCullingStack& getModelViewCullingStack() +oCullingStack& getModelViewCullingStack()
oCullingSet& getCurrentCullingSet()
@@ -248,7 +265,7 @@
oinline osg::Matrix& getProjectionMatrix()
-oinline const osg::Matrix getWindowMatrix() +oinline osg::Matrix getWindowMatrix()
oinline const osg::Matrix& getMVPW()
@@ -264,7 +281,7 @@
oinline Matrix& getProjectionMatrix()
-oinline const Matrix getWindowMatrix() +oinline Matrix getWindowMatrix()
oinline const Matrix& getMVPW()
@@ -273,28 +290,40 @@

Public Members

-otypedef std::vector<ShadowVolumeOccluder> OccluderListenum CullingModeValues +otypedef std::vector<ShadowVolumeOccluder> OccluderList +
+oenum CullingModeValues +
+otypedef unsigned int CullingMode +
+otypedef fast_back_stack<ref_ptr<CullingSet> > CullingStack

Protected Fields

-oCullingMode _cullingMode +oCullingMode _cullingMode
ofloat _LODBias
ofloat _smallFeatureCullingPixelSize
-oShadowVolumeOccluderList _occluderList +oShadowVolumeOccluderList _occluderList
-oMatrixStack _modelviewStack +oMatrixStack _projectionStack
-oMatrixStack _MVPW_Stack +oMatrixStack _modelviewStack
-oCullingStack _clipspaceCullingStack +oMatrixStack _MVPW_Stack
-oCullingStack _projectionCullingStack +oViewportStack _viewportStack
-oCullingStack _modelviewCullingStack +oEyePointStack _eyePointStack +
+oCullingStack _clipspaceCullingStack +
+oCullingStack _projectionCullingStack +
+oCullingStack _modelviewCullingStack
ofloat _frustumVolume
@@ -304,6 +333,8 @@
oosg::Matrix _identity
+oMatrixList _reuseMatrixList +
ounsigned int _currentReuseMatrixIndex

@@ -320,13 +351,13 @@

Protected Members

-otypedef fast_back_stack< ref_ptr<Matrix> > MatrixStack MatrixStack _projectionStack +otypedef fast_back_stack< ref_ptr<Matrix> > MatrixStack
-otypedef fast_back_stack<ref_ptr<Viewport> > ViewportStack ViewportStack _viewportStack +otypedef fast_back_stack<ref_ptr<Viewport> > ViewportStack
-otypedef fast_back_stack<Vec3> EyePointStack EyePointStack _eyePointStack +otypedef fast_back_stack<Vec3> EyePointStack
-otypedef std::vector< osg::ref_ptr<osg::Matrix> > MatrixList MatrixList _reuseMatrixList +otypedef std::vector< osg::ref_ptr<osg::Matrix> > MatrixList

@@ -336,108 +367,120 @@

Documentation

+ + +
otypedef std::set<ShadowVolumeOccluder> ShadowVolumeOccluderSet +

- -

otypedef std::set<ShadowVolumeOccluder> ShadowVolumeOccluderSet CollectOccludersVisitor() + +
o CollectOccludersVisitor()

- +

ovirtual ~CollectOccludersVisitor()

- +

ovirtual CollectOccludersVisitor* cloneType() const

- +

ovirtual void reset()

+ + +

ovirtual float getDistanceToEyePoint(const Vec3& pos, bool withLODBias) const +

+ + +

ovirtual float getDistanceFromEyePoint(const Vec3& pos, bool withLODBias) const +

- +

ovirtual void apply(osg::Node&)

- +

ovirtual void apply(osg::Transform& node)

- +

ovirtual void apply(osg::Projection& node)

- +

ovirtual void apply(osg::Switch& node)

- +

ovirtual void apply(osg::LOD& node)

- +

ovirtual void apply(osg::OccluderNode& node)

- +

ovoid setMinimumShadowOccluderVolume(float vol)

- +

ofloat getMinimumShadowOccluderVolume() const

- +

ovoid setCreateDrawablesOnOccludeNodes(bool flag)

- +

obool getCreateDrawablesOnOccludeNodes() const

- -

ovoid setCollectedOcculderList(const ShadowVolumeOccluderSet& svol) + +
ovoid setCollectedOcculderList(const ShadowVolumeOccluderSet& svol)

- -

oShadowVolumeOccluderSet& getCollectedOccluderSet() + +
oShadowVolumeOccluderSet& getCollectedOccluderSet()

- -

oconst ShadowVolumeOccluderSet& getCollectedOccluderSet() const + +
oconst ShadowVolumeOccluderSet& getCollectedOccluderSet() const

- +

ovoid removeOccludedOccluders()
remove occluded occluders for the collected occluders list

- -

o CollectOccludersVisitor(const CollectOccludersVisitor&) + +
o CollectOccludersVisitor(const CollectOccludersVisitor&)
prevent unwanted copy construction

- +

oCollectOccludersVisitor& operator = (const CollectOccludersVisitor&)
prevent unwanted copy operator

- +

oinline void handle_cull_callbacks_and_traverse(osg::Node& node)

- +

oinline void handle_cull_callbacks_and_accept(osg::Node& node, osg::Node* acceptNode)

- +

ofloat _minimumShadowOccluderVolume

- +

obool _createDrawables

- -

oShadowVolumeOccluderSet _occluderSet + +
oShadowVolumeOccluderSet _occluderSet

This class has no child classes.
diff --git a/doc/doc++/osg/ColorMask.html b/doc/doc++/osg/ColorMask.html index 184106fce..0c39f0ef8 100644 --- a/doc/doc++/osg/ColorMask.html +++ b/doc/doc++/osg/ColorMask.html @@ -23,43 +23,43 @@

Public Methods

-[more] ColorMask() +[more] ColorMask()
-[more] ColorMask(const ColorMask& cm, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] ColorMask(const ColorMask& cm, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy
-[more] META_StateAttribute(osg, ColorMask, COLORMASK) +[more] META_StateAttribute(osg, ColorMask, COLORMASK)
-[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
-[more]inline void setMask(bool red, bool green, bool blue, bool alpha) +[more]inline void setMask(bool red, bool green, bool blue, bool alpha)
-[more]inline const bool getRedMask() const +[more]inline bool getRedMask() const
-[more]inline const bool getGreenMask() const +[more]inline bool getGreenMask() const
-[more]inline const bool getBlueMask() const +[more]inline bool getBlueMask() const
-[more]inline const bool getAlphaMask() const +[more]inline bool getAlphaMask() const
-[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

Protected Fields

-[more]bool _red +[more]bool _red
-[more]bool _green +[more]bool _green
-[more]bool _blue +[more]bool _blue
-[more]bool _alpha +[more]bool _alpha

Protected Methods

-[more]virtual ~ColorMask() +[more]virtual ~ColorMask()

@@ -77,7 +77,7 @@
ovirtual const char* className() const
-ovirtual const Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -87,7 +87,7 @@
obool operator != (const StateAttribute& rhs) const
-ovirtual void getAssociatedModes(std::vector<GLMode>& ) const +ovirtual void getAssociatedModes(std::vector<GLMode>& ) const
ovirtual void compile(State&) const

@@ -112,9 +112,9 @@

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -130,7 +130,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -148,12 +148,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -165,65 +173,65 @@
- +
o ColorMask()

- -

o ColorMask(const ColorMask& cm, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o ColorMask(const ColorMask& cm, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy

- -

o META_StateAttribute(osg, ColorMask, COLORMASK) + +
o META_StateAttribute(osg, ColorMask, COLORMASK)

- +

ovirtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

- +

oinline void setMask(bool red, bool green, bool blue, bool alpha)

- -

oinline const bool getRedMask() const + +
oinline bool getRedMask() const

- -

oinline const bool getGreenMask() const + +
oinline bool getGreenMask() const

- -

oinline const bool getBlueMask() const + +
oinline bool getBlueMask() const

- -

oinline const bool getAlphaMask() const + +
oinline bool getAlphaMask() const

- +

ovirtual void apply(State& state) const

- +

ovirtual ~ColorMask()

- +

obool _red

- +

obool _green

- +

obool _blue

- +

obool _alpha

diff --git a/doc/doc++/osg/ColorMatrix.html b/doc/doc++/osg/ColorMatrix.html index 620d1a34f..4c46ad4d3 100644 --- a/doc/doc++/osg/ColorMatrix.html +++ b/doc/doc++/osg/ColorMatrix.html @@ -23,37 +23,37 @@

Public Methods

-[more] ColorMatrix() +[more] ColorMatrix()
-[more] ColorMatrix(const ColorMatrix& cm, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] ColorMatrix(const ColorMatrix& cm, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy
-[more] META_StateAttribute(osg, ColorMatrix, COLORMATRIX) +[more] META_StateAttribute(osg, ColorMatrix, COLORMATRIX)
-[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
-[more]inline void setMatrix(const Matrix& matrix) +[more]inline void setMatrix(const Matrix& matrix)
Set the color matrix
-[more]inline Matrix& getMatrix() +[more]inline Matrix& getMatrix()
Get the color matrix
-[more]inline const Matrix& getMatrix() const +[more]inline const Matrix& getMatrix() const
Get the const color matrix
-[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const
apply as OpenGL texture matrix

Protected Fields

-[more]Matrix _matrix +[more]Matrix _matrix

Protected Methods

-[more]virtual ~ColorMatrix( void ) +[more]virtual ~ColorMatrix( void )

@@ -71,7 +71,7 @@
ovirtual const char* className() const
-ovirtual const Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -81,7 +81,7 @@
obool operator != (const StateAttribute& rhs) const
-ovirtual void getAssociatedModes(std::vector<GLMode>& ) const +ovirtual void getAssociatedModes(std::vector<GLMode>& ) const
ovirtual void compile(State&) const

@@ -106,9 +106,9 @@

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -124,7 +124,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -142,12 +142,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -159,49 +167,49 @@
- +
o ColorMatrix()

- -

o ColorMatrix(const ColorMatrix& cm, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o ColorMatrix(const ColorMatrix& cm, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy

- -

o META_StateAttribute(osg, ColorMatrix, COLORMATRIX) + +
o META_StateAttribute(osg, ColorMatrix, COLORMATRIX)

- +

ovirtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

- +

oinline void setMatrix(const Matrix& matrix)
Set the color matrix

- +

oinline Matrix& getMatrix()
Get the color matrix

- +

oinline const Matrix& getMatrix() const
Get the const color matrix

- +

ovirtual void apply(State& state) const
apply as OpenGL texture matrix

- +

ovirtual ~ColorMatrix( void )

- +

oMatrix _matrix

diff --git a/doc/doc++/osg/ConvexPlanarOccluder.html b/doc/doc++/osg/ConvexPlanarOccluder.html index 99d85f03b..2a8c9386c 100644 --- a/doc/doc++/osg/ConvexPlanarOccluder.html +++ b/doc/doc++/osg/ConvexPlanarOccluder.html @@ -23,39 +23,44 @@

Public Methods

-[more] ConvexPlanarOccluder() +[more] ConvexPlanarOccluder()
-[more] ConvexPlanarOccluder(const ConvexPlanarOccluder& cpo, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] ConvexPlanarOccluder(const ConvexPlanarOccluder& cpo, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
-[more]META_Object (osg, ConvexPlanarOccluder)(const ConvexPlanarPolygon& cpp) +[more]META_Object (osg, ConvexPlanarOccluder)(const ConvexPlanarPolygon& cpp)
-[more]ConvexPlanarPolygon& getOccluder() +[more]ConvexPlanarPolygon& getOccluder()
-[more]const ConvexPlanarPolygon& getOccluder() const +[more]const ConvexPlanarPolygon& getOccluder() const
-[more]typedef std::vector<ConvexPlanarPolygon> HoleList void addHole(const ConvexPlanarPolygon& cpp) +[more]void addHole(const ConvexPlanarPolygon& cpp)
-[more]HoleList& getHoleList() +[more]HoleList& getHoleList()
-[more]const HoleList& getHoleList() const +[more]const HoleList& getHoleList() const
-[more]void computeAttributes() +[more]void computeAttributes()
-[more]void computeBound(BoundingBox& bb) const +[more]void computeBound(BoundingBox& bb) const
-[more]void computeBound(BoundingSphere& bs) const +[more]void computeBound(BoundingSphere& bs) const +

+ +

+

Public Members

+[more]typedef std::vector<ConvexPlanarPolygon> HoleList

Protected Fields

-[more]ConvexPlanarPolygon _occluder +[more]ConvexPlanarPolygon _occluder
-[more]HoleList _holeList +[more]HoleList _holeList

Protected Methods

-[more] ~ConvexPlanarOccluder() +[more] ~ConvexPlanarOccluder()

@@ -73,9 +78,9 @@
ovirtual const char* className() const
-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -91,7 +96,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -109,12 +114,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -127,60 +140,64 @@ When adding planes, their normals should point inwards (into the volume) - +
o ConvexPlanarOccluder()

- -

o ConvexPlanarOccluder(const ConvexPlanarOccluder& cpo, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o ConvexPlanarOccluder(const ConvexPlanarOccluder& cpo, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

- -

oMETA_Object (osg, ConvexPlanarOccluder)(const ConvexPlanarPolygon& cpp) + +
oMETA_Object (osg, ConvexPlanarOccluder)(const ConvexPlanarPolygon& cpp)

- +

oConvexPlanarPolygon& getOccluder()

- +

oconst ConvexPlanarPolygon& getOccluder() const

+ + +

otypedef std::vector<ConvexPlanarPolygon> HoleList +

- -

otypedef std::vector<ConvexPlanarPolygon> HoleList void addHole(const ConvexPlanarPolygon& cpp) + +
ovoid addHole(const ConvexPlanarPolygon& cpp)

- -

oHoleList& getHoleList() + +
oHoleList& getHoleList()

- -

oconst HoleList& getHoleList() const + +
oconst HoleList& getHoleList() const

- +

ovoid computeAttributes()

- +

ovoid computeBound(BoundingBox& bb) const

- +

ovoid computeBound(BoundingSphere& bs) const

- +

o ~ConvexPlanarOccluder()

- +

oConvexPlanarPolygon _occluder

- -

oHoleList _holeList + +
oHoleList _holeList

This class has no child classes.
diff --git a/doc/doc++/osg/ConvexPlanarPolygon.html b/doc/doc++/osg/ConvexPlanarPolygon.html index 2f0ef2e92..6ef4199c5 100644 --- a/doc/doc++/osg/ConvexPlanarPolygon.html +++ b/doc/doc++/osg/ConvexPlanarPolygon.html @@ -13,18 +13,23 @@

Public Methods

-[more] ConvexPlanarPolygon() +[more] ConvexPlanarPolygon()
-[more]typedef std::vector<osg::Vec3> VertexList void add(const Vec3& v) +[more]void add(const Vec3& v)
-[more]VertexList& getVertexList() +[more]VertexList& getVertexList()
-[more]const VertexList& getVertexList() const +[more]const VertexList& getVertexList() const +

+ +

+

Public Members

+[more]typedef std::vector<osg::Vec3> VertexList

Protected Fields

-[more]VertexList _vertexList +[more]VertexList _vertexList

@@ -37,24 +42,28 @@ When adding planes, their normals should point inwards (into the volume) - +
o ConvexPlanarPolygon()

+ + +

otypedef std::vector<osg::Vec3> VertexList +

- -

otypedef std::vector<osg::Vec3> VertexList void add(const Vec3& v) + +
ovoid add(const Vec3& v)

- -

oVertexList& getVertexList() + +
oVertexList& getVertexList()

- -

oconst VertexList& getVertexList() const + +
oconst VertexList& getVertexList() const

- -

oVertexList _vertexList + +
oVertexList _vertexList

This class has no child classes.
diff --git a/doc/doc++/osg/CopyOp.html b/doc/doc++/osg/CopyOp.html index 5753134c3..fe3576d19 100644 --- a/doc/doc++/osg/CopyOp.html +++ b/doc/doc++/osg/CopyOp.html @@ -13,39 +13,43 @@

Public Methods

-[more]typedef unsigned intinline CopyFlags CopyOp(CopyFlags flags=SHALLOW_COPY) +[more]inline CopyOp(CopyFlags flags=SHALLOW_COPY)
-[more]virtual ~CopyOp() +[more]virtual ~CopyOp()
-[more]virtual Referenced* operator() (const Referenced* ref) const +[more]virtual Referenced* operator() (const Referenced* ref) const
-[more]virtual Object* operator() (const Object* obj) const +[more]virtual Object* operator() (const Object* obj) const
-[more]virtual Node* operator() (const Node* node) const +[more]virtual Node* operator() (const Node* node) const
-[more]virtual Drawable* operator() (const Drawable* drawable) const +[more]virtual Drawable* operator() (const Drawable* drawable) const
-[more]virtual StateSet* operator() (const StateSet* stateset) const +[more]virtual StateSet* operator() (const StateSet* stateset) const
-[more]virtual StateAttribute* operator() (const StateAttribute* attr) const +[more]virtual StateAttribute* operator() (const StateAttribute* attr) const
-[more]virtual Texture* operator() (const Texture* text) const +[more]virtual Texture* operator() (const Texture* text) const
-[more]virtual Image* operator() (const Image* image) const +[more]virtual Image* operator() (const Image* image) const
-[more]virtual Array* operator() (const Array* image) const +[more]virtual Array* operator() (const Array* array) const
-[more]virtual Primitive* operator() (const Primitive* image) const +[more]virtual PrimitiveSet* operator() (const PrimitiveSet* primitives) const +
+[more]virtual Shape* operator() (const Shape* shape) const

Public Members

-[more]enum Options +[more]enum Options +
+[more]typedef unsigned int CopyFlags

Protected Fields

-[more]CopyFlags _flags +[more]CopyFlags _flags

@@ -58,106 +62,118 @@ during copy construction and clone operation
- +
oenum Options

- +
o SHALLOW_COPY

- +

o DEEP_COPY_OBJECTS

- +

o DEEP_COPY_NODES

- +

o DEEP_COPY_DRAWABLES

- +

o DEEP_COPY_STATESETS

- +

o DEEP_COPY_STATEATTRIBUTES

- +

o DEEP_COPY_TEXTURES

- +

o DEEP_COPY_IMAGES

- +

o DEEP_COPY_ARRAYS

- +

o DEEP_COPY_PRIMITIVES

+ + +

o DEEP_COPY_SHAPES +

- +

o DEEP_COPY_ALL

+ + +
otypedef unsigned int CopyFlags +

- -

otypedef unsigned intinline CopyFlags CopyOp(CopyFlags flags=SHALLOW_COPY) + +
oinline CopyOp(CopyFlags flags=SHALLOW_COPY)

- +

ovirtual ~CopyOp()

- -

ovirtual Referenced* operator() (const Referenced* ref) const + +
ovirtual Referenced* operator() (const Referenced* ref) const

- +

ovirtual Object* operator() (const Object* obj) const

- +

ovirtual Node* operator() (const Node* node) const

- +

ovirtual Drawable* operator() (const Drawable* drawable) const

- +

ovirtual StateSet* operator() (const StateSet* stateset) const

- +

ovirtual StateAttribute* operator() (const StateAttribute* attr) const

- +

ovirtual Texture* operator() (const Texture* text) const

- +

ovirtual Image* operator() (const Image* image) const

- -

ovirtual Array* operator() (const Array* image) const + +
ovirtual Array* operator() (const Array* array) const

- -

ovirtual Primitive* operator() (const Primitive* image) const + +
ovirtual PrimitiveSet* operator() (const PrimitiveSet* primitives) const +

+ + +

ovirtual Shape* operator() (const Shape* shape) const

- -

oCopyFlags _flags + +
oCopyFlags _flags

This class has no child classes.
diff --git a/doc/doc++/osg/CullFace.html b/doc/doc++/osg/CullFace.html index 03c19ae05..22cd61027 100644 --- a/doc/doc++/osg/CullFace.html +++ b/doc/doc++/osg/CullFace.html @@ -23,38 +23,38 @@

Public Methods

-[more] CullFace() +[more] CullFace()
-[more] CullFace(const CullFace& cf, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] CullFace(const CullFace& cf, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy
-[more] META_StateAttribute(osg, CullFace, CULLFACE) +[more] META_StateAttribute(osg, CullFace, CULLFACE)
-[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
-[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const
-[more]inline void setMode(const Mode mode) +[more]inline void setMode(Mode mode)
-[more]inline const Mode getMode() const +[more]inline Mode getMode() const
-[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

Public Members

-[more]enum Mode +[more]enum Mode

Protected Fields

-[more]Mode _mode +[more]Mode _mode

Protected Methods

-[more]virtual ~CullFace() +[more]virtual ~CullFace()

@@ -72,7 +72,7 @@
ovirtual const char* className() const
-ovirtual const Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -105,9 +105,9 @@

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -123,7 +123,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -141,12 +141,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -158,64 +166,64 @@
- +
o CullFace()

- -

o CullFace(const CullFace& cf, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o CullFace(const CullFace& cf, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy

- -

o META_StateAttribute(osg, CullFace, CULLFACE) + +
o META_StateAttribute(osg, CullFace, CULLFACE)

- +

ovirtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

- -

ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const + +
ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const

- +

oenum Mode

- +
o FRONT

- +

o BACK

- +

o FRONT_AND_BACK

- -
oinline void setMode(const Mode mode) + +
oinline void setMode(Mode mode)

- -

oinline const Mode getMode() const + +
oinline Mode getMode() const

- +

ovirtual void apply(State& state) const

- +

ovirtual ~CullFace()

- -

oMode _mode + +
oMode _mode

This class has no child classes.
diff --git a/doc/doc++/osg/CullStack.html b/doc/doc++/osg/CullStack.html index f466b018d..a6db44a34 100644 --- a/doc/doc++/osg/CullStack.html +++ b/doc/doc++/osg/CullStack.html @@ -23,161 +23,175 @@

Public Methods

-[more] CullStack() +[more] CullStack()
-[more] ~CullStack() +[more] ~CullStack()
-[more]typedef unsigned int CullingMode void reset() +[more]void reset()
-[more]void setOccluderList(const ShadowVolumeOccluderList& svol) +[more]void setOccluderList(const ShadowVolumeOccluderList& svol)
-[more]ShadowVolumeOccluderList& getOccluderList() +[more]ShadowVolumeOccluderList& getOccluderList()
-[more]const ShadowVolumeOccluderList& getOccluderList() const +[more]const ShadowVolumeOccluderList& getOccluderList() const
-[more]void pushViewport(osg::Viewport* viewport) +[more]void pushViewport(osg::Viewport* viewport)
-[more]void popViewport() +[more]void popViewport()
-[more]void pushProjectionMatrix(osg::Matrix* matrix) +[more]void pushProjectionMatrix(osg::Matrix* matrix)
-[more]void popProjectionMatrix() +[more]void popProjectionMatrix()
-[more]void pushModelViewMatrix(osg::Matrix* matrix) +[more]void pushModelViewMatrix(osg::Matrix* matrix)
-[more]void popModelViewMatrix() +[more]void popModelViewMatrix()
-[more]inline float getFrustumVolume() +[more]inline float getFrustumVolume()
-[more]void setCullingMode(CullingMode mode) +[more]void setCullingMode(CullingMode mode)
Sets the current CullingMode
-[more]CullingMode getCullingMode() const +[more]CullingMode getCullingMode() const
Returns the current CullingMode
-[more]void setLODBias(const float bias) +[more]void setLODBias(float bias)
-[more]const float getLODBias() const +[more]float getLODBias() const
-[more]void setSmallFeatureCullingPixelSize(float value) +[more]void setSmallFeatureCullingPixelSize(float value)
-[more]float getSmallFeatureCullingPixelSize() const +[more]float getSmallFeatureCullingPixelSize() const
-[more]float pixelSize(const Vec3& v, float radius) const +[more]float pixelSize(const Vec3& v, float radius) const
Compute the pixel of an object at position v, with specified radius
-[more]float pixelSize(const BoundingSphere& bs) const +[more]float pixelSize(const BoundingSphere& bs) const
Compute the pixel of an bounding sphere
-[more]inline void disableAndPushOccludersCurrentMask(NodePath& nodePath) +[more]inline void disableAndPushOccludersCurrentMask(NodePath& nodePath)
-[more]inline void popOccludersCurrentMask(NodePath& nodePath) +[more]inline void popOccludersCurrentMask(NodePath& nodePath)
-[more]inline bool isCulled(const std::vector<Vec3>& vertices) +[more]inline bool isCulled(const std::vector<Vec3>& vertices)
-[more]inline bool isCulled(const BoundingBox& bb) +[more]inline bool isCulled(const BoundingBox& bb)
-[more]inline bool isCulled(const BoundingSphere& bs) +[more]inline bool isCulled(const BoundingSphere& bs)
-[more]inline bool isCulled(const osg::Node& node) +[more]inline bool isCulled(const osg::Node& node)
-[more]inline void pushCurrentMask() +[more]inline void pushCurrentMask()
-[more]inline void popCurrentMask() +[more]inline void popCurrentMask()
-[more]typedef fast_back_stack<ref_ptr<CullingSet> > CullingStack CullingStack& getClipSpaceCullingStack() +[more]CullingStack& getClipSpaceCullingStack()
-[more]CullingStack& getProjectionCullingStack() +[more]CullingStack& getProjectionCullingStack()
-[more]CullingStack& getModelViewCullingStack() +[more]CullingStack& getModelViewCullingStack()
-[more]CullingSet& getCurrentCullingSet() +[more]CullingSet& getCurrentCullingSet()
-[more]inline osg::Viewport* getViewport() +[more]inline osg::Viewport* getViewport()
-[more]inline osg::Matrix& getModelViewMatrix() +[more]inline osg::Matrix& getModelViewMatrix()
-[more]inline osg::Matrix& getProjectionMatrix() +[more]inline osg::Matrix& getProjectionMatrix()
-[more]inline const osg::Matrix getWindowMatrix() +[more]inline osg::Matrix getWindowMatrix()
-[more]inline const osg::Matrix& getMVPW() +[more]inline const osg::Matrix& getMVPW()
-[more]inline const osg::Vec3& getEyeLocal() const +[more]inline const osg::Vec3& getEyeLocal() const
-[more]inline const osg::Vec3 getUpLocal() const +[more]inline const osg::Vec3 getUpLocal() const
-[more]inline const osg::Vec3 getLookVectorLocal() const +[more]inline const osg::Vec3 getLookVectorLocal() const
-[more]inline Viewport* getViewport() +[more]inline Viewport* getViewport()
-[more]inline Matrix& getModelViewMatrix() +[more]inline Matrix& getModelViewMatrix()
-[more]inline Matrix& getProjectionMatrix() +[more]inline Matrix& getProjectionMatrix()
-[more]inline const Matrix getWindowMatrix() +[more]inline Matrix getWindowMatrix()
-[more]inline const Matrix& getMVPW() +[more]inline const Matrix& getMVPW()
-[more]inline Matrix* createOrReuseMatrix(const osg::Matrix& value) +[more]inline Matrix* createOrReuseMatrix(const osg::Matrix& value)

Public Members

-[more]typedef std::vector<ShadowVolumeOccluder> OccluderListenum CullingModeValues +[more]typedef std::vector<ShadowVolumeOccluder> OccluderList +
+[more]enum CullingModeValues +
+[more]typedef unsigned int CullingMode +
+[more]typedef fast_back_stack<ref_ptr<CullingSet> > CullingStack

Protected Fields

-[more]CullingMode _cullingMode +[more]CullingMode _cullingMode
-[more]float _LODBias +[more]float _LODBias
-[more]float _smallFeatureCullingPixelSize +[more]float _smallFeatureCullingPixelSize
-[more]ShadowVolumeOccluderList _occluderList +[more]ShadowVolumeOccluderList _occluderList
-[more]MatrixStack _modelviewStack +[more]MatrixStack _projectionStack
-[more]MatrixStack _MVPW_Stack +[more]MatrixStack _modelviewStack
-[more]CullingStack _clipspaceCullingStack +[more]MatrixStack _MVPW_Stack
-[more]CullingStack _projectionCullingStack +[more]ViewportStack _viewportStack
-[more]CullingStack _modelviewCullingStack +[more]EyePointStack _eyePointStack
-[more]float _frustumVolume +[more]CullingStack _clipspaceCullingStack
-[more]unsigned int _bbCornerNear +[more]CullingStack _projectionCullingStack
-[more]unsigned int _bbCornerFar +[more]CullingStack _modelviewCullingStack
-[more]osg::Matrix _identity +[more]float _frustumVolume
-[more]unsigned int _currentReuseMatrixIndex +[more]unsigned int _bbCornerNear +
+[more]unsigned int _bbCornerFar +
+[more]osg::Matrix _identity +
+[more]MatrixList _reuseMatrixList +
+[more]unsigned int _currentReuseMatrixIndex

Protected Methods

-[more]void pushCullingSet() +[more]void pushCullingSet()
-[more]void popCullingSet() +[more]void popCullingSet()
-[more]void computeFrustumVolume() +[more]void computeFrustumVolume()
-[more]inline osg::Matrix* createOrReuseMatrix(const osg::Matrix& value) +[more]inline osg::Matrix* createOrReuseMatrix(const osg::Matrix& value)

Protected Members

-[more]typedef fast_back_stack< ref_ptr<Matrix> > MatrixStack MatrixStack _projectionStack +[more]typedef fast_back_stack< ref_ptr<Matrix> > MatrixStack
-[more]typedef fast_back_stack<ref_ptr<Viewport> > ViewportStack ViewportStack _viewportStack +[more]typedef fast_back_stack<ref_ptr<Viewport> > ViewportStack
-[more]typedef fast_back_stack<Vec3> EyePointStack EyePointStack _eyePointStack +[more]typedef fast_back_stack<Vec3> EyePointStack
-[more]typedef std::vector< osg::ref_ptr<osg::Matrix> > MatrixList MatrixList _reuseMatrixList +[more]typedef std::vector< osg::ref_ptr<osg::Matrix> > MatrixList

@@ -190,317 +204,345 @@ and the CullingSet.
- +
o CullStack()

- +

o ~CullStack()

+ + +

otypedef std::vector<ShadowVolumeOccluder> OccluderList +

- -

otypedef std::vector<ShadowVolumeOccluder> OccluderListenum CullingModeValues + +
oenum CullingModeValues

- +
o NO_CULLING

- +

o VIEW_FRUSTUM_CULLING

- +

o NEAR_PLANE_CULLING

- +

o FAR_PLANE_CULLING

- +

o SMALL_FEATURE_CULLING

- +

o SHADOW_OCCLUSION_CULLING

- +

o ENABLE_ALL_CULLING

+ + +
otypedef unsigned int CullingMode +

- -

otypedef unsigned int CullingMode void reset() + +
ovoid reset()

- -

ovoid setOccluderList(const ShadowVolumeOccluderList& svol) + +
ovoid setOccluderList(const ShadowVolumeOccluderList& svol)

- -

oShadowVolumeOccluderList& getOccluderList() + +
oShadowVolumeOccluderList& getOccluderList()

- -

oconst ShadowVolumeOccluderList& getOccluderList() const + +
oconst ShadowVolumeOccluderList& getOccluderList() const

- +

ovoid pushViewport(osg::Viewport* viewport)

- +

ovoid popViewport()

- +

ovoid pushProjectionMatrix(osg::Matrix* matrix)

- +

ovoid popProjectionMatrix()

- +

ovoid pushModelViewMatrix(osg::Matrix* matrix)

- +

ovoid popModelViewMatrix()

- +

oinline float getFrustumVolume()

- -

ovoid setCullingMode(CullingMode mode) + +
ovoid setCullingMode(CullingMode mode)
Sets the current CullingMode

- -

oCullingMode getCullingMode() const + +
oCullingMode getCullingMode() const
Returns the current CullingMode

- -

ovoid setLODBias(const float bias) + +
ovoid setLODBias(float bias)

- -

oconst float getLODBias() const + +
ofloat getLODBias() const

- +

ovoid setSmallFeatureCullingPixelSize(float value)

- +

ofloat getSmallFeatureCullingPixelSize() const

- -

ofloat pixelSize(const Vec3& v, float radius) const + +
ofloat pixelSize(const Vec3& v, float radius) const
Compute the pixel of an object at position v, with specified radius

- +

ofloat pixelSize(const BoundingSphere& bs) const
Compute the pixel of an bounding sphere

- +

oinline void disableAndPushOccludersCurrentMask(NodePath& nodePath)

- +

oinline void popOccludersCurrentMask(NodePath& nodePath)

- +

oinline bool isCulled(const std::vector<Vec3>& vertices)

- +

oinline bool isCulled(const BoundingBox& bb)

- +

oinline bool isCulled(const BoundingSphere& bs)

- +

oinline bool isCulled(const osg::Node& node)

- +

oinline void pushCurrentMask()

- +

oinline void popCurrentMask()

+ + +

otypedef fast_back_stack<ref_ptr<CullingSet> > CullingStack +

- -

otypedef fast_back_stack<ref_ptr<CullingSet> > CullingStack CullingStack& getClipSpaceCullingStack() + +
oCullingStack& getClipSpaceCullingStack()

- -

oCullingStack& getProjectionCullingStack() + +
oCullingStack& getProjectionCullingStack()

- -

oCullingStack& getModelViewCullingStack() + +
oCullingStack& getModelViewCullingStack()

- +

oCullingSet& getCurrentCullingSet()

- +

oinline osg::Viewport* getViewport()

- +

oinline osg::Matrix& getModelViewMatrix()

- +

oinline osg::Matrix& getProjectionMatrix()

- -

oinline const osg::Matrix getWindowMatrix() + +
oinline osg::Matrix getWindowMatrix()

- +

oinline const osg::Matrix& getMVPW()

- +

oinline const osg::Vec3& getEyeLocal() const

- +

oinline const osg::Vec3 getUpLocal() const

- +

oinline const osg::Vec3 getLookVectorLocal() const

- +

ovoid pushCullingSet()

- +

ovoid popCullingSet()

- -

oCullingMode _cullingMode + +
oCullingMode _cullingMode

- +

ofloat _LODBias

- +

ofloat _smallFeatureCullingPixelSize

- -

oShadowVolumeOccluderList _occluderList + +
oShadowVolumeOccluderList _occluderList +

+ + +

otypedef fast_back_stack< ref_ptr<Matrix> > MatrixStack

- -

otypedef fast_back_stack< ref_ptr<Matrix> > MatrixStack MatrixStack _projectionStack + +
oMatrixStack _projectionStack

- -

oMatrixStack _modelviewStack + +
oMatrixStack _modelviewStack

- -

oMatrixStack _MVPW_Stack + +
oMatrixStack _MVPW_Stack +

+ + +

otypedef fast_back_stack<ref_ptr<Viewport> > ViewportStack

- -

otypedef fast_back_stack<ref_ptr<Viewport> > ViewportStack ViewportStack _viewportStack + +
oViewportStack _viewportStack +

+ + +

otypedef fast_back_stack<Vec3> EyePointStack

- -

otypedef fast_back_stack<Vec3> EyePointStack EyePointStack _eyePointStack + +
oEyePointStack _eyePointStack

- -

oCullingStack _clipspaceCullingStack + +
oCullingStack _clipspaceCullingStack

- -

oCullingStack _projectionCullingStack + +
oCullingStack _projectionCullingStack

- -

oCullingStack _modelviewCullingStack + +
oCullingStack _modelviewCullingStack

- +

ovoid computeFrustumVolume()

- +

ofloat _frustumVolume

- +

ounsigned int _bbCornerNear

- +

ounsigned int _bbCornerFar

- +

oosg::Matrix _identity

+ + +

otypedef std::vector< osg::ref_ptr<osg::Matrix> > MatrixList +

- -

otypedef std::vector< osg::ref_ptr<osg::Matrix> > MatrixList MatrixList _reuseMatrixList + +
oMatrixList _reuseMatrixList

- +

ounsigned int _currentReuseMatrixIndex

- +

oinline osg::Matrix* createOrReuseMatrix(const osg::Matrix& value)

- +

oinline Viewport* getViewport()

- +

oinline Matrix& getModelViewMatrix()

- +

oinline Matrix& getProjectionMatrix()

- -

oinline const Matrix getWindowMatrix() + +
oinline Matrix getWindowMatrix()

- +

oinline const Matrix& getMVPW()

- +

oinline Matrix* createOrReuseMatrix(const osg::Matrix& value)

diff --git a/doc/doc++/osg/CullingSet.html b/doc/doc++/osg/CullingSet.html index d8202968b..467d80153 100644 --- a/doc/doc++/osg/CullingSet.html +++ b/doc/doc++/osg/CullingSet.html @@ -23,71 +23,75 @@

Public Methods

-[more] CullingSet() +[more] CullingSet()
-[more] CullingSet(const CullingSet& cs, const Matrix& matrix, const Vec4& pixelSizeVector) +[more] CullingSet(const CullingSet& cs, const Matrix& matrix, const Vec4& pixelSizeVector)
-[more] ~CullingSet() +[more] ~CullingSet()
-[more]void setCullingMask(Mask mask) +[more]void setCullingMask(Mask mask)
-[more]void setFrustum(Polytope& cv) +[more]void setFrustum(Polytope& cv)
-[more]Polytope& getFrustum() +[more]Polytope& getFrustum()
-[more]const Polytope& getFrustum() const +[more]const Polytope& getFrustum() const
-[more]void addOccluder(ShadowVolumeOccluder& cv) +[more]void addOccluder(ShadowVolumeOccluder& cv)
-[more]void setPixelSizeVector(const Vec4& v) +[more]void setPixelSizeVector(const Vec4& v)
-[more]Vec4& getPixelSizeVector() +[more]Vec4& getPixelSizeVector()
-[more]const Vec4& getPixelSizeVector() const +[more]const Vec4& getPixelSizeVector() const
-[more]void setSmallFeatureCullingPixelSize(float value) +[more]void setSmallFeatureCullingPixelSize(float value)
-[more]float& getSmallFeatureCullingPixelSize() +[more]float& getSmallFeatureCullingPixelSize()
-[more]float getSmallFeatureCullingPixelSize() const +[more]float getSmallFeatureCullingPixelSize() const
-[more]float pixelSize(const Vec3& v, float radius) const +[more]float pixelSize(const Vec3& v, float radius) const
Compute the pixel of an object at position v, with specified radius
-[more]float pixelSize(const BoundingSphere& bs) const +[more]float pixelSize(const BoundingSphere& bs) const
Compute the pixel of an bounding sphere
-[more]inline bool isCulled(const std::vector<Vec3>& vertices) +[more]inline bool isCulled(const std::vector<Vec3>& vertices)
-[more]inline bool isCulled(const BoundingBox& bb) +[more]inline bool isCulled(const BoundingBox& bb)
-[more]inline bool isCulled(const BoundingSphere& bs) +[more]inline bool isCulled(const BoundingSphere& bs)
-[more]inline void pushCurrentMask() +[more]inline void pushCurrentMask()
-[more]inline void popCurrentMask() +[more]inline void popCurrentMask()
-[more]void disableAndPushOccludersCurrentMask(NodePath& nodePath) +[more]void disableAndPushOccludersCurrentMask(NodePath& nodePath)
-[more]void popOccludersCurrentMask(NodePath& nodePath) +[more]void popOccludersCurrentMask(NodePath& nodePath)

Public Members

-[more]typedef unsigned int Maskenum MaskValues +[more]typedef std::vector<ShadowVolumeOccluder> OccluderList +
+[more]typedef unsigned int Mask +
+[more]enum MaskValues

Protected Fields

-[more]Mask _mask +[more]Mask _mask
-[more]Polytope _frustum +[more]Polytope _frustum
-[more]OccluderList _occluderList +[more]OccluderList _occluderList
-[more]Vec4 _pixelSizeVector +[more]Vec4 _pixelSizeVector
-[more]float _smallFeatureCullingPixelSize +[more]float _smallFeatureCullingPixelSize

@@ -103,12 +107,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -120,139 +132,147 @@
- +
o CullingSet()

- -

o CullingSet(const CullingSet& cs, const Matrix& matrix, const Vec4& pixelSizeVector) + +
o CullingSet(const CullingSet& cs, const Matrix& matrix, const Vec4& pixelSizeVector)

- +

o ~CullingSet()

+ + +

otypedef std::vector<ShadowVolumeOccluder> OccluderList +

+ + +

otypedef unsigned int Mask +

- -

otypedef unsigned int Maskenum MaskValues + +
oenum MaskValues

- +
o VIEW_FRUSTUM_CULLING

- +

o SMALL_FEATURE_CULLING

- +

o SHADOW_OCCLUSION_CULLING

- +

o ALL_CULLING

- -
ovoid setCullingMask(Mask mask) + +
ovoid setCullingMask(Mask mask)

- +

ovoid setFrustum(Polytope& cv)

- +

oPolytope& getFrustum()

- +

oconst Polytope& getFrustum() const

- +

ovoid addOccluder(ShadowVolumeOccluder& cv)

- +

ovoid setPixelSizeVector(const Vec4& v)

- +

oVec4& getPixelSizeVector()

- +

oconst Vec4& getPixelSizeVector() const

- +

ovoid setSmallFeatureCullingPixelSize(float value)

- +

ofloat& getSmallFeatureCullingPixelSize()

- +

ofloat getSmallFeatureCullingPixelSize() const

- -

ofloat pixelSize(const Vec3& v, float radius) const + +
ofloat pixelSize(const Vec3& v, float radius) const
Compute the pixel of an object at position v, with specified radius

- +

ofloat pixelSize(const BoundingSphere& bs) const
Compute the pixel of an bounding sphere

- +

oinline bool isCulled(const std::vector<Vec3>& vertices)

- +

oinline bool isCulled(const BoundingBox& bb)

- +

oinline bool isCulled(const BoundingSphere& bs)

- +

oinline void pushCurrentMask()

- +

oinline void popCurrentMask()

- +

ovoid disableAndPushOccludersCurrentMask(NodePath& nodePath)

- +

ovoid popOccludersCurrentMask(NodePath& nodePath)

- -

oMask _mask + +
oMask _mask

- +

oPolytope _frustum

- -

oOccluderList _occluderList + +
oOccluderList _occluderList

- +

oVec4 _pixelSizeVector

- +

ofloat _smallFeatureCullingPixelSize

diff --git a/doc/doc++/osg/DOFTransform.html b/doc/doc++/osg/DOFTransform.html index 166fdc502..6971185c2 100644 --- a/doc/doc++/osg/DOFTransform.html +++ b/doc/doc++/osg/DOFTransform.html @@ -23,134 +23,134 @@

Public Methods

-[more] DOFTransform() +[more] DOFTransform()
constructor
-[more] DOFTransform(const DOFTransform& dof, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] DOFTransform(const DOFTransform& dof, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
copy constructor
-[more] META_Node(osg, DOFTransform) +[more] META_Node(osg, DOFTransform)
-[more]virtual void traverse(NodeVisitor& nv) +[more]virtual void traverse(NodeVisitor& nv)
-[more]void setMinHPR(const Vec3& hpr) +[more]void setMinHPR(const Vec3& hpr)
-[more]const Vec3& getMinHPR() const +[more]const Vec3& getMinHPR() const
-[more]void setMaxHPR(const Vec3& hpr) +[more]void setMaxHPR(const Vec3& hpr)
-[more]const Vec3& getMaxHPR() const +[more]const Vec3& getMaxHPR() const
-[more]void setIncrementHPR(const Vec3& hpr) +[more]void setIncrementHPR(const Vec3& hpr)
-[more]const Vec3& getIncrementHPR() const +[more]const Vec3& getIncrementHPR() const
-[more]void setCurrentHPR(const Vec3& hpr) +[more]void setCurrentHPR(const Vec3& hpr)
-[more]const Vec3& getCurrentHPR() const +[more]const Vec3& getCurrentHPR() const
-[more]void updateCurrentHPR(const Vec3& hpr) +[more]void updateCurrentHPR(const Vec3& hpr)
-[more]void setMinTranslate(const Vec3& translate) +[more]void setMinTranslate(const Vec3& translate)
-[more]const Vec3& getMinTranslate() const +[more]const Vec3& getMinTranslate() const
-[more]void setMaxTranslate(const Vec3& translate) +[more]void setMaxTranslate(const Vec3& translate)
-[more]const Vec3& getMaxTranslate() const +[more]const Vec3& getMaxTranslate() const
-[more]void setIncrementTranslate(const Vec3& translate) +[more]void setIncrementTranslate(const Vec3& translate)
-[more]const Vec3& getIncrementTranslate() const +[more]const Vec3& getIncrementTranslate() const
-[more]void setCurrentTranslate(const Vec3& translate) +[more]void setCurrentTranslate(const Vec3& translate)
-[more]inline const Vec3& getCurrentTranslate() const +[more]inline const Vec3& getCurrentTranslate() const
-[more]void updateCurrentTranslate(const Vec3& translate) +[more]void updateCurrentTranslate(const Vec3& translate)
-[more]void setMinScale(const Vec3& scale) +[more]void setMinScale(const Vec3& scale)
-[more]const Vec3& getMinScale() const +[more]const Vec3& getMinScale() const
-[more]void setMaxScale(const Vec3& scale) +[more]void setMaxScale(const Vec3& scale)
-[more]const Vec3& getMaxScale() const +[more]const Vec3& getMaxScale() const
-[more]void setIncrementScale(const Vec3& scale) +[more]void setIncrementScale(const Vec3& scale)
-[more]const Vec3& getIncrementScale() const +[more]const Vec3& getIncrementScale() const
-[more]void setCurrentScale(const Vec3& scale) +[more]void setCurrentScale(const Vec3& scale)
-[more]inline const Vec3& getCurrentScale() const +[more]inline const Vec3& getCurrentScale() const
-[more]void updateCurrentScale(const Vec3& scale) +[more]void updateCurrentScale(const Vec3& scale)
-[more]void setPutMatrix(const Matrix& put) +[more]void setPutMatrix(const Matrix& put)
-[more]inline const Matrix& getPutMatrix() const +[more]inline const Matrix& getPutMatrix() const
-[more]void setInversePutMatrix(const Matrix& inversePut) +[more]void setInversePutMatrix(const Matrix& inversePut)
-[more]inline const Matrix& getInversePutMatrix() const +[more]inline const Matrix& getInversePutMatrix() const
-[more]void setLimitationFlags(unsigned long flags) +[more]void setLimitationFlags(unsigned long flags)
-[more]inline unsigned long getLimitationFlags() const +[more]inline unsigned long getLimitationFlags() const
-[more]inline void setAnimationOn(bool do_animate) +[more]inline void setAnimationOn(bool do_animate)
-[more]inline bool getAnimationOn() const +[more]inline bool getAnimationOn() const
-[more]void animate() +[more]void animate()
-[more]virtual const bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const +[more]virtual bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const
-[more]virtual const bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const +[more]virtual bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const

Protected Fields

-[more]Vec3 _minHPR +[more]Vec3 _minHPR
-[more]Vec3 _maxHPR +[more]Vec3 _maxHPR
-[more]Vec3 _currentHPR +[more]Vec3 _currentHPR
-[more]Vec3 _incrementHPR +[more]Vec3 _incrementHPR
-[more]Vec3 _minTranslate +[more]Vec3 _minTranslate
-[more]Vec3 _maxTranslate +[more]Vec3 _maxTranslate
-[more]Vec3 _currentTranslate +[more]Vec3 _currentTranslate
-[more]Vec3 _incrementTranslate +[more]Vec3 _incrementTranslate
-[more]Vec3 _minScale +[more]Vec3 _minScale
-[more]Vec3 _maxScale +[more]Vec3 _maxScale
-[more]Vec3 _currentScale +[more]Vec3 _currentScale
-[more]Vec3 _incrementScale +[more]Vec3 _incrementScale
-[more]Matrix _Put +[more]Matrix _Put
-[more]Matrix _inversePut +[more]Matrix _inversePut
-[more]unsigned long _limitationFlags +[more]unsigned long _limitationFlags
-[more]bool _animationOn +[more]bool _animationOn
-[more]unsigned short _increasingFlags +[more]unsigned short _increasingFlags
flags indicating whether value is incerasing or decreasing in animation bits form right to left, 1 means increasing while 0 is decreasing 0 = x translation 1 = y translation 2 = z translation 3 = pitch 4 = roll 5 = yaw 6 = x scale 7 = y scale 8 = z scale

Protected Methods

-[more]virtual ~DOFTransform() +[more]virtual ~DOFTransform()

@@ -158,19 +158,23 @@

Public Methods

-ovoid setReferenceFrame(ReferenceFrame rf) +ovirtual Transform* asTransform()
-oconst ReferenceFrame getReferenceFrame() const +ovirtual const Transform* asTransform() const
-ovoid setComputeTransformCallback(ComputeTransformCallback* ctc) +ovoid setReferenceFrame(ReferenceFrame rf)
-oComputeTransformCallback* getComputeTransformCallback() +oReferenceFrame getReferenceFrame() const
-oconst ComputeTransformCallback* getComputeTransformCallback() const +ovoid setComputeTransformCallback(ComputeTransformCallback* ctc)
-oinline const bool getLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const +oComputeTransformCallback* getComputeTransformCallback()
-oinline const bool getWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const +oconst ComputeTransformCallback* getComputeTransformCallback() const +
+oinline bool getLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const +
+oinline bool getWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const

@@ -182,14 +186,14 @@

Protected Fields

-oref_ptr<ComputeTransformCallback> _computeTransformCallback +oref_ptr<ComputeTransformCallback> _computeTransformCallback
-oReferenceFrame _referenceFrame +oReferenceFrame _referenceFrame

Protected Methods

-ovirtual const bool computeBound() const +ovirtual bool computeBound() const

@@ -197,28 +201,39 @@

Public Methods

+ovirtual Group* asGroup() +
+ovirtual const Group* asGroup() const +
ovirtual bool addChild( Node* child )
ovirtual bool removeChild( Node* child )
ovirtual bool replaceChild( Node* origChild, Node* newChild )
-oinline const unsigned int getNumChildren() const +oinline unsigned int getNumChildren() const
-oinline Node* getChild( const unsigned int i ) +oinline Node* getChild( unsigned int i )
-oinline const Node* getChild( const unsigned int i ) const +oinline const Node* getChild( unsigned int i ) const
oinline bool containsNode( const Node* node ) const
oinline ChildList::iterator findNode( const Node* node )
oinline ChildList::const_iterator findNode( const Node* node ) const +
+oinline unsigned int findChildNo( const Node* node ) const +

+ +

+

Public Members

+otypedef std::vector<ref_ptr<Node> > ChildList

Protected Fields

-oChildList _children +oChildList _children

@@ -230,245 +245,245 @@
- +
o DOFTransform()
constructor

- -

o DOFTransform(const DOFTransform& dof, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o DOFTransform(const DOFTransform& dof, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
copy constructor

- +

o META_Node(osg, DOFTransform)

- +

ovirtual void traverse(NodeVisitor& nv)

- +

ovoid setMinHPR(const Vec3& hpr)

- +

oconst Vec3& getMinHPR() const

- +

ovoid setMaxHPR(const Vec3& hpr)

- +

oconst Vec3& getMaxHPR() const

- +

ovoid setIncrementHPR(const Vec3& hpr)

- +

oconst Vec3& getIncrementHPR() const

- +

ovoid setCurrentHPR(const Vec3& hpr)

- +

oconst Vec3& getCurrentHPR() const

- +

ovoid updateCurrentHPR(const Vec3& hpr)

- -

ovoid setMinTranslate(const Vec3& translate) + +
ovoid setMinTranslate(const Vec3& translate)

- +

oconst Vec3& getMinTranslate() const

- -

ovoid setMaxTranslate(const Vec3& translate) + +
ovoid setMaxTranslate(const Vec3& translate)

- +

oconst Vec3& getMaxTranslate() const

- -

ovoid setIncrementTranslate(const Vec3& translate) + +
ovoid setIncrementTranslate(const Vec3& translate)

- +

oconst Vec3& getIncrementTranslate() const

- -

ovoid setCurrentTranslate(const Vec3& translate) + +
ovoid setCurrentTranslate(const Vec3& translate)

- +

oinline const Vec3& getCurrentTranslate() const

- -

ovoid updateCurrentTranslate(const Vec3& translate) + +
ovoid updateCurrentTranslate(const Vec3& translate)

- -

ovoid setMinScale(const Vec3& scale) + +
ovoid setMinScale(const Vec3& scale)

- +

oconst Vec3& getMinScale() const

- -

ovoid setMaxScale(const Vec3& scale) + +
ovoid setMaxScale(const Vec3& scale)

- +

oconst Vec3& getMaxScale() const

- -

ovoid setIncrementScale(const Vec3& scale) + +
ovoid setIncrementScale(const Vec3& scale)

- +

oconst Vec3& getIncrementScale() const

- -

ovoid setCurrentScale(const Vec3& scale) + +
ovoid setCurrentScale(const Vec3& scale)

- +

oinline const Vec3& getCurrentScale() const

- -

ovoid updateCurrentScale(const Vec3& scale) + +
ovoid updateCurrentScale(const Vec3& scale)

- +

ovoid setPutMatrix(const Matrix& put)

- +

oinline const Matrix& getPutMatrix() const

- +

ovoid setInversePutMatrix(const Matrix& inversePut)

- +

oinline const Matrix& getInversePutMatrix() const

- +

ovoid setLimitationFlags(unsigned long flags)

- +

oinline unsigned long getLimitationFlags() const

- +

oinline void setAnimationOn(bool do_animate)

- +

oinline bool getAnimationOn() const

- +

ovoid animate()

- -

ovirtual const bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const + +
ovirtual bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const

- -

ovirtual const bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const + +
ovirtual bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const

- +

ovirtual ~DOFTransform()

- +

oVec3 _minHPR

- +

oVec3 _maxHPR

- +

oVec3 _currentHPR

- +

oVec3 _incrementHPR

- +

oVec3 _minTranslate

- +

oVec3 _maxTranslate

- +

oVec3 _currentTranslate

- +

oVec3 _incrementTranslate

- +

oVec3 _minScale

- +

oVec3 _maxScale

- +

oVec3 _currentScale

- +

oVec3 _incrementScale

- +

oMatrix _Put

- +

oMatrix _inversePut

- +

ounsigned long _limitationFlags

- +

obool _animationOn

- +

ounsigned short _increasingFlags
flags indicating whether value is incerasing or decreasing in animation bits form right to left, 1 means increasing while 0 is decreasing diff --git a/doc/doc++/osg/Depth.html b/doc/doc++/osg/Depth.html index 842f0dbbe..7ecc8095b 100644 --- a/doc/doc++/osg/Depth.html +++ b/doc/doc++/osg/Depth.html @@ -23,54 +23,54 @@

Public Methods

-[more] Depth() +[more] Depth()
-[more] Depth(const Depth& dp, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Depth(const Depth& dp, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy
-[more] META_StateAttribute(osg, Depth, DEPTH) +[more] META_StateAttribute(osg, Depth, DEPTH)
-[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
-[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const
-[more]inline void setFunction(const Function func) +[more]inline void setFunction(Function func)
-[more]inline const Function getFunction() const +[more]inline Function getFunction() const
-[more]inline void setWriteMask(const bool mask) +[more]inline void setWriteMask(bool mask)
-[more]inline const bool getWriteMask() const +[more]inline bool getWriteMask() const
-[more]inline void setRange(const double zNear, const double zFar) +[more]inline void setRange(double zNear, double zFar)
-[more]inline const double getZNear() const +[more]inline double getZNear() const
-[more]inline const double getZFar() const +[more]inline double getZFar() const
-[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

Public Members

-[more]enum Function +[more]enum Function

Protected Fields

-[more]Function _func +[more]Function _func
-[more]bool _depthWriteMask +[more]bool _depthWriteMask
-[more]double _zNear +[more]double _zNear
-[more]double _zFar +[more]double _zFar

Protected Methods

-[more]virtual ~Depth() +[more]virtual ~Depth()

@@ -88,7 +88,7 @@
ovirtual const char* className() const
-ovirtual const Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -121,9 +121,9 @@

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -139,7 +139,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -157,12 +157,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -174,115 +182,115 @@
- +
o Depth()

- -

o Depth(const Depth& dp, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o Depth(const Depth& dp, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy

- -

o META_StateAttribute(osg, Depth, DEPTH) + +
o META_StateAttribute(osg, Depth, DEPTH)

- +

ovirtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

- -

ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const + +
ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const

- +

oenum Function

- +
o NEVER

- +

o LESS

- +

o EQUAL

- +

o LEQUAL

- +

o GREATER

- +

o NOTEQUAL

- +

o GEQUAL

- +

o ALWAYS

- -
oinline void setFunction(const Function func) + +
oinline void setFunction(Function func)

- -

oinline const Function getFunction() const + +
oinline Function getFunction() const

- -

oinline void setWriteMask(const bool mask) + +
oinline void setWriteMask(bool mask)

- -

oinline const bool getWriteMask() const + +
oinline bool getWriteMask() const

- -

oinline void setRange(const double zNear, const double zFar) + +
oinline void setRange(double zNear, double zFar)

- -

oinline const double getZNear() const + +
oinline double getZNear() const

- -

oinline const double getZFar() const + +
oinline double getZFar() const

- +

ovirtual void apply(State& state) const

- +

ovirtual ~Depth()

- -

oFunction _func + +
oFunction _func

- +

obool _depthWriteMask

- +

odouble _zNear

- +

odouble _zFar

diff --git a/doc/doc++/osg/DisplaySettings.html b/doc/doc++/osg/DisplaySettings.html index 2a61b61b8..e39b7d1be 100644 --- a/doc/doc++/osg/DisplaySettings.html +++ b/doc/doc++/osg/DisplaySettings.html @@ -23,138 +23,138 @@

Public Methods

-[more]static DisplaySettings* instance() +[more]static DisplaySettings* instance()
Maintain a DisplaySettings singleton for objects to querry at runtime
-[more] DisplaySettings() +[more] DisplaySettings()
-[more] DisplaySettings(std::vector<std::string>& commandLine) +[more] DisplaySettings(std::vector<std::string>& commandLine)
-[more] DisplaySettings(const DisplaySettings& vs) +[more] DisplaySettings(const DisplaySettings& vs)
-[more]virtual ~DisplaySettings() +[more]virtual ~DisplaySettings()
-[more]DisplaySettings& operator = (const DisplaySettings& vs) +[more]DisplaySettings& operator = (const DisplaySettings& vs)
-[more]void merge(const DisplaySettings& vs) +[more]void merge(const DisplaySettings& vs)
-[more]void setDefaults() +[more]void setDefaults()
-[more]void readEnvironmentalVariables() +[more]void readEnvironmentalVariables()
-[more]void readCommandLine(std::vector<std::string>& commandLine) +[more]void readCommandLine(std::vector<std::string>& commandLine)
read the command line string list, removing any matched control sequences
-[more]void setStereo(const bool on) +[more]void setStereo(bool on)
-[more]const bool getStereo() const +[more]bool getStereo() const
-[more]void setStereoMode(const StereoMode mode) +[more]void setStereoMode(StereoMode mode)
-[more]const StereoMode getStereoMode() const +[more]StereoMode getStereoMode() const
-[more]void setEyeSeparation(const float eyeSeparation) +[more]void setEyeSeparation(float eyeSeparation)
-[more]const float getEyeSeparation() const +[more]float getEyeSeparation() const
-[more]void setScreenDistance(const float distance) +[more]void setScreenDistance(float distance)
-[more]const float getScreenDistance() const +[more]float getScreenDistance() const
-[more]void setSplitStereoHorizontalEyeMapping(SplitStereoHorizontalEyeMapping m) +[more]void setSplitStereoHorizontalEyeMapping(SplitStereoHorizontalEyeMapping m)
-[more]SplitStereoHorizontalEyeMapping getSplitStereoHorizontalEyeMapping() const +[more]SplitStereoHorizontalEyeMapping getSplitStereoHorizontalEyeMapping() const
-[more]void setSplitStereoHorizontalSeparation(const int s) +[more]void setSplitStereoHorizontalSeparation(int s)
-[more]const int getSplitStereoHorizontalSeparation() const +[more]int getSplitStereoHorizontalSeparation() const
-[more]void setSplitStereoVerticalEyeMapping(SplitStereoVerticalEyeMapping m) +[more]void setSplitStereoVerticalEyeMapping(SplitStereoVerticalEyeMapping m)
-[more]SplitStereoVerticalEyeMapping getSplitStereoVerticalEyeMapping() const +[more]SplitStereoVerticalEyeMapping getSplitStereoVerticalEyeMapping() const
-[more]void setSplitStereoVerticalSeparation(const int s) +[more]void setSplitStereoVerticalSeparation(int s)
-[more]const int getSplitStereoVerticalSeparation() const +[more]int getSplitStereoVerticalSeparation() const
-[more]void setScreenHeight(const float height) +[more]void setScreenHeight(float height)
-[more]const float getScreenHeight() const +[more]float getScreenHeight() const
-[more]void setDoubleBuffer(const bool flag) +[more]void setDoubleBuffer(bool flag)
-[more]const bool getDoubleBuffer() const +[more]bool getDoubleBuffer() const
-[more]void setRGB(const bool flag) +[more]void setRGB(bool flag)
-[more]const bool getRGB() const +[more]bool getRGB() const
-[more]void setDepthBuffer(const bool flag) +[more]void setDepthBuffer(bool flag)
-[more]const bool getDepthBuffer() const +[more]bool getDepthBuffer() const
-[more]void setMinimumNumAlphaBits(const unsigned int bits) +[more]void setMinimumNumAlphaBits(unsigned int bits)
-[more]const unsigned int getMinimumNumAlphaBits() const +[more]unsigned int getMinimumNumAlphaBits() const
-[more]const bool getAlphaBuffer() const +[more]bool getAlphaBuffer() const
-[more]void setMinimumNumStencilBits(const unsigned int bits) +[more]void setMinimumNumStencilBits(unsigned int bits)
-[more]const unsigned int getMinimumNumStencilBits() const +[more]unsigned int getMinimumNumStencilBits() const
-[more]const bool getStencilBuffer() const +[more]bool getStencilBuffer() const
-[more]void setMaxNumberOfGraphicsContexts(const int num) +[more]void setMaxNumberOfGraphicsContexts(unsigned int num)
-[more]const int getMaxNumberOfGraphicsContexts() const +[more]unsigned int getMaxNumberOfGraphicsContexts() const

Public Members

-[more]enum StereoMode +[more]enum StereoMode
-[more]enum SplitStereoHorizontalEyeMapping +[more]enum SplitStereoHorizontalEyeMapping
-[more]enum SplitStereoVerticalEyeMapping +[more]enum SplitStereoVerticalEyeMapping

Protected Fields

-[more]bool _stereo +[more]bool _stereo
-[more]StereoMode _stereoMode +[more]StereoMode _stereoMode
-[more]float _eyeSeparation +[more]float _eyeSeparation
-[more]float _screenDistance +[more]float _screenDistance
-[more]float _screenHeight +[more]float _screenHeight
-[more]SplitStereoHorizontalEyeMapping _splitStereoHorizontalEyeMapping +[more]SplitStereoHorizontalEyeMapping _splitStereoHorizontalEyeMapping
-[more]int _splitStereoHorizontalSeparation +[more]int _splitStereoHorizontalSeparation
-[more]SplitStereoVerticalEyeMapping _splitStereoVerticalEyeMapping +[more]SplitStereoVerticalEyeMapping _splitStereoVerticalEyeMapping
-[more]int _splitStereoVerticalSeparation +[more]int _splitStereoVerticalSeparation
-[more]bool _doubleBuffer +[more]bool _doubleBuffer
-[more]bool _RGB +[more]bool _RGB
-[more]bool _depthBuffer +[more]bool _depthBuffer
-[more]unsigned int _minimumNumberAlphaBits +[more]unsigned int _minimumNumberAlphaBits
-[more]unsigned int _minimumNumberStencilBits +[more]unsigned int _minimumNumberStencilBits
-[more]int _maxNumOfGraphicsContexts +[more]unsigned int _maxNumOfGraphicsContexts

Protected Methods

-[more]void copy(const DisplaySettings& vs) +[more]void copy(const DisplaySettings& vs)

@@ -168,12 +168,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -186,288 +194,288 @@ have been set up, and the status of stereo viewing
- +
ostatic DisplaySettings* instance()
Maintain a DisplaySettings singleton for objects to querry at runtime

- +

o DisplaySettings()

- +

o DisplaySettings(std::vector<std::string>& commandLine)

- -

o DisplaySettings(const DisplaySettings& vs) + +
o DisplaySettings(const DisplaySettings& vs)

- +

ovirtual ~DisplaySettings()

- +

oDisplaySettings& operator = (const DisplaySettings& vs)

- +

ovoid merge(const DisplaySettings& vs)

- +

ovoid setDefaults()

- +

ovoid readEnvironmentalVariables()

- +

ovoid readCommandLine(std::vector<std::string>& commandLine)
read the command line string list, removing any matched control sequences

- -

ovoid setStereo(const bool on) + +
ovoid setStereo(bool on)

- -

oconst bool getStereo() const + +
obool getStereo() const

- +

oenum StereoMode

- +
o QUAD_BUFFER

- +

o ANAGLYPHIC

- +

o HORIZONTAL_SPLIT

- +

o VERTICAL_SPLIT

- -
ovoid setStereoMode(const StereoMode mode) + +
ovoid setStereoMode(StereoMode mode)

- -

oconst StereoMode getStereoMode() const + +
oStereoMode getStereoMode() const

- -

ovoid setEyeSeparation(const float eyeSeparation) + +
ovoid setEyeSeparation(float eyeSeparation)

- -

oconst float getEyeSeparation() const + +
ofloat getEyeSeparation() const

- -

ovoid setScreenDistance(const float distance) + +
ovoid setScreenDistance(float distance)

- -

oconst float getScreenDistance() const + +
ofloat getScreenDistance() const

- +

oenum SplitStereoHorizontalEyeMapping

- +
o LEFT_EYE_LEFT_VIEWPORT

- +

o LEFT_EYE_RIGHT_VIEWPORT

- -
ovoid setSplitStereoHorizontalEyeMapping(SplitStereoHorizontalEyeMapping m) + +
ovoid setSplitStereoHorizontalEyeMapping(SplitStereoHorizontalEyeMapping m)

- -

oSplitStereoHorizontalEyeMapping getSplitStereoHorizontalEyeMapping() const + +
oSplitStereoHorizontalEyeMapping getSplitStereoHorizontalEyeMapping() const

- -

ovoid setSplitStereoHorizontalSeparation(const int s) + +
ovoid setSplitStereoHorizontalSeparation(int s)

- -

oconst int getSplitStereoHorizontalSeparation() const + +
oint getSplitStereoHorizontalSeparation() const

- +

oenum SplitStereoVerticalEyeMapping

- +
o LEFT_EYE_TOP_VIEWPORT

- +

o LEFT_EYE_BOTTOM_VIEWPORT

- -
ovoid setSplitStereoVerticalEyeMapping(SplitStereoVerticalEyeMapping m) + +
ovoid setSplitStereoVerticalEyeMapping(SplitStereoVerticalEyeMapping m)

- -

oSplitStereoVerticalEyeMapping getSplitStereoVerticalEyeMapping() const + +
oSplitStereoVerticalEyeMapping getSplitStereoVerticalEyeMapping() const

- -

ovoid setSplitStereoVerticalSeparation(const int s) + +
ovoid setSplitStereoVerticalSeparation(int s)

- -

oconst int getSplitStereoVerticalSeparation() const + +
oint getSplitStereoVerticalSeparation() const

- -

ovoid setScreenHeight(const float height) + +
ovoid setScreenHeight(float height)

- -

oconst float getScreenHeight() const + +
ofloat getScreenHeight() const

- -

ovoid setDoubleBuffer(const bool flag) + +
ovoid setDoubleBuffer(bool flag)

- -

oconst bool getDoubleBuffer() const + +
obool getDoubleBuffer() const

- -

ovoid setRGB(const bool flag) + +
ovoid setRGB(bool flag)

- -

oconst bool getRGB() const + +
obool getRGB() const

- -

ovoid setDepthBuffer(const bool flag) + +
ovoid setDepthBuffer(bool flag)

- -

oconst bool getDepthBuffer() const + +
obool getDepthBuffer() const

- -

ovoid setMinimumNumAlphaBits(const unsigned int bits) + +
ovoid setMinimumNumAlphaBits(unsigned int bits)

- -

oconst unsigned int getMinimumNumAlphaBits() const + +
ounsigned int getMinimumNumAlphaBits() const

- -

oconst bool getAlphaBuffer() const + +
obool getAlphaBuffer() const

- -

ovoid setMinimumNumStencilBits(const unsigned int bits) + +
ovoid setMinimumNumStencilBits(unsigned int bits)

- -

oconst unsigned int getMinimumNumStencilBits() const + +
ounsigned int getMinimumNumStencilBits() const

- -

oconst bool getStencilBuffer() const + +
obool getStencilBuffer() const

- -

ovoid setMaxNumberOfGraphicsContexts(const int num) + +
ovoid setMaxNumberOfGraphicsContexts(unsigned int num)

- -

oconst int getMaxNumberOfGraphicsContexts() const + +
ounsigned int getMaxNumberOfGraphicsContexts() const

- +

ovoid copy(const DisplaySettings& vs)

- +

obool _stereo

- -

oStereoMode _stereoMode + +
oStereoMode _stereoMode

- +

ofloat _eyeSeparation

- +

ofloat _screenDistance

- +

ofloat _screenHeight

- -

oSplitStereoHorizontalEyeMapping _splitStereoHorizontalEyeMapping + +
oSplitStereoHorizontalEyeMapping _splitStereoHorizontalEyeMapping

- +

oint _splitStereoHorizontalSeparation

- -

oSplitStereoVerticalEyeMapping _splitStereoVerticalEyeMapping + +
oSplitStereoVerticalEyeMapping _splitStereoVerticalEyeMapping

- +

oint _splitStereoVerticalSeparation

- +

obool _doubleBuffer

- +

obool _RGB

- +

obool _depthBuffer

- +

ounsigned int _minimumNumberAlphaBits

- +

ounsigned int _minimumNumberStencilBits

- -

oint _maxNumOfGraphicsContexts + +
ounsigned int _maxNumOfGraphicsContexts

This class has no child classes.
diff --git a/doc/doc++/osg/DrawArrayLengths.html b/doc/doc++/osg/DrawArrayLengths.html index 284182663..cb2a77c2a 100644 --- a/doc/doc++/osg/DrawArrayLengths.html +++ b/doc/doc++/osg/DrawArrayLengths.html @@ -10,11 +10,11 @@

class SG_EXPORT osg::DrawArrayLengths

Inheritance:

- - - - - + + + + +
@@ -22,48 +22,54 @@

Public Methods

-[more] DrawArrayLengths(GLenum mode=0) +[more] DrawArrayLengths(GLenum mode=0)
-[more] DrawArrayLengths(const DrawArrayLengths& dal, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] DrawArrayLengths(const DrawArrayLengths& dal, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
-[more] DrawArrayLengths(GLenum mode, GLint first, unsigned int no, GLsizei* ptr) +[more] DrawArrayLengths(GLenum mode, GLint first, unsigned int no, GLsizei* ptr)
-[more] DrawArrayLengths(GLenum mode, GLint first, unsigned int no) +[more] DrawArrayLengths(GLenum mode, GLint first, unsigned int no)
-[more]template<class InputIterator> DrawArrayLengths(GLenum mode, GLint first, InputIterator firstItr, InputIterator lastItr) +[more]template<class InputIterator> DrawArrayLengths(GLenum mode, GLint first, InputIterator firstItr, InputIterator lastItr)
-[more]virtual Object* cloneType() const +[more]virtual Object* cloneType() const
-[more]virtual Object* clone(const CopyOp& copyop) const +[more]virtual Object* clone(const CopyOp& copyop) const
-[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
-[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
-[more]virtual const char* className() const +[more]virtual const char* className() const
-[more]void setFirst(GLint first) +[more]void setFirst(GLint first)
-[more]GLint getFirst() const +[more]GLint getFirst() const
-[more]virtual void draw() const +[more]virtual void draw() const
-[more]virtual void accept(Drawable::PrimitiveFunctor& functor) +[more]virtual void accept(Drawable::PrimitiveFunctor& functor) const
-[more]virtual void offsetIndices(int offset) +[more]virtual unsigned int getNumIndices() const +
+[more]virtual unsigned int index(unsigned int pos) const +
+[more]virtual void offsetIndices(int offset) +
+[more]virtual unsigned int getNumPrimitives() const

Protected Fields

-[more]GLint _first +[more]GLint _first

-

Inherited from Primitive:

+

Inherited from PrimitiveSet:

Public Methods

-oType getType() const +oType getType() const
ovoid setMode(GLenum mode)
@@ -79,7 +85,7 @@

Protected Fields

-oType _primitiveType +oType _primitiveType
oGLenum _mode

@@ -89,9 +95,9 @@

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -107,7 +113,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -125,17 +131,22 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

-
-

Inherited from VectorSizei:

-
@@ -144,67 +155,79 @@
- +
o DrawArrayLengths(GLenum mode=0)

- -

o DrawArrayLengths(const DrawArrayLengths& dal, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o DrawArrayLengths(const DrawArrayLengths& dal, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

- -

o DrawArrayLengths(GLenum mode, GLint first, unsigned int no, GLsizei* ptr) + +
o DrawArrayLengths(GLenum mode, GLint first, unsigned int no, GLsizei* ptr)

- -

o DrawArrayLengths(GLenum mode, GLint first, unsigned int no) + +
o DrawArrayLengths(GLenum mode, GLint first, unsigned int no)

- -

otemplate<class InputIterator> DrawArrayLengths(GLenum mode, GLint first, InputIterator firstItr, InputIterator lastItr) + +
otemplate<class InputIterator> DrawArrayLengths(GLenum mode, GLint first, InputIterator firstItr, InputIterator lastItr)

- +

ovirtual Object* cloneType() const

- +

ovirtual Object* clone(const CopyOp& copyop) const

- +

ovirtual bool isSameKindAs(const Object* obj) const

- +

ovirtual const char* libraryName() const

- +

ovirtual const char* className() const

- -

ovoid setFirst(GLint first) + +
ovoid setFirst(GLint first)

- +

oGLint getFirst() const

- +

ovirtual void draw() const

- -

ovirtual void accept(Drawable::PrimitiveFunctor& functor) + +
ovirtual void accept(Drawable::PrimitiveFunctor& functor) const +

+ + +

ovirtual unsigned int getNumIndices() const +

+ + +

ovirtual unsigned int index(unsigned int pos) const

- +

ovirtual void offsetIndices(int offset)

+ + +

ovirtual unsigned int getNumPrimitives() const +

- +

oGLint _first

diff --git a/doc/doc++/osg/DrawArrays.html b/doc/doc++/osg/DrawArrays.html index a7c038ea6..68030ed61 100644 --- a/doc/doc++/osg/DrawArrays.html +++ b/doc/doc++/osg/DrawArrays.html @@ -11,7 +11,7 @@

Inheritance:

- + @@ -22,56 +22,62 @@

Public Methods

-[more] DrawArrays(GLenum mode=0) +[more] DrawArrays(GLenum mode=0)
-[more] DrawArrays(GLenum mode, GLint first, GLsizei count) +[more] DrawArrays(GLenum mode, GLint first, GLsizei count)
-[more] DrawArrays(const DrawArrays& da, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] DrawArrays(const DrawArrays& da, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
-[more]virtual Object* cloneType() const +[more]virtual Object* cloneType() const
-[more]virtual Object* clone(const CopyOp& copyop) const +[more]virtual Object* clone(const CopyOp& copyop) const
-[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
-[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
-[more]virtual const char* className() const +[more]virtual const char* className() const
-[more]void set(GLenum mode, GLint first, GLsizei count) +[more]void set(GLenum mode, GLint first, GLsizei count)
-[more]void setFirst(GLint first) +[more]void setFirst(GLint first)
-[more]GLint getFirst() const +[more]GLint getFirst() const
-[more]void setCount(GLsizei count) +[more]void setCount(GLsizei count)
-[more]GLsizei getCount() const +[more]GLsizei getCount() const
-[more]virtual void draw() const +[more]virtual void draw() const
-[more]virtual void accept(Drawable::PrimitiveFunctor& functor) +[more]virtual void accept(Drawable::PrimitiveFunctor& functor) const
-[more]virtual void offsetIndices(int offset) +[more]virtual unsigned int getNumIndices() const +
+[more]virtual unsigned int index(unsigned int pos) const +
+[more]virtual void offsetIndices(int offset)

Protected Fields

-[more]GLint _first +[more]GLint _first
-[more]GLsizei _count +[more]GLsizei _count

-

Inherited from Primitive:

+

Inherited from PrimitiveSet:

Public Methods

-oType getType() const +oType getType() const
ovoid setMode(GLenum mode)
oGLenum getMode() const +
+ovirtual unsigned int getNumPrimitives() const

@@ -83,7 +89,7 @@

Protected Fields

-oType _primitiveType +oType _primitiveType
oGLenum _mode

@@ -93,9 +99,9 @@

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -111,7 +117,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -129,12 +135,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -145,75 +159,83 @@
- +
o DrawArrays(GLenum mode=0)

- -

o DrawArrays(GLenum mode, GLint first, GLsizei count) + +
o DrawArrays(GLenum mode, GLint first, GLsizei count)

- -

o DrawArrays(const DrawArrays& da, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o DrawArrays(const DrawArrays& da, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

- +

ovirtual Object* cloneType() const

- +

ovirtual Object* clone(const CopyOp& copyop) const

- +

ovirtual bool isSameKindAs(const Object* obj) const

- +

ovirtual const char* libraryName() const

- +

ovirtual const char* className() const

- -

ovoid set(GLenum mode, GLint first, GLsizei count) + +
ovoid set(GLenum mode, GLint first, GLsizei count)

- -

ovoid setFirst(GLint first) + +
ovoid setFirst(GLint first)

- +

oGLint getFirst() const

- +

ovoid setCount(GLsizei count)

- +

oGLsizei getCount() const

- +

ovirtual void draw() const

- -

ovirtual void accept(Drawable::PrimitiveFunctor& functor) + +
ovirtual void accept(Drawable::PrimitiveFunctor& functor) const +

+ + +

ovirtual unsigned int getNumIndices() const +

+ + +

ovirtual unsigned int index(unsigned int pos) const

- +

ovirtual void offsetIndices(int offset)

- +

oGLint _first

- +

oGLsizei _count

diff --git a/doc/doc++/osg/DrawElementsUByte.html b/doc/doc++/osg/DrawElementsUByte.html index 460e55680..e348ff149 100644 --- a/doc/doc++/osg/DrawElementsUByte.html +++ b/doc/doc++/osg/DrawElementsUByte.html @@ -10,11 +10,11 @@

class SG_EXPORT osg::DrawElementsUByte

Inheritance:

- - - - - + + + + +
@@ -22,43 +22,49 @@

Public Methods

-[more] DrawElementsUByte(GLenum mode=0) +[more] DrawElementsUByte(GLenum mode=0)
-[more] DrawElementsUByte(const DrawElementsUByte& array, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] DrawElementsUByte(const DrawElementsUByte& array, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
-[more] DrawElementsUByte(GLenum mode, unsigned int no, GLubyte* ptr) +[more] DrawElementsUByte(GLenum mode, unsigned int no, GLubyte* ptr)
-[more] DrawElementsUByte(GLenum mode, unsigned int no) +[more] DrawElementsUByte(GLenum mode, unsigned int no)
-[more]template<class InputIterator> DrawElementsUByte(GLenum mode, InputIterator first, InputIterator last) +[more]template<class InputIterator> DrawElementsUByte(GLenum mode, InputIterator first, InputIterator last)
-[more]virtual Object* cloneType() const +[more]virtual Object* cloneType() const
-[more]virtual Object* clone(const CopyOp& copyop) const +[more]virtual Object* clone(const CopyOp& copyop) const
-[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
-[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
-[more]virtual const char* className() const +[more]virtual const char* className() const
-[more]virtual void draw() const +[more]virtual void draw() const
-[more]virtual void accept(Drawable::PrimitiveFunctor& functor) +[more]virtual void accept(Drawable::PrimitiveFunctor& functor) const
-[more]virtual void offsetIndices(int offset) +[more]virtual unsigned int getNumIndices() const +
+[more]virtual unsigned int index(unsigned int pos) const +
+[more]virtual void offsetIndices(int offset)

-

Inherited from Primitive:

+

Inherited from PrimitiveSet:

Public Methods

-oType getType() const +oType getType() const
ovoid setMode(GLenum mode)
oGLenum getMode() const +
+ovirtual unsigned int getNumPrimitives() const

@@ -70,7 +76,7 @@

Protected Fields

-oType _primitiveType +oType _primitiveType
oGLenum _mode

@@ -80,9 +86,9 @@

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -98,7 +104,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -116,17 +122,22 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

-
-

Inherited from VectorUByte:

-
@@ -135,55 +146,63 @@
- +
o DrawElementsUByte(GLenum mode=0)

- -

o DrawElementsUByte(const DrawElementsUByte& array, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o DrawElementsUByte(const DrawElementsUByte& array, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

- -

o DrawElementsUByte(GLenum mode, unsigned int no, GLubyte* ptr) + +
o DrawElementsUByte(GLenum mode, unsigned int no, GLubyte* ptr)

- +

o DrawElementsUByte(GLenum mode, unsigned int no)

- -

otemplate<class InputIterator> DrawElementsUByte(GLenum mode, InputIterator first, InputIterator last) + +
otemplate<class InputIterator> DrawElementsUByte(GLenum mode, InputIterator first, InputIterator last)

- +

ovirtual Object* cloneType() const

- +

ovirtual Object* clone(const CopyOp& copyop) const

- +

ovirtual bool isSameKindAs(const Object* obj) const

- +

ovirtual const char* libraryName() const

- +

ovirtual const char* className() const

- +

ovirtual void draw() const

- -

ovirtual void accept(Drawable::PrimitiveFunctor& functor) + +
ovirtual void accept(Drawable::PrimitiveFunctor& functor) const +

+ + +

ovirtual unsigned int getNumIndices() const +

+ + +

ovirtual unsigned int index(unsigned int pos) const

- +

ovirtual void offsetIndices(int offset)

diff --git a/doc/doc++/osg/DrawElementsUInt.html b/doc/doc++/osg/DrawElementsUInt.html index 9b9af08e6..51f7d35e5 100644 --- a/doc/doc++/osg/DrawElementsUInt.html +++ b/doc/doc++/osg/DrawElementsUInt.html @@ -10,11 +10,11 @@

class SG_EXPORT osg::DrawElementsUInt

Inheritance:

- - - - - + + + + +
@@ -22,43 +22,49 @@

Public Methods

-[more] DrawElementsUInt(GLenum mode=0) +[more] DrawElementsUInt(GLenum mode=0)
-[more] DrawElementsUInt(const DrawElementsUInt& array, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] DrawElementsUInt(const DrawElementsUInt& array, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
-[more] DrawElementsUInt(GLenum mode, unsigned int no, GLuint* ptr) +[more] DrawElementsUInt(GLenum mode, unsigned int no, GLuint* ptr)
-[more] DrawElementsUInt(GLenum mode, unsigned int no) +[more] DrawElementsUInt(GLenum mode, unsigned int no)
-[more]template<class InputIterator> DrawElementsUInt(GLenum mode, InputIterator first, InputIterator last) +[more]template<class InputIterator> DrawElementsUInt(GLenum mode, InputIterator first, InputIterator last)
-[more]virtual Object* cloneType() const +[more]virtual Object* cloneType() const
-[more]virtual Object* clone(const CopyOp& copyop) const +[more]virtual Object* clone(const CopyOp& copyop) const
-[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
-[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
-[more]virtual const char* className() const +[more]virtual const char* className() const
-[more]virtual void draw() const +[more]virtual void draw() const
-[more]virtual void accept(Drawable::PrimitiveFunctor& functor) +[more]virtual void accept(Drawable::PrimitiveFunctor& functor) const
-[more]virtual void offsetIndices(int offset) +[more]virtual unsigned int getNumIndices() const +
+[more]virtual unsigned int index(unsigned int pos) const +
+[more]virtual void offsetIndices(int offset)

-

Inherited from Primitive:

+

Inherited from PrimitiveSet:

Public Methods

-oType getType() const +oType getType() const
ovoid setMode(GLenum mode)
oGLenum getMode() const +
+ovirtual unsigned int getNumPrimitives() const

@@ -70,7 +76,7 @@

Protected Fields

-oType _primitiveType +oType _primitiveType
oGLenum _mode

@@ -80,9 +86,9 @@

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -98,7 +104,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -116,17 +122,22 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

-
-

Inherited from VectorUInt:

-
@@ -135,55 +146,63 @@
- +
o DrawElementsUInt(GLenum mode=0)

- -

o DrawElementsUInt(const DrawElementsUInt& array, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o DrawElementsUInt(const DrawElementsUInt& array, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

- -

o DrawElementsUInt(GLenum mode, unsigned int no, GLuint* ptr) + +
o DrawElementsUInt(GLenum mode, unsigned int no, GLuint* ptr)

- +

o DrawElementsUInt(GLenum mode, unsigned int no)

- -

otemplate<class InputIterator> DrawElementsUInt(GLenum mode, InputIterator first, InputIterator last) + +
otemplate<class InputIterator> DrawElementsUInt(GLenum mode, InputIterator first, InputIterator last)

- +

ovirtual Object* cloneType() const

- +

ovirtual Object* clone(const CopyOp& copyop) const

- +

ovirtual bool isSameKindAs(const Object* obj) const

- +

ovirtual const char* libraryName() const

- +

ovirtual const char* className() const

- +

ovirtual void draw() const

- -

ovirtual void accept(Drawable::PrimitiveFunctor& functor) + +
ovirtual void accept(Drawable::PrimitiveFunctor& functor) const +

+ + +

ovirtual unsigned int getNumIndices() const +

+ + +

ovirtual unsigned int index(unsigned int pos) const

- +

ovirtual void offsetIndices(int offset)

diff --git a/doc/doc++/osg/DrawElementsUShort.html b/doc/doc++/osg/DrawElementsUShort.html index 390e54406..36ca2cb1a 100644 --- a/doc/doc++/osg/DrawElementsUShort.html +++ b/doc/doc++/osg/DrawElementsUShort.html @@ -10,11 +10,11 @@

class SG_EXPORT osg::DrawElementsUShort

Inheritance:

- - - - - + + + + +
@@ -22,43 +22,49 @@

Public Methods

-[more] DrawElementsUShort(GLenum mode=0) +[more] DrawElementsUShort(GLenum mode=0)
-[more] DrawElementsUShort(const DrawElementsUShort& array, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] DrawElementsUShort(const DrawElementsUShort& array, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
-[more] DrawElementsUShort(GLenum mode, unsigned int no, GLushort* ptr) +[more] DrawElementsUShort(GLenum mode, unsigned int no, GLushort* ptr)
-[more] DrawElementsUShort(GLenum mode, unsigned int no) +[more] DrawElementsUShort(GLenum mode, unsigned int no)
-[more]template<class InputIterator> DrawElementsUShort(GLenum mode, InputIterator first, InputIterator last) +[more]template<class InputIterator> DrawElementsUShort(GLenum mode, InputIterator first, InputIterator last)
-[more]virtual Object* cloneType() const +[more]virtual Object* cloneType() const
-[more]virtual Object* clone(const CopyOp& copyop) const +[more]virtual Object* clone(const CopyOp& copyop) const
-[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
-[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
-[more]virtual const char* className() const +[more]virtual const char* className() const
-[more]virtual void draw() const +[more]virtual void draw() const
-[more]virtual void accept(Drawable::PrimitiveFunctor& functor) +[more]virtual void accept(Drawable::PrimitiveFunctor& functor) const
-[more]virtual void offsetIndices(int offset) +[more]virtual unsigned int getNumIndices() const +
+[more]virtual unsigned int index(unsigned int pos) const +
+[more]virtual void offsetIndices(int offset)

-

Inherited from Primitive:

+

Inherited from PrimitiveSet:

Public Methods

-oType getType() const +oType getType() const
ovoid setMode(GLenum mode)
oGLenum getMode() const +
+ovirtual unsigned int getNumPrimitives() const

@@ -70,7 +76,7 @@

Protected Fields

-oType _primitiveType +oType _primitiveType
oGLenum _mode

@@ -80,9 +86,9 @@

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -98,7 +104,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -116,17 +122,22 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

-
-

Inherited from VectorUShort:

-
@@ -135,55 +146,63 @@
- +
o DrawElementsUShort(GLenum mode=0)

- -

o DrawElementsUShort(const DrawElementsUShort& array, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o DrawElementsUShort(const DrawElementsUShort& array, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

- -

o DrawElementsUShort(GLenum mode, unsigned int no, GLushort* ptr) + +
o DrawElementsUShort(GLenum mode, unsigned int no, GLushort* ptr)

- +

o DrawElementsUShort(GLenum mode, unsigned int no)

- -

otemplate<class InputIterator> DrawElementsUShort(GLenum mode, InputIterator first, InputIterator last) + +
otemplate<class InputIterator> DrawElementsUShort(GLenum mode, InputIterator first, InputIterator last)

- +

ovirtual Object* cloneType() const

- +

ovirtual Object* clone(const CopyOp& copyop) const

- +

ovirtual bool isSameKindAs(const Object* obj) const

- +

ovirtual const char* libraryName() const

- +

ovirtual const char* className() const

- +

ovirtual void draw() const

- -

ovirtual void accept(Drawable::PrimitiveFunctor& functor) + +
ovirtual void accept(Drawable::PrimitiveFunctor& functor) const +

+ + +

ovirtual unsigned int getNumIndices() const +

+ + +

ovirtual unsigned int index(unsigned int pos) const

- +

ovirtual void offsetIndices(int offset)

diff --git a/doc/doc++/osg/DrawPixels.html b/doc/doc++/osg/DrawPixels.html index 9bb1d94e3..48f806677 100644 --- a/doc/doc++/osg/DrawPixels.html +++ b/doc/doc++/osg/DrawPixels.html @@ -23,68 +23,68 @@

Public Methods

-[more] DrawPixels() +[more] DrawPixels()
-[more] DrawPixels(const DrawPixels& drawimage, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] DrawPixels(const DrawPixels& drawimage, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy
-[more]virtual Object* cloneType() const +[more]virtual Object* cloneType() const
-[more]virtual Object* clone(const CopyOp& copyop) const +[more]virtual Object* clone(const CopyOp& copyop) const
-[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
-[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
-[more]virtual const char* className() const +[more]virtual const char* className() const
-[more]void setPosition(const osg::Vec3& position) +[more]void setPosition(const osg::Vec3& position)
-[more]osg::Vec3& getPosition() +[more]osg::Vec3& getPosition()
-[more]const osg::Vec3& getPosition() const +[more]const osg::Vec3& getPosition() const
-[more]void setImage(osg::Image* image) +[more]void setImage(osg::Image* image)
-[more]osg::Image* getImage() +[more]osg::Image* getImage()
-[more]const osg::Image* getImage() const +[more]const osg::Image* getImage() const
-[more]void setUseCompleteImage() +[more]void setUseCompleteImage()
-[more]void setSubImageDimensions(unsigned int offsetX, unsigned int offsetY, unsigned int width, unsigned int height) +[more]void setSubImageDimensions(unsigned int offsetX, unsigned int offsetY, unsigned int width, unsigned int height)
-[more]void getSubImageDimensions(unsigned int& offsetX, unsigned int& offsetY, unsigned int& width, unsigned int& height) const +[more]void getSubImageDimensions(unsigned int& offsetX, unsigned int& offsetY, unsigned int& width, unsigned int& height) const
-[more]const bool getUseSubImage() const +[more]bool getUseSubImage() const
-[more]virtual void drawImmediateMode(State& state) +[more]virtual void drawImplementation(State& state) const

Protected Fields

-[more]Vec3 _position +[more]Vec3 _position
-[more]ref_ptr<Image> _image +[more]ref_ptr<Image> _image
-[more]bool _useSubImage +[more]bool _useSubImage
-[more]unsigned int _offsetX +[more]unsigned int _offsetX
-[more]unsigned int _offsetY +[more]unsigned int _offsetY
-[more]unsigned int _width +[more]unsigned int _width
-[more]unsigned int _height +[more]unsigned int _height

Protected Methods

-[more]DrawPixels& operator = (const DrawPixels&) +[more]DrawPixels& operator = (const DrawPixels&)
-[more]virtual ~DrawPixels() +[more]virtual ~DrawPixels()
-[more]virtual const bool computeBound() const +[more]virtual bool computeBound() const

@@ -92,15 +92,19 @@

Public Methods

-oinline const ParentList& getParents() const +ovirtual Geometry* asGeometry()
-oinline ParentList getParents() +ovirtual const Geometry* asGeometry() const
-oinline Node* getParent(const unsigned int i) +oinline const ParentList& getParents() const
-oinline const Node* getParent(const unsigned int i) const +oinline ParentList getParents()
-oinline const unsigned int getNumParents() const +oinline Node* getParent(unsigned int i) +
+oinline const Node* getParent(unsigned int i) const +
+oinline unsigned int getNumParents() const
oinline void setStateSet(StateSet* state)
@@ -108,47 +112,63 @@
oinline const StateSet* getStateSet() const
-ovoid setSupportsDisplayList(const bool flag) -
-oinline const bool getSupportsDisplayList() const -
-ovoid setUseDisplayList(const bool flag) -
-oinline const bool getUseDisplayList() const -
-ovoid dirtyDisplayList() +oStateSet* getOrCreateStateSet()
ovoid dirtyBound()
oinline const BoundingBox& getBound() const
+oinline void setShape(Shape* shape) +
+oinline Shape* getShape() +
+oinline const Shape* getShape() const +
+ovoid setSupportsDisplayList(bool flag) +
+oinline bool getSupportsDisplayList() const +
+ovoid setUseDisplayList(bool flag) +
+oinline bool getUseDisplayList() const +
+ovoid dirtyDisplayList() +
ovoid compile(State& state)
-ovoid setAppCallback(AppCallback* ac) +ovoid setAppCallback(AppCallback* ac)
-oAppCallback* getAppCallback() +oAppCallback* getAppCallback()
-oconst AppCallback* getAppCallback() const +oconst AppCallback* getAppCallback() const
-ovoid setCullCallback(CullCallback* cc) +ovoid setCullCallback(CullCallback* cc)
-oCullCallback* getCullCallback() +oCullCallback* getCullCallback()
-oconst CullCallback* getCullCallback() const +oconst CullCallback* getCullCallback() const
-ovoid setDrawCallback(DrawCallback* dc) +ovoid setDrawCallback(DrawCallback* dc)
-oDrawCallback* getDrawCallback() +oDrawCallback* getDrawCallback()
-oconst DrawCallback* getDrawCallback() const +oconst DrawCallback* getDrawCallback() const
-ostatic void deleteDisplayList(uint contextID, uint globj) +ostatic void deleteDisplayList(uint contextID, uint globj)
-ostatic void flushDeletedDisplayLists(uint contextID) +ostatic void flushDeletedDisplayLists(uint contextID) +
+ovirtual bool supports(AttributeFunctor&) const
ovirtual void accept(AttributeFunctor&)
-ovirtual void accept(PrimitiveFunctor&) +ovirtual bool supports(ConstAttributeFunctor&) const +
+ovirtual void accept(ConstAttributeFunctor&) const +
+ovirtual bool supports(PrimitiveFunctor&) const +
+ovirtual void accept(PrimitiveFunctor&) const
oinline void draw(State& state)

@@ -167,28 +187,36 @@
class AttributeFunctor
+class ConstAttributeFunctor +
class PrimitiveFunctor

Protected Fields

-oParentList _parents +oParentList _parents
-oref_ptr<StateSet> _dstate -
-obool _supportsDisplayList -
-obool _useDisplayList +oref_ptr<StateSet> _stateset
omutable BoundingBox _bbox
omutable bool _bbox_computed
-oref_ptr<AppCallback> _appCallback +oref_ptr<Shape> _shape
-oref_ptr<DrawCallback> _drawCallback +obool _supportsDisplayList
-oref_ptr<CullCallback> _cullCallback +obool _useDisplayList +
+omutable GLObjectList _globjList +
+oref_ptr<AppCallback> _appCallback +
+oref_ptr<DrawCallback> _drawCallback +
+oref_ptr<CullCallback> _cullCallback +
+ostatic DeletedDisplayListCache s_deletedDisplayListCache

@@ -200,9 +228,9 @@ class PrimitiveFunctor

Protected Members

-otypedef std::vector<uint> GLObjectList mutable GLObjectList _globjList +otypedef std::vector<uint> GLObjectList
-otypedef std::map<uint,std::set<uint> >static DeletedDisplayListCache DeletedDisplayListCache s_deletedDisplayListCache +otypedef std::map<uint,std::set<uint> > DeletedDisplayListCache

@@ -210,9 +238,9 @@ class PrimitiveFunctor

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -228,7 +256,7 @@ class PrimitiveFunctor

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -244,12 +272,20 @@ class PrimitiveFunctor
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -262,116 +298,116 @@ images using glDrawPixels
- +
o DrawPixels()

- -

o DrawPixels(const DrawPixels& drawimage, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o DrawPixels(const DrawPixels& drawimage, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy

- +

ovirtual Object* cloneType() const

- +

ovirtual Object* clone(const CopyOp& copyop) const

- +

ovirtual bool isSameKindAs(const Object* obj) const

- +

ovirtual const char* libraryName() const

- +

ovirtual const char* className() const

- +

ovoid setPosition(const osg::Vec3& position)

- +

oosg::Vec3& getPosition()

- +

oconst osg::Vec3& getPosition() const

- +

ovoid setImage(osg::Image* image)

- +

oosg::Image* getImage()

- +

oconst osg::Image* getImage() const

- +

ovoid setUseCompleteImage()

- -

ovoid setSubImageDimensions(unsigned int offsetX, unsigned int offsetY, unsigned int width, unsigned int height) + +
ovoid setSubImageDimensions(unsigned int offsetX, unsigned int offsetY, unsigned int width, unsigned int height)

- -

ovoid getSubImageDimensions(unsigned int& offsetX, unsigned int& offsetY, unsigned int& width, unsigned int& height) const + +
ovoid getSubImageDimensions(unsigned int& offsetX, unsigned int& offsetY, unsigned int& width, unsigned int& height) const

- -

oconst bool getUseSubImage() const + +
obool getUseSubImage() const

- - -

ovirtual void drawImmediateMode(State& state) + + +
ovirtual void drawImplementation(State& state) const

- +

oDrawPixels& operator = (const DrawPixels&)

- +

ovirtual ~DrawPixels()

- -

ovirtual const bool computeBound() const + +
ovirtual bool computeBound() const

- +

oVec3 _position

- +

oref_ptr<Image> _image

- +

obool _useSubImage

- +

ounsigned int _offsetX

- +

ounsigned int _offsetY

- +

ounsigned int _width

- +

ounsigned int _height

diff --git a/doc/doc++/osg/Drawable.html b/doc/doc++/osg/Drawable.html index e09aa652f..2a8318d64 100644 --- a/doc/doc++/osg/Drawable.html +++ b/doc/doc++/osg/Drawable.html @@ -11,11 +11,11 @@

Inheritance:

- - - - - + + + + +
@@ -23,170 +23,208 @@

Public Methods

-[more] Drawable() +[more] Drawable()
-[more] Drawable(const Drawable& drawable, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Drawable(const Drawable& drawable, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy
-[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
-[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
-[more]virtual const char* className() const +[more]virtual const char* className() const
-[more]inline const ParentList& getParents() const +[more]virtual Geometry* asGeometry() +
convert 'this' into a Geometry pointer if Drawable is a Geometry, otherwise return 0. +
+[more]virtual const Geometry* asGeometry() const +
convert 'const this' into a const Geometry pointer if Drawable is a Geometry, otherwise return 0. +
+[more]inline const ParentList& getParents() const
Get the parent list of drawable.
-[more]inline ParentList getParents() +[more]inline ParentList getParents()
Get the a copy of parent list of node.
-[more]inline Node* getParent(const unsigned int i) +[more]inline Node* getParent(unsigned int i)
Get a single parent of Drawable.
-[more]inline const Node* getParent(const unsigned int i) const +[more]inline const Node* getParent(unsigned int i) const
Get a single const parent of Drawable.
-[more]inline const unsigned int getNumParents() const +[more]inline unsigned int getNumParents() const
Get the number of parents of node.
-[more]inline void setStateSet(StateSet* state) +[more]inline void setStateSet(StateSet* state)
Set the StateSet attached to the Drawable.
-[more]inline StateSet* getStateSet() +[more]inline StateSet* getStateSet()
Get the attached StateSet
-[more]inline const StateSet* getStateSet() const +[more]inline const StateSet* getStateSet() const
Get the attached const StateSet
-[more]void setSupportsDisplayList(const bool flag) -
Set the drawable to it can or cannot be used in conjunction with OpenGL display lists. +[more]StateSet* getOrCreateStateSet() +
Get the attached const StateSet, if one is not already attach create one, attach it to the drawable and return a pointer to it
-[more]inline const bool getSupportsDisplayList() const -
Get whether display lists are supported for this drawable instance -
-[more]void setUseDisplayList(const bool flag) -
When set to true, force the draw method to use OpenGL Display List for rendering. -
-[more]inline const bool getUseDisplayList() const -
Return whether OpenGL display lists are being used for rendering -
-[more]void dirtyDisplayList() -
Force a recompile on next draw() of any OpenGL display list associated with this geoset -
-[more]void dirtyBound() +[more]void dirtyBound()
Dirty the bounding box, forcing a computeBound() on the next call to getBound().
-[more]inline const BoundingBox& getBound() const +[more]inline const BoundingBox& getBound() const
get bounding box of geoset.
-[more]void compile(State& state) +[more]inline void setShape(Shape* shape) +
Set the Shape of the drawable. +
+[more]inline Shape* getShape() +
Get the Shape of the Drawable +
+[more]inline const Shape* getShape() const +
Get the const Shape of the const Drawable +
+[more]void setSupportsDisplayList(bool flag) +
Set the drawable to it can or cannot be used in conjunction with OpenGL display lists. +
+[more]inline bool getSupportsDisplayList() const +
Get whether display lists are supported for this drawable instance +
+[more]void setUseDisplayList(bool flag) +
When set to true, force the draw method to use OpenGL Display List for rendering. +
+[more]inline bool getUseDisplayList() const +
Return whether OpenGL display lists are being used for rendering +
+[more]void dirtyDisplayList() +
Force a recompile on next draw() of any OpenGL display list associated with this geoset +
+[more]void compile(State& state)
Immediately compile this drawable into an OpenGL Display List.
-[more]void setAppCallback(AppCallback* ac) +[more]void setAppCallback(AppCallback* ac)
Set the AppCallback which allows users to attach customize the undating of an object during the app traversal
-[more]AppCallback* getAppCallback() +[more]AppCallback* getAppCallback()
Get the non const AppCallback
-[more]const AppCallback* getAppCallback() const +[more]const AppCallback* getAppCallback() const
Get the const AppCallback
-[more]void setCullCallback(CullCallback* cc) +[more]void setCullCallback(CullCallback* cc)
Set the CullCallback which allows users to attach customize the culling of Drawable during the cull traversal
-[more]CullCallback* getCullCallback() +[more]CullCallback* getCullCallback()
Get the non const CullCallback
-[more]const CullCallback* getCullCallback() const +[more]const CullCallback* getCullCallback() const
Get the const CullCallback
-[more]void setDrawCallback(DrawCallback* dc) +[more]void setDrawCallback(DrawCallback* dc)
Set the DrawCallback which allows users to attach customize the drawing of existing Drawable object
-[more]DrawCallback* getDrawCallback() +[more]DrawCallback* getDrawCallback()
Get the non const DrawCallback
-[more]const DrawCallback* getDrawCallback() const +[more]const DrawCallback* getDrawCallback() const
Get the const DrawCallback
-[more]virtual void drawImmediateMode(State& state) = 0 +[more]virtual void drawImplementation(State& state) const = 0
draw directly ignoring an OpenGL display list which could be attached.
-[more]static void deleteDisplayList(uint contextID, uint globj) +[more]static void deleteDisplayList(uint contextID, uint globj)
use deleteDisplayList instead of glDeleteList to allow OpenGL display list to cached until they can be deleted by the OpenGL context in which they were created, specified by contextID
-[more]static void flushDeletedDisplayLists(uint contextID) +[more]static void flushDeletedDisplayLists(uint contextID)
flush all the cached display list which need to be deleted in the OpenGL context related to contextID
-[more]virtual void accept(AttributeFunctor&) -
accept an AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has +[more]virtual bool supports(AttributeFunctor&) const +
return true if the Drawable subclass supports accept(AttributeFunctor&)
-[more]virtual void accept(PrimitiveFunctor&) -
accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has +[more]virtual void accept(AttributeFunctor&) +
accept an AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has.
-[more]inline void draw(State& state) +[more]virtual bool supports(ConstAttributeFunctor&) const +
return true if the Drawable subclass supports accept(ConstAttributeFunctor&) +
+[more]virtual void accept(ConstAttributeFunctor&) const +
accept an AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. +
+[more]virtual bool supports(PrimitiveFunctor&) const +
return true if the Drawable subclass supports accept(PrimitiveFunctor&) +
+[more]virtual void accept(PrimitiveFunctor&) const +
accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has. +
+[more]inline void draw(State& state)
draw OpenGL primitives.

Public Members

-[more]typedef std::vector<Node*> ParentList +[more]typedef std::vector<Node*> ParentList
A vector of osg::Node pointers which is used to store the parent(s) of drawable
-[more]struct AppCallback: public osg::Referenced +[more]struct AppCallback: public osg::Referenced
-[more]struct CullCallback: public osg::Referenced +[more]struct CullCallback: public osg::Referenced
-[more]struct DrawCallback: public osg::Referenced +[more]struct DrawCallback: public osg::Referenced
Callback attached to an Drawable which allows the users to customize the drawing of an exist Drawable object.
-[more]enum AttributeType +[more]enum AttributeType
class AttributeFunctor
+class ConstAttributeFunctor +
class PrimitiveFunctor

Protected Fields

-[more]ParentList _parents +[more]ParentList _parents
-[more]ref_ptr<StateSet> _dstate +[more]ref_ptr<StateSet> _stateset
-[more]bool _supportsDisplayList +[more]mutable BoundingBox _bbox
-[more]bool _useDisplayList +[more]mutable bool _bbox_computed
-[more]mutable BoundingBox _bbox +[more]ref_ptr<Shape> _shape
-[more]mutable bool _bbox_computed +[more]bool _supportsDisplayList
-[more]ref_ptr<AppCallback> _appCallback +[more]bool _useDisplayList
-[more]ref_ptr<DrawCallback> _drawCallback +[more]mutable GLObjectList _globjList
-[more]ref_ptr<CullCallback> _cullCallback +[more]ref_ptr<AppCallback> _appCallback +
+[more]ref_ptr<DrawCallback> _drawCallback +
+[more]ref_ptr<CullCallback> _cullCallback +
+[more]static DeletedDisplayListCache s_deletedDisplayListCache

Protected Methods

-[more]Drawable& operator = (const Drawable&) +[more]Drawable& operator = (const Drawable&)
-[more]virtual ~Drawable() +[more]virtual ~Drawable()
-[more]virtual const bool computeBound() const +[more]virtual bool computeBound() const
compute the bounding box of the drawable.
-[more]void addParent(osg::Node* node) +[more]void addParent(osg::Node* node)
-[more]void removeParent(osg::Node* node) +[more]void removeParent(osg::Node* node)

Protected Members

-[more]typedef std::vector<uint> GLObjectList mutable GLObjectList _globjList +[more]typedef std::vector<uint> GLObjectList
-[more]typedef std::map<uint,std::set<uint> >static DeletedDisplayListCache DeletedDisplayListCache s_deletedDisplayListCache +[more]typedef std::map<uint,std::set<uint> > DeletedDisplayListCache

@@ -198,9 +236,9 @@ class PrimitiveFunctor
ovirtual Object* clone(const CopyOp&) const
-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -216,7 +254,7 @@ class PrimitiveFunctor

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -232,12 +270,20 @@ class PrimitiveFunctor
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -253,83 +299,133 @@ be shared for optimal memory usage and graphics performance.
- +
o Drawable()

- -

o Drawable(const Drawable& drawable, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o Drawable(const Drawable& drawable, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy

- +

ovirtual bool isSameKindAs(const Object* obj) const

- +

ovirtual const char* libraryName() const

- +

ovirtual const char* className() const

+ + +

ovirtual Geometry* asGeometry() +
convert 'this' into a Geometry pointer if Drawable is a Geometry, otherwise return 0. +Equivalent to dynamic_cast(this). +

+ + +

ovirtual const Geometry* asGeometry() const +
convert 'const this' into a const Geometry pointer if Drawable is a Geometry, otherwise return 0. +Equivalent to dynamic_cast(this). +

- +

otypedef std::vector<Node*> ParentList
A vector of osg::Node pointers which is used to store the parent(s) of drawable

- -

oinline const ParentList& getParents() const + +
oinline const ParentList& getParents() const
Get the parent list of drawable.

- -

oinline ParentList getParents() + +
oinline ParentList getParents()
Get the a copy of parent list of node. A copy is returned to prevent modification of the parent list.

- -

oinline Node* getParent(const unsigned int i) + +
oinline Node* getParent(unsigned int i)
Get a single parent of Drawable. -
Parameters:
i - index of the parent to get. +
Parameters:
i - index of the parent to get.
Returns:
the parent i.

- -

oinline const Node* getParent(const unsigned int i) const + +
oinline const Node* getParent(unsigned int i) const
Get a single const parent of Drawable. -
Parameters:
i - index of the parent to get. +
Parameters:
i - index of the parent to get.
Returns:
the parent i.

- -

oinline const unsigned int getNumParents() const + +
oinline unsigned int getNumParents() const
Get the number of parents of node.
Returns:
the number of parents of this node.

- +

oinline void setStateSet(StateSet* state)
Set the StateSet attached to the Drawable. Previously attached StateSet are automatically unreferenced on assignment of a new drawstate.

- +

oinline StateSet* getStateSet()
Get the attached StateSet

- +

oinline const StateSet* getStateSet() const
Get the attached const StateSet

+ + +

oStateSet* getOrCreateStateSet() +
Get the attached const StateSet, +if one is not already attach create one, +attach it to the drawable and return a pointer to it +

+ + +

ovoid dirtyBound() +
Dirty the bounding box, forcing a computeBound() on the next call +to getBound(). Should be called in the internal geometry of the Drawable +is modified. +

+ + +

oinline const BoundingBox& getBound() const +
get bounding box of geoset. +Note, now made virtual to make it possible to implement user-drawn +objects albeit so what crudely, to be improved later. +

+ + +

oinline void setShape(Shape* shape) +
Set the Shape of the drawable. The shape can be used to +speed up collision detection or as a guide for produral +geometry generation - see osg::ProduralGeometry. +

+ + +

oinline Shape* getShape() +
Get the Shape of the Drawable +

+ + +

oinline const Shape* getShape() const +
Get the const Shape of the const Drawable +

- -

ovoid setSupportsDisplayList(const bool flag) + +
ovoid setSupportsDisplayList(bool flag)
Set the drawable to it can or cannot be used in conjunction with OpenGL display lists. With set to true, calls to Drawable::setUseDisplayList, whereas when set to false, no display lists can be created and calls @@ -339,295 +435,319 @@ on objects with dynamic internal data such as continuous Level of Detail algorithms.

- -

oinline const bool getSupportsDisplayList() const + +
oinline bool getSupportsDisplayList() const
Get whether display lists are supported for this drawable instance

- -

ovoid setUseDisplayList(const bool flag) + +
ovoid setUseDisplayList(bool flag)
When set to true, force the draw method to use OpenGL Display List for rendering. If false rendering directly. If the display list has not been already compile the next call to draw will automatically create the display list.

- -

oinline const bool getUseDisplayList() const + +
oinline bool getUseDisplayList() const
Return whether OpenGL display lists are being used for rendering

- +

ovoid dirtyDisplayList()
Force a recompile on next draw() of any OpenGL display list associated with this geoset

- - -

ovoid dirtyBound() -
Dirty the bounding box, forcing a computeBound() on the next call -to getBound(). Should be called in the internal geometry of the Drawable -is modified. -

- - -

oinline const BoundingBox& getBound() const -
get bounding box of geoset. -Note, now made virtual to make it possible to implement user-drawn -objects albeit so what crudely, to be improved later. -

- +

ovoid compile(State& state)
Immediately compile this drawable into an OpenGL Display List. Note I, operation is ignored if _useDisplayList to false. Note II, compile is not intended to be overridden in subclasses.

- +

ostruct AppCallback: public osg::Referenced

- +
ovirtual void app(osg::NodeVisitor* visitor, osg::Drawable* drawable) = 0
do customized app code

- -
ovoid setAppCallback(AppCallback* ac) + +
ovoid setAppCallback(AppCallback* ac)
Set the AppCallback which allows users to attach customize the undating of an object during the app traversal

- -

oAppCallback* getAppCallback() + +
oAppCallback* getAppCallback()
Get the non const AppCallback

- -

oconst AppCallback* getAppCallback() const + +
oconst AppCallback* getAppCallback() const
Get the const AppCallback

- +

ostruct CullCallback: public osg::Referenced

- +
ovirtual bool cull(osg::NodeVisitor* visitor, osg::Drawable* drawable, osg::State* state=NULL) const = 0
do customized cull code

- -
ovoid setCullCallback(CullCallback* cc) + +
ovoid setCullCallback(CullCallback* cc)
Set the CullCallback which allows users to attach customize the culling of Drawable during the cull traversal

- -

oCullCallback* getCullCallback() + +
oCullCallback* getCullCallback()
Get the non const CullCallback

- -

oconst CullCallback* getCullCallback() const + +
oconst CullCallback* getCullCallback() const
Get the const CullCallback

- +

ostruct DrawCallback: public osg::Referenced
Callback attached to an Drawable which allows the users to customize the drawing of an exist Drawable object. -The draw callback is implement as a replacement to the Drawable's own drawImmediateMode() method, if the -the user intends to decorate the exist draw code then simple call the drawable->drawImmediateMode() from -with the callbacks drawImmediateMode() method. This allows the users to do both pre and post callbacks +The draw callback is implement as a replacement to the Drawable's own drawImplementation() method, if the +the user intends to decorate the exist draw code then simple call the drawable->drawImplementation() from +with the callbacks drawImplementation() method. This allows the users to do both pre and post callbacks without fuss and can even diable the inner draw in required.

- - -
ovirtual void drawImmediateMode(State& state, osg::Drawable* drawable) const = 0 + + +
ovirtual void drawImplementation(State& state, const osg::Drawable* drawable) const = 0
do customized draw code

- -
ovoid setDrawCallback(DrawCallback* dc) + +
ovoid setDrawCallback(DrawCallback* dc)
Set the DrawCallback which allows users to attach customize the drawing of existing Drawable object

- -

oDrawCallback* getDrawCallback() + +
oDrawCallback* getDrawCallback()
Get the non const DrawCallback

- -

oconst DrawCallback* getDrawCallback() const + +
oconst DrawCallback* getDrawCallback() const
Get the const DrawCallback

- - -

ovirtual void drawImmediateMode(State& state) = 0 + + +
ovirtual void drawImplementation(State& state) const = 0
draw directly ignoring an OpenGL display list which could be attached. This is the internal draw method which does the drawing itself, and is the method to override when deriving from Drawable.

- -

ostatic void deleteDisplayList(uint contextID, uint globj) + +
ostatic void deleteDisplayList(uint contextID, uint globj)
use deleteDisplayList instead of glDeleteList to allow OpenGL display list to cached until they can be deleted by the OpenGL context in which they were created, specified by contextID

- -

ostatic void flushDeletedDisplayLists(uint contextID) + +
ostatic void flushDeletedDisplayLists(uint contextID)
flush all the cached display list which need to be deleted in the OpenGL context related to contextID

- +

oenum AttributeType

- +
o VERTICES

- +

o NORMALS

- +

o COLORS

- +

o TEXTURE_COORDS

- +

o TEXTURE_COORDS_0

- +

o TEXTURE_COORDS_1

- +

o TEXTURE_COORDS_2

- +

o TEXTURE_COORDS_3

- +

o TEXTURE_COORDS_4

- +

o TEXTURE_COORDS_5

- +

o TEXTURE_COORDS_6

- +

o TEXTURE_COORDS_7

- - -
ovirtual void accept(AttributeFunctor&) -
accept an AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has + + +
ovirtual bool supports(AttributeFunctor&) const +
return true if the Drawable subclass supports accept(AttributeFunctor&)

- -

ovirtual void accept(PrimitiveFunctor&) -
accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has + +
ovirtual void accept(AttributeFunctor&) +
accept an AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. +return true if functor handled by drawable, return false on failure of drawable to generate functor calls. +

+ + +

ovirtual bool supports(ConstAttributeFunctor&) const +
return true if the Drawable subclass supports accept(ConstAttributeFunctor&) +

+ + +

ovirtual void accept(ConstAttributeFunctor&) const +
accept an AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. +return true if functor handled by drawable, return false on failure of drawable to generate functor calls. +

+ + +

ovirtual bool supports(PrimitiveFunctor&) const +
return true if the Drawable subclass supports accept(PrimitiveFunctor&) +

+ + +

ovirtual void accept(PrimitiveFunctor&) const +
accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has. +return true if functor handled by drawable, return false on failure of drawable to generate functor calls. +Note, PrimtiveFunctor only provide const access of the primtives, as primitives may be procedurally generated +so one cannot modify it.

- +

oDrawable& operator = (const Drawable&)

- +

ovirtual ~Drawable()

- -

ovirtual const bool computeBound() const + +
ovirtual bool computeBound() const
compute the bounding box of the drawable. Method must be implemented by subclasses.

- +

ovoid addParent(osg::Node* node)

- +

ovoid removeParent(osg::Node* node)

- -

oParentList _parents + +
oParentList _parents

- - -

oref_ptr<StateSet> _dstate -

- - -

obool _supportsDisplayList -

- - -

obool _useDisplayList -

- - -

otypedef std::vector<uint> GLObjectList mutable GLObjectList _globjList + + +
oref_ptr<StateSet> _stateset

- +

omutable BoundingBox _bbox

- +

omutable bool _bbox_computed

+ + +

oref_ptr<Shape> _shape +

+ + +

obool _supportsDisplayList +

+ + +

obool _useDisplayList +

+ + +

otypedef std::vector<uint> GLObjectList +

+ + +

omutable GLObjectList _globjList +

- -

oref_ptr<AppCallback> _appCallback + +
oref_ptr<AppCallback> _appCallback

- -

oref_ptr<DrawCallback> _drawCallback + +
oref_ptr<DrawCallback> _drawCallback

- -

oref_ptr<CullCallback> _cullCallback + +
oref_ptr<CullCallback> _cullCallback +

+ + +

otypedef std::map<uint,std::set<uint> > DeletedDisplayListCache

- -

otypedef std::map<uint,std::set<uint> >static DeletedDisplayListCache DeletedDisplayListCache s_deletedDisplayListCache + +
ostatic DeletedDisplayListCache s_deletedDisplayListCache

- +

oinline void draw(State& state)
draw OpenGL primitives. If the drawable has _useDisplayList set to true then use an OpenGL display list, automatically compiling one if required. -Otherwise call drawImmediateMode(). +Otherwise call drawImplementation(). Note, draw method should *not* be overridden in subclasses as it manages the optional display list.

Direct child classes: -
ImpostorSprite
+
ShapeDrawable
+ImpostorSprite
Geometry
GeoSet
DrawPixels
diff --git a/doc/doc++/osg/Fog.html b/doc/doc++/osg/Fog.html index d3fc89535..f7ac3e2f5 100644 --- a/doc/doc++/osg/Fog.html +++ b/doc/doc++/osg/Fog.html @@ -23,70 +23,70 @@

Public Methods

-[more] Fog() +[more] Fog()
-[more] Fog(const Fog& fog, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Fog(const Fog& fog, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy
-[more] META_StateAttribute(osg, Fog, FOG) +[more] META_StateAttribute(osg, Fog, FOG)
-[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
-[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const
-[more]inline void setMode( const Mode mode ) +[more]inline void setMode( const Mode mode )
-[more]inline Mode getMode() const +[more]inline Mode getMode() const
-[more]inline void setDensity( const float density ) +[more]inline void setDensity( float density )
-[more]inline const float getDensity() const +[more]inline float getDensity() const
-[more]inline void setStart( const float start ) +[more]inline void setStart( float start )
-[more]inline const float getStart() const +[more]inline float getStart() const
-[more]inline void setEnd( const float end ) +[more]inline void setEnd( float end )
-[more]inline const float getEnd() const +[more]inline float getEnd() const
-[more]inline void setColor( const Vec4 &color ) +[more]inline void setColor( const Vec4 &color )
-[more]inline const Vec4& getColor() const +[more]inline const Vec4& getColor() const
-[more]inline void setFogCoordinateSource(GLint source) +[more]inline void setFogCoordinateSource(GLint source)
-[more]inline GLint getFogCoordinateSource() const +[more]inline GLint getFogCoordinateSource() const
-[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

Public Members

-[more]enum Mode +[more]enum Mode
-[more]enum FogCoordinateSource +[more]enum FogCoordinateSource

Protected Fields

-[more]Mode _mode +[more]Mode _mode
-[more]float _density +[more]float _density
-[more]float _start +[more]float _start
-[more]float _end +[more]float _end
-[more]Vec4 _color +[more]Vec4 _color
-[more]GLint _fogCoordinateSource +[more]GLint _fogCoordinateSource

Protected Methods

-[more]virtual ~Fog() +[more]virtual ~Fog()

@@ -104,7 +104,7 @@
ovirtual const char* className() const
-ovirtual const Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -137,9 +137,9 @@

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -155,7 +155,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -173,12 +173,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -190,137 +198,137 @@
- +
o Fog()

- -

o Fog(const Fog& fog, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o Fog(const Fog& fog, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy

- -

o META_StateAttribute(osg, Fog, FOG) + +
o META_StateAttribute(osg, Fog, FOG)

- +

ovirtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

- -

ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const + +
ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const

- +

oenum Mode

- +
o LINEAR

- +

o EXP

- +

o EXP2

- -
oinline void setMode( const Mode mode ) + +
oinline void setMode( const Mode mode )

- -

oinline Mode getMode() const + +
oinline Mode getMode() const

- -

oinline void setDensity( const float density ) + +
oinline void setDensity( float density )

- -

oinline const float getDensity() const + +
oinline float getDensity() const

- -

oinline void setStart( const float start ) + +
oinline void setStart( float start )

- -

oinline const float getStart() const + +
oinline float getStart() const

- -

oinline void setEnd( const float end ) + +
oinline void setEnd( float end )

- -

oinline const float getEnd() const + +
oinline float getEnd() const

- +

oinline void setColor( const Vec4 &color )

- +

oinline const Vec4& getColor() const

- +

oenum FogCoordinateSource

- +
o FOG_COORDINATE

- +

o FRAGMENT_DEPTH

- +
oinline void setFogCoordinateSource(GLint source)

- +

oinline GLint getFogCoordinateSource() const

- +

ovirtual void apply(State& state) const

- +

ovirtual ~Fog()

- -

oMode _mode + +
oMode _mode

- +

ofloat _density

- +

ofloat _start

- +

ofloat _end

- +

oVec4 _color

- +

oGLint _fogCoordinateSource

diff --git a/doc/doc++/osg/FrameStamp.html b/doc/doc++/osg/FrameStamp.html index e588edeaf..d66b07335 100644 --- a/doc/doc++/osg/FrameStamp.html +++ b/doc/doc++/osg/FrameStamp.html @@ -23,50 +23,50 @@

Public Methods

-[more] FrameStamp() +[more] FrameStamp()
-[more] FrameStamp(const FrameStamp& fs) +[more] FrameStamp(const FrameStamp& fs)
-[more] ~FrameStamp() +[more] ~FrameStamp()
-[more]FrameStamp& operator = (const FrameStamp& fs) +[more]FrameStamp& operator = (const FrameStamp& fs)
-[more]void setFrameNumber(int fnum) +[more]void setFrameNumber(int fnum)
-[more]int getFrameNumber() const +[more]int getFrameNumber() const
-[more]void setReferenceTime(double refTime) +[more]void setReferenceTime(double refTime)
-[more]double getReferenceTime() const +[more]double getReferenceTime() const
-[more]void setCalendarTime(const tm& calendarTime) +[more]void setCalendarTime(const tm& calendarTime)
-[more]void getCalendarTime(tm& calendarTime) const +[more]void getCalendarTime(tm& calendarTime) const

Protected Fields

-[more]int _frameNumber +[more]int _frameNumber
-[more]double _referenceTime +[more]double _referenceTime
-[more]int tm_sec +[more]int tm_sec
-[more]int tm_min +[more]int tm_min
-[more]int tm_hour +[more]int tm_hour
-[more]int tm_mday +[more]int tm_mday
-[more]int tm_mon +[more]int tm_mon
-[more]int tm_year +[more]int tm_year
-[more]int tm_wday +[more]int tm_wday
-[more]int tm_yday +[more]int tm_yday
-[more]int tm_isdst +[more]int tm_isdst

@@ -80,12 +80,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -101,87 +109,87 @@ of day etc.
- +
o FrameStamp()

- -

o FrameStamp(const FrameStamp& fs) + +
o FrameStamp(const FrameStamp& fs)

- +

o ~FrameStamp()

- +

oFrameStamp& operator = (const FrameStamp& fs)

- +

ovoid setFrameNumber(int fnum)

- +

oint getFrameNumber() const

- +

ovoid setReferenceTime(double refTime)

- +

odouble getReferenceTime() const

- +

ovoid setCalendarTime(const tm& calendarTime)

- +

ovoid getCalendarTime(tm& calendarTime) const

- +

oint _frameNumber

- +

odouble _referenceTime

- +

oint tm_sec

- +

oint tm_min

- +

oint tm_hour

- +

oint tm_mday

- +

oint tm_mon

- +

oint tm_year

- +

oint tm_wday

- +

oint tm_yday

- +

oint tm_isdst

diff --git a/doc/doc++/osg/FrontFace.html b/doc/doc++/osg/FrontFace.html index 3451ea647..59ae44265 100644 --- a/doc/doc++/osg/FrontFace.html +++ b/doc/doc++/osg/FrontFace.html @@ -23,36 +23,36 @@

Public Methods

-[more] FrontFace() +[more] FrontFace()
-[more] FrontFace(const FrontFace& ff, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] FrontFace(const FrontFace& ff, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy
-[more] META_StateAttribute(osg, FrontFace, FRONTFACE) +[more] META_StateAttribute(osg, FrontFace, FRONTFACE)
-[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
-[more]inline void setMode(const Mode mode) +[more]inline void setMode(Mode mode)
-[more]inline const Mode getMode() const +[more]inline const Mode getMode() const
-[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

Public Members

-[more]enum Mode +[more]enum Mode

Protected Fields

-[more]Mode _mode +[more]Mode _mode

Protected Methods

-[more]virtual ~FrontFace() +[more]virtual ~FrontFace()

@@ -70,7 +70,7 @@
ovirtual const char* className() const
-ovirtual const Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -80,7 +80,7 @@
obool operator != (const StateAttribute& rhs) const
-ovirtual void getAssociatedModes(std::vector<GLMode>& ) const +ovirtual void getAssociatedModes(std::vector<GLMode>& ) const
ovirtual void compile(State&) const

@@ -105,9 +105,9 @@

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -123,7 +123,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -141,12 +141,20 @@
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -158,56 +166,56 @@
- +
o FrontFace()

- -

o FrontFace(const FrontFace& ff, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o FrontFace(const FrontFace& ff, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy

- -

o META_StateAttribute(osg, FrontFace, FRONTFACE) + +
o META_StateAttribute(osg, FrontFace, FRONTFACE)

- +

ovirtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

- +

oenum Mode

- +
o CLOCKWISE

- +

o COUNTER_CLOCKWISE

- -
oinline void setMode(const Mode mode) + +
oinline void setMode(Mode mode)

- -

oinline const Mode getMode() const + +
oinline const Mode getMode() const

- +

ovirtual void apply(State& state) const

- +

ovirtual ~FrontFace()

- -

oMode _mode + +
oMode _mode

This class has no child classes.
diff --git a/doc/doc++/osg/General.html b/doc/doc++/osg/General.html index d17d46e27..26b411116 100644 --- a/doc/doc++/osg/General.html +++ b/doc/doc++/osg/General.html @@ -34,6 +34,9 @@ o#define OSG_BOUNDSCHECKING
+o#define +OSG_BUFFERED_VALUE
+ o#define OSG_CAMERA
@@ -196,8 +199,8 @@ o#define __OSG_MATH
-odefined(macintosh)(sun)(__DARWIN_OSX__)(float)(float)(float)(float)(float)(float)(float)(float)(float)(macintosh)(sun)(__DARWIN_OSX__) -(__hpux__)(float)
+odefined(sun)(__DARWIN_OSX__)(float)(float)(float)(float)(float)(float)(float)(float)(sun)(float)(sun)(__hpux__) +(DARWIN_OSX_PRE_10_2)(float)
o#define OSG_MATRIXTRANSFORM
@@ -233,7 +236,7 @@ m_alloc_free
oSG_EXPORT extern void -m_setOwner(const char* file, const unsigned int line)
+m_setOwner(const char* file, unsigned int line)
oSG_EXPORT extern bool& m_breakOnRealloc(void* reportedAddress)
@@ -245,13 +248,13 @@ m_breakOnAllocation(unsigned int count)
oSG_EXPORT extern void* -m_allocator(const char* sourceFile, const unsigned int sourceLine, const unsigned int allocationType, const size_t reportedSize)
+m_allocator(const char* sourceFile, unsigned int sourceLine, unsigned int allocationType, const size_t reportedSize)
oSG_EXPORT extern void* -m_reallocator(const char* sourceFile, const unsigned int sourceLine, const unsigned int reallocationType, const size_t reportedSize, void* reportedAddress)
+m_reallocator(const char* sourceFile, unsigned int sourceLine, unsigned int reallocationType, const size_t reportedSize, void* reportedAddress)
oSG_EXPORT extern void -m_deallocator(const char* sourceFile, const unsigned int sourceLine, const unsigned int deallocationType, const void* reportedAddress)
+m_deallocator(const char* sourceFile, unsigned int sourceLine, unsigned int deallocationType, const void* reportedAddress)
oSG_EXPORT extern bool m_validateAddress(const void* reportedAddress)
@@ -272,7 +275,7 @@ m_dumpAllocUnit(const sAllocUnit* allocUnit, const char* prefix = "")
oSG_EXPORT extern void -m_dumpMemoryReport(const char* filename = "memreport.log", const bool overwrite = true)
+m_dumpMemoryReport(const char* filename = "memreport.log", bool overwrite = true)
oSG_EXPORT extern sMStats m_getMemoryStatistics()
@@ -304,14 +307,17 @@ o#define OSG_POLYGONOFFSET
+o#define +OSG_POLYGONSTIPPLE
+ o#define OSG_POLYTOPE
o#define OSG_POSITIONATTITIDETRANSFORM
-o#define -OSG_PRIMTIVE
+o#define +OSG_PRIMTIVESET
o#define OSG_PROJECTION
@@ -334,6 +340,12 @@ o#define OSG_SHADOWVOLUMEOCCLUDER
+o#define +OSG_SHAPE
+ +o#define +OSG_SHAPEDRAWABLE
+ o#define OSG_STATE
diff --git a/doc/doc++/osg/GeoSet.html b/doc/doc++/osg/GeoSet.html index 24aa51e86..719d5c56d 100644 --- a/doc/doc++/osg/GeoSet.html +++ b/doc/doc++/osg/GeoSet.html @@ -23,312 +23,322 @@

Public Methods

-[more] GeoSet() +[more] GeoSet()
-[more] GeoSet(const GeoSet& geoset, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] GeoSet(const GeoSet& geoset, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy
-[more]virtual Object* cloneType() const +[more]virtual Object* cloneType() const
-[more]virtual Object* clone(const CopyOp& copyop) const +[more]virtual Object* clone(const CopyOp& copyop) const
-[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
-[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
-[more]virtual const char* className() const +[more]virtual const char* className() const
-[more]inline void setNumPrims( const int n ) +[more]inline void setNumPrims( int n )
-[more]inline const int getNumPrims() const +[more]inline int getNumPrims() const
-[more]void setPrimType( const PrimitiveType type ) +[more]void setPrimType( PrimitiveType type )
-[more]inline const PrimitiveType getPrimType() const +[more]inline PrimitiveType getPrimType() const
-[more]inline void setPrimLengths( int* lens ) +[more]inline void setPrimLengths( int* lens )
-[more]inline int* getPrimLengths() +[more]inline int* getPrimLengths() const
-[more]inline const int* getPrimLengths() const +[more]void computeNumVerts() const
-[more]void computeNumVerts() const -
-[more]inline const int getNumCoords() const +[more]inline int getNumCoords() const
get the number of coords required by the defined primitives.
-[more]inline Vec3* getCoords() +[more]inline Vec3* getCoords()
get a pointer to Vec3 coord array.
-[more]inline const Vec3* getCoords() const +[more]inline const Vec3* getCoords() const
get a const pointer to Vec3 coord array.
-[more]inline const int getNumCoordIndices() const +[more]inline int getNumCoordIndices() const
get the number of indices required by the defined primitives.
-[more]inline IndexPointer& getCoordIndices() +[more]inline IndexPointer& getCoordIndices()
get the coord index array.
-[more]inline const IndexPointer& getCoordIndices() const +[more]inline const IndexPointer& getCoordIndices() const
get the const coord index array.
-[more]void setCoords( Vec3* cp ) +[more]void setCoords( Vec3* cp )
set the coords (ie the geometry) of the geoset
-[more]void setCoords( Vec3* cp, GLushort* ci ) +[more]void setCoords( Vec3* cp, GLushort* ci )
set the coords (ie the geometry) and ushort indices of the geoset.
-[more]void setCoords( Vec3* cp, GLuint* ci ) +[more]void setCoords( Vec3* cp, GLuint* ci )
set the coords (ie the geometry) and uint indices of the geoset.
-[more]void setCoords( Vec3* cp, IndexPointer& ip ) +[more]void setCoords( Vec3* cp, IndexPointer& ip )
set the coords (ie the geometry) and indices of the geoset
-[more]inline const int getNumNormals() const +[more]inline int getNumNormals() const
get the number of normals required by the defined primitives and normals binding
-[more]inline Vec3* getNormals() +[more]inline Vec3* getNormals()
get a pointer to Vec3 normal array.
-[more]inline const Vec3* getNormals() const +[more]inline const Vec3* getNormals() const
get a const pointer to Vec3 normal array.
-[more]inline int getNumNormalIndices() const +[more]inline int getNumNormalIndices() const
get the number of normal indices required by the defined primitives and normals binding
-[more]inline IndexPointer& getNormalIndices() +[more]inline IndexPointer& getNormalIndices()
get the normal index array.
-[more]inline const IndexPointer& getNormalIndices() const +[more]inline const IndexPointer& getNormalIndices() const
get the const normal index array.
-[more]void setNormals( Vec3* np ) +[more]void setNormals( Vec3* np )
set the normals of the geoset
-[more]void setNormals( Vec3* np, GLushort* ni ) +[more]void setNormals( Vec3* np, GLushort* ni )
set the normals and normal indices of the geoset
-[more]void setNormals( Vec3* np, GLuint* ni ) +[more]void setNormals( Vec3* np, GLuint* ni )
set the normals and normal indices of the geoset
-[more]void setNormals( Vec3* np, IndexPointer& ip ) +[more]void setNormals( Vec3* np, IndexPointer& ip )
set the normals and normal indices of the geoset
-[more]void setNormalBinding( const BindingType binding ) +[more]void setNormalBinding( BindingType binding )
set the normals binding to the vertices/primitives/overall
-[more]inline const BindingType getNormalBinding() const +[more]inline BindingType getNormalBinding() const
-[more]inline const int getNumColors() const +[more]inline int getNumColors() const
get the number of colors required by the defined primitives and color binding
-[more]inline Vec4* getColors() +[more]inline Vec4* getColors()
get a pointer to Vec4 color array.
-[more]inline const Vec4* getColors() const +[more]inline const Vec4* getColors() const
get a pointer to Vec4 color array.
-[more]inline int getNumColorIndices() const +[more]inline int getNumColorIndices() const
get the number of colors indices required by the defined primitives and color binding
-[more]inline IndexPointer& getColorIndices() +[more]inline IndexPointer& getColorIndices()
get the color index array.
-[more]inline const IndexPointer& getColorIndices() const +[more]inline const IndexPointer& getColorIndices() const
get the const color index array.
-[more]void setColors( Vec4* cp ) +[more]void setColors( Vec4* cp )
set the colors of the geoset
-[more]void setColors( Vec4* cp, GLushort* li ) +[more]void setColors( Vec4* cp, GLushort* li )
set the colors and color indices of the geoset
-[more]void setColors( Vec4* cp, GLuint* li ) +[more]void setColors( Vec4* cp, GLuint* li )
set the colors and color indices of the geoset
-[more]void setColors( Vec4* cp, IndexPointer& ip ) +[more]void setColors( Vec4* cp, IndexPointer& ip )
set the colors and color indices of the geoset
-[more]void setColorBinding( const BindingType binding ) +[more]void setColorBinding( BindingType binding )
set the color binding to the vertices/primitives/overall
-[more]inline BindingType getColorBinding() const +[more]inline BindingType getColorBinding() const
-[more]inline const int getNumTextureCoords() const +[more]inline int getNumTextureCoords() const
get the number of texture coords required by the defined primitives and textures binding
-[more]inline Vec2* getTextureCoords() +[more]inline Vec2* getTextureCoords()
get a pointer to Vec4 color array.
-[more]inline const Vec2* getTextureCoords() const +[more]inline const Vec2* getTextureCoords() const
get a pointer to Vec4 color array.
-[more]inline const int getNumTextureIndices() const +[more]inline int getNumTextureIndices() const
get the number of texture coord indices required by the defined primitives and texture binding
-[more]inline IndexPointer& getTextureIndices() +[more]inline IndexPointer& getTextureIndices()
get the texture index array.
-[more]inline const IndexPointer& getTextureIndices() const +[more]inline const IndexPointer& getTextureIndices() const
get the texture index array.
-[more]void setTextureCoords( Vec2* tc ) +[more]void setTextureCoords( Vec2* tc )
set the texture coords of the geoset
-[more]void setTextureCoords( Vec2* tc, GLushort* ti ) +[more]void setTextureCoords( Vec2* tc, GLushort* ti )
set the texture coords and texture coord indices of the geoset
-[more]void setTextureCoords( Vec2* tc, GLuint* ti ) +[more]void setTextureCoords( Vec2* tc, GLuint* ti )
set the texture coords and texture coord indices of the geoset
-[more]void setTextureCoords( Vec2* tc, IndexPointer& ip ) +[more]void setTextureCoords( Vec2* tc, IndexPointer& ip )
set the texture coords and texture indices of the geoset
-[more]void setTextureBinding( const BindingType binding ) +[more]void setTextureBinding( BindingType binding )
set the texture coord binding to the vertices/primitives/overall
-[more]inline const BindingType getTextureBinding() const +[more]inline BindingType getTextureBinding() const
-[more]inline const int getNumInterleavedCoords() const +[more]inline int getNumInterleavedCoords() const
get the number of texture coords required by the defined primitives and textures binding
-[more]inline void* getInterleavedArray() +[more]inline void* getInterleavedArray()
get a pointer to interleaved float array.
-[more]inline const void* getInterleavedArray() const +[more]inline const void* getInterleavedArray() const
get a const pointer to interleaved float array.
-[more]inline const int getNumInterleavedIndices() const +[more]inline int getNumInterleavedIndices() const
get the number of texture coord indices required by the defined primitives and texture binding
-[more]inline IndexPointer& getInterleavedIndices() +[more]inline IndexPointer& getInterleavedIndices()
get the texture index array.
-[more]inline const IndexPointer& getInterleavedIndices() const +[more]inline const IndexPointer& getInterleavedIndices() const
get the interleaved index array.
-[more]inline const InterleaveArrayType getInterleavedFormat() const +[more]inline InterleaveArrayType getInterleavedFormat() const
get the interleaved array storage format.
-[more]void setInterleavedArray( const InterleaveArrayType format, float* ia ) +[more]void setInterleavedArray( InterleaveArrayType format, float* ia )
set the interleaved arrays of the geoset
-[more]void setInterleavedArray( const InterleaveArrayType format, float* ia, GLushort* iai ) +[more]void setInterleavedArray( InterleaveArrayType format, float* ia, GLushort* iai )
-[more]void setInterleavedArray( const InterleaveArrayType format, float* ia, GLuint* iai ) +[more]void setInterleavedArray( InterleaveArrayType format, float* ia, GLuint* iai )
-[more]void setInterleavedArray( const InterleaveArrayType format, float* ia, IndexPointer& iai ) +[more]void setInterleavedArray( InterleaveArrayType format, float* ia, IndexPointer& iai )
-[more]virtual void drawImmediateMode(State& state) +[more]virtual void drawImplementation(State& state) const
draw geoset directly ignoring an OpenGL display list which could be attached.
-[more]const bool check() const +[more]bool check() const
-[more]void setAttributeDeleteFunctor(AttributeDeleteFunctor* adf) +[more]void setAttributeDeleteFunctor(AttributeDeleteFunctor* adf)
set an alternative AttributeDeleteFunction to handle attribute arrays attached to this Geoset
-[more]AttributeDeleteFunctor* getAttributeDeleteFunctor() +[more]AttributeDeleteFunctor* getAttributeDeleteFunctor()
get the current AttributeDeleteFunction to handle attribute arrays attached to this Geoset
-[more]const AttributeDeleteFunctor* getAttributeDeleteFunctor() const +[more]const AttributeDeleteFunctor* getAttributeDeleteFunctor() const
get the current AttributeDeleteFunction to handle attribute arrays attached to this Geoset
-[more]virtual void accept(AttributeFunctor& af) +[more]virtual bool supports(AttributeFunctor&) const +
return true, osg::GeoSet does support accept(AttributeFunctor&) +
+[more]virtual void accept(AttributeFunctor& af)
accept an AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has
-[more]virtual void accept(PrimitiveFunctor& pf) +[more]virtual bool supports(ConstAttributeFunctor&) const +
return true, osg::GeoSet does support accept(ConstAttributeFunctor&) +
+[more]virtual void accept(ConstAttributeFunctor& af) const +
accept an ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has +
+[more]virtual bool supports(PrimitiveFunctor&) const +
return true, osg::GeoSet does support accept(PrimitiveFunctor&) +
+[more]virtual void accept(PrimitiveFunctor& pf) const
accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has
-[more]Geometry* convertToGeometry() +[more]Geometry* convertToGeometry()
convinience function for converting GeoSet's to equivilant Geometry nodes

Public Members

-[more]enum PrimitiveType +[more]enum PrimitiveType
-[more]enum BindingType +[more]enum BindingType
-[more]enum InterleaveArrayType +[more]enum InterleaveArrayType
-[more]struct IndexPointer +[more]struct IndexPointer
-[more]struct AttributeDeleteFunctor: public osg::Referenced +[more]struct AttributeDeleteFunctor: public osg::Referenced
function object which is used to handling the clean up of attribute arrays associated with GeoSet's.

Protected Fields

-[more]ref_ptr<AttributeDeleteFunctor> _adf +[more]ref_ptr<AttributeDeleteFunctor> _adf
-[more]int _numprims +[more]int _numprims
-[more]PrimitiveType _primtype +[more]PrimitiveType _primtype
-[more]int _needprimlen +[more]int _needprimlen
-[more]unsigned int _oglprimtype +[more]unsigned int _oglprimtype
-[more]int* _primLengths +[more]int* _primLengths
-[more]mutable unsigned char _primlength +[more]mutable unsigned char _primlength
-[more]unsigned char _flat_shaded_skip +[more]unsigned char _flat_shaded_skip
-[more]mutable int _numcoords +[more]mutable int _numcoords
-[more]Vec3* _coords +[more]Vec3* _coords
-[more]IndexPointer _cindex +[more]mutable IndexPointer _cindex
-[more]BindingType _normal_binding +[more]BindingType _normal_binding
-[more]mutable int _numnormals +[more]mutable int _numnormals
-[more]Vec3* _normals +[more]Vec3* _normals
-[more]IndexPointer _nindex +[more]IndexPointer _nindex
-[more]BindingType _color_binding +[more]BindingType _color_binding
-[more]mutable int _numcolors +[more]mutable int _numcolors
-[more]Vec4* _colors +[more]Vec4* _colors
-[more]IndexPointer _colindex +[more]IndexPointer _colindex
-[more]BindingType _texture_binding +[more]BindingType _texture_binding
-[more]mutable int _numtcoords +[more]mutable int _numtcoords
-[more]Vec2* _tcoords +[more]Vec2* _tcoords
-[more]IndexPointer _tindex +[more]IndexPointer _tindex
-[more]void* _iarray +[more]void* _iarray
-[more]IndexPointer _iaindex +[more]IndexPointer _iaindex
-[more]InterleaveArrayType _iaformat +[more]InterleaveArrayType _iaformat
-[more]unsigned int _ogliaformat +[more]unsigned int _ogliaformat
-[more]int _fast_path +[more]int _fast_path

Protected Methods

-[more]GeoSet& operator = (const GeoSet&) +[more]GeoSet& operator = (const GeoSet&)
-[more]virtual ~GeoSet() +[more]virtual ~GeoSet()
-[more]virtual const bool computeBound() const +[more]virtual bool computeBound() const
-[more]void set_fast_path( void ) +[more]void set_fast_path( void )
-[more]void draw_fast_path( State& state ) +[more]void draw_fast_path( State& state ) const
-[more]void draw_alternate_path( State& state ) +[more]void draw_alternate_path( State& state ) const

@@ -336,15 +346,19 @@

Public Methods

-oinline const ParentList& getParents() const +ovirtual Geometry* asGeometry()
-oinline ParentList getParents() +ovirtual const Geometry* asGeometry() const
-oinline Node* getParent(const unsigned int i) +oinline const ParentList& getParents() const
-oinline const Node* getParent(const unsigned int i) const +oinline ParentList getParents()
-oinline const unsigned int getNumParents() const +oinline Node* getParent(unsigned int i) +
+oinline const Node* getParent(unsigned int i) const +
+oinline unsigned int getNumParents() const
oinline void setStateSet(StateSet* state)
@@ -352,43 +366,51 @@
oinline const StateSet* getStateSet() const
-ovoid setSupportsDisplayList(const bool flag) -
-oinline const bool getSupportsDisplayList() const -
-ovoid setUseDisplayList(const bool flag) -
-oinline const bool getUseDisplayList() const -
-ovoid dirtyDisplayList() +oStateSet* getOrCreateStateSet()
ovoid dirtyBound()
oinline const BoundingBox& getBound() const
+oinline void setShape(Shape* shape) +
+oinline Shape* getShape() +
+oinline const Shape* getShape() const +
+ovoid setSupportsDisplayList(bool flag) +
+oinline bool getSupportsDisplayList() const +
+ovoid setUseDisplayList(bool flag) +
+oinline bool getUseDisplayList() const +
+ovoid dirtyDisplayList() +
ovoid compile(State& state)
-ovoid setAppCallback(AppCallback* ac) +ovoid setAppCallback(AppCallback* ac)
-oAppCallback* getAppCallback() +oAppCallback* getAppCallback()
-oconst AppCallback* getAppCallback() const +oconst AppCallback* getAppCallback() const
-ovoid setCullCallback(CullCallback* cc) +ovoid setCullCallback(CullCallback* cc)
-oCullCallback* getCullCallback() +oCullCallback* getCullCallback()
-oconst CullCallback* getCullCallback() const +oconst CullCallback* getCullCallback() const
-ovoid setDrawCallback(DrawCallback* dc) +ovoid setDrawCallback(DrawCallback* dc)
-oDrawCallback* getDrawCallback() +oDrawCallback* getDrawCallback()
-oconst DrawCallback* getDrawCallback() const +oconst DrawCallback* getDrawCallback() const
-ostatic void deleteDisplayList(uint contextID, uint globj) +ostatic void deleteDisplayList(uint contextID, uint globj)
-ostatic void flushDeletedDisplayLists(uint contextID) +ostatic void flushDeletedDisplayLists(uint contextID)
oinline void draw(State& state)

@@ -407,28 +429,36 @@
class AttributeFunctor
+class ConstAttributeFunctor +
class PrimitiveFunctor

Protected Fields

-oParentList _parents +oParentList _parents
-oref_ptr<StateSet> _dstate -
-obool _supportsDisplayList -
-obool _useDisplayList +oref_ptr<StateSet> _stateset
omutable BoundingBox _bbox
omutable bool _bbox_computed
-oref_ptr<AppCallback> _appCallback +oref_ptr<Shape> _shape
-oref_ptr<DrawCallback> _drawCallback +obool _supportsDisplayList
-oref_ptr<CullCallback> _cullCallback +obool _useDisplayList +
+omutable GLObjectList _globjList +
+oref_ptr<AppCallback> _appCallback +
+oref_ptr<DrawCallback> _drawCallback +
+oref_ptr<CullCallback> _cullCallback +
+ostatic DeletedDisplayListCache s_deletedDisplayListCache

@@ -440,9 +470,9 @@ class PrimitiveFunctor

Protected Members

-otypedef std::vector<uint> GLObjectList mutable GLObjectList _globjList +otypedef std::vector<uint> GLObjectList
-otypedef std::map<uint,std::set<uint> >static DeletedDisplayListCache DeletedDisplayListCache s_deletedDisplayListCache +otypedef std::map<uint,std::set<uint> > DeletedDisplayListCache

@@ -450,9 +480,9 @@ class PrimitiveFunctor

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -468,7 +498,7 @@ class PrimitiveFunctor

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -484,12 +514,20 @@ class PrimitiveFunctor
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -510,580 +548,576 @@ be shared for optimal memory usage and graphics performance.
- +
oenum PrimitiveType

- +
o NO_TYPE

- +

o POINTS

- +

o LINES

- +

o LINE_STRIP

- +

o FLAT_LINE_STRIP

- +

o LINE_LOOP

- +

o TRIANGLES

- +

o TRIANGLE_STRIP

- +

o FLAT_TRIANGLE_STRIP

- +

o TRIANGLE_FAN

- +

o FLAT_TRIANGLE_FAN

- +

o QUADS

- +

o QUAD_STRIP

- +

o POLYGON

- +
oenum BindingType

- +
o BIND_OFF

- +

o BIND_OVERALL

- +

o BIND_PERPRIM

- +

o BIND_PERVERTEX

- +

o BIND_DEFAULT

- +
oenum InterleaveArrayType

- +
o IA_OFF

- +

o IA_V2F

- +

o IA_V3F

- +

o IA_C4UB_V2F

- +

o IA_C4UB_V3F

- +

o IA_C3F_V3F

- +

o IA_N3F_V3F

- +

o IA_C4F_N3F_V3F

- +

o IA_T2F_V3F

- +

o IA_T4F_V4F

- +

o IA_T2F_C4UB_V3F

- +

o IA_T2F_C3F_V3F

- +

o IA_T2F_N3F_V3F

- +

o IA_T2F_C4F_N3F_V3F

- +

o IA_T4F_C4F_N3F_V4F

- +
ostruct IndexPointer

- -
omutable uint _size + +
omutable uint _size

- +

obool _is_ushort

- +

ounion

- +
oGLushort* _ushort

- +

oGLuint* _uint

- +
o IndexPointer()

- -

oinline const bool operator == (const IndexPointer& ip) const + +
oinline bool operator == (const IndexPointer& ip) const

- -

oinline const bool valid() const + +
oinline bool valid() const

- -

oinline const bool null() const + +
oinline bool null() const

- +

oinline void setToNull()

- -

oinline void set(uint size, GLushort* data) + +
oinline void set(uint size, GLushort* data)

- -

ovoid set(const uint size, GLuint* data) + +
ovoid set(uint size, GLuint* data)

- -

oinline const uint maxIndex() const + +
oinline uint maxIndex() const

- -

oinline const GLint operator [] (const GLuint pos) const + +
oinline GLint operator [] (const GLuint pos) const

- +
o GeoSet()

- -

o GeoSet(const GeoSet& geoset, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o GeoSet(const GeoSet& geoset, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy

- +

ovirtual Object* cloneType() const

- +

ovirtual Object* clone(const CopyOp& copyop) const

- +

ovirtual bool isSameKindAs(const Object* obj) const

- +

ovirtual const char* libraryName() const

- +

ovirtual const char* className() const

- -

oinline void setNumPrims( const int n ) + +
oinline void setNumPrims( int n )

- -

oinline const int getNumPrims() const + +
oinline int getNumPrims() const

- -

ovoid setPrimType( const PrimitiveType type ) + +
ovoid setPrimType( PrimitiveType type )

- -

oinline const PrimitiveType getPrimType() const + +
oinline PrimitiveType getPrimType() const

- +

oinline void setPrimLengths( int* lens )

- -

oinline int* getPrimLengths() -

- - -

oinline const int* getPrimLengths() const + +
oinline int* getPrimLengths() const

- +

ovoid computeNumVerts() const

- -

oinline const int getNumCoords() const + +
oinline int getNumCoords() const
get the number of coords required by the defined primitives.

- +

oinline Vec3* getCoords()
get a pointer to Vec3 coord array.

- +

oinline const Vec3* getCoords() const
get a const pointer to Vec3 coord array.

- -

oinline const int getNumCoordIndices() const + +
oinline int getNumCoordIndices() const
get the number of indices required by the defined primitives.

- -

oinline IndexPointer& getCoordIndices() + +
oinline IndexPointer& getCoordIndices()
get the coord index array.

- -

oinline const IndexPointer& getCoordIndices() const + +
oinline const IndexPointer& getCoordIndices() const
get the const coord index array.

- +

ovoid setCoords( Vec3* cp )
set the coords (ie the geometry) of the geoset

- +

ovoid setCoords( Vec3* cp, GLushort* ci )
set the coords (ie the geometry) and ushort indices of the geoset. To reduce memory footprint and bandwidth for small datasets it is recommended the ushort indices are used instead of unit indices.

- +

ovoid setCoords( Vec3* cp, GLuint* ci )
set the coords (ie the geometry) and uint indices of the geoset. Unless your data set exceeds 65536 indices prefer ushort indices over uint indices, only use this unit indices version if necessary.

- -

ovoid setCoords( Vec3* cp, IndexPointer& ip ) + +
ovoid setCoords( Vec3* cp, IndexPointer& ip )
set the coords (ie the geometry) and indices of the geoset

- -

oinline const int getNumNormals() const + +
oinline int getNumNormals() const
get the number of normals required by the defined primitives and normals binding

- +

oinline Vec3* getNormals()
get a pointer to Vec3 normal array.

- +

oinline const Vec3* getNormals() const
get a const pointer to Vec3 normal array.

- +

oinline int getNumNormalIndices() const
get the number of normal indices required by the defined primitives and normals binding

- -

oinline IndexPointer& getNormalIndices() + +
oinline IndexPointer& getNormalIndices()
get the normal index array.

- -

oinline const IndexPointer& getNormalIndices() const + +
oinline const IndexPointer& getNormalIndices() const
get the const normal index array.

- +

ovoid setNormals( Vec3* np )
set the normals of the geoset

- +

ovoid setNormals( Vec3* np, GLushort* ni )
set the normals and normal indices of the geoset

- +

ovoid setNormals( Vec3* np, GLuint* ni )
set the normals and normal indices of the geoset

- -

ovoid setNormals( Vec3* np, IndexPointer& ip ) + +
ovoid setNormals( Vec3* np, IndexPointer& ip )
set the normals and normal indices of the geoset

- -

ovoid setNormalBinding( const BindingType binding ) + +
ovoid setNormalBinding( BindingType binding )
set the normals binding to the vertices/primitives/overall

- -

oinline const BindingType getNormalBinding() const + +
oinline BindingType getNormalBinding() const

- -

oinline const int getNumColors() const + +
oinline int getNumColors() const
get the number of colors required by the defined primitives and color binding

- +

oinline Vec4* getColors()
get a pointer to Vec4 color array.

- +

oinline const Vec4* getColors() const
get a pointer to Vec4 color array.

- +

oinline int getNumColorIndices() const
get the number of colors indices required by the defined primitives and color binding

- -

oinline IndexPointer& getColorIndices() + +
oinline IndexPointer& getColorIndices()
get the color index array.

- -

oinline const IndexPointer& getColorIndices() const + +
oinline const IndexPointer& getColorIndices() const
get the const color index array.

- +

ovoid setColors( Vec4* cp )
set the colors of the geoset

- +

ovoid setColors( Vec4* cp, GLushort* li )
set the colors and color indices of the geoset

- +

ovoid setColors( Vec4* cp, GLuint* li )
set the colors and color indices of the geoset

- -

ovoid setColors( Vec4* cp, IndexPointer& ip ) + +
ovoid setColors( Vec4* cp, IndexPointer& ip )
set the colors and color indices of the geoset

- -

ovoid setColorBinding( const BindingType binding ) + +
ovoid setColorBinding( BindingType binding )
set the color binding to the vertices/primitives/overall

- -

oinline BindingType getColorBinding() const + +
oinline BindingType getColorBinding() const

- -

oinline const int getNumTextureCoords() const + +
oinline int getNumTextureCoords() const
get the number of texture coords required by the defined primitives and textures binding

- +

oinline Vec2* getTextureCoords()
get a pointer to Vec4 color array.

- +

oinline const Vec2* getTextureCoords() const
get a pointer to Vec4 color array.

- -

oinline const int getNumTextureIndices() const + +
oinline int getNumTextureIndices() const
get the number of texture coord indices required by the defined primitives and texture binding

- -

oinline IndexPointer& getTextureIndices() + +
oinline IndexPointer& getTextureIndices()
get the texture index array.

- -

oinline const IndexPointer& getTextureIndices() const + +
oinline const IndexPointer& getTextureIndices() const
get the texture index array.

- +

ovoid setTextureCoords( Vec2* tc )
set the texture coords of the geoset

- +

ovoid setTextureCoords( Vec2* tc, GLushort* ti )
set the texture coords and texture coord indices of the geoset

- +

ovoid setTextureCoords( Vec2* tc, GLuint* ti )
set the texture coords and texture coord indices of the geoset

- -

ovoid setTextureCoords( Vec2* tc, IndexPointer& ip ) + +
ovoid setTextureCoords( Vec2* tc, IndexPointer& ip )
set the texture coords and texture indices of the geoset

- -

ovoid setTextureBinding( const BindingType binding ) + +
ovoid setTextureBinding( BindingType binding )
set the texture coord binding to the vertices/primitives/overall

- -

oinline const BindingType getTextureBinding() const + +
oinline BindingType getTextureBinding() const

- -

oinline const int getNumInterleavedCoords() const + +
oinline int getNumInterleavedCoords() const
get the number of texture coords required by the defined primitives and textures binding

- +

oinline void* getInterleavedArray()
get a pointer to interleaved float array.

- +

oinline const void* getInterleavedArray() const
get a const pointer to interleaved float array.

- -

oinline const int getNumInterleavedIndices() const + +
oinline int getNumInterleavedIndices() const
get the number of texture coord indices required by the defined primitives and texture binding

- -

oinline IndexPointer& getInterleavedIndices() + +
oinline IndexPointer& getInterleavedIndices()
get the texture index array.

- -

oinline const IndexPointer& getInterleavedIndices() const + +
oinline const IndexPointer& getInterleavedIndices() const
get the interleaved index array.

- -

oinline const InterleaveArrayType getInterleavedFormat() const + +
oinline InterleaveArrayType getInterleavedFormat() const
get the interleaved array storage format.

- -

ovoid setInterleavedArray( const InterleaveArrayType format, float* ia ) + +
ovoid setInterleavedArray( InterleaveArrayType format, float* ia )
set the interleaved arrays of the geoset

- -

ovoid setInterleavedArray( const InterleaveArrayType format, float* ia, GLushort* iai ) + +
ovoid setInterleavedArray( InterleaveArrayType format, float* ia, GLushort* iai )

- -

ovoid setInterleavedArray( const InterleaveArrayType format, float* ia, GLuint* iai ) + +
ovoid setInterleavedArray( InterleaveArrayType format, float* ia, GLuint* iai )

- -

ovoid setInterleavedArray( const InterleaveArrayType format, float* ia, IndexPointer& iai ) + +
ovoid setInterleavedArray( InterleaveArrayType format, float* ia, IndexPointer& iai )

- - -

ovirtual void drawImmediateMode(State& state) + + +
ovirtual void drawImplementation(State& state) const
draw geoset directly ignoring an OpenGL display list which could be attached. This is the internal draw method which does the drawing itself, and is the method to override when deriving from GeoSet for user-drawn objects.

- -

oconst bool check() const + +
obool check() const

- +

ostruct AttributeDeleteFunctor: public osg::Referenced
function object which is used to handling the clean up of attribute arrays associated with GeoSet's. A default is provided which assumes that all @@ -1093,175 +1127,195 @@ a specify your own memory deletion operation.

- +
ovirtual void operator() (GeoSet* gset)

- -
ovoid setAttributeDeleteFunctor(AttributeDeleteFunctor* adf) + +
ovoid setAttributeDeleteFunctor(AttributeDeleteFunctor* adf)
set an alternative AttributeDeleteFunction to handle attribute arrays attached to this Geoset

- -

oAttributeDeleteFunctor* getAttributeDeleteFunctor() + +
oAttributeDeleteFunctor* getAttributeDeleteFunctor()
get the current AttributeDeleteFunction to handle attribute arrays attached to this Geoset

- -

oconst AttributeDeleteFunctor* getAttributeDeleteFunctor() const + +
oconst AttributeDeleteFunctor* getAttributeDeleteFunctor() const
get the current AttributeDeleteFunction to handle attribute arrays attached to this Geoset

+ + +

ovirtual bool supports(AttributeFunctor&) const +
return true, osg::GeoSet does support accept(AttributeFunctor&) +

- +

ovirtual void accept(AttributeFunctor& af)
accept an AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has

+ + +

ovirtual bool supports(ConstAttributeFunctor&) const +
return true, osg::GeoSet does support accept(ConstAttributeFunctor&) +

- -

ovirtual void accept(PrimitiveFunctor& pf) + +
ovirtual void accept(ConstAttributeFunctor& af) const +
accept an ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has +

+ + +

ovirtual bool supports(PrimitiveFunctor&) const +
return true, osg::GeoSet does support accept(PrimitiveFunctor&) +

+ + +

ovirtual void accept(PrimitiveFunctor& pf) const
accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has

- +

oGeometry* convertToGeometry()
convinience function for converting GeoSet's to equivilant Geometry nodes

- +

oGeoSet& operator = (const GeoSet&)

- +

ovirtual ~GeoSet()

- -

ovirtual const bool computeBound() const + +
ovirtual bool computeBound() const

- -

oref_ptr<AttributeDeleteFunctor> _adf + +
oref_ptr<AttributeDeleteFunctor> _adf

- +

oint _numprims

- -

oPrimitiveType _primtype + +
oPrimitiveType _primtype

- +

oint _needprimlen

- +

ounsigned int _oglprimtype

- +

oint* _primLengths

- +

omutable unsigned char _primlength

- +

ounsigned char _flat_shaded_skip

- +

omutable int _numcoords

- +

oVec3* _coords

- -

oIndexPointer _cindex + +
omutable IndexPointer _cindex

- -

oBindingType _normal_binding + +
oBindingType _normal_binding

- +

omutable int _numnormals

- +

oVec3* _normals

- -

oIndexPointer _nindex + +
oIndexPointer _nindex

- -

oBindingType _color_binding + +
oBindingType _color_binding

- +

omutable int _numcolors

- +

oVec4* _colors

- -

oIndexPointer _colindex + +
oIndexPointer _colindex

- -

oBindingType _texture_binding + +
oBindingType _texture_binding

- +

omutable int _numtcoords

- +

oVec2* _tcoords

- -

oIndexPointer _tindex + +
oIndexPointer _tindex

- +

ovoid* _iarray

- -

oIndexPointer _iaindex + +
oIndexPointer _iaindex

- -

oInterleaveArrayType _iaformat + +
oInterleaveArrayType _iaformat

- +

ounsigned int _ogliaformat

- +

oint _fast_path

- +

ovoid set_fast_path( void )

- -

ovoid draw_fast_path( State& state ) + +
ovoid draw_fast_path( State& state ) const

- -

ovoid draw_alternate_path( State& state ) + +
ovoid draw_alternate_path( State& state ) const

This class has no child classes.
diff --git a/doc/doc++/osg/Geode.html b/doc/doc++/osg/Geode.html index b1e8d259d..5eb4a30f9 100644 --- a/doc/doc++/osg/Geode.html +++ b/doc/doc++/osg/Geode.html @@ -23,54 +23,59 @@

Public Methods

-[more]typedef std::vector< ref_ptr<Drawable> > DrawableList Geode() +[more] Geode()
-[more] Geode(const Geode&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Geode(const Geode&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy
-[more] META_Node(osg, Geode) +[more] META_Node(osg, Geode)
-[more]virtual const bool addDrawable( Drawable* drawable ) +[more]virtual bool addDrawable( Drawable* drawable )
Add Drawable to Geode.
-[more]virtual const bool removeDrawable( Drawable* drawable ) +[more]virtual bool removeDrawable( Drawable* drawable )
Remove Drawable from Geode.
-[more]virtual const bool replaceDrawable( Drawable* origDraw, Drawable* newDraw ) +[more]virtual bool replaceDrawable( Drawable* origDraw, Drawable* newDraw )
Replace specified Drawable with another Drawable.
-[more]inline const unsigned int getNumDrawables() const +[more]inline unsigned int getNumDrawables() const
return the number of geoset's
-[more]inline Drawable* getDrawable( const unsigned int i ) +[more]inline Drawable* getDrawable( unsigned int i )
return geoset at position i
-[more]inline const Drawable* getDrawable( const unsigned int i ) const +[more]inline const Drawable* getDrawable( unsigned int i ) const
return geoset at position i
-[more]inline const bool containsDrawable(const Drawable* gset) const +[more]inline bool containsDrawable(const Drawable* gset) const
return true if geoset is contained within Geode
-[more]inline DrawableList::iterator findDrawable(const Drawable* gset) +[more]inline DrawableList::iterator findDrawable(const Drawable* gset)
return the iterator position for specified Drawable.
-[more]inline DrawableList::const_iterator findDrawable(const Drawable* gset) const +[more]inline DrawableList::const_iterator findDrawable(const Drawable* gset) const
return the const_iterator position for specified Drawable.
-[more]void compileDrawables(State& state) +[more]void compileDrawables(State& state)
compile OpenGL Display List for each geoset

+

+

Public Members

+[more]typedef std::vector< ref_ptr<Drawable> > DrawableList +

+

Protected Fields

-[more]DrawableList _drawables +[more]DrawableList _drawables

Protected Methods

-[more]virtual ~Geode() +[more]virtual ~Geode()
-[more]virtual const bool computeBound() const +[more]virtual bool computeBound() const

@@ -81,22 +86,26 @@
Leaf Node for grouping Drawables
- - -
otypedef std::vector< ref_ptr<Drawable> > DrawableList Geode() + + +
otypedef std::vector< ref_ptr<Drawable> > DrawableList

- -

o Geode(const Geode&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o Geode() +

+ + +

o Geode(const Geode&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy

- +

o META_Node(osg, Geode)

- -

ovirtual const bool addDrawable( Drawable* drawable ) + +
ovirtual bool addDrawable( Drawable* drawable )
Add Drawable to Geode. If gset is not NULL and is not contained in Geode then increment its reference count, add it to the drawables list and dirty the bounding @@ -104,8 +113,8 @@ sphere to force it to recompute on next getBound() and return true for success. Otherwise return false.

- -

ovirtual const bool removeDrawable( Drawable* drawable ) + +
ovirtual bool removeDrawable( Drawable* drawable )
Remove Drawable from Geode. If gset is contained in Geode then remove it from the geoset list and decrement its reference count, and dirty the @@ -114,8 +123,8 @@ return true for success. If gset is not found then return false and do not change the reference count of gset.

- -

ovirtual const bool replaceDrawable( Drawable* origDraw, Drawable* newDraw ) + +
ovirtual bool replaceDrawable( Drawable* origDraw, Drawable* newDraw )
Replace specified Drawable with another Drawable. Decrement the reference count origGSet and increments the reference count of newGset, and dirty the bounding sphere @@ -125,53 +134,53 @@ add newGset. If newGset is NULL then return false and do not remove origGset.

- -

oinline const unsigned int getNumDrawables() const + +
oinline unsigned int getNumDrawables() const
return the number of geoset's

- -

oinline Drawable* getDrawable( const unsigned int i ) + +
oinline Drawable* getDrawable( unsigned int i )
return geoset at position i

- -

oinline const Drawable* getDrawable( const unsigned int i ) const + +
oinline const Drawable* getDrawable( unsigned int i ) const
return geoset at position i

- -

oinline const bool containsDrawable(const Drawable* gset) const + +
oinline bool containsDrawable(const Drawable* gset) const
return true if geoset is contained within Geode

- +

oinline DrawableList::iterator findDrawable(const Drawable* gset)
return the iterator position for specified Drawable. return _geoset.end() if gset not is contained in Geode.

- +

oinline DrawableList::const_iterator findDrawable(const Drawable* gset) const
return the const_iterator position for specified Drawable. return _geoset.end() if gset not is contained in Geode.

- +

ovoid compileDrawables(State& state)
compile OpenGL Display List for each geoset

- +

ovirtual ~Geode()

- -

ovirtual const bool computeBound() const + +
ovirtual bool computeBound() const

- -

oDrawableList _drawables + +
oDrawableList _drawables

Direct child classes: diff --git a/doc/doc++/osg/Geometry.html b/doc/doc++/osg/Geometry.html index 51ddacec7..7d3201ffd 100644 --- a/doc/doc++/osg/Geometry.html +++ b/doc/doc++/osg/Geometry.html @@ -22,142 +22,217 @@

Public Methods

-[more] Geometry() +[more] Geometry()
-[more] Geometry(const Geometry& geometry, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Geometry(const Geometry& geometry, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy
-[more]virtual Object* cloneType() const +[more]virtual Object* cloneType() const
-[more]virtual Object* clone(const CopyOp& copyop) const +[more]virtual Object* clone(const CopyOp& copyop) const
-[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
-[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
-[more]virtual const char* className() const +[more]virtual const char* className() const
-[more]void setVertexArray(Vec3Array* array) +[more]virtual Geometry* asGeometry()
-[more]Vec3Array* getVertexArray() +[more]virtual const Geometry* asGeometry() const
-[more]const Vec3Array* getVertexArray() const +[more]void setVertexArray(Vec3Array* array)
-[more]void setNormalBinding(AttributeBinding ab) +[more]Vec3Array* getVertexArray()
-[more]AttributeBinding getNormalBinding() const +[more]const Vec3Array* getVertexArray() const
-[more]void setNormalArray(Vec3Array* array) +[more]void setVertexIndices(IndexArray* array)
-[more]Vec3Array* getNormalArray() +[more]IndexArray* getVertexIndices()
-[more]const Vec3Array* getNormalArray() const +[more]const IndexArray* getVertexIndices() const
-[more]void setColorBinding(AttributeBinding ab) +[more]void setNormalBinding(AttributeBinding ab)
-[more]AttributeBinding getColorBinding() const +[more]AttributeBinding getNormalBinding() const
-[more]void setColorArray(Array* array) +[more]void setNormalArray(Vec3Array* array)
-[more]Array* getColorArray() +[more]Vec3Array* getNormalArray()
-[more]const Array* getColorArray() const +[more]const Vec3Array* getNormalArray() const
-[more]void setSecondaryColorBinding(AttributeBinding ab) +[more]void setNormalIndices(IndexArray* array)
-[more]AttributeBinding getSecondaryColorBinding() const +[more]IndexArray* getNormalIndices()
-[more]void setSecondaryColorArray(Array* array) +[more]const IndexArray* getNormalIndices() const
-[more]Array* getSecondaryColorArray() +[more]void setColorBinding(AttributeBinding ab)
-[more]const Array* getSecondaryColorArray() const +[more]AttributeBinding getColorBinding() const
-[more]void setFogCoordBinding(AttributeBinding ab) +[more]void setColorArray(Array* array)
-[more]AttributeBinding getFogCoordBinding() const +[more]Array* getColorArray()
-[more]void setFogCoordArray(FloatArray* array) +[more]const Array* getColorArray() const
-[more]FloatArray* getFogCoordArray() +[more]void setColorIndices(IndexArray* array)
-[more]const FloatArray* getFogCoordArray() const +[more]IndexArray* getColorIndices()
-[more]typedef std::vector< ref_ptr<Array> > TexCoordArrayList void setTexCoordArray(unsigned int unit, Array*) +[more]const IndexArray* getColorIndices() const
-[more]Array* getTexCoordArray(unsigned int unit) +[more]void setSecondaryColorBinding(AttributeBinding ab)
-[more]const Array* getTexCoordArray(unsigned int unit) const +[more]AttributeBinding getSecondaryColorBinding() const
-[more]unsigned int getNumTexCoordArrays() const +[more]void setSecondaryColorArray(Array* array)
-[more]TexCoordArrayList& getTexCoordArrayList() +[more]Array* getSecondaryColorArray()
-[more]const TexCoordArrayList& getTexCoordArrayList() const +[more]const Array* getSecondaryColorArray() const
-[more]typedef std::vector< ref_ptr<Primitive> > PrimitiveList void setPrimitiveList(const PrimitiveList& primitives) +[more]void setSecondaryColorIndices(IndexArray* array)
-[more]PrimitiveList& getPrimitiveList() +[more]IndexArray* getSecondaryColorIndices()
-[more]const PrimitiveList& getPrimitiveList() const +[more]const IndexArray* getSecondaryColorIndices() const
-[more]unsigned int getNumPrimitives() const +[more]void setFogCoordBinding(AttributeBinding ab)
-[more]Primitive* getPrimitive(unsigned int pos) +[more]AttributeBinding getFogCoordBinding() const
-[more]const Primitive* getPrimitive(unsigned int pos) const +[more]void setFogCoordArray(FloatArray* array)
-[more]void addPrimitive(Primitive* primitive) +[more]FloatArray* getFogCoordArray()
-[more]bool verifyBindings() const +[more]const FloatArray* getFogCoordArray() const
-[more]void computeCorrectBindingsAndArraySizes() +[more]void setFogCoordIndices(IndexArray* array)
-[more]virtual void drawImmediateMode(State& state) +[more]IndexArray* getFogCoordIndices() +
+[more]const IndexArray* getFogCoordIndices() const +
+[more]void setTexCoordArray(unsigned int unit, Array*) +
+[more]Array* getTexCoordArray(unsigned int unit) +
+[more]const Array* getTexCoordArray(unsigned int unit) const +
+[more]void setTexCoordIndices(unsigned int unit, IndexArray*) +
+[more]IndexArray* getTexCoordIndices(unsigned int unit) +
+[more]const IndexArray* getTexCoordIndices(unsigned int unit) const +
+[more]unsigned int getNumTexCoordArrays() const +
+[more]TexCoordArrayList& getTexCoordArrayList() +
+[more]const TexCoordArrayList& getTexCoordArrayList() const +
+[more]void setPrimitiveSetList(const PrimitiveSetList& primitives) +
+[more]PrimitiveSetList& getPrimitiveSetList() +
+[more]const PrimitiveSetList& getPrimitiveSetList() const +
+[more]unsigned int getNumPrimitiveSets() const +
+[more]PrimitiveSet* getPrimitiveSet(unsigned int pos) +
+[more]const PrimitiveSet* getPrimitiveSet(unsigned int pos) const +
+[more]void addPrimitiveSet(PrimitiveSet* primitive) +
+[more]bool areFastPathsUsed() const +
return true if OpenGL fast paths will be used with drawing this Geometry. +
+[more]bool verifyBindings() const +
+[more]void computeCorrectBindingsAndArraySizes() +
+[more]virtual void drawImplementation(State& state) const
draw Geometry directly ignoring an OpenGL display list which could be attached.
-[more]virtual void accept(AttributeFunctor& af) +[more]virtual bool supports(AttributeFunctor&) const +
return true, osg::Geometry does support accept(AttributeFunctor&) +
+[more]virtual void accept(AttributeFunctor& af)
accept an AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has
-[more]virtual void accept(PrimitiveFunctor& pf) +[more]virtual bool supports(ConstAttributeFunctor&) const +
return true, osg::Geometry does support accept(ConstAttributeFunctor&) +
+[more]virtual void accept(ConstAttributeFunctor& af) const +
accept an ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has +
+[more]virtual bool supports(PrimitiveFunctor&) const +
return true, osg::Geometry does support accept(PrimitiveFunctor&) +
+[more]virtual void accept(PrimitiveFunctor& pf) const
accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has

Public Members

-[more]enum AttributeBinding +[more]enum AttributeBinding +
+[more]typedef std::pair< ref_ptr<Array>, ref_ptr<IndexArray> > TexCoordArrayPair +
+[more]typedef std::vector< TexCoordArrayPair > TexCoordArrayList +
+[more]typedef std::vector< ref_ptr<PrimitiveSet> > PrimitiveSetList

Protected Fields

-[more]PrimitiveList _primitives +[more]PrimitiveSetList _primitives
-[more]ref_ptr<Vec3Array> _vertexArray +[more]ref_ptr<Vec3Array> _vertexArray
-[more]AttributeBinding _normalBinding +[more]ref_ptr<IndexArray> _vertexIndices
-[more]ref_ptr<Vec3Array> _normalArray +[more]mutable AttributeBinding _normalBinding
-[more]AttributeBinding _colorBinding +[more]ref_ptr<Vec3Array> _normalArray
-[more]ref_ptr<Array> _colorArray +[more]ref_ptr<IndexArray> _normalIndices
-[more]AttributeBinding _secondaryColorBinding +[more]mutable AttributeBinding _colorBinding
-[more]ref_ptr<Array> _secondaryColorArray +[more]ref_ptr<Array> _colorArray
-[more]AttributeBinding _fogCoordBinding +[more]ref_ptr<IndexArray> _colorIndices
-[more]ref_ptr<FloatArray> _fogCoordArray +[more]mutable AttributeBinding _secondaryColorBinding
-[more]TexCoordArrayList _texCoordList +[more]ref_ptr<Array> _secondaryColorArray +
+[more]ref_ptr<IndexArray> _secondaryColorIndices +
+[more]mutable AttributeBinding _fogCoordBinding +
+[more]ref_ptr<FloatArray> _fogCoordArray +
+[more]ref_ptr<IndexArray> _fogCoordIndices +
+[more]TexCoordArrayList _texCoordList +
+[more]mutable bool _fastPathComputed +
+[more]mutable bool _fastPath

Protected Methods

-[more]Geometry& operator = (const Geometry&) +[more]Geometry& operator = (const Geometry&)
-[more]virtual ~Geometry() +[more]virtual ~Geometry()

@@ -165,15 +240,15 @@

Public Methods

-oinline const ParentList& getParents() const +oinline const ParentList& getParents() const
-oinline ParentList getParents() +oinline ParentList getParents()
-oinline Node* getParent(const unsigned int i) +oinline Node* getParent(unsigned int i)
-oinline const Node* getParent(const unsigned int i) const +oinline const Node* getParent(unsigned int i) const
-oinline const unsigned int getNumParents() const +oinline unsigned int getNumParents() const
oinline void setStateSet(StateSet* state)
@@ -181,43 +256,51 @@
oinline const StateSet* getStateSet() const
-ovoid setSupportsDisplayList(const bool flag) -
-oinline const bool getSupportsDisplayList() const -
-ovoid setUseDisplayList(const bool flag) -
-oinline const bool getUseDisplayList() const -
-ovoid dirtyDisplayList() +oStateSet* getOrCreateStateSet()
ovoid dirtyBound()
oinline const BoundingBox& getBound() const
+oinline void setShape(Shape* shape) +
+oinline Shape* getShape() +
+oinline const Shape* getShape() const +
+ovoid setSupportsDisplayList(bool flag) +
+oinline bool getSupportsDisplayList() const +
+ovoid setUseDisplayList(bool flag) +
+oinline bool getUseDisplayList() const +
+ovoid dirtyDisplayList() +
ovoid compile(State& state)
-ovoid setAppCallback(AppCallback* ac) +ovoid setAppCallback(AppCallback* ac)
-oAppCallback* getAppCallback() +oAppCallback* getAppCallback()
-oconst AppCallback* getAppCallback() const +oconst AppCallback* getAppCallback() const
-ovoid setCullCallback(CullCallback* cc) +ovoid setCullCallback(CullCallback* cc)
-oCullCallback* getCullCallback() +oCullCallback* getCullCallback()
-oconst CullCallback* getCullCallback() const +oconst CullCallback* getCullCallback() const
-ovoid setDrawCallback(DrawCallback* dc) +ovoid setDrawCallback(DrawCallback* dc)
-oDrawCallback* getDrawCallback() +oDrawCallback* getDrawCallback()
-oconst DrawCallback* getDrawCallback() const +oconst DrawCallback* getDrawCallback() const
-ostatic void deleteDisplayList(uint contextID, uint globj) +ostatic void deleteDisplayList(uint contextID, uint globj)
-ostatic void flushDeletedDisplayLists(uint contextID) +ostatic void flushDeletedDisplayLists(uint contextID)
oinline void draw(State& state)

@@ -236,33 +319,41 @@
class AttributeFunctor
+class ConstAttributeFunctor +
class PrimitiveFunctor

Protected Fields

-oParentList _parents +oParentList _parents
-oref_ptr<StateSet> _dstate -
-obool _supportsDisplayList -
-obool _useDisplayList +oref_ptr<StateSet> _stateset
omutable BoundingBox _bbox
omutable bool _bbox_computed
-oref_ptr<AppCallback> _appCallback +oref_ptr<Shape> _shape
-oref_ptr<DrawCallback> _drawCallback +obool _supportsDisplayList
-oref_ptr<CullCallback> _cullCallback +obool _useDisplayList +
+omutable GLObjectList _globjList +
+oref_ptr<AppCallback> _appCallback +
+oref_ptr<DrawCallback> _drawCallback +
+oref_ptr<CullCallback> _cullCallback +
+ostatic DeletedDisplayListCache s_deletedDisplayListCache

Protected Methods

-ovirtual const bool computeBound() const +ovirtual bool computeBound() const
ovoid addParent(osg::Node* node)
@@ -271,9 +362,9 @@ class PrimitiveFunctor

Protected Members

-otypedef std::vector<uint> GLObjectList mutable GLObjectList _globjList +otypedef std::vector<uint> GLObjectList
-otypedef std::map<uint,std::set<uint> >static DeletedDisplayListCache DeletedDisplayListCache s_deletedDisplayListCache +otypedef std::map<uint,std::set<uint> > DeletedDisplayListCache

@@ -281,9 +372,9 @@ class PrimitiveFunctor

Public Methods

-oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
-oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -299,7 +390,7 @@ class PrimitiveFunctor

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -315,12 +406,20 @@ class PrimitiveFunctor
oinline void unref_nodelete() const
-oinline const int referenceCount() const +oinline int referenceCount() const +
+oinline static int createdCount() +
+oinline static int deletedCount()

Protected Fields

omutable int _refCount +
+ostatic int _createdCount +
+ostatic int _deletedCount

@@ -331,276 +430,428 @@ class PrimitiveFunctor
- +
o Geometry()

- -

o Geometry(const Geometry& geometry, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o Geometry(const Geometry& geometry, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy

- +

ovirtual Object* cloneType() const

- +

ovirtual Object* clone(const CopyOp& copyop) const

- +

ovirtual bool isSameKindAs(const Object* obj) const

- +

ovirtual const char* libraryName() const

- +

ovirtual const char* className() const

+ + +

ovirtual Geometry* asGeometry() +

+ + +

ovirtual const Geometry* asGeometry() const +

- +

oenum AttributeBinding

- +
o BIND_OFF

- +

o BIND_OVERALL

+ + +

o BIND_PER_PRIMITIVE_SET +

- +

o BIND_PER_PRIMITIVE

- +

o BIND_PER_VERTEX

- -
ovoid setVertexArray(Vec3Array* array) + +
ovoid setVertexArray(Vec3Array* array)

- -

oVec3Array* getVertexArray() + +
oVec3Array* getVertexArray()

- -

oconst Vec3Array* getVertexArray() const + +
oconst Vec3Array* getVertexArray() const +

+ + +

ovoid setVertexIndices(IndexArray* array) +

+ + +

oIndexArray* getVertexIndices() +

+ + +

oconst IndexArray* getVertexIndices() const

- -

ovoid setNormalBinding(AttributeBinding ab) + +
ovoid setNormalBinding(AttributeBinding ab)

- -

oAttributeBinding getNormalBinding() const + +
oAttributeBinding getNormalBinding() const

- -

ovoid setNormalArray(Vec3Array* array) + +
ovoid setNormalArray(Vec3Array* array)

- -

oVec3Array* getNormalArray() + +
oVec3Array* getNormalArray()

- -

oconst Vec3Array* getNormalArray() const + +
oconst Vec3Array* getNormalArray() const +

+ + +

ovoid setNormalIndices(IndexArray* array) +

+ + +

oIndexArray* getNormalIndices() +

+ + +

oconst IndexArray* getNormalIndices() const

- -

ovoid setColorBinding(AttributeBinding ab) + +
ovoid setColorBinding(AttributeBinding ab)

- -

oAttributeBinding getColorBinding() const + +
oAttributeBinding getColorBinding() const

- +

ovoid setColorArray(Array* array)

- +

oArray* getColorArray()

- +

oconst Array* getColorArray() const

+ + +

ovoid setColorIndices(IndexArray* array) +

+ + +

oIndexArray* getColorIndices() +

+ + +

oconst IndexArray* getColorIndices() const +

- -

ovoid setSecondaryColorBinding(AttributeBinding ab) + +
ovoid setSecondaryColorBinding(AttributeBinding ab)

- -

oAttributeBinding getSecondaryColorBinding() const + +
oAttributeBinding getSecondaryColorBinding() const

- +

ovoid setSecondaryColorArray(Array* array)

- +

oArray* getSecondaryColorArray()

- +

oconst Array* getSecondaryColorArray() const

+ + +

ovoid setSecondaryColorIndices(IndexArray* array) +

+ + +

oIndexArray* getSecondaryColorIndices() +

+ + +

oconst IndexArray* getSecondaryColorIndices() const +

- -

ovoid setFogCoordBinding(AttributeBinding ab) + +
ovoid setFogCoordBinding(AttributeBinding ab)

- -

oAttributeBinding getFogCoordBinding() const + +
oAttributeBinding getFogCoordBinding() const

- -

ovoid setFogCoordArray(FloatArray* array) + +
ovoid setFogCoordArray(FloatArray* array)

- -

oFloatArray* getFogCoordArray() + +
oFloatArray* getFogCoordArray()

- -

oconst FloatArray* getFogCoordArray() const + +
oconst FloatArray* getFogCoordArray() const +

+ + +

ovoid setFogCoordIndices(IndexArray* array) +

+ + +

oIndexArray* getFogCoordIndices() +

+ + +

oconst IndexArray* getFogCoordIndices() const +

+ + +

otypedef std::pair< ref_ptr<Array>, ref_ptr<IndexArray> > TexCoordArrayPair +

+ + +

otypedef std::vector< TexCoordArrayPair > TexCoordArrayList

- -

otypedef std::vector< ref_ptr<Array> > TexCoordArrayList void setTexCoordArray(unsigned int unit, Array*) + +
ovoid setTexCoordArray(unsigned int unit, Array*)

- +

oArray* getTexCoordArray(unsigned int unit)

- +

oconst Array* getTexCoordArray(unsigned int unit) const

+ + +

ovoid setTexCoordIndices(unsigned int unit, IndexArray*) +

+ + +

oIndexArray* getTexCoordIndices(unsigned int unit) +

+ + +

oconst IndexArray* getTexCoordIndices(unsigned int unit) const +

- +

ounsigned int getNumTexCoordArrays() const

- -

oTexCoordArrayList& getTexCoordArrayList() + +
oTexCoordArrayList& getTexCoordArrayList()

- -

oconst TexCoordArrayList& getTexCoordArrayList() const + +
oconst TexCoordArrayList& getTexCoordArrayList() const

- - -

otypedef std::vector< ref_ptr<Primitive> > PrimitiveList void setPrimitiveList(const PrimitiveList& primitives) + + +
otypedef std::vector< ref_ptr<PrimitiveSet> > PrimitiveSetList

- - -

oPrimitiveList& getPrimitiveList() + + +
ovoid setPrimitiveSetList(const PrimitiveSetList& primitives)

- - -

oconst PrimitiveList& getPrimitiveList() const + + +
oPrimitiveSetList& getPrimitiveSetList()

- - -

ounsigned int getNumPrimitives() const + + +
oconst PrimitiveSetList& getPrimitiveSetList() const

- - -

oPrimitive* getPrimitive(unsigned int pos) + + +
ounsigned int getNumPrimitiveSets() const

- - -

oconst Primitive* getPrimitive(unsigned int pos) const + + +
oPrimitiveSet* getPrimitiveSet(unsigned int pos)

- - -

ovoid addPrimitive(Primitive* primitive) + + +
oconst PrimitiveSet* getPrimitiveSet(unsigned int pos) const +

+ + +

ovoid addPrimitiveSet(PrimitiveSet* primitive) +

+ + +

obool areFastPathsUsed() const +
return true if OpenGL fast paths will be used with drawing this Geometry. +Fast paths use vertex arrays, and glDrawArrays/glDrawElements. Slow paths +use glBegin()/glVertex.../glEnd(). Use of per primtive bindings or per vertex indexed +arrays will drop the rendering path off the fast path.

- +

obool verifyBindings() const

- +

ovoid computeCorrectBindingsAndArraySizes()

- - -

ovirtual void drawImmediateMode(State& state) + + +
ovirtual void drawImplementation(State& state) const
draw Geometry directly ignoring an OpenGL display list which could be attached. This is the internal draw method which does the drawing itself, and is the method to override when deriving from Geometry for user-drawn objects.

+ + +

ovirtual bool supports(AttributeFunctor&) const +
return true, osg::Geometry does support accept(AttributeFunctor&) +

- +

ovirtual void accept(AttributeFunctor& af)
accept an AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has

+ + +

ovirtual bool supports(ConstAttributeFunctor&) const +
return true, osg::Geometry does support accept(ConstAttributeFunctor&) +

- -

ovirtual void accept(PrimitiveFunctor& pf) + +
ovirtual void accept(ConstAttributeFunctor& af) const +
accept an ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has +

+ + +

ovirtual bool supports(PrimitiveFunctor&) const +
return true, osg::Geometry does support accept(PrimitiveFunctor&) +

+ + +

ovirtual void accept(PrimitiveFunctor& pf) const
accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has

- +

oGeometry& operator = (const Geometry&)

- +

ovirtual ~Geometry()

- -

oPrimitiveList _primitives + +
oPrimitiveSetList _primitives

- -

oref_ptr<Vec3Array> _vertexArray + +
oref_ptr<Vec3Array> _vertexArray +

+ + +

oref_ptr<IndexArray> _vertexIndices

- -

oAttributeBinding _normalBinding + +
omutable AttributeBinding _normalBinding

- -

oref_ptr<Vec3Array> _normalArray + +
oref_ptr<Vec3Array> _normalArray +

+ + +

oref_ptr<IndexArray> _normalIndices

- -

oAttributeBinding _colorBinding + +
omutable AttributeBinding _colorBinding

- +

oref_ptr<Array> _colorArray

+ + +

oref_ptr<IndexArray> _colorIndices +

- -

oAttributeBinding _secondaryColorBinding + +
omutable AttributeBinding _secondaryColorBinding

- +

oref_ptr<Array> _secondaryColorArray

+ + +

oref_ptr<IndexArray> _secondaryColorIndices +

- -

oAttributeBinding _fogCoordBinding + +
omutable AttributeBinding _fogCoordBinding

- -

oref_ptr<FloatArray> _fogCoordArray + +
oref_ptr<FloatArray> _fogCoordArray +

+ + +

oref_ptr<IndexArray> _fogCoordIndices

- -

oTexCoordArrayList _texCoordList + +
oTexCoordArrayList _texCoordList +

+ + +

omutable bool _fastPathComputed +

+ + +

omutable bool _fastPath

This class has no child classes.
diff --git a/doc/doc++/osg/Group.html b/doc/doc++/osg/Group.html index 734a71bc4..8d503bb81 100644 --- a/doc/doc++/osg/Group.html +++ b/doc/doc++/osg/Group.html @@ -23,53 +23,65 @@

Public Methods

-[more]typedef std::vector<ref_ptr<Node> > ChildList Group() +[more] Group()
-[more] Group(const Group&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Group(const Group&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy
-[more] META_Node(osg, Group) +[more] META_Node(osg, Group)
-[more]virtual void traverse(NodeVisitor& nv) +[more]virtual Group* asGroup()
-[more]virtual bool addChild( Node* child ) +[more]virtual const Group* asGroup() const +
+[more]virtual void traverse(NodeVisitor& nv) +
+[more]virtual bool addChild( Node* child )
Add Node to Group.
-[more]virtual bool removeChild( Node* child ) +[more]virtual bool removeChild( Node* child )
Remove Node from Group.
-[more]virtual bool replaceChild( Node* origChild, Node* newChild ) +[more]virtual bool replaceChild( Node* origChild, Node* newChild )
Replace specified Node with another Node.
-[more]inline const unsigned int getNumChildren() const +[more]inline unsigned int getNumChildren() const
return the number of chilren nodes
-[more]inline Node* getChild( const unsigned int i ) +[more]inline Node* getChild( unsigned int i )
return child node at position i
-[more]inline const Node* getChild( const unsigned int i ) const +[more]inline const Node* getChild( unsigned int i ) const
return child node at position i
-[more]inline bool containsNode( const Node* node ) const +[more]inline bool containsNode( const Node* node ) const
return true if node is contained within Group
-[more]inline ChildList::iterator findNode( const Node* node ) +[more]inline ChildList::iterator findNode( const Node* node )
return the iterator position for specified Node.
-[more]inline ChildList::const_iterator findNode( const Node* node ) const +[more]inline ChildList::const_iterator findNode( const Node* node ) const
return the const_iterator position for specified Node. +
+[more]inline unsigned int findChildNo( const Node* node ) const +
Find the index number of child, return a value between 0 and _childrensize()-1 if found, if not found then return _childrensize() +

+ +

+

Public Members

+[more]typedef std::vector<ref_ptr<Node> > ChildList

Protected Fields

-[more]ChildList _children +[more]ChildList _children

Protected Methods

-[more]virtual ~Group() +[more]virtual ~Group()
-[more]virtual const bool computeBound() const +[more]virtual bool computeBound() const

@@ -82,25 +94,37 @@ Children are reference counted. This allows children to be shared with memory management handled automatically via osg::Referenced.
- - -
otypedef std::vector<ref_ptr<Node> > ChildList Group() + + +
otypedef std::vector<ref_ptr<Node> > ChildList

- -

o Group(const Group&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o Group() +

+ + +

o Group(const Group&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
Copy constructor using CopyOp to manage deep vs shallow copy

- +

o META_Node(osg, Group)

+ + +

ovirtual Group* asGroup() +

+ + +

ovirtual const Group* asGroup() const +

- +

ovirtual void traverse(NodeVisitor& nv)

- +

ovirtual bool addChild( Node* child )
Add Node to Group. If node is not NULL and is not contained in Group then increment its @@ -109,7 +133,7 @@ sphere to force it to recompute on next getBound() and return true for success. Otherwise return false. Scene nodes can't be added as child nodes.

- +

ovirtual bool removeChild( Node* child )
Remove Node from Group. If Node is contained in Group then remove it from the child @@ -119,7 +143,7 @@ return true for success. If Node is not found then return false and do not change the reference count of the Node.

- +

ovirtual bool replaceChild( Node* origChild, Node* newChild )
Replace specified Node with another Node. Decrement the reference count origNode and increments the @@ -130,48 +154,55 @@ add newNode. If newNode is NULL then return false and do not remove origNode. Also returns false if newChild is a Scene node.

- -

oinline const unsigned int getNumChildren() const + +
oinline unsigned int getNumChildren() const
return the number of chilren nodes

- -

oinline Node* getChild( const unsigned int i ) + +
oinline Node* getChild( unsigned int i )
return child node at position i

- -

oinline const Node* getChild( const unsigned int i ) const + +
oinline const Node* getChild( unsigned int i ) const
return child node at position i

- +

oinline bool containsNode( const Node* node ) const
return true if node is contained within Group

- +

oinline ChildList::iterator findNode( const Node* node )
return the iterator position for specified Node. return _children.end() if node is not contained in Group.

- +

oinline ChildList::const_iterator findNode( const Node* node ) const
return the const_iterator position for specified Node. return _children.end() if node is not contained in Group.

+ + +

oinline unsigned int findChildNo( const Node* node ) const +
Find the index number of child, return a value between +0 and _childrensize()-1 if found, if not found then +return _childrensize() +

- +

ovirtual ~Group()

- -

ovirtual const bool computeBound() const + +
ovirtual bool computeBound() const

- -

oChildList _children + +
oChildList _children

Direct child classes: diff --git a/doc/doc++/osg/HIER.html b/doc/doc++/osg/HIER.html index 5a6755e0f..8d8c3f73d 100644 --- a/doc/doc++/osg/HIER.html +++ b/doc/doc++/osg/HIER.html @@ -13,6 +13,10 @@
  • osg::Drawable::AttributeFunctor
  • osg::BoundingBox
  • osg::BoundingSphere +
  • osg::ConstArrayVisitor +
  • osg::Drawable::ConstAttributeFunctor +
  • osg::ConstShapeVisitor +
  • osg::ConstValueVisitor
  • osg::ConvexPlanarPolygon
  • osg::CopyOp
  • osg::CullStack -
  • osg::Plane +
  • osg::Plane +
  • osg::Polytope
  • osg::Drawable::PrimitiveFunctor +
  • osg::ImpostorSprite +
  • osg::ShapeDrawable
  • osg::Image
  • osg::Matrix -
  • osg::Primitive +
  • osg::StateSet +
  • osg::TessellationHints
  • osg::State
  • osg::Statistics -
  • osg::TextureCubeMap::SubloadCallback
  • osg::Texture1D::SubloadCallback +
  • osg::TextureCubeMap::SubloadCallback
  • osg::Texture3D::SubloadCallback
  • osg::Texture2D::SubloadCallback
  • osgUtx::Test
      @@ -146,6 +180,7 @@
  • osg::ShadowVolumeOccluder +
  • osg::ShapeVisitor
  • osgUtx::TestContext
  • osgUtx::TestGraph
  • osgUtx::TestRecord @@ -167,25 +202,15 @@
  • osgUtx::TestContext::TraceStream
  • osg::TriangleFunctor
  • osg::UByte4 +
  • osg::ValueVisitor
  • osg::Vec2
  • osg::Vec3
  • osg::Vec4 -
  • osg::VectorSizei - -
  • osg::VectorUByte - -
  • osg::VectorUInt - -
  • osg::VectorUShort - +
  • osg::VectorSizei +
  • osg::VectorUByte +
  • osg::VectorUInt +
  • osg::VectorUShort +
  • osg::buffered_value
  • osg::fast_back_stack
  • osg::ref_ptr

    Alphabetic index

    diff --git a/doc/doc++/osg/HIERjava.html b/doc/doc++/osg/HIERjava.html index 9f054dbc8..33c9ff133 100644 --- a/doc/doc++/osg/HIERjava.html +++ b/doc/doc++/osg/HIERjava.html @@ -30,6 +30,27 @@
    • + + + + + + + + + + + + + + + + + + + + + @@ -57,6 +78,13 @@ + + + + + + + @@ -78,11 +106,11 @@ - - - - - + + + + + @@ -99,11 +127,11 @@ - - - - - + + + + + @@ -114,6 +142,13 @@ + + + + + + + @@ -135,6 +170,13 @@ + + + + + + + @@ -155,32 +197,39 @@ - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + + + + + + + + diff --git a/doc/doc++/osg/Image.html b/doc/doc++/osg/Image.html index ecb17060d..bd5d38a71 100644 --- a/doc/doc++/osg/Image.html +++ b/doc/doc++/osg/Image.html @@ -23,152 +23,155 @@

    Public Methods

    -[more] Image() +[more] Image()
    -[more] Image(const Image& image, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Image(const Image& image, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more]virtual Object* cloneType() const +[more]virtual Object* cloneType() const
    -[more]virtual Object* clone(const CopyOp& copyop) const +[more]virtual Object* clone(const CopyOp& copyop) const
    -[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
    -[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    -[more]void setFileName(const std::string& fileName) +[more]void setFileName(const std::string& fileName)
    -[more]inline const std::string& getFileName() const +[more]inline const std::string& getFileName() const
    -[more]void allocateImage(int s, int t, int r, GLenum format, GLenum type, int packing=1) +[more]void allocateImage(int s, int t, int r, GLenum format, GLenum type, int packing=1)
    -[more]void setImage(int s, int t, int r, GLint internalTextureformat, GLenum format, GLenum type, unsigned char* data, int packing=1) +[more]void setImage(int s, int t, int r, GLint internalTextureformat, GLenum format, GLenum type, unsigned char* data, int packing=1)
    set the image data and format.
    -[more]void readPixels(int x, int y, int width, int height, GLenum format, GLenum type) +[more]void readPixels(int x, int y, int width, int height, GLenum format, GLenum type)
    readPixels from screen at specified position and size, using glReadPixels.
    -[more]void scaleImage(const int s, const int t, const int r) +[more]void scaleImage(int s, int t, int r)
    Scale image to specified size.
    -[more]void copySubImage(int s_offset, int t_offset, int r_offset, osg::Image* source) +[more]void copySubImage(int s_offset, int t_offset, int r_offset, osg::Image* source)
    Copy a source Image into a subpart of this Image at specified position.
    -[more]inline const int s() const +[more]inline int s() const
    Width of image
    -[more]inline const int t() const +[more]inline int t() const
    Height of image
    -[more]inline const int r() const +[more]inline int r() const
    Depth of image
    -[more]void setInternalTextureFormat(GLint internalFormat) +[more]void setInternalTextureFormat(GLint internalFormat)
    -[more]inline const GLint getInternalTextureFormat() const +[more]inline GLint getInternalTextureFormat() const
    -[more]void setPixelFormat(const GLenum format) +[more]void setPixelFormat(GLenum format)
    -[more]inline const GLenum getPixelFormat() const +[more]inline GLenum getPixelFormat() const
    -[more]inline const GLenum getDataType() const +[more]inline GLenum getDataType() const
    -[more]inline const unsigned int getPacking() const +[more]inline unsigned int getPacking() const
    -[more]inline const unsigned int getPixelSizeInBits() const +[more]inline unsigned int getPixelSizeInBits() const
    return the numbers of bits required for each pixel
    -[more]inline const unsigned int getRowSizeInBytes() const +[more]inline unsigned int getRowSizeInBytes() const
    return the numbers of bytes each row of pixels occupies once it has been packed
    -[more]inline const unsigned int getImageSizeInBytes() const +[more]inline unsigned int getImageSizeInBytes() const
    return the numbers of bytes each image (_s*_t) of pixels occupies
    -[more]inline const unsigned int getTotalSizeInBytes() const +[more]inline unsigned int getTotalSizeInBytes() const
    return the numbers of bytes the whole row/image/volume of pixels occupies
    -[more]inline unsigned char* data() +[more]inline unsigned char* data()
    raw image data
    -[more]inline const unsigned char* data() const +[more]inline const unsigned char* data() const
    raw const image data
    -[more]inline unsigned char* data(int column, int row=0, int image=0) +[more]inline unsigned char* data(int column, int row=0, int image=0) const
    -[more]inline const unsigned char* data(int column, int row=0, int image=0) const -
    -[more]void flipHorizontal(int image=0) +[more]void flipHorizontal(int image=0)
    Flip the image horizontally
    -[more]void flipVertical(int image=0) +[more]void flipVertical(int image=0)
    Flip the image vertically
    -[more]void ensureValidSizeForTexturing() +[more]void ensureValidSizeForTexturing(GLint maxTextureSize)
    Ensure image dimensions are a power of two.
    -[more]inline void dirty() +[more]inline void dirty()
    Dirty the image, which increments the modified flag, to force osg::Texture to reload the image
    -[more]inline void setModifiedTag(const unsigned int value) +[more]inline void setModifiedTag(unsigned int value)
    Set the modified tag value, only used by osg::Texture when using texture subloading.
    -[more]inline const unsigned int getModifiedTag() const +[more]inline unsigned int getModifiedTag() const
    Get modified tag value, only used by osg::Texture when using texture subloading.
    -[more]static const bool isPackedType(GLenum type) +[more]static bool isPackedType(GLenum type)
    -[more]static const unsigned int computeNumComponents(GLenum format) +[more]static unsigned int computeNumComponents(GLenum format)
    -[more]static const unsigned int computePixelSizeInBits(GLenum format, GLenum type) +[more]static unsigned int computePixelSizeInBits(GLenum format, GLenum type)
    -[more]static const unsigned int computeRowWidthInBytes(int width, GLenum format, GLenum type, int packing) +[more]static unsigned int computeRowWidthInBytes(int width, GLenum format, GLenum type, int packing)
    -[more]static const unsigned int computeNearestPowerOfTwo(unsigned int s, float bias=0.5f) +[more]static unsigned int computeNearestPowerOfTwo(unsigned int s, float bias=0.5f)
    -[more]typedef std::vector< unsigned int >inline MipmapDataType bool isMipmap() const +[more]inline bool isMipmap() const
    -[more]unsigned int getNumMipmapLevels() const +[more]unsigned int getNumMipmapLevels() const
    -[more]inline void setMipmapData(const MipmapDataType& mipmapDataVector) +[more]inline void setMipmapData(const MipmapDataType& mipmapDataVector)
    -[more]inline unsigned char* getMipmapData(unsigned int mipmapNumber) const +[more]inline unsigned char* getMipmapData(unsigned int mipmapNumber) const
    -[more]void computeMipMaps() +[more]void computeMipMaps()
    converts a single image into mip mapped version image

    +

    +

    Public Members

    +[more]typedef std::vector< unsigned int > MipmapDataType +

    +

    Protected Fields

    -[more]std::string _fileName +[more]std::string _fileName
    -[more]int _s +[more]int _s
    -[more]int _t +[more]int _t
    -[more]int _r +[more]int _r
    -[more]GLint _internalTextureFormat +[more]GLint _internalTextureFormat
    -[more]GLenum _pixelFormat +[more]GLenum _pixelFormat
    -[more]GLenum _dataType +[more]GLenum _dataType
    -[more]unsigned int _packing +[more]unsigned int _packing
    -[more]unsigned char* _data +[more]unsigned char* _data
    -[more]unsigned int _modifiedTag +[more]unsigned int _modifiedTag
    -[more]MipmapDataType _mipmapData +[more]MipmapDataType _mipmapData

    Protected Methods

    -[more]virtual ~Image() +[more]virtual ~Image()
    -[more]Image& operator = (const Image&) +[more]Image& operator = (const Image&)

    @@ -176,9 +179,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -194,7 +197,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -210,12 +213,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -227,49 +238,49 @@
    - +
    o Image()

    - -

    o Image(const Image& image, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o Image(const Image& image, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - +

    ovirtual Object* cloneType() const

    - +

    ovirtual Object* clone(const CopyOp& copyop) const

    - +

    ovirtual bool isSameKindAs(const Object* obj) const

    - +

    ovirtual const char* libraryName() const

    - +

    ovirtual const char* className() const

    - +

    ovoid setFileName(const std::string& fileName)

    - +

    oinline const std::string& getFileName() const

    - -

    ovoid allocateImage(int s, int t, int r, GLenum format, GLenum type, int packing=1) + +
    ovoid allocateImage(int s, int t, int r, GLenum format, GLenum type, int packing=1)

    - -

    ovoid setImage(int s, int t, int r, GLint internalTextureformat, GLenum format, GLenum type, unsigned char* data, int packing=1) + +
    ovoid setImage(int s, int t, int r, GLint internalTextureformat, GLenum format, GLenum type, unsigned char* data, int packing=1)
    set the image data and format. note, when the packing value is negative (the default is -1) this method assumes a _packing width of 1 if the width is not a multiple of 4, @@ -277,19 +288,19 @@ otherwise automatically sets to _packing to 4. If a positive value of packing is supplied than _packing is simply set to that value.

    - -

    ovoid readPixels(int x, int y, int width, int height, GLenum format, GLenum type) + +
    ovoid readPixels(int x, int y, int width, int height, GLenum format, GLenum type)
    readPixels from screen at specified position and size, using glReadPixels. Create memory for storage if required, reuse existing pixel coords if possible. if pixelFormat or dataType

    - -

    ovoid scaleImage(const int s, const int t, const int r) + +
    ovoid scaleImage(int s, int t, int r)
    Scale image to specified size.

    - +

    ovoid copySubImage(int s_offset, int t_offset, int r_offset, osg::Image* source)
    Copy a source Image into a subpart of this Image at specified position. Typically used to copy to an already allocated image, such as creating @@ -299,207 +310,207 @@ accomodate the imaging image in its offset position. If source is NULL then no operation happens, this Image is left unchanged.

    - -

    oinline const int s() const + +
    oinline int s() const
    Width of image

    - -

    oinline const int t() const + +
    oinline int t() const
    Height of image

    - -

    oinline const int r() const + +
    oinline int r() const
    Depth of image

    - +

    ovoid setInternalTextureFormat(GLint internalFormat)

    - -

    oinline const GLint getInternalTextureFormat() const + +
    oinline GLint getInternalTextureFormat() const

    - -

    ovoid setPixelFormat(const GLenum format) + +
    ovoid setPixelFormat(GLenum format)

    - -

    oinline const GLenum getPixelFormat() const + +
    oinline GLenum getPixelFormat() const

    - -

    oinline const GLenum getDataType() const + +
    oinline GLenum getDataType() const

    - -

    oinline const unsigned int getPacking() const + +
    oinline unsigned int getPacking() const

    - -

    oinline const unsigned int getPixelSizeInBits() const + +
    oinline unsigned int getPixelSizeInBits() const
    return the numbers of bits required for each pixel

    - -

    oinline const unsigned int getRowSizeInBytes() const + +
    oinline unsigned int getRowSizeInBytes() const
    return the numbers of bytes each row of pixels occupies once it has been packed

    - -

    oinline const unsigned int getImageSizeInBytes() const + +
    oinline unsigned int getImageSizeInBytes() const
    return the numbers of bytes each image (_s*_t) of pixels occupies

    - -

    oinline const unsigned int getTotalSizeInBytes() const + +
    oinline unsigned int getTotalSizeInBytes() const
    return the numbers of bytes the whole row/image/volume of pixels occupies

    - +

    oinline unsigned char* data()
    raw image data

    - +

    oinline const unsigned char* data() const
    raw const image data

    - -

    oinline unsigned char* data(int column, int row=0, int image=0) -

    - - -

    oinline const unsigned char* data(int column, int row=0, int image=0) const + +
    oinline unsigned char* data(int column, int row=0, int image=0) const

    - +

    ovoid flipHorizontal(int image=0)
    Flip the image horizontally

    - +

    ovoid flipVertical(int image=0)
    Flip the image vertically

    - -

    ovoid ensureValidSizeForTexturing() + +
    ovoid ensureValidSizeForTexturing(GLint maxTextureSize)
    Ensure image dimensions are a power of two. Mip Mapped texture require the image dimensions to be power of two and are within the maxiumum texture size for the host machine.

    - +

    oinline void dirty()
    Dirty the image, which increments the modified flag, to force osg::Texture to reload the image

    - -

    oinline void setModifiedTag(const unsigned int value) + +
    oinline void setModifiedTag(unsigned int value)
    Set the modified tag value, only used by osg::Texture when using texture subloading.

    - -

    oinline const unsigned int getModifiedTag() const + +
    oinline unsigned int getModifiedTag() const
    Get modified tag value, only used by osg::Texture when using texture subloading.

    - -

    ostatic const bool isPackedType(GLenum type) + +
    ostatic bool isPackedType(GLenum type)

    - -

    ostatic const unsigned int computeNumComponents(GLenum format) + +
    ostatic unsigned int computeNumComponents(GLenum format)

    - -

    ostatic const unsigned int computePixelSizeInBits(GLenum format, GLenum type) + +
    ostatic unsigned int computePixelSizeInBits(GLenum format, GLenum type)

    - -

    ostatic const unsigned int computeRowWidthInBytes(int width, GLenum format, GLenum type, int packing) + +
    ostatic unsigned int computeRowWidthInBytes(int width, GLenum format, GLenum type, int packing)

    - -

    ostatic const unsigned int computeNearestPowerOfTwo(unsigned int s, float bias=0.5f) + +
    ostatic unsigned int computeNearestPowerOfTwo(unsigned int s, float bias=0.5f) +

    + + +

    otypedef std::vector< unsigned int > MipmapDataType

    - -

    otypedef std::vector< unsigned int >inline MipmapDataType bool isMipmap() const + +
    oinline bool isMipmap() const

    - +

    ounsigned int getNumMipmapLevels() const

    - -

    oinline void setMipmapData(const MipmapDataType& mipmapDataVector) + +
    oinline void setMipmapData(const MipmapDataType& mipmapDataVector)

    - +

    oinline unsigned char* getMipmapData(unsigned int mipmapNumber) const

    - +

    ovoid computeMipMaps()
    converts a single image into mip mapped version image

    - +

    ovirtual ~Image()

    - +

    oImage& operator = (const Image&)

    - +

    ostd::string _fileName

    - +

    oint _s

    - +

    oint _t

    - +

    oint _r

    - +

    oGLint _internalTextureFormat

    - +

    oGLenum _pixelFormat

    - +

    oGLenum _dataType

    - +

    ounsigned int _packing

    - +

    ounsigned char* _data

    - +

    ounsigned int _modifiedTag

    - -

    oMipmapDataType _mipmapData + +
    oMipmapDataType _mipmapData

    This class has no child classes.
    diff --git a/doc/doc++/osg/Impostor.html b/doc/doc++/osg/Impostor.html index a90f2b067..9a20962ef 100644 --- a/doc/doc++/osg/Impostor.html +++ b/doc/doc++/osg/Impostor.html @@ -23,47 +23,52 @@

    Public Methods

    -[more] Impostor() +[more] Impostor()
    -[more] Impostor(const Impostor& es, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Impostor(const Impostor& es, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    -[more] META_Node(osg, Impostor) +[more] META_Node(osg, Impostor)
    -[more]inline void setImpostorThreshold(float distance) +[more]inline void setImpostorThreshold(float distance)
    Set the Impostor threshold distance.
    -[more]inline void setImpostorThresholdToBound(float ratio=1.0f) +[more]inline void setImpostorThresholdToBound(float ratio=1.0f)
    Set the Impostor threshold distance relative to the node's bounding sphere's radius
    -[more]inline const float getImpostorThreshold() const +[more]inline float getImpostorThreshold() const
    -[more]inline const float getImpostorThreshold2() const +[more]inline float getImpostorThreshold2() const
    -[more]ImpostorSprite* findBestImpostorSprite(const osg::Vec3& currLocalEyePoint) +[more]ImpostorSprite* findBestImpostorSprite(const osg::Vec3& currLocalEyePoint)
    Find the ImposterSprite which fits the current eye point best
    -[more]void addImpostorSprite(ImpostorSprite* is) +[more]void addImpostorSprite(ImpostorSprite* is)
    Add an ImpostorSprite to the Impostor
    -[more]inline ImpostorSpriteList& getImpostorSpriteList() +[more]inline ImpostorSpriteList& getImpostorSpriteList()
    Get the list of ImpostorSprites attached to this Impostor
    -[more]inline const ImpostorSpriteList& getImpostorSpriteList() const +[more]inline const ImpostorSpriteList& getImpostorSpriteList() const
    Get a const list of ImpostorSprites attached to this const Impostor

    +

    +

    Public Members

    +[more]typedef std::vector< ref_ptr<ImpostorSprite> > ImpostorSpriteList +

    +

    Protected Fields

    -[more]ImpostorSpriteList _impostorSpriteList +[more]ImpostorSpriteList _impostorSpriteList
    -[more]float _impostorThreshold +[more]float _impostorThreshold

    Protected Methods

    -[more]virtual ~Impostor() +[more]virtual ~Impostor()
    -[more]virtual const bool computeBound() const +[more]virtual bool computeBound() const

    @@ -73,44 +78,49 @@

    Public Methods

    ovirtual void traverse(NodeVisitor& nv)
    -ovoid setRange(const unsigned int index, const float range) +ovirtual bool addChild(Node* child)
    -oinline const float getRange(const unsigned int index) const +ovirtual bool addChild(Node* child, float min, float max)
    -oinline const unsigned int getNumRanges() const +ovirtual bool removeChild(Node* child)
    -oinline void setCenter(const Vec3 &center) +ovoid setCenterMode(CenterMode mode) +
    +oCenterMode getCenterMode() const +
    +oinline void setCenter(const Vec3& center)
    oinline const Vec3& getCenter() const
    -ovoid setEvaluateLODCallback(EvaluateLODCallback* cbc) +ovoid setRange(unsigned int childNo, float min, float max)
    -oEvaluateLODCallback* getEvaluateLODCallback() +oinline float getMinRange(unsigned int childNo) const
    -oconst EvaluateLODCallback* getEvaluateLODCallback() const +oinline float getMaxRange(unsigned int childNo) const
    -oinline const int evaluate(const Vec3& eye_local, const float bias=1.0f) const +oinline unsigned int getNumRanges() const
    -ovirtual const int evaluateLODChild(const Vec3& eye_local, const float bias) const +oinline RangeList& getRangeList() +
    +oinline const RangeList& getRangeList() const

    Public Members

    -ostruct EvaluateLODCallback: public osg::Referenced +otypedef std::pair<float,float> MinMaxPair +
    +otypedef std::vector<MinMaxPair> RangeList +
    +oenum CenterMode

    Protected Fields

    -oRangeList _rangeList2 +oCenterMode _centerMode
    -oref_ptr<EvaluateLODCallback> _evaluateLODCallback +oVec3 _userDefinedCenter
    -oVec3 _center -

    - -

    -

    Protected Members

    -otypedef std::vector<float> RangeList RangeList _rangeList +oRangeList _rangeList

    @@ -118,28 +128,35 @@

    Public Methods

    -ovirtual bool addChild( Node* child ) +ovirtual Group* asGroup()
    -ovirtual bool removeChild( Node* child ) +ovirtual const Group* asGroup() const
    ovirtual bool replaceChild( Node* origChild, Node* newChild )
    -oinline const unsigned int getNumChildren() const +oinline unsigned int getNumChildren() const
    -oinline Node* getChild( const unsigned int i ) +oinline Node* getChild( unsigned int i )
    -oinline const Node* getChild( const unsigned int i ) const +oinline const Node* getChild( unsigned int i ) const
    oinline bool containsNode( const Node* node ) const
    oinline ChildList::iterator findNode( const Node* node )
    oinline ChildList::const_iterator findNode( const Node* node ) const +
    +oinline unsigned int findChildNo( const Node* node ) const +

    + +

    +

    Public Members

    +otypedef std::vector<ref_ptr<Node> > ChildList

    Protected Fields

    -oChildList _children +oChildList _children

    @@ -187,72 +204,76 @@ geometry.
    - +
    o Impostor()

    - -

    o Impostor(const Impostor& es, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o Impostor(const Impostor& es, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

    - +

    o META_Node(osg, Impostor)

    + + +

    otypedef std::vector< ref_ptr<ImpostorSprite> > ImpostorSpriteList +

    - -

    oinline void setImpostorThreshold(float distance) + +
    oinline void setImpostorThreshold(float distance)
    Set the Impostor threshold distance. For eye points further than this threshold the Imposter is used if appropriate, otherwise the LOD children as chosen as per a standard LOD node.

    - +

    oinline void setImpostorThresholdToBound(float ratio=1.0f)
    Set the Impostor threshold distance relative to the node's bounding sphere's radius

    - -

    oinline const float getImpostorThreshold() const + +
    oinline float getImpostorThreshold() const

    - -

    oinline const float getImpostorThreshold2() const + +
    oinline float getImpostorThreshold2() const

    - +

    oImpostorSprite* findBestImpostorSprite(const osg::Vec3& currLocalEyePoint)
    Find the ImposterSprite which fits the current eye point best

    - +

    ovoid addImpostorSprite(ImpostorSprite* is)
    Add an ImpostorSprite to the Impostor

    - -

    oinline ImpostorSpriteList& getImpostorSpriteList() + +
    oinline ImpostorSpriteList& getImpostorSpriteList()
    Get the list of ImpostorSprites attached to this Impostor

    - -

    oinline const ImpostorSpriteList& getImpostorSpriteList() const + +
    oinline const ImpostorSpriteList& getImpostorSpriteList() const
    Get a const list of ImpostorSprites attached to this const Impostor

    - +

    ovirtual ~Impostor()

    - -

    ovirtual const bool computeBound() const + +
    ovirtual bool computeBound() const

    - -

    oImpostorSpriteList _impostorSpriteList + +
    oImpostorSpriteList _impostorSpriteList

    - +

    ofloat _impostorThreshold

    diff --git a/doc/doc++/osg/ImpostorSprite.html b/doc/doc++/osg/ImpostorSprite.html index 155ffcf1d..b0819cf1d 100644 --- a/doc/doc++/osg/ImpostorSprite.html +++ b/doc/doc++/osg/ImpostorSprite.html @@ -23,118 +23,130 @@

    Public Methods

    -[more] ImpostorSprite() +[more] ImpostorSprite()
    -[more]virtual Object* cloneType() const +[more]virtual Object* cloneType() const
    Clone an object of the same type as an ImpostorSprite
    -[more]virtual Object* clone(const CopyOp&) const +[more]virtual Object* clone(const CopyOp&) const
    Clone on ImpostorSprite just returns a clone of type, since it is not appropriate to share data of an ImpostorSprite
    -[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
    -[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    -[more]void setParent(Impostor* parent) +[more]void setParent(Impostor* parent)
    Set the parent, which must be an Impostor.
    -[more]Impostor* getParent() +[more]Impostor* getParent()
    Get the parent, which is an Impostor.
    -[more]const Impostor* getParent() const +[more]const Impostor* getParent() const
    Get the const parent, which is an Impostor.
    -[more]inline void setStoredLocalEyePoint(const Vec3& v) +[more]inline void setStoredLocalEyePoint(const Vec3& v)
    Set the eye point for when the ImpsotorSprite was snapped
    -[more]inline const Vec3& getStoredLocalEyePoint() const +[more]inline const Vec3& getStoredLocalEyePoint() const
    Get the eye point for when the ImpsotorSprite was snapped
    -[more]inline void setLastFrameUsed(const int frameNumber) +[more]inline void setLastFrameUsed(int frameNumber)
    Set the frame number for when the ImpostorSprite was last used in rendering
    -[more]inline int getLastFrameUsed() const +[more]inline int getLastFrameUsed() const
    Get the frame number for when the ImpostorSprite was last used in rendering
    -[more]inline Vec3* getCoords() +[more]inline Vec3* getCoords()
    Get the coordinates of the corners of the quad.
    -[more]inline const Vec3* getCoords() const +[more]inline const Vec3* getCoords() const
    Get the const coordinates of the corners of the quad
    -[more]inline Vec2* getTexCoords() +[more]inline Vec2* getTexCoords()
    Get the texture coordinates of the corners of the quad.
    -[more]inline const Vec2* getTexCoords() const +[more]inline const Vec2* getTexCoords() const
    Get the const texture coordinates of the corners of the quad
    -[more]inline Vec3* getControlCoords() +[more]inline Vec3* getControlCoords()
    Get the control coordinates of the corners of the quad.
    -[more]inline const Vec3* getControlCoords() const +[more]inline const Vec3* getControlCoords() const
    Get the const control coordinates of the corners of the quad
    -[more]const float calcPixelError(const Matrix& MVPW) const +[more]float calcPixelError(const Matrix& MVPW) const
    calculate the pixel error value for passing in the ModelViewProjectionWindow transform, which transform local coords into screen space
    -[more]void setTexture(Texture2D* tex, int s, int t) +[more]void setTexture(Texture2D* tex, int s, int t)
    -[more]Texture2D* getTexture() +[more]Texture2D* getTexture()
    -[more]const Texture2D* getTexture() const +[more]const Texture2D* getTexture() const
    -[more]const int s() const +[more]int s() const
    -[more]const int t() const +[more]int t() const
    -[more]virtual void drawImmediateMode(State& state) +[more]virtual void drawImplementation(State& state) const
    draw ImpostorSprite directly.
    -[more]virtual void accept(AttributeFunctor& af) +[more]virtual bool supports(AttributeFunctor&) const +
    return true, osg::ImpostorSprite does support accept(AttributeFunctor&) +
    +[more]virtual void accept(AttributeFunctor& af)
    accept an AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has
    -[more]virtual void accept(PrimitiveFunctor& pf) +[more]virtual bool supports(ConstAttributeFunctor&) const +
    return true, osg::ImpostorSprite does support accept(ConstAttributeFunctor&) +
    +[more]virtual void accept(ConstAttributeFunctor& af) const +
    accept an ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has +
    +[more]virtual bool supports(PrimitiveFunctor&) const +
    return true, osg::ImpostorSprite does support accept(PrimitiveFunctor&) +
    +[more]virtual void accept(PrimitiveFunctor& pf) const
    accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has

    Protected Fields

    -[more]Impostor* _parent +[more]Impostor* _parent
    -[more]ImpostorSpriteManager* _ism +[more]ImpostorSpriteManager* _ism
    -[more]ImpostorSprite* _previous +[more]ImpostorSprite* _previous
    -[more]ImpostorSprite* _next +[more]ImpostorSprite* _next
    -[more]int _lastFrameUsed +[more]int _lastFrameUsed
    -[more]Vec3 _storedLocalEyePoint +[more]Vec3 _storedLocalEyePoint
    -[more]Vec3 _coords[4] +[more]Vec3 _coords[4]
    -[more]Vec2 _texcoords[4] +[more]Vec2 _texcoords[4]
    -[more]Vec3 _controlcoords[4] +[more]Vec3 _controlcoords[4]
    -[more]Texture2D* _texture +[more]Texture2D* _texture
    -[more]int _s +[more]int _s
    -[more]int _t +[more]int _t

    Protected Methods

    -[more] ImpostorSprite(const ImpostorSprite&) +[more] ImpostorSprite(const ImpostorSprite&)
    -[more]ImpostorSprite& operator = (const ImpostorSprite&) +[more]ImpostorSprite& operator = (const ImpostorSprite&)
    -[more]virtual ~ImpostorSprite() +[more]virtual ~ImpostorSprite()
    -[more]virtual const bool computeBound() const +[more]virtual bool computeBound() const

    @@ -142,11 +154,15 @@

    Public Methods

    -oinline const ParentList& getParents() const +ovirtual Geometry* asGeometry()
    -oinline ParentList getParents() +ovirtual const Geometry* asGeometry() const
    -oinline const unsigned int getNumParents() const +oinline const ParentList& getParents() const +
    +oinline ParentList getParents() +
    +oinline unsigned int getNumParents() const
    oinline void setStateSet(StateSet* state)
    @@ -154,43 +170,51 @@
    oinline const StateSet* getStateSet() const
    -ovoid setSupportsDisplayList(const bool flag) -
    -oinline const bool getSupportsDisplayList() const -
    -ovoid setUseDisplayList(const bool flag) -
    -oinline const bool getUseDisplayList() const -
    -ovoid dirtyDisplayList() +oStateSet* getOrCreateStateSet()
    ovoid dirtyBound()
    oinline const BoundingBox& getBound() const
    +oinline void setShape(Shape* shape) +
    +oinline Shape* getShape() +
    +oinline const Shape* getShape() const +
    +ovoid setSupportsDisplayList(bool flag) +
    +oinline bool getSupportsDisplayList() const +
    +ovoid setUseDisplayList(bool flag) +
    +oinline bool getUseDisplayList() const +
    +ovoid dirtyDisplayList() +
    ovoid compile(State& state)
    -ovoid setAppCallback(AppCallback* ac) +ovoid setAppCallback(AppCallback* ac)
    -oAppCallback* getAppCallback() +oAppCallback* getAppCallback()
    -oconst AppCallback* getAppCallback() const +oconst AppCallback* getAppCallback() const
    -ovoid setCullCallback(CullCallback* cc) +ovoid setCullCallback(CullCallback* cc)
    -oCullCallback* getCullCallback() +oCullCallback* getCullCallback()
    -oconst CullCallback* getCullCallback() const +oconst CullCallback* getCullCallback() const
    -ovoid setDrawCallback(DrawCallback* dc) +ovoid setDrawCallback(DrawCallback* dc)
    -oDrawCallback* getDrawCallback() +oDrawCallback* getDrawCallback()
    -oconst DrawCallback* getDrawCallback() const +oconst DrawCallback* getDrawCallback() const
    -ostatic void deleteDisplayList(uint contextID, uint globj) +ostatic void deleteDisplayList(uint contextID, uint globj)
    -ostatic void flushDeletedDisplayLists(uint contextID) +ostatic void flushDeletedDisplayLists(uint contextID)
    oinline void draw(State& state)

    @@ -209,28 +233,36 @@
    class AttributeFunctor
    +class ConstAttributeFunctor +
    class PrimitiveFunctor

    Protected Fields

    -oParentList _parents +oParentList _parents
    -oref_ptr<StateSet> _dstate -
    -obool _supportsDisplayList -
    -obool _useDisplayList +oref_ptr<StateSet> _stateset
    omutable BoundingBox _bbox
    omutable bool _bbox_computed
    -oref_ptr<AppCallback> _appCallback +oref_ptr<Shape> _shape
    -oref_ptr<DrawCallback> _drawCallback +obool _supportsDisplayList
    -oref_ptr<CullCallback> _cullCallback +obool _useDisplayList +
    +omutable GLObjectList _globjList +
    +oref_ptr<AppCallback> _appCallback +
    +oref_ptr<DrawCallback> _drawCallback +
    +oref_ptr<CullCallback> _cullCallback +
    +ostatic DeletedDisplayListCache s_deletedDisplayListCache

    @@ -242,9 +274,9 @@ class PrimitiveFunctor

    Protected Members

    -otypedef std::vector<uint> GLObjectList mutable GLObjectList _globjList +otypedef std::vector<uint> GLObjectList
    -otypedef std::map<uint,std::set<uint> >static DeletedDisplayListCache DeletedDisplayListCache s_deletedDisplayListCache +otypedef std::map<uint,std::set<uint> > DeletedDisplayListCache

    @@ -252,9 +284,9 @@ class PrimitiveFunctor

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -270,7 +302,7 @@ class PrimitiveFunctor

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -286,12 +318,20 @@ class PrimitiveFunctor
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -307,93 +347,93 @@ necessary to deal with it directly.
    - +
    o ImpostorSprite()

    - +

    ovirtual Object* cloneType() const
    Clone an object of the same type as an ImpostorSprite

    - +

    ovirtual Object* clone(const CopyOp&) const
    Clone on ImpostorSprite just returns a clone of type, since it is not appropriate to share data of an ImpostorSprite

    - +

    ovirtual bool isSameKindAs(const Object* obj) const

    - +

    ovirtual const char* libraryName() const

    - +

    ovirtual const char* className() const

    - +

    ovoid setParent(Impostor* parent)
    Set the parent, which must be an Impostor. Unlike conventional Drawables, ImpostorSprite's can only ever have one parent.

    - +

    oImpostor* getParent()
    Get the parent, which is an Impostor.

    - +

    oconst Impostor* getParent() const
    Get the const parent, which is an Impostor.

    - +

    oinline void setStoredLocalEyePoint(const Vec3& v)
    Set the eye point for when the ImpsotorSprite was snapped

    - +

    oinline const Vec3& getStoredLocalEyePoint() const
    Get the eye point for when the ImpsotorSprite was snapped

    - -

    oinline void setLastFrameUsed(const int frameNumber) + +
    oinline void setLastFrameUsed(int frameNumber)
    Set the frame number for when the ImpostorSprite was last used in rendering

    - +

    oinline int getLastFrameUsed() const
    Get the frame number for when the ImpostorSprite was last used in rendering

    - +

    oinline Vec3* getCoords()
    Get the coordinates of the corners of the quad. Stored in the order, [0] - top_left, [1] - bottom_left, [2] - bottom_right, [3] - top_left.

    - +

    oinline const Vec3* getCoords() const
    Get the const coordinates of the corners of the quad

    - +

    oinline Vec2* getTexCoords()
    Get the texture coordinates of the corners of the quad. Stored in the order, [0] - top_left, [1] - bottom_left, [2] - bottom_right, [3] - top_left.

    - +

    oinline const Vec2* getTexCoords() const
    Get the const texture coordinates of the corners of the quad

    - +

    oinline Vec3* getControlCoords()
    Get the control coordinates of the corners of the quad. The control coordinates are the corners of the quad projected @@ -408,113 +448,133 @@ can then be used to determine whether the impostor needs to be updated. Stored in the order, [0] - top_left, [1] - bottom_left, [2] - bottom_right, [3] - top_left.

    - +

    oinline const Vec3* getControlCoords() const
    Get the const control coordinates of the corners of the quad

    - -

    oconst float calcPixelError(const Matrix& MVPW) const + +
    ofloat calcPixelError(const Matrix& MVPW) const
    calculate the pixel error value for passing in the ModelViewProjectionWindow transform, which transform local coords into screen space

    - -

    ovoid setTexture(Texture2D* tex, int s, int t) + +
    ovoid setTexture(Texture2D* tex, int s, int t)

    - +

    oTexture2D* getTexture()

    - +

    oconst Texture2D* getTexture() const

    - -

    oconst int s() const + +
    oint s() const

    - -

    oconst int t() const + +
    oint t() const

    - - -

    ovirtual void drawImmediateMode(State& state) + + +
    ovirtual void drawImplementation(State& state) const
    draw ImpostorSprite directly.

    + + +

    ovirtual bool supports(AttributeFunctor&) const +
    return true, osg::ImpostorSprite does support accept(AttributeFunctor&) +

    - +

    ovirtual void accept(AttributeFunctor& af)
    accept an AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has

    + + +

    ovirtual bool supports(ConstAttributeFunctor&) const +
    return true, osg::ImpostorSprite does support accept(ConstAttributeFunctor&) +

    - -

    ovirtual void accept(PrimitiveFunctor& pf) + +
    ovirtual void accept(ConstAttributeFunctor& af) const +
    accept an ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has +

    + + +

    ovirtual bool supports(PrimitiveFunctor&) const +
    return true, osg::ImpostorSprite does support accept(PrimitiveFunctor&) +

    + + +

    ovirtual void accept(PrimitiveFunctor& pf) const
    accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has

    - -

    o ImpostorSprite(const ImpostorSprite&) + +
    o ImpostorSprite(const ImpostorSprite&)

    - +

    oImpostorSprite& operator = (const ImpostorSprite&)

    - +

    ovirtual ~ImpostorSprite()

    - -

    ovirtual const bool computeBound() const + +
    ovirtual bool computeBound() const

    - +

    oImpostor* _parent

    - +

    oImpostorSpriteManager* _ism

    - +

    oImpostorSprite* _previous

    - +

    oImpostorSprite* _next

    - +

    oint _lastFrameUsed

    - +

    oVec3 _storedLocalEyePoint

    - +

    oVec3 _coords[4]

    - +

    oVec2 _texcoords[4]

    - +

    oVec3 _controlcoords[4]

    - +

    oTexture2D* _texture

    - +

    oint _s

    - +

    oint _t

    diff --git a/doc/doc++/osg/ImpostorSpriteManager.html b/doc/doc++/osg/ImpostorSpriteManager.html index 4d735b0a7..a4993a8f5 100644 --- a/doc/doc++/osg/ImpostorSpriteManager.html +++ b/doc/doc++/osg/ImpostorSpriteManager.html @@ -23,35 +23,35 @@

    Public Methods

    -[more] ImpostorSpriteManager() +[more] ImpostorSpriteManager()
    -[more]const bool empty() const +[more]bool empty() const
    -[more]ImpostorSprite* first() +[more]ImpostorSprite* first()
    -[more]ImpostorSprite* last() +[more]ImpostorSprite* last()
    -[more]void push_back(ImpostorSprite* is) +[more]void push_back(ImpostorSprite* is)
    -[more]void remove(ImpostorSprite* is) +[more]void remove(ImpostorSprite* is)
    -[more]ImpostorSprite* createOrReuseImpostorSprite(int s, int t, int frameNumber) +[more]ImpostorSprite* createOrReuseImpostorSprite(int s, int t, int frameNumber)

    Protected Fields

    -[more]ref_ptr<TexEnv> _texenv +[more]ref_ptr<TexEnv> _texenv
    -[more]ref_ptr<AlphaFunc> _alphafunc +[more]ref_ptr<AlphaFunc> _alphafunc
    -[more]ImpostorSprite* _first +[more]ImpostorSprite* _first
    -[more]ImpostorSprite* _last +[more]ImpostorSprite* _last

    Protected Methods

    -[more] ~ImpostorSpriteManager() +[more] ~ImpostorSpriteManager()

    @@ -67,12 +67,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -84,51 +92,51 @@
    - +
    o ImpostorSpriteManager()

    - -

    oconst bool empty() const + +
    obool empty() const

    - +

    oImpostorSprite* first()

    - +

    oImpostorSprite* last()

    - +

    ovoid push_back(ImpostorSprite* is)

    - +

    ovoid remove(ImpostorSprite* is)

    - -

    oImpostorSprite* createOrReuseImpostorSprite(int s, int t, int frameNumber) + +
    oImpostorSprite* createOrReuseImpostorSprite(int s, int t, int frameNumber)

    - +

    o ~ImpostorSpriteManager()

    - +

    oref_ptr<TexEnv> _texenv

    - +

    oref_ptr<AlphaFunc> _alphafunc

    - +

    oImpostorSprite* _first

    - +

    oImpostorSprite* _last

    diff --git a/doc/doc++/osg/LOD.html b/doc/doc++/osg/LOD.html index 2c58d16e9..ae9292a40 100644 --- a/doc/doc++/osg/LOD.html +++ b/doc/doc++/osg/LOD.html @@ -23,68 +23,71 @@

    Public Methods

    -[more] LOD() +[more] LOD()
    -[more] LOD(const LOD&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] LOD(const LOD&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_Node(osg, LOD) +[more] META_Node(osg, LOD)
    -[more]virtual void traverse(NodeVisitor& nv) +[more]virtual void traverse(NodeVisitor& nv)
    -[more]void setRange(const unsigned int index, const float range) -
    Sets the value of range list element index to range which is a floating point distance specified in world coordinates. +[more]virtual bool addChild(Node* child)
    -[more]inline const float getRange(const unsigned int index) const -
    returns the range for specified index +[more]virtual bool addChild(Node* child, float min, float max)
    -[more]inline const unsigned int getNumRanges() const -
    returns the number of ranges currently set +[more]virtual bool removeChild(Node* child)
    -[more]inline void setCenter(const Vec3 &center) +[more]void setCenterMode(CenterMode mode) +
    +[more]CenterMode getCenterMode() const +
    +[more]inline void setCenter(const Vec3& center)
    Sets the object-space point which defines the center of the osg::LOD.
    -[more]inline const Vec3& getCenter() const +[more]inline const Vec3& getCenter() const
    return the LOD center point.
    -[more]void setEvaluateLODCallback(EvaluateLODCallback* cbc) -
    Set the EvaluateLODCallback which allows users to attach customize computation of the the selection of LOD children +[more]void setRange(unsigned int childNo, float min, float max) +
    Sets the min and max visible ranges of range of specifiec child.
    -[more]EvaluateLODCallback* getEvaluateLODCallback() -
    Get the non const ComputeBillboardCallback +[more]inline float getMinRange(unsigned int childNo) const +
    returns the min visible range for specified child
    -[more]const EvaluateLODCallback* getEvaluateLODCallback() const -
    Get the const ComputeBillboardCallback +[more]inline float getMaxRange(unsigned int childNo) const +
    returns the max visible range for specified child
    -[more]inline const int evaluate(const Vec3& eye_local, const float bias=1.0f) const -
    return the child to traverse. +[more]inline unsigned int getNumRanges() const +
    returns the number of ranges currently set.
    -[more]virtual const int evaluateLODChild(const Vec3& eye_local, const float bias) const +[more]inline RangeList& getRangeList() +
    return the list of MinMax ranges for each child +
    +[more]inline const RangeList& getRangeList() const +
    return the list of MinMax ranges for each child

    Public Members

    -[more]struct EvaluateLODCallback: public osg::Referenced -
    Callback attached to an LOD which allows the users to customize the selection of LOD children +[more]typedef std::pair<float,float> MinMaxPair +
    +[more]typedef std::vector<MinMaxPair> RangeList +
    +[more]enum CenterMode

    Protected Fields

    -[more]RangeList _rangeList2 +[more]CenterMode _centerMode
    -[more]ref_ptr<EvaluateLODCallback> _evaluateLODCallback +[more]Vec3 _userDefinedCenter
    -[more]Vec3 _center +[more]RangeList _rangeList

    Protected Methods

    -[more]virtual ~LOD() -

    - -

    -

    Protected Members

    -[more]typedef std::vector<float> RangeList RangeList _rangeList +[more]virtual ~LOD()

    @@ -92,33 +95,40 @@

    Public Methods

    -ovirtual bool addChild( Node* child ) +ovirtual Group* asGroup()
    -ovirtual bool removeChild( Node* child ) +ovirtual const Group* asGroup() const
    ovirtual bool replaceChild( Node* origChild, Node* newChild )
    -oinline const unsigned int getNumChildren() const +oinline unsigned int getNumChildren() const
    -oinline Node* getChild( const unsigned int i ) +oinline Node* getChild( unsigned int i )
    -oinline const Node* getChild( const unsigned int i ) const +oinline const Node* getChild( unsigned int i ) const
    oinline bool containsNode( const Node* node ) const
    oinline ChildList::iterator findNode( const Node* node )
    oinline ChildList::const_iterator findNode( const Node* node ) const +
    +oinline unsigned int findChildNo( const Node* node ) const +

    + +

    +

    Public Members

    +otypedef std::vector<ref_ptr<Node> > ChildList

    Protected Fields

    -oChildList _children +oChildList _children

    Protected Methods

    -ovirtual const bool computeBound() const +ovirtual bool computeBound() const

    @@ -142,108 +152,122 @@ during rendering.
    - +
    o LOD()

    - -

    o LOD(const LOD&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o LOD(const LOD&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - +

    o META_Node(osg, LOD)

    - +

    ovirtual void traverse(NodeVisitor& nv)

    - - -

    ovoid setRange(const unsigned int index, const float range) -
    Sets the value of range list element index to range which -is a floating point distance specified in world coordinates. -Range list automatically expands to accommodate values beyond -the current getNumRanges(). + + +
    ovirtual bool addChild(Node* child)

    - - -

    oinline const float getRange(const unsigned int index) const -
    returns the range for specified index + + +
    ovirtual bool addChild(Node* child, float min, float max)

    - - -

    oinline const unsigned int getNumRanges() const -
    returns the number of ranges currently set + + +
    ovirtual bool removeChild(Node* child) +

    + + +

    otypedef std::pair<float,float> MinMaxPair +

    + + +

    otypedef std::vector<MinMaxPair> RangeList +

    + + +

    oenum CenterMode +

    + + + +
    o USE_BOUNDING_SPHERE_CENTER +

    + + +

    o USER_DEFINED_CENTER +

    + + + +
    ovoid setCenterMode(CenterMode mode) +

    + + +

    oCenterMode getCenterMode() const

    - -

    oinline void setCenter(const Vec3 &center) + +
    oinline void setCenter(const Vec3& center)
    Sets the object-space point which defines the center of the osg::LOD. center is affected by any transforms in the hierarchy above the osg::LOD.

    - +

    oinline const Vec3& getCenter() const
    return the LOD center point.

    - - -

    ostruct EvaluateLODCallback: public osg::Referenced -
    Callback attached to an LOD which allows the users to customize the selection of LOD children -

    - - - -
    ovirtual const int evaluateLODChild(const osg::LOD* lod, const Vec3& eye_local, const float bias) const = 0 -
    Compute the child to select -

    - - - -
    ovoid setEvaluateLODCallback(EvaluateLODCallback* cbc) -
    Set the EvaluateLODCallback which allows users to attach customize computation of the the selection of LOD children + + +
    ovoid setRange(unsigned int childNo, float min, float max) +
    Sets the min and max visible ranges of range of specifiec child. +Values are floating point distance specified in local objects coordinates.

    - - -

    oEvaluateLODCallback* getEvaluateLODCallback() -
    Get the non const ComputeBillboardCallback + + +
    oinline float getMinRange(unsigned int childNo) const +
    returns the min visible range for specified child

    - - -

    oconst EvaluateLODCallback* getEvaluateLODCallback() const -
    Get the const ComputeBillboardCallback + + +
    oinline float getMaxRange(unsigned int childNo) const +
    returns the max visible range for specified child

    - - -

    oinline const int evaluate(const Vec3& eye_local, const float bias=1.0f) const -
    return the child to traverse. -Selected by the distance between the eye point in local -coordinates and the LOD center, multiplied by the bias. + + +
    oinline unsigned int getNumRanges() const +
    returns the number of ranges currently set. +An LOD which has been fully set up will have getNumChildren()==getNumRanges().

    - - -

    ovirtual const int evaluateLODChild(const Vec3& eye_local, const float bias) const + + +
    oinline RangeList& getRangeList() +
    return the list of MinMax ranges for each child +

    + + +

    oinline const RangeList& getRangeList() const +
    return the list of MinMax ranges for each child

    - +

    ovirtual ~LOD()

    + + +

    oCenterMode _centerMode +

    + + +

    oVec3 _userDefinedCenter +

    - -

    otypedef std::vector<float> RangeList RangeList _rangeList -

    - - -

    oRangeList _rangeList2 -

    - - -

    oref_ptr<EvaluateLODCallback> _evaluateLODCallback -

    - - -

    oVec3 _center + +
    oRangeList _rangeList

    Direct child classes: diff --git a/doc/doc++/osg/Light.html b/doc/doc++/osg/Light.html index 0a2ddeae2..e150e7141 100644 --- a/doc/doc++/osg/Light.html +++ b/doc/doc++/osg/Light.html @@ -23,121 +23,121 @@

    Public Methods

    -[more] Light() +[more] Light()
    -[more] Light(const Light& light, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Light(const Light& light, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, Light, (Type)(LIGHT_0+_lightnum)) +[more] META_StateAttribute(osg, Light, (Type)(LIGHT_0+_lightnum))
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const
    -[more]void setLightNum(const int num) +[more]void setLightNum(int num)
    Set which OpenGL light to operate on
    -[more]const int getLightNum() const +[more]int getLightNum() const
    Get which OpenGL light this osg::Light operates on
    -[more]inline void setAmbient( const Vec4& ambient ) +[more]inline void setAmbient( const Vec4& ambient )
    Set the ambient component of the light.
    -[more]inline const Vec4& getAmbient() const +[more]inline const Vec4& getAmbient() const
    Get the ambient component of the light.
    -[more]inline void setDiffuse( const Vec4& diffuse ) +[more]inline void setDiffuse( const Vec4& diffuse )
    Set the diffuse component of the light.
    -[more]inline const Vec4& getDiffuse() const +[more]inline const Vec4& getDiffuse() const
    Get the diffuse component of the light.
    -[more]inline void setSpecular( const Vec4& specular ) +[more]inline void setSpecular( const Vec4& specular )
    Set the specular component of the light.
    -[more]inline const Vec4& getSpecular() const +[more]inline const Vec4& getSpecular() const
    Get the specular component of the light.
    -[more]inline void setPosition( const Vec4& position ) +[more]inline void setPosition( const Vec4& position )
    Set the position of the light.
    -[more]inline const Vec4& getPosition() const +[more]inline const Vec4& getPosition() const
    Get the position of the light.
    -[more]inline void setDirection( const Vec3& direction ) +[more]inline void setDirection( const Vec3& direction )
    Set the direction of the light.
    -[more]inline const Vec3& getDirection() const +[more]inline const Vec3& getDirection() const
    Get the direction of the light.
    -[more]inline void setConstantAttenuation( const float constant_attenuation ) +[more]inline void setConstantAttenuation( float constant_attenuation )
    Set the constant attenuation of the light.
    -[more]inline const float getConstantAttenuation() const +[more]inline float getConstantAttenuation() const
    Get the constant attenuation of the light.
    -[more]inline void setLinearAttenuation( const float linear_attenuation ) +[more]inline void setLinearAttenuation( float linear_attenuation )
    Set the linear attenuation of the light.
    -[more]inline const float getLinearAttenuation() const +[more]inline float getLinearAttenuation() const
    Get the linear attenuation of the light.
    -[more]inline void setQuadraticAttenuation( const float quadratic_attenuation ) +[more]inline void setQuadraticAttenuation( float quadratic_attenuation )
    Set the quadratic attenuation of the light.
    -[more]inline const float getQuadraticAttenuation() const +[more]inline float getQuadraticAttenuation() const
    Get the quadratic attenuation of the light.
    -[more]inline void setSpotExponent( const float spot_exponent ) +[more]inline void setSpotExponent( float spot_exponent )
    Set the spot exponent of the light.
    -[more]inline const float getSpotExponent() const +[more]inline float getSpotExponent() const
    Get the spot exponent of the light.
    -[more]inline void setSpotCutoff( const float spot_cutoff ) +[more]inline void setSpotCutoff( float spot_cutoff )
    Set the spot cutoff of the light.
    -[more]inline const float getSpotCutoff() const +[more]inline float getSpotCutoff() const
    Get the spot cutoff of the light.
    -[more]void captureLightState() +[more]void captureLightState()
    Capture the lighting settings of the current OpenGL state and store them in this object
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const
    Apply the light's state to the OpenGL state machine.

    Protected Fields

    -[more]int _lightnum +[more]int _lightnum
    -[more]Vec4 _ambient +[more]Vec4 _ambient
    -[more]Vec4 _diffuse +[more]Vec4 _diffuse
    -[more]Vec4 _specular +[more]Vec4 _specular
    -[more]Vec4 _position +[more]Vec4 _position
    -[more]Vec3 _direction +[more]Vec3 _direction
    -[more]float _constant_attenuation +[more]float _constant_attenuation
    -[more]float _linear_attenuation +[more]float _linear_attenuation
    -[more]float _quadratic_attenuation +[more]float _quadratic_attenuation
    -[more]float _spot_exponent +[more]float _spot_exponent
    -[more]float _spot_cutoff +[more]float _spot_cutoff

    Protected Methods

    -[more]virtual ~Light() +[more]virtual ~Light()
    -[more]void init() +[more]void init()
    Initialize the light's settings with some decent defaults.

    @@ -156,7 +156,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    ovirtual bool isTextureAttribute() const
    @@ -189,9 +189,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -207,7 +207,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -225,12 +225,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -242,200 +250,200 @@
    - +
    o Light()

    - -

    o Light(const Light& light, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o Light(const Light& light, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, Light, (Type)(LIGHT_0+_lightnum)) + +
    o META_StateAttribute(osg, Light, (Type)(LIGHT_0+_lightnum))

    - +

    ovirtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - -

    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const + +
    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const

    - -

    ovoid setLightNum(const int num) + +
    ovoid setLightNum(int num)
    Set which OpenGL light to operate on

    - -

    oconst int getLightNum() const + +
    oint getLightNum() const
    Get which OpenGL light this osg::Light operates on

    - +

    oinline void setAmbient( const Vec4& ambient )
    Set the ambient component of the light.

    - +

    oinline const Vec4& getAmbient() const
    Get the ambient component of the light.

    - +

    oinline void setDiffuse( const Vec4& diffuse )
    Set the diffuse component of the light.

    - +

    oinline const Vec4& getDiffuse() const
    Get the diffuse component of the light.

    - +

    oinline void setSpecular( const Vec4& specular )
    Set the specular component of the light.

    - +

    oinline const Vec4& getSpecular() const
    Get the specular component of the light.

    - +

    oinline void setPosition( const Vec4& position )
    Set the position of the light.

    - +

    oinline const Vec4& getPosition() const
    Get the position of the light.

    - +

    oinline void setDirection( const Vec3& direction )
    Set the direction of the light.

    - +

    oinline const Vec3& getDirection() const
    Get the direction of the light.

    - -

    oinline void setConstantAttenuation( const float constant_attenuation ) + +
    oinline void setConstantAttenuation( float constant_attenuation )
    Set the constant attenuation of the light.

    - -

    oinline const float getConstantAttenuation() const + +
    oinline float getConstantAttenuation() const
    Get the constant attenuation of the light.

    - -

    oinline void setLinearAttenuation( const float linear_attenuation ) + +
    oinline void setLinearAttenuation( float linear_attenuation )
    Set the linear attenuation of the light.

    - -

    oinline const float getLinearAttenuation() const + +
    oinline float getLinearAttenuation() const
    Get the linear attenuation of the light.

    - -

    oinline void setQuadraticAttenuation( const float quadratic_attenuation ) + +
    oinline void setQuadraticAttenuation( float quadratic_attenuation )
    Set the quadratic attenuation of the light.

    - -

    oinline const float getQuadraticAttenuation() const + +
    oinline float getQuadraticAttenuation() const
    Get the quadratic attenuation of the light.

    - -

    oinline void setSpotExponent( const float spot_exponent ) + +
    oinline void setSpotExponent( float spot_exponent )
    Set the spot exponent of the light.

    - -

    oinline const float getSpotExponent() const + +
    oinline float getSpotExponent() const
    Get the spot exponent of the light.

    - -

    oinline void setSpotCutoff( const float spot_cutoff ) + +
    oinline void setSpotCutoff( float spot_cutoff )
    Set the spot cutoff of the light.

    - -

    oinline const float getSpotCutoff() const + +
    oinline float getSpotCutoff() const
    Get the spot cutoff of the light.

    - +

    ovoid captureLightState()
    Capture the lighting settings of the current OpenGL state and store them in this object

    - +

    ovirtual void apply(State& state) const
    Apply the light's state to the OpenGL state machine.

    - +

    ovirtual ~Light()

    - +

    ovoid init()
    Initialize the light's settings with some decent defaults.

    - +

    oint _lightnum

    - +

    oVec4 _ambient

    - +

    oVec4 _diffuse

    - +

    oVec4 _specular

    - +

    oVec4 _position

    - +

    oVec3 _direction

    - +

    ofloat _constant_attenuation

    - +

    ofloat _linear_attenuation

    - +

    ofloat _quadratic_attenuation

    - +

    ofloat _spot_exponent

    - +

    ofloat _spot_cutoff

    diff --git a/doc/doc++/osg/LightModel.html b/doc/doc++/osg/LightModel.html index 7573dc0af..408f507e1 100644 --- a/doc/doc++/osg/LightModel.html +++ b/doc/doc++/osg/LightModel.html @@ -22,54 +22,54 @@

    Public Methods

    -[more] LightModel() +[more] LightModel()
    -[more] LightModel(const LightModel& lw, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] LightModel(const LightModel& lw, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, LightModel, LIGHTMODEL) +[more] META_StateAttribute(osg, LightModel, LIGHTMODEL)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]void setAmbientIntensity(const osg::Vec4& ambient) +[more]void setAmbientIntensity(const osg::Vec4& ambient)
    -[more]const osg::Vec4& getAmbientIntensity() const +[more]const osg::Vec4& getAmbientIntensity() const
    -[more]void setColorControl(const ColorControl cc) +[more]void setColorControl(ColorControl cc)
    -[more]inline const ColorControl getColorControl() const +[more]inline ColorControl getColorControl() const
    -[more]void setLocalViewer(const bool localViewer) +[more]void setLocalViewer(bool localViewer)
    -[more]inline const bool getLocalViewer() const +[more]inline bool getLocalViewer() const
    -[more]void setTwoSided(const bool twoSided) +[more]void setTwoSided(bool twoSided)
    -[more]inline const bool getTwoSided() const +[more]inline bool getTwoSided() const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

    Public Members

    -[more]enum ColorControl +[more]enum ColorControl

    Protected Fields

    -[more]osg::Vec4 _ambient +[more]osg::Vec4 _ambient
    -[more]ColorControl _colorControl +[more]ColorControl _colorControl
    -[more]bool _localViewer +[more]bool _localViewer
    -[more]bool _twoSided +[more]bool _twoSided

    Protected Methods

    -[more]virtual ~LightModel() +[more]virtual ~LightModel()

    @@ -87,7 +87,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    ovirtual bool isTextureAttribute() const
    @@ -97,7 +97,7 @@
    obool operator != (const StateAttribute& rhs) const
    -ovirtual void getAssociatedModes(std::vector<GLMode>& ) const +ovirtual void getAssociatedModes(std::vector<GLMode>& ) const
    ovirtual void compile(State&) const

    @@ -122,9 +122,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -140,7 +140,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -158,12 +158,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -174,91 +182,91 @@
    - +
    o LightModel()

    - -

    o LightModel(const LightModel& lw, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o LightModel(const LightModel& lw, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, LightModel, LIGHTMODEL) + +
    o META_StateAttribute(osg, LightModel, LIGHTMODEL)

    - +

    ovirtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - +

    ovoid setAmbientIntensity(const osg::Vec4& ambient)

    - +

    oconst osg::Vec4& getAmbientIntensity() const

    - +

    oenum ColorControl

    - +
    o SEPARATE_SPECULAR_COLOR

    - +

    o SINGLE_COLOR

    - -
    ovoid setColorControl(const ColorControl cc) + +
    ovoid setColorControl(ColorControl cc)

    - -

    oinline const ColorControl getColorControl() const + +
    oinline ColorControl getColorControl() const

    - -

    ovoid setLocalViewer(const bool localViewer) + +
    ovoid setLocalViewer(bool localViewer)

    - -

    oinline const bool getLocalViewer() const + +
    oinline bool getLocalViewer() const

    - -

    ovoid setTwoSided(const bool twoSided) + +
    ovoid setTwoSided(bool twoSided)

    - -

    oinline const bool getTwoSided() const + +
    oinline bool getTwoSided() const

    - +

    ovirtual void apply(State& state) const

    - +

    ovirtual ~LightModel()

    - +

    oosg::Vec4 _ambient

    - -

    oColorControl _colorControl + +
    oColorControl _colorControl

    - +

    obool _localViewer

    - +

    obool _twoSided

    diff --git a/doc/doc++/osg/LightSource.html b/doc/doc++/osg/LightSource.html index ac6586a6b..5e06a3382 100644 --- a/doc/doc++/osg/LightSource.html +++ b/doc/doc++/osg/LightSource.html @@ -23,40 +23,40 @@

    Public Methods

    -[more] LightSource() +[more] LightSource()
    -[more] LightSource(const LightSource& ls, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] LightSource(const LightSource& ls, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    -[more] META_Node(osg, LightSource) +[more] META_Node(osg, LightSource)
    -[more]void setLight(StateAttribute* light) +[more]void setLight(StateAttribute* light)
    Set the attached light
    -[more]inline StateAttribute* getLight() +[more]inline StateAttribute* getLight()
    Get the attached light
    -[more]inline const StateAttribute* getLight() const +[more]inline const StateAttribute* getLight() const
    Get the const attached light
    -[more]void setStateSetModes(StateSet&, const StateAttribute::GLModeValue) const +[more]void setStateSetModes(StateSet&, StateAttribute::GLModeValue) const
    Set the GLModes on StateSet associated with the LightSource
    -[more]void setLocalStateSetModes(const StateAttribute::GLModeValue=StateAttribute::ON) +[more]void setLocalStateSetModes(StateAttribute::GLModeValue=StateAttribute::ON)
    Set up the local StateSet

    Protected Fields

    -[more]StateAttribute::GLModeValue _value +[more]StateAttribute::GLModeValue _value
    -[more]ref_ptr<StateAttribute> _light +[more]ref_ptr<StateAttribute> _light

    Protected Methods

    -[more]virtual ~LightSource() +[more]virtual ~LightSource()
    -[more]virtual const bool computeBound() const +[more]virtual bool computeBound() const

    @@ -64,6 +64,10 @@

    Public Methods

    +ovirtual Group* asGroup() +
    +ovirtual const Group* asGroup() const +
    ovirtual void traverse(NodeVisitor& nv)
    ovirtual bool addChild( Node* child ) @@ -72,22 +76,29 @@
    ovirtual bool replaceChild( Node* origChild, Node* newChild )
    -oinline const unsigned int getNumChildren() const +oinline unsigned int getNumChildren() const
    -oinline Node* getChild( const unsigned int i ) +oinline Node* getChild( unsigned int i )
    -oinline const Node* getChild( const unsigned int i ) const +oinline const Node* getChild( unsigned int i ) const
    oinline bool containsNode( const Node* node ) const
    oinline ChildList::iterator findNode( const Node* node )
    oinline ChildList::const_iterator findNode( const Node* node ) const +
    +oinline unsigned int findChildNo( const Node* node ) const +

    + +

    +

    Public Members

    +otypedef std::vector<ref_ptr<Node> > ChildList

    Protected Fields

    -oChildList _children +oChildList _children

    @@ -99,56 +110,56 @@
    - +
    o LightSource()

    - -

    o LightSource(const LightSource& ls, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o LightSource(const LightSource& ls, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

    - +

    o META_Node(osg, LightSource)

    - +

    ovoid setLight(StateAttribute* light)
    Set the attached light

    - +

    oinline StateAttribute* getLight()
    Get the attached light

    - +

    oinline const StateAttribute* getLight() const
    Get the const attached light

    - -

    ovoid setStateSetModes(StateSet&, const StateAttribute::GLModeValue) const + +
    ovoid setStateSetModes(StateSet&, StateAttribute::GLModeValue) const
    Set the GLModes on StateSet associated with the LightSource

    - -

    ovoid setLocalStateSetModes(const StateAttribute::GLModeValue=StateAttribute::ON) + +
    ovoid setLocalStateSetModes(StateAttribute::GLModeValue=StateAttribute::ON)
    Set up the local StateSet

    - +

    ovirtual ~LightSource()

    - -

    ovirtual const bool computeBound() const + +
    ovirtual bool computeBound() const

    - +

    oStateAttribute::GLModeValue _value

    - +

    oref_ptr<StateAttribute> _light

    diff --git a/doc/doc++/osg/LineSegment.html b/doc/doc++/osg/LineSegment.html index 39b52f520..6e219a822 100644 --- a/doc/doc++/osg/LineSegment.html +++ b/doc/doc++/osg/LineSegment.html @@ -23,60 +23,60 @@

    Public Methods

    -[more] LineSegment() +[more] LineSegment()
    -[more] LineSegment(const LineSegment& seg) +[more] LineSegment(const LineSegment& seg)
    -[more] LineSegment(const Vec3& s, const Vec3& e) +[more] LineSegment(const Vec3& s, const Vec3& e)
    -[more]LineSegment& operator = (const LineSegment& seg) +[more]LineSegment& operator = (const LineSegment& seg)
    -[more]inline void set(const Vec3& s, const Vec3& e) +[more]inline void set(const Vec3& s, const Vec3& e)
    -[more]inline Vec3& start() +[more]inline Vec3& start()
    -[more]inline const Vec3& start() const +[more]inline const Vec3& start() const
    -[more]inline Vec3& end() +[more]inline Vec3& end()
    -[more]inline const Vec3& end() const +[more]inline const Vec3& end() const
    -[more]inline const bool valid() const +[more]inline bool valid() const
    -[more]const bool intersect(const BoundingBox& bb) const +[more]bool intersect(const BoundingBox& bb) const
    return true if segment intersects BoundingBox
    -[more]const bool intersect(const BoundingBox& bb, float& r1, float& r2) const +[more]bool intersect(const BoundingBox& bb, float& r1, float& r2) const
    return true if segment intersects BoundingBox and return the intersection ratio's
    -[more]const bool intersect(const BoundingSphere& bs) const +[more]bool intersect(const BoundingSphere& bs) const
    return true if segment intersects BoundingSphere
    -[more]const bool intersect(const BoundingSphere& bs, float& r1, float& r2) const +[more]bool intersect(const BoundingSphere& bs, float& r1, float& r2) const
    return true if segment intersects BoundingSphere and return the intersection ratio's
    -[more]const bool intersect(const Vec3& v1, const Vec3& v2, const Vec3& v3, float& r) +[more]bool intersect(const Vec3& v1, const Vec3& v2, const Vec3& v3, float& r)
    return true if segment intersects triangle and set ratio long segment.
    -[more]inline void mult(const LineSegment& seg, const Matrix& m) +[more]inline void mult(const LineSegment& seg, const Matrix& m)
    post multiply a segment by matrix
    -[more]inline void mult(const Matrix& m, const LineSegment& seg) +[more]inline void mult(const Matrix& m, const LineSegment& seg)
    pre multiply a segment by matrix

    Protected Fields

    -[more]Vec3 _s +[more]Vec3 _s
    -[more]Vec3 _e +[more]Vec3 _e

    Protected Methods

    -[more]virtual ~LineSegment() +[more]virtual ~LineSegment()
    -[more]static const bool intersectAndClip(Vec3& s, Vec3& e, const BoundingBox& bb) +[more]static bool intersectAndClip(Vec3& s, Vec3& e, const BoundingBox& bb)

    @@ -90,12 +90,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -107,94 +115,94 @@
    - +
    o LineSegment()

    - -

    o LineSegment(const LineSegment& seg) + +
    o LineSegment(const LineSegment& seg)

    - -

    o LineSegment(const Vec3& s, const Vec3& e) + +
    o LineSegment(const Vec3& s, const Vec3& e)

    - +

    oLineSegment& operator = (const LineSegment& seg)

    - -

    oinline void set(const Vec3& s, const Vec3& e) + +
    oinline void set(const Vec3& s, const Vec3& e)

    - +

    oinline Vec3& start()

    - +

    oinline const Vec3& start() const

    - +

    oinline Vec3& end()

    - +

    oinline const Vec3& end() const

    - -

    oinline const bool valid() const + +
    oinline bool valid() const

    - -

    oconst bool intersect(const BoundingBox& bb) const + +
    obool intersect(const BoundingBox& bb) const
    return true if segment intersects BoundingBox

    - -

    oconst bool intersect(const BoundingBox& bb, float& r1, float& r2) const + +
    obool intersect(const BoundingBox& bb, float& r1, float& r2) const
    return true if segment intersects BoundingBox and return the intersection ratio's

    - -

    oconst bool intersect(const BoundingSphere& bs) const + +
    obool intersect(const BoundingSphere& bs) const
    return true if segment intersects BoundingSphere

    - -

    oconst bool intersect(const BoundingSphere& bs, float& r1, float& r2) const + +
    obool intersect(const BoundingSphere& bs, float& r1, float& r2) const
    return true if segment intersects BoundingSphere and return the intersection ratio's

    - -

    oconst bool intersect(const Vec3& v1, const Vec3& v2, const Vec3& v3, float& r) + +
    obool intersect(const Vec3& v1, const Vec3& v2, const Vec3& v3, float& r)
    return true if segment intersects triangle and set ratio long segment.

    - +

    oinline void mult(const LineSegment& seg, const Matrix& m)
    post multiply a segment by matrix

    - +

    oinline void mult(const Matrix& m, const LineSegment& seg)
    pre multiply a segment by matrix

    - +

    ovirtual ~LineSegment()

    - -

    ostatic const bool intersectAndClip(Vec3& s, Vec3& e, const BoundingBox& bb) + +
    ostatic bool intersectAndClip(Vec3& s, Vec3& e, const BoundingBox& bb)

    - +

    oVec3 _s

    - +

    oVec3 _e

    diff --git a/doc/doc++/osg/LineStipple.html b/doc/doc++/osg/LineStipple.html index c022e78a1..c79683da9 100644 --- a/doc/doc++/osg/LineStipple.html +++ b/doc/doc++/osg/LineStipple.html @@ -22,39 +22,39 @@

    Public Methods

    -[more] LineStipple() +[more] LineStipple()
    -[more] LineStipple(const LineStipple& lw, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] LineStipple(const LineStipple& lw, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, LineStipple, LINESTIPPLE) +[more] META_StateAttribute(osg, LineStipple, LINESTIPPLE)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const
    -[more]void setFactor(const int factor) +[more]void setFactor(GLint factor)
    -[more]inline const int getFactor() const +[more]inline GLint getFactor() const
    -[more]void setPattern(const unsigned short pattern) +[more]void setPattern(GLushort pattern)
    -[more]inline const unsigned short getPattern() const +[more]inline GLushort getPattern() const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

    Protected Fields

    -[more]int _factor +[more]GLint _factor
    -[more]unsigned short _pattern +[more]GLushort _pattern

    Protected Methods

    -[more]virtual ~LineStipple() +[more]virtual ~LineStipple()

    @@ -72,7 +72,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    ovirtual bool isTextureAttribute() const
    @@ -105,9 +105,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -123,7 +123,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -141,12 +141,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -157,58 +165,58 @@
    - +
    o LineStipple()

    - -

    o LineStipple(const LineStipple& lw, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o LineStipple(const LineStipple& lw, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, LineStipple, LINESTIPPLE) + +
    o META_StateAttribute(osg, LineStipple, LINESTIPPLE)

    - +

    ovirtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - -

    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const + +
    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const

    - -

    ovoid setFactor(const int factor) + +
    ovoid setFactor(GLint factor)

    - -

    oinline const int getFactor() const + +
    oinline GLint getFactor() const

    - -

    ovoid setPattern(const unsigned short pattern) + +
    ovoid setPattern(GLushort pattern)

    - -

    oinline const unsigned short getPattern() const + +
    oinline GLushort getPattern() const

    - +

    ovirtual void apply(State& state) const

    - +

    ovirtual ~LineStipple()

    - -

    oint _factor + +
    oGLint _factor

    - -

    ounsigned short _pattern + +
    oGLushort _pattern

    This class has no child classes.
    diff --git a/doc/doc++/osg/LineWidth.html b/doc/doc++/osg/LineWidth.html index ebfad26d5..117677582 100644 --- a/doc/doc++/osg/LineWidth.html +++ b/doc/doc++/osg/LineWidth.html @@ -23,31 +23,31 @@

    Public Methods

    -[more] LineWidth() +[more] LineWidth()
    -[more] LineWidth(const LineWidth& lw, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] LineWidth(const LineWidth& lw, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, LineWidth, LINEWIDTH) +[more] META_StateAttribute(osg, LineWidth, LINEWIDTH)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]void setWidth(const float width) +[more]void setWidth(float width)
    -[more]inline const float getWidth() const +[more]inline float getWidth() const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

    Protected Fields

    -[more]float _width +[more]float _width

    Protected Methods

    -[more]virtual ~LineWidth() +[more]virtual ~LineWidth()

    @@ -65,7 +65,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    ovirtual bool isTextureAttribute() const
    @@ -75,7 +75,7 @@
    obool operator != (const StateAttribute& rhs) const
    -ovirtual void getAssociatedModes(std::vector<GLMode>& ) const +ovirtual void getAssociatedModes(std::vector<GLMode>& ) const
    ovirtual void compile(State&) const

    @@ -100,9 +100,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -118,7 +118,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -136,12 +136,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -153,41 +161,41 @@
    - +
    o LineWidth()

    - -

    o LineWidth(const LineWidth& lw, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o LineWidth(const LineWidth& lw, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, LineWidth, LINEWIDTH) + +
    o META_StateAttribute(osg, LineWidth, LINEWIDTH)

    - +

    ovirtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - -

    ovoid setWidth(const float width) + +
    ovoid setWidth(float width)

    - -

    oinline const float getWidth() const + +
    oinline float getWidth() const

    - +

    ovirtual void apply(State& state) const

    - +

    ovirtual ~LineWidth()

    - +

    ofloat _width

    diff --git a/doc/doc++/osg/META_Object.html b/doc/doc++/osg/META_Object.html index e187eaba8..4edcc0d91 100644 --- a/doc/doc++/osg/META_Object.html +++ b/doc/doc++/osg/META_Object.html @@ -7,7 +7,7 @@ -

    #define osg::META_Object

    (library, name)

    META_Object macro define the standard clone, isSameKindAs and className methods.
    +

    #define osg::META_Object

    (library, name)

    META_Object macro define the standard clone, isSameKindAs and className methods.
    diff --git a/doc/doc++/osg/META_StateAttribute.html b/doc/doc++/osg/META_StateAttribute.html index 75b0dd3e5..df15f4f73 100644 --- a/doc/doc++/osg/META_StateAttribute.html +++ b/doc/doc++/osg/META_StateAttribute.html @@ -7,7 +7,7 @@ -

    #define osg::META_StateAttribute

    (library, name, type)

    META_StateAttribute macro define the standard clone, isSameKindAs, className and getType methods.
    +

    #define osg::META_StateAttribute

    (library, name, type)

    META_StateAttribute macro define the standard clone, isSameKindAs, className and getType methods.
    diff --git a/doc/doc++/osg/Material.html b/doc/doc++/osg/Material.html index 201d4ff6c..4222ae302 100644 --- a/doc/doc++/osg/Material.html +++ b/doc/doc++/osg/Material.html @@ -23,115 +23,115 @@

    Public Methods

    -[more] Material() +[more] Material()
    -[more] Material(const Material& mat, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Material(const Material& mat, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, Material, MATERIAL) +[more] META_StateAttribute(osg, Material, MATERIAL)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const
    -[more]inline void setColorMode(const ColorMode mode) +[more]inline void setColorMode(ColorMode mode)
    -[more]inline const ColorMode getColorMode() const +[more]inline ColorMode getColorMode() const
    -[more]void setAmbient( const Face face, const Vec4& ambient ) +[more]void setAmbient( Face face, const Vec4& ambient )
    -[more]const Vec4& getAmbient(const Face face) const +[more]const Vec4& getAmbient(Face face) const
    -[more]inline const bool getAmbientFrontAndBack() const +[more]inline bool getAmbientFrontAndBack() const
    -[more]void setDiffuse( const Face face, const Vec4& diffuse ) +[more]void setDiffuse( Face face, const Vec4& diffuse )
    -[more]const Vec4& getDiffuse(const Face face) const +[more]const Vec4& getDiffuse(Face face) const
    -[more]inline const bool getDiffuseFrontAndBack() const +[more]inline bool getDiffuseFrontAndBack() const
    -[more]void setSpecular( const Face face, const Vec4& specular ) +[more]void setSpecular( Face face, const Vec4& specular )
    Set specular value of specified face(s) of the material, valid specular[03] range is 00 to 10
    -[more]const Vec4& getSpecular(const Face face) const +[more]const Vec4& getSpecular(Face face) const
    Get the specular value for specified face
    -[more]inline const bool getSpecularFrontAndBack() const +[more]inline bool getSpecularFrontAndBack() const
    Get the whether specular values are equal for front and back faces
    -[more]void setEmission( const Face face, const Vec4& emission ) +[more]void setEmission( Face face, const Vec4& emission )
    Set emission value of specified face(s) of the material, valid emmison[03] range is 00 to 10
    -[more]const Vec4& getEmission(const Face face) const +[more]const Vec4& getEmission(Face face) const
    Get the emmsion value for specified face
    -[more]inline const bool getEmissionFrontAndBack() const +[more]inline bool getEmissionFrontAndBack() const
    Get the whether emission values are equal for front and back faces
    -[more]void setShininess( const Face face, float shininess ) +[more]void setShininess(Face face, float shininess )
    Set shininess of specified face(s) of the material, valid shininess range is 00 to 1280
    -[more]const float getShininess(const Face face) const +[more]float getShininess(Face face) const
    Get the shininess value for specified face
    -[more]inline const bool getShininessFrontAndBack() const +[more]inline bool getShininessFrontAndBack() const
    Get the whether shininess values are equal for front and back faces
    -[more]void setTransparency(const Face face, float trans) +[more]void setTransparency(Face face, float trans)
    Set the alpha value of ambient,diffuse,specular and emission colors, of specified face, to 1-transparency.
    -[more]void setAlpha(const Face face, float alpha) +[more]void setAlpha(Face face, float alpha)
    Set the alpha value of ambient,diffuse,specular and emission colors.

    Public Members

    -[more]enum Face +[more]enum Face
    -[more]enum ColorMode +[more]enum ColorMode

    Protected Fields

    -[more]ColorMode _colorMode +[more]ColorMode _colorMode
    -[more]bool _ambientFrontAndBack +[more]bool _ambientFrontAndBack
    -[more]Vec4 _ambientFront +[more]Vec4 _ambientFront
    -[more]Vec4 _ambientBack +[more]Vec4 _ambientBack
    -[more]bool _diffuseFrontAndBack +[more]bool _diffuseFrontAndBack
    -[more]Vec4 _diffuseFront +[more]Vec4 _diffuseFront
    -[more]Vec4 _diffuseBack +[more]Vec4 _diffuseBack
    -[more]bool _specularFrontAndBack +[more]bool _specularFrontAndBack
    -[more]Vec4 _specularFront +[more]Vec4 _specularFront
    -[more]Vec4 _specularBack +[more]Vec4 _specularBack
    -[more]bool _emissionFrontAndBack +[more]bool _emissionFrontAndBack
    -[more]Vec4 _emissionFront +[more]Vec4 _emissionFront
    -[more]Vec4 _emissionBack +[more]Vec4 _emissionBack
    -[more]bool _shininessFrontAndBack +[more]bool _shininessFrontAndBack
    -[more]float _shininessFront +[more]float _shininessFront
    -[more]float _shininessBack +[more]float _shininessBack

    Protected Methods

    -[more]virtual ~Material() +[more]virtual ~Material()

    @@ -149,7 +149,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    ovirtual bool isTextureAttribute() const
    @@ -182,9 +182,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -200,7 +200,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -218,12 +218,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -235,236 +243,236 @@
    - +
    o Material()

    - -

    o Material(const Material& mat, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o Material(const Material& mat, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, Material, MATERIAL) + +
    o META_StateAttribute(osg, Material, MATERIAL)

    - +

    ovirtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - -

    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const + +
    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const

    - +

    ovirtual void apply(State& state) const

    - +

    oenum Face

    - +
    o FRONT

    - +

    o BACK

    - +

    o FRONT_AND_BACK

    - +
    oenum ColorMode

    - +
    o AMBIENT

    - +

    o DIFFUSE

    - +

    o SPECULAR

    - +

    o EMISSION

    - +

    o AMBIENT_AND_DIFFUSE

    - +

    o OFF

    - -
    oinline void setColorMode(const ColorMode mode) + +
    oinline void setColorMode(ColorMode mode)

    - -

    oinline const ColorMode getColorMode() const + +
    oinline ColorMode getColorMode() const

    - -

    ovoid setAmbient( const Face face, const Vec4& ambient ) + +
    ovoid setAmbient( Face face, const Vec4& ambient )

    - -

    oconst Vec4& getAmbient(const Face face) const + +
    oconst Vec4& getAmbient(Face face) const

    - -

    oinline const bool getAmbientFrontAndBack() const + +
    oinline bool getAmbientFrontAndBack() const

    - -

    ovoid setDiffuse( const Face face, const Vec4& diffuse ) + +
    ovoid setDiffuse( Face face, const Vec4& diffuse )

    - -

    oconst Vec4& getDiffuse(const Face face) const + +
    oconst Vec4& getDiffuse(Face face) const

    - -

    oinline const bool getDiffuseFrontAndBack() const + +
    oinline bool getDiffuseFrontAndBack() const

    - -

    ovoid setSpecular( const Face face, const Vec4& specular ) + +
    ovoid setSpecular( Face face, const Vec4& specular )
    Set specular value of specified face(s) of the material, valid specular[03] range is 00 to 10

    - -

    oconst Vec4& getSpecular(const Face face) const + +
    oconst Vec4& getSpecular(Face face) const
    Get the specular value for specified face

    - -

    oinline const bool getSpecularFrontAndBack() const + +
    oinline bool getSpecularFrontAndBack() const
    Get the whether specular values are equal for front and back faces

    - -

    ovoid setEmission( const Face face, const Vec4& emission ) + +
    ovoid setEmission( Face face, const Vec4& emission )
    Set emission value of specified face(s) of the material, valid emmison[03] range is 00 to 10

    - -

    oconst Vec4& getEmission(const Face face) const + +
    oconst Vec4& getEmission(Face face) const
    Get the emmsion value for specified face

    - -

    oinline const bool getEmissionFrontAndBack() const + +
    oinline bool getEmissionFrontAndBack() const
    Get the whether emission values are equal for front and back faces

    - -

    ovoid setShininess( const Face face, float shininess ) + +
    ovoid setShininess(Face face, float shininess )
    Set shininess of specified face(s) of the material, valid shininess range is 00 to 1280

    - -

    oconst float getShininess(const Face face) const + +
    ofloat getShininess(Face face) const
    Get the shininess value for specified face

    - -

    oinline const bool getShininessFrontAndBack() const + +
    oinline bool getShininessFrontAndBack() const
    Get the whether shininess values are equal for front and back faces

    - -

    ovoid setTransparency(const Face face, float trans) + +
    ovoid setTransparency(Face face, float trans)
    Set the alpha value of ambient,diffuse,specular and emission colors, of specified face, to 1-transparency. Valid transparency range is 0.0 to 1.0.

    - -

    ovoid setAlpha(const Face face, float alpha) + +
    ovoid setAlpha(Face face, float alpha)
    Set the alpha value of ambient,diffuse,specular and emission colors. Valid transparency range is 0.0 to 1.0.

    - +

    ovirtual ~Material()

    - -

    oColorMode _colorMode + +
    oColorMode _colorMode

    - +

    obool _ambientFrontAndBack

    - +

    oVec4 _ambientFront

    - +

    oVec4 _ambientBack

    - +

    obool _diffuseFrontAndBack

    - +

    oVec4 _diffuseFront

    - +

    oVec4 _diffuseBack

    - +

    obool _specularFrontAndBack

    - +

    oVec4 _specularFront

    - +

    oVec4 _specularBack

    - +

    obool _emissionFrontAndBack

    - +

    oVec4 _emissionFront

    - +

    oVec4 _emissionBack

    - +

    obool _shininessFrontAndBack

    - +

    ofloat _shininessFront

    - +

    ofloat _shininessBack

    diff --git a/doc/doc++/osg/Matrix.html b/doc/doc++/osg/Matrix.html index de67e1060..7edf3108e 100644 --- a/doc/doc++/osg/Matrix.html +++ b/doc/doc++/osg/Matrix.html @@ -22,199 +22,202 @@

    Public Methods

    -[more] Matrix() +[more] Matrix()
    -[more] Matrix( const Matrix& other) +[more] Matrix( const Matrix& other)
    -[more]explicit Matrix( float const* const def ) +[more]explicit Matrix( float const* const def )
    -[more] Matrix( float a00, float a01, float a02, float a03, float a10, float a11, float a12, float a13, float a20, float a21, float a22, float a23, float a30, float a31, float a32, float a33) +[more] Matrix( float a00, float a01, float a02, float a03, float a10, float a11, float a12, float a13, float a20, float a21, float a22, float a23, float a30, float a31, float a32, float a33)
    -[more]virtual Object* cloneType() const +[more]virtual Object* cloneType() const
    -[more]virtual Object* clone(const CopyOp&) const +[more]virtual Object* clone(const CopyOp&) const
    -[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
    -[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    -[more]virtual ~Matrix() +[more]virtual ~Matrix()
    -[more]int compare(const Matrix& m) const +[more]int compare(const Matrix& m) const
    -[more]bool operator < (const Matrix& m) const +[more]bool operator < (const Matrix& m) const
    -[more]bool operator == (const Matrix& m) const +[more]bool operator == (const Matrix& m) const
    -[more]bool operator != (const Matrix& m) const +[more]bool operator != (const Matrix& m) const
    -[more]inline float& operator()(int row, int col) +[more]inline float& operator()(int row, int col)
    -[more]inline float operator()(int row, int col) const +[more]inline float operator()(int row, int col) const
    -[more]inline const bool valid() const +[more]inline bool valid() const
    -[more]inline const bool isNaN() const +[more]inline bool isNaN() const
    -[more]inline Matrix& operator = (const Matrix& other) +[more]inline Matrix& operator = (const Matrix& other)
    -[more]inline void set(const Matrix& other) +[more]inline void set(const Matrix& other)
    -[more]inline void set(float const* const ptr) +[more]inline void set(float const* const ptr)
    -[more]void set( float a00, float a01, float a02, float a03, float a10, float a11, float a12, float a13, float a20, float a21, float a22, float a23, float a30, float a31, float a32, float a33) +[more]void set( float a00, float a01, float a02, float a03, float a10, float a11, float a12, float a13, float a20, float a21, float a22, float a23, float a30, float a31, float a32, float a33)
    -[more]float* ptr() +[more]float* ptr() const
    -[more]const float* ptr() const +[more]void makeIdentity()
    -[more]void makeIdentity() +[more]void makeScale( const Vec3& )
    -[more]void makeScale( const Vec3& ) +[more]void makeScale( float, float, float )
    -[more]void makeScale( float, float, float ) +[more]void makeTranslate( const Vec3& )
    -[more]void makeTranslate( const Vec3& ) +[more]void makeTranslate( float, float, float )
    -[more]void makeTranslate( float, float, float ) +[more]void makeRotate( const Vec3& from, const Vec3& to )
    -[more]void makeRotate( const Vec3& from, const Vec3& to ) +[more]void makeRotate( float angle, const Vec3& axis )
    -[more]void makeRotate( float angle, const Vec3& axis ) +[more]void makeRotate( float angle, float x, float y, float z )
    -[more]void makeRotate( float angle, float x, float y, float z ) +[more]void makeRotate( const Quat& )
    -[more]void makeRotate( const Quat& ) +[more]void makeRotate( float angle1, const Vec3& axis1, float angle2, const Vec3& axis2, float angle3, const Vec3& axis3)
    -[more]void makeRotate( float angle1, const Vec3& axis1, float angle2, const Vec3& axis2, float angle3, const Vec3& axis3) -
    -[more]void makeOrtho(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) +[more]void makeOrtho(double left, double right, double bottom, double top, double zNear, double zFar)
    Set to a orthographic projection.
    -[more]inline void makeOrtho2D(const double left, const double right, const double bottom, const double top) +[more]inline void makeOrtho2D(double left, double right, double bottom, double top)
    Set to a 2D orthographic projection.
    -[more]void makeFrustum(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) +[more]void makeFrustum(double left, double right, double bottom, double top, double zNear, double zFar)
    Set to a perspective projection.
    -[more]void makePerspective(const double fovy, const double aspectRatio, const double zNear, const double zFar) +[more]void makePerspective(double fovy, double aspectRatio, double zNear, double zFar)
    Set to a symmetrical perspective projection, See gluPerspective for further details.
    -[more]void makeLookAt(const Vec3& eye, const Vec3& center, const Vec3& up) +[more]void makeLookAt(const Vec3& eye, const Vec3& center, const Vec3& up)
    Set to the position and orientation as per a camera, using the same convention as gluLookAt.
    -[more]bool invert( const Matrix& ) +[more]bool invert( const Matrix& )
    -[more]inline static Matrix identity( void ) +[more]inline static Matrix identity( void )
    -[more]inline static Matrix scale( const Vec3& sv) +[more]inline static Matrix scale( const Vec3& sv)
    -[more]inline static Matrix scale( float sx, float sy, float sz) +[more]inline static Matrix scale( float sx, float sy, float sz)
    -[more]inline static Matrix translate( const Vec3& dv) +[more]inline static Matrix translate( const Vec3& dv)
    -[more]inline static Matrix translate( float x, float y, float z) +[more]inline static Matrix translate( float x, float y, float z)
    -[more]inline static Matrix rotate( const Vec3& from, const Vec3& to) +[more]inline static Matrix rotate( const Vec3& from, const Vec3& to)
    -[more]inline static Matrix rotate( float angle, float x, float y, float z) +[more]inline static Matrix rotate( float angle, float x, float y, float z)
    -[more]inline static Matrix rotate( float angle, const Vec3& axis) +[more]inline static Matrix rotate( float angle, const Vec3& axis)
    -[more]inline static Matrix rotate( float angle1, const Vec3& axis1, float angle2, const Vec3& axis2, float angle3, const Vec3& axis3) +[more]inline static Matrix rotate( float angle1, const Vec3& axis1, float angle2, const Vec3& axis2, float angle3, const Vec3& axis3)
    -[more]inline static Matrix rotate( const Quat& quat) +[more]inline static Matrix rotate( const Quat& quat)
    -[more]inline static Matrix inverse( const Matrix& matrix) +[more]inline static Matrix inverse( const Matrix& matrix)
    -[more]inline static Matrix ortho(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) +[more]inline static Matrix ortho(double left, double right, double bottom, double top, double zNear, double zFar)
    Create a orthographic projection.
    -[more]inline static Matrix ortho2D(const double left, const double right, const double bottom, const double top) +[more]inline static Matrix ortho2D(double left, double right, double bottom, double top)
    Create a 2D orthographic projection.
    -[more]inline static Matrix frustum(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) +[more]inline static Matrix frustum(double left, double right, double bottom, double top, double zNear, double zFar)
    Create a perspective projection.
    -[more]inline static Matrix perspective(const double fovy, const double aspectRatio, const double zNear, const double zFar) +[more]inline static Matrix perspective(double fovy, double aspectRatio, double zNear, double zFar)
    Create a symmetrical perspective projection, See gluPerspective for further details.
    -[more]inline static Matrix lookAt(const Vec3& eye, const Vec3& center, const Vec3& up) +[more]inline static Matrix lookAt(const Vec3& eye, const Vec3& center, const Vec3& up)
    Create the position and orientation as per a camera, using the same convention as gluLookAt.
    -[more]void setTrans( float tx, float ty, float tz ) +[more]void setTrans( float tx, float ty, float tz )
    -[more]void setTrans( const Vec3& v ) +[more]void setTrans( const Vec3& v )
    -[more]inline Vec3 getTrans() const +[more]inline Vec3 getTrans() const
    -[more]inline Vec3 getScale() const +[more]inline Vec3 getScale() const
    -[more]inline static Vec3 transform3x3(const Vec3& v, const Matrix& m) +[more]inline static Vec3 transform3x3(const Vec3& v, const Matrix& m)
    apply apply an 3x3 transform of v*M[02,02]
    -[more]inline static Vec3 transform3x3(const Matrix& m, const Vec3& v) +[more]inline static Vec3 transform3x3(const Matrix& m, const Vec3& v)
    apply apply an 3x3 transform of M[02,02]*v
    -[more]void mult( const Matrix&, const Matrix& ) +[more]void mult( const Matrix&, const Matrix& )
    -[more]void preMult( const Matrix& ) +[more]void preMult( const Matrix& )
    -[more]void postMult( const Matrix& ) +[more]void postMult( const Matrix& )
    -[more]inline void operator *= ( const Matrix& other ) +[more]inline void operator *= ( const Matrix& other )
    -[more]inline Matrix operator * ( const Matrix &m ) const +[more]inline Matrix operator * ( const Matrix &m ) const
    -[more]inline Matrix identity(void) +[more]inline Matrix identity(void)
    -[more]inline Matrix scale(float sx, float sy, float sz) +[more]inline Matrix scale(float sx, float sy, float sz)
    -[more]inline Matrix scale(const Vec3& v ) +[more]inline Matrix scale(const Vec3& v )
    -[more]inline Matrix translate(float tx, float ty, float tz) +[more]inline Matrix translate(float tx, float ty, float tz)
    -[more]inline Matrix translate(const Vec3& v ) +[more]inline Matrix translate(const Vec3& v )
    -[more]inline Matrix rotate( const Quat& q ) +[more]inline Matrix rotate( const Quat& q )
    -[more]inline Matrix rotate(float angle, float x, float y, float z ) +[more]inline Matrix rotate(float angle, float x, float y, float z )
    -[more]inline Matrix rotate(float angle, const Vec3& axis ) +[more]inline Matrix rotate(float angle, const Vec3& axis )
    -[more]inline Matrix rotate( float angle1, const Vec3& axis1, float angle2, const Vec3& axis2, float angle3, const Vec3& axis3) +[more]inline Matrix rotate( float angle1, const Vec3& axis1, float angle2, const Vec3& axis2, float angle3, const Vec3& axis3)
    -[more]inline Matrix rotate(const Vec3& from, const Vec3& to ) +[more]inline Matrix rotate(const Vec3& from, const Vec3& to )
    -[more]inline Matrix inverse( const Matrix& matrix) +[more]inline Matrix inverse( const Matrix& matrix)
    -[more]inline Matrix ortho(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) +[more]inline Matrix ortho(double left, double right, double bottom, double top, double zNear, double zFar)
    -[more]inline Matrix ortho2D(const double left, const double right, const double bottom, const double top) +[more]inline Matrix ortho2D(double left, double right, double bottom, double top)
    -[more]inline Matrix frustum(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) +[more]inline Matrix frustum(double left, double right, double bottom, double top, double zNear, double zFar)
    -[more]inline Matrix perspective(const double fovy, const double aspectRatio, const double zNear, const double zFar) +[more]inline Matrix perspective(double fovy, double aspectRatio, double zNear, double zFar)
    -[more]inline Matrix lookAt(const Vec3& eye, const Vec3& center, const Vec3& up) +[more]inline Matrix lookAt(const Vec3& eye, const Vec3& center, const Vec3& up)
    -[more]inline Vec3 postMult( const Vec3& v ) const +[more]inline Vec3 postMult( const Vec3& v ) const
    -[more]inline Vec3 preMult( const Vec3& v ) const +[more]inline Vec3 preMult( const Vec3& v ) const
    -[more]inline Vec4 postMult( const Vec4& v ) const +[more]inline Vec4 postMult( const Vec4& v ) const
    -[more]inline Vec4 preMult( const Vec4& v ) const +[more]inline Vec4 preMult( const Vec4& v ) const
    -[more]inline Vec3 transform3x3(const Vec3& v, const Matrix& m) +[more]inline Vec3 transform3x3(const Vec3& v, const Matrix& m)
    -[more]inline Vec3 transform3x3(const Matrix& m, const Vec3& v) +[more]inline Vec3 transform3x3(const Matrix& m, const Vec3& v)
    -[more]inline Vec3 operator* (const Vec3& v) const +[more]inline Vec3 operator* (const Vec3& v) const
    -[more]inline Vec4 operator* (const Vec4& v) const +[more]inline Vec4 operator* (const Vec4& v) const +

    + +

    +

    Protected Fields

    +[more]float _mat[4][4]

    @@ -222,9 +225,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -240,7 +243,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -256,12 +259,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -272,381 +283,381 @@
    - +
    o Matrix()

    - -

    o Matrix( const Matrix& other) + +
    o Matrix( const Matrix& other)

    - +

    oexplicit Matrix( float const* const def )

    - +

    o Matrix( float a00, float a01, float a02, float a03, float a10, float a11, float a12, float a13, float a20, float a21, float a22, float a23, float a30, float a31, float a32, float a33)

    - +

    ovirtual Object* cloneType() const

    - +

    ovirtual Object* clone(const CopyOp&) const

    - +

    ovirtual bool isSameKindAs(const Object* obj) const

    - +

    ovirtual const char* libraryName() const

    - +

    ovirtual const char* className() const

    - +

    ovirtual ~Matrix()

    - +

    oint compare(const Matrix& m) const

    - +

    obool operator < (const Matrix& m) const

    - +

    obool operator == (const Matrix& m) const

    - +

    obool operator != (const Matrix& m) const

    - +

    oinline float& operator()(int row, int col)

    - +

    oinline float operator()(int row, int col) const

    - -

    oinline const bool valid() const + +
    oinline bool valid() const

    - -

    oinline const bool isNaN() const + +
    oinline bool isNaN() const

    - +

    oinline Matrix& operator = (const Matrix& other)

    - +

    oinline void set(const Matrix& other)

    - -

    oinline void set(float const* const ptr) + +
    oinline void set(float const* const ptr)

    - +

    ovoid set( float a00, float a01, float a02, float a03, float a10, float a11, float a12, float a13, float a20, float a21, float a22, float a23, float a30, float a31, float a32, float a33)

    - -

    ofloat* ptr() -

    - - -

    oconst float* ptr() const + +
    ofloat* ptr() const

    - +

    ovoid makeIdentity()

    - +

    ovoid makeScale( const Vec3& )

    - +

    ovoid makeScale( float, float, float )

    - +

    ovoid makeTranslate( const Vec3& )

    - +

    ovoid makeTranslate( float, float, float )

    - +

    ovoid makeRotate( const Vec3& from, const Vec3& to )

    - +

    ovoid makeRotate( float angle, const Vec3& axis )

    - -

    ovoid makeRotate( float angle, float x, float y, float z ) + +
    ovoid makeRotate( float angle, float x, float y, float z )

    - +

    ovoid makeRotate( const Quat& )

    - +

    ovoid makeRotate( float angle1, const Vec3& axis1, float angle2, const Vec3& axis2, float angle3, const Vec3& axis3)

    - -

    ovoid makeOrtho(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) + +
    ovoid makeOrtho(double left, double right, double bottom, double top, double zNear, double zFar)
    Set to a orthographic projection. See glOrtho for further details.

    - -

    oinline void makeOrtho2D(const double left, const double right, const double bottom, const double top) + +
    oinline void makeOrtho2D(double left, double right, double bottom, double top)
    Set to a 2D orthographic projection. See glOrtho2D for further details.

    - -

    ovoid makeFrustum(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) + +
    ovoid makeFrustum(double left, double right, double bottom, double top, double zNear, double zFar)
    Set to a perspective projection. See glFrustum for further details.

    - -

    ovoid makePerspective(const double fovy, const double aspectRatio, const double zNear, const double zFar) + +
    ovoid makePerspective(double fovy, double aspectRatio, double zNear, double zFar)
    Set to a symmetrical perspective projection, See gluPerspective for further details. Aspect ratio is defined as width/height.

    - -

    ovoid makeLookAt(const Vec3& eye, const Vec3& center, const Vec3& up) + +
    ovoid makeLookAt(const Vec3& eye, const Vec3& center, const Vec3& up)
    Set to the position and orientation as per a camera, using the same convention as gluLookAt.

    - +

    obool invert( const Matrix& )

    - +

    oinline static Matrix identity( void )

    - +

    oinline static Matrix scale( const Vec3& sv)

    - +

    oinline static Matrix scale( float sx, float sy, float sz)

    - +

    oinline static Matrix translate( const Vec3& dv)

    - -

    oinline static Matrix translate( float x, float y, float z) + +
    oinline static Matrix translate( float x, float y, float z)

    - +

    oinline static Matrix rotate( const Vec3& from, const Vec3& to)

    - -

    oinline static Matrix rotate( float angle, float x, float y, float z) + +
    oinline static Matrix rotate( float angle, float x, float y, float z)

    - +

    oinline static Matrix rotate( float angle, const Vec3& axis)

    - +

    oinline static Matrix rotate( float angle1, const Vec3& axis1, float angle2, const Vec3& axis2, float angle3, const Vec3& axis3)

    - +

    oinline static Matrix rotate( const Quat& quat)

    - +

    oinline static Matrix inverse( const Matrix& matrix)

    - -

    oinline static Matrix ortho(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) + +
    oinline static Matrix ortho(double left, double right, double bottom, double top, double zNear, double zFar)
    Create a orthographic projection. See glOrtho for further details.

    - -

    oinline static Matrix ortho2D(const double left, const double right, const double bottom, const double top) + +
    oinline static Matrix ortho2D(double left, double right, double bottom, double top)
    Create a 2D orthographic projection. See glOrtho for further details.

    - -

    oinline static Matrix frustum(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) + +
    oinline static Matrix frustum(double left, double right, double bottom, double top, double zNear, double zFar)
    Create a perspective projection. See glFrustum for further details.

    - -

    oinline static Matrix perspective(const double fovy, const double aspectRatio, const double zNear, const double zFar) + +
    oinline static Matrix perspective(double fovy, double aspectRatio, double zNear, double zFar)
    Create a symmetrical perspective projection, See gluPerspective for further details. Aspect ratio is defined as width/height.

    - -

    oinline static Matrix lookAt(const Vec3& eye, const Vec3& center, const Vec3& up) + +
    oinline static Matrix lookAt(const Vec3& eye, const Vec3& center, const Vec3& up)
    Create the position and orientation as per a camera, using the same convention as gluLookAt.

    - +

    ovoid setTrans( float tx, float ty, float tz )

    - +

    ovoid setTrans( const Vec3& v )

    - +

    oinline Vec3 getTrans() const

    - +

    oinline Vec3 getScale() const

    - +

    oinline static Vec3 transform3x3(const Vec3& v, const Matrix& m)
    apply apply an 3x3 transform of v*M[02,02]

    - +

    oinline static Vec3 transform3x3(const Matrix& m, const Vec3& v)
    apply apply an 3x3 transform of M[02,02]*v

    - +

    ovoid mult( const Matrix&, const Matrix& )

    - +

    ovoid preMult( const Matrix& )

    - +

    ovoid postMult( const Matrix& )

    - +

    oinline void operator *= ( const Matrix& other )

    - +

    oinline Matrix operator * ( const Matrix &m ) const

    + + +

    ofloat _mat[4][4] +

    - +

    oinline Matrix identity(void)

    - +

    oinline Matrix scale(float sx, float sy, float sz)

    - +

    oinline Matrix scale(const Vec3& v )

    - +

    oinline Matrix translate(float tx, float ty, float tz)

    - +

    oinline Matrix translate(const Vec3& v )

    - +

    oinline Matrix rotate( const Quat& q )

    - -

    oinline Matrix rotate(float angle, float x, float y, float z ) + +
    oinline Matrix rotate(float angle, float x, float y, float z )

    - +

    oinline Matrix rotate(float angle, const Vec3& axis )

    - +

    oinline Matrix rotate( float angle1, const Vec3& axis1, float angle2, const Vec3& axis2, float angle3, const Vec3& axis3)

    - +

    oinline Matrix rotate(const Vec3& from, const Vec3& to )

    - +

    oinline Matrix inverse( const Matrix& matrix)

    - -

    oinline Matrix ortho(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) + +
    oinline Matrix ortho(double left, double right, double bottom, double top, double zNear, double zFar)

    - -

    oinline Matrix ortho2D(const double left, const double right, const double bottom, const double top) + +
    oinline Matrix ortho2D(double left, double right, double bottom, double top)

    - -

    oinline Matrix frustum(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) + +
    oinline Matrix frustum(double left, double right, double bottom, double top, double zNear, double zFar)

    - -

    oinline Matrix perspective(const double fovy, const double aspectRatio, const double zNear, const double zFar) + +
    oinline Matrix perspective(double fovy, double aspectRatio, double zNear, double zFar)

    - -

    oinline Matrix lookAt(const Vec3& eye, const Vec3& center, const Vec3& up) + +
    oinline Matrix lookAt(const Vec3& eye, const Vec3& center, const Vec3& up)

    - +

    oinline Vec3 postMult( const Vec3& v ) const

    - +

    oinline Vec3 preMult( const Vec3& v ) const

    - +

    oinline Vec4 postMult( const Vec4& v ) const

    - +

    oinline Vec4 preMult( const Vec4& v ) const

    - +

    oinline Vec3 transform3x3(const Vec3& v, const Matrix& m)

    - +

    oinline Vec3 transform3x3(const Matrix& m, const Vec3& v)

    - +

    oinline Vec3 operator* (const Vec3& v) const

    - +

    oinline Vec4 operator* (const Vec4& v) const

    diff --git a/doc/doc++/osg/MatrixTransform.html b/doc/doc++/osg/MatrixTransform.html index 9ee970024..1ae93636d 100644 --- a/doc/doc++/osg/MatrixTransform.html +++ b/doc/doc++/osg/MatrixTransform.html @@ -23,33 +23,33 @@

    Public Methods

    -[more] MatrixTransform() +[more] MatrixTransform()
    -[more] MatrixTransform(const MatrixTransform&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] MatrixTransform(const MatrixTransform&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] MatrixTransform(const Matrix& matix) +[more] MatrixTransform(const Matrix& matix)
    -[more] META_Node(osg, MatrixTransform) +[more] META_Node(osg, MatrixTransform)
    -[more]void setMatrix(const Matrix& mat) +[more]void setMatrix(const Matrix& mat)
    Set the transform's matrix
    -[more]inline const Matrix& getMatrix() const +[more]inline const Matrix& getMatrix() const
    Get the matrix.
    -[more]void preMult(const Matrix& mat) +[more]void preMult(const Matrix& mat)
    pre multiply the transforms matrix
    -[more]void postMult(const Matrix& mat) +[more]void postMult(const Matrix& mat)
    post multiply the transforms matrix
    -[more]inline const Matrix& getInverseMatrix() const +[more]inline const Matrix& getInverseMatrix() const
    Get the inverse matrix.
    -[more]virtual const bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor*) const +[more]virtual bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor*) const
    -[more]virtual const bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor*) const +[more]virtual bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor*) const

    @@ -60,16 +60,16 @@ class SG_EXPORT AnimationPathCallback

    Protected Fields

    -[more]ref_ptr<Matrix> _matrix +[more]ref_ptr<Matrix> _matrix
    -[more]mutable ref_ptr<Matrix> _inverse +[more]mutable ref_ptr<Matrix> _inverse
    -[more]mutable bool _inverseDirty +[more]mutable bool _inverseDirty

    Protected Methods

    -[more]virtual ~MatrixTransform() +[more]virtual ~MatrixTransform()

    @@ -77,19 +77,23 @@ class SG_EXPORT AnimationPathCallback

    Public Methods

    -ovoid setReferenceFrame(ReferenceFrame rf) +ovirtual Transform* asTransform()
    -oconst ReferenceFrame getReferenceFrame() const +ovirtual const Transform* asTransform() const
    -ovoid setComputeTransformCallback(ComputeTransformCallback* ctc) +ovoid setReferenceFrame(ReferenceFrame rf)
    -oComputeTransformCallback* getComputeTransformCallback() +oReferenceFrame getReferenceFrame() const
    -oconst ComputeTransformCallback* getComputeTransformCallback() const +ovoid setComputeTransformCallback(ComputeTransformCallback* ctc)
    -oinline const bool getLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const +oComputeTransformCallback* getComputeTransformCallback()
    -oinline const bool getWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const +oconst ComputeTransformCallback* getComputeTransformCallback() const +
    +oinline bool getLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const +
    +oinline bool getWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const

    @@ -101,14 +105,14 @@ class SG_EXPORT AnimationPathCallback

    Protected Fields

    -oref_ptr<ComputeTransformCallback> _computeTransformCallback +oref_ptr<ComputeTransformCallback> _computeTransformCallback
    -oReferenceFrame _referenceFrame +oReferenceFrame _referenceFrame

    Protected Methods

    -ovirtual const bool computeBound() const +ovirtual bool computeBound() const

    @@ -116,6 +120,10 @@ class SG_EXPORT AnimationPathCallback

    Public Methods

    +ovirtual Group* asGroup() +
    +ovirtual const Group* asGroup() const +
    ovirtual void traverse(NodeVisitor& nv)
    ovirtual bool addChild( Node* child ) @@ -124,22 +132,29 @@ class SG_EXPORT AnimationPathCallback ovirtual bool replaceChild( Node* origChild, Node* newChild )
    -oinline const unsigned int getNumChildren() const +oinline unsigned int getNumChildren() const
    -oinline Node* getChild( const unsigned int i ) +oinline Node* getChild( unsigned int i )
    -oinline const Node* getChild( const unsigned int i ) const +oinline const Node* getChild( unsigned int i ) const
    oinline bool containsNode( const Node* node ) const
    oinline ChildList::iterator findNode( const Node* node )
    oinline ChildList::const_iterator findNode( const Node* node ) const +
    +oinline unsigned int findChildNo( const Node* node ) const +

    + +

    +

    Public Members

    +otypedef std::vector<ref_ptr<Node> > ChildList

    Protected Fields

    -oChildList _children +oChildList _children

    @@ -153,69 +168,69 @@ into the Transform's parent coordinates
    - +
    o MatrixTransform()

    - -

    o MatrixTransform(const MatrixTransform&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o MatrixTransform(const MatrixTransform&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - +

    o MatrixTransform(const Matrix& matix)

    - +

    o META_Node(osg, MatrixTransform)

    - +

    ovoid setMatrix(const Matrix& mat)
    Set the transform's matrix

    - +

    oinline const Matrix& getMatrix() const
    Get the matrix.

    - +

    ovoid preMult(const Matrix& mat)
    pre multiply the transforms matrix

    - +

    ovoid postMult(const Matrix& mat)
    post multiply the transforms matrix

    - +

    oinline const Matrix& getInverseMatrix() const
    Get the inverse matrix.

    - -

    ovirtual const bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor*) const + +
    ovirtual bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor*) const

    - -

    ovirtual const bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor*) const + +
    ovirtual bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor*) const

    - +

    ovirtual ~MatrixTransform()

    - +

    oref_ptr<Matrix> _matrix

    - +

    omutable ref_ptr<Matrix> _inverse

    - +

    omutable bool _inverseDirty

    diff --git a/doc/doc++/osg/NodeAcceptOp.html b/doc/doc++/osg/NodeAcceptOp.html index 8f26c7dc0..82897b169 100644 --- a/doc/doc++/osg/NodeAcceptOp.html +++ b/doc/doc++/osg/NodeAcceptOp.html @@ -12,13 +12,13 @@

    -[more]NodeVisitor& _nv +[more]NodeVisitor& _nv
    -[more] NodeAcceptOp(NodeVisitor& nv) +[more] NodeAcceptOp(NodeVisitor& nv)
    -[more]void operator () (Node* node) +[more]void operator () (Node* node)
    -[more]void operator () (ref_ptr<Node> node) +[more]void operator () (ref_ptr<Node> node)

    @@ -29,19 +29,19 @@
    - +
    oNodeVisitor& _nv

    - +

    o NodeAcceptOp(NodeVisitor& nv)

    - +

    ovoid operator () (Node* node)

    - +

    ovoid operator () (ref_ptr<Node> node)

    Alphabetic index HTML hierarchy of classes or Java

    diff --git a/doc/doc++/osg/NodeCallback.html b/doc/doc++/osg/NodeCallback.html index 5d9f4b571..355b360a5 100644 --- a/doc/doc++/osg/NodeCallback.html +++ b/doc/doc++/osg/NodeCallback.html @@ -22,28 +22,28 @@

    Public Fields

    -[more]ref_ptr<NodeCallback> _nestedCallback +[more]ref_ptr<NodeCallback> _nestedCallback

    Public Methods

    -[more] NodeCallback() +[more] NodeCallback()
    -[more]virtual ~NodeCallback() +[more]virtual ~NodeCallback()
    -[more]virtual void operator()(Node* node, NodeVisitor* nv) +[more]virtual void operator()(Node* node, NodeVisitor* nv)
    Callback method call by the NodeVisitor when visiting a node
    -[more]void traverse(Node* node, NodeVisitor* nv) +[more]void traverse(Node* node, NodeVisitor* nv)
    Call any nested callbacks and then traverse the scene graph.
    -[more]void setNestedCallback(NodeCallback* nc) +[more]void setNestedCallback(NodeCallback* nc)
    -[more]NodeCallback* getNestedCallback() +[more]NodeCallback* getNestedCallback()
    -[more]inline void addNestedCallback(NodeCallback* nc) +[more]inline void addNestedCallback(NodeCallback* nc)
    -[more]inline void removeNestedCallback(NodeCallback* nc) +[more]inline void removeNestedCallback(NodeCallback* nc)

    @@ -59,12 +59,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -75,41 +83,41 @@
    - +
    o NodeCallback()

    - +

    ovirtual ~NodeCallback()

    - +

    ovirtual void operator()(Node* node, NodeVisitor* nv)
    Callback method call by the NodeVisitor when visiting a node

    - +

    ovoid traverse(Node* node, NodeVisitor* nv)
    Call any nested callbacks and then traverse the scene graph.

    - +

    ovoid setNestedCallback(NodeCallback* nc)

    - +

    oNodeCallback* getNestedCallback()

    - +

    oinline void addNestedCallback(NodeCallback* nc)

    - +

    oinline void removeNestedCallback(NodeCallback* nc)

    - +

    oref_ptr<NodeCallback> _nestedCallback

    diff --git a/doc/doc++/osg/NodeVisitor.html b/doc/doc++/osg/NodeVisitor.html index 6b104a30c..36c9af0d6 100644 --- a/doc/doc++/osg/NodeVisitor.html +++ b/doc/doc++/osg/NodeVisitor.html @@ -23,140 +23,146 @@

    Public Methods

    -[more] NodeVisitor(TraversalMode tm=TRAVERSE_NONE) +[more] NodeVisitor(TraversalMode tm=TRAVERSE_NONE)
    -[more] NodeVisitor(VisitorType type, TraversalMode tm=TRAVERSE_NONE) +[more] NodeVisitor(VisitorType type, TraversalMode tm=TRAVERSE_NONE)
    -[more]virtual ~NodeVisitor() +[more]virtual ~NodeVisitor()
    -[more]virtual void reset() +[more]virtual void reset()
    Method to call to reset visitor.
    -[more]inline void setVisitorType(VisitorType type) +[more]inline void setVisitorType(VisitorType type)
    Set the VisitorType, used to distingush different visitors during traversal of the scene, typically used in the Node::traverse() method to select which behaviour to use for different types of traversal/visitors
    -[more]inline VisitorType getVisitorType() const +[more]inline VisitorType getVisitorType() const
    Get the VisitorType
    -[more]inline void setTraversalNumber(const int fn) +[more]inline void setTraversalNumber(int fn)
    Set the traversal number.
    -[more]inline const int getTraversalNumber() const +[more]inline int getTraversalNumber() const
    Get the traversal number.
    -[more]inline void setFrameStamp(FrameStamp* fs) +[more]inline void setFrameStamp(FrameStamp* fs)
    Set the FrameStamp that this traversal is assoicated with
    -[more]inline const FrameStamp* getFrameStamp() const +[more]inline const FrameStamp* getFrameStamp() const
    Get the FrameStamp that this traversal is assoicated with
    -[more]inline void setTraversalMask(const Node::NodeMask mask) +[more]inline void setTraversalMask(Node::NodeMask mask)
    Set the TraversalMask of this NodeVisitor.
    -[more]inline const Node::NodeMask getTraversalMask() const +[more]inline Node::NodeMask getTraversalMask() const
    Get the TraversalMask
    -[more]inline void setNodeMaskOverride(const Node::NodeMask mask) +[more]inline void setNodeMaskOverride(Node::NodeMask mask)
    Set the NodeMaskOverride mask.
    -[more]inline const Node::NodeMask getNodeMaskOverride() const +[more]inline Node::NodeMask getNodeMaskOverride() const
    Get the NodeMaskOverride mask
    -[more]inline const bool validNodeMask(const osg::Node& node) const +[more]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.
    -[more]void setTraversalMode(const TraversalMode mode) +[more]void setTraversalMode(const TraversalMode mode)
    Set the traversal mode for Node::traverse() to use when deciding which children of a node to traverse.
    -[more]inline const TraversalMode getTraversalMode() const +[more]inline TraversalMode getTraversalMode() const
    Get the traversal mode
    -[more]void setTraversalVisitor(NodeVisitor* nv) +[more]void setTraversalVisitor(NodeVisitor* nv)
    Set a visitor to handle traversal.
    -[more]inline NodeVisitor* getTraversalVisitor() +[more]inline NodeVisitor* getTraversalVisitor()
    Get the traversal visitor, returns NULL if none is attached
    -[more]inline void traverse(Node& node) +[more]inline void traverse(Node& node)
    Method for handling traversal of a nodes.
    -[more]inline void pushOntoNodePath(Node* node) +[more]inline void pushOntoNodePath(Node* node)
    Method called by osg::Node::accept() method before a call the NodeVisitor::apply().
    -[more]inline void popFromNodePath() +[more]inline void popFromNodePath()
    Method callby osg::Node::accept() method after a call the NodeVisitor::apply().
    -[more]NodePath& getNodePath() +[more]NodePath& getNodePath()
    Get the non const NodePath from the top most node applied down to the current Node being visited
    -[more]const NodePath& getNodePath() const +[more]const NodePath& getNodePath() const
    Get the const NodePath from the top most node applied down to the current Node being visited
    -[more]const bool getLocalToWorldMatrix(Matrix& matrix, Node* node) +[more]virtual bool getLocalToWorldMatrix(Matrix& matrix, Node* node)
    Get the Local To World Matrix from the NodePath for specified Transform::Mode, and u
    -[more]const bool getWorldToLocalMatrix(Matrix& matrix, Node* node) +[more]virtual bool getWorldToLocalMatrix(Matrix& matrix, Node* node)
    Get the World To Local Matrix from the NodePath for specified Transform::Mode
    -[more]virtual void apply(Node& node) +[more]virtual float getDistanceToEyePoint(const Vec3& , bool ) const +
    Get the distance from a point to the eye point, distance value in local coordinate system.
    -[more]virtual void apply(Geode& node) +[more]virtual float getDistanceFromEyePoint(const Vec3& , bool ) const +
    Get the distance of a point from the eye point, distance value in the eye coordinate system.
    -[more]virtual void apply(Billboard& node) +[more]virtual void apply(Node& node)
    -[more]virtual void apply(Group& node) +[more]virtual void apply(Geode& node)
    -[more]virtual void apply(Projection& node) +[more]virtual void apply(Billboard& node)
    -[more]virtual void apply(ClipNode& node) +[more]virtual void apply(Group& node)
    -[more]virtual void apply(LightSource& node) +[more]virtual void apply(Projection& node)
    -[more]virtual void apply(Transform& node) +[more]virtual void apply(ClipNode& node)
    -[more]virtual void apply(DOFTransform& node) +[more]virtual void apply(LightSource& node)
    -[more]virtual void apply(MatrixTransform& node) +[more]virtual void apply(Transform& node)
    -[more]virtual void apply(PositionAttitudeTransform& node) +[more]virtual void apply(DOFTransform& node)
    -[more]virtual void apply(Switch& node) +[more]virtual void apply(MatrixTransform& node)
    -[more]virtual void apply(Sequence& node) +[more]virtual void apply(PositionAttitudeTransform& node)
    -[more]virtual void apply(LOD& node) +[more]virtual void apply(Switch& node)
    -[more]virtual void apply(Impostor& node) +[more]virtual void apply(Sequence& node)
    -[more]virtual void apply(ClearNode& node) +[more]virtual void apply(LOD& node)
    -[more]virtual void apply(OccluderNode& node) +[more]virtual void apply(Impostor& node) +
    +[more]virtual void apply(ClearNode& node) +
    +[more]virtual void apply(OccluderNode& node)

    Public Members

    -[more]enum TraversalMode +[more]enum TraversalMode
    -[more]enum VisitorType +[more]enum VisitorType

    Protected Fields

    -[more]VisitorType _visitorType +[more]VisitorType _visitorType
    -[more]int _traversalNumber +[more]int _traversalNumber
    -[more]ref_ptr<FrameStamp> _frameStamp +[more]ref_ptr<FrameStamp> _frameStamp
    -[more]ref_ptr<NodeVisitor> _traversalVisitor +[more]ref_ptr<NodeVisitor> _traversalVisitor
    -[more]TraversalMode _traversalMode +[more]TraversalMode _traversalMode
    -[more]Node::NodeMask _traversalMask +[more]Node::NodeMask _traversalMask
    -[more]Node::NodeMask _nodeMaskOverride +[more]Node::NodeMask _nodeMaskOverride
    -[more]NodePath _nodePath +[more]NodePath _nodePath

    @@ -172,12 +178,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -202,67 +216,67 @@ not be called.
    - +
    oenum TraversalMode

    - +
    o TRAVERSE_NONE

    - +

    o TRAVERSE_PARENTS

    - +

    o TRAVERSE_ALL_CHILDREN

    - +

    o TRAVERSE_ACTIVE_CHILDREN

    - +

    o TRAVERSE_VISITOR

    - +
    oenum VisitorType

    - +
    o NODE_VISITOR

    - +

    o APP_VISITOR

    - +

    o COLLECT_OCCLUDER_VISITOR

    - +

    o CULL_VISITOR

    - -
    o NodeVisitor(TraversalMode tm=TRAVERSE_NONE) + +
    o NodeVisitor(TraversalMode tm=TRAVERSE_NONE)

    - -

    o NodeVisitor(VisitorType type, TraversalMode tm=TRAVERSE_NONE) + +
    o NodeVisitor(VisitorType type, TraversalMode tm=TRAVERSE_NONE)

    - +

    ovirtual ~NodeVisitor()

    - +

    ovirtual void reset()
    Method to call to reset visitor. Useful for your visitor accumulates state during a traversal, and you plan to reuse the visitor. @@ -270,40 +284,40 @@ To flush that state for the next traversal than call reset() prior to each traversal.

    - -

    oinline void setVisitorType(VisitorType type) + +
    oinline void setVisitorType(VisitorType type)
    Set the VisitorType, used to distingush different visitors during traversal of the scene, typically used in the Node::traverse() method to select which behaviour to use for different types of traversal/visitors

    - -

    oinline VisitorType getVisitorType() const + +
    oinline VisitorType getVisitorType() const
    Get the VisitorType

    - -

    oinline void setTraversalNumber(const int fn) + +
    oinline void setTraversalNumber(int fn)
    Set the traversal number. Typically used to denote the frame count.

    - -

    oinline const int getTraversalNumber() const + +
    oinline int getTraversalNumber() const
    Get the traversal number. Typically used to denote the frame count.

    - +

    oinline void setFrameStamp(FrameStamp* fs)
    Set the FrameStamp that this traversal is assoicated with

    - +

    oinline const FrameStamp* getFrameStamp() const
    Get the FrameStamp that this traversal is assoicated with

    - -

    oinline void setTraversalMask(const Node::NodeMask mask) + +
    oinline void setTraversalMask(Node::NodeMask mask)
    Set the TraversalMask of this NodeVisitor. The TraversalMask is used by the NodeVisitor::validNodeMask() method to determine whether to operate on a node and its subgraph. @@ -315,13 +329,13 @@ _nodeMaskOverride to 0xffffffff will allow a visitor to work on all nodes regardless of their own Node::_nodeMask state.

    - -

    oinline const Node::NodeMask getTraversalMask() const + +
    oinline Node::NodeMask getTraversalMask() const
    Get the TraversalMask

    - -

    oinline void setNodeMaskOverride(const Node::NodeMask mask) + +
    oinline void setNodeMaskOverride(Node::NodeMask mask)
    Set the NodeMaskOverride mask. Used in validNodeMask() to determine whether to operate on a node or its subgraph, by OR'ing NodeVisitor::_nodeMaskOverride with the Node's own Node::_nodeMask. @@ -329,13 +343,13 @@ Typically used to force on nodes which may have been switched off by their own Node::_nodeMask.

    - -

    oinline const Node::NodeMask getNodeMaskOverride() const + +
    oinline Node::NodeMask getNodeMaskOverride() const
    Get the NodeMaskOverride mask

    - -

    oinline const bool validNodeMask(const osg::Node& node) const + +
    oinline 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. Return true if the result of a bit wise and of the NodeVisitor::_traversalMask @@ -344,8 +358,8 @@ default values for _traversalMask is 0xffffffff, _nodeMaskOverride is 0x0, and osg::Node::_nodeMask is 0xffffffff.

    - -

    ovoid setTraversalMode(const TraversalMode mode) + +
    ovoid setTraversalMode(const 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() @@ -353,23 +367,23 @@ and the new mode is not TRAVERSE_VISITOR then the attached visitor is detached. Default mode is TRAVERSE_NONE.

    - -

    oinline const TraversalMode getTraversalMode() const + +
    oinline TraversalMode getTraversalMode() const
    Get the traversal mode

    - +

    ovoid setTraversalVisitor(NodeVisitor* nv)
    Set a visitor to handle traversal. Overrides the traverse mode setting it to TRAVERSAL_VISITOR.

    - +

    oinline NodeVisitor* getTraversalVisitor()
    Get the traversal visitor, returns NULL if none is attached

    - +

    oinline void traverse(Node& node)
    Method for handling traversal of a nodes. If you intend to use the visitor for actively traversing @@ -377,7 +391,7 @@ the scene graph then make sure the accept() methods call this method unless they handle traversal directly.

    - +

    oinline void pushOntoNodePath(Node* node)
    Method called by osg::Node::accept() method before a call the NodeVisitor::apply(). The back of the list will, @@ -388,7 +402,7 @@ Note, the user does not typically call pushNodeOnPath() as it will be called automatically by the Node::accept() method.

    - +

    oinline void popFromNodePath()
    Method callby osg::Node::accept() method after a call the NodeVisitor::apply(). @@ -396,125 +410,139 @@ Note, the user does not typically call pushNodeOnPath() as it will be called automatically by the Node::accept() method.

    - +

    oNodePath& getNodePath()
    Get the non const NodePath from the top most node applied down to the current Node being visited

    - +

    oconst NodePath& getNodePath() const
    Get the const NodePath from the top most node applied down to the current Node being visited

    - -

    oconst bool getLocalToWorldMatrix(Matrix& matrix, Node* node) + +
    ovirtual bool getLocalToWorldMatrix(Matrix& matrix, Node* node)
    Get the Local To World Matrix from the NodePath for specified Transform::Mode, and u

    - -

    oconst bool getWorldToLocalMatrix(Matrix& matrix, Node* node) + +
    ovirtual bool getWorldToLocalMatrix(Matrix& matrix, Node* node)
    Get the World To Local Matrix from the NodePath for specified Transform::Mode

    + + +

    ovirtual float getDistanceToEyePoint(const Vec3& , bool ) const +
    Get the distance from a point to the eye point, distance value in local coordinate system. +Note, not all NodeVisitor implement this method, it is mainly cull visitors which will implement. +If the getDistianceFromEyePoint(pos) is not implmented than a default value of 0.0 is returned. +

    + + +

    ovirtual float getDistanceFromEyePoint(const Vec3& , bool ) const +
    Get the distance of a point from the eye point, distance value in the eye coordinate system. +Note, not all NodeVisitor implement this method, it is mainly cull visitors which will implement. +If the getDistianceFromEyePoint(pos) is not implmented than a default value of 0.0 is returned. +

    - +

    ovirtual void apply(Node& node)

    - +

    ovirtual void apply(Geode& node)

    - +

    ovirtual void apply(Billboard& node)

    - +

    ovirtual void apply(Group& node)

    - +

    ovirtual void apply(Projection& node)

    - +

    ovirtual void apply(ClipNode& node)

    - +

    ovirtual void apply(LightSource& node)

    - +

    ovirtual void apply(Transform& node)

    - +

    ovirtual void apply(DOFTransform& node)

    - +

    ovirtual void apply(MatrixTransform& node)

    - +

    ovirtual void apply(PositionAttitudeTransform& node)

    - +

    ovirtual void apply(Switch& node)

    - +

    ovirtual void apply(Sequence& node)

    - +

    ovirtual void apply(LOD& node)

    - +

    ovirtual void apply(Impostor& node)

    - +

    ovirtual void apply(ClearNode& node)

    - +

    ovirtual void apply(OccluderNode& node)

    - -

    oVisitorType _visitorType + +
    oVisitorType _visitorType

    - +

    oint _traversalNumber

    - +

    oref_ptr<FrameStamp> _frameStamp

    - +

    oref_ptr<NodeVisitor> _traversalVisitor

    - -

    oTraversalMode _traversalMode + +
    oTraversalMode _traversalMode

    - +

    oNode::NodeMask _traversalMask

    - +

    oNode::NodeMask _nodeMaskOverride

    - +

    oNodePath _nodePath

    diff --git a/doc/doc++/osg/NotifySeverity.html b/doc/doc++/osg/NotifySeverity.html index 2ebf69834..b7001be32 100644 --- a/doc/doc++/osg/NotifySeverity.html +++ b/doc/doc++/osg/NotifySeverity.html @@ -12,19 +12,19 @@

    -[more] ALWAYS +[more] ALWAYS
    -[more] FATAL +[more] FATAL
    -[more] WARN +[more] WARN
    -[more] NOTICE +[more] NOTICE
    -[more] INFO +[more] INFO
    -[more] DEBUG_INFO +[more] DEBUG_INFO
    -[more] DEBUG_FP +[more] DEBUG_FP

    @@ -39,31 +39,31 @@ further details.
    - +
    o ALWAYS

    - +

    o FATAL

    - +

    o WARN

    - +

    o NOTICE

    - +

    o INFO

    - +

    o DEBUG_INFO

    - +

    o DEBUG_FP

    Alphabetic index HTML hierarchy of classes or Java

    diff --git a/doc/doc++/osg/Object.html b/doc/doc++/osg/Object.html index be562b01e..c1861e94b 100644 --- a/doc/doc++/osg/Object.html +++ b/doc/doc++/osg/Object.html @@ -11,11 +11,11 @@

    Inheritance:

    - - - - - + + + + +
    @@ -23,57 +23,57 @@

    Public Methods

    -[more]inline Object() +[more]inline Object()
    Construct an object.
    -[more] Object(const Object&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Object(const Object&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor, optional CopyOp object can be used to control shallow vs deep copying of dynamic data
    -[more]virtual Object* cloneType() const = 0 +[more]virtual Object* cloneType() const = 0
    Clone the type of an object, with Object* return type.
    -[more]virtual Object* clone(const CopyOp&) const = 0 +[more]virtual Object* clone(const CopyOp&) const = 0
    Clone the an object, with Object* return type.
    -[more]virtual bool isSameKindAs(const Object*) const +[more]virtual bool isSameKindAs(const Object*) const
    -[more]virtual const char* libraryName() const = 0 +[more]virtual const char* libraryName() const = 0
    return the name of the object's library.
    -[more]virtual const char* className() const = 0 +[more]virtual const char* className() const = 0
    return the name of the object's class type.
    -[more]inline void setDataVariance(const DataVariance dv) +[more]inline void setDataVariance(const DataVariance dv)
    Set the data variance of this object.
    -[more]inline const DataVariance getDataVariance() const +[more]inline const DataVariance getDataVariance() const
    Get the data variance of this object
    -[more]inline void setUserData(Referenced* obj) +[more]inline void setUserData(Referenced* obj)
    Set user data, data must be subclased from Referenced to allow automatic memory handling.
    -[more]inline Referenced* getUserData() +[more]inline Referenced* getUserData()
    Get user data
    -[more]inline const Referenced* getUserData() const +[more]inline const Referenced* getUserData() const
    Get const user data

    Public Members

    -[more]enum DataVariance +[more]enum DataVariance

    Protected Fields

    -[more]DataVariance _dataVariance +[more]DataVariance _dataVariance
    -[more]ref_ptr<Referenced> _userData +[more]ref_ptr<Referenced> _userData

    Protected Methods

    -[more]virtual ~Object() +[more]virtual ~Object()
    Object destructor.

    @@ -90,12 +90,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -109,7 +117,7 @@ Based on GOF Composite, Prototype and Template Method patterns.
    - +
    oinline Object()
    Construct an object. Note Object is a pure virtual base class and therefore cannot be constructed on its own, only derived @@ -117,69 +125,69 @@ classes which override the clone and className methods are concrete classes and can be constructed.

    - -

    o Object(const Object&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o Object(const Object&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor, optional CopyOp object can be used to control shallow vs deep copying of dynamic data

    - +

    ovirtual Object* cloneType() const = 0
    Clone the type of an object, with Object* return type. Must be defined by derived classes.

    - +

    ovirtual Object* clone(const CopyOp&) const = 0
    Clone the an object, with Object* return type. Must be defined by derived classes.

    - +

    ovirtual bool isSameKindAs(const Object*) const

    - +

    ovirtual const char* libraryName() const = 0
    return the name of the object's library. Must be defined by derived classes. The OpenSceneGraph convention the is that the namspace of a library is the same as the library name.

    - +

    ovirtual const char* className() const = 0
    return the name of the object's class type. Must be defined by derived classes.

    - +

    oenum DataVariance

    - +
    o DYNAMIC

    - +

    o STATIC

    - -
    oinline void setDataVariance(const DataVariance dv) + +
    oinline void setDataVariance(const 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 can be used be routines such as optimzation codes that wish to share static data.

    - -

    oinline const DataVariance getDataVariance() const + +
    oinline const DataVariance getDataVariance() const
    Get the data variance of this object

    - +

    oinline void setUserData(Referenced* obj)
    Set user data, data must be subclased from Referenced to allow @@ -188,17 +196,17 @@ subclassed from Referenced then create and adapter object which points to your own objects and handles the memory addressing.

    - +

    oinline Referenced* getUserData()
    Get user data

    - +

    oinline const Referenced* getUserData() const
    Get const user data

    - +

    ovirtual ~Object()
    Object destructor. Note, is protected so that Objects cannot be deleted other than by being dereferenced and the reference @@ -209,18 +217,20 @@ forcing all nodes to be created on the heap i.e Node* node = new Node().

    - -

    oDataVariance _dataVariance + +
    oDataVariance _dataVariance

    - +

    oref_ptr<Referenced> _userData

    Direct child classes: -
    StateSet
    +
    TessellationHints
    +StateSet
    StateAttribute
    -Primitive
    +Shape
    +PrimitiveSet
    Matrix
    Image
    Drawable
    diff --git a/doc/doc++/osg/OccluderNode.html b/doc/doc++/osg/OccluderNode.html index 5b53c536a..d21305f58 100644 --- a/doc/doc++/osg/OccluderNode.html +++ b/doc/doc++/osg/OccluderNode.html @@ -23,33 +23,33 @@

    Public Methods

    -[more] OccluderNode() +[more] OccluderNode()
    -[more] OccluderNode(const OccluderNode&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] OccluderNode(const OccluderNode&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_Node(osg, OccluderNode) +[more] META_Node(osg, OccluderNode)
    -[more]void setOccluder(ConvexPlanarOccluder* occluder) +[more]void setOccluder(ConvexPlanarOccluder* occluder)
    Attach a ConvexPlanarOccluder to an OccluderNode
    -[more]ConvexPlanarOccluder* getOccluder() +[more]ConvexPlanarOccluder* getOccluder()
    Get the ConvexPlanarOccluder* attached to a OccluderNode.
    -[more]const ConvexPlanarOccluder* getOccluder() const +[more]const ConvexPlanarOccluder* getOccluder() const
    Get the const ConvexPlanarOccluder* attached to a OccluderNode

    Protected Fields

    -[more]ref_ptr<ConvexPlanarOccluder> _occluder +[more]ref_ptr<ConvexPlanarOccluder> _occluder

    Protected Methods

    -[more]virtual ~OccluderNode() +[more]virtual ~OccluderNode()
    -[more]virtual const bool computeBound() const +[more]virtual bool computeBound() const
    Override's Group's computeBound

    @@ -58,6 +58,10 @@

    Public Methods

    +ovirtual Group* asGroup() +
    +ovirtual const Group* asGroup() const +
    ovirtual void traverse(NodeVisitor& nv)
    ovirtual bool addChild( Node* child ) @@ -66,22 +70,29 @@
    ovirtual bool replaceChild( Node* origChild, Node* newChild )
    -oinline const unsigned int getNumChildren() const +oinline unsigned int getNumChildren() const
    -oinline Node* getChild( const unsigned int i ) +oinline Node* getChild( unsigned int i )
    -oinline const Node* getChild( const unsigned int i ) const +oinline const Node* getChild( unsigned int i ) const
    oinline bool containsNode( const Node* node ) const
    oinline ChildList::iterator findNode( const Node* node )
    oinline ChildList::const_iterator findNode( const Node* node ) const +
    +oinline unsigned int findChildNo( const Node* node ) const +

    + +

    +

    Public Members

    +otypedef std::vector<ref_ptr<Node> > ChildList

    Protected Fields

    -oChildList _children +oChildList _children

    @@ -96,44 +107,44 @@ to represent the different states of a traffic light.
    - +
    o OccluderNode()

    - -

    o OccluderNode(const OccluderNode&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o OccluderNode(const OccluderNode&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - +

    o META_Node(osg, OccluderNode)

    - +

    ovoid setOccluder(ConvexPlanarOccluder* occluder)
    Attach a ConvexPlanarOccluder to an OccluderNode

    - +

    oConvexPlanarOccluder* getOccluder()
    Get the ConvexPlanarOccluder* attached to a OccluderNode.

    - +

    oconst ConvexPlanarOccluder* getOccluder() const
    Get the const ConvexPlanarOccluder* attached to a OccluderNode

    - +

    ovirtual ~OccluderNode()

    - -

    ovirtual const bool computeBound() const + +
    ovirtual bool computeBound() const
    Override's Group's computeBound

    - +

    oref_ptr<ConvexPlanarOccluder> _occluder

    diff --git a/doc/doc++/osg/Plane.html b/doc/doc++/osg/Plane.html index b71fde251..e31acb576 100644 --- a/doc/doc++/osg/Plane.html +++ b/doc/doc++/osg/Plane.html @@ -10,79 +10,91 @@

    class SG_EXPORT osg::Plane

    A plane class.
    +

    Inheritance:

    + + + + + + + +
    +

    Public Methods

    -[more]inline Plane() +[more]inline Plane()
    -[more]inline Plane(const Plane& pl) +[more]inline Plane(const Plane& pl)
    -[more]inline Plane(const float a, const float b, const float c, const float d) +[more]inline Plane(float a, float b, float c, float d)
    -[more]inline Plane(const Vec4& vec) +[more]inline Plane(const Vec4& vec)
    -[more]inline Plane(const Vec3& norm, const float d) +[more]inline Plane(const Vec3& norm, float d)
    -[more]inline Plane(const Vec3& v1, const Vec3& v2, const Vec3& v3) +[more]inline Plane(const Vec3& v1, const Vec3& v2, const Vec3& v3)
    -[more]inline Plane& operator = (const Plane& pl) +[more]inline Plane& operator = (const Plane& pl)
    -[more]inline void set(const Plane& pl) +[more]inline void set(const Plane& pl)
    -[more]inline void set(const float a, const float b, const float c, const float d) +[more]inline void set(float a, float b, float c, float d)
    -[more]inline void set(const Vec4& vec) +[more]inline void set(const Vec4& vec)
    -[more]inline void set(const Vec3& norm, const float d) +[more]inline void set(const Vec3& norm, float d)
    -[more]inline void set(const Vec3& v1, const Vec3& v2, const Vec3& v3) +[more]inline void set(const Vec3& v1, const Vec3& v2, const Vec3& v3)
    -[more]inline void flip() +[more]inline void set(const Vec3& norm, const Vec3& point) +
    +[more]inline void flip()
    flip/reverse the orientation of the plane
    -[more]inline void makeUnitLength() +[more]inline void makeUnitLength()
    -[more]inline void calculateUpperLowerBBCorners() +[more]inline void calculateUpperLowerBBCorners()
    calculate the upper and lower bounding box corners to be used in the intersect(BoundingBox&) method for speeding calculations
    -[more]inline const bool valid() const +[more]inline bool valid() const
    -[more]inline Vec4& asVec4() +[more]inline Vec4& asVec4()
    -[more]inline const Vec4& asVec4() const +[more]inline const Vec4& asVec4() const
    -[more]inline float& operator [] (const int i) +[more]inline float& operator [] (unsigned int i)
    -[more]inline float operator [] (const int i) const +[more]inline float operator [] (unsigned int i) const
    -[more]inline osg::Vec3 getNormal() +[more]inline osg::Vec3 getNormal() const
    -[more]inline const float distance(const osg::Vec3& v) const +[more]inline float distance(const osg::Vec3& v) const
    calculate the distance between a point and the plane
    -[more]inline const int intersect(const std::vector<Vec3>& vertices) const +[more]inline int intersect(const std::vector<Vec3>& vertices) const
    intersection test between plane and vertex list return 1 if the bs is completely above plane, return 0 if the bs intersects the plane, return -1 if the bs is completely below the plane
    -[more]inline const int intersect(const BoundingSphere& bs) const +[more]inline int intersect(const BoundingSphere& bs) const
    intersection test between plane and bounding sphere.
    -[more]inline const int intersect(const BoundingBox& bb) const +[more]inline int intersect(const BoundingBox& bb) const
    intersection test between plane and bounding sphere.
    -[more]inline void transform(const osg::Matrix& matrix) +[more]inline void transform(const osg::Matrix& matrix)
    Transform the plane by matrix.
    -[more]inline void transformProvidingInverse(const osg::Matrix& matrix) +[more]inline void transformProvidingInverse(const osg::Matrix& matrix)
    Transform the plane by provide a pre inverted matrix.

    Protected Fields

    -[more]Vec4 _fv +[more]Vec4 _fv
    -[more]unsigned int _upperBBCorner +[more]unsigned int _upperBBCorner
    -[more]unsigned int _lowerBBCorner +[more]unsigned int _lowerBBCorner

    @@ -94,123 +106,127 @@
    - +
    oinline Plane()

    - -

    oinline Plane(const Plane& pl) + +
    oinline Plane(const Plane& pl)

    - -

    oinline Plane(const float a, const float b, const float c, const float d) + +
    oinline Plane(float a, float b, float c, float d)

    - +

    oinline Plane(const Vec4& vec)

    - -

    oinline Plane(const Vec3& norm, const float d) + +
    oinline Plane(const Vec3& norm, float d)

    - +

    oinline Plane(const Vec3& v1, const Vec3& v2, const Vec3& v3)

    - +

    oinline Plane& operator = (const Plane& pl)

    - +

    oinline void set(const Plane& pl)

    - -

    oinline void set(const float a, const float b, const float c, const float d) + +
    oinline void set(float a, float b, float c, float d)

    - +

    oinline void set(const Vec4& vec)

    - -

    oinline void set(const Vec3& norm, const float d) + +
    oinline void set(const Vec3& norm, float d)

    - +

    oinline void set(const Vec3& v1, const Vec3& v2, const Vec3& v3)

    + + +

    oinline void set(const Vec3& norm, const Vec3& point) +

    - +

    oinline void flip()
    flip/reverse the orientation of the plane

    - +

    oinline void makeUnitLength()

    - +

    oinline void calculateUpperLowerBBCorners()
    calculate the upper and lower bounding box corners to be used in the intersect(BoundingBox&) method for speeding calculations

    - -

    oinline const bool valid() const + +
    oinline bool valid() const

    - +

    oinline Vec4& asVec4()

    - +

    oinline const Vec4& asVec4() const

    - -

    oinline float& operator [] (const int i) + +
    oinline float& operator [] (unsigned int i)

    - -

    oinline float operator [] (const int i) const + +
    oinline float operator [] (unsigned int i) const

    - -

    oinline osg::Vec3 getNormal() + +
    oinline osg::Vec3 getNormal() const

    - -

    oinline const float distance(const osg::Vec3& v) const + +
    oinline float distance(const osg::Vec3& v) const
    calculate the distance between a point and the plane

    - -

    oinline const int intersect(const std::vector<Vec3>& vertices) const + +
    oinline int intersect(const std::vector<Vec3>& vertices) const
    intersection test between plane and vertex list return 1 if the bs is completely above plane, return 0 if the bs intersects the plane, return -1 if the bs is completely below the plane

    - -

    oinline const int intersect(const BoundingSphere& bs) const + +
    oinline int intersect(const BoundingSphere& bs) const
    intersection test between plane and bounding sphere. return 1 if the bs is completely above plane, return 0 if the bs intersects the plane, return -1 if the bs is completely below the plane.

    - -

    oinline const int intersect(const BoundingBox& bb) const + +
    oinline int intersect(const BoundingBox& bb) const
    intersection test between plane and bounding sphere. return 1 if the bs is completely above plane, return 0 if the bs intersects the plane, return -1 if the bs is completely below the plane.

    - +

    oinline void transform(const osg::Matrix& matrix)
    Transform the plane by matrix. Note, this operations carries out the calculation of the inverse of the matrix since to transforms @@ -220,25 +236,27 @@ calculated elsewhere then use transformProvidingInverse() instead. See http://www.worldserver.com/turk/computergraphics/NormalTransformations.pdf

    - +

    oinline void transformProvidingInverse(const osg::Matrix& matrix)
    Transform the plane by provide a pre inverted matrix. see transform for details.

    - +

    oVec4 _fv

    - +

    ounsigned int _upperBBCorner

    - +

    ounsigned int _lowerBBCorner

    - -
    This class has no child classes.
    +
    +
    Direct child classes: +
    InfinitePlane
    +
    Friends:
    inline std::ostream& operator << (std::ostream& output, const Plane& pl)

    Alphabetic index HTML hierarchy of classes or Java


    diff --git a/doc/doc++/osg/Point.html b/doc/doc++/osg/Point.html index b8b03cc56..284caf5e4 100644 --- a/doc/doc++/osg/Point.html +++ b/doc/doc++/osg/Point.html @@ -23,47 +23,47 @@

    Public Methods

    -[more] Point() +[more] Point()
    -[more] Point(const Point& point, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Point(const Point& point, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, Point, POINT) +[more] META_StateAttribute(osg, Point, POINT)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const
    -[more]void setSize(const float size) +[more]void setSize(float size)
    -[more]inline const float getSize() const +[more]inline float getSize() const
    -[more]void setFadeThresholdSize(const float fadeThresholdSize) +[more]void setFadeThresholdSize(float fadeThresholdSize)
    -[more]inline const float getFadeThresholdSize() const +[more]inline float getFadeThresholdSize() const
    -[more]void setDistanceAttenuation(const Vec3& distanceAttenuation) +[more]void setDistanceAttenuation(const Vec3& distanceAttenuation)
    -[more]inline const Vec3& getDistanceAttenuation() const +[more]inline const Vec3& getDistanceAttenuation() const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const
    -[more]static void init_GL_EXT() +[more]static void init_GL_EXT()

    Protected Fields

    -[more]float _size +[more]float _size
    -[more]float _fadeThresholdSize +[more]float _fadeThresholdSize
    -[more]Vec3 _distanceAttenuation +[more]Vec3 _distanceAttenuation

    Protected Methods

    -[more]virtual ~Point() +[more]virtual ~Point()

    @@ -81,7 +81,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    ovirtual bool isTextureAttribute() const
    @@ -114,9 +114,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -132,7 +132,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -150,12 +150,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -167,73 +175,73 @@
    - +
    o Point()

    - -

    o Point(const Point& point, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o Point(const Point& point, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, Point, POINT) + +
    o META_StateAttribute(osg, Point, POINT)

    - +

    ovirtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - -

    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const + +
    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const

    - -

    ovoid setSize(const float size) + +
    ovoid setSize(float size)

    - -

    oinline const float getSize() const + +
    oinline float getSize() const

    - -

    ovoid setFadeThresholdSize(const float fadeThresholdSize) + +
    ovoid setFadeThresholdSize(float fadeThresholdSize)

    - -

    oinline const float getFadeThresholdSize() const + +
    oinline float getFadeThresholdSize() const

    - +

    ovoid setDistanceAttenuation(const Vec3& distanceAttenuation)

    - +

    oinline const Vec3& getDistanceAttenuation() const

    - +

    ovirtual void apply(State& state) const

    - +

    ostatic void init_GL_EXT()

    - +

    ovirtual ~Point()

    - +

    ofloat _size

    - +

    ofloat _fadeThresholdSize

    - +

    oVec3 _distanceAttenuation

    diff --git a/doc/doc++/osg/PolygonMode.html b/doc/doc++/osg/PolygonMode.html index 2cc60bae6..4dd907475 100644 --- a/doc/doc++/osg/PolygonMode.html +++ b/doc/doc++/osg/PolygonMode.html @@ -23,44 +23,44 @@

    Public Methods

    -[more] PolygonMode() +[more] PolygonMode()
    -[more] PolygonMode(const PolygonMode& pm, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] PolygonMode(const PolygonMode& pm, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, PolygonMode, POLYGONMODE) +[more] META_StateAttribute(osg, PolygonMode, POLYGONMODE)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]void setMode(const Face face, const Mode mode) +[more]void setMode(Face face, Mode mode)
    -[more]const Mode getMode(const Face face) const +[more]Mode getMode(Face face) const
    -[more]inline const bool getFrontAndBack() const +[more]inline bool getFrontAndBack() const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

    Public Members

    -[more]enum Face +[more]enum Face
    -[more]enum Mode +[more]enum Mode

    Protected Fields

    -[more]bool _frontAndBack +[more]bool _frontAndBack
    -[more]Mode _modeFront +[more]Mode _modeFront
    -[more]Mode _modeBack +[more]Mode _modeBack

    Protected Methods

    -[more]virtual ~PolygonMode() +[more]virtual ~PolygonMode()

    @@ -78,7 +78,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    ovirtual bool isTextureAttribute() const
    @@ -88,7 +88,7 @@
    obool operator != (const StateAttribute& rhs) const
    -ovirtual void getAssociatedModes(std::vector<GLMode>& ) const +ovirtual void getAssociatedModes(std::vector<GLMode>& ) const
    ovirtual void compile(State&) const

    @@ -113,9 +113,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -131,7 +131,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -149,12 +149,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -166,90 +174,90 @@
    - +
    o PolygonMode()

    - -

    o PolygonMode(const PolygonMode& pm, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o PolygonMode(const PolygonMode& pm, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, PolygonMode, POLYGONMODE) + +
    o META_StateAttribute(osg, PolygonMode, POLYGONMODE)

    - +

    ovirtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - +

    oenum Face

    - +
    o FRONT

    - +

    o BACK

    - +

    o FRONT_AND_BACK

    - +
    oenum Mode

    - +
    o POINT

    - +

    o LINE

    - +

    o FILL

    - -
    ovoid setMode(const Face face, const Mode mode) + +
    ovoid setMode(Face face, Mode mode)

    - -

    oconst Mode getMode(const Face face) const + +
    oMode getMode(Face face) const

    - -

    oinline const bool getFrontAndBack() const + +
    oinline bool getFrontAndBack() const

    - +

    ovirtual void apply(State& state) const

    - +

    ovirtual ~PolygonMode()

    - +

    obool _frontAndBack

    - -

    oMode _modeFront + +
    oMode _modeFront

    - -

    oMode _modeBack + +
    oMode _modeBack

    This class has no child classes.
    diff --git a/doc/doc++/osg/PolygonOffset.html b/doc/doc++/osg/PolygonOffset.html index c85f29730..6cbea4774 100644 --- a/doc/doc++/osg/PolygonOffset.html +++ b/doc/doc++/osg/PolygonOffset.html @@ -23,39 +23,39 @@

    Public Methods

    -[more] PolygonOffset() +[more] PolygonOffset()
    -[more] PolygonOffset(const PolygonOffset& po, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] PolygonOffset(const PolygonOffset& po, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, PolygonOffset, POLYGONOFFSET) +[more] META_StateAttribute(osg, PolygonOffset, POLYGONOFFSET)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const
    -[more]inline void setFactor(const float factor) +[more]inline void setFactor(float factor)
    -[more]inline const float getFactor() const +[more]inline float getFactor() const
    -[more]inline void setUnits(const float units) +[more]inline void setUnits(float units)
    -[more]inline const float getUnits() const +[more]inline float getUnits() const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

    Protected Fields

    -[more]float _factor +[more]float _factor
    -[more]float _units +[more]float _units

    Protected Methods

    -[more]virtual ~PolygonOffset() +[more]virtual ~PolygonOffset()

    @@ -73,7 +73,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    ovirtual bool isTextureAttribute() const
    @@ -106,9 +106,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -124,7 +124,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -142,12 +142,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -159,57 +167,57 @@
    - +
    o PolygonOffset()

    - -

    o PolygonOffset(const PolygonOffset& po, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o PolygonOffset(const PolygonOffset& po, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, PolygonOffset, POLYGONOFFSET) + +
    o META_StateAttribute(osg, PolygonOffset, POLYGONOFFSET)

    - +

    ovirtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - -

    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const + +
    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const

    - -

    oinline void setFactor(const float factor) + +
    oinline void setFactor(float factor)

    - -

    oinline const float getFactor() const + +
    oinline float getFactor() const

    - -

    oinline void setUnits(const float units) + +
    oinline void setUnits(float units)

    - -

    oinline const float getUnits() const + +
    oinline float getUnits() const

    - +

    ovirtual void apply(State& state) const

    - +

    ovirtual ~PolygonOffset()

    - +

    ofloat _factor

    - +

    ofloat _units

    diff --git a/doc/doc++/osg/Polytope.html b/doc/doc++/osg/Polytope.html index 5e25a55a8..5899345b9 100644 --- a/doc/doc++/osg/Polytope.html +++ b/doc/doc++/osg/Polytope.html @@ -13,93 +13,104 @@

    Public Methods

    -[more]typedef fast_back_stack<ClippingMask>inline MaskStack Polytope() +[more]inline Polytope()
    -[more]inline Polytope(const Polytope& cv) +[more]inline Polytope(const Polytope& cv)
    -[more]inline Polytope(const PlaneList& pl) +[more]inline Polytope(const PlaneList& pl)
    -[more]inline ~Polytope() +[more]inline ~Polytope()
    -[more]inline void clear() +[more]inline void clear()
    -[more]inline Polytope& operator = (const Polytope& cv) +[more]inline Polytope& operator = (const Polytope& cv)
    -[more]void setToUnitFrustum(bool withNear=true, bool withFar=true) +[more]void setToUnitFrustum(bool withNear=true, bool withFar=true)
    Create a Polytope with is cube, centered at 0,0,0, with sides of 2 units
    -[more]inline void set(const PlaneList& pl) +[more]inline void set(const PlaneList& pl)
    -[more]inline void add(const osg::Plane& pl) +[more]inline void add(const osg::Plane& pl)
    -[more]inline void flip() +[more]inline void flip()
    flip/reverse the orientation of all the planes
    -[more]inline PlaneList& getPlaneList() +[more]inline PlaneList& getPlaneList()
    -[more]inline const PlaneList& getPlaneList() const +[more]inline const PlaneList& getPlaneList() const
    -[more]inline void setReferenceVertexList(VertexList& vertices) +[more]inline void setReferenceVertexList(VertexList& vertices)
    -[more]inline VertexList& getReferenceVertexList() +[more]inline VertexList& getReferenceVertexList()
    -[more]inline const VertexList& getReferenceVertexList() const +[more]inline const VertexList& getReferenceVertexList() const
    -[more]inline void setupMask() +[more]inline void setupMask()
    -[more]inline ClippingMask& getCurrentMask() +[more]inline ClippingMask& getCurrentMask()
    -[more]inline ClippingMask getCurrentMask() const +[more]inline ClippingMask getCurrentMask() const
    -[more]inline void setResultMask(ClippingMask mask) +[more]inline void setResultMask(ClippingMask mask)
    -[more]inline ClippingMask getResultMask() const +[more]inline ClippingMask getResultMask() const
    -[more]MaskStack& getMaskStack() +[more]MaskStack& getMaskStack()
    -[more]const MaskStack& getMaskStack() const +[more]const MaskStack& getMaskStack() const
    -[more]inline void pushCurrentMask() +[more]inline void pushCurrentMask()
    -[more]inline void popCurrentMask() +[more]inline void popCurrentMask()
    -[more]inline const bool contains(const osg::Vec3& v) const +[more]inline bool contains(const osg::Vec3& v) const
    Check whether a vertex is contained with clipping set
    -[more]inline const bool contains(const std::vector<Vec3>& vertices) +[more]inline bool contains(const std::vector<Vec3>& vertices)
    Check whether any part of vertex list is contained with clipping set
    -[more]inline const bool contains(const osg::BoundingSphere& bs) +[more]inline bool contains(const osg::BoundingSphere& bs)
    Check whether any part of a bounding sphere is contained within clipping set.
    -[more]inline const bool contains(const osg::BoundingBox& bb) +[more]inline bool contains(const osg::BoundingBox& bb)
    Check whether any part of a bounding box is contained within clipping set.
    -[more]inline const bool containsAllOf(const std::vector<Vec3>& vertices) +[more]inline bool containsAllOf(const std::vector<Vec3>& vertices)
    Check whether all of vertex list is contained with clipping set
    -[more]inline const bool containsAllOf(const osg::BoundingSphere& bs) +[more]inline bool containsAllOf(const osg::BoundingSphere& bs)
    Check whether the entire bounding sphere is contained within clipping set
    -[more]inline const bool containsAllOf(const osg::BoundingBox& bb) +[more]inline bool containsAllOf(const osg::BoundingBox& bb)
    Check whether the entire bounding box is contained within clipping set
    -[more]inline void transform(const osg::Matrix& matrix) +[more]inline void transform(const osg::Matrix& matrix)
    Transform the clipping set by matrix.
    -[more]inline void transformProvidingInverse(const osg::Matrix& matrix) +[more]inline void transformProvidingInverse(const osg::Matrix& matrix)
    Transform the clipping set by provide a pre inverted matrix.

    +

    +

    Public Members

    +[more]typedef unsigned int ClippingMask +
    +[more]typedef std::vector<Plane> PlaneList +
    +[more]typedef std::vector<Vec3> VertexList +
    +[more]typedef fast_back_stack<ClippingMask> MaskStack +

    +

    Protected Fields

    -[more]MaskStack _maskStack +[more]MaskStack _maskStack
    -[more]ClippingMask _resultMask +[more]ClippingMask _resultMask
    -[more]PlaneList _planeList +[more]PlaneList _planeList
    -[more]VertexList _referenceVertexList +[more]VertexList _referenceVertexList

    @@ -111,117 +122,133 @@ When adding planes, their normals should point inwards (into the volume)
    - - -
    otypedef fast_back_stack<ClippingMask>inline MaskStack Polytope() + + +
    otypedef unsigned int ClippingMask +

    + + +

    otypedef std::vector<Plane> PlaneList +

    + + +

    otypedef std::vector<Vec3> VertexList +

    + + +

    otypedef fast_back_stack<ClippingMask> MaskStack

    - -

    oinline Polytope(const Polytope& cv) + +
    oinline Polytope()

    - -

    oinline Polytope(const PlaneList& pl) + +
    oinline Polytope(const Polytope& cv) +

    + + +

    oinline Polytope(const PlaneList& pl)

    - +

    oinline ~Polytope()

    - +

    oinline void clear()

    - +

    oinline Polytope& operator = (const Polytope& cv)

    - +

    ovoid setToUnitFrustum(bool withNear=true, bool withFar=true)
    Create a Polytope with is cube, centered at 0,0,0, with sides of 2 units

    - -

    oinline void set(const PlaneList& pl) + +
    oinline void set(const PlaneList& pl)

    - +

    oinline void add(const osg::Plane& pl)

    - +

    oinline void flip()
    flip/reverse the orientation of all the planes

    - -

    oinline PlaneList& getPlaneList() + +
    oinline PlaneList& getPlaneList()

    - -

    oinline const PlaneList& getPlaneList() const + +
    oinline const PlaneList& getPlaneList() const

    - -

    oinline void setReferenceVertexList(VertexList& vertices) + +
    oinline void setReferenceVertexList(VertexList& vertices)

    - -

    oinline VertexList& getReferenceVertexList() + +
    oinline VertexList& getReferenceVertexList()

    - -

    oinline const VertexList& getReferenceVertexList() const + +
    oinline const VertexList& getReferenceVertexList() const

    - +

    oinline void setupMask()

    - -

    oinline ClippingMask& getCurrentMask() + +
    oinline ClippingMask& getCurrentMask()

    - -

    oinline ClippingMask getCurrentMask() const + +
    oinline ClippingMask getCurrentMask() const

    - -

    oinline void setResultMask(ClippingMask mask) + +
    oinline void setResultMask(ClippingMask mask)

    - -

    oinline ClippingMask getResultMask() const + +
    oinline ClippingMask getResultMask() const

    - -

    oMaskStack& getMaskStack() + +
    oMaskStack& getMaskStack()

    - -

    oconst MaskStack& getMaskStack() const + +
    oconst MaskStack& getMaskStack() const

    - +

    oinline void pushCurrentMask()

    - +

    oinline void popCurrentMask()

    - -

    oinline const bool contains(const osg::Vec3& v) const + +
    oinline bool contains(const osg::Vec3& v) const
    Check whether a vertex is contained with clipping set

    - -

    oinline const bool contains(const std::vector<Vec3>& vertices) + +
    oinline bool contains(const std::vector<Vec3>& vertices)
    Check whether any part of vertex list is contained with clipping set

    - -

    oinline const bool contains(const osg::BoundingSphere& bs) + +
    oinline bool contains(const osg::BoundingSphere& bs)
    Check whether any part of a bounding sphere is contained within clipping set. Using a mask to determine which planes should be used for the check, and modifying the mask to turn off planes which wouldn't contribute to clipping @@ -229,8 +256,8 @@ of any internal objects. This feature is used in osgUtil::CullVisitor to prevent redundant plane checking.

    - -

    oinline const bool contains(const osg::BoundingBox& bb) + +
    oinline bool contains(const osg::BoundingBox& bb)
    Check whether any part of a bounding box is contained within clipping set. Using a mask to determine which planes should be used for the check, and modifying the mask to turn off planes which wouldn't contribute to clipping @@ -238,22 +265,22 @@ of any internal objects. This feature is used in osgUtil::CullVisitor to prevent redundant plane checking.

    - -

    oinline const bool containsAllOf(const std::vector<Vec3>& vertices) + +
    oinline bool containsAllOf(const std::vector<Vec3>& vertices)
    Check whether all of vertex list is contained with clipping set

    - -

    oinline const bool containsAllOf(const osg::BoundingSphere& bs) + +
    oinline bool containsAllOf(const osg::BoundingSphere& bs)
    Check whether the entire bounding sphere is contained within clipping set

    - -

    oinline const bool containsAllOf(const osg::BoundingBox& bb) + +
    oinline bool containsAllOf(const osg::BoundingBox& bb)
    Check whether the entire bounding box is contained within clipping set

    - +

    oinline void transform(const osg::Matrix& matrix)
    Transform the clipping set by matrix. Note, this operations carries out the calculation of the inverse of the matrix since to transforms @@ -263,26 +290,26 @@ calculated elsewhere then use transformProvidingInverse() instead. See http://www.worldserver.com/turk/computergraphics/NormalTransformations.pdf

    - +

    oinline void transformProvidingInverse(const osg::Matrix& matrix)
    Transform the clipping set by provide a pre inverted matrix. see transform for details.

    - -

    oMaskStack _maskStack + +
    oMaskStack _maskStack

    - -

    oClippingMask _resultMask + +
    oClippingMask _resultMask

    - -

    oPlaneList _planeList + +
    oPlaneList _planeList

    - -

    oVertexList _referenceVertexList + +
    oVertexList _referenceVertexList

    This class has no child classes.
    diff --git a/doc/doc++/osg/PositionAttitudeTransform.html b/doc/doc++/osg/PositionAttitudeTransform.html index 9b8d713a2..d6ab6229d 100644 --- a/doc/doc++/osg/PositionAttitudeTransform.html +++ b/doc/doc++/osg/PositionAttitudeTransform.html @@ -23,27 +23,27 @@

    Public Methods

    -[more] PositionAttitudeTransform() +[more] PositionAttitudeTransform()
    -[more] PositionAttitudeTransform(const PositionAttitudeTransform& pat, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] PositionAttitudeTransform(const PositionAttitudeTransform& pat, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    -[more] META_Node(osg, PositionAttitudeTransform) +[more] META_Node(osg, PositionAttitudeTransform)
    -[more]void setPosition(const Vec3& pos) +[more]void setPosition(const Vec3& pos)
    -[more]const Vec3& getPosition() const +[more]const Vec3& getPosition() const
    -[more]void setAttitude(const Quat& quat) +[more]void setAttitude(const Quat& quat)
    -[more]const Quat& getAttitude() const +[more]const Quat& getAttitude() const
    -[more]void setPivotPoint(const Vec3& pivot) +[more]void setPivotPoint(const Vec3& pivot)
    -[more]const Vec3& getPivotPoint() const +[more]const Vec3& getPivotPoint() const
    -[more]virtual const bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const +[more]virtual bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const
    -[more]virtual const bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const +[more]virtual bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const

    @@ -54,11 +54,11 @@ class SG_EXPORT AnimationPathCallback

    Protected Fields

    -[more]Vec3 _position +[more]Vec3 _position
    -[more]Quat _attitude +[more]Quat _attitude
    -[more]Vec3 _pivotPoint +[more]Vec3 _pivotPoint

    @@ -66,19 +66,23 @@ class SG_EXPORT AnimationPathCallback

    Public Methods

    -ovoid setReferenceFrame(ReferenceFrame rf) +ovirtual Transform* asTransform()
    -oconst ReferenceFrame getReferenceFrame() const +ovirtual const Transform* asTransform() const
    -ovoid setComputeTransformCallback(ComputeTransformCallback* ctc) +ovoid setReferenceFrame(ReferenceFrame rf)
    -oComputeTransformCallback* getComputeTransformCallback() +oReferenceFrame getReferenceFrame() const
    -oconst ComputeTransformCallback* getComputeTransformCallback() const +ovoid setComputeTransformCallback(ComputeTransformCallback* ctc)
    -oinline const bool getLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const +oComputeTransformCallback* getComputeTransformCallback()
    -oinline const bool getWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const +oconst ComputeTransformCallback* getComputeTransformCallback() const +
    +oinline bool getLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const +
    +oinline bool getWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const

    @@ -90,14 +94,14 @@ class SG_EXPORT AnimationPathCallback

    Protected Fields

    -oref_ptr<ComputeTransformCallback> _computeTransformCallback +oref_ptr<ComputeTransformCallback> _computeTransformCallback
    -oReferenceFrame _referenceFrame +oReferenceFrame _referenceFrame

    Protected Methods

    -ovirtual const bool computeBound() const +ovirtual bool computeBound() const

    @@ -105,6 +109,10 @@ class SG_EXPORT AnimationPathCallback

    Public Methods

    +ovirtual Group* asGroup() +
    +ovirtual const Group* asGroup() const +
    ovirtual void traverse(NodeVisitor& nv)
    ovirtual bool addChild( Node* child ) @@ -113,22 +121,29 @@ class SG_EXPORT AnimationPathCallback
    ovirtual bool replaceChild( Node* origChild, Node* newChild )
    -oinline const unsigned int getNumChildren() const +oinline unsigned int getNumChildren() const
    -oinline Node* getChild( const unsigned int i ) +oinline Node* getChild( unsigned int i )
    -oinline const Node* getChild( const unsigned int i ) const +oinline const Node* getChild( unsigned int i ) const
    oinline bool containsNode( const Node* node ) const
    oinline ChildList::iterator findNode( const Node* node )
    oinline ChildList::const_iterator findNode( const Node* node ) const +
    +oinline unsigned int findChildNo( const Node* node ) const +

    + +

    +

    Public Members

    +otypedef std::vector<ref_ptr<Node> > ChildList

    Protected Fields

    -oChildList _children +oChildList _children

    @@ -141,59 +156,59 @@ up via a Vec3 position and Quat attitude
    - +
    o PositionAttitudeTransform()

    - -

    o PositionAttitudeTransform(const PositionAttitudeTransform& pat, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o PositionAttitudeTransform(const PositionAttitudeTransform& pat, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

    - +

    o META_Node(osg, PositionAttitudeTransform)

    - +

    ovoid setPosition(const Vec3& pos)

    - +

    oconst Vec3& getPosition() const

    - +

    ovoid setAttitude(const Quat& quat)

    - +

    oconst Quat& getAttitude() const

    - +

    ovoid setPivotPoint(const Vec3& pivot)

    - +

    oconst Vec3& getPivotPoint() const

    - -

    ovirtual const bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const + +
    ovirtual bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const

    - -

    ovirtual const bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const + +
    ovirtual bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const

    - +

    oVec3 _position

    - +

    oQuat _attitude

    - +

    oVec3 _pivotPoint

    diff --git a/doc/doc++/osg/PrimitiveFunctor.html b/doc/doc++/osg/PrimitiveFunctor.html index 0048ca4db..0f60bd6c9 100644 --- a/doc/doc++/osg/PrimitiveFunctor.html +++ b/doc/doc++/osg/PrimitiveFunctor.html @@ -22,25 +22,25 @@

    Public Methods

    -[more]virtual ~PrimitiveFunctor() +[more]virtual ~PrimitiveFunctor()
    -[more]virtual void setVertexArray(unsigned int count, Vec3* vertices) = 0 +[more]virtual void setVertexArray(unsigned int count, const Vec3* vertices) = 0
    -[more]virtual void drawArrays(GLenum mode, GLint first, GLsizei count) = 0 +[more]virtual void drawArrays(GLenum mode, GLint first, GLsizei count) = 0
    -[more]virtual void drawElements(GLenum mode, GLsizei count, GLubyte* indices) = 0 +[more]virtual void drawElements(GLenum mode, GLsizei count, const GLubyte* indices) = 0
    -[more]virtual void drawElements(GLenum mode, GLsizei count, GLushort* indices) = 0 +[more]virtual void drawElements(GLenum mode, GLsizei count, const GLushort* indices) = 0
    -[more]virtual void drawElements(GLenum mode, GLsizei count, GLuint* indices) = 0 +[more]virtual void drawElements(GLenum mode, GLsizei count, const GLuint* indices) = 0
    -[more]virtual void begin(GLenum mode) = 0 +[more]virtual void begin(GLenum mode) = 0
    -[more]virtual void vertex(const Vec3& vert) = 0 +[more]virtual void vertex(const Vec3& vert) = 0
    -[more]virtual void vertex(float x, float y, float z) = 0 +[more]virtual void vertex(float x, float y, float z) = 0
    -[more]virtual void end() = 0 +[more]virtual void end() = 0

    @@ -51,43 +51,43 @@
    - +
    ovirtual ~PrimitiveFunctor()

    - -

    ovirtual void setVertexArray(unsigned int count, Vec3* vertices) = 0 + +
    ovirtual void setVertexArray(unsigned int count, const Vec3* vertices) = 0

    - -

    ovirtual void drawArrays(GLenum mode, GLint first, GLsizei count) = 0 + +
    ovirtual void drawArrays(GLenum mode, GLint first, GLsizei count) = 0

    - -

    ovirtual void drawElements(GLenum mode, GLsizei count, GLubyte* indices) = 0 + +
    ovirtual void drawElements(GLenum mode, GLsizei count, const GLubyte* indices) = 0

    - -

    ovirtual void drawElements(GLenum mode, GLsizei count, GLushort* indices) = 0 + +
    ovirtual void drawElements(GLenum mode, GLsizei count, const GLushort* indices) = 0

    - -

    ovirtual void drawElements(GLenum mode, GLsizei count, GLuint* indices) = 0 + +
    ovirtual void drawElements(GLenum mode, GLsizei count, const GLuint* indices) = 0

    - +

    ovirtual void begin(GLenum mode) = 0

    - +

    ovirtual void vertex(const Vec3& vert) = 0

    - -

    ovirtual void vertex(float x, float y, float z) = 0 + +
    ovirtual void vertex(float x, float y, float z) = 0

    - +

    ovirtual void end() = 0

    diff --git a/doc/doc++/osg/Projection.html b/doc/doc++/osg/Projection.html index 943348848..1de91c104 100644 --- a/doc/doc++/osg/Projection.html +++ b/doc/doc++/osg/Projection.html @@ -23,36 +23,36 @@

    Public Methods

    -[more] Projection() +[more] Projection()
    -[more] Projection(const Projection&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Projection(const Projection&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] Projection(const Matrix& matix) +[more] Projection(const Matrix& matix)
    -[more] META_Node(osg, Projection) +[more] META_Node(osg, Projection)
    -[more]void setMatrix(const Matrix& mat) +[more]void setMatrix(const Matrix& mat)
    Set the transform's matrix
    -[more]inline const Matrix& getMatrix() const +[more]inline const Matrix& getMatrix() const
    Get the transform's matrix.
    -[more]void preMult(const Matrix& mat) +[more]void preMult(const Matrix& mat)
    preMult transform
    -[more]void postMult(const Matrix& mat) +[more]void postMult(const Matrix& mat)
    postMult transform

    Protected Fields

    -[more]ref_ptr<Matrix> _matrix +[more]ref_ptr<Matrix> _matrix

    Protected Methods

    -[more]virtual ~Projection() +[more]virtual ~Projection()

    @@ -60,6 +60,10 @@

    Public Methods

    +ovirtual Group* asGroup() +
    +ovirtual const Group* asGroup() const +
    ovirtual void traverse(NodeVisitor& nv)
    ovirtual bool addChild( Node* child ) @@ -68,27 +72,34 @@
    ovirtual bool replaceChild( Node* origChild, Node* newChild )
    -oinline const unsigned int getNumChildren() const +oinline unsigned int getNumChildren() const
    -oinline Node* getChild( const unsigned int i ) +oinline Node* getChild( unsigned int i )
    -oinline const Node* getChild( const unsigned int i ) const +oinline const Node* getChild( unsigned int i ) const
    oinline bool containsNode( const Node* node ) const
    oinline ChildList::iterator findNode( const Node* node )
    oinline ChildList::const_iterator findNode( const Node* node ) const +
    +oinline unsigned int findChildNo( const Node* node ) const +

    + +

    +

    Public Members

    +otypedef std::vector<ref_ptr<Node> > ChildList

    Protected Fields

    -oChildList _children +oChildList _children

    Protected Methods

    -ovirtual const bool computeBound() const +ovirtual bool computeBound() const

    @@ -100,48 +111,48 @@
    - +
    o Projection()

    - -

    o Projection(const Projection&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o Projection(const Projection&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - +

    o Projection(const Matrix& matix)

    - +

    o META_Node(osg, Projection)

    - +

    ovoid setMatrix(const Matrix& mat)
    Set the transform's matrix

    - +

    oinline const Matrix& getMatrix() const
    Get the transform's matrix.

    - +

    ovoid preMult(const Matrix& mat)
    preMult transform

    - +

    ovoid postMult(const Matrix& mat)
    postMult transform

    - +

    ovirtual ~Projection()

    - +

    oref_ptr<Matrix> _matrix

    diff --git a/doc/doc++/osg/QualifiedTestPrinter.html b/doc/doc++/osg/QualifiedTestPrinter.html index ba1f7c2a9..c76ed2863 100644 --- a/doc/doc++/osg/QualifiedTestPrinter.html +++ b/doc/doc++/osg/QualifiedTestPrinter.html @@ -23,7 +23,7 @@

    Public Methods

    -[more]virtual bool visit( TestCase* pTest ) +[more]virtual bool visit( TestCase* pTest )

    @@ -52,7 +52,7 @@ qualified tests
    - +
    ovirtual bool visit( TestCase* pTest )

    diff --git a/doc/doc++/osg/Quat.html b/doc/doc++/osg/Quat.html index beaf57150..465d75a40 100644 --- a/doc/doc++/osg/Quat.html +++ b/doc/doc++/osg/Quat.html @@ -13,123 +13,130 @@

    Public Fields

    -[more]Vec4 _fv +[more]Vec4 _fv

    Public Methods

    -[more] Quat() +[more]inline Quat()
    -[more] Quat( float x, float y, float z, float w ) +[more]inline Quat( float x, float y, float z, float w )
    -[more] Quat( const Vec4& v ) +[more]inline Quat( const Vec4& v )
    -[more]inline Vec4& asVec4() +[more]inline Quat( float angle, const Vec3& axis)
    -[more]inline const Vec4& asVec4() const +[more]inline Quat( float angle1, const Vec3& axis1, float angle2, const Vec3& axis2, float angle3, const Vec3& axis3)
    -[more]inline const Vec3 asVec3() const +[more]inline Vec4& asVec4()
    -[more]inline void set(const float x, const float y, const float z, const float w) +[more]inline const Vec4& asVec4() const
    -[more]inline void set(const osg::Vec4& v) +[more]inline const Vec3 asVec3() const
    -[more]inline float& operator [] (int i) +[more]inline void set(float x, float y, float z, float w)
    -[more]inline float operator [] (int i) const +[more]inline void set(const osg::Vec4& v)
    -[more]inline float& x() +[more]inline float& operator [] (int i)
    -[more]inline float& y() +[more]inline float operator [] (int i) const
    -[more]inline float& z() +[more]inline float& x()
    -[more]inline float& w() +[more]inline float& y()
    -[more]inline float x() const +[more]inline float& z()
    -[more]inline float y() const +[more]inline float& w()
    -[more]inline float z() const +[more]inline float x() const
    -[more]inline float w() const +[more]inline float y() const
    -[more]inline const Quat operator * (const float rhs) const +[more]inline float z() const +
    +[more]inline float w() const +
    +[more]bool zeroRotation() const +
    return true if the Quat represents a zero rotation, and therefore can be ignored in computations +
    +[more]inline const Quat operator * (float rhs) const
    Multiply by scalar
    -[more]inline Quat& operator *= (const float rhs) +[more]inline Quat& operator *= (float rhs)
    Unary multiply by scalar
    -[more]inline const Quat operator*(const Quat& rhs) const +[more]inline const Quat operator*(const Quat& rhs) const
    Binary multiply
    -[more]inline Quat& operator*=(const Quat& rhs) +[more]inline Quat& operator*=(const Quat& rhs)
    Unary multiply
    -[more]inline const Quat operator / (const float& rhs) const +[more]inline const Quat operator / (float rhs) const
    Divide by scalar
    -[more]inline Quat& operator /= (const float& rhs) +[more]inline Quat& operator /= (float rhs)
    Unary divide by scalar
    -[more]inline const Quat operator/(const Quat& denom) const +[more]inline const Quat operator/(const Quat& denom) const
    Binary divide
    -[more]inline Quat& operator/=(const Quat& denom) +[more]inline Quat& operator/=(const Quat& denom)
    Unary divide
    -[more]inline const Quat operator + (const Quat& rhs) const +[more]inline const Quat operator + (const Quat& rhs) const
    Binary addition
    -[more]inline Quat& operator += (const Quat& rhs) +[more]inline Quat& operator += (const Quat& rhs)
    Unary addition
    -[more]inline const Quat operator - (const Quat& rhs) const +[more]inline const Quat operator - (const Quat& rhs) const
    Binary subtraction
    -[more]inline Quat& operator -= (const Quat& rhs) +[more]inline Quat& operator -= (const Quat& rhs)
    Unary subtraction
    -[more]inline const Quat operator - () const +[more]inline const Quat operator - () const
    Negation operator - returns the negative of the quaternion.
    -[more]const float length() const +[more]float length() const
    Length of the quaternion = sqrt( vec .
    -[more]const float length2() const +[more]float length2() const
    Length of the quaternion = vec .
    -[more]inline const Quat conj() const +[more]inline Quat conj() const
    Conjugate
    -[more]inline const Quat inverse() const +[more]inline const Quat inverse() const
    Multiplicative inverse method: q^(-1) = q^*/(qq^*)
    -[more]void makeRotate( const float angle, const float x, const float y, const float z ) +[more]void makeRotate( float angle, float x, float y, float z )
    -[more]void makeRotate( const float angle, const Vec3& vec ) +[more]void makeRotate( float angle, const Vec3& vec )
    -[more]void makeRotate( float angle1, const Vec3& axis1, float angle2, const Vec3& axis2, float angle3, const Vec3& axis3) +[more]void makeRotate( float angle1, const Vec3& axis1, float angle2, const Vec3& axis2, float angle3, const Vec3& axis3)
    -[more]void makeRotate( const Vec3& vec1, const Vec3& vec2 ) +[more]void makeRotate( const Vec3& vec1, const Vec3& vec2 )
    Make a rotation Quat which will rotate vec1 to vec2.
    -[more]void getRotate( float& angle, float& x, float& y, float& z ) const +[more]void getRotate( float& angle, float& x, float& y, float& z ) const
    Return the angle and vector components represented by the quaternion
    -[more]void getRotate( float& angle, Vec3& vec ) const +[more]void getRotate( float& angle, Vec3& vec ) const
    Return the angle and vector represented by the quaternion
    -[more]void slerp( const float t, const Quat& from, const Quat& to) +[more]void slerp( float t, const Quat& from, const Quat& to)
    Spherical Linear Interpolation.
    -[more]void set( const Matrix& m ) +[more]void set( const Matrix& m )
    Set quaternion to be equivalent to specified matrix
    -[more]void get( Matrix& m ) const +[more]void get( Matrix& m ) const
    Get the equivalent matrix for this quaternion
    -[more]Matrix getMatrix() const +[more]Matrix getMatrix() const
    Get the equivalent matrix for this quaternion

    @@ -142,181 +149,194 @@
    - +
    oVec4 _fv

    - -

    o Quat() + +
    oinline Quat()

    - -

    o Quat( float x, float y, float z, float w ) + +
    oinline Quat( float x, float y, float z, float w )

    - -

    o Quat( const Vec4& v ) + +
    oinline Quat( const Vec4& v ) +

    + + +

    oinline Quat( float angle, const Vec3& axis) +

    + + +

    oinline Quat( float angle1, const Vec3& axis1, float angle2, const Vec3& axis2, float angle3, const Vec3& axis3)

    - +

    oinline Vec4& asVec4()

    - +

    oinline const Vec4& asVec4() const

    - +

    oinline const Vec3 asVec3() const

    - -

    oinline void set(const float x, const float y, const float z, const float w) + +
    oinline void set(float x, float y, float z, float w)

    - +

    oinline void set(const osg::Vec4& v)

    - +

    oinline float& operator [] (int i)

    - +

    oinline float operator [] (int i) const

    - +

    oinline float& x()

    - +

    oinline float& y()

    - +

    oinline float& z()

    - +

    oinline float& w()

    - +

    oinline float x() const

    - +

    oinline float y() const

    - +

    oinline float z() const

    - +

    oinline float w() const

    + + +

    obool zeroRotation() const +
    return true if the Quat represents a zero rotation, and therefore can be ignored in computations +

    - -

    oinline const Quat operator * (const float rhs) const + +
    oinline const Quat operator * (float rhs) const
    Multiply by scalar

    - -

    oinline Quat& operator *= (const float rhs) + +
    oinline Quat& operator *= (float rhs)
    Unary multiply by scalar

    - +

    oinline const Quat operator*(const Quat& rhs) const
    Binary multiply

    - +

    oinline Quat& operator*=(const Quat& rhs)
    Unary multiply

    - -

    oinline const Quat operator / (const float& rhs) const + +
    oinline const Quat operator / (float rhs) const
    Divide by scalar

    - -

    oinline Quat& operator /= (const float& rhs) + +
    oinline Quat& operator /= (float rhs)
    Unary divide by scalar

    - +

    oinline const Quat operator/(const Quat& denom) const
    Binary divide

    - +

    oinline Quat& operator/=(const Quat& denom)
    Unary divide

    - +

    oinline const Quat operator + (const Quat& rhs) const
    Binary addition

    - +

    oinline Quat& operator += (const Quat& rhs)
    Unary addition

    - +

    oinline const Quat operator - (const Quat& rhs) const
    Binary subtraction

    - +

    oinline Quat& operator -= (const Quat& rhs)
    Unary subtraction

    - +

    oinline const Quat operator - () const
    Negation operator - returns the negative of the quaternion. Basically just calls operator - () on the Vec4

    - -

    oconst float length() const + +
    ofloat length() const
    Length of the quaternion = sqrt( vec . vec )

    - -

    oconst float length2() const + +
    ofloat length2() const
    Length of the quaternion = vec . vec

    - -

    oinline const Quat conj() const + +
    oinline Quat conj() const
    Conjugate

    - +

    oinline const Quat inverse() const
    Multiplicative inverse method: q^(-1) = q^*/(qq^*)

    - -

    ovoid makeRotate( const float angle, const float x, const float y, const float z ) + +
    ovoid makeRotate( float angle, float x, float y, float z )

    - -

    ovoid makeRotate( const float angle, const Vec3& vec ) + +
    ovoid makeRotate( float angle, const Vec3& vec )

    - +

    ovoid makeRotate( float angle1, const Vec3& axis1, float angle2, const Vec3& axis2, float angle3, const Vec3& axis3)

    - +

    ovoid makeRotate( const Vec3& vec1, const Vec3& vec2 )
    Make a rotation Quat which will rotate vec1 to vec2. Generally take adot product to get the angle between these @@ -325,33 +345,33 @@ Watch out for the two special cases of when the vectors are co-incident or opposite in direction.

    - -

    ovoid getRotate( float& angle, float& x, float& y, float& z ) const + +
    ovoid getRotate( float& angle, float& x, float& y, float& z ) const
    Return the angle and vector components represented by the quaternion

    - +

    ovoid getRotate( float& angle, Vec3& vec ) const
    Return the angle and vector represented by the quaternion

    - -

    ovoid slerp( const float t, const Quat& from, const Quat& to) + +
    ovoid slerp( float t, const Quat& from, const Quat& to)
    Spherical Linear Interpolation. As t goes from 0 to 1, the Quat object goes from "from" to "to".

    - +

    ovoid set( const Matrix& m )
    Set quaternion to be equivalent to specified matrix

    - +

    ovoid get( Matrix& m ) const
    Get the equivalent matrix for this quaternion

    - +

    oMatrix getMatrix() const
    Get the equivalent matrix for this quaternion

    diff --git a/doc/doc++/osg/Referenced.html b/doc/doc++/osg/Referenced.html index b1a25fa67..9e3e68041 100644 --- a/doc/doc++/osg/Referenced.html +++ b/doc/doc++/osg/Referenced.html @@ -11,11 +11,11 @@

    Inheritance:

    - - - - - + + + + +
    @@ -23,33 +23,43 @@

    Public Methods

    -[more] Referenced() +[more] Referenced()
    -[more] Referenced(const Referenced&) +[more] Referenced(const Referenced&)
    -[more]inline Referenced& operator = (Referenced&) +[more]inline Referenced& operator = (Referenced&)
    -[more]inline void ref() const +[more]inline void ref() const
    increment the reference count by one, indicating that this object has another pointer which is referencing it
    -[more]inline void unref() const +[more]inline void unref() const
    decrement the reference count by one, indicating that a pointer to this object is referencing it.
    -[more]inline void unref_nodelete() const +[more]inline void unref_nodelete() const
    decrement the reference count by one, indicating that a pointer to this object is referencing it.
    -[more]inline const int referenceCount() const +[more]inline int referenceCount() const
    return the number pointers currently referencing this object. +
    +[more]inline static int createdCount() +
    return the total number of created referenced objects +
    +[more]inline static int deletedCount() +
    return the total number of deleted referenced objects

    Protected Fields

    -[more]mutable int _refCount +[more]mutable int _refCount +
    +[more]static int _createdCount +
    +[more]static int _deletedCount

    Protected Methods

    -[more]virtual ~Referenced() +[more]virtual ~Referenced()

    @@ -61,25 +71,25 @@
    - +
    o Referenced()

    - -

    o Referenced(const Referenced&) + +
    o Referenced(const Referenced&)

    - +

    oinline Referenced& operator = (Referenced&)

    - +

    oinline void ref() const
    increment the reference count by one, indicating that this object has another pointer which is referencing it

    - +

    oinline void unref() const
    decrement the reference count by one, indicating that a pointer to this object is referencing it. If the @@ -87,7 +97,7 @@ reference count goes to zero, it is assumed that this object is no longer referenced and is automatically deleted.

    - +

    oinline void unref_nodelete() const
    decrement the reference count by one, indicating that a pointer to this object is referencing it. However, do @@ -97,25 +107,46 @@ be resonsible for, one should prefer unref() over unref_nodelete() as the later can lead to memory leaks.

    - -

    oinline const int referenceCount() const + +
    oinline int referenceCount() const
    return the number pointers currently referencing this object.

    + + +

    oinline static int createdCount() +
    return the total number of created referenced objects +

    + + +

    oinline static int deletedCount() +
    return the total number of deleted referenced objects +

    - +

    ovirtual ~Referenced()

    - +

    omutable int _refCount +

    + + +

    ostatic int _createdCount +

    + + +

    ostatic int _deletedCount

    Direct child classes:
    Test
    SubloadCallback
    +Extensions
    SubloadCallback
    +Extensions
    SubloadCallback
    SubloadCallback
    +Extensions
    Statistics
    State
    Object
    diff --git a/doc/doc++/osg/Sequence.html b/doc/doc++/osg/Sequence.html index c94ee94b3..624fe0166 100644 --- a/doc/doc++/osg/Sequence.html +++ b/doc/doc++/osg/Sequence.html @@ -23,75 +23,75 @@

    Public Methods

    -[more] Sequence() +[more] Sequence()
    -[more] Sequence(const Sequence&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Sequence(const Sequence&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_Node(osg, Sequence) +[more] META_Node(osg, Sequence)
    -[more]virtual void traverse(NodeVisitor& nv) +[more]virtual void traverse(NodeVisitor& nv)
    -[more]void setTime(int frame, float t) +[more]void setTime(int frame, float t)
    Set time in seconds for child
    -[more]const float getTime(int frame) const +[more]float getTime(int frame) const
    Get time for child
    -[more]void setInterval(LoopMode mode, int begin, int end) +[more]void setInterval(LoopMode mode, int begin, int end)
    Set sequence mode & interval.
    -[more]inline void getInterval(LoopMode& mode, int& begin, int& end) const +[more]inline void getInterval(LoopMode& mode, int& begin, int& end) const
    Get sequence mode & interval.
    -[more]void setDuration(float speed, int nreps = -1) +[more]void setDuration(float speed, int nreps = -1)
    Set duration: speed-up & number of repeats
    -[more]inline void getDuration(float& speed, int& nreps) const +[more]inline void getDuration(float& speed, int& nreps) const
    Get duration
    -[more]void setMode(SequenceMode mode) +[more]void setMode(SequenceMode mode)
    Set sequence mode.
    -[more]inline SequenceMode getMode() const +[more]inline SequenceMode getMode() const
    Get sequence mode.

    Public Members

    -[more]enum LoopMode +[more]enum LoopMode
    Interval modes
    -[more]enum SequenceMode +[more]enum SequenceMode
    Sequence modes

    Protected Fields

    -[more]float _last +[more]float _last
    -[more]std::vector<float> _frameTime +[more]std::vector<float> _frameTime
    -[more]int _step +[more]int _step
    -[more]LoopMode _loopMode +[more]LoopMode _loopMode
    -[more]int _begin +[more]int _begin
    -[more]int _end +[more]int _end
    -[more]float _speed +[more]float _speed
    -[more]int _nreps +[more]int _nreps
    -[more]int _nrepsremain +[more]int _nrepsremain
    -[more]SequenceMode _mode +[more]SequenceMode _mode

    Protected Methods

    -[more]virtual ~Sequence() +[more]virtual ~Sequence()

    @@ -99,19 +99,43 @@

    Public Methods

    -oinline void setValue(const int value) +ovoid setNewChildDefaultValue(bool value)
    -oinline const int getValue() const +obool getNewChildDefaultValue() const +
    +ovirtual bool addChild( Node* child ) +
    +ovirtual bool addChild( Node* child, bool value ) +
    +ovirtual bool removeChild( Node* child ) +
    +ovoid setValue(unsigned int pos, bool value) +
    +ovoid setValue(const Node* child, bool value) +
    +obool getValue(unsigned int pos) const +
    +obool getValue(const Node* child) const +
    +ovoid setValue(int value) +
    +oint getValue() const +
    +oconst ValueList& getValueList() const

    Public Members

    -oenum SwitchType +oenum Values +
    +otypedef std::vector<bool> ValueList

    Protected Fields

    -oint _value +obool _newChildDefaultValue +
    +oValueList _values

    @@ -119,33 +143,40 @@

    Public Methods

    -ovirtual bool addChild( Node* child ) +ovirtual Group* asGroup()
    -ovirtual bool removeChild( Node* child ) +ovirtual const Group* asGroup() const
    ovirtual bool replaceChild( Node* origChild, Node* newChild )
    -oinline const unsigned int getNumChildren() const +oinline unsigned int getNumChildren() const
    -oinline Node* getChild( const unsigned int i ) +oinline Node* getChild( unsigned int i )
    -oinline const Node* getChild( const unsigned int i ) const +oinline const Node* getChild( unsigned int i ) const
    oinline bool containsNode( const Node* node ) const
    oinline ChildList::iterator findNode( const Node* node )
    oinline ChildList::const_iterator findNode( const Node* node ) const +
    +oinline unsigned int findChildNo( const Node* node ) const +

    + +

    +

    Public Members

    +otypedef std::vector<ref_ptr<Node> > ChildList

    Protected Fields

    -oChildList _children +oChildList _children

    Protected Methods

    -ovirtual const bool computeBound() const +ovirtual bool computeBound() const

    @@ -158,143 +189,143 @@ switching between children
    - +
    o Sequence()

    - -

    o Sequence(const Sequence&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o Sequence(const Sequence&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - +

    o META_Node(osg, Sequence)

    - +

    ovirtual void traverse(NodeVisitor& nv)

    - -

    ovoid setTime(int frame, float t) + +
    ovoid setTime(int frame, float t)
    Set time in seconds for child

    - -

    oconst float getTime(int frame) const + +
    ofloat getTime(int frame) const
    Get time for child

    - +

    oenum LoopMode
    Interval modes

    - +
    o LOOP

    - +

    o SWING

    - -
    ovoid setInterval(LoopMode mode, int begin, int end) + +
    ovoid setInterval(LoopMode mode, int begin, int end)
    Set sequence mode & interval.

    - -

    oinline void getInterval(LoopMode& mode, int& begin, int& end) const + +
    oinline void getInterval(LoopMode& mode, int& begin, int& end) const
    Get sequence mode & interval.

    - +

    ovoid setDuration(float speed, int nreps = -1)
    Set duration: speed-up & number of repeats

    - +

    oinline void getDuration(float& speed, int& nreps) const
    Get duration

    - +

    oenum SequenceMode
    Sequence modes

    - +
    o START

    - +

    o STOP

    - +

    o PAUSE

    - +

    o RESUME

    - -
    ovoid setMode(SequenceMode mode) + +
    ovoid setMode(SequenceMode mode)
    Set sequence mode. Start/stop & pause/resume.

    - -

    oinline SequenceMode getMode() const + +
    oinline SequenceMode getMode() const
    Get sequence mode.

    - +

    ovirtual ~Sequence()

    - +

    ofloat _last

    - +

    ostd::vector<float> _frameTime

    - +

    oint _step

    - -

    oLoopMode _loopMode + +
    oLoopMode _loopMode

    - +

    oint _begin

    - +

    oint _end

    - +

    ofloat _speed

    - +

    oint _nreps

    - +

    oint _nrepsremain

    - -

    oSequenceMode _mode + +
    oSequenceMode _mode

    This class has no child classes.
    diff --git a/doc/doc++/osg/ShadeModel.html b/doc/doc++/osg/ShadeModel.html index 4c15bb6af..d05b4eb0f 100644 --- a/doc/doc++/osg/ShadeModel.html +++ b/doc/doc++/osg/ShadeModel.html @@ -23,36 +23,36 @@

    Public Methods

    -[more] ShadeModel() +[more] ShadeModel()
    -[more] ShadeModel(const ShadeModel& sm, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] ShadeModel(const ShadeModel& sm, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, ShadeModel, SHADEMODEL) +[more] META_StateAttribute(osg, ShadeModel, SHADEMODEL)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]inline void setMode(const Mode mode) +[more]inline void setMode(const Mode mode)
    -[more]inline const Mode getMode() const +[more]inline const Mode getMode() const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

    Public Members

    -[more]enum Mode +[more]enum Mode

    Protected Fields

    -[more]Mode _mode +[more]Mode _mode

    Protected Methods

    -[more]virtual ~ShadeModel() +[more]virtual ~ShadeModel()

    @@ -70,7 +70,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    ovirtual bool isTextureAttribute() const
    @@ -80,7 +80,7 @@
    obool operator != (const StateAttribute& rhs) const
    -ovirtual void getAssociatedModes(std::vector<GLMode>& ) const +ovirtual void getAssociatedModes(std::vector<GLMode>& ) const
    ovirtual void compile(State&) const

    @@ -105,9 +105,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -123,7 +123,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -141,12 +141,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -158,56 +166,56 @@
    - +
    o ShadeModel()

    - -

    o ShadeModel(const ShadeModel& sm, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o ShadeModel(const ShadeModel& sm, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, ShadeModel, SHADEMODEL) + +
    o META_StateAttribute(osg, ShadeModel, SHADEMODEL)

    - +

    ovirtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - +

    oenum Mode

    - +
    o FLAT

    - +

    o SMOOTH

    - -
    oinline void setMode(const Mode mode) + +
    oinline void setMode(const Mode mode)

    - -

    oinline const Mode getMode() const + +
    oinline const Mode getMode() const

    - +

    ovirtual void apply(State& state) const

    - +

    ovirtual ~ShadeModel()

    - -

    oMode _mode + +
    oMode _mode

    This class has no child classes.
    diff --git a/doc/doc++/osg/ShadowVolumeOccluder.html b/doc/doc++/osg/ShadowVolumeOccluder.html index b886ce974..ea44f7229 100644 --- a/doc/doc++/osg/ShadowVolumeOccluder.html +++ b/doc/doc++/osg/ShadowVolumeOccluder.html @@ -13,72 +13,74 @@

    Public Methods

    -[more]typedef std::vector<Polytope> HoleList ShadowVolumeOccluder(const ShadowVolumeOccluder& svo) +[more] ShadowVolumeOccluder(const ShadowVolumeOccluder& svo)
    -[more] ShadowVolumeOccluder() +[more] ShadowVolumeOccluder()
    -[more]bool operator < (const ShadowVolumeOccluder& svo) const +[more]bool operator < (const ShadowVolumeOccluder& svo) const
    -[more]bool computeOccluder(const NodePath& nodePath, const ConvexPlanarOccluder& occluder, CullStack& cullStack, bool createDrawables=false) +[more]bool computeOccluder(const NodePath& nodePath, const ConvexPlanarOccluder& occluder, CullStack& cullStack, bool createDrawables=false)
    compute the shadow volume occluder.
    -[more]inline void disableResultMasks() -
    -[more]bool matchProjectionMatrix(const osg::Matrix& matrix) const +[more]bool matchProjectionMatrix(const osg::Matrix& matrix) const
    return true if the matrix passed in matches the projection matrix that this ShaowVolumeOccluder is associated with
    -[more]inline void setNodePath(NodePath& nodePath) +[more]inline void setNodePath(NodePath& nodePath)
    Set the NodePath which describes the which node in the scene graph that this occluder was attached to
    -[more]inline NodePath& getNodePath() +[more]inline NodePath& getNodePath()
    -[more]inline const NodePath& getNodePath() const +[more]inline const NodePath& getNodePath() const
    -[more]float getVolume() const +[more]float getVolume() const
    get the volume of the occluder minus its holes, in eye coords, the volume is normalized by dividing by the volume of the view frustum in eye coords
    -[more]Polytope& getOccluder() +[more]Polytope& getOccluder()
    return the occluder polytope
    -[more]const Polytope& getOccluder() const +[more]const Polytope& getOccluder() const
    return the const occluder polytope
    -[more]HoleList& getHoleList() +[more]HoleList& getHoleList()
    return the list of holes
    -[more]const HoleList& getHoleList() const +[more]const HoleList& getHoleList() const
    return the const list of holes
    -[more]bool contains(const std::vector<Vec3>& vertices) +[more]bool contains(const std::vector<Vec3>& vertices)
    return true if the specified vertex list is contaned entirely within this shadow occluder volume
    -[more]bool contains(const BoundingSphere& bound) +[more]bool contains(const BoundingSphere& bound)
    return true if the specified bounding sphere is contaned entirely within this shadow occluder volume
    -[more]bool contains(const BoundingBox& bound) +[more]bool contains(const BoundingBox& bound)
    return true if the specified bounding box is contained entirely within this shadow occluder volume
    -[more]inline void transformProvidingInverse(const osg::Matrix& matrix) +[more]inline void transformProvidingInverse(const osg::Matrix& matrix)
    -[more]typedef std::vector<ShadowVolumeOccluder>inline ShadowVolumeOccluderList void disableResultMasks() -
    A list of ShadowVolumeOccluder, used by CollectOccluderVisitor and CullVistor's +[more]inline void disableResultMasks()
    -[more]inline void pushCurrentMask() +[more]inline void pushCurrentMask()
    -[more]inline void popCurrentMask() +[more]inline void popCurrentMask() +

    + +

    +

    Public Members

    +[more]typedef std::vector<Polytope> HoleList

    Protected Fields

    -[more]float _volume +[more]float _volume
    -[more]NodePath _nodePath +[more]NodePath _nodePath
    -[more]ref_ptr<const Matrix> _projectionMatrix +[more]ref_ptr<const Matrix> _projectionMatrix
    -[more]Polytope _occluderVolume +[more]Polytope _occluderVolume
    -[more]HoleList _holeList +[more]HoleList _holeList

    @@ -89,126 +91,125 @@
    ShadowVolumeOccluder is a helper class for implementating shadow occlusion culling.
    - - -
    otypedef std::vector<Polytope> HoleList ShadowVolumeOccluder(const ShadowVolumeOccluder& svo) + + +
    otypedef std::vector<Polytope> HoleList

    - + +

    o ShadowVolumeOccluder(const ShadowVolumeOccluder& svo) +

    + +

    o ShadowVolumeOccluder()

    - +

    obool operator < (const ShadowVolumeOccluder& svo) const

    - +

    obool computeOccluder(const NodePath& nodePath, const ConvexPlanarOccluder& occluder, CullStack& cullStack, bool createDrawables=false)
    compute the shadow volume occluder.

    - - -

    oinline void disableResultMasks() -

    - +

    obool matchProjectionMatrix(const osg::Matrix& matrix) const
    return true if the matrix passed in matches the projection matrix that this ShaowVolumeOccluder is associated with

    - +

    oinline void setNodePath(NodePath& nodePath)
    Set the NodePath which describes the which node in the scene graph that this occluder was attached to

    - +

    oinline NodePath& getNodePath()

    - +

    oinline const NodePath& getNodePath() const

    - +

    ofloat getVolume() const
    get the volume of the occluder minus its holes, in eye coords, the volume is normalized by dividing by the volume of the view frustum in eye coords

    - +

    oPolytope& getOccluder()
    return the occluder polytope

    - +

    oconst Polytope& getOccluder() const
    return the const occluder polytope

    - -

    oHoleList& getHoleList() + +
    oHoleList& getHoleList()
    return the list of holes

    - -

    oconst HoleList& getHoleList() const + +
    oconst HoleList& getHoleList() const
    return the const list of holes

    - +

    obool contains(const std::vector<Vec3>& vertices)
    return true if the specified vertex list is contaned entirely within this shadow occluder volume

    - +

    obool contains(const BoundingSphere& bound)
    return true if the specified bounding sphere is contaned entirely within this shadow occluder volume

    - +

    obool contains(const BoundingBox& bound)
    return true if the specified bounding box is contained entirely within this shadow occluder volume

    - +

    oinline void transformProvidingInverse(const osg::Matrix& matrix)

    - +

    ofloat _volume

    - +

    oNodePath _nodePath

    - +

    oref_ptr<const Matrix> _projectionMatrix

    - +

    oPolytope _occluderVolume

    - -

    oHoleList _holeList + +
    oHoleList _holeList

    - -

    otypedef std::vector<ShadowVolumeOccluder>inline ShadowVolumeOccluderList void disableResultMasks() -
    A list of ShadowVolumeOccluder, used by CollectOccluderVisitor and CullVistor's + +
    oinline void disableResultMasks()

    - +

    oinline void pushCurrentMask()

    - +

    oinline void popCurrentMask()

    diff --git a/doc/doc++/osg/State.html b/doc/doc++/osg/State.html index fbc72f798..35c1fafc4 100644 --- a/doc/doc++/osg/State.html +++ b/doc/doc++/osg/State.html @@ -23,167 +23,198 @@

    Public Methods

    -[more] State() +[more] State()
    -[more]virtual ~State() +[more]virtual ~State()
    -[more]void pushStateSet(const StateSet* dstate) +[more]void pushStateSet(const StateSet* dstate)
    push stateset onto state stack
    -[more]void popStateSet() +[more]void popStateSet()
    pop drawstate off state stack
    -[more]void captureCurrentState(StateSet& stateset) const +[more]void captureCurrentState(StateSet& stateset) const
    copy the modes and attributes which captures the current state
    -[more]void reset() +[more]void reset()
    reset the state object to an empty stack
    -[more]inline void applyProjectionMatrix(const osg::Matrix* matrix) +[more]inline void applyProjectionMatrix(const osg::Matrix* matrix)
    -[more]const osg::Matrix& getProjectionMatrix() const +[more]const osg::Matrix& getProjectionMatrix() const
    -[more]inline void applyModelViewMatrix(const osg::Matrix* matrix) +[more]inline void applyModelViewMatrix(const osg::Matrix* matrix)
    -[more]const osg::Matrix& getModelViewMatrix() const +[more]const osg::Matrix& getModelViewMatrix() const
    -[more]Polytope getViewFrustum() const +[more]Polytope getViewFrustum() const
    -[more]void apply(const StateSet* dstate) +[more]void apply(const StateSet* dstate)
    Apply stateset
    -[more]void apply() +[more]void apply()
    Apply the state
    -[more]inline const bool applyMode(const StateAttribute::GLMode mode, const bool enabled) +[more]inline bool applyMode(StateAttribute::GLMode mode, bool enabled)
    Apply an OpenGL mode if required.
    -[more]inline const bool applyTextureMode(unsigned int unit, const StateAttribute::GLMode mode, const bool enabled) +[more]inline bool applyTextureMode(unsigned int unit, StateAttribute::GLMode mode, bool enabled)
    -[more]inline const bool applyAttribute(const StateAttribute* attribute) +[more]inline bool applyAttribute(const StateAttribute* attribute)
    Apply an attribute if required.
    -[more]inline const bool applyTextureAttribute(unsigned int unit, const StateAttribute* attribute) +[more]inline bool applyTextureAttribute(unsigned int unit, const StateAttribute* attribute)
    -[more]void haveAppliedMode(const StateAttribute::GLMode mode, const StateAttribute::GLModeValue value) +[more]void haveAppliedMode(StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
    Mode has been set externally, update state to reflect this setting
    -[more]void haveAppliedMode(const StateAttribute::GLMode mode) +[more]void haveAppliedMode(StateAttribute::GLMode mode)
    Mode has been set externally, therefore dirty the associated mode in osg::State so it is applied on next call to osg::State::apply()
    -[more]void haveAppliedAttribute(const StateAttribute* attribute) +[more]void haveAppliedAttribute(const StateAttribute* attribute)
    Attribute has been applied externally, update state to reflect this setting
    -[more]void haveAppliedAttribute(const StateAttribute::Type type) +[more]void haveAppliedAttribute(StateAttribute::Type type)
    Attribute has been applied externally, and therefore this attribute type has been dirtied and will need to be re-appplied on next osg::Stateapply().
    -[more]const bool getLastAppliedMode(const StateAttribute::GLMode mode) const +[more]bool getLastAppliedMode(StateAttribute::GLMode mode) const
    Get whether the current specified mode is enabled (true) or disabled (false)
    -[more]const StateAttribute* getLastAppliedAttribute(const StateAttribute::Type type) const +[more]const StateAttribute* getLastAppliedAttribute(StateAttribute::Type type) const
    Get the current specified attribute, return NULL is one has not yet been applied
    -[more]void haveAppliedTextureMode(unsigned int unit, const StateAttribute::GLMode mode, const StateAttribute::GLModeValue value) +[more]void haveAppliedTextureMode(unsigned int unit, StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
    texture Mode has been set externally, update state to reflect this setting
    -[more]void haveAppliedTextureMode(unsigned int unit, const StateAttribute::GLMode mode) +[more]void haveAppliedTextureMode(unsigned int unit, StateAttribute::GLMode mode)
    texture Mode has been set externally, therefore dirty the associated mode in osg::State so it is applied on next call to osg::State::apply()
    -[more]void haveAppliedTextureAttribute(unsigned int unit, const StateAttribute* attribute) +[more]void haveAppliedTextureAttribute(unsigned int unit, const StateAttribute* attribute)
    texture Attribute has been applied externally, update state to reflect this setting
    -[more]void haveAppliedTextureAttribute(unsigned int unit, const StateAttribute::Type type) +[more]void haveAppliedTextureAttribute(unsigned int unit, StateAttribute::Type type)
    texture Attribute has been applied externally, and therefore this attribute type has been dirtied and will need to be re-appplied on next osg::Stateapply().
    -[more]const bool getLastAppliedTextureMode(unsigned int unit, const StateAttribute::GLMode mode) const +[more]bool getLastAppliedTextureMode(unsigned int unit, StateAttribute::GLMode mode) const
    Get whether the current specified texture mode is enabled (true) or disabled (false)
    -[more]const StateAttribute* getLastAppliedTextureAttribute(unsigned int unit, const StateAttribute::Type type) const +[more]const StateAttribute* getLastAppliedTextureAttribute(unsigned int unit, StateAttribute::Type type) const
    Get the current specified texture attribute, return NULL is one has not yet been applied
    -[more]inline void setVertexPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr ) +[more]void disableAllVertexArrays() +
    disable the vertex, normal, color, tex coords, secenday color, fog coord and index arrays +
    +[more]void dirtyAllVertexArrays() +
    dirty the vertex, normal, color, tex coords, secenday color, fog coord and index arrays +
    +[more]inline void setVertexPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
    wrapper around glEnableClientState(GL_VERTEX_ARRAY);glVertexPointer(); note, only updates values that change
    -[more]inline void disableVertexPointer() +[more]inline void disableVertexPointer()
    wrapper glDisableClientState(GL_VERTEX_ARRAY).
    -[more]inline void setNormalPointer( GLenum type, GLsizei stride, const GLvoid* ptr ) +[more]inline void dirtyVertexPointer() +
    +[more]inline void setNormalPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
    wrapper around glEnableClientState(GL_NORMAL_ARRAY);glNormalPointer(); note, only updates values that change
    -[more]inline void disableNormalPointer() +[more]inline void disableNormalPointer()
    wrapper around glDisableClientState(GL_NORMAL_ARRAY); note, only updates values that change
    -[more]inline void setColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr ) +[more]inline void dirtyNormalPointer() +
    +[more]inline void setColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
    wrapper around glEnableClientState(GL_COLOR_ARRAY);glColorPointer(); note, only updates values that change
    -[more]inline void disableColorPointer() +[more]inline void disableColorPointer()
    wrapper around glDisableClientState(GL_COLOR_ARRAY); note, only updates values that change
    -[more]void setSecondaryColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr ) +[more]inline void dirtyColorPointer() +
    +[more]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
    -[more]inline void disableSecondaryColorPointer() +[more]inline void disableSecondaryColorPointer()
    wrapper around glDisableClientState(GL_SECONDARY_COLOR_ARRAY); note, only updates values that change
    -[more]inline void setIndexPointer( GLenum type, GLsizei stride, const GLvoid* ptr ) +[more]inline void dirtySecondaryColorPointer() +
    +[more]inline void setIndexPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
    wrapper around glEnableClientState(GL_INDEX_ARRAY);glIndexPointer(); note, only updates values that change
    -[more]inline void disableIndexPointer() +[more]inline void disableIndexPointer()
    wrapper around glDisableClientState(GL_INDEX_ARRAY); note, only updates values that change
    -[more]void setFogCoordPointer( GLenum type, GLsizei stride, const GLvoid* ptr ) +[more]inline void dirtyIndexPointer() +
    +[more]void setFogCoordPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
    wrapper around glEnableClientState(GL_FOG_COORDINATE_ARRAY);glFogCoordPointer(); note, only updates values that change
    -[more]inline void disableFogCoordPointer() +[more]inline void disableFogCoordPointer()
    wrapper around glDisableClientState(GL_FOG_COORDINATE_ARRAY); note, only updates values that change
    -[more]inline void setTexCoordPointer( unsigned int unit, GLint size, GLenum type, GLsizei stride, const GLvoid* ptr ) +[more]inline void dirtyFogCoordPointer() +
    +[more]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
    -[more]inline void disableTexCoordPointer( unsigned int unit ) +[more]inline void disableTexCoordPointer( unsigned int unit )
    wrapper around glDisableClientState(GL_TEXTURE_COORD_ARRAY); note, only updates values that change
    -[more]inline void disableTexCoordPointersAboveAndIncluding( unsigned int unit ) +[more]inline void dirtyTexCoordPointer( unsigned int unit )
    -[more]bool setClientActiveTextureUnit( unsigned int unit ) +[more]inline void disableTexCoordPointersAboveAndIncluding( unsigned int unit ) +
    +[more]inline void dirtyTexCoordPointersAboveAndIncluding( unsigned int unit ) +
    +[more]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.
    -[more]bool setActiveTextureUnit( unsigned int unit ) +[more]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.
    -[more]inline void setContextID(unsigned int contextID) +[more]inline void setContextID(unsigned int contextID)
    Set the current OpenGL context uniqueID.
    -[more]inline const unsigned int getContextID() const +[more]inline unsigned int getContextID() const
    Get the current OpenGL context unique ID
    -[more]inline void setFrameStamp(FrameStamp* fs) +[more]inline void setFrameStamp(FrameStamp* fs)
    Set the frame stamp for the current frame
    -[more]inline const FrameStamp* getFrameStamp() const +[more]inline const FrameStamp* getFrameStamp() const
    Set the frame stamp for the current frame
    -[more]inline void setDisplaySettings(DisplaySettings* vs) +[more]inline void setDisplaySettings(DisplaySettings* vs)
    Set the DisplaySettings.
    -[more]inline const DisplaySettings* getDisplaySettings() const +[more]inline const DisplaySettings* getDisplaySettings() const
    Get the DisplaySettings
    -[more]inline void pushModeList(ModeMap& modeMap, const StateSet::ModeList& modeList) +[more]inline void pushModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
    -[more]inline void pushAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList) +[more]inline void pushAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
    -[more]inline void popModeList(ModeMap& modeMap, const StateSet::ModeList& modeList) +[more]inline void popModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
    -[more]inline void popAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList) +[more]inline void popAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
    -[more]inline void applyModeList(ModeMap& modeMap, const StateSet::ModeList& modeList) +[more]inline void applyModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)
    -[more]inline void applyAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList) +[more]inline void applyAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)
    -[more]inline void applyModeMap(ModeMap& modeMap) +[more]inline void applyModeMap(ModeMap& modeMap)
    -[more]inline void applyAttributeMap(AttributeMap& attributeMap) +[more]inline void applyAttributeMap(AttributeMap& attributeMap) +

    + +

    +

    Public Members

    +[more]typedef std::pair<const StateAttribute*,StateAttribute::OverrideValue> AttributePair +
    +[more]typedef std::vector<AttributePair> AttributeVec +
    +[more]typedef std::vector<StateAttribute::GLModeValue> ValueVec

    @@ -199,12 +230,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -217,100 +256,100 @@ Lazy state updating is used to minimize state changes.
    - +
    o State()

    - +

    ovirtual ~State()

    - +

    ovoid pushStateSet(const StateSet* dstate)
    push stateset onto state stack

    - +

    ovoid popStateSet()
    pop drawstate off state stack

    - +

    ovoid captureCurrentState(StateSet& stateset) const
    copy the modes and attributes which captures the current state

    - +

    ovoid reset()
    reset the state object to an empty stack

    - +

    oinline void applyProjectionMatrix(const osg::Matrix* matrix)

    - +

    oconst osg::Matrix& getProjectionMatrix() const

    - +

    oinline void applyModelViewMatrix(const osg::Matrix* matrix)

    - +

    oconst osg::Matrix& getModelViewMatrix() const

    - +

    oPolytope getViewFrustum() const

    - +

    ovoid apply(const StateSet* dstate)
    Apply stateset

    - +

    ovoid apply()
    Apply the state

    - -

    oinline const bool applyMode(const StateAttribute::GLMode mode, const bool enabled) + +
    oinline bool applyMode(StateAttribute::GLMode mode, bool enabled)
    Apply an OpenGL mode if required.

    - -

    oinline const bool applyTextureMode(unsigned int unit, const StateAttribute::GLMode mode, const bool enabled) + +
    oinline bool applyTextureMode(unsigned int unit, StateAttribute::GLMode mode, bool enabled)

    - -

    oinline const bool applyAttribute(const StateAttribute* attribute) + +
    oinline bool applyAttribute(const StateAttribute* attribute)
    Apply an attribute if required.

    - -

    oinline const bool applyTextureAttribute(unsigned int unit, const StateAttribute* attribute) + +
    oinline bool applyTextureAttribute(unsigned int unit, const StateAttribute* attribute)

    - -

    ovoid haveAppliedMode(const StateAttribute::GLMode mode, const StateAttribute::GLModeValue value) + +
    ovoid haveAppliedMode(StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
    Mode has been set externally, update state to reflect this setting

    - -

    ovoid haveAppliedMode(const StateAttribute::GLMode mode) + +
    ovoid haveAppliedMode(StateAttribute::GLMode mode)
    Mode has been set externally, therefore dirty the associated mode in osg::State so it is applied on next call to osg::State::apply()

    - +

    ovoid haveAppliedAttribute(const StateAttribute* attribute)
    Attribute has been applied externally, update state to reflect this setting

    - -

    ovoid haveAppliedAttribute(const StateAttribute::Type type) + +
    ovoid haveAppliedAttribute(StateAttribute::Type type)
    Attribute has been applied externally, and therefore this attribute type has been dirtied and will need to be re-appplied on next osg::Stateapply(). @@ -320,34 +359,34 @@ track the current state more accuratly and enable lazy state updating such that only changed state will be applied.

    - -

    oconst bool getLastAppliedMode(const StateAttribute::GLMode mode) const + +
    obool getLastAppliedMode(StateAttribute::GLMode mode) const
    Get whether the current specified mode is enabled (true) or disabled (false)

    - -

    oconst StateAttribute* getLastAppliedAttribute(const StateAttribute::Type type) const + +
    oconst StateAttribute* getLastAppliedAttribute(StateAttribute::Type type) const
    Get the current specified attribute, return NULL is one has not yet been applied

    - -

    ovoid haveAppliedTextureMode(unsigned int unit, const StateAttribute::GLMode mode, const StateAttribute::GLModeValue value) + +
    ovoid haveAppliedTextureMode(unsigned int unit, StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
    texture Mode has been set externally, update state to reflect this setting

    - -

    ovoid haveAppliedTextureMode(unsigned int unit, const StateAttribute::GLMode mode) + +
    ovoid haveAppliedTextureMode(unsigned int unit, StateAttribute::GLMode mode)
    texture Mode has been set externally, therefore dirty the associated mode in osg::State so it is applied on next call to osg::State::apply()

    - +

    ovoid haveAppliedTextureAttribute(unsigned int unit, const StateAttribute* attribute)
    texture Attribute has been applied externally, update state to reflect this setting

    - -

    ovoid haveAppliedTextureAttribute(unsigned int unit, const StateAttribute::Type type) + +
    ovoid haveAppliedTextureAttribute(unsigned int unit, StateAttribute::Type type)
    texture Attribute has been applied externally, and therefore this attribute type has been dirtied and will need to be re-appplied on next osg::Stateapply(). @@ -357,250 +396,312 @@ track the current state more accuratly and enable lazy state updating such that only changed state will be applied.

    - -

    oconst bool getLastAppliedTextureMode(unsigned int unit, const StateAttribute::GLMode mode) const + +
    obool getLastAppliedTextureMode(unsigned int unit, StateAttribute::GLMode mode) const
    Get whether the current specified texture mode is enabled (true) or disabled (false)

    - -

    oconst StateAttribute* getLastAppliedTextureAttribute(unsigned int unit, const StateAttribute::Type type) const + +
    oconst StateAttribute* getLastAppliedTextureAttribute(unsigned int unit, StateAttribute::Type type) const
    Get the current specified texture attribute, return NULL is one has not yet been applied

    + + +

    ovoid disableAllVertexArrays() +
    disable the vertex, normal, color, tex coords, secenday color, fog coord and index arrays +

    + + +

    ovoid dirtyAllVertexArrays() +
    dirty the vertex, normal, color, tex coords, secenday color, fog coord and index arrays +

    - -

    oinline void setVertexPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr ) + +
    oinline void setVertexPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
    wrapper around glEnableClientState(GL_VERTEX_ARRAY);glVertexPointer(); note, only updates values that change

    - +

    oinline void disableVertexPointer()
    wrapper glDisableClientState(GL_VERTEX_ARRAY). note, only updates values that change.

    + + +

    oinline void dirtyVertexPointer() +

    - -

    oinline void setNormalPointer( GLenum type, GLsizei stride, const GLvoid* ptr ) + +
    oinline void setNormalPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
    wrapper around glEnableClientState(GL_NORMAL_ARRAY);glNormalPointer(); note, only updates values that change

    - +

    oinline void disableNormalPointer()
    wrapper around glDisableClientState(GL_NORMAL_ARRAY); note, only updates values that change

    + + +

    oinline void dirtyNormalPointer() +

    - -

    oinline void setColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr ) + +
    oinline void setColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
    wrapper around glEnableClientState(GL_COLOR_ARRAY);glColorPointer(); note, only updates values that change

    - +

    oinline void disableColorPointer()
    wrapper around glDisableClientState(GL_COLOR_ARRAY); note, only updates values that change

    + + +

    oinline void dirtyColorPointer() +

    - -

    ovoid setSecondaryColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr ) + +
    ovoid setSecondaryColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid* ptr )
    wrapper around glEnableClientState(GL_SECONDARY_COLOR_ARRAY);glSecondayColorPointer(); note, only updates values that change

    - +

    oinline void disableSecondaryColorPointer()
    wrapper around glDisableClientState(GL_SECONDARY_COLOR_ARRAY); note, only updates values that change

    + + +

    oinline void dirtySecondaryColorPointer() +

    - -

    oinline void setIndexPointer( GLenum type, GLsizei stride, const GLvoid* ptr ) + +
    oinline void setIndexPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
    wrapper around glEnableClientState(GL_INDEX_ARRAY);glIndexPointer(); note, only updates values that change

    - +

    oinline void disableIndexPointer()
    wrapper around glDisableClientState(GL_INDEX_ARRAY); note, only updates values that change

    + + +

    oinline void dirtyIndexPointer() +

    - -

    ovoid setFogCoordPointer( GLenum type, GLsizei stride, const GLvoid* ptr ) + +
    ovoid setFogCoordPointer( GLenum type, GLsizei stride, const GLvoid* ptr )
    wrapper around glEnableClientState(GL_FOG_COORDINATE_ARRAY);glFogCoordPointer(); note, only updates values that change

    - +

    oinline void disableFogCoordPointer()
    wrapper around glDisableClientState(GL_FOG_COORDINATE_ARRAY); note, only updates values that change

    + + +

    oinline void dirtyFogCoordPointer() +

    - -

    oinline void setTexCoordPointer( unsigned int unit, GLint size, GLenum type, GLsizei stride, const GLvoid* ptr ) + +
    oinline 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

    - +

    oinline void disableTexCoordPointer( unsigned int unit )
    wrapper around glDisableClientState(GL_TEXTURE_COORD_ARRAY); note, only updates values that change

    + + +

    oinline void dirtyTexCoordPointer( unsigned int unit ) +

    - +

    oinline void disableTexCoordPointersAboveAndIncluding( unsigned int unit )

    + + +

    oinline void dirtyTexCoordPointersAboveAndIncluding( unsigned int unit ) +

    - +

    obool 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.

    - +

    obool 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.

    - +

    oinline void setContextID(unsigned int contextID)
    Set the current OpenGL context uniqueID. Note, it is the application developers responsibility to set up unique ID for each OpenGL context. This value is then used by osg::StateAttribure's and osg::Drawable's to help manage OpenGL display list and texture binds appropriate -for each context. +for each context, the contextID simply acts as an index local +arrays that they maintain for the purpose. +Typical settings for contextID are 0,1,2,3... up to the maximum +number of graphics contexts you have setup. +By default contextID is 0.

    - -

    oinline const unsigned int getContextID() const + +
    oinline unsigned int getContextID() const
    Get the current OpenGL context unique ID

    - +

    oinline void setFrameStamp(FrameStamp* fs)
    Set the frame stamp for the current frame

    - +

    oinline const FrameStamp* getFrameStamp() const
    Set the frame stamp for the current frame

    - +

    oinline 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.

    - +

    oinline const DisplaySettings* getDisplaySettings() const
    Get the DisplaySettings +

    + + +

    otypedef std::pair<const StateAttribute*,StateAttribute::OverrideValue> AttributePair +

    + + +

    otypedef std::vector<AttributePair> AttributeVec +

    + + +

    otypedef std::vector<StateAttribute::GLModeValue> ValueVec

    - +
    o ModeStack()

    - +

    obool changed

    - +

    obool last_applied_value

    - +

    obool global_default_value

    - -

    oValueVec valueVec + +
    oValueVec valueVec

    - +
    o AttributeStack()

    - +

    obool changed
    apply an attribute if required, passing in attribute and appropriate attribute stack

    - +

    oconst StateAttribute* last_applied_attribute

    - +

    oref_ptr<StateAttribute> global_default_attribute

    - -

    oAttributeVec attributeVec + +
    oAttributeVec attributeVec

    - +
    o EnabledArrayPair()

    - -

    o EnabledArrayPair(const EnabledArrayPair& eap) + +
    o EnabledArrayPair(const EnabledArrayPair& eap)

    - -

    oEnabledArrayPair& operator = (const EnabledArrayPair& eap) + +
    oEnabledArrayPair& operator = (const EnabledArrayPair& eap) +

    + + +

    obool _dirty

    - +

    obool _enabled

    - +

    oconst GLvoid* _pointer

    - -
    oinline void pushModeList(ModeMap& modeMap, const StateSet::ModeList& modeList) + +
    oinline void pushModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)

    - -

    oinline void pushAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList) + +
    oinline void pushAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)

    - -

    oinline void popModeList(ModeMap& modeMap, const StateSet::ModeList& modeList) + +
    oinline void popModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)

    - -

    oinline void popAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList) + +
    oinline void popAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)

    - -

    oinline void applyModeList(ModeMap& modeMap, const StateSet::ModeList& modeList) + +
    oinline void applyModeList(ModeMap& modeMap, const StateSet::ModeList& modeList)

    - -

    oinline void applyAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList) + +
    oinline void applyAttributeList(AttributeMap& attributeMap, const StateSet::AttributeList& attributeList)

    - -

    oinline void applyModeMap(ModeMap& modeMap) + +
    oinline void applyModeMap(ModeMap& modeMap)

    - -

    oinline void applyAttributeMap(AttributeMap& attributeMap) + +
    oinline 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 7f171480e..a9a5651c9 100644 --- a/doc/doc++/osg/StateAttribute.html +++ b/doc/doc++/osg/StateAttribute.html @@ -11,11 +11,11 @@

    Inheritance:

    - - - - - + + + + +
    @@ -23,74 +23,74 @@

    Public Methods

    -[more] StateAttribute() +[more] StateAttribute()
    -[more] StateAttribute(const StateAttribute& sa, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] StateAttribute(const StateAttribute& sa, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    -[more]virtual Object* cloneType() const = 0 +[more]virtual Object* cloneType() const = 0
    Clone the type of an attribute, with Object* return type.
    -[more]virtual Object* clone(const CopyOp&) const = 0 +[more]virtual Object* clone(const CopyOp&) const = 0
    Clone an attribute, with Object* return type.
    -[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
    return true if this and obj are of the same kind of object
    -[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
    return the name of the attribute's library
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    return the name of the attribute's class type
    -[more]virtual const Type getType() const = 0 +[more]virtual Type getType() const = 0
    return the Type identifier of the attribute's class type
    -[more]virtual bool isTextureAttribute() const +[more]virtual bool isTextureAttribute() const
    return true if StateAttribute is a type which controls texturing and needs to be issued wrt to specific texture unit
    -[more]virtual int compare(const StateAttribute& sa) const = 0 +[more]virtual int compare(const StateAttribute& sa) const = 0
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]bool operator < (const StateAttribute& rhs) const +[more]bool operator < (const StateAttribute& rhs) const
    -[more]bool operator == (const StateAttribute& rhs) const +[more]bool operator == (const StateAttribute& rhs) const
    -[more]bool operator != (const StateAttribute& rhs) const +[more]bool operator != (const StateAttribute& rhs) const
    -[more]virtual void getAssociatedModes(std::vector<GLMode>& ) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& ) const
    return the modes associated with this StateSet
    -[more]virtual void apply(State&) const = 0 +[more]virtual void apply(State&) const = 0
    apply the OpenGL state attributes.
    -[more]virtual void compile(State&) const +[more]virtual void compile(State&) const
    default to nothing to compile - all state is applied immediately.

    Public Members

    -[more]typedef GLenum GLMode +[more]typedef GLenum GLMode
    GLMode is the value used in glEnable/glDisable(mode)
    -[more]typedef unsigned int GLModeValue +[more]typedef unsigned int GLModeValue
    GLModeValue is used to specified whether an mode is enabled (ON) or disabled (OFF).
    -[more]typedef unsigned int OverrideValue +[more]typedef unsigned int OverrideValue
    Override is used to specified the override behavior of StateAttributes from from parent to children.
    -[more]enum Values +[more]enum Values
    list values which can be used in to set either GLModeValues or OverrideValues.
    -[more]typedef unsigned int Type +[more]typedef unsigned int Type
    Type identifier to differentiate between different state types.
    -[more]enum Types +[more]enum Types
    Values of StateAttribute::Type used to aid identification of different StateAttribute subclasses.

    Protected Methods

    -[more]virtual ~StateAttribute() +[more]virtual ~StateAttribute()

    @@ -98,9 +98,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -116,7 +116,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -134,12 +134,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -151,26 +159,26 @@
    - +
    otypedef GLenum GLMode
    GLMode is the value used in glEnable/glDisable(mode)

    - +

    otypedef unsigned int GLModeValue
    GLModeValue is used to specified whether an mode is enabled (ON) or disabled (OFF). GLMoveValue is also used to specify the override behavior of modes from parent to children. See enum Value description for more details.

    - +

    otypedef unsigned int OverrideValue
    Override is used to specified the override behavior of StateAttributes from from parent to children. See enum Value description for more details.

    - +

    oenum Values
    list values which can be used in to set either GLModeValues or OverrideValues. When using in conjunction with GLModeValues @@ -182,38 +190,38 @@ StateSet::setAttributeAndModes(..).

    - +
    o OFF
    means that associated GLMode and Override is disabled

    - +

    o ON
    means that associated GLMode is enabled and Override is disabled

    - +

    o OVERRIDE
    Overriding of GLMode's or StateAttributes is enabled, so that state below it is overriden

    - +

    o PROTECTED
    Protecting of GLMode's os StateAttributes is enabled, so that state from above connot override this and below state

    - +

    o INHERIT
    means that GLMode or StateAttribute should in inherited from above

    - +
    otypedef unsigned int Type
    Type identifier to differentiate between different state types.

    - +

    oenum Types
    Values of StateAttribute::Type used to aid identification of different StateAttribute subclasses. Each subclass defines @@ -226,235 +234,239 @@ that types value.

    - +
    o TEXTURE

    - +

    o POLYGONMODE

    - +

    o POLYGONOFFSET

    - +

    o MATERIAL

    - +

    o ALPHAFUNC

    - +

    o ANTIALIAS

    - +

    o COLORTABLE

    - +

    o CULLFACE

    - +

    o FOG

    - +

    o FRONTFACE

    - +

    o LIGHT

    - +

    o LIGHT_0

    - +

    o LIGHT_1

    - +

    o LIGHT_2

    - +

    o LIGHT_3

    - +

    o LIGHT_4

    - +

    o LIGHT_5

    - +

    o LIGHT_6

    - +

    o LIGHT_7

    - +

    o POINT

    - +

    o LINEWIDTH

    - +

    o LINESTIPPLE

    + + +

    o POLYGONSTIPPLE +

    - +

    o SHADEMODEL

    - +

    o TEXENV

    - +

    o TEXGEN

    - +

    o TEXMAT

    - +

    o LIGHTMODEL

    - +

    o BLENDFUNC

    - +

    o STENCIL

    - +

    o COLORMASK

    - +

    o DEPTH

    - +

    o VIEWPORT

    - +

    o CLIPPLANE

    - +

    o CLIPPLANE_0

    - +

    o CLIPPLANE_1

    - +

    o CLIPPLANE_2

    - +

    o CLIPPLANE_3

    - +

    o CLIPPLANE_4

    - +

    o CLIPPLANE_5

    - +

    o COLORMATRIX

    - +
    o StateAttribute()

    - -

    o StateAttribute(const StateAttribute& sa, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o StateAttribute(const StateAttribute& sa, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

    - +

    ovirtual Object* cloneType() const = 0
    Clone the type of an attribute, with Object* return type. Must be defined by derived classes.

    - +

    ovirtual Object* clone(const CopyOp&) const = 0
    Clone an attribute, with Object* return type. Must be defined by derived classes.

    - +

    ovirtual bool isSameKindAs(const Object* obj) const
    return true if this and obj are of the same kind of object

    - +

    ovirtual const char* libraryName() const
    return the name of the attribute's library

    - +

    ovirtual const char* className() const
    return the name of the attribute's class type

    - -

    ovirtual const Type getType() const = 0 + +
    ovirtual Type getType() const = 0
    return the Type identifier of the attribute's class type

    - +

    ovirtual bool isTextureAttribute() const
    return true if StateAttribute is a type which controls texturing and needs to be issued wrt to specific texture unit

    - +

    ovirtual int compare(const StateAttribute& sa) const = 0
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - +

    obool operator < (const StateAttribute& rhs) const

    - +

    obool operator == (const StateAttribute& rhs) const

    - +

    obool operator != (const StateAttribute& rhs) const

    - -

    ovirtual void getAssociatedModes(std::vector<GLMode>& ) const + +
    ovirtual void getAssociatedModes(std::vector<GLMode>& ) const
    return the modes associated with this StateSet

    - +

    ovirtual void apply(State&) const = 0
    apply the OpenGL state attributes. The global state for the current OpenGL context is passed @@ -462,12 +474,12 @@ in to allow the StateAttribute to obtain details on the the current context and state.

    - +

    ovirtual void compile(State&) const
    default to nothing to compile - all state is applied immediately.

    - +

    ovirtual ~StateAttribute()

    @@ -480,6 +492,7 @@ the current context and state. TexEnv
    Stencil
    ShadeModel
    +PolygonStipple
    PolygonOffset
    PolygonMode
    Point
    diff --git a/doc/doc++/osg/StateSet.html b/doc/doc++/osg/StateSet.html index 2029008f4..99f03cdae 100644 --- a/doc/doc++/osg/StateSet.html +++ b/doc/doc++/osg/StateSet.html @@ -23,214 +23,218 @@

    Public Methods

    -[more] StateSet() +[more] StateSet()
    -[more] StateSet(const StateSet&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] StateSet(const StateSet&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    -[more]virtual Object* cloneType() const +[more]virtual Object* cloneType() const
    -[more]virtual Object* clone(const CopyOp& copyop) const +[more]virtual Object* clone(const CopyOp& copyop) const
    -[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
    -[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    -[more]int compare(const StateSet& rhs, bool compareAttributeContents=false) const +[more]int compare(const StateSet& rhs, bool compareAttributeContents=false) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]bool operator < (const StateSet& rhs) const +[more]bool operator < (const StateSet& rhs) const
    -[more]bool operator == (const StateSet& rhs) const +[more]bool operator == (const StateSet& rhs) const
    -[more]bool operator != (const StateSet& rhs) const +[more]bool operator != (const StateSet& rhs) const
    -[more]void setGlobalDefaults() +[more]void setGlobalDefaults()
    set all the modes to on or off so that it defines a complete state, typically used for a default global state
    -[more]void setAllToInherit() +[more]void setAllToInherit()
    set all the modes to inherit, typically used to signify nodes which inherit all of their modes for the global state
    -[more]void merge(const StateSet& rhs) +[more]void merge(const StateSet& rhs)
    merge this stateset with stateset rhs, this overrides the rhs if OVERRIDE is specified, otherwise rhs takes precedence
    -[more]void setMode(const StateAttribute::GLMode mode, const StateAttribute::GLModeValue value) +[more]void setMode(StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
    set this StateSet to contain specified GLMode and value
    -[more]void setModeToInherit(const StateAttribute::GLMode mode) +[more]void setModeToInherit(StateAttribute::GLMode mode)
    set this StateSet to inherit specified GLMode type from parents.
    -[more]const StateAttribute::GLModeValue getMode(const StateAttribute::GLMode mode) const +[more]StateAttribute::GLModeValue getMode(StateAttribute::GLMode mode) const
    get specified GLModeValue for specified GLMode.
    -[more]inline ModeList& getModeList() +[more]inline ModeList& getModeList()
    return the list of all GLModes contained in this StateSet
    -[more]inline const ModeList& getModeList() const +[more]inline const ModeList& getModeList() const
    return the const list of all GLModes contained in this const StateSet
    -[more]void setAttribute(StateAttribute* attribute, const StateAttribute::OverrideValue value=StateAttribute::OFF) +[more]void setAttribute(StateAttribute* attribute, StateAttribute::OverrideValue value=StateAttribute::OFF)
    set this StateSet to contain specified attribute and override flag
    -[more]void setAttributeAndModes(StateAttribute* attribute, const StateAttribute::GLModeValue value=StateAttribute::ON) +[more]void setAttributeAndModes(StateAttribute* attribute, StateAttribute::GLModeValue value=StateAttribute::ON)
    set this StateSet to contain specified attribute and set the associated GLMode's to specified value
    -[more]void setAttributeToInherit(const StateAttribute::Type type) +[more]void setAttributeToInherit(StateAttribute::Type type)
    set this StateSet to inherit specified attribute type from parents.
    -[more]StateAttribute* getAttribute(const StateAttribute::Type type) +[more]StateAttribute* getAttribute(StateAttribute::Type type)
    get specified StateAttribute for specified type.
    -[more]const StateAttribute* getAttribute(const StateAttribute::Type type) const +[more]const StateAttribute* getAttribute(StateAttribute::Type type) const
    get specified const StateAttribute for specified type.
    -[more]const RefAttributePair* getAttributePair(const StateAttribute::Type type) const +[more]const RefAttributePair* getAttributePair(StateAttribute::Type type) const
    get specified RefAttributePair for specified type.
    -[more]inline AttributeList& getAttributeList() +[more]inline AttributeList& getAttributeList()
    return the list of all StateAttributes contained in this StateSet
    -[more]inline const AttributeList& getAttributeList() const +[more]inline const AttributeList& getAttributeList() const
    return the const list of all StateAttributes contained in this const StateSet
    -[more]void setTextureMode(unsigned int unit, const StateAttribute::GLMode mode, const StateAttribute::GLModeValue value) +[more]void setTextureMode(unsigned int unit, StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
    set this StateSet to contain specified GLMode and value
    -[more]void setTextureModeToInherit(unsigned int unit, const StateAttribute::GLMode mode) +[more]void setTextureModeToInherit(unsigned int unit, StateAttribute::GLMode mode)
    set this StateSet to inherit specified GLMode type from parents.
    -[more]const StateAttribute::GLModeValue getTextureMode(unsigned int unit, const StateAttribute::GLMode mode) const +[more]StateAttribute::GLModeValue getTextureMode(unsigned int unit, StateAttribute::GLMode mode) const
    get specified GLModeValue for specified GLMode.
    -[more]inline TextureModeList& getTextureModeList() +[more]inline TextureModeList& getTextureModeList()
    return the list of all Texture related GLModes contained in this StateSet
    -[more]inline const TextureModeList& getTextureModeList() const +[more]inline const TextureModeList& getTextureModeList() const
    return the const list of all Texture related GLModes contained in this const StateSet
    -[more]void setTextureAttribute(unsigned int unit, StateAttribute* attribute, const StateAttribute::OverrideValue value=StateAttribute::OFF) +[more]void setTextureAttribute(unsigned int unit, StateAttribute* attribute, StateAttribute::OverrideValue value=StateAttribute::OFF)
    set this StateSet to contain specified attribute and override flag
    -[more]void setTextureAttributeAndModes(unsigned int unit, StateAttribute* attribute, const StateAttribute::GLModeValue value=StateAttribute::ON) +[more]void setTextureAttributeAndModes(unsigned int unit, StateAttribute* attribute, StateAttribute::GLModeValue value=StateAttribute::ON)
    set this StateSet to contain specified attribute and set the associated GLMode's to specified value
    -[more]void setTextureAttributeToInherit(unsigned int unit, const StateAttribute::Type type) +[more]void setTextureAttributeToInherit(unsigned int unit, StateAttribute::Type type)
    set this StateSet to inherit specified attribute type from parents.
    -[more]StateAttribute* getTextureAttribute(unsigned int unit, const StateAttribute::Type type) +[more]StateAttribute* getTextureAttribute(unsigned int unit, StateAttribute::Type type)
    get specified Texture related StateAttribute for specified type.
    -[more]const StateAttribute* getTextureAttribute(unsigned int unit, const StateAttribute::Type type) const +[more]const StateAttribute* getTextureAttribute(unsigned int unit, StateAttribute::Type type) const
    get specified Texture related const StateAttribute for specified type.
    -[more]const RefAttributePair* getTextureAttributePair(unsigned int unit, const StateAttribute::Type type) const +[more]const RefAttributePair* getTextureAttributePair(unsigned int unit, StateAttribute::Type type) const
    get specified Texture related RefAttributePair for specified type.
    -[more]inline TextureAttributeList& getTextureAttributeList() +[more]inline TextureAttributeList& getTextureAttributeList()
    return the list of all Texture related StateAttributes contained in this StateSet
    -[more]inline const TextureAttributeList& getTextureAttributeList() const +[more]inline const TextureAttributeList& getTextureAttributeList() const
    return the const list of all Texture related StateAttributes contained in this const StateSet
    -[more]void setAssociatedModes(const StateAttribute* attribute, const StateAttribute::GLModeValue value) +[more]void setAssociatedModes(const StateAttribute* attribute, StateAttribute::GLModeValue value)
    -[more]void setAssociatedTextureModes(unsigned int unit, const StateAttribute* attribute, const StateAttribute::GLModeValue value) +[more]void setAssociatedTextureModes(unsigned int unit, const StateAttribute* attribute, StateAttribute::GLModeValue value)
    -[more]void setRenderingHint(const int hint) +[more]void setRenderingHint(int hint)
    set the RenderingHint of the StateSet.
    -[more]inline const int getRenderingHint() const +[more]inline int getRenderingHint() const
    get the RenderingHint of the StateSet
    -[more]void setRenderBinDetails(const int binNum, const std::string& binName, const RenderBinMode mode=USE_RENDERBIN_DETAILS) +[more]void setRenderBinDetails(int binNum, const std::string& binName, RenderBinMode mode=USE_RENDERBIN_DETAILS)
    set the render bin details
    -[more]void setRendingBinToInherit() +[more]void setRenderBinToInherit()
    set the render bin details to inherit
    -[more]inline const RenderBinMode getRenderBinMode() const +[more]inline RenderBinMode getRenderBinMode() const
    get the render bin mode
    -[more]inline const bool useRenderBinDetails() const +[more]inline bool useRenderBinDetails() const
    get whether the render bin details are set and should be used
    -[more]inline const int getBinNumber() const +[more]inline int getBinNumber() const
    get the render bin number
    -[more]inline const std::string& getBinName() const +[more]inline const std::string& getBinName() const
    get the render bin name
    -[more]void compile(State& state) const +[more]void compile(State& state) const
    call compile on all StateAttributes contained within this StateSet

    Public Members

    -[more]typedef std::map<StateAttribute::GLMode,StateAttribute::GLModeValue> ModeList +[more]typedef std::map<StateAttribute::GLMode,StateAttribute::GLModeValue> ModeList
    a container to map GLModes to their respective GLModeValues
    -[more]typedef std::pair<ref_ptr<StateAttribute>,StateAttribute::OverrideValue> RefAttributePair +[more]typedef std::pair<ref_ptr<StateAttribute>,StateAttribute::OverrideValue> RefAttributePair
    simple pairing between an attribute and its override flag
    -[more]typedef std::map<StateAttribute::Type,RefAttributePair> AttributeList +[more]typedef std::map<StateAttribute::Type,RefAttributePair> AttributeList
    a container to map StateAttribyte::Types to their respective RefAttributePair
    -[more]enum RenderingHint +[more]typedef std::vector<ModeList> TextureModeList
    -[more]enum RenderBinMode +[more]typedef std::vector<AttributeList> TextureAttributeList +
    +[more]enum RenderingHint +
    +[more]enum RenderBinMode

    Protected Fields

    -[more]ModeList _modeList +[more]ModeList _modeList
    -[more]AttributeList _attributeList +[more]AttributeList _attributeList
    -[more]TextureModeList _textureModeList +[more]TextureModeList _textureModeList
    -[more]TextureAttributeList _textureAttributeList +[more]TextureAttributeList _textureAttributeList
    -[more]int _renderingHint +[more]int _renderingHint
    -[more]RenderBinMode _binMode +[more]RenderBinMode _binMode
    -[more]int _binNum +[more]int _binNum
    -[more]std::string _binName +[more]std::string _binName

    Protected Methods

    -[more]virtual ~StateSet() +[more]virtual ~StateSet()
    -[more]StateSet& operator = (const StateSet&) +[more]StateSet& operator = (const StateSet&)
    -[more]inline ModeList& getOrCreateTextureModeList(unsigned int unit) +[more]inline ModeList& getOrCreateTextureModeList(unsigned int unit)
    -[more]inline AttributeList& getOrCreateTextureAttributeList(unsigned int unit) +[more]inline AttributeList& getOrCreateTextureAttributeList(unsigned int unit)
    -[more]int compareModes(const ModeList& lhs, const ModeList& rhs) +[more]int compareModes(const ModeList& lhs, const ModeList& rhs)
    -[more]int compareAttributePtrs(const AttributeList& lhs, const AttributeList& rhs) +[more]int compareAttributePtrs(const AttributeList& lhs, const AttributeList& rhs)
    -[more]int compareAttributeContents(const AttributeList& lhs, const AttributeList& rhs) +[more]int compareAttributeContents(const AttributeList& lhs, const AttributeList& rhs)
    -[more]void setMode(ModeList& modeList, const StateAttribute::GLMode mode, const StateAttribute::GLModeValue value) +[more]void setMode(ModeList& modeList, StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
    -[more]void setModeToInherit(ModeList& modeList, const StateAttribute::GLMode mode) +[more]void setModeToInherit(ModeList& modeList, StateAttribute::GLMode mode)
    -[more]const StateAttribute::GLModeValue getMode(const ModeList& modeList, const StateAttribute::GLMode mode) const +[more]StateAttribute::GLModeValue getMode(const ModeList& modeList, StateAttribute::GLMode mode) const
    -[more]void setAssociatedModes(ModeList& modeList, const StateAttribute* attribute, const StateAttribute::GLModeValue value) +[more]void setAssociatedModes(ModeList& modeList, const StateAttribute* attribute, StateAttribute::GLModeValue value)
    -[more]void setAttribute(AttributeList& attributeList, StateAttribute* attribute, const StateAttribute::OverrideValue value=StateAttribute::OFF) +[more]void setAttribute(AttributeList& attributeList, StateAttribute* attribute, const StateAttribute::OverrideValue value=StateAttribute::OFF)
    -[more]StateAttribute* getAttribute(AttributeList& attributeList, const StateAttribute::Type type) +[more]StateAttribute* getAttribute(AttributeList& attributeList, const StateAttribute::Type type)
    -[more]const StateAttribute* getAttribute(const AttributeList& attributeList, const StateAttribute::Type type) const +[more]const StateAttribute* getAttribute(const AttributeList& attributeList, const StateAttribute::Type type) const
    -[more]const RefAttributePair* getAttributePair(const AttributeList& attributeList, const StateAttribute::Type type) const +[more]const RefAttributePair* getAttributePair(const AttributeList& attributeList, const StateAttribute::Type type) const

    @@ -238,9 +242,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -256,7 +260,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -272,12 +276,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -294,254 +306,262 @@ in the graphics pipeline.
    - +
    o StateSet()

    - -

    o StateSet(const StateSet&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o StateSet(const StateSet&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

    - +

    ovirtual Object* cloneType() const

    - +

    ovirtual Object* clone(const CopyOp& copyop) const

    - +

    ovirtual bool isSameKindAs(const Object* obj) const

    - +

    ovirtual const char* libraryName() const

    - +

    ovirtual const char* className() const

    - -

    oint compare(const StateSet& rhs, bool compareAttributeContents=false) const + +
    oint compare(const StateSet& rhs, bool compareAttributeContents=false) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - +

    obool operator < (const StateSet& rhs) const

    - +

    obool operator == (const StateSet& rhs) const

    - +

    obool operator != (const StateSet& rhs) const

    - +

    ovoid setGlobalDefaults()
    set all the modes to on or off so that it defines a complete state, typically used for a default global state

    - +

    ovoid setAllToInherit()
    set all the modes to inherit, typically used to signify nodes which inherit all of their modes for the global state

    - +

    ovoid merge(const StateSet& rhs)
    merge this stateset with stateset rhs, this overrides the rhs if OVERRIDE is specified, otherwise rhs takes precedence

    - +

    otypedef std::map<StateAttribute::GLMode,StateAttribute::GLModeValue> ModeList
    a container to map GLModes to their respective GLModeValues

    - -

    ovoid setMode(const StateAttribute::GLMode mode, const StateAttribute::GLModeValue value) + +
    ovoid setMode(StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
    set this StateSet to contain specified GLMode and value

    - -

    ovoid setModeToInherit(const StateAttribute::GLMode mode) + +
    ovoid setModeToInherit(StateAttribute::GLMode mode)
    set this StateSet to inherit specified GLMode type from parents. has the effect of deleting any GlMode of specified type from StateSet.

    - -

    oconst StateAttribute::GLModeValue getMode(const StateAttribute::GLMode mode) const + +
    oStateAttribute::GLModeValue getMode(StateAttribute::GLMode mode) const
    get specified GLModeValue for specified GLMode. returns INHERIT if no GLModeValue is contained within StateSet.

    - -

    oinline ModeList& getModeList() + +
    oinline ModeList& getModeList()
    return the list of all GLModes contained in this StateSet

    - -

    oinline const ModeList& getModeList() const + +
    oinline const ModeList& getModeList() const
    return the const list of all GLModes contained in this const StateSet

    - +

    otypedef std::pair<ref_ptr<StateAttribute>,StateAttribute::OverrideValue> RefAttributePair
    simple pairing between an attribute and its override flag

    - -

    otypedef std::map<StateAttribute::Type,RefAttributePair> AttributeList + +
    otypedef std::map<StateAttribute::Type,RefAttributePair> AttributeList
    a container to map StateAttribyte::Types to their respective RefAttributePair

    - -

    ovoid setAttribute(StateAttribute* attribute, const StateAttribute::OverrideValue value=StateAttribute::OFF) + +
    ovoid setAttribute(StateAttribute* attribute, StateAttribute::OverrideValue value=StateAttribute::OFF)
    set this StateSet to contain specified attribute and override flag

    - -

    ovoid setAttributeAndModes(StateAttribute* attribute, const StateAttribute::GLModeValue value=StateAttribute::ON) + +
    ovoid setAttributeAndModes(StateAttribute* attribute, StateAttribute::GLModeValue value=StateAttribute::ON)
    set this StateSet to contain specified attribute and set the associated GLMode's to specified value

    - -

    ovoid setAttributeToInherit(const StateAttribute::Type type) + +
    ovoid setAttributeToInherit(StateAttribute::Type type)
    set this StateSet to inherit specified attribute type from parents. has the effect of deleting any state attributes of specified type from StateSet.

    - -

    oStateAttribute* getAttribute(const StateAttribute::Type type) + +
    oStateAttribute* getAttribute(StateAttribute::Type type)
    get specified StateAttribute for specified type. returns NULL if no type is contained within StateSet.

    - -

    oconst StateAttribute* getAttribute(const StateAttribute::Type type) const + +
    oconst StateAttribute* getAttribute(StateAttribute::Type type) const
    get specified const StateAttribute for specified type. returns NULL if no type is contained within const StateSet.

    - -

    oconst RefAttributePair* getAttributePair(const StateAttribute::Type type) const + +
    oconst RefAttributePair* getAttributePair(StateAttribute::Type type) const
    get specified RefAttributePair for specified type. returns NULL if no type is contained within StateSet.

    - -

    oinline AttributeList& getAttributeList() + +
    oinline AttributeList& getAttributeList()
    return the list of all StateAttributes contained in this StateSet

    - -

    oinline const AttributeList& getAttributeList() const + +
    oinline const AttributeList& getAttributeList() const
    return the const list of all StateAttributes contained in this const StateSet

    + + +

    otypedef std::vector<ModeList> TextureModeList +

    - -

    ovoid setTextureMode(unsigned int unit, const StateAttribute::GLMode mode, const StateAttribute::GLModeValue value) + +
    ovoid setTextureMode(unsigned int unit, StateAttribute::GLMode mode, StateAttribute::GLModeValue value)
    set this StateSet to contain specified GLMode and value

    - -

    ovoid setTextureModeToInherit(unsigned int unit, const StateAttribute::GLMode mode) + +
    ovoid setTextureModeToInherit(unsigned int unit, StateAttribute::GLMode mode)
    set this StateSet to inherit specified GLMode type from parents. has the effect of deleting any GlMode of specified type from StateSet.

    - -

    oconst StateAttribute::GLModeValue getTextureMode(unsigned int unit, const StateAttribute::GLMode mode) const + +
    oStateAttribute::GLModeValue getTextureMode(unsigned int unit, StateAttribute::GLMode mode) const
    get specified GLModeValue for specified GLMode. returns INHERIT if no GLModeValue is contained within StateSet.

    - -

    oinline TextureModeList& getTextureModeList() + +
    oinline TextureModeList& getTextureModeList()
    return the list of all Texture related GLModes contained in this StateSet

    - -

    oinline const TextureModeList& getTextureModeList() const + +
    oinline const TextureModeList& getTextureModeList() const
    return the const list of all Texture related GLModes contained in this const StateSet

    + + +

    otypedef std::vector<AttributeList> TextureAttributeList +

    - -

    ovoid setTextureAttribute(unsigned int unit, StateAttribute* attribute, const StateAttribute::OverrideValue value=StateAttribute::OFF) + +
    ovoid setTextureAttribute(unsigned int unit, StateAttribute* attribute, StateAttribute::OverrideValue value=StateAttribute::OFF)
    set this StateSet to contain specified attribute and override flag

    - -

    ovoid setTextureAttributeAndModes(unsigned int unit, StateAttribute* attribute, const StateAttribute::GLModeValue value=StateAttribute::ON) + +
    ovoid setTextureAttributeAndModes(unsigned int unit, StateAttribute* attribute, StateAttribute::GLModeValue value=StateAttribute::ON)
    set this StateSet to contain specified attribute and set the associated GLMode's to specified value

    - -

    ovoid setTextureAttributeToInherit(unsigned int unit, const StateAttribute::Type type) + +
    ovoid setTextureAttributeToInherit(unsigned int unit, StateAttribute::Type type)
    set this StateSet to inherit specified attribute type from parents. has the effect of deleting any state attributes of specified type from StateSet.

    - -

    oStateAttribute* getTextureAttribute(unsigned int unit, const StateAttribute::Type type) + +
    oStateAttribute* getTextureAttribute(unsigned int unit, StateAttribute::Type type)
    get specified Texture related StateAttribute for specified type. returns NULL if no type is contained within StateSet.

    - -

    oconst StateAttribute* getTextureAttribute(unsigned int unit, const StateAttribute::Type type) const + +
    oconst StateAttribute* getTextureAttribute(unsigned int unit, StateAttribute::Type type) const
    get specified Texture related const StateAttribute for specified type. returns NULL if no type is contained within const StateSet.

    - -

    oconst RefAttributePair* getTextureAttributePair(unsigned int unit, const StateAttribute::Type type) const + +
    oconst RefAttributePair* getTextureAttributePair(unsigned int unit, StateAttribute::Type type) const
    get specified Texture related RefAttributePair for specified type. returns NULL if no type is contained within StateSet.

    - -

    oinline TextureAttributeList& getTextureAttributeList() + +
    oinline TextureAttributeList& getTextureAttributeList()
    return the list of all Texture related StateAttributes contained in this StateSet

    - -

    oinline const TextureAttributeList& getTextureAttributeList() const + +
    oinline const TextureAttributeList& getTextureAttributeList() const
    return the const list of all Texture related StateAttributes contained in this const StateSet

    - -

    ovoid setAssociatedModes(const StateAttribute* attribute, const StateAttribute::GLModeValue value) + +
    ovoid setAssociatedModes(const StateAttribute* attribute, StateAttribute::GLModeValue value)

    - -

    ovoid setAssociatedTextureModes(unsigned int unit, const StateAttribute* attribute, const StateAttribute::GLModeValue value) + +
    ovoid setAssociatedTextureModes(unsigned int unit, const StateAttribute* attribute, StateAttribute::GLModeValue value)

    - +

    oenum RenderingHint

    - +
    o DEFAULT_BIN

    - +

    o OPAQUE_BIN

    - +

    o TRANSPARENT_BIN

    - -
    ovoid setRenderingHint(const int hint) + +
    ovoid setRenderingHint(int hint)
    set the RenderingHint of the StateSet. RenderingHint is used by osgUtil::Renderer to determine which draw bin to drop associated osg::Drawables in. For opaque @@ -549,157 +569,157 @@ objects OPAQUE_BIN would typical used, which TRANSPARENT_BIN should be used for objects which need to be depth sorted.

    - -

    oinline const int getRenderingHint() const + +
    oinline int getRenderingHint() const
    get the RenderingHint of the StateSet

    - +

    oenum RenderBinMode

    - +
    o INHERIT_RENDERBIN_DETAILS

    - +

    o USE_RENDERBIN_DETAILS

    - +

    o OVERRIDE_RENDERBIN_DETAILS

    - +

    o ENCLOSE_RENDERBIN_DETAILS

    - -
    ovoid setRenderBinDetails(const int binNum, const std::string& binName, const RenderBinMode mode=USE_RENDERBIN_DETAILS) + +
    ovoid setRenderBinDetails(int binNum, const std::string& binName, RenderBinMode mode=USE_RENDERBIN_DETAILS)
    set the render bin details

    - - -

    ovoid setRendingBinToInherit() + + +
    ovoid setRenderBinToInherit()
    set the render bin details to inherit

    - -

    oinline const RenderBinMode getRenderBinMode() const + +
    oinline RenderBinMode getRenderBinMode() const
    get the render bin mode

    - -

    oinline const bool useRenderBinDetails() const + +
    oinline bool useRenderBinDetails() const
    get whether the render bin details are set and should be used

    - -

    oinline const int getBinNumber() const + +
    oinline int getBinNumber() const
    get the render bin number

    - +

    oinline const std::string& getBinName() const
    get the render bin name

    - +

    ovoid compile(State& state) const
    call compile on all StateAttributes contained within this StateSet

    - +

    ovirtual ~StateSet()

    - +

    oStateSet& operator = (const StateSet&)

    - -

    oModeList _modeList + +
    oModeList _modeList

    - -

    oAttributeList _attributeList + +
    oAttributeList _attributeList

    - -

    oTextureModeList _textureModeList + +
    oTextureModeList _textureModeList

    - -

    oTextureAttributeList _textureAttributeList + +
    oTextureAttributeList _textureAttributeList

    - -

    oinline ModeList& getOrCreateTextureModeList(unsigned int unit) + +
    oinline ModeList& getOrCreateTextureModeList(unsigned int unit)

    - -

    oinline AttributeList& getOrCreateTextureAttributeList(unsigned int unit) + +
    oinline AttributeList& getOrCreateTextureAttributeList(unsigned int unit)

    - -

    oint compareModes(const ModeList& lhs, const ModeList& rhs) + +
    oint compareModes(const ModeList& lhs, const ModeList& rhs)

    - -

    oint compareAttributePtrs(const AttributeList& lhs, const AttributeList& rhs) + +
    oint compareAttributePtrs(const AttributeList& lhs, const AttributeList& rhs)

    - -

    oint compareAttributeContents(const AttributeList& lhs, const AttributeList& rhs) + +
    oint compareAttributeContents(const AttributeList& lhs, const AttributeList& rhs)

    - -

    ovoid setMode(ModeList& modeList, const StateAttribute::GLMode mode, const StateAttribute::GLModeValue value) + +
    ovoid setMode(ModeList& modeList, StateAttribute::GLMode mode, StateAttribute::GLModeValue value)

    - -

    ovoid setModeToInherit(ModeList& modeList, const StateAttribute::GLMode mode) + +
    ovoid setModeToInherit(ModeList& modeList, StateAttribute::GLMode mode)

    - -

    oconst StateAttribute::GLModeValue getMode(const ModeList& modeList, const StateAttribute::GLMode mode) const + +
    oStateAttribute::GLModeValue getMode(const ModeList& modeList, StateAttribute::GLMode mode) const

    - -

    ovoid setAssociatedModes(ModeList& modeList, const StateAttribute* attribute, const StateAttribute::GLModeValue value) + +
    ovoid setAssociatedModes(ModeList& modeList, const StateAttribute* attribute, StateAttribute::GLModeValue value)

    - -

    ovoid setAttribute(AttributeList& attributeList, StateAttribute* attribute, const StateAttribute::OverrideValue value=StateAttribute::OFF) + +
    ovoid setAttribute(AttributeList& attributeList, StateAttribute* attribute, const StateAttribute::OverrideValue value=StateAttribute::OFF)

    - -

    oStateAttribute* getAttribute(AttributeList& attributeList, const StateAttribute::Type type) + +
    oStateAttribute* getAttribute(AttributeList& attributeList, const StateAttribute::Type type)

    - -

    oconst StateAttribute* getAttribute(const AttributeList& attributeList, const StateAttribute::Type type) const + +
    oconst StateAttribute* getAttribute(const AttributeList& attributeList, const StateAttribute::Type type) const

    - -

    oconst RefAttributePair* getAttributePair(const AttributeList& attributeList, const StateAttribute::Type type) const + +
    oconst RefAttributePair* getAttributePair(const AttributeList& attributeList, const StateAttribute::Type type) const

    - +

    oint _renderingHint

    - -

    oRenderBinMode _binMode + +
    oRenderBinMode _binMode

    - +

    oint _binNum

    - +

    ostd::string _binName

    diff --git a/doc/doc++/osg/Statistics.html b/doc/doc++/osg/Statistics.html index fb39c5db8..e13bb3f34 100644 --- a/doc/doc++/osg/Statistics.html +++ b/doc/doc++/osg/Statistics.html @@ -23,77 +23,77 @@

    Public Fields

    -[more]int numOpaque +[more]int numDrawables
    -[more]int nummat +[more]int nummat
    -[more]int nbins +[more]int nbins
    -[more]int nlights +[more]int nlights
    -[more]int depth +[more]int depth
    -[more]int _binNo +[more]int _binNo
    -[more]statsType stattype +[more]statsType stattype
    -[more]int nimpostor +[more]int nimpostor
    -[more]unsigned int _vertexCount +[more]unsigned int _vertexCount
    -[more]PrimtiveValueMap _primitiveCount +[more]PrimtiveValueMap _primitiveCount
    -[more]GLenum _currentPrimtiveFunctorMode +[more]GLenum _currentPrimtiveFunctorMode

    Public Methods

    -[more]typedef std::map<GLenum,PrimitivePair> PrimtiveValueMap Statistics() +[more] Statistics()
    -[more] ~Statistics() +[more] ~Statistics()
    -[more]void reset() +[more]void reset()
    -[more]void setType(statsType t) +[more]void setType(statsType t)
    -[more]virtual void setVertexArray(unsigned int count, Vec3*) +[more]virtual void setVertexArray(unsigned int count, const Vec3*)
    -[more]virtual void drawArrays(GLenum mode, GLint, GLsizei count) +[more]virtual void drawArrays(GLenum mode, GLint, GLsizei count)
    -[more]virtual void drawElements(GLenum mode, GLsizei count, GLubyte*) +[more]virtual void drawElements(GLenum mode, GLsizei count, const GLuint*)
    -[more]virtual void drawElements(GLenum mode, GLsizei count, GLushort*) +[more]virtual void begin(GLenum mode)
    -[more]virtual void drawElements(GLenum mode, GLsizei count, GLuint*) +[more]virtual void vertex(const Vec3&)
    -[more]virtual void begin(GLenum mode) +[more]virtual void vertex(float, float, float)
    -[more]virtual void vertex(const Vec3&) +[more]virtual void end()
    -[more]virtual void vertex(float, float, float) +[more]void addDrawable()
    -[more]virtual void end() +[more]void addMatrix()
    -[more]void addOpaque() +[more]void addLight(int np)
    -[more]void addMatrix() +[more]void addImpostor(int np)
    -[more]void addLight(const int np) +[more]inline int getBins()
    -[more]void addImpostor(const int np) +[more]void setDepth(int d)
    -[more]inline const int getBins() +[more]void addBins(int np)
    -[more]void setDepth(const int d) -
    -[more]void addBins(const int np) -
    -[more]void setBinNo(const int n) +[more]void setBinNo(int n)

    Public Members

    -[more]enum statsType +[more]typedef std::pair<unsigned int,unsigned int> PrimitivePair +
    +[more]typedef std::map<GLenum,PrimitivePair> PrimtiveValueMap +
    +[more]enum statsType

    @@ -109,12 +109,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -138,170 +146,170 @@ each quad = 2 triangles (nverts/2) each trifan or tristrip = (length-2) triangles and so on.
    + + +
    otypedef std::pair<unsigned int,unsigned int> PrimitivePair +

    + + +

    otypedef std::map<GLenum,PrimitivePair> PrimtiveValueMap +

    - -

    otypedef std::map<GLenum,PrimitivePair> PrimtiveValueMap Statistics() + +
    o Statistics()

    - +

    o ~Statistics()

    - +

    oenum statsType

    - +
    o STAT_NONE

    - +

    o STAT_FRAMERATE

    - +

    o STAT_GRAPHS

    - +

    o STAT_PRIMS

    - +

    o STAT_PRIMSPERVIEW

    - +

    o STAT_PRIMSPERBIN

    - +

    o STAT_DC

    - +

    o STAT_RESTART

    - +
    ovoid reset()

    - -

    ovoid setType(statsType t) + +
    ovoid setType(statsType t)

    - -

    ovirtual void setVertexArray(unsigned int count, Vec3*) + +
    ovirtual void setVertexArray(unsigned int count, const Vec3*)

    - +

    ovirtual void drawArrays(GLenum mode, GLint, GLsizei count)

    - -

    ovirtual void drawElements(GLenum mode, GLsizei count, GLubyte*) -

    - - -

    ovirtual void drawElements(GLenum mode, GLsizei count, GLushort*) -

    - - -

    ovirtual void drawElements(GLenum mode, GLsizei count, GLuint*) + +
    ovirtual void drawElements(GLenum mode, GLsizei count, const GLuint*)

    - +

    ovirtual void begin(GLenum mode)

    - +

    ovirtual void vertex(const Vec3&)

    - +

    ovirtual void vertex(float, float, float)

    - +

    ovirtual void end()

    - - -

    ovoid addOpaque() + + +
    ovoid addDrawable()

    - +

    ovoid addMatrix()

    - -

    ovoid addLight(const int np) + +
    ovoid addLight(int np)

    - -

    ovoid addImpostor(const int np) + +
    ovoid addImpostor(int np)

    - -

    oinline const int getBins() + +
    oinline int getBins()

    - -

    ovoid setDepth(const int d) + +
    ovoid setDepth(int d)

    - -

    ovoid addBins(const int np) + +
    ovoid addBins(int np)

    - -

    ovoid setBinNo(const int n) + +
    ovoid setBinNo(int n)

    - - -

    oint numOpaque + + +
    oint numDrawables

    - +

    oint nummat

    - +

    oint nbins

    - +

    oint nlights

    - +

    oint depth

    - +

    oint _binNo

    - -

    ostatsType stattype + +
    ostatsType stattype

    - +

    oint nimpostor

    - +

    ounsigned int _vertexCount

    - -

    oPrimtiveValueMap _primitiveCount + +
    oPrimtiveValueMap _primitiveCount

    - +

    oGLenum _currentPrimtiveFunctorMode

    diff --git a/doc/doc++/osg/Stencil.html b/doc/doc++/osg/Stencil.html index 5cde8fc3b..779a11a61 100644 --- a/doc/doc++/osg/Stencil.html +++ b/doc/doc++/osg/Stencil.html @@ -23,72 +23,72 @@

    Public Methods

    -[more] Stencil() +[more] Stencil()
    -[more] Stencil(const Stencil& stencil, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Stencil(const Stencil& stencil, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, Stencil, STENCIL) +[more] META_StateAttribute(osg, Stencil, STENCIL)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const
    -[more]inline void setFunction(const Function func, int ref, uint mask) +[more]inline void setFunction(const Function func, int ref, uint mask)
    -[more]inline const Function getFunction() const +[more]inline const Function getFunction() const
    -[more]inline const int getFunctionRef() const +[more]inline int getFunctionRef() const
    -[more]inline const uint getFunctionMask() const +[more]inline const uint getFunctionMask() const
    -[more]inline void setOperation(const Operation sfail, const Operation zfail, const Operation zpass) +[more]inline void setOperation(const Operation sfail, const Operation zfail, const Operation zpass)
    set the operations to apply when the various stencil and depth tests fail or pass.
    -[more]inline const Operation getStencilFailOperation() const +[more]inline const Operation getStencilFailOperation() const
    get the operation when the stencil test fails
    -[more]inline const Operation getStencilPassAndDepthFailOperation() const +[more]inline const Operation getStencilPassAndDepthFailOperation() const
    get the operation when the stencil test passes but the depth test fails
    -[more]inline const Operation getStencilPassAndDepthPassOperation() const +[more]inline const Operation getStencilPassAndDepthPassOperation() const
    get the operation when both the stencil test and the depth test pass
    -[more]inline void setWriteMask(uint mask) +[more]inline void setWriteMask(uint mask)
    -[more]inline const uint getWriteMask() const +[more]inline const uint getWriteMask() const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

    Public Members

    -[more]enum Function +[more]enum Function
    -[more]enum Operation +[more]enum Operation

    Protected Fields

    -[more]Function _func +[more]Function _func
    -[more]int _funcRef +[more]int _funcRef
    -[more]uint _funcMask +[more]uint _funcMask
    -[more]Operation _sfail +[more]Operation _sfail
    -[more]Operation _zfail +[more]Operation _zfail
    -[more]Operation _zpass +[more]Operation _zpass
    -[more]uint _writeMask +[more]uint _writeMask

    Protected Methods

    -[more]virtual ~Stencil() +[more]virtual ~Stencil()

    @@ -106,7 +106,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    ovirtual bool isTextureAttribute() const
    @@ -139,9 +139,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -157,7 +157,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -175,12 +175,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -192,114 +200,114 @@
    - +
    o Stencil()

    - -

    o Stencil(const Stencil& stencil, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o Stencil(const Stencil& stencil, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, Stencil, STENCIL) + +
    o META_StateAttribute(osg, Stencil, STENCIL)

    - +

    ovirtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - -

    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const + +
    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const

    - +

    oenum Function

    - +
    o NEVER

    - +

    o LESS

    - +

    o EQUAL

    - +

    o LEQUAL

    - +

    o GREATER

    - +

    o NOTEQUAL

    - +

    o GEQUAL

    - +

    o ALWAYS

    - -
    oinline void setFunction(const Function func, int ref, uint mask) + +
    oinline void setFunction(const Function func, int ref, uint mask)

    - -

    oinline const Function getFunction() const + +
    oinline const Function getFunction() const

    - -

    oinline const int getFunctionRef() const + +
    oinline int getFunctionRef() const

    - -

    oinline const uint getFunctionMask() const + +
    oinline const uint getFunctionMask() const

    - +

    oenum Operation

    - +
    o KEEP

    - +

    o ZERO

    - +

    o REPLACE

    - +

    o INCR

    - +

    o DECR

    - +

    o INVERT

    - -
    oinline void setOperation(const Operation sfail, const Operation zfail, const Operation zpass) + +
    oinline void setOperation(const Operation sfail, const Operation zfail, const 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 @@ -309,63 +317,63 @@ and depth pass. Ordering of parameter is the same as if using glStencilOp(,,).

    - -

    oinline const Operation getStencilFailOperation() const + +
    oinline const Operation getStencilFailOperation() const
    get the operation when the stencil test fails

    - -

    oinline const Operation getStencilPassAndDepthFailOperation() const + +
    oinline const Operation getStencilPassAndDepthFailOperation() const
    get the operation when the stencil test passes but the depth test fails

    - -

    oinline const Operation getStencilPassAndDepthPassOperation() const + +
    oinline const Operation getStencilPassAndDepthPassOperation() const
    get the operation when both the stencil test and the depth test pass

    - -

    oinline void setWriteMask(uint mask) + +
    oinline void setWriteMask(uint mask)

    - -

    oinline const uint getWriteMask() const + +
    oinline const uint getWriteMask() const

    - +

    ovirtual void apply(State& state) const

    - +

    ovirtual ~Stencil()

    - -

    oFunction _func + +
    oFunction _func

    - +

    oint _funcRef

    - -

    ouint _funcMask + +
    ouint _funcMask

    - -

    oOperation _sfail + +
    oOperation _sfail

    - -

    oOperation _zfail + +
    oOperation _zfail

    - -

    oOperation _zpass + +
    oOperation _zpass

    - -

    ouint _writeMask + +
    ouint _writeMask

    This class has no child classes.
    diff --git a/doc/doc++/osg/SubloadCallback.2.html b/doc/doc++/osg/SubloadCallback.2.html index b3dab3f26..205a5926e 100644 --- a/doc/doc++/osg/SubloadCallback.2.html +++ b/doc/doc++/osg/SubloadCallback.2.html @@ -22,9 +22,9 @@

    Public Methods

    -[more]virtual void load(const Texture2D& texture, State& state) const = 0 +[more]virtual void load(const Texture2D& texture, State& state) const = 0
    -[more]virtual void subload(const Texture2D& texture, State& state) const = 0 +[more]virtual void subload(const Texture2D& texture, State& state) const = 0

    @@ -40,12 +40,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -56,11 +64,11 @@
    - +
    ovirtual void load(const Texture2D& texture, State& state) const = 0

    - +

    ovirtual void subload(const Texture2D& texture, State& state) const = 0

    diff --git a/doc/doc++/osg/SubloadCallback.3.html b/doc/doc++/osg/SubloadCallback.3.html index 32e0fbf75..228254199 100644 --- a/doc/doc++/osg/SubloadCallback.3.html +++ b/doc/doc++/osg/SubloadCallback.3.html @@ -22,9 +22,9 @@

    Public Methods

    -[more]virtual void load(const Texture3D& texture, State& state) const = 0 +[more]virtual void load(const Texture3D& texture, State& state) const = 0
    -[more]virtual void subload(const Texture3D& texture, State& state) const = 0 +[more]virtual void subload(const Texture3D& texture, State& state) const = 0

    @@ -40,12 +40,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -56,11 +64,11 @@
    - +
    ovirtual void load(const Texture3D& texture, State& state) const = 0

    - +

    ovirtual void subload(const Texture3D& texture, State& state) const = 0

    diff --git a/doc/doc++/osg/SubloadCallback.4.html b/doc/doc++/osg/SubloadCallback.4.html index b417b02b9..a653bfea0 100644 --- a/doc/doc++/osg/SubloadCallback.4.html +++ b/doc/doc++/osg/SubloadCallback.4.html @@ -22,9 +22,9 @@

    Public Methods

    -[more]virtual void load(const TextureCubeMap& texture, State& state) const = 0 +[more]virtual void load(const TextureCubeMap& texture, State& state) const = 0
    -[more]virtual void subload(const TextureCubeMap& texture, State& state) const = 0 +[more]virtual void subload(const TextureCubeMap& texture, State& state) const = 0

    @@ -40,12 +40,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -56,11 +64,11 @@
    - +
    ovirtual void load(const TextureCubeMap& texture, State& state) const = 0

    - +

    ovirtual void subload(const TextureCubeMap& texture, State& state) const = 0

    diff --git a/doc/doc++/osg/SubloadCallback.html b/doc/doc++/osg/SubloadCallback.html index 3421d3b9a..7ed2b585f 100644 --- a/doc/doc++/osg/SubloadCallback.html +++ b/doc/doc++/osg/SubloadCallback.html @@ -22,9 +22,9 @@

    Public Methods

    -[more]virtual void load(const Texture1D& texture, State& state) const = 0 +[more]virtual void load(const Texture1D& texture, State& state) const = 0
    -[more]virtual void subload(const Texture1D& texture, State& state) const = 0 +[more]virtual void subload(const Texture1D& texture, State& state) const = 0

    @@ -40,12 +40,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -56,11 +64,11 @@
    - +
    ovirtual void load(const Texture1D& texture, State& state) const = 0

    - +

    ovirtual void subload(const Texture1D& texture, State& state) const = 0

    diff --git a/doc/doc++/osg/Switch.html b/doc/doc++/osg/Switch.html index d15b5ef3d..17b8084b4 100644 --- a/doc/doc++/osg/Switch.html +++ b/doc/doc++/osg/Switch.html @@ -23,37 +23,59 @@

    Public Methods

    -[more] Switch() +[more] Switch()
    -[more] Switch(const Switch&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Switch(const Switch&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_Node(osg, Switch) +[more] META_Node(osg, Switch)
    -[more]virtual void traverse(NodeVisitor& nv) +[more]virtual void traverse(NodeVisitor& nv)
    -[more]inline void setValue(const int value) +[more]void setNewChildDefaultValue(bool value) +
    +[more]bool getNewChildDefaultValue() const +
    +[more]virtual bool addChild( Node* child ) +
    +[more]virtual bool addChild( Node* child, bool value ) +
    +[more]virtual bool removeChild( Node* child ) +
    +[more]void setValue(unsigned int pos, bool value) +
    +[more]void setValue(const Node* child, bool value) +
    +[more]bool getValue(unsigned int pos) const +
    +[more]bool getValue(const Node* child) const +
    +[more]void setValue(int value)
    Selects the active child Node or enables a special SwitchType mode.
    -[more]inline const int getValue() const -
    Returns the number of the active child Node or the SwitchType +[more]int getValue() const +
    +[more]const ValueList& getValueList() const

    Public Members

    -[more]enum SwitchType -
    Special mode values for the Switch. +[more]enum Values +
    Special values for the Switch. +
    +[more]typedef std::vector<bool> ValueList

    Protected Fields

    -[more]int _value -
    The current Switch value. +[more]bool _newChildDefaultValue +
    +[more]ValueList _values

    Protected Methods

    -[more]virtual ~Switch() +[more]virtual ~Switch()

    @@ -61,33 +83,40 @@

    Public Methods

    -ovirtual bool addChild( Node* child ) +ovirtual Group* asGroup()
    -ovirtual bool removeChild( Node* child ) +ovirtual const Group* asGroup() const
    ovirtual bool replaceChild( Node* origChild, Node* newChild )
    -oinline const unsigned int getNumChildren() const +oinline unsigned int getNumChildren() const
    -oinline Node* getChild( const unsigned int i ) +oinline Node* getChild( unsigned int i )
    -oinline const Node* getChild( const unsigned int i ) const +oinline const Node* getChild( unsigned int i ) const
    oinline bool containsNode( const Node* node ) const
    oinline ChildList::iterator findNode( const Node* node )
    oinline ChildList::const_iterator findNode( const Node* node ) const +
    +oinline unsigned int findChildNo( const Node* node ) const +

    + +

    +

    Public Members

    +otypedef std::vector<ref_ptr<Node> > ChildList

    Protected Fields

    -oChildList _children +oChildList _children

    Protected Methods

    -ovirtual const bool computeBound() const +ovirtual bool computeBound() const

    @@ -101,66 +130,116 @@ differently at different times, for instance a switch could be used to represent the different states of a traffic light.
    - - -
    oenum SwitchType + + +
    o Switch() +

    + + +

    o Switch(const Switch&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +
    Copy constructor using CopyOp to manage deep vs shallow copy +

    + + +

    o META_Node(osg, Switch) +

    + + +

    ovirtual void traverse(NodeVisitor& nv) +

    + + +

    ovoid setNewChildDefaultValue(bool value) +

    + + +

    obool getNewChildDefaultValue() const +

    + + +

    ovirtual bool addChild( Node* child ) +

    + + +

    ovirtual bool addChild( Node* child, bool value ) +

    + + +

    ovirtual bool removeChild( Node* child ) +

    + + +

    ovoid setValue(unsigned int pos, bool value) +

    + + +

    ovoid setValue(const Node* child, bool value) +

    + + +

    obool getValue(unsigned int pos) const +

    + + +

    obool getValue(const Node* child) const +

    + + +

    oenum Values
    -Special mode values for the Switch. Use these if you want to +Special values for the Switch. Use these if you want to turn on/off all child nodes.

    - +
    o ALL_CHILDREN_ON -
    Turn on all children. +
    All children turned on.

    - +

    o ALL_CHILDREN_OFF -
    Turn off all children. +
    All children off. +

    + + +

    o MULTIPLE_CHILDREN_ON +
    Multiple children turned on

    - - -
    o Switch() -

    - - -

    o Switch(const Switch&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) -
    Copy constructor using CopyOp to manage deep vs shallow copy -

    - - -

    o META_Node(osg, Switch) -

    - - -

    ovirtual void traverse(NodeVisitor& nv) -

    - -

    oinline void setValue(const int value) + +
    ovoid setValue(int value)
    Selects the active child Node or enables a special SwitchType mode.
    Parameters:
    value - the number of the active child -(first child == number 0) or SwitchType. Invalid values +(first child == number 0) or SwitchType. Invalid values will be ignored.

    - -

    oinline const int getValue() const -
    -Returns the number of the active child Node or the SwitchType + +
    oint getValue() const +

    + + +

    otypedef std::vector<bool> ValueList +

    + + +

    oconst ValueList& getValueList() const

    - +

    ovirtual ~Switch()

    - - -

    oint _value -
    The current Switch value. + + +
    obool _newChildDefaultValue +

    + + +

    oValueList _values

    Direct child classes: diff --git a/doc/doc++/osg/TemplateArray.html b/doc/doc++/osg/TemplateArray.html index f0b19c8fa..8a30800ae 100644 --- a/doc/doc++/osg/TemplateArray.html +++ b/doc/doc++/osg/TemplateArray.html @@ -7,7 +7,7 @@ -

    template<typename T, Array::Type ARRAYTYPE, int DataSize, int DataType> class osg::TemplateArray

    +

    template<typename T, Array::Type ARRAYTYPE, int DataSize, int DataType> class osg::TemplateArray

    Inheritance:

    @@ -28,9 +28,9 @@
    [more] TemplateArray(unsigned int no)
    -[more] TemplateArray(unsigned int no, T* ptr) +[more] TemplateArray(unsigned int no, T* ptr)
    -[more]template<class InputIterator> TemplateArray(InputIterator first, InputIterator last) +[more]template<class InputIterator> TemplateArray(InputIterator first, InputIterator last)
    [more]virtual Object* cloneType() const
    @@ -38,14 +38,20 @@
    [more]virtual void accept(ArrayVisitor& av)
    -[more]virtual const GLvoid* getDataPointer() const +[more]virtual void accept(ConstArrayVisitor& av) const
    -[more]virtual unsigned int getNumElements() const +[more]virtual void accept(unsigned int index, ValueVisitor& vv) +
    +[more]virtual void accept(unsigned int index, ConstValueVisitor& vv) const +
    +[more]virtual const GLvoid* getDataPointer() const +
    +[more]virtual unsigned int getNumElements() const

    Protected Methods

    -[more]virtual ~TemplateArray() +[more]virtual ~TemplateArray()

    @@ -85,9 +91,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -103,7 +109,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -121,12 +127,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -150,11 +164,11 @@

    -

    o TemplateArray(unsigned int no, T* ptr) +
    o TemplateArray(unsigned int no, T* ptr)

    -

    otemplate<class InputIterator> TemplateArray(InputIterator first, InputIterator last) +
    otemplate<class InputIterator> TemplateArray(InputIterator first, InputIterator last)

    @@ -168,16 +182,28 @@

    ovirtual void accept(ArrayVisitor& av)

    - + +

    ovirtual void accept(ConstArrayVisitor& av) const +

    + + +

    ovirtual void accept(unsigned int index, ValueVisitor& vv) +

    + + +

    ovirtual void accept(unsigned int index, ConstValueVisitor& vv) const +

    + +

    ovirtual const GLvoid* getDataPointer() const

    - +

    ovirtual unsigned int getNumElements() const

    - +

    ovirtual ~TemplateArray()

    diff --git a/doc/doc++/osg/Test.html b/doc/doc++/osg/Test.html index 0652a1cf3..d17ee256b 100644 --- a/doc/doc++/osg/Test.html +++ b/doc/doc++/osg/Test.html @@ -23,11 +23,16 @@

    Public Methods

    -[more]typedef TestVisitor Visitor Test( const std::string& sName ) +[more] Test( const std::string& sName )
    -[more]const std::string& name() const +[more]const std::string& name() const
    -[more]virtual bool accept( Visitor& ) = 0 +[more]virtual bool accept( Visitor& ) = 0 +

    + +

    +

    Public Members

    +[more]typedef TestVisitor Visitor

    @@ -43,12 +48,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -63,17 +76,21 @@ for all Test components. It is a referent, and may be pointed to by an osg::ref_ptr.
    + + +
    otypedef TestVisitor Visitor +

    - -

    otypedef TestVisitor Visitor Test( const std::string& sName ) + +
    o Test( const std::string& sName )

    - +

    oconst std::string& name() const

    - -

    ovirtual bool accept( Visitor& ) = 0 + +
    ovirtual bool accept( Visitor& ) = 0

    Direct child classes: diff --git a/doc/doc++/osg/TestCase.html b/doc/doc++/osg/TestCase.html index 2d94ca176..97119c424 100644 --- a/doc/doc++/osg/TestCase.html +++ b/doc/doc++/osg/TestCase.html @@ -23,11 +23,16 @@

    Public Methods

    -[more]typedef TestContext Context TestCase( const std::string& sName ) +[more] TestCase( const std::string& sName )
    -[more]virtual bool accept( Visitor& v ) +[more]virtual bool accept( Visitor& v )
    -[more]virtual void run( const Context& ) = 0 +[more]virtual void run( const Context& ) = 0 +

    + +

    +

    Public Members

    +[more]typedef TestContext Context

    @@ -38,6 +43,11 @@ oconst std::string& name() const

    +

    +

    Public Members

    +otypedef TestVisitor Visitor +

    +

    Inherited from Referenced:

    @@ -51,12 +61,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -69,17 +87,21 @@ TestCase, is the supplies the interface for a Composite pattern's \em leaf class, though it is not a leaf in itself
    + + +
    otypedef TestContext Context +

    - -

    otypedef TestContext Context TestCase( const std::string& sName ) + +
    o TestCase( const std::string& sName )

    - -

    ovirtual bool accept( Visitor& v ) + +
    ovirtual bool accept( Visitor& v )

    - -

    ovirtual void run( const Context& ) = 0 + +
    ovirtual void run( const Context& ) = 0

    Direct child classes: diff --git a/doc/doc++/osg/TestCase_.html b/doc/doc++/osg/TestCase_.html index bfd0b8f76..1e5dc13d9 100644 --- a/doc/doc++/osg/TestCase_.html +++ b/doc/doc++/osg/TestCase_.html @@ -23,9 +23,9 @@

    Public Methods

    -[more] TestCase_( const std::string& sName, TestMethodPtr pTestMethod ) +[more] TestCase_( const std::string& sName, TestMethodPtr pTestMethod )
    -[more]virtual void run( const Context& ctx ) +[more]virtual void run( const Context& ctx )

    @@ -33,7 +33,12 @@

    Public Methods

    -ovirtual bool accept( Visitor& v ) +ovirtual bool accept( Visitor& v ) +

    + +

    +

    Public Members

    +otypedef TestContext Context

    @@ -44,6 +49,11 @@ oconst std::string& name() const

    +

    +

    Public Members

    +otypedef TestVisitor Visitor +

    +

    Inherited from Referenced:

    @@ -57,12 +67,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -80,12 +98,12 @@ of information from one test case to the next.
    - +
    o TestCase_( const std::string& sName, TestMethodPtr pTestMethod )

    - -

    ovirtual void run( const Context& ctx ) + +
    ovirtual void run( const Context& ctx )

    This class has no child classes.
    diff --git a/doc/doc++/osg/TestContext.html b/doc/doc++/osg/TestContext.html index 8aaf85e76..4c64fa54f 100644 --- a/doc/doc++/osg/TestContext.html +++ b/doc/doc++/osg/TestContext.html @@ -13,22 +13,22 @@

    Public Methods

    -[more] TestContext() +[more] TestContext()
    -[more]bool shouldStop() +[more]bool shouldStop()
    -[more]bool isVerbose() +[more]bool isVerbose()
    -[more]void setTraceLevel(TraceLevel tl) +[more]void setTraceLevel(TraceLevel tl)
    -[more]TraceLevel getTraceLevel() const +[more]TraceLevel getTraceLevel() const
    -[more]std::ostream& tout(TraceLevel tl=Full) const +[more]std::ostream& tout(TraceLevel tl=Full) const

    Public Members

    -[more]enum TraceLevel +[more]enum TraceLevel

    @@ -45,48 +45,48 @@ as an output stream for verbose output during the running of tests.
    - +
    o TestContext()

    - +

    obool shouldStop()

    - +

    obool isVerbose()

    - +

    oenum TraceLevel

    - +
    o Off

    - +

    o Results
    < All tracing turned off

    - +

    o Full
    < Output results only

    - -
    ovoid setTraceLevel(TraceLevel tl) + +
    ovoid setTraceLevel(TraceLevel tl)

    - -

    oTraceLevel getTraceLevel() const + +
    oTraceLevel getTraceLevel() const

    - -

    ostd::ostream& tout(TraceLevel tl=Full) const + +
    ostd::ostream& tout(TraceLevel tl=Full) const

    This class has no child classes.
    diff --git a/doc/doc++/osg/TestErrorX.html b/doc/doc++/osg/TestErrorX.html index 60362fb1a..21a3641be 100644 --- a/doc/doc++/osg/TestErrorX.html +++ b/doc/doc++/osg/TestErrorX.html @@ -23,7 +23,7 @@

    Public Methods

    -[more] TestErrorX(const std::string& s) +[more] TestErrorX(const std::string& s)

    @@ -47,8 +47,8 @@ run which prevents the component from being tested
    - -
    o TestErrorX(const std::string& s) + +
    o TestErrorX(const std::string& s)

    This class has no child classes.
    diff --git a/doc/doc++/osg/TestFailureX.html b/doc/doc++/osg/TestFailureX.html index 7f6fde8a3..39af99f93 100644 --- a/doc/doc++/osg/TestFailureX.html +++ b/doc/doc++/osg/TestFailureX.html @@ -23,7 +23,7 @@

    Public Methods

    -[more] TestFailureX(const std::string& s) +[more] TestFailureX(const std::string& s)

    @@ -44,8 +44,8 @@ A TestFailureX indicates a failure in the tested component
    - -
    o TestFailureX(const std::string& s) + +
    o TestFailureX(const std::string& s)

    This class has no child classes.
    diff --git a/doc/doc++/osg/TestGraph.html b/doc/doc++/osg/TestGraph.html index 97d0795d4..89538a2ae 100644 --- a/doc/doc++/osg/TestGraph.html +++ b/doc/doc++/osg/TestGraph.html @@ -13,12 +13,12 @@

    Public Methods

    -[more]static TestGraph& instance() +[more]static TestGraph& instance()
    -[more]TestSuite* root() +[more]TestSuite* root()
    -[more]TestSuite* suite(const std::string& path, TestSuite* tsuite = 0, bool createIfNecessary = false) +[more]TestSuite* suite(const std::string& path, TestSuite* tsuite = 0, bool createIfNecessary = false)
    A utility function for accessing an arbitrary quite by pathname, relative to the suite 'tsuite' (defaults to root if null), and with the option of creating the \em TestSuite designated by \em path, if it does not already exist.

    @@ -33,17 +33,17 @@ primarily, it provides access to the root suite
    - +
    ostatic TestGraph& instance()

    - +

    oTestSuite* root()
    Returns:
    a pointer to the root TestSuite.

    - +

    oTestSuite* suite(const std::string& path, TestSuite* tsuite = 0, bool createIfNecessary = false)
    A utility function for accessing an arbitrary quite by pathname, relative to @@ -62,10 +62,10 @@ already exists.

    -

    Parameters:
    path - The name of the TestSuite to return. -
    tsuite - The suite to 'start from'. Path is relative to this -suite (defaults to root suite). -
    createIfNecessary - Optionally create the TestSuite(s) denoted by path if +
    Parameters:
    path - The name of the TestSuite to return. +
    tsuite - The suite to 'start from'. Path is relative to this +suite (defaults to root suite). +
    createIfNecessary - Optionally create the TestSuite(s) denoted by path if they do not exist.

    This class has no child classes.
    diff --git a/doc/doc++/osg/TestQualifier.html b/doc/doc++/osg/TestQualifier.html index 326a31f43..4996de99c 100644 --- a/doc/doc++/osg/TestQualifier.html +++ b/doc/doc++/osg/TestQualifier.html @@ -23,11 +23,11 @@

    Public Methods

    -[more]virtual bool visitEnter( TestSuite* pSuite ) +[more]virtual bool visitEnter( TestSuite* pSuite )
    -[more]virtual bool visitLeave( TestSuite* pSuite ) +[more]virtual bool visitLeave( TestSuite* pSuite )
    -[more]const std::string& currentPath() const +[more]const std::string& currentPath() const

    @@ -50,20 +50,20 @@ current qualified TestSuite path
    - +
    o SEPCHAR

    - +
    ovirtual bool visitEnter( TestSuite* pSuite )

    - +

    ovirtual bool visitLeave( TestSuite* pSuite )

    - +

    oconst std::string& currentPath() const

    diff --git a/doc/doc++/osg/TestRecord.html b/doc/doc++/osg/TestRecord.html index 4cc18a42d..e0f561ef5 100644 --- a/doc/doc++/osg/TestRecord.html +++ b/doc/doc++/osg/TestRecord.html @@ -13,17 +13,17 @@

    Public Methods

    -[more]void start() +[more]void start()
    -[more]void stop() +[more]void stop()
    -[more]void log(const TestFailureX& e) +[more]void log(const TestFailureX& e)
    -[more]void log(const TestErrorX& e) +[more]void log(const TestErrorX& e)
    -[more]void log(const std::exception& e) +[more]void log(const std::exception& e)
    -[more]void log(const std::string& s) +[more]void log(const std::string& s)

    @@ -40,40 +40,40 @@ stored in the TestRecord.
    - +
    ovoid start()

    - +

    ovoid stop()

    - +

    ovoid log(const TestFailureX& e)

    - +

    ovoid log(const TestErrorX& e)

    - +

    ovoid log(const std::exception& e)

    - -

    ovoid log(const std::string& s) + +
    ovoid log(const std::string& s)

    - +
    o Success

    - +

    o Failure

    - +

    o Error

    diff --git a/doc/doc++/osg/TestReport.html b/doc/doc++/osg/TestReport.html index fc72920c5..f180835b0 100644 --- a/doc/doc++/osg/TestReport.html +++ b/doc/doc++/osg/TestReport.html @@ -13,7 +13,7 @@

    Public Methods

    -[more]TestRecord& createRecord(const std::string& s) +[more]TestRecord& createRecord(const std::string& s)

    @@ -30,8 +30,8 @@ e.g. text, XML, CSV
    - -
    oTestRecord& createRecord(const std::string& s) + +
    oTestRecord& createRecord(const std::string& s)

    This class has no child classes.
    diff --git a/doc/doc++/osg/TestRunner.html b/doc/doc++/osg/TestRunner.html index acda9bb60..9cc60e64a 100644 --- a/doc/doc++/osg/TestRunner.html +++ b/doc/doc++/osg/TestRunner.html @@ -23,21 +23,21 @@

    Public Methods

    -[more] TestRunner( TestContext& ctx ) +[more] TestRunner( TestContext& ctx )
    -[more]void specify( const std::string& sQualifiedName ) +[more]void specify( const std::string& sQualifiedName )
    Tests may be specified by partial names.
    -[more]bool visitEnter( TestSuite* pSuite ) +[more]bool visitEnter( TestSuite* pSuite )
    -[more]bool visit( TestCase* pTest ) +[more]bool visit( TestCase* pTest )
    -[more]bool visitLeave( TestSuite* pSuite ) +[more]bool visitLeave( TestSuite* pSuite )

    Protected Methods

    -[more]void perform( TestCase* pTest ) +[more]void perform( TestCase* pTest )

    @@ -64,11 +64,11 @@ test graph.
    - +
    o TestRunner( TestContext& ctx )

    - +

    ovoid specify( const std::string& sQualifiedName )
    Tests may be specified by partial names. E.g. specifiying "root" @@ -78,19 +78,19 @@ Specifying "root.osg.de" will run all tests (and suites) below \em root.osg with names beginning with the \em de.

    - +

    obool visitEnter( TestSuite* pSuite )

    - +

    obool visit( TestCase* pTest )

    - +

    obool visitLeave( TestSuite* pSuite )

    - +

    ovoid perform( TestCase* pTest )

    diff --git a/doc/doc++/osg/TestSuite.html b/doc/doc++/osg/TestSuite.html index 4555e5e5c..c30a1c684 100644 --- a/doc/doc++/osg/TestSuite.html +++ b/doc/doc++/osg/TestSuite.html @@ -23,15 +23,15 @@

    Public Methods

    -[more] TestSuite( const std::string& name ) +[more] TestSuite( const std::string& name )
    -[more]void add( Test* pTest ) +[more]void add( Test* pTest )
    Adds a Test to the suite.
    -[more]Test* findChild(const std::string& name) +[more]Test* findChild(const std::string& name)
    -[more]virtual bool accept( Test::Visitor& v ) +[more]virtual bool accept( Test::Visitor& v )

    @@ -42,6 +42,11 @@ oconst std::string& name() const

    +

    +

    Public Members

    +otypedef TestVisitor Visitor +

    +

    Inherited from Referenced:

    @@ -55,12 +60,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -74,22 +87,22 @@ and allows aggregation of Tests into hierarchies
    - -
    o TestSuite( const std::string& name ) + +
    o TestSuite( const std::string& name )

    - +

    ovoid add( Test* pTest )
    Adds a Test to the suite.

    - -

    oTest* findChild(const std::string& name) + +
    oTest* findChild(const std::string& name)
    Returns:
    s The immediate child denoted by name, or 0 if not found.

    - +

    ovirtual bool accept( Test::Visitor& v )

    diff --git a/doc/doc++/osg/TestSuiteAutoRegistrationAgent.html b/doc/doc++/osg/TestSuiteAutoRegistrationAgent.html index 5d88aeaf1..8a93483e7 100644 --- a/doc/doc++/osg/TestSuiteAutoRegistrationAgent.html +++ b/doc/doc++/osg/TestSuiteAutoRegistrationAgent.html @@ -12,7 +12,7 @@

    -[more] TestSuiteAutoRegistrationAgent(TestSuite* tsuite, const char* path = 0) +[more] TestSuiteAutoRegistrationAgent(TestSuite* tsuite, const char* path = 0)

    @@ -27,7 +27,7 @@ direct use, it should be used via the following macros. (It's a secret agent :-)
    - +
    o TestSuiteAutoRegistrationAgent(TestSuite* tsuite, const char* path = 0)

    See Also:
    OSGUTX_AUTOREGISTER_TESTSUITE, OSGUTX_AUTOREGISTER_TESTSUITE_AT

    Alphabetic index HTML hierarchy of classes or Java

    diff --git a/doc/doc++/osg/TestVisitor.html b/doc/doc++/osg/TestVisitor.html index 1b9b55df0..902d0170d 100644 --- a/doc/doc++/osg/TestVisitor.html +++ b/doc/doc++/osg/TestVisitor.html @@ -23,20 +23,20 @@

    Public Methods

    -[more]virtual bool visitEnter( TestSuite* ) +[more]virtual bool visitEnter( TestSuite* )
    -[more]virtual bool visit( TestCase* ) = 0 +[more]virtual bool visit( TestCase* ) = 0
    -[more]virtual bool visitLeave( TestSuite* ) +[more]virtual bool visitLeave( TestSuite* )

    Protected Methods

    -[more] TestVisitor() +[more] TestVisitor()
    -[more] TestVisitor( const TestVisitor& ) +[more] TestVisitor( const TestVisitor& )
    -[more]virtual ~TestVisitor() +[more]virtual ~TestVisitor()

    @@ -50,27 +50,27 @@ the traversal to be short-cicuited at any point during the visitation. - +
    ovirtual bool visitEnter( TestSuite* )

    - +

    ovirtual bool visit( TestCase* ) = 0

    - +

    ovirtual bool visitLeave( TestSuite* )

    - +

    o TestVisitor()

    - -

    o TestVisitor( const TestVisitor& ) + +
    o TestVisitor( const TestVisitor& )

    - +

    ovirtual ~TestVisitor()

    diff --git a/doc/doc++/osg/TestX.html b/doc/doc++/osg/TestX.html index d2b60e955..9124ac483 100644 --- a/doc/doc++/osg/TestX.html +++ b/doc/doc++/osg/TestX.html @@ -23,11 +23,11 @@

    Public Methods

    -[more] TestX(const std::string& s) +[more] TestX(const std::string& s)
    -[more]virtual ~TestX() +[more]virtual ~TestX()
    -[more]const std::string& what() const +[more]const std::string& what() const

    @@ -41,15 +41,15 @@ indicate problems during the run of a TestCase
    - -
    o TestX(const std::string& s) + +
    o TestX(const std::string& s)

    - +

    ovirtual ~TestX()

    - +

    oconst std::string& what() const

    diff --git a/doc/doc++/osg/TexEnv.html b/doc/doc++/osg/TexEnv.html index 3bc2201a9..e53e4707c 100644 --- a/doc/doc++/osg/TexEnv.html +++ b/doc/doc++/osg/TexEnv.html @@ -23,46 +23,46 @@

    Public Methods

    -[more] TexEnv() +[more] TexEnv()
    -[more] TexEnv(const TexEnv& texenv, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] TexEnv(const TexEnv& texenv, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, TexEnv, TEXENV) +[more] META_StateAttribute(osg, TexEnv, TEXENV)
    -[more]virtual bool isTextureAttribute() const +[more]virtual bool isTextureAttribute() const
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]void setMode( const Mode mode ) +[more]void setMode( const Mode mode )
    -[more]const Mode getMode() const +[more]const Mode getMode() const
    -[more]void setColor( const Vec4& color ) +[more]void setColor( const Vec4& color )
    -[more]Vec4& getColor() +[more]Vec4& getColor()
    -[more]const Vec4& getColor() const +[more]const Vec4& getColor() const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

    Public Members

    -[more]enum Mode +[more]enum Mode

    Protected Fields

    -[more]Mode _mode +[more]Mode _mode
    -[more]osg::Vec4 _color +[more]osg::Vec4 _color

    Protected Methods

    -[more]virtual ~TexEnv( void ) +[more]virtual ~TexEnv( void )

    @@ -80,7 +80,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    obool operator < (const StateAttribute& rhs) const
    @@ -88,7 +88,7 @@
    obool operator != (const StateAttribute& rhs) const
    -ovirtual void getAssociatedModes(std::vector<GLMode>& ) const +ovirtual void getAssociatedModes(std::vector<GLMode>& ) const
    ovirtual void compile(State&) const

    @@ -113,9 +113,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -131,7 +131,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -149,12 +149,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -166,87 +174,87 @@
    - +
    o TexEnv()

    - -

    o TexEnv(const TexEnv& texenv, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o TexEnv(const TexEnv& texenv, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, TexEnv, TEXENV) + +
    o META_StateAttribute(osg, TexEnv, TEXENV)

    - +

    ovirtual bool isTextureAttribute() const

    - +

    ovirtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - +

    oenum Mode

    - +
    o DECAL

    - +

    o MODULATE

    - +

    o BLEND

    - +

    o REPLACE

    - +

    o ADD

    - -
    ovoid setMode( const Mode mode ) + +
    ovoid setMode( const Mode mode )

    - -

    oconst Mode getMode() const + +
    oconst Mode getMode() const

    - +

    ovoid setColor( const Vec4& color )

    - +

    oVec4& getColor()

    - +

    oconst Vec4& getColor() const

    - +

    ovirtual void apply(State& state) const

    - +

    ovirtual ~TexEnv( void )

    - -

    oMode _mode + +
    oMode _mode

    - +

    oosg::Vec4 _color

    diff --git a/doc/doc++/osg/TexEnvCombine.html b/doc/doc++/osg/TexEnvCombine.html index 3f5c3824e..a76fa1791 100644 --- a/doc/doc++/osg/TexEnvCombine.html +++ b/doc/doc++/osg/TexEnvCombine.html @@ -23,144 +23,144 @@

    Public Methods

    -[more] TexEnvCombine() +[more] TexEnvCombine()
    -[more] TexEnvCombine(const TexEnvCombine& texenv, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] TexEnvCombine(const TexEnvCombine& texenv, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, TexEnvCombine, TEXENV) +[more] META_StateAttribute(osg, TexEnvCombine, TEXENV)
    -[more]virtual bool isTextureAttribute() const +[more]virtual bool isTextureAttribute() const
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]void setCombine_RGB(GLint cm) +[more]void setCombine_RGB(GLint cm)
    -[more]void setCombine_Alpha(GLint cm) +[more]void setCombine_Alpha(GLint cm)
    -[more]GLint getCombine_RGB() const +[more]GLint getCombine_RGB() const
    -[more]GLint getCombine_Alpha() const +[more]GLint getCombine_Alpha() const
    -[more]void setSource0_RGB(GLint sp) +[more]void setSource0_RGB(GLint sp)
    -[more]void setSource1_RGB(GLint sp) +[more]void setSource1_RGB(GLint sp)
    -[more]void setSource2_RGB(GLint sp) +[more]void setSource2_RGB(GLint sp)
    -[more]void setSource0_Alpha(GLint sp) +[more]void setSource0_Alpha(GLint sp)
    -[more]void setSource1_Alpha(GLint sp) +[more]void setSource1_Alpha(GLint sp)
    -[more]void setSource2_Alpha(GLint sp) +[more]void setSource2_Alpha(GLint sp)
    -[more]GLint getSource0_RGB() const +[more]GLint getSource0_RGB() const
    -[more]GLint getSource1_RGB() const +[more]GLint getSource1_RGB() const
    -[more]GLint getSource2_RGB() const +[more]GLint getSource2_RGB() const
    -[more]GLint getSource0_Alpha() const +[more]GLint getSource0_Alpha() const
    -[more]GLint getSource1_Alpha() const +[more]GLint getSource1_Alpha() const
    -[more]GLint getSource2_Alpha() const +[more]GLint getSource2_Alpha() const
    -[more]void setOperand0_RGB(GLint op) +[more]void setOperand0_RGB(GLint op)
    -[more]void setOperand1_RGB(GLint op) +[more]void setOperand1_RGB(GLint op)
    -[more]void setOperand2_RGB(GLint op) +[more]void setOperand2_RGB(GLint op)
    -[more]void setOperand0_Alpha(GLint op) +[more]void setOperand0_Alpha(GLint op)
    -[more]void setOperand1_Alpha(GLint op) +[more]void setOperand1_Alpha(GLint op)
    -[more]void setOperand2_Alpha(GLint op) +[more]void setOperand2_Alpha(GLint op)
    -[more]GLint getOperand0_RGB() const +[more]GLint getOperand0_RGB() const
    -[more]GLint getOperand1_RGB() const +[more]GLint getOperand1_RGB() const
    -[more]GLint getOperand2_RGB() const +[more]GLint getOperand2_RGB() const
    -[more]GLint getOperand0_Alpha() const +[more]GLint getOperand0_Alpha() const
    -[more]GLint getOperand1_Alpha() const +[more]GLint getOperand1_Alpha() const
    -[more]GLint getOperand2_Alpha() const +[more]GLint getOperand2_Alpha() const
    -[more]void setScale_RGB(float scale) +[more]void setScale_RGB(float scale)
    -[more]void setScale_Alpha(float scale) +[more]void setScale_Alpha(float scale)
    -[more]float getScale_RGB() const +[more]float getScale_RGB() const
    -[more]float getScale_Alpha() const +[more]float getScale_Alpha() const
    -[more]void setConstantColor( const Vec4& color ) +[more]void setConstantColor( const Vec4& color )
    -[more]const Vec4& getConstantColor() const +[more]const Vec4& getConstantColor() const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

    Public Members

    -[more]enum CombineParam +[more]enum CombineParam
    -[more]enum SourceParam +[more]enum SourceParam
    -[more]enum OperandParam +[more]enum OperandParam

    Protected Fields

    -[more]bool _needsTexEnvCrossbar +[more]bool _needsTexEnvCrossbar
    -[more]GLint _combine_RGB +[more]GLint _combine_RGB
    -[more]GLint _combine_Alpha +[more]GLint _combine_Alpha
    -[more]GLint _source0_RGB +[more]GLint _source0_RGB
    -[more]GLint _source1_RGB +[more]GLint _source1_RGB
    -[more]GLint _source2_RGB +[more]GLint _source2_RGB
    -[more]GLint _source0_Alpha +[more]GLint _source0_Alpha
    -[more]GLint _source1_Alpha +[more]GLint _source1_Alpha
    -[more]GLint _source2_Alpha +[more]GLint _source2_Alpha
    -[more]GLint _operand0_RGB +[more]GLint _operand0_RGB
    -[more]GLint _operand1_RGB +[more]GLint _operand1_RGB
    -[more]GLint _operand2_RGB +[more]GLint _operand2_RGB
    -[more]GLint _operand0_Alpha +[more]GLint _operand0_Alpha
    -[more]GLint _operand1_Alpha +[more]GLint _operand1_Alpha
    -[more]GLint _operand2_Alpha +[more]GLint _operand2_Alpha
    -[more]float _scale_RGB +[more]float _scale_RGB
    -[more]float _scale_Alpha +[more]float _scale_Alpha
    -[more]osg::Vec4 _constantColor +[more]osg::Vec4 _constantColor

    Protected Methods

    -[more]virtual ~TexEnvCombine() +[more]virtual ~TexEnvCombine()
    -[more]inline bool needsTexEnvCombiner(GLint value) const +[more]inline bool needsTexEnvCombiner(GLint value) const
    -[more]void computeNeedoForTexEnvCombiners() +[more]void computeNeedoForTexEnvCombiners()

    @@ -178,7 +178,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    obool operator < (const StateAttribute& rhs) const
    @@ -186,7 +186,7 @@
    obool operator != (const StateAttribute& rhs) const
    -ovirtual void getAssociatedModes(std::vector<GLMode>& ) const +ovirtual void getAssociatedModes(std::vector<GLMode>& ) const
    ovirtual void compile(State&) const

    @@ -211,9 +211,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -229,7 +229,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -247,12 +247,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -264,363 +272,363 @@
    - +
    o TexEnvCombine()

    - -

    o TexEnvCombine(const TexEnvCombine& texenv, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o TexEnvCombine(const TexEnvCombine& texenv, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, TexEnvCombine, TEXENV) + +
    o META_StateAttribute(osg, TexEnvCombine, TEXENV)

    - +

    ovirtual bool isTextureAttribute() const

    - +

    ovirtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - +

    oenum CombineParam

    - +
    o REPLACE

    - +

    o MODULATE

    - +

    o ADD

    - +

    o ADD_SIGNED

    - +

    o INTERPOLATE

    - +

    o SUBTRACT

    - +

    o DOT3_RGB

    - +

    o DOT3_RGBA

    - +
    ovoid setCombine_RGB(GLint cm)

    - +

    ovoid setCombine_Alpha(GLint cm)

    - +

    oGLint getCombine_RGB() const

    - +

    oGLint getCombine_Alpha() const

    - +

    oenum SourceParam

    - +
    o CONSTANT

    - +

    o PRIMARY_COLOR

    - +

    o PREVIOUS

    - +

    o TEXTURE

    - +

    o TEXTURE0

    - +

    o TEXTURE1

    - +

    o TEXTURE2

    - +

    o TEXTURE3

    - +

    o TEXTURE4

    - +

    o TEXTURE5

    - +

    o TEXTURE6

    - +

    o TEXTURE7

    - +
    ovoid setSource0_RGB(GLint sp)

    - +

    ovoid setSource1_RGB(GLint sp)

    - +

    ovoid setSource2_RGB(GLint sp)

    - +

    ovoid setSource0_Alpha(GLint sp)

    - +

    ovoid setSource1_Alpha(GLint sp)

    - +

    ovoid setSource2_Alpha(GLint sp)

    - +

    oGLint getSource0_RGB() const

    - +

    oGLint getSource1_RGB() const

    - +

    oGLint getSource2_RGB() const

    - +

    oGLint getSource0_Alpha() const

    - +

    oGLint getSource1_Alpha() const

    - +

    oGLint getSource2_Alpha() const

    - +

    oenum OperandParam

    - +
    o SRC_COLOR

    - +

    o ONE_MINUS_SRC_COLOR

    - +

    o SRC_ALPHA

    - +

    o ONE_MINUS_SRC_ALPHA

    - +
    ovoid setOperand0_RGB(GLint op)

    - +

    ovoid setOperand1_RGB(GLint op)

    - +

    ovoid setOperand2_RGB(GLint op)

    - +

    ovoid setOperand0_Alpha(GLint op)

    - +

    ovoid setOperand1_Alpha(GLint op)

    - +

    ovoid setOperand2_Alpha(GLint op)

    - +

    oGLint getOperand0_RGB() const

    - +

    oGLint getOperand1_RGB() const

    - +

    oGLint getOperand2_RGB() const

    - +

    oGLint getOperand0_Alpha() const

    - +

    oGLint getOperand1_Alpha() const

    - +

    oGLint getOperand2_Alpha() const

    - -

    ovoid setScale_RGB(float scale) + +
    ovoid setScale_RGB(float scale)

    - -

    ovoid setScale_Alpha(float scale) + +
    ovoid setScale_Alpha(float scale)

    - +

    ofloat getScale_RGB() const

    - +

    ofloat getScale_Alpha() const

    - +

    ovoid setConstantColor( const Vec4& color )

    - +

    oconst Vec4& getConstantColor() const

    - +

    ovirtual void apply(State& state) const

    - +

    ovirtual ~TexEnvCombine()

    - +

    oinline bool needsTexEnvCombiner(GLint value) const

    - +

    ovoid computeNeedoForTexEnvCombiners()

    - +

    obool _needsTexEnvCrossbar

    - +

    oGLint _combine_RGB

    - +

    oGLint _combine_Alpha

    - +

    oGLint _source0_RGB

    - +

    oGLint _source1_RGB

    - +

    oGLint _source2_RGB

    - +

    oGLint _source0_Alpha

    - +

    oGLint _source1_Alpha

    - +

    oGLint _source2_Alpha

    - +

    oGLint _operand0_RGB

    - +

    oGLint _operand1_RGB

    - +

    oGLint _operand2_RGB

    - +

    oGLint _operand0_Alpha

    - +

    oGLint _operand1_Alpha

    - +

    oGLint _operand2_Alpha

    - +

    ofloat _scale_RGB

    - +

    ofloat _scale_Alpha

    - +

    oosg::Vec4 _constantColor

    diff --git a/doc/doc++/osg/TexGen.html b/doc/doc++/osg/TexGen.html index 570705f3f..48931b40e 100644 --- a/doc/doc++/osg/TexGen.html +++ b/doc/doc++/osg/TexGen.html @@ -23,55 +23,55 @@

    Public Methods

    -[more] TexGen() +[more] TexGen()
    -[more] TexGen(const TexGen& texgen, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] TexGen(const TexGen& texgen, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, TexGen, TEXGEN) +[more] META_StateAttribute(osg, TexGen, TEXGEN)
    -[more]virtual bool isTextureAttribute() const +[more]virtual bool isTextureAttribute() const
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const
    -[more]inline void setMode( const Mode mode ) +[more]inline void setMode( Mode mode )
    -[more]const Mode getMode() const +[more]Mode getMode() const
    -[more]void setPlane(const Coord which, const Vec4& plane) +[more]void setPlane(Coord which, const Vec4& plane)
    -[more]const Vec4& getPlane(const Coord which) const +[more]const Vec4& getPlane(Coord which) const

    Public Members

    -[more]enum Mode +[more]enum Mode
    -[more]enum Coord +[more]enum Coord

    Protected Fields

    -[more]Mode _mode +[more]Mode _mode
    -[more]Vec4 _plane_s +[more]Vec4 _plane_s
    additional texgen coefficents for GL_OBJECT_PLANE or GL_EYE_PLANE,
    -[more]Vec4 _plane_t +[more]Vec4 _plane_t
    -[more]Vec4 _plane_r +[more]Vec4 _plane_r
    -[more]Vec4 _plane_q +[more]Vec4 _plane_q

    Protected Methods

    -[more]virtual ~TexGen( void ) +[more]virtual ~TexGen( void )

    @@ -89,7 +89,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    obool operator < (const StateAttribute& rhs) const
    @@ -120,9 +120,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -138,7 +138,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -156,12 +156,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -173,122 +181,122 @@
    - +
    o TexGen()

    - -

    o TexGen(const TexGen& texgen, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o TexGen(const TexGen& texgen, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, TexGen, TEXGEN) + +
    o META_StateAttribute(osg, TexGen, TEXGEN)

    - +

    ovirtual bool isTextureAttribute() const

    - +

    ovirtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - -

    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const + +
    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const

    - +

    ovirtual void apply(State& state) const

    - +

    oenum Mode

    - +
    o OBJECT_LINEAR

    - +

    o EYE_LINEAR

    - +

    o SPHERE_MAP

    - +

    o NORMAL_MAP

    - +

    o REFLECTION_MAP

    - -
    oinline void setMode( const Mode mode ) + +
    oinline void setMode( Mode mode )

    - -

    oconst Mode getMode() const + +
    oMode getMode() const

    - +

    oenum Coord

    - +
    o S

    - +

    o T

    - +

    o R

    - +

    o Q

    - -
    ovoid setPlane(const Coord which, const Vec4& plane) + +
    ovoid setPlane(Coord which, const Vec4& plane)

    - -

    oconst Vec4& getPlane(const Coord which) const + +
    oconst Vec4& getPlane(Coord which) const

    - +

    ovirtual ~TexGen( void )

    - -

    oMode _mode + +
    oMode _mode

    - +

    oVec4 _plane_s
    additional texgen coefficents for GL_OBJECT_PLANE or GL_EYE_PLANE,

    - +

    oVec4 _plane_t

    - +

    oVec4 _plane_r

    - +

    oVec4 _plane_q

    diff --git a/doc/doc++/osg/TexMat.html b/doc/doc++/osg/TexMat.html index 951665283..15ea3ad8d 100644 --- a/doc/doc++/osg/TexMat.html +++ b/doc/doc++/osg/TexMat.html @@ -23,39 +23,39 @@

    Public Methods

    -[more] TexMat() +[more] TexMat()
    -[more] TexMat(const TexMat& texmat, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] TexMat(const TexMat& texmat, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, TexMat, TEXMAT) +[more] META_StateAttribute(osg, TexMat, TEXMAT)
    -[more]virtual bool isTextureAttribute() const +[more]virtual bool isTextureAttribute() const
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]inline void setMatrix(const Matrix& matrix) +[more]inline void setMatrix(const Matrix& matrix)
    Set the texture matrix
    -[more]inline Matrix& getMatrix() +[more]inline Matrix& getMatrix()
    Get the texture matrix
    -[more]inline const Matrix& getMatrix() const +[more]inline const Matrix& getMatrix() const
    Get the const texture matrix
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const
    apply as OpenGL texture matrix

    Protected Fields

    -[more]Matrix _matrix +[more]Matrix _matrix

    Protected Methods

    -[more]virtual ~TexMat( void ) +[more]virtual ~TexMat( void )

    @@ -73,7 +73,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    obool operator < (const StateAttribute& rhs) const
    @@ -81,7 +81,7 @@
    obool operator != (const StateAttribute& rhs) const
    -ovirtual void getAssociatedModes(std::vector<GLMode>& ) const +ovirtual void getAssociatedModes(std::vector<GLMode>& ) const
    ovirtual void compile(State&) const

    @@ -106,9 +106,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -124,7 +124,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -142,12 +142,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -159,53 +167,53 @@
    - +
    o TexMat()

    - -

    o TexMat(const TexMat& texmat, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o TexMat(const TexMat& texmat, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, TexMat, TEXMAT) + +
    o META_StateAttribute(osg, TexMat, TEXMAT)

    - +

    ovirtual bool isTextureAttribute() const

    - +

    ovirtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - +

    oinline void setMatrix(const Matrix& matrix)
    Set the texture matrix

    - +

    oinline Matrix& getMatrix()
    Get the texture matrix

    - +

    oinline const Matrix& getMatrix() const
    Get the const texture matrix

    - +

    ovirtual void apply(State& state) const
    apply as OpenGL texture matrix

    - +

    ovirtual ~TexMat( void )

    - +

    oMatrix _matrix

    diff --git a/doc/doc++/osg/Texture.html b/doc/doc++/osg/Texture.html index bbf622140..f848dfe3b 100644 --- a/doc/doc++/osg/Texture.html +++ b/doc/doc++/osg/Texture.html @@ -23,151 +23,166 @@

    Public Methods

    -[more] Texture() +[more] Texture()
    -[more] Texture(const Texture& text, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Texture(const Texture& text, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more]virtual osg::Object* cloneType() const = 0 +[more]virtual osg::Object* cloneType() const = 0
    -[more]virtual osg::Object* clone(const CopyOp& copyop) const = 0 +[more]virtual osg::Object* clone(const CopyOp& copyop) const = 0
    -[more]virtual bool isSameKindAs(const osg::Object* obj) const +[more]virtual bool isSameKindAs(const osg::Object* obj) const
    -[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    -[more]virtual const Type getType() const +[more]virtual Type getType() const
    -[more]virtual bool isTextureAttribute() const +[more]virtual bool isTextureAttribute() const
    -[more]void setWrap(const WrapParameter which, const WrapMode wrap) +[more]void setWrap(WrapParameter which, WrapMode wrap)
    Set the texture wrap mode
    -[more]const WrapMode getWrap(const WrapParameter which) const +[more]WrapMode getWrap(WrapParameter which) const
    Get the texture wrap mode
    -[more]void setBorderColor(const Vec4& color) +[more]void setBorderColor(const Vec4& color)
    Sets the border color for this texture.
    -[more]const Vec4& borderColor(void) const +[more]const Vec4& getBorderColor() const
    -[more]void setFilter(const FilterParameter which, const FilterMode filter) +[more]void setFilter(FilterParameter which, FilterMode filter)
    Set the texture filter mode
    -[more]const FilterMode getFilter(const FilterParameter which) const +[more]FilterMode getFilter(FilterParameter which) const
    Get the texture filter mode
    -[more]void setMaxAnisotropy(float anis) +[more]void setMaxAnisotropy(float anis)
    Set the maximum anisotropy value, default value is 10 for no anisotropic filtering.
    -[more]inline float getMaxAnisotropy() const +[more]inline float getMaxAnisotropy() const
    Get the maximum anisotropy value
    -[more]inline void setInternalFormatMode(const InternalFormatMode mode) +[more]inline void setInternalFormatMode(InternalFormatMode mode)
    Set the internal format mode.
    -[more]inline const InternalFormatMode getInternalFormatMode() const +[more]inline InternalFormatMode getInternalFormatMode() const
    Get the internal format mode
    -[more]inline void setInternalFormat(const int internalFormat) +[more]inline void setInternalFormat(GLint internalFormat)
    Set the internal format to use when creating OpenGL textures.
    -[more]inline const int getInternalFormat() const +[more]inline GLint getInternalFormat() const
    Get the internal format to use when creating OpenGL textures
    -[more]bool isCompressedInternalFormat() const +[more]bool isCompressedInternalFormat() const
    -[more]inline GLuint& getTextureObject(const uint contextID) const +[more]inline GLuint& getTextureObject(uint contextID) const
    return the OpenGL texture object for specified context
    -[more]inline uint& getModifiedTag(const uint contextID) const +[more]inline uint& getModifiedTag(uint contextID) const
    -[more]void dirtyTextureObject() +[more]inline uint& getTextureParameterDity(uint contextID) const +
    +[more]void dirtyTextureObject()
    Force a recompile on next apply() of associated OpenGL texture objects
    -[more]static void deleteTextureObject(uint contextID, GLuint handle) +[more]void dirtyTextureParameters() +
    Force a resetting on next apply() of associated OpenGL texture parameters +
    +[more]static void deleteTextureObject(uint contextID, GLuint handle)
    use deleteTextureObject instead of glDeleteTextures to allow OpenGL texture objects to cached until they can be deleted by the OpenGL context in which they were created, specified by contextID
    -[more]static void flushDeletedTextureObjects(uint contextID) +[more]static void flushDeletedTextureObjects(uint contextID)
    flush all the cached display list which need to be deleted in the OpenGL context related to contextID
    -[more]static GLint getMaxTextureSize() -
    Get the maximum texture size supported, this is the normally define by GL_MAX_TEXTURE_SIZE, but can be overridden by the OSG_MAX_TEXTURE_SIZE environmental variable -
    -[more]virtual void apply(State& state) const = 0 +[more]virtual void apply(State& state) const = 0
    Texture is pure virtual base class, apply must be overriden.
    -[more]virtual void compile(State& state) const +[more]virtual void compile(State& state) const
    Calls apply(state) to compile the texture. +
    +[more]static const Extensions* getExtensions(uint contextID, bool createIfNotInitalized) +
    Function to call to get the extension of a specified context. +
    +[more]static void setExtensions(uint contextID, Extensions* extensions) +
    setExtensions allows users to override the extensions across graphics contexts.

    Public Members

    -[more]enum WrapParameter +[more]enum WrapParameter
    -[more]enum WrapMode +[more]enum WrapMode
    -[more]enum FilterParameter +[more]enum FilterParameter
    -[more]enum FilterMode +[more]enum FilterMode
    -[more]enum InternalFormatMode +[more]enum InternalFormatMode
    -[more] Get the handle to the texture object for the current context +[more] Get the handle to the texture object for the current context +
    +class Extensions: public osg::Referenced +
    Extensions class which encapsulates the querring of extensions and associated function pointers, and provide convinience wrappers to check for the extensions or use the associated functions

    Protected Fields

    -[more]WrapMode _wrap_s +[more]mutable TextureNameList _handleList
    -[more]WrapMode _wrap_t +[more]mutable ImageModifiedTag _modifiedTag
    -[more]WrapMode _wrap_r +[more]mutable TexParameterDirtyList _texParametersDirtyList
    -[more]FilterMode _min_filter +[more]WrapMode _wrap_s
    -[more]FilterMode _mag_filter +[more]WrapMode _wrap_t
    -[more]float _maxAnisotropy +[more]WrapMode _wrap_r
    -[more]Vec4 _borderColor +[more]FilterMode _min_filter
    -[more]mutable bool _texParametersDirty +[more]FilterMode _mag_filter
    -[more]InternalFormatMode _internalFormatMode +[more]float _maxAnisotropy
    -[more]mutable GLint _internalFormat +[more]Vec4 _borderColor +
    +[more]InternalFormatMode _internalFormatMode +
    +[more]mutable GLint _internalFormat

    Protected Methods

    -[more]virtual ~Texture() +[more]virtual ~Texture()
    -[more]virtual void computeInternalFormat() const = 0 +[more]virtual void computeInternalFormat() const = 0
    -[more]void computeInternalFormatWithImage(osg::Image& image) const +[more]void computeInternalFormatWithImage(osg::Image& image) const
    -[more]bool isCompressedInternalFormat(GLint internalFormat) const +[more]bool isCompressedInternalFormat(GLint internalFormat) const
    -[more]void applyTexParameters(GLenum target, State& state) const +[more]void applyTexParameters(GLenum target, State& state) const
    Helper method which does setting of texture paramters.
    -[more]void applyTexImage2D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& height, GLsizei& numMimpmapLevels) const +[more]void applyTexImage2D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& height, GLsizei& numMimpmapLevels) const
    Helper method which does the creation of the texture itself, and does not set or use texture binding.
    -[more]int compareTexture(const Texture& rhs) const +[more]int compareTexture(const Texture& rhs) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    Protected Members

    -[more]typedef std::vector<GLuint> TextureNameList mutable TextureNameList _handleList +[more]typedef buffered_value<GLuint> TextureNameList
    -[more]typedef std::vector<uint> ImageModifiedTag mutable ImageModifiedTag _modifiedTag +[more]typedef buffered_value<uint> ImageModifiedTag
    -[more]typedef std::map<uint,std::set<uint> >static DeletedTextureObjectCache DeletedTextureObjectCache s_deletedTextureObjectCache +[more]typedef buffered_value<uint> TexParameterDirtyList

    @@ -183,7 +198,7 @@
    obool operator != (const StateAttribute& rhs) const
    -ovirtual void getAssociatedModes(std::vector<GLMode>& ) const +ovirtual void getAssociatedModes(std::vector<GLMode>& ) const

    @@ -206,9 +221,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -224,7 +239,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -242,12 +257,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -259,162 +282,162 @@
    - +
    o Texture()

    - -

    o Texture(const Texture& text, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o Texture(const Texture& text, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - +

    ovirtual osg::Object* cloneType() const = 0

    - +

    ovirtual osg::Object* clone(const CopyOp& copyop) const = 0

    - +

    ovirtual bool isSameKindAs(const osg::Object* obj) const

    - +

    ovirtual const char* libraryName() const

    - +

    ovirtual const char* className() const

    - -

    ovirtual const Type getType() const + +
    ovirtual Type getType() const

    - +

    ovirtual bool isTextureAttribute() const

    - +

    oenum WrapParameter

    - +
    o WRAP_S

    - +

    o WRAP_T

    - +

    o WRAP_R

    - +
    oenum WrapMode

    - +
    o CLAMP

    - +

    o CLAMP_TO_EDGE

    - +

    o CLAMP_TO_BORDER

    - +

    o REPEAT

    - +

    o MIRROR

    - -
    ovoid setWrap(const WrapParameter which, const WrapMode wrap) + +
    ovoid setWrap(WrapParameter which, WrapMode wrap)
    Set the texture wrap mode

    - -

    oconst WrapMode getWrap(const WrapParameter which) const + +
    oWrapMode getWrap(WrapParameter which) const
    Get the texture wrap mode

    - +

    ovoid setBorderColor(const Vec4& color)
    Sets the border color for this texture. Makes difference only if wrap mode is CLAMP_TO_BORDER

    - - -

    oconst Vec4& borderColor(void) const + + +
    oconst Vec4& getBorderColor() const

    - +

    oenum FilterParameter

    - +
    o MIN_FILTER

    - +

    o MAG_FILTER

    - +
    oenum FilterMode

    - +
    o LINEAR

    - +

    o LINEAR_MIPMAP_LINEAR

    - +

    o LINEAR_MIPMAP_NEAREST

    - +

    o NEAREST

    - +

    o NEAREST_MIPMAP_LINEAR

    - +

    o NEAREST_MIPMAP_NEAREST

    - -
    ovoid setFilter(const FilterParameter which, const FilterMode filter) + +
    ovoid setFilter(FilterParameter which, FilterMode filter)
    Set the texture filter mode

    - -

    oconst FilterMode getFilter(const FilterParameter which) const + +
    oFilterMode getFilter(FilterParameter which) const
    Get the texture filter mode

    - +

    ovoid setMaxAnisotropy(float anis)
    Set the maximum anisotropy value, default value is 10 for no anisotropic filtering. If hardware does not support anisotropic @@ -423,201 +446,228 @@ valid range is 1.0f upwards. The maximum value depends on the graphics system being used.

    - +

    oinline float getMaxAnisotropy() const
    Get the maximum anisotropy value

    - +

    oenum InternalFormatMode

    - +
    o USE_IMAGE_DATA_FORMAT

    - +

    o USE_USER_DEFINED_FORMAT

    - +

    o USE_ARB_COMPRESSION

    - +

    o USE_S3TC_DXT1_COMPRESSION

    - +

    o USE_S3TC_DXT3_COMPRESSION

    - +

    o USE_S3TC_DXT5_COMPRESSION

    - -
    oinline void setInternalFormatMode(const InternalFormatMode mode) + +
    oinline void setInternalFormatMode(InternalFormatMode mode)
    Set the internal format mode. Note, If the mode is set USE_IMAGE_DATA_FORMAT, USE_ARB_COMPRESSION, USE_S3TC_COMPRESSION the internalFormat is automatically selected, and will overwrite the previous _internalFormat.

    - -

    oinline const InternalFormatMode getInternalFormatMode() const + +
    oinline InternalFormatMode getInternalFormatMode() const
    Get the internal format mode

    - -

    oinline void setInternalFormat(const int internalFormat) + +
    oinline void setInternalFormat(GLint internalFormat)
    Set the internal format to use when creating OpenGL textures. Also sets the internalFormatMode to USE_USER_DEFINED_FORMAT.

    - -

    oinline const int getInternalFormat() const + +
    oinline GLint getInternalFormat() const
    Get the internal format to use when creating OpenGL textures

    - +

    obool isCompressedInternalFormat() const

    - +

    o Get the handle to the texture object for the current context
    Get the handle to the texture object for the current context

    - -

    oinline GLuint& getTextureObject(const uint contextID) const + +
    oinline GLuint& getTextureObject(uint contextID) const
    return the OpenGL texture object for specified context

    - -

    oinline uint& getModifiedTag(const uint contextID) const + +
    oinline uint& getModifiedTag(uint contextID) const +

    + + +

    oinline uint& getTextureParameterDity(uint contextID) const

    - +

    ovoid dirtyTextureObject()
    Force a recompile on next apply() of associated OpenGL texture objects

    + + +

    ovoid dirtyTextureParameters() +
    Force a resetting on next apply() of associated OpenGL texture parameters +

    - -

    ostatic void deleteTextureObject(uint contextID, GLuint handle) + +
    ostatic void deleteTextureObject(uint contextID, GLuint handle)
    use deleteTextureObject instead of glDeleteTextures to allow OpenGL texture objects to cached until they can be deleted by the OpenGL context in which they were created, specified by contextID

    - -

    ostatic void flushDeletedTextureObjects(uint contextID) + +
    ostatic void flushDeletedTextureObjects(uint contextID)
    flush all the cached display list which need to be deleted in the OpenGL context related to contextID

    - - -

    ostatic GLint getMaxTextureSize() -
    Get the maximum texture size supported, this is the -normally define by GL_MAX_TEXTURE_SIZE, but can be overridden -by the OSG_MAX_TEXTURE_SIZE environmental variable -

    - +

    ovirtual void apply(State& state) const = 0
    Texture is pure virtual base class, apply must be overriden.

    - +

    ovirtual void compile(State& state) const
    Calls apply(state) to compile the texture.

    + + +

    ostatic const Extensions* getExtensions(uint contextID, bool createIfNotInitalized) +
    Function to call to get the extension of a specified context. +If the Exentsion object for that context has not yet been created then +and the 'createIfNotInitalized' flag been set to false then returns NULL. +If 'createIfNotInitalized' is true then the Extensions object is +automatically created. However, in this case the extension object +only be created with the graphics context associated with ContextID.. +

    + + +

    ostatic void setExtensions(uint contextID, Extensions* extensions) +
    setExtensions allows users to override the extensions across graphics contexts. +typically used when you have different extensions supported across graphics pipes +but need to ensure that they all use the same low common denominator extensions. +

    - +

    ovirtual ~Texture()

    - +

    ovirtual void computeInternalFormat() const = 0

    - +

    ovoid computeInternalFormatWithImage(osg::Image& image) const

    - +

    obool isCompressedInternalFormat(GLint internalFormat) const

    - +

    ovoid applyTexParameters(GLenum target, State& state) const
    Helper method which does setting of texture paramters.

    - -

    ovoid applyTexImage2D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& height, GLsizei& numMimpmapLevels) const + +
    ovoid applyTexImage2D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& height, GLsizei& numMimpmapLevels) const
    Helper method which does the creation of the texture itself, and does not set or use texture binding.

    - +

    oint compareTexture(const Texture& rhs) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    + + +

    otypedef buffered_value<GLuint> TextureNameList +

    - -

    otypedef std::vector<GLuint> TextureNameList mutable TextureNameList _handleList + +
    omutable TextureNameList _handleList +

    + + +

    otypedef buffered_value<uint> ImageModifiedTag

    - -

    otypedef std::vector<uint> ImageModifiedTag mutable ImageModifiedTag _modifiedTag + +
    omutable ImageModifiedTag _modifiedTag +

    + + +

    otypedef buffered_value<uint> TexParameterDirtyList +

    + + +

    omutable TexParameterDirtyList _texParametersDirtyList

    - -

    oWrapMode _wrap_s + +
    oWrapMode _wrap_s

    - -

    oWrapMode _wrap_t + +
    oWrapMode _wrap_t

    - -

    oWrapMode _wrap_r + +
    oWrapMode _wrap_r

    - -

    oFilterMode _min_filter + +
    oFilterMode _min_filter

    - -

    oFilterMode _mag_filter + +
    oFilterMode _mag_filter

    - +

    ofloat _maxAnisotropy

    - +

    oVec4 _borderColor

    - - -

    omutable bool _texParametersDirty -

    - -

    oInternalFormatMode _internalFormatMode + +
    oInternalFormatMode _internalFormatMode

    - +

    omutable GLint _internalFormat -

    - - -

    otypedef std::map<uint,std::set<uint> >static DeletedTextureObjectCache DeletedTextureObjectCache s_deletedTextureObjectCache

    Direct child classes: diff --git a/doc/doc++/osg/Texture1D.html b/doc/doc++/osg/Texture1D.html index 332834038..1bae71c33 100644 --- a/doc/doc++/osg/Texture1D.html +++ b/doc/doc++/osg/Texture1D.html @@ -23,52 +23,52 @@

    Public Methods

    -[more] Texture1D() +[more] Texture1D()
    -[more] Texture1D(const Texture1D& text, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Texture1D(const Texture1D& text, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, Texture1D, TEXTURE) +[more] META_StateAttribute(osg, Texture1D, TEXTURE)
    -[more]virtual int compare(const StateAttribute& rhs) const +[more]virtual int compare(const StateAttribute& rhs) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const
    -[more]void setImage(Image* image) +[more]void setImage(Image* image)
    Set the texture image.
    -[more]Image* getImage() +[more]Image* getImage()
    Get the texture image.
    -[more]inline const Image* getImage() const +[more]inline const Image* getImage() const
    Get the const texture image.
    -[more]inline void setTextureSize(const int width) const +[more]inline void setTextureSize(int width) const
    Set the texture width and height.
    -[more]inline void getTextureSize(int& width) const +[more]inline void getTextureSize(int& width) const
    Get the texture subload width.
    -[more]void setSubloadCallback(SubloadCallback* cb) +[more]void setSubloadCallback(SubloadCallback* cb)
    -[more]SubloadCallback* getSubloadCallback() +[more]SubloadCallback* getSubloadCallback()
    -[more]const SubloadCallback* getSubloadCallback() const +[more]const SubloadCallback* getSubloadCallback() const
    -[more]void setNumMipmapLevels(unsigned int num) const +[more]void setNumMipmapLevels(unsigned int num) const
    Set the number of mip map levels the the texture has been created with, should only be called within an osg::Texuture::apply() and custom OpenGL texture load
    -[more]unsigned int getNumMipmapLevels() const +[more]unsigned int getNumMipmapLevels() const
    Get the number of mip map levels the the texture has been created with
    -[more]void copyTexImage1D(State& state, int x, int y, int width) +[more]void copyTexImage1D(State& state, int x, int y, int width)
    Copy pixels into a 1D texture imageAs per glCopyTexImage1D.
    -[more]void copyTexSubImage1D(State& state, int xoffset, int x, int y, int width) +[more]void copyTexSubImage1D(State& state, int xoffset, int x, int y, int width)
    Copy a one-dimensional texture subimage.
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const
    On first apply (unless already compiled), create the minmapped texture and bind it, subsequent apply will simple bind to texture

    @@ -79,22 +79,22 @@ class SubloadCallback: public

    Protected Fields

    -[more]mutable ref_ptr<Image> _image +[more]mutable ref_ptr<Image> _image
    -[more]mutable GLsizei _textureWidth +[more]mutable GLsizei _textureWidth
    -[more]mutable GLsizei _numMimpmapLevels +[more]mutable GLsizei _numMimpmapLevels
    -[more]ref_ptr<SubloadCallback> _subloadCallback +[more]ref_ptr<SubloadCallback> _subloadCallback

    Protected Methods

    -[more]virtual ~Texture1D() +[more]virtual ~Texture1D()
    -[more]virtual void computeInternalFormat() const +[more]virtual void computeInternalFormat() const
    -[more]void applyTexImage1D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& numMimpmapLevels) const +[more]void applyTexImage1D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& numMimpmapLevels) const
    Helper method which does the creation of the texture itself, and does not set or use texture binding.

    @@ -113,49 +113,55 @@ class SubloadCallback: public ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    ovirtual bool isTextureAttribute() const
    -ovoid setWrap(const WrapParameter which, const WrapMode wrap) +ovoid setWrap(WrapParameter which, WrapMode wrap)
    -oconst WrapMode getWrap(const WrapParameter which) const +oWrapMode getWrap(WrapParameter which) const
    ovoid setBorderColor(const Vec4& color)
    -oconst Vec4& borderColor(void) const +oconst Vec4& getBorderColor() const
    -ovoid setFilter(const FilterParameter which, const FilterMode filter) +ovoid setFilter(FilterParameter which, FilterMode filter)
    -oconst FilterMode getFilter(const FilterParameter which) const +oFilterMode getFilter(FilterParameter which) const
    ovoid setMaxAnisotropy(float anis)
    oinline float getMaxAnisotropy() const
    -oinline void setInternalFormatMode(const InternalFormatMode mode) +oinline void setInternalFormatMode(InternalFormatMode mode)
    -oinline const InternalFormatMode getInternalFormatMode() const +oinline InternalFormatMode getInternalFormatMode() const
    -oinline void setInternalFormat(const int internalFormat) +oinline void setInternalFormat(GLint internalFormat)
    -oinline const int getInternalFormat() const +oinline GLint getInternalFormat() const
    obool isCompressedInternalFormat() const
    -oinline GLuint& getTextureObject(const uint contextID) const +oinline GLuint& getTextureObject(uint contextID) const
    -oinline uint& getModifiedTag(const uint contextID) const +oinline uint& getModifiedTag(uint contextID) const +
    +oinline uint& getTextureParameterDity(uint contextID) const
    ovoid dirtyTextureObject()
    -ostatic void deleteTextureObject(uint contextID, GLuint handle) +ovoid dirtyTextureParameters()
    -ostatic void flushDeletedTextureObjects(uint contextID) +ostatic void deleteTextureObject(uint contextID, GLuint handle)
    -ostatic GLint getMaxTextureSize() +ostatic void flushDeletedTextureObjects(uint contextID)
    ovirtual void compile(State& state) const +
    +ostatic const Extensions* getExtensions(uint contextID, bool createIfNotInitalized) +
    +ostatic void setExtensions(uint contextID, Extensions* extensions)

    @@ -171,27 +177,34 @@ class SubloadCallback: public enum InternalFormatMode
    o Get the handle to the texture object for the current context +
    +class Extensions: public osg::Referenced +
    Extensions class which encapsulates the querring of extensions and associated function pointers, and provide convinience wrappers to check for the extensions or use the associated functions

    Protected Fields

    -oWrapMode _wrap_s +omutable TextureNameList _handleList
    -oWrapMode _wrap_t +omutable ImageModifiedTag _modifiedTag
    -oWrapMode _wrap_r +omutable TexParameterDirtyList _texParametersDirtyList
    -oFilterMode _min_filter +oWrapMode _wrap_s
    -oFilterMode _mag_filter +oWrapMode _wrap_t +
    +oWrapMode _wrap_r +
    +oFilterMode _min_filter +
    +oFilterMode _mag_filter
    ofloat _maxAnisotropy
    oVec4 _borderColor
    -omutable bool _texParametersDirty -
    -oInternalFormatMode _internalFormatMode +oInternalFormatMode _internalFormatMode
    omutable GLint _internalFormat

    @@ -204,18 +217,18 @@ class SubloadCallback: public ovoid applyTexParameters(GLenum target, State& state) const
    -ovoid applyTexImage2D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& height, GLsizei& numMimpmapLevels) const +ovoid applyTexImage2D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& height, GLsizei& numMimpmapLevels) const
    oint compareTexture(const Texture& rhs) const

    Protected Members

    -otypedef std::vector<GLuint> TextureNameList mutable TextureNameList _handleList +otypedef buffered_value<GLuint> TextureNameList
    -otypedef std::vector<uint> ImageModifiedTag mutable ImageModifiedTag _modifiedTag +otypedef buffered_value<uint> ImageModifiedTag
    -otypedef std::map<uint,std::set<uint> >static DeletedTextureObjectCache DeletedTextureObjectCache s_deletedTextureObjectCache +otypedef buffered_value<uint> TexParameterDirtyList

    @@ -250,9 +263,9 @@ class SubloadCallback: public

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -268,7 +281,7 @@ class SubloadCallback: public

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -286,12 +299,20 @@ class SubloadCallback: public oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -303,124 +324,124 @@ class     SubloadCallback: public - +
    o Texture1D()

    - -

    o Texture1D(const Texture1D& text, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o Texture1D(const Texture1D& text, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, Texture1D, TEXTURE) + +
    o META_StateAttribute(osg, Texture1D, TEXTURE)

    - +

    ovirtual int compare(const StateAttribute& rhs) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - -

    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const + +
    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const

    - +

    ovoid setImage(Image* image)
    Set the texture image.

    - +

    oImage* getImage()
    Get the texture image.

    - +

    oinline const Image* getImage() const
    Get the const texture image.

    - -

    oinline void setTextureSize(const int width) const + +
    oinline void setTextureSize(int width) const
    Set the texture width and height. If width or height are zero then the repsective size value is calculated from the source image sizes.

    - -

    oinline void getTextureSize(int& width) const + +
    oinline void getTextureSize(int& width) const
    Get the texture subload width.

    - +

    ovoid setSubloadCallback(SubloadCallback* cb)

    - +

    oSubloadCallback* getSubloadCallback()

    - +

    oconst SubloadCallback* getSubloadCallback() const

    - +

    ovoid setNumMipmapLevels(unsigned int num) const
    Set the number of mip map levels the the texture has been created with, should only be called within an osg::Texuture::apply() and custom OpenGL texture load

    - +

    ounsigned int getNumMipmapLevels() const
    Get the number of mip map levels the the texture has been created with

    - -

    ovoid copyTexImage1D(State& state, int x, int y, int width) + +
    ovoid copyTexImage1D(State& state, int x, int y, int width)
    Copy pixels into a 1D texture imageAs per glCopyTexImage1D. Creates an OpenGL texture object from the current OpenGL background framebuffer contents at pos \a x, \a y with width \a width. \a width must be a power of two.

    - -

    ovoid copyTexSubImage1D(State& state, int xoffset, int x, int y, int width) + +
    ovoid copyTexSubImage1D(State& state, int xoffset, int x, int y, int width)
    Copy a one-dimensional texture subimage. As per glCopyTexSubImage1D. Updates portion of an existing OpenGL texture object from the current OpenGL background framebuffer contents at pos \a x, \a y with width \a width.

    - +

    ovirtual void apply(State& state) const
    On first apply (unless already compiled), create the minmapped texture and bind it, subsequent apply will simple bind to texture

    - +

    ovirtual ~Texture1D()

    - +

    ovirtual void computeInternalFormat() const

    - -

    ovoid applyTexImage1D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& numMimpmapLevels) const + +
    ovoid applyTexImage1D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& numMimpmapLevels) const
    Helper method which does the creation of the texture itself, and does not set or use texture binding.

    - +

    omutable ref_ptr<Image> _image

    - +

    omutable GLsizei _textureWidth

    - +

    omutable GLsizei _numMimpmapLevels

    - +

    oref_ptr<SubloadCallback> _subloadCallback

    diff --git a/doc/doc++/osg/Texture2D.html b/doc/doc++/osg/Texture2D.html index f4db45426..d444d135e 100644 --- a/doc/doc++/osg/Texture2D.html +++ b/doc/doc++/osg/Texture2D.html @@ -23,52 +23,52 @@

    Public Methods

    -[more] Texture2D() +[more] Texture2D()
    -[more] Texture2D(const Texture2D& text, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Texture2D(const Texture2D& text, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, Texture2D, TEXTURE) +[more] META_StateAttribute(osg, Texture2D, TEXTURE)
    -[more]virtual int compare(const StateAttribute& rhs) const +[more]virtual int compare(const StateAttribute& rhs) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const
    -[more]void setImage(Image* image) +[more]void setImage(Image* image)
    Set the texture image.
    -[more]Image* getImage() +[more]Image* getImage()
    Get the texture image.
    -[more]inline const Image* getImage() const +[more]inline const Image* getImage() const
    Get the const texture image.
    -[more]inline void setTextureSize(const int width, const int height) const +[more]inline void setTextureSize(int width, int height) const
    Set the texture width and height.
    -[more]inline void getTextureSize(int& width, int& height) const +[more]inline void getTextureSize(int& width, int& height) const
    Get the texture subload width.
    -[more]void setSubloadCallback(SubloadCallback* cb) +[more]void setSubloadCallback(SubloadCallback* cb)
    -[more]SubloadCallback* getSubloadCallback() +[more]SubloadCallback* getSubloadCallback()
    -[more]const SubloadCallback* getSubloadCallback() const +[more]const SubloadCallback* getSubloadCallback() const
    -[more]void setNumMipmapLevels(unsigned int num) const +[more]void setNumMipmapLevels(unsigned int num) const
    Set the number of mip map levels the the texture has been created with, should only be called within an osg::Texuture::apply() and custom OpenGL texture load
    -[more]unsigned int getNumMipmapLevels() const +[more]unsigned int getNumMipmapLevels() const
    Get the number of mip map levels the the texture has been created with
    -[more]void copyTexImage2D(State& state, int x, int y, int width, int height ) +[more]void copyTexImage2D(State& state, int x, int y, int width, int height )
    Copy pixels into a 2D texture imageAs per glCopyTexImage2D.
    -[more]void copyTexSubImage2D(State& state, int xoffset, int yoffset, int x, int y, int width, int height ) +[more]void copyTexSubImage2D(State& state, int xoffset, int yoffset, int x, int y, int width, int height )
    Copy a two-dimensional texture subimage.
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const
    On first apply (unless already compiled), create the minmapped texture and bind it, subsequent apply will simple bind to texture

    @@ -79,22 +79,22 @@ class SubloadCallback: public <

    Protected Fields

    -[more]mutable ref_ptr<Image> _image +[more]mutable ref_ptr<Image> _image
    -[more]mutable GLsizei _textureWidth +[more]mutable GLsizei _textureWidth
    -[more]mutable GLsizei _textureHeight +[more]mutable GLsizei _textureHeight
    -[more]mutable GLsizei _numMimpmapLevels +[more]mutable GLsizei _numMimpmapLevels
    -[more]ref_ptr<SubloadCallback> _subloadCallback +[more]ref_ptr<SubloadCallback> _subloadCallback

    Protected Methods

    -[more]virtual ~Texture2D() +[more]virtual ~Texture2D()
    -[more]virtual void computeInternalFormat() const +[more]virtual void computeInternalFormat() const

    @@ -112,49 +112,55 @@ class SubloadCallback: public <
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    ovirtual bool isTextureAttribute() const
    -ovoid setWrap(const WrapParameter which, const WrapMode wrap) +ovoid setWrap(WrapParameter which, WrapMode wrap)
    -oconst WrapMode getWrap(const WrapParameter which) const +oWrapMode getWrap(WrapParameter which) const
    ovoid setBorderColor(const Vec4& color)
    -oconst Vec4& borderColor(void) const +oconst Vec4& getBorderColor() const
    -ovoid setFilter(const FilterParameter which, const FilterMode filter) +ovoid setFilter(FilterParameter which, FilterMode filter)
    -oconst FilterMode getFilter(const FilterParameter which) const +oFilterMode getFilter(FilterParameter which) const
    ovoid setMaxAnisotropy(float anis)
    oinline float getMaxAnisotropy() const
    -oinline void setInternalFormatMode(const InternalFormatMode mode) +oinline void setInternalFormatMode(InternalFormatMode mode)
    -oinline const InternalFormatMode getInternalFormatMode() const +oinline InternalFormatMode getInternalFormatMode() const
    -oinline void setInternalFormat(const int internalFormat) +oinline void setInternalFormat(GLint internalFormat)
    -oinline const int getInternalFormat() const +oinline GLint getInternalFormat() const
    obool isCompressedInternalFormat() const
    -oinline GLuint& getTextureObject(const uint contextID) const +oinline GLuint& getTextureObject(uint contextID) const
    -oinline uint& getModifiedTag(const uint contextID) const +oinline uint& getModifiedTag(uint contextID) const +
    +oinline uint& getTextureParameterDity(uint contextID) const
    ovoid dirtyTextureObject()
    -ostatic void deleteTextureObject(uint contextID, GLuint handle) +ovoid dirtyTextureParameters()
    -ostatic void flushDeletedTextureObjects(uint contextID) +ostatic void deleteTextureObject(uint contextID, GLuint handle)
    -ostatic GLint getMaxTextureSize() +ostatic void flushDeletedTextureObjects(uint contextID)
    ovirtual void compile(State& state) const +
    +ostatic const Extensions* getExtensions(uint contextID, bool createIfNotInitalized) +
    +ostatic void setExtensions(uint contextID, Extensions* extensions)

    @@ -170,27 +176,34 @@ class SubloadCallback: public < oenum InternalFormatMode
    o Get the handle to the texture object for the current context +
    +class Extensions: public osg::Referenced +
    Extensions class which encapsulates the querring of extensions and associated function pointers, and provide convinience wrappers to check for the extensions or use the associated functions

    Protected Fields

    -oWrapMode _wrap_s +omutable TextureNameList _handleList
    -oWrapMode _wrap_t +omutable ImageModifiedTag _modifiedTag
    -oWrapMode _wrap_r +omutable TexParameterDirtyList _texParametersDirtyList
    -oFilterMode _min_filter +oWrapMode _wrap_s
    -oFilterMode _mag_filter +oWrapMode _wrap_t +
    +oWrapMode _wrap_r +
    +oFilterMode _min_filter +
    +oFilterMode _mag_filter
    ofloat _maxAnisotropy
    oVec4 _borderColor
    -omutable bool _texParametersDirty -
    -oInternalFormatMode _internalFormatMode +oInternalFormatMode _internalFormatMode
    omutable GLint _internalFormat

    @@ -203,18 +216,18 @@ class SubloadCallback: public <
    ovoid applyTexParameters(GLenum target, State& state) const
    -ovoid applyTexImage2D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& height, GLsizei& numMimpmapLevels) const +ovoid applyTexImage2D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& height, GLsizei& numMimpmapLevels) const
    oint compareTexture(const Texture& rhs) const

    Protected Members

    -otypedef std::vector<GLuint> TextureNameList mutable TextureNameList _handleList +otypedef buffered_value<GLuint> TextureNameList
    -otypedef std::vector<uint> ImageModifiedTag mutable ImageModifiedTag _modifiedTag +otypedef buffered_value<uint> ImageModifiedTag
    -otypedef std::map<uint,std::set<uint> >static DeletedTextureObjectCache DeletedTextureObjectCache s_deletedTextureObjectCache +otypedef buffered_value<uint> TexParameterDirtyList

    @@ -249,9 +262,9 @@ class SubloadCallback: public <

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -267,7 +280,7 @@ class SubloadCallback: public <

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -285,12 +298,20 @@ class SubloadCallback: public <
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -302,87 +323,87 @@ class SubloadCallback: public <
    - +
    o Texture2D()

    - -

    o Texture2D(const Texture2D& text, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o Texture2D(const Texture2D& text, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, Texture2D, TEXTURE) + +
    o META_StateAttribute(osg, Texture2D, TEXTURE)

    - +

    ovirtual int compare(const StateAttribute& rhs) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - -

    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const + +
    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const

    - +

    ovoid setImage(Image* image)
    Set the texture image.

    - +

    oImage* getImage()
    Get the texture image.

    - +

    oinline const Image* getImage() const
    Get the const texture image.

    - -

    oinline void setTextureSize(const int width, const int height) const + +
    oinline void setTextureSize(int width, int height) const
    Set the texture width and height. If width or height are zero then the repsective size value is calculated from the source image sizes.

    - -

    oinline void getTextureSize(int& width, int& height) const + +
    oinline void getTextureSize(int& width, int& height) const
    Get the texture subload width.

    - +

    ovoid setSubloadCallback(SubloadCallback* cb)

    - +

    oSubloadCallback* getSubloadCallback()

    - +

    oconst SubloadCallback* getSubloadCallback() const

    - +

    ovoid setNumMipmapLevels(unsigned int num) const
    Set the number of mip map levels the the texture has been created with, should only be called within an osg::Texuture::apply() and custom OpenGL texture load

    - +

    ounsigned int getNumMipmapLevels() const
    Get the number of mip map levels the the texture has been created with

    - -

    ovoid copyTexImage2D(State& state, int x, int y, int width, int height ) + +
    ovoid copyTexImage2D(State& state, int x, int y, int width, int height )
    Copy pixels into a 2D texture imageAs per glCopyTexImage2D. Creates an OpenGL texture object from the current OpenGL background framebuffer contents at pos \a x, \a y with width \a width and height \a height. \a width and \a height must be a power of two.

    - -

    ovoid copyTexSubImage2D(State& state, int xoffset, int yoffset, int x, int y, int width, int height ) + +
    ovoid copyTexSubImage2D(State& state, int xoffset, int yoffset, int x, int y, int width, int height )
    Copy a two-dimensional texture subimage. As per glCopyTexSubImage2D. Updates portion of an existing OpenGL texture object from the current OpenGL background framebuffer contents at pos \a x, \a y with width \a width and @@ -390,37 +411,37 @@ height \a height. \a width and \a height must be a power of two, and writing into the texture with offset \a xoffset and \a yoffset.

    - +

    ovirtual void apply(State& state) const
    On first apply (unless already compiled), create the minmapped texture and bind it, subsequent apply will simple bind to texture

    - +

    ovirtual ~Texture2D()

    - +

    ovirtual void computeInternalFormat() const

    - +

    omutable ref_ptr<Image> _image

    - +

    omutable GLsizei _textureWidth

    - +

    omutable GLsizei _textureHeight

    - +

    omutable GLsizei _numMimpmapLevels

    - +

    oref_ptr<SubloadCallback> _subloadCallback

    diff --git a/doc/doc++/osg/Texture3D.html b/doc/doc++/osg/Texture3D.html index 3248bc13b..65334b567 100644 --- a/doc/doc++/osg/Texture3D.html +++ b/doc/doc++/osg/Texture3D.html @@ -23,79 +23,88 @@

    Public Methods

    -[more] Texture3D() +[more] Texture3D()
    -[more] Texture3D(const Texture3D& text, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Texture3D(const Texture3D& text, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, Texture3D, TEXTURE) +[more] META_StateAttribute(osg, Texture3D, TEXTURE)
    -[more]virtual int compare(const StateAttribute& rhs) const +[more]virtual int compare(const StateAttribute& rhs) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const
    -[more]void setImage(Image* image) +[more]void setImage(Image* image)
    Set the texture image.
    -[more]Image* getImage() +[more]Image* getImage()
    Get the texture image.
    -[more]inline const Image* getImage() const +[more]inline const Image* getImage() const
    Get the const texture image.
    -[more]inline void setTextureSize(const int width, const int height, const int depth) const +[more]inline void setTextureSize(int width, int height, int depth) const
    Set the texture width and height.
    -[more]inline void getTextureSize(int& width, int& height, int& depth) const +[more]inline void getTextureSize(int& width, int& height, int& depth) const
    Get the texture subload width.
    -[more]void setSubloadCallback(SubloadCallback* cb) +[more]void setSubloadCallback(SubloadCallback* cb)
    -[more]SubloadCallback* getSubloadCallback() +[more]SubloadCallback* getSubloadCallback()
    -[more]const SubloadCallback* getSubloadCallback() const +[more]const SubloadCallback* getSubloadCallback() const
    -[more]void setNumMipmapLevels(unsigned int num) const +[more]void setNumMipmapLevels(unsigned int num) const
    Set the number of mip map levels the the texture has been created with, should only be called within an osg::Texuture::apply() and custom OpenGL texture load
    -[more]unsigned int getNumMipmapLevels() const +[more]unsigned int getNumMipmapLevels() const
    Get the number of mip map levels the the texture has been created with
    -[more]void copyTexSubImage3D(State& state, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height) +[more]void copyTexSubImage3D(State& state, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height)
    Copy a two-dimensional texture subimage.
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const
    On first apply (unless already compiled), create the minmapped texture and bind it, subsequent apply will simple bind to texture +
    +[more]static const Extensions* getExtensions(uint contextID, bool createIfNotInitalized) +
    Function to call to get the extension of a specified context. +
    +[more]static void setExtensions(uint contextID, Extensions* extensions) +
    setExtensions allows users to override the extensions across graphics contexts.

    Public Members

    class SubloadCallback: public Referenced +
    +class Extensions: public osg::Referenced +
    Extensions class which encapsulates the querring of extensions and associated function pointers, and provide convinience wrappers to check for the extensions or use the associated functions

    Protected Fields

    -[more]mutable ref_ptr<Image> _image +[more]mutable ref_ptr<Image> _image
    -[more]mutable GLsizei _textureWidth +[more]mutable GLsizei _textureWidth
    -[more]mutable GLsizei _textureHeight +[more]mutable GLsizei _textureHeight
    -[more]mutable GLsizei _textureDepth +[more]mutable GLsizei _textureDepth
    -[more]mutable GLsizei _numMimpmapLevels +[more]mutable GLsizei _numMimpmapLevels
    -[more]ref_ptr<SubloadCallback> _subloadCallback +[more]ref_ptr<SubloadCallback> _subloadCallback

    Protected Methods

    -[more]virtual ~Texture3D() +[more]virtual ~Texture3D()
    -[more]virtual void computeInternalFormat() const +[more]virtual void computeInternalFormat() const
    -[more]void applyTexImage3D(GLenum target, Image* image, State& state, GLsizei& inwidth, GLsizei& inheight, GLsizei& indepth, GLsizei& numMimpmapLevels) const +[more]void applyTexImage3D(GLenum target, Image* image, State& state, GLsizei& inwidth, GLsizei& inheight, GLsizei& indepth, GLsizei& numMimpmapLevels) const

    @@ -113,47 +122,49 @@ class SubloadCallback: public <
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    ovirtual bool isTextureAttribute() const
    -ovoid setWrap(const WrapParameter which, const WrapMode wrap) +ovoid setWrap(WrapParameter which, WrapMode wrap)
    -oconst WrapMode getWrap(const WrapParameter which) const +oWrapMode getWrap(WrapParameter which) const
    ovoid setBorderColor(const Vec4& color)
    -oconst Vec4& borderColor(void) const +oconst Vec4& getBorderColor() const
    -ovoid setFilter(const FilterParameter which, const FilterMode filter) +ovoid setFilter(FilterParameter which, FilterMode filter)
    -oconst FilterMode getFilter(const FilterParameter which) const +oFilterMode getFilter(FilterParameter which) const
    ovoid setMaxAnisotropy(float anis)
    oinline float getMaxAnisotropy() const
    -oinline void setInternalFormatMode(const InternalFormatMode mode) +oinline void setInternalFormatMode(InternalFormatMode mode)
    -oinline const InternalFormatMode getInternalFormatMode() const +oinline InternalFormatMode getInternalFormatMode() const
    -oinline void setInternalFormat(const int internalFormat) +oinline void setInternalFormat(GLint internalFormat)
    -oinline const int getInternalFormat() const +oinline GLint getInternalFormat() const
    obool isCompressedInternalFormat() const
    -oinline GLuint& getTextureObject(const uint contextID) const +oinline GLuint& getTextureObject(uint contextID) const
    -oinline uint& getModifiedTag(const uint contextID) const +oinline uint& getModifiedTag(uint contextID) const +
    +oinline uint& getTextureParameterDity(uint contextID) const
    ovoid dirtyTextureObject()
    -ostatic void deleteTextureObject(uint contextID, GLuint handle) +ovoid dirtyTextureParameters()
    -ostatic void flushDeletedTextureObjects(uint contextID) +ostatic void deleteTextureObject(uint contextID, GLuint handle)
    -ostatic GLint getMaxTextureSize() +ostatic void flushDeletedTextureObjects(uint contextID)
    ovirtual void compile(State& state) const

    @@ -175,23 +186,27 @@ class SubloadCallback: public <

    Protected Fields

    -oWrapMode _wrap_s +omutable TextureNameList _handleList
    -oWrapMode _wrap_t +omutable ImageModifiedTag _modifiedTag
    -oWrapMode _wrap_r +omutable TexParameterDirtyList _texParametersDirtyList
    -oFilterMode _min_filter +oWrapMode _wrap_s
    -oFilterMode _mag_filter +oWrapMode _wrap_t +
    +oWrapMode _wrap_r +
    +oFilterMode _min_filter +
    +oFilterMode _mag_filter
    ofloat _maxAnisotropy
    oVec4 _borderColor
    -omutable bool _texParametersDirty -
    -oInternalFormatMode _internalFormatMode +oInternalFormatMode _internalFormatMode
    omutable GLint _internalFormat

    @@ -204,18 +219,18 @@ class SubloadCallback: public <
    ovoid applyTexParameters(GLenum target, State& state) const
    -ovoid applyTexImage2D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& height, GLsizei& numMimpmapLevels) const +ovoid applyTexImage2D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& height, GLsizei& numMimpmapLevels) const
    oint compareTexture(const Texture& rhs) const

    Protected Members

    -otypedef std::vector<GLuint> TextureNameList mutable TextureNameList _handleList +otypedef buffered_value<GLuint> TextureNameList
    -otypedef std::vector<uint> ImageModifiedTag mutable ImageModifiedTag _modifiedTag +otypedef buffered_value<uint> ImageModifiedTag
    -otypedef std::map<uint,std::set<uint> >static DeletedTextureObjectCache DeletedTextureObjectCache s_deletedTextureObjectCache +otypedef buffered_value<uint> TexParameterDirtyList

    @@ -250,9 +265,9 @@ class SubloadCallback: public <

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -268,7 +283,7 @@ class SubloadCallback: public <

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -286,12 +301,20 @@ class SubloadCallback: public <
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -303,124 +326,141 @@ class SubloadCallback: public <
    - +
    o Texture3D()

    - -

    o Texture3D(const Texture3D& text, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o Texture3D(const Texture3D& text, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, Texture3D, TEXTURE) + +
    o META_StateAttribute(osg, Texture3D, TEXTURE)

    - +

    ovirtual int compare(const StateAttribute& rhs) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - -

    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const + +
    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const

    - +

    ovoid setImage(Image* image)
    Set the texture image.

    - +

    oImage* getImage()
    Get the texture image.

    - +

    oinline const Image* getImage() const
    Get the const texture image.

    - -

    oinline void setTextureSize(const int width, const int height, const int depth) const + +
    oinline void setTextureSize(int width, int height, int depth) const
    Set the texture width and height. If width or height are zero then the repsective size value is calculated from the source image sizes.

    - -

    oinline void getTextureSize(int& width, int& height, int& depth) const + +
    oinline void getTextureSize(int& width, int& height, int& depth) const
    Get the texture subload width.

    - +

    ovoid setSubloadCallback(SubloadCallback* cb)

    - +

    oSubloadCallback* getSubloadCallback()

    - +

    oconst SubloadCallback* getSubloadCallback() const

    - +

    ovoid setNumMipmapLevels(unsigned int num) const
    Set the number of mip map levels the the texture has been created with, should only be called within an osg::Texuture::apply() and custom OpenGL texture load

    - +

    ounsigned int getNumMipmapLevels() const
    Get the number of mip map levels the the texture has been created with

    - -

    ovoid copyTexSubImage3D(State& state, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height) + +
    ovoid copyTexSubImage3D(State& state, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height)
    Copy a two-dimensional texture subimage. As per glCopyTexSubImage2D. Updates portion of an existing OpenGL texture object from the current OpenGL background framebuffer contents at pos \a x, \a y with width \a width and height \a height.

    - +

    ovirtual void apply(State& state) const
    On first apply (unless already compiled), create the minmapped texture and bind it, subsequent apply will simple bind to texture

    + + +

    ostatic const Extensions* getExtensions(uint contextID, bool createIfNotInitalized) +
    Function to call to get the extension of a specified context. +If the Exentsion object for that context has not yet been created then +and the 'createIfNotInitalized' flag been set to false then returns NULL. +If 'createIfNotInitalized' is true then the Extensions object is +automatically created. However, in this case the extension object +only be created with the graphics context associated with ContextID.. +

    + + +

    ostatic void setExtensions(uint contextID, Extensions* extensions) +
    setExtensions allows users to override the extensions across graphics contexts. +typically used when you have different extensions supported across graphics pipes +but need to ensure that they all use the same low common denominator extensions. +

    - +

    ovirtual ~Texture3D()

    - +

    ovirtual void computeInternalFormat() const

    - +

    ovoid applyTexImage3D(GLenum target, Image* image, State& state, GLsizei& inwidth, GLsizei& inheight, GLsizei& indepth, GLsizei& numMimpmapLevels) const

    - +

    omutable ref_ptr<Image> _image

    - +

    omutable GLsizei _textureWidth

    - +

    omutable GLsizei _textureHeight

    - +

    omutable GLsizei _textureDepth

    - +

    omutable GLsizei _numMimpmapLevels

    - +

    oref_ptr<SubloadCallback> _subloadCallback

    diff --git a/doc/doc++/osg/TextureCubeMap.html b/doc/doc++/osg/TextureCubeMap.html index 08f6b316e..2db0bc9ae 100644 --- a/doc/doc++/osg/TextureCubeMap.html +++ b/doc/doc++/osg/TextureCubeMap.html @@ -23,74 +23,85 @@

    Public Methods

    -[more] TextureCubeMap() +[more] TextureCubeMap()
    -[more] TextureCubeMap(const TextureCubeMap& cm, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] TextureCubeMap(const TextureCubeMap& cm, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, TextureCubeMap, TEXTURE) +[more] META_StateAttribute(osg, TextureCubeMap, TEXTURE)
    -[more]virtual int compare(const StateAttribute& rhs) const +[more]virtual int compare(const StateAttribute& rhs) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]void setImage(const Face, Image* image) +[more]virtual void getAssociatedModes(std::vector<GLMode>& modes) const +
    +[more]void setImage(Face, Image* image)
    Set the texture image for specified face.
    -[more]Image* getImage(const Face) +[more]Image* getImage(Face)
    Get the texture image for specified face.
    -[more]const Image* getImage(const Face) const +[more]const Image* getImage(Face) const
    Get the const texture image for specified face.
    -[more]inline void setTextureSize(const int width, const int height) const +[more]inline void setTextureSize(int width, int height) const
    Set the texture width and height.
    -[more]inline void getTextureSize(int& width, int& height) const +[more]inline void getTextureSize(int& width, int& height) const
    Get the texture subload width.
    -[more]void setSubloadCallback(SubloadCallback* cb) +[more]void setSubloadCallback(SubloadCallback* cb)
    -[more]SubloadCallback* getSubloadCallback() +[more]SubloadCallback* getSubloadCallback()
    -[more]const SubloadCallback* getSubloadCallback() const +[more]const SubloadCallback* getSubloadCallback() const
    -[more]void setNumMipmapLevels(unsigned int num) const -
    Set the number of mip map levels the the texture has been created with, should only be called within an osg::Texuture::apply() and custom OpenGL texture load +[more]void setNumMipmapLevels(unsigned int num) const +
    Set the number of mip map levels the the texture has been created with, should only be called within an osg::Texuture::apply() and custom OpenGL texture load
    -[more]unsigned int getNumMipmapLevels() const +[more]unsigned int getNumMipmapLevels() const
    Get the number of mip map levels the the texture has been created with
    -[more]virtual void apply(State& state) const -
    On first apply (unless already compiled), create the minmapped texture and bind it, subsequent apply will simple bind to texture +[more]virtual void apply(State& state) const +
    On first apply (unless already compiled), create the minmapped texture and bind it, subsequent apply will simple bind to texture +
    +[more]static const Extensions* getExtensions(uint contextID, bool createIfNotInitalized) +
    Function to call to get the extension of a specified context. +
    +[more]static void setExtensions(uint contextID, Extensions* extensions) +
    setExtensions allows users to override the extensions across graphics contexts.

    Public Members

    -[more]enum Face +[more]enum Face
    class SubloadCallback: public Referenced +
    +class Extensions: public osg::Referenced +
    Extensions class which encapsulates the querring of extensions and associated function pointers, and provide convinience wrappers to check for the extensions or use the associated functions

    Protected Fields

    -[more]mutable ref_ptr<Image> _images[6] +[more]mutable ref_ptr<Image> _images[6]
    -[more]mutable GLsizei _textureWidth +[more]mutable GLsizei _textureWidth
    -[more]mutable GLsizei _textureHeight +[more]mutable GLsizei _textureHeight
    -[more]mutable GLsizei _numMimpmapLevels +[more]mutable GLsizei _numMimpmapLevels
    -[more]ref_ptr<SubloadCallback> _subloadCallback +[more]ref_ptr<SubloadCallback> _subloadCallback

    Protected Methods

    -[more]virtual ~TextureCubeMap() +[more]virtual ~TextureCubeMap()
    -[more]bool imagesValid() const +[more]bool imagesValid() const
    -[more]virtual void computeInternalFormat() const +[more]virtual void computeInternalFormat() const

    @@ -108,47 +119,49 @@ class SubloadCallback: public <
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    ovirtual bool isTextureAttribute() const
    -ovoid setWrap(const WrapParameter which, const WrapMode wrap) +ovoid setWrap(WrapParameter which, WrapMode wrap)
    -oconst WrapMode getWrap(const WrapParameter which) const +oWrapMode getWrap(WrapParameter which) const
    ovoid setBorderColor(const Vec4& color)
    -oconst Vec4& borderColor(void) const +oconst Vec4& getBorderColor() const
    -ovoid setFilter(const FilterParameter which, const FilterMode filter) +ovoid setFilter(FilterParameter which, FilterMode filter)
    -oconst FilterMode getFilter(const FilterParameter which) const +oFilterMode getFilter(FilterParameter which) const
    ovoid setMaxAnisotropy(float anis)
    oinline float getMaxAnisotropy() const
    -oinline void setInternalFormatMode(const InternalFormatMode mode) +oinline void setInternalFormatMode(InternalFormatMode mode)
    -oinline const InternalFormatMode getInternalFormatMode() const +oinline InternalFormatMode getInternalFormatMode() const
    -oinline void setInternalFormat(const int internalFormat) +oinline void setInternalFormat(GLint internalFormat)
    -oinline const int getInternalFormat() const +oinline GLint getInternalFormat() const
    obool isCompressedInternalFormat() const
    -oinline GLuint& getTextureObject(const uint contextID) const +oinline GLuint& getTextureObject(uint contextID) const
    -oinline uint& getModifiedTag(const uint contextID) const +oinline uint& getModifiedTag(uint contextID) const +
    +oinline uint& getTextureParameterDity(uint contextID) const
    ovoid dirtyTextureObject()
    -ostatic void deleteTextureObject(uint contextID, GLuint handle) +ovoid dirtyTextureParameters()
    -ostatic void flushDeletedTextureObjects(uint contextID) +ostatic void deleteTextureObject(uint contextID, GLuint handle)
    -ostatic GLint getMaxTextureSize() +ostatic void flushDeletedTextureObjects(uint contextID)
    ovirtual void compile(State& state) const

    @@ -170,23 +183,27 @@ class SubloadCallback: public <

    Protected Fields

    -oWrapMode _wrap_s +omutable TextureNameList _handleList
    -oWrapMode _wrap_t +omutable ImageModifiedTag _modifiedTag
    -oWrapMode _wrap_r +omutable TexParameterDirtyList _texParametersDirtyList
    -oFilterMode _min_filter +oWrapMode _wrap_s
    -oFilterMode _mag_filter +oWrapMode _wrap_t +
    +oWrapMode _wrap_r +
    +oFilterMode _min_filter +
    +oFilterMode _mag_filter
    ofloat _maxAnisotropy
    oVec4 _borderColor
    -omutable bool _texParametersDirty -
    -oInternalFormatMode _internalFormatMode +oInternalFormatMode _internalFormatMode
    omutable GLint _internalFormat

    @@ -199,18 +216,18 @@ class SubloadCallback: public <
    ovoid applyTexParameters(GLenum target, State& state) const
    -ovoid applyTexImage2D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& height, GLsizei& numMimpmapLevels) const +ovoid applyTexImage2D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& height, GLsizei& numMimpmapLevels) const
    oint compareTexture(const Texture& rhs) const

    Protected Members

    -otypedef std::vector<GLuint> TextureNameList mutable TextureNameList _handleList +otypedef buffered_value<GLuint> TextureNameList
    -otypedef std::vector<uint> ImageModifiedTag mutable ImageModifiedTag _modifiedTag +otypedef buffered_value<uint> ImageModifiedTag
    -otypedef std::map<uint,std::set<uint> >static DeletedTextureObjectCache DeletedTextureObjectCache s_deletedTextureObjectCache +otypedef buffered_value<uint> TexParameterDirtyList

    @@ -223,8 +240,6 @@ class SubloadCallback: public < obool operator == (const StateAttribute& rhs) const
    obool operator != (const StateAttribute& rhs) const -
    -ovirtual void getAssociatedModes(std::vector<GLMode>& ) const

    @@ -247,9 +262,9 @@ class SubloadCallback: public <

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -265,7 +280,7 @@ class SubloadCallback: public <

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -283,12 +298,20 @@ class SubloadCallback: public <
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -300,138 +323,159 @@ class SubloadCallback: public <
    - +
    o TextureCubeMap()

    - -

    o TextureCubeMap(const TextureCubeMap& cm, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o TextureCubeMap(const TextureCubeMap& cm, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, TextureCubeMap, TEXTURE) + +
    o META_StateAttribute(osg, TextureCubeMap, TEXTURE)

    - +

    ovirtual int compare(const StateAttribute& rhs) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    + + +

    ovirtual void getAssociatedModes(std::vector<GLMode>& modes) const +

    - +

    oenum Face

    - +
    o POSITIVE_X

    - +

    o NEGATIVE_X

    - +

    o POSITIVE_Y

    - +

    o NEGATIVE_Y

    - +

    o POSITIVE_Z

    - +

    o NEGATIVE_Z

    - -
    ovoid setImage(const Face, Image* image) + +
    ovoid setImage(Face, Image* image)
    Set the texture image for specified face.

    - -

    oImage* getImage(const Face) + +
    oImage* getImage(Face)
    Get the texture image for specified face.

    - -

    oconst Image* getImage(const Face) const + +
    oconst Image* getImage(Face) const
    Get the const texture image for specified face.

    - -

    oinline void setTextureSize(const int width, const int height) const -
    Set the texture width and height. If width or height are zero then + +
    oinline void setTextureSize(int width, int height) const +
    Set the texture width and height. If width or height are zero then the repsective size value is calculated from the source image sizes.

    - -

    oinline void getTextureSize(int& width, int& height) const + +
    oinline void getTextureSize(int& width, int& height) const
    Get the texture subload width.

    - +

    ovoid setSubloadCallback(SubloadCallback* cb)

    - +

    oSubloadCallback* getSubloadCallback()

    - +

    oconst SubloadCallback* getSubloadCallback() const

    - +

    ovoid setNumMipmapLevels(unsigned int num) const -
    Set the number of mip map levels the the texture has been created with, +
    Set the number of mip map levels the the texture has been created with, should only be called within an osg::Texuture::apply() and custom OpenGL texture load

    - +

    ounsigned int getNumMipmapLevels() const
    Get the number of mip map levels the the texture has been created with

    - +

    ovirtual void apply(State& state) const -
    On first apply (unless already compiled), create the minmapped +
    On first apply (unless already compiled), create the minmapped texture and bind it, subsequent apply will simple bind to texture

    + + +

    ostatic const Extensions* getExtensions(uint contextID, bool createIfNotInitalized) +
    Function to call to get the extension of a specified context. +If the Exentsion object for that context has not yet been created then +and the 'createIfNotInitalized' flag been set to false then returns NULL. +If 'createIfNotInitalized' is true then the Extensions object is +automatically created. However, in this case the extension object +only be created with the graphics context associated with ContextID.. +

    + + +

    ostatic void setExtensions(uint contextID, Extensions* extensions) +
    setExtensions allows users to override the extensions across graphics contexts. +typically used when you have different extensions supported across graphics pipes +but need to ensure that they all use the same low common denominator extensions. +

    - +

    ovirtual ~TextureCubeMap()

    - +

    obool imagesValid() const

    - +

    ovirtual void computeInternalFormat() const

    - +

    omutable ref_ptr<Image> _images[6]

    - +

    omutable GLsizei _textureWidth

    - +

    omutable GLsizei _textureHeight

    - +

    omutable GLsizei _numMimpmapLevels

    - +

    oref_ptr<SubloadCallback> _subloadCallback

    diff --git a/doc/doc++/osg/Timer.html b/doc/doc++/osg/Timer.html index aaa1a7acc..f0757b318 100644 --- a/doc/doc++/osg/Timer.html +++ b/doc/doc++/osg/Timer.html @@ -13,21 +13,21 @@

    Public Methods

    -[more] Timer() +[more] Timer()
    -[more] ~Timer() +[more] ~Timer()
    -[more]inline double delta_s( Timer_t t1, Timer_t t2 ) const +[more]inline double delta_s( Timer_t t1, Timer_t t2 ) const
    -[more]inline double delta_m( Timer_t t1, Timer_t t2 ) const +[more]inline double delta_m( Timer_t t1, Timer_t t2 ) const
    -[more]inline double delta_u( Timer_t t1, Timer_t t2 ) const +[more]inline double delta_u( Timer_t t1, Timer_t t2 ) const
    -[more]inline double delta_n( Timer_t t1, Timer_t t2 ) const +[more]inline double delta_n( Timer_t t1, Timer_t t2 ) const
    -[more]inline Timer_t tick() const +[more]inline Timer_t tick() const
    -[more]inline Timer_t tick( void ) const +[more]inline Timer_t tick( void ) const

    @@ -39,36 +39,36 @@
    - +
    o Timer()

    - +

    o ~Timer()

    - -

    oinline double delta_s( Timer_t t1, Timer_t t2 ) const + +
    oinline double delta_s( Timer_t t1, Timer_t t2 ) const

    - -

    oinline double delta_m( Timer_t t1, Timer_t t2 ) const + +
    oinline double delta_m( Timer_t t1, Timer_t t2 ) const

    - -

    oinline double delta_u( Timer_t t1, Timer_t t2 ) const + +
    oinline double delta_u( Timer_t t1, Timer_t t2 ) const

    - -

    oinline double delta_n( Timer_t t1, Timer_t t2 ) const + +
    oinline double delta_n( Timer_t t1, Timer_t t2 ) const

    - -

    oinline Timer_t tick() const + +
    oinline Timer_t tick() const

    - -

    oinline Timer_t tick( void ) const + +
    oinline Timer_t tick( void ) const

    This class has no child classes.
    diff --git a/doc/doc++/osg/TraceStream.html b/doc/doc++/osg/TraceStream.html index 863c99443..6bd8c2030 100644 --- a/doc/doc++/osg/TraceStream.html +++ b/doc/doc++/osg/TraceStream.html @@ -12,15 +12,15 @@

    Public Methods

    -[more] TraceStream(std::ostream& o=std::cout, TraceLevel tl=Results) +[more] TraceStream(std::ostream& o=std::cout, TraceLevel tl=Results)
    -[more] ~TraceStream() +[more] ~TraceStream()
    -[more]void setTraceLevel(TraceLevel tl) +[more]void setTraceLevel(TraceLevel tl)
    -[more]TraceLevel getTraceLevel() const +[more]TraceLevel getTraceLevel() const
    -[more]std::ostream& stream(TraceLevel tl) +[more]std::ostream& stream(TraceLevel tl)

    @@ -31,24 +31,24 @@
    - -
    o TraceStream(std::ostream& o=std::cout, TraceLevel tl=Results) + +
    o TraceStream(std::ostream& o=std::cout, TraceLevel tl=Results)

    - +

    o ~TraceStream()

    - -

    ovoid setTraceLevel(TraceLevel tl) + +
    ovoid setTraceLevel(TraceLevel tl)

    - -

    oTraceLevel getTraceLevel() const + +
    oTraceLevel getTraceLevel() const

    - -

    ostd::ostream& stream(TraceLevel tl) + +
    ostd::ostream& stream(TraceLevel tl)

    This class has no child classes.
    diff --git a/doc/doc++/osg/Transform.html b/doc/doc++/osg/Transform.html index 292372d69..12121cf5c 100644 --- a/doc/doc++/osg/Transform.html +++ b/doc/doc++/osg/Transform.html @@ -23,58 +23,62 @@

    Public Methods

    -[more] Transform() +[more] Transform()
    -[more] Transform(const Transform&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Transform(const Transform&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_Node(osg, Transform) +[more] META_Node(osg, Transform)
    -[more]void setReferenceFrame(ReferenceFrame rf) +[more]virtual Transform* asTransform() +
    +[more]virtual const Transform* asTransform() const +
    +[more]void setReferenceFrame(ReferenceFrame rf)
    Set the transform's ReferenceFrame, either to be relative to its parent reference frame, or relative to an absolute coordinate frame.
    -[more]const ReferenceFrame getReferenceFrame() const +[more]ReferenceFrame getReferenceFrame() const
    -[more]void setComputeTransformCallback(ComputeTransformCallback* ctc) +[more]void setComputeTransformCallback(ComputeTransformCallback* ctc)
    Set the ComputerTransfromCallback which allows users to attach custom computation of the local transformation as seen by cull traversers and the like.
    -[more]ComputeTransformCallback* getComputeTransformCallback() +[more]ComputeTransformCallback* getComputeTransformCallback()
    Get the non const ComputerTransfromCallback
    -[more]const ComputeTransformCallback* getComputeTransformCallback() const +[more]const ComputeTransformCallback* getComputeTransformCallback() const
    Get the const ComputerTransfromCallback
    -[more]inline const bool getLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const +[more]inline bool getLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const
    Get the transformation matrix which moves from local coords to world coords.
    -[more]inline const bool getWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const +[more]inline bool getWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const
    Get the transformation matrix which moves from world coords to local coords.
    -[more]virtual const bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor*) const +[more]virtual bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor*) const
    -[more]virtual const bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor*) const +[more]virtual bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor*) const

    Public Members

    -[more]enum ReferenceFrame +[more]enum ReferenceFrame
    -[more]struct ComputeTransformCallback: public osg::Referenced +[more]struct ComputeTransformCallback: public osg::Referenced
    Callback attached to an Transform to specify how to compute the modelview transformation for the transform below the Transform node.

    Protected Fields

    -[more]ref_ptr<ComputeTransformCallback> _computeTransformCallback +[more]ref_ptr<ComputeTransformCallback> _computeTransformCallback
    -[more]ReferenceFrame _referenceFrame +[more]ReferenceFrame _referenceFrame

    Protected Methods

    -[more]virtual ~Transform() +[more]virtual ~Transform()
    -[more]virtual const bool computeBound() const +[more]virtual bool computeBound() const
    Overrides Group's computeBound.

    @@ -83,6 +87,10 @@

    Public Methods

    +ovirtual Group* asGroup() +
    +ovirtual const Group* asGroup() const +
    ovirtual void traverse(NodeVisitor& nv)
    ovirtual bool addChild( Node* child ) @@ -91,22 +99,29 @@
    ovirtual bool replaceChild( Node* origChild, Node* newChild )
    -oinline const unsigned int getNumChildren() const +oinline unsigned int getNumChildren() const
    -oinline Node* getChild( const unsigned int i ) +oinline Node* getChild( unsigned int i )
    -oinline const Node* getChild( const unsigned int i ) const +oinline const Node* getChild( unsigned int i ) const
    oinline bool containsNode( const Node* node ) const
    oinline ChildList::iterator findNode( const Node* node )
    oinline ChildList::const_iterator findNode( const Node* node ) const +
    +oinline unsigned int findChildNo( const Node* node ) const +

    + +

    +

    Public Members

    +otypedef std::vector<ref_ptr<Node> > ChildList

    Protected Fields

    -oChildList _children +oChildList _children

    @@ -140,35 +155,43 @@ stateset->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
    - +
    o Transform()

    - -

    o Transform(const Transform&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o Transform(const Transform&, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - +

    o META_Node(osg, Transform)

    + + +

    ovirtual Transform* asTransform() +

    + + +

    ovirtual const Transform* asTransform() const +

    - +

    oenum ReferenceFrame

    - +
    o RELATIVE_TO_PARENTS

    - +

    o RELATIVE_TO_ABSOLUTE

    - -
    ovoid setReferenceFrame(ReferenceFrame rf) + +
    ovoid setReferenceFrame(ReferenceFrame rf)
    Set the transform's ReferenceFrame, either to be relative to its parent reference frame, or relative to an absolute coordinate frame. RELATIVE_TO_PARENTS is the default. @@ -182,11 +205,11 @@ absolute Transforms at the top of the scene, for such things as headlight LightSources or Heads up displays.

    - -

    oconst ReferenceFrame getReferenceFrame() const + +
    oReferenceFrame getReferenceFrame() const

    - +

    ostruct ComputeTransformCallback: public osg::Referenced
    Callback attached to an Transform to specify how to compute the modelview transformation for the transform below the Transform @@ -194,76 +217,76 @@ node.

    - -
    ovirtual const bool computeLocalToWorldMatrix(Matrix& matrix, const Transform* transform, NodeVisitor* nv) const = 0 + +
    ovirtual bool computeLocalToWorldMatrix(Matrix& matrix, const Transform* transform, NodeVisitor* nv) const = 0
    Get the transformation matrix which moves from local coords to world coords

    - -

    ovirtual const bool computeWorldToLocalMatrix(Matrix& matrix, const Transform* transform, NodeVisitor* nv) const = 0 + +
    ovirtual bool computeWorldToLocalMatrix(Matrix& matrix, const Transform* transform, NodeVisitor* nv) const = 0
    Get the transformation matrix which moves from world coords to local coords

    - -
    ovoid setComputeTransformCallback(ComputeTransformCallback* ctc) + +
    ovoid setComputeTransformCallback(ComputeTransformCallback* ctc)
    Set the ComputerTransfromCallback which allows users to attach custom computation of the local transformation as seen by cull traversers and the like.

    - -

    oComputeTransformCallback* getComputeTransformCallback() + +
    oComputeTransformCallback* getComputeTransformCallback()
    Get the non const ComputerTransfromCallback

    - -

    oconst ComputeTransformCallback* getComputeTransformCallback() const + +
    oconst ComputeTransformCallback* getComputeTransformCallback() const
    Get the const ComputerTransfromCallback

    - -

    oinline const bool getLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const + +
    oinline bool getLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const
    Get the transformation matrix which moves from local coords to world coords. Returns true if the Matrix passed in has been updated.

    - -

    oinline const bool getWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const + +
    oinline bool getWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const
    Get the transformation matrix which moves from world coords to local coords. Return true if the Matrix passed in has been updated.

    - -

    ovirtual const bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor*) const + +
    ovirtual bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor*) const

    - -

    ovirtual const bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor*) const + +
    ovirtual bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor*) const

    - +

    ovirtual ~Transform()

    - -

    ovirtual const bool computeBound() const + +
    ovirtual bool computeBound() const
    Overrides Group's computeBound. There is no need to override in subclasses from osg::Transform since this computeBound() uses the underlying matrix (calling computeMatrix if required.)

    - -

    oref_ptr<ComputeTransformCallback> _computeTransformCallback + +
    oref_ptr<ComputeTransformCallback> _computeTransformCallback

    - -

    oReferenceFrame _referenceFrame + +
    oReferenceFrame _referenceFrame

    Direct child classes: diff --git a/doc/doc++/osg/TriangleFunctor.html b/doc/doc++/osg/TriangleFunctor.html index 91414cbb2..cfa0e503c 100644 --- a/doc/doc++/osg/TriangleFunctor.html +++ b/doc/doc++/osg/TriangleFunctor.html @@ -7,7 +7,7 @@ -

    template<class T> class osg::TriangleFunctor

    +

    template<class T> class osg::TriangleFunctor

    Inheritance:

    @@ -22,39 +22,39 @@

    Public Methods

    -[more] TriangleFunctor() +[more] TriangleFunctor()
    -[more]virtual ~TriangleFunctor() +[more]virtual ~TriangleFunctor()
    -[more]virtual void setVertexArray(unsigned int count, Vec3* vertices) +[more]virtual void setVertexArray(unsigned int count, const Vec3* vertices)
    -[more]virtual void drawArrays(GLenum mode, GLint first, GLsizei count) +[more]virtual void drawArrays(GLenum mode, GLint first, GLsizei count)
    -[more]virtual void drawElements(GLenum mode, GLsizei count, GLubyte* indices) +[more]virtual void drawElements(GLenum mode, GLsizei count, const GLubyte* indices)
    -[more]virtual void drawElements(GLenum mode, GLsizei count, GLushort* indices) +[more]virtual void drawElements(GLenum mode, GLsizei count, const GLushort* indices)
    -[more]virtual void drawElements(GLenum mode, GLsizei count, GLuint* indices) +[more]virtual void drawElements(GLenum mode, GLsizei count, const GLuint* indices)
    -[more]inline void begin(GLenum mode) +[more]inline void begin(GLenum mode)
    begin(),vertex() & end() are convinience methods for adapting non vertex array primitives to vertex array based primitives.
    -[more]inline void vertex(const Vec3& vert) +[more]inline void vertex(const Vec3& vert)
    -[more]inline void vertex(float x, float y, float z) +[more]inline void vertex(float x, float y, float z)
    -[more]inline void end() +[more]inline void end()

    Protected Fields

    -[more]unsigned int _vertexArraySize +[more]unsigned int _vertexArraySize
    -[more]Vec3* _vertexArrayPtr +[more]const Vec3* _vertexArrayPtr
    -[more]GLenum _modeCache +[more]GLenum _modeCache
    -[more]std::vector<Vec3> _vertexCache +[more]std::vector<Vec3> _vertexCache

    @@ -65,35 +65,35 @@
    - +
    o TriangleFunctor()

    - +

    ovirtual ~TriangleFunctor()

    - -

    ovirtual void setVertexArray(unsigned int count, Vec3* vertices) + +
    ovirtual void setVertexArray(unsigned int count, const Vec3* vertices)

    - -

    ovirtual void drawArrays(GLenum mode, GLint first, GLsizei count) + +
    ovirtual void drawArrays(GLenum mode, GLint first, GLsizei count)

    - -

    ovirtual void drawElements(GLenum mode, GLsizei count, GLubyte* indices) + +
    ovirtual void drawElements(GLenum mode, GLsizei count, const GLubyte* indices)

    - -

    ovirtual void drawElements(GLenum mode, GLsizei count, GLushort* indices) + +
    ovirtual void drawElements(GLenum mode, GLsizei count, const GLushort* indices)

    - -

    ovirtual void drawElements(GLenum mode, GLsizei count, GLuint* indices) + +
    ovirtual void drawElements(GLenum mode, GLsizei count, const GLuint* indices)

    - +

    oinline void begin(GLenum mode)
    begin(),vertex() & end() are convinience methods for adapting non vertex array primitives to vertex array based primitives. @@ -101,31 +101,31 @@ this is done to simplify the implementation of primtive functor subclasses - users only need override drawArray and drawElements.

    - +

    oinline void vertex(const Vec3& vert)

    - -

    oinline void vertex(float x, float y, float z) + +
    oinline void vertex(float x, float y, float z)

    - +

    oinline void end()

    - +

    ounsigned int _vertexArraySize

    - -

    oVec3* _vertexArrayPtr + +
    oconst Vec3* _vertexArrayPtr

    - +

    oGLenum _modeCache

    - +

    ostd::vector<Vec3> _vertexCache

    diff --git a/doc/doc++/osg/UByte4.html b/doc/doc++/osg/UByte4.html index ffcfb4677..9e24787ef 100644 --- a/doc/doc++/osg/UByte4.html +++ b/doc/doc++/osg/UByte4.html @@ -13,69 +13,69 @@

    Public Fields

    -[more]unsigned char _v[4] +[more]unsigned char _v[4]

    Public Methods

    -[more] UByte4() +[more] UByte4()
    -[more] UByte4(unsigned char r, unsigned char g, unsigned char b, unsigned char a) +[more] UByte4(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
    -[more]inline const bool operator == (const UByte4& v) const +[more]inline bool operator == (const UByte4& v) const
    -[more]inline const bool operator != (const UByte4& v) const +[more]inline bool operator != (const UByte4& v) const
    -[more]inline const bool operator < (const UByte4& v) const +[more]inline bool operator < (const UByte4& v) const
    -[more]inline unsigned char* ptr() +[more]inline unsigned char* ptr()
    -[more]inline const unsigned char* ptr() const +[more]inline const unsigned char* ptr() const
    -[more]inline void set(unsigned char r, unsigned char g, unsigned char b, unsigned char a) +[more]inline void set(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
    -[more]inline unsigned char& operator [] (const int i) +[more]inline unsigned char& operator [] (unsigned int i)
    -[more]inline unsigned char operator [] (const int i) const +[more]inline unsigned char operator [] (unsigned int i) const
    -[more]inline unsigned char& r() +[more]inline unsigned char& r()
    -[more]inline unsigned char& g() +[more]inline unsigned char& g()
    -[more]inline unsigned char& b() +[more]inline unsigned char& b()
    -[more]inline unsigned char& a() +[more]inline unsigned char& a()
    -[more]inline unsigned char r() const +[more]inline unsigned char r() const
    -[more]inline unsigned char g() const +[more]inline unsigned char g() const
    -[more]inline unsigned char b() const +[more]inline unsigned char b() const
    -[more]inline unsigned char a() const +[more]inline unsigned char a() const
    -[more]inline UByte4 operator * (const float rhs) const +[more]inline UByte4 operator * (float rhs) const
    multiply by scalar
    -[more]inline UByte4& operator *= (const float rhs) +[more]inline UByte4& operator *= (float rhs)
    unary multiply by scalar
    -[more]inline UByte4 operator / (const float rhs) const +[more]inline UByte4 operator / (float rhs) const
    divide by scalar
    -[more]inline UByte4& operator /= (const float rhs) +[more]inline UByte4& operator /= (float rhs)
    unary divide by scalar
    -[more]inline UByte4 operator + (const UByte4& rhs) const +[more]inline UByte4 operator + (const UByte4& rhs) const
    binary vector add
    -[more]inline UByte4& operator += (const UByte4& rhs) +[more]inline UByte4& operator += (const UByte4& rhs)
    unary vector add.
    -[more]inline UByte4 operator - (const UByte4& rhs) const +[more]inline UByte4 operator - (const UByte4& rhs) const
    binary vector subtract
    -[more]inline UByte4& operator -= (const UByte4& rhs) +[more]inline UByte4& operator -= (const UByte4& rhs)
    unary vector subtract

    @@ -92,119 +92,119 @@ UByte4 * float is okay
    - +
    o UByte4()

    - -

    o UByte4(unsigned char r, unsigned char g, unsigned char b, unsigned char a) + +
    o UByte4(unsigned char r, unsigned char g, unsigned char b, unsigned char a)

    - +

    ounsigned char _v[4]

    - -

    oinline const bool operator == (const UByte4& v) const + +
    oinline bool operator == (const UByte4& v) const

    - -

    oinline const bool operator != (const UByte4& v) const + +
    oinline bool operator != (const UByte4& v) const

    - -

    oinline const bool operator < (const UByte4& v) const + +
    oinline bool operator < (const UByte4& v) const

    - +

    oinline unsigned char* ptr()

    - +

    oinline const unsigned char* ptr() const

    - -

    oinline void set(unsigned char r, unsigned char g, unsigned char b, unsigned char a) + +
    oinline void set(unsigned char r, unsigned char g, unsigned char b, unsigned char a)

    - -

    oinline unsigned char& operator [] (const int i) + +
    oinline unsigned char& operator [] (unsigned int i)

    - -

    oinline unsigned char operator [] (const int i) const + +
    oinline unsigned char operator [] (unsigned int i) const

    - +

    oinline unsigned char& r()

    - +

    oinline unsigned char& g()

    - +

    oinline unsigned char& b()

    - +

    oinline unsigned char& a()

    - +

    oinline unsigned char r() const

    - +

    oinline unsigned char g() const

    - +

    oinline unsigned char b() const

    - +

    oinline unsigned char a() const

    - -

    oinline UByte4 operator * (const float rhs) const + +
    oinline UByte4 operator * (float rhs) const
    multiply by scalar

    - -

    oinline UByte4& operator *= (const float rhs) + +
    oinline UByte4& operator *= (float rhs)
    unary multiply by scalar

    - -

    oinline UByte4 operator / (const float rhs) const + +
    oinline UByte4 operator / (float rhs) const
    divide by scalar

    - -

    oinline UByte4& operator /= (const float rhs) + +
    oinline UByte4& operator /= (float rhs)
    unary divide by scalar

    - +

    oinline UByte4 operator + (const UByte4& rhs) const
    binary vector add

    - +

    oinline UByte4& operator += (const UByte4& rhs)
    unary vector add. Slightly more efficient because no temporary intermediate object

    - +

    oinline UByte4 operator - (const UByte4& rhs) const
    binary vector subtract

    - +

    oinline UByte4& operator -= (const UByte4& rhs)
    unary vector subtract

    diff --git a/doc/doc++/osg/Vec2.html b/doc/doc++/osg/Vec2.html index 925e7e5b6..ef9614d45 100644 --- a/doc/doc++/osg/Vec2.html +++ b/doc/doc++/osg/Vec2.html @@ -13,80 +13,80 @@

    Public Fields

    -[more]float _v[2] +[more]float _v[2]

    Public Methods

    -[more] Vec2() +[more] Vec2()
    -[more] Vec2(float x, float y) +[more] Vec2(float x, float y)
    -[more]inline const bool operator == (const Vec2& v) const +[more]inline bool operator == (const Vec2& v) const
    -[more]inline const bool operator != (const Vec2& v) const +[more]inline bool operator != (const Vec2& v) const
    -[more]inline const bool operator < (const Vec2& v) const +[more]inline bool operator < (const Vec2& v) const
    -[more]inline float* ptr() +[more]inline float* ptr()
    -[more]inline const float* ptr() const +[more]inline const float* ptr() const
    -[more]inline void set( float x, float y ) +[more]inline void set( float x, float y )
    -[more]inline float& operator [] (int i) +[more]inline float& operator [] (int i)
    -[more]inline const float operator [] (int i) const +[more]inline float operator [] (int i) const
    -[more]inline float& x() +[more]inline float& x()
    -[more]inline float& y() +[more]inline float& y()
    -[more]inline const float x() const +[more]inline float x() const
    -[more]inline const float y() const +[more]inline float y() const
    -[more]inline const bool valid() const +[more]inline bool valid() const
    -[more]inline const bool isNaN() const +[more]inline bool isNaN() const
    -[more]inline const float operator * (const Vec2& rhs) const +[more]inline float operator * (const Vec2& rhs) const
    dot product
    -[more]inline const Vec2 operator * (const float& rhs) const +[more]inline const Vec2 operator * (float rhs) const
    multiply by scalar
    -[more]inline Vec2& operator *= (const float& rhs) +[more]inline Vec2& operator *= (float rhs)
    unary multiply by scalar
    -[more]inline const Vec2 operator / (const float& rhs) const +[more]inline const Vec2 operator / (float rhs) const
    divide by scalar
    -[more]inline Vec2& operator /= (const float& rhs) +[more]inline Vec2& operator /= (float rhs)
    unary divide by scalar
    -[more]inline const Vec2 operator + (const Vec2& rhs) const +[more]inline const Vec2 operator + (const Vec2& rhs) const
    binary vector add
    -[more]inline Vec2& operator += (const Vec2& rhs) +[more]inline Vec2& operator += (const Vec2& rhs)
    unary vector add.
    -[more]inline const Vec2 operator - (const Vec2& rhs) const +[more]inline const Vec2 operator - (const Vec2& rhs) const
    binary vector subtract
    -[more]inline Vec2& operator -= (const Vec2& rhs) +[more]inline Vec2& operator -= (const Vec2& rhs)
    unary vector subtract
    -[more]inline const Vec2 operator - () const +[more]inline const Vec2 operator - () const
    negation operator.
    -[more]inline const float length() const +[more]inline float length() const
    Length of the vector = sqrt( vec .
    -[more]inline const float length2( void ) const +[more]inline float length2( void ) const
    Length squared of the vector = vec .
    -[more]inline const float normalize() +[more]inline float normalize()
    normalize the vector so that it has length unity returns the previous length of the vector

    @@ -103,137 +103,137 @@ BTW: Vec2 * float is okay
    - +
    o Vec2()

    - -

    o Vec2(float x, float y) + +
    o Vec2(float x, float y)

    - +

    ofloat _v[2]

    - -

    oinline const bool operator == (const Vec2& v) const + +
    oinline bool operator == (const Vec2& v) const

    - -

    oinline const bool operator != (const Vec2& v) const + +
    oinline bool operator != (const Vec2& v) const

    - -

    oinline const bool operator < (const Vec2& v) const + +
    oinline bool operator < (const Vec2& v) const

    - +

    oinline float* ptr()

    - +

    oinline const float* ptr() const

    - -

    oinline void set( float x, float y ) + +
    oinline void set( float x, float y )

    - +

    oinline float& operator [] (int i)

    - -

    oinline const float operator [] (int i) const + +
    oinline float operator [] (int i) const

    - +

    oinline float& x()

    - +

    oinline float& y()

    - -

    oinline const float x() const + +
    oinline float x() const

    - -

    oinline const float y() const + +
    oinline float y() const

    - -

    oinline const bool valid() const + +
    oinline bool valid() const

    - -

    oinline const bool isNaN() const + +
    oinline bool isNaN() const

    - -

    oinline const float operator * (const Vec2& rhs) const + +
    oinline float operator * (const Vec2& rhs) const
    dot product

    - -

    oinline const Vec2 operator * (const float& rhs) const + +
    oinline const Vec2 operator * (float rhs) const
    multiply by scalar

    - -

    oinline Vec2& operator *= (const float& rhs) + +
    oinline Vec2& operator *= (float rhs)
    unary multiply by scalar

    - -

    oinline const Vec2 operator / (const float& rhs) const + +
    oinline const Vec2 operator / (float rhs) const
    divide by scalar

    - -

    oinline Vec2& operator /= (const float& rhs) + +
    oinline Vec2& operator /= (float rhs)
    unary divide by scalar

    - +

    oinline const Vec2 operator + (const Vec2& rhs) const
    binary vector add

    - +

    oinline Vec2& operator += (const Vec2& rhs)
    unary vector add. Slightly more efficient because no temporary intermediate object.

    - +

    oinline const Vec2 operator - (const Vec2& rhs) const
    binary vector subtract

    - +

    oinline Vec2& operator -= (const Vec2& rhs)
    unary vector subtract

    - +

    oinline const Vec2 operator - () const
    negation operator. Returns the negative of the Vec2

    - -

    oinline const float length() const + +
    oinline float length() const
    Length of the vector = sqrt( vec . vec )

    - -

    oinline const float length2( void ) const + +
    oinline float length2( void ) const
    Length squared of the vector = vec . vec

    - -

    oinline const float normalize() + +
    oinline float normalize()
    normalize the vector so that it has length unity returns the previous length of the vector

    diff --git a/doc/doc++/osg/Vec3.html b/doc/doc++/osg/Vec3.html index 644185a98..145fc515f 100644 --- a/doc/doc++/osg/Vec3.html +++ b/doc/doc++/osg/Vec3.html @@ -13,87 +13,87 @@

    Public Fields

    -[more]float _v[3] +[more]float _v[3]

    Public Methods

    -[more] Vec3() +[more] Vec3()
    -[more] Vec3(float x, float y, float z) +[more] Vec3(float x, float y, float z)
    -[more]inline const bool operator == (const Vec3& v) const +[more]inline bool operator == (const Vec3& v) const
    -[more]inline const bool operator != (const Vec3& v) const +[more]inline bool operator != (const Vec3& v) const
    -[more]inline const bool operator < (const Vec3& v) const +[more]inline bool operator < (const Vec3& v) const
    -[more]inline float* ptr() +[more]inline float* ptr()
    -[more]inline const float* ptr() const +[more]inline const float* ptr() const
    -[more]inline void set( float x, float y, float z) +[more]inline void set( float x, float y, float z)
    -[more]inline float& operator [] (int i) +[more]inline float& operator [] (int i)
    -[more]inline const float operator [] (int i) const +[more]inline float operator [] (int i) const
    -[more]inline float& x() +[more]inline float& x()
    -[more]inline float& y() +[more]inline float& y()
    -[more]inline float& z() +[more]inline float& z()
    -[more]inline const float x() const +[more]inline float x() const
    -[more]inline const float y() const +[more]inline float y() const
    -[more]inline const float z() const +[more]inline float z() const
    -[more]inline const bool valid() const +[more]inline bool valid() const
    -[more]inline const bool isNaN() const +[more]inline bool isNaN() const
    -[more]inline float operator * (const Vec3& rhs) const +[more]inline float operator * (const Vec3& rhs) const
    dot product
    -[more]inline const Vec3 operator ^ (const Vec3& rhs) const +[more]inline const Vec3 operator ^ (const Vec3& rhs) const
    cross product
    -[more]inline const Vec3 operator * (const float& rhs) const +[more]inline const Vec3 operator * (float rhs) const
    multiply by scalar
    -[more]inline Vec3& operator *= (const float& rhs) +[more]inline Vec3& operator *= (float rhs)
    unary multiply by scalar
    -[more]inline const Vec3 operator / (const float& rhs) const +[more]inline const Vec3 operator / (float rhs) const
    divide by scalar
    -[more]inline Vec3& operator /= (const float& rhs) +[more]inline Vec3& operator /= (float rhs)
    unary divide by scalar
    -[more]inline const Vec3 operator + (const Vec3& rhs) const +[more]inline const Vec3 operator + (const Vec3& rhs) const
    binary vector add
    -[more]inline Vec3& operator += (const Vec3& rhs) +[more]inline Vec3& operator += (const Vec3& rhs)
    unary vector add.
    -[more]inline const Vec3 operator - (const Vec3& rhs) const +[more]inline const Vec3 operator - (const Vec3& rhs) const
    binary vector subtract
    -[more]inline Vec3& operator -= (const Vec3& rhs) +[more]inline Vec3& operator -= (const Vec3& rhs)
    unary vector subtract
    -[more]inline const Vec3 operator - () const +[more]inline const Vec3 operator - () const
    negation operator.
    -[more]inline const float length() const +[more]inline float length() const
    Length of the vector = sqrt( vec .
    -[more]inline const float length2() const +[more]inline float length2() const
    Length squared of the vector = vec .
    -[more]inline const float normalize() +[more]inline float normalize()
    normalize the vector so that it has length unity returns the previous length of the vector

    @@ -110,150 +110,150 @@ Vec3 * float is okay
    - +
    o Vec3()

    - -

    o Vec3(float x, float y, float z) + +
    o Vec3(float x, float y, float z)

    - +

    ofloat _v[3]

    - -

    oinline const bool operator == (const Vec3& v) const + +
    oinline bool operator == (const Vec3& v) const

    - -

    oinline const bool operator != (const Vec3& v) const + +
    oinline bool operator != (const Vec3& v) const

    - -

    oinline const bool operator < (const Vec3& v) const + +
    oinline bool operator < (const Vec3& v) const

    - +

    oinline float* ptr()

    - +

    oinline const float* ptr() const

    - -

    oinline void set( float x, float y, float z) + +
    oinline void set( float x, float y, float z)

    - +

    oinline float& operator [] (int i)

    - -

    oinline const float operator [] (int i) const + +
    oinline float operator [] (int i) const

    - +

    oinline float& x()

    - +

    oinline float& y()

    - +

    oinline float& z()

    - -

    oinline const float x() const + +
    oinline float x() const

    - -

    oinline const float y() const + +
    oinline float y() const

    - -

    oinline const float z() const + +
    oinline float z() const

    - -

    oinline const bool valid() const + +
    oinline bool valid() const

    - -

    oinline const bool isNaN() const + +
    oinline bool isNaN() const

    - +

    oinline float operator * (const Vec3& rhs) const
    dot product

    - +

    oinline const Vec3 operator ^ (const Vec3& rhs) const
    cross product

    - -

    oinline const Vec3 operator * (const float& rhs) const + +
    oinline const Vec3 operator * (float rhs) const
    multiply by scalar

    - -

    oinline Vec3& operator *= (const float& rhs) + +
    oinline Vec3& operator *= (float rhs)
    unary multiply by scalar

    - -

    oinline const Vec3 operator / (const float& rhs) const + +
    oinline const Vec3 operator / (float rhs) const
    divide by scalar

    - -

    oinline Vec3& operator /= (const float& rhs) + +
    oinline Vec3& operator /= (float rhs)
    unary divide by scalar

    - +

    oinline const Vec3 operator + (const Vec3& rhs) const
    binary vector add

    - +

    oinline Vec3& operator += (const Vec3& rhs)
    unary vector add. Slightly more efficient because no temporary intermediate object

    - +

    oinline const Vec3 operator - (const Vec3& rhs) const
    binary vector subtract

    - +

    oinline Vec3& operator -= (const Vec3& rhs)
    unary vector subtract

    - +

    oinline const Vec3 operator - () const
    negation operator. Returns the negative of the Vec3

    - -

    oinline const float length() const + +
    oinline float length() const
    Length of the vector = sqrt( vec . vec )

    - -

    oinline const float length2() const + +
    oinline float length2() const
    Length squared of the vector = vec . vec

    - -

    oinline const float normalize() + +
    oinline float normalize()
    normalize the vector so that it has length unity returns the previous length of the vector

    diff --git a/doc/doc++/osg/Vec4.html b/doc/doc++/osg/Vec4.html index 578f640dd..86261c75a 100644 --- a/doc/doc++/osg/Vec4.html +++ b/doc/doc++/osg/Vec4.html @@ -13,94 +13,94 @@

    Public Fields

    -[more]float _v[4] +[more]float _v[4]

    Public Methods

    -[more] Vec4() +[more] Vec4()
    -[more] Vec4(float x, float y, float z, float w) +[more] Vec4(float x, float y, float z, float w)
    -[more] Vec4(const Vec3& v3, float w) +[more] Vec4(const Vec3& v3, float w)
    -[more]inline const bool operator == (const Vec4& v) const +[more]inline bool operator == (const Vec4& v) const
    -[more]inline const bool operator != (const Vec4& v) const +[more]inline bool operator != (const Vec4& v) const
    -[more]inline const bool operator < (const Vec4& v) const +[more]inline bool operator < (const Vec4& v) const
    -[more]inline float* ptr() +[more]inline float* ptr()
    -[more]inline const float* ptr() const +[more]inline const float* ptr() const
    -[more]inline void set( float x, float y, float z, float w) +[more]inline void set( float x, float y, float z, float w)
    -[more]inline float& operator [] (const int i) +[more]inline float& operator [] (unsigned int i)
    -[more]inline float operator [] (const int i) const +[more]inline float operator [] (unsigned int i) const
    -[more]inline float& x() +[more]inline float& x()
    -[more]inline float& y() +[more]inline float& y()
    -[more]inline float& z() +[more]inline float& z()
    -[more]inline float& w() +[more]inline float& w()
    -[more]inline float x() const +[more]inline float x() const
    -[more]inline float y() const +[more]inline float y() const
    -[more]inline float z() const +[more]inline float z() const
    -[more]inline float w() const +[more]inline float w() const
    -[more]inline unsigned long asABGR() const +[more]inline unsigned long asABGR() const
    -[more]inline const unsigned long asRGBA() const +[more]inline unsigned long asRGBA() const
    -[more]inline const bool valid() const +[more]inline bool valid() const
    -[more]inline const bool isNaN() const +[more]inline bool isNaN() const
    -[more]inline float operator * (const Vec4& rhs) const +[more]inline float operator * (const Vec4& rhs) const
    dot product
    -[more]inline Vec4 operator * (const float rhs) const +[more]inline Vec4 operator * (float rhs) const
    multiply by scalar
    -[more]inline Vec4& operator *= (const float rhs) +[more]inline Vec4& operator *= (float rhs)
    unary multiply by scalar
    -[more]inline Vec4 operator / (const float rhs) const +[more]inline Vec4 operator / (float rhs) const
    divide by scalar
    -[more]inline Vec4& operator /= (const float rhs) +[more]inline Vec4& operator /= (float rhs)
    unary divide by scalar
    -[more]inline Vec4 operator + (const Vec4& rhs) const +[more]inline Vec4 operator + (const Vec4& rhs) const
    binary vector add
    -[more]inline Vec4& operator += (const Vec4& rhs) +[more]inline Vec4& operator += (const Vec4& rhs)
    unary vector add.
    -[more]inline Vec4 operator - (const Vec4& rhs) const +[more]inline Vec4 operator - (const Vec4& rhs) const
    binary vector subtract
    -[more]inline Vec4& operator -= (const Vec4& rhs) +[more]inline Vec4& operator -= (const Vec4& rhs)
    unary vector subtract
    -[more]inline const Vec4 operator - () const +[more]inline const Vec4 operator - () const
    negation operator.
    -[more]inline const float length() const +[more]inline float length() const
    Length of the vector = sqrt( vec .
    -[more]inline const float length2() const +[more]inline float length2() const
    Length squared of the vector = vec .
    -[more]inline const float normalize() +[more]inline float normalize()
    normalize the vector so that it has length unity returns the previous length of the vector

    @@ -117,165 +117,165 @@ Vec4 * float is okay
    - +
    o Vec4()

    - -

    o Vec4(float x, float y, float z, float w) + +
    o Vec4(float x, float y, float z, float w)

    - -

    o Vec4(const Vec3& v3, float w) + +
    o Vec4(const Vec3& v3, float w)

    - +

    ofloat _v[4]

    - -

    oinline const bool operator == (const Vec4& v) const + +
    oinline bool operator == (const Vec4& v) const

    - -

    oinline const bool operator != (const Vec4& v) const + +
    oinline bool operator != (const Vec4& v) const

    - -

    oinline const bool operator < (const Vec4& v) const + +
    oinline bool operator < (const Vec4& v) const

    - +

    oinline float* ptr()

    - +

    oinline const float* ptr() const

    - -

    oinline void set( float x, float y, float z, float w) + +
    oinline void set( float x, float y, float z, float w)

    - -

    oinline float& operator [] (const int i) + +
    oinline float& operator [] (unsigned int i)

    - -

    oinline float operator [] (const int i) const + +
    oinline float operator [] (unsigned int i) const

    - +

    oinline float& x()

    - +

    oinline float& y()

    - +

    oinline float& z()

    - +

    oinline float& w()

    - +

    oinline float x() const

    - +

    oinline float y() const

    - +

    oinline float z() const

    - +

    oinline float w() const

    - +

    oinline unsigned long asABGR() const

    - -

    oinline const unsigned long asRGBA() const + +
    oinline unsigned long asRGBA() const

    - -

    oinline const bool valid() const + +
    oinline bool valid() const

    - -

    oinline const bool isNaN() const + +
    oinline bool isNaN() const

    - +

    oinline float operator * (const Vec4& rhs) const
    dot product

    - -

    oinline Vec4 operator * (const float rhs) const + +
    oinline Vec4 operator * (float rhs) const
    multiply by scalar

    - -

    oinline Vec4& operator *= (const float rhs) + +
    oinline Vec4& operator *= (float rhs)
    unary multiply by scalar

    - -

    oinline Vec4 operator / (const float rhs) const + +
    oinline Vec4 operator / (float rhs) const
    divide by scalar

    - -

    oinline Vec4& operator /= (const float rhs) + +
    oinline Vec4& operator /= (float rhs)
    unary divide by scalar

    - +

    oinline Vec4 operator + (const Vec4& rhs) const
    binary vector add

    - +

    oinline Vec4& operator += (const Vec4& rhs)
    unary vector add. Slightly more efficient because no temporary intermediate object

    - +

    oinline Vec4 operator - (const Vec4& rhs) const
    binary vector subtract

    - +

    oinline Vec4& operator -= (const Vec4& rhs)
    unary vector subtract

    - +

    oinline const Vec4 operator - () const
    negation operator. Returns the negative of the Vec4

    - -

    oinline const float length() const + +
    oinline float length() const
    Length of the vector = sqrt( vec . vec )

    - -

    oinline const float length2() const + +
    oinline float length2() const
    Length squared of the vector = vec . vec

    - -

    oinline const float normalize() + +
    oinline float normalize()
    normalize the vector so that it has length unity returns the previous length of the vector

    diff --git a/doc/doc++/osg/VectorSizei.html b/doc/doc++/osg/VectorSizei.html index 5cbd1b159..12b685660 100644 --- a/doc/doc++/osg/VectorSizei.html +++ b/doc/doc++/osg/VectorSizei.html @@ -2,36 +2,29 @@ - typedef std::vector<GLuint> VectorUIntclass osg::VectorSizei + typedef std::vector<GLsizei> osg::VectorSizei -

    typedef std::vector<GLuint> VectorUIntclass osg::VectorSizei

    - -

    Inheritance:

    - - - - - - - +

    typedef std::vector<GLsizei> osg::VectorSizei

    - -

    -

    Public Methods

    -[more]typedef std::vector<value_type> inherited VectorSizei() + + +
    -[more]explicit VectorSizei(size_type n) +otypedef std::vector<value_type> inherited
    -[more] VectorSizei(const VectorSizei &copy) +[more] VectorSizei()
    -[more]template<class InputIterator> VectorSizei(InputIterator beg_, InputIterator end_) +[more]explicit VectorSizei(size_type n) +
    +[more] VectorSizei(const VectorSizei &copy) +
    +[more]template<class InputIterator> VectorSizei(InputIterator beg_, InputIterator end_)

    -
    @@ -39,26 +32,21 @@
    - -
    otypedef std::vector<value_type> inherited VectorSizei() + +
    o VectorSizei()

    - +

    oexplicit VectorSizei(size_type n)

    - -

    o VectorSizei(const VectorSizei &copy) + +
    o VectorSizei(const VectorSizei &copy)

    - +

    otemplate<class InputIterator> VectorSizei(InputIterator beg_, InputIterator end_)

    -
    -
    Direct child classes: -
    DrawArrayLengths
    -
    -

    Alphabetic index HTML hierarchy of classes or Java


    This page was generated with the help of DOC++. diff --git a/doc/doc++/osg/VectorUByte.html b/doc/doc++/osg/VectorUByte.html index 212855a7d..77608d5cf 100644 --- a/doc/doc++/osg/VectorUByte.html +++ b/doc/doc++/osg/VectorUByte.html @@ -2,36 +2,29 @@ - class osg::VectorUByte + typedef std::vector<GLubyte> osg::VectorUByte -

    class osg::VectorUByte

    - -

    Inheritance:

    - - - - - - - +

    typedef std::vector<GLubyte> osg::VectorUByte

    - -

    -

    Public Methods

    -[more]typedef std::vector<value_type> inherited VectorUByte() + + +
    -[more]explicit VectorUByte(size_type n) +otypedef std::vector<value_type> inherited
    -[more] VectorUByte(const VectorUByte &copy) +[more] VectorUByte()
    -[more]template<class InputIterator> VectorUByte(InputIterator beg_, InputIterator end_) +[more]explicit VectorUByte(size_type n) +
    +[more] VectorUByte(const VectorUByte &copy) +
    +[more]template<class InputIterator> VectorUByte(InputIterator beg_, InputIterator end_)

    -
    @@ -39,26 +32,21 @@
    - -
    otypedef std::vector<value_type> inherited VectorUByte() + +
    o VectorUByte()

    - +

    oexplicit VectorUByte(size_type n)

    - -

    o VectorUByte(const VectorUByte &copy) + +
    o VectorUByte(const VectorUByte &copy)

    - +

    otemplate<class InputIterator> VectorUByte(InputIterator beg_, InputIterator end_)

    -
    -
    Direct child classes: -
    DrawElementsUByte
    -
    -

    Alphabetic index HTML hierarchy of classes or Java


    This page was generated with the help of DOC++. diff --git a/doc/doc++/osg/VectorUInt.html b/doc/doc++/osg/VectorUInt.html index 02dadbc8a..8f2882311 100644 --- a/doc/doc++/osg/VectorUInt.html +++ b/doc/doc++/osg/VectorUInt.html @@ -2,36 +2,29 @@ - class osg::VectorUInt + typedef std::vector<GLuint> osg::VectorUInt -

    class osg::VectorUInt

    - -

    Inheritance:

    - - - - - - - +

    typedef std::vector<GLuint> osg::VectorUInt

    - -

    -

    Public Methods

    -[more]typedef std::vector<value_type> inherited VectorUInt() + + +
    -[more]explicit VectorUInt(size_type n) +otypedef std::vector<value_type> inherited
    -[more] VectorUInt(const VectorUInt &copy) +[more] VectorUInt()
    -[more]template<class InputIterator> VectorUInt(InputIterator beg_, InputIterator end_) +[more]explicit VectorUInt(size_type n) +
    +[more] VectorUInt(const VectorUInt &copy) +
    +[more]template<class InputIterator> VectorUInt(InputIterator beg_, InputIterator end_)

    -
    @@ -39,26 +32,21 @@
    - -
    otypedef std::vector<value_type> inherited VectorUInt() + +
    o VectorUInt()

    - +

    oexplicit VectorUInt(size_type n)

    - -

    o VectorUInt(const VectorUInt &copy) + +
    o VectorUInt(const VectorUInt &copy)

    - +

    otemplate<class InputIterator> VectorUInt(InputIterator beg_, InputIterator end_)

    -
    -
    Direct child classes: -
    DrawElementsUInt
    -
    -

    Alphabetic index HTML hierarchy of classes or Java


    This page was generated with the help of DOC++. diff --git a/doc/doc++/osg/VectorUShort.html b/doc/doc++/osg/VectorUShort.html index fc51acfec..f7260a310 100644 --- a/doc/doc++/osg/VectorUShort.html +++ b/doc/doc++/osg/VectorUShort.html @@ -2,36 +2,29 @@ - class osg::VectorUShort + typedef std::vector<GLushort> osg::VectorUShort -

    class osg::VectorUShort

    - -

    Inheritance:

    - - - - - - - +

    typedef std::vector<GLushort> osg::VectorUShort

    - -

    -

    Public Methods

    -[more]typedef std::vector<value_type> inherited VectorUShort() + + +
    -[more]explicit VectorUShort(size_type n) +otypedef std::vector<value_type> inherited
    -[more] VectorUShort(const VectorUShort &copy) +[more] VectorUShort()
    -[more]template<class InputIterator> VectorUShort(InputIterator beg_, InputIterator end_) +[more]explicit VectorUShort(size_type n) +
    +[more] VectorUShort(const VectorUShort &copy) +
    +[more]template<class InputIterator> VectorUShort(InputIterator beg_, InputIterator end_)

    -
    @@ -39,26 +32,21 @@
    - -
    otypedef std::vector<value_type> inherited VectorUShort() + +
    o VectorUShort()

    - +

    oexplicit VectorUShort(size_type n)

    - -

    o VectorUShort(const VectorUShort &copy) + +
    o VectorUShort(const VectorUShort &copy)

    - +

    otemplate<class InputIterator> VectorUShort(InputIterator beg_, InputIterator end_)

    -
    -
    Direct child classes: -
    DrawElementsUShort
    -
    -

    Alphabetic index HTML hierarchy of classes or Java


    This page was generated with the help of DOC++. diff --git a/doc/doc++/osg/Viewport.html b/doc/doc++/osg/Viewport.html index dab28f004..a7ca299a3 100644 --- a/doc/doc++/osg/Viewport.html +++ b/doc/doc++/osg/Viewport.html @@ -23,53 +23,53 @@

    Public Methods

    -[more] Viewport() +[more] Viewport()
    -[more] Viewport(const Viewport& vp, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Viewport(const Viewport& vp, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more] META_StateAttribute(osg, Viewport, VIEWPORT) +[more] META_StateAttribute(osg, Viewport, VIEWPORT)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]inline void setViewport(const int x, const int y, const int width, const int height) +[more]inline void setViewport(int x, int y, int width, int height)
    -[more]void getViewport(int& x, int& y, int& width, int& height) const +[more]void getViewport(int& x, int& y, int& width, int& height) const
    -[more]inline const int x() const +[more]inline int x() const
    -[more]inline const int y() const +[more]inline int y() const
    -[more]inline const int width() const +[more]inline int width() const
    -[more]inline const int height() const +[more]inline int height() const
    -[more]inline const bool valid() const +[more]inline bool valid() const
    -[more]inline const float aspectRatio() const +[more]inline float aspectRatio() const
    Return the aspcetRatio of the viewport, which is equal to width/height.
    -[more]inline const osg::Matrix computeWindowMatrix() const +[more]inline const osg::Matrix computeWindowMatrix() const
    Compute the Window Matrix which takes projected coords into Window coordinates.
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

    Protected Fields

    -[more]int _x +[more]int _x
    -[more]int _y +[more]int _y
    -[more]int _width +[more]int _width
    -[more]int _height +[more]int _height

    Protected Methods

    -[more]virtual ~Viewport() +[more]virtual ~Viewport()

    @@ -87,7 +87,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual Type getType() const
    ovirtual bool isTextureAttribute() const
    @@ -97,7 +97,7 @@
    obool operator != (const StateAttribute& rhs) const
    -ovirtual void getAssociatedModes(std::vector<GLMode>& ) const +ovirtual void getAssociatedModes(std::vector<GLMode>& ) const
    ovirtual void compile(State&) const

    @@ -122,9 +122,9 @@

    Public Methods

    -oinline void setDataVariance(const DataVariance dv) +oinline void setDataVariance(const DataVariance dv)
    -oinline const DataVariance getDataVariance() const +oinline const DataVariance getDataVariance() const
    oinline void setUserData(Referenced* obj)
    @@ -140,7 +140,7 @@

    Protected Fields

    -oDataVariance _dataVariance +oDataVariance _dataVariance
    oref_ptr<Referenced> _userData

    @@ -158,12 +158,20 @@
    oinline void unref_nodelete() const
    -oinline const int referenceCount() const +oinline int referenceCount() const +
    +oinline static int createdCount() +
    +oinline static int deletedCount()

    Protected Fields

    omutable int _refCount +
    +ostatic int _createdCount +
    +ostatic int _deletedCount

    @@ -175,59 +183,59 @@
    - +
    o Viewport()

    - -

    o Viewport(const Viewport& vp, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
    o Viewport(const Viewport& vp, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
    Copy constructor using CopyOp to manage deep vs shallow copy

    - -

    o META_StateAttribute(osg, Viewport, VIEWPORT) + +
    o META_StateAttribute(osg, Viewport, VIEWPORT)

    - +

    ovirtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs

    - -

    oinline void setViewport(const int x, const int y, const int width, const int height) + +
    oinline void setViewport(int x, int y, int width, int height)

    - -

    ovoid getViewport(int& x, int& y, int& width, int& height) const + +
    ovoid getViewport(int& x, int& y, int& width, int& height) const

    - -

    oinline const int x() const + +
    oinline int x() const

    - -

    oinline const int y() const + +
    oinline int y() const

    - -

    oinline const int width() const + +
    oinline int width() const

    - -

    oinline const int height() const + +
    oinline int height() const

    - -

    oinline const bool valid() const + +
    oinline bool valid() const

    - -

    oinline const float aspectRatio() const + +
    oinline float aspectRatio() const
    Return the aspcetRatio of the viewport, which is equal to width/height. If height is zero, the potental division by zero is avoid by simply returning 1.0f.

    - +

    oinline const osg::Matrix computeWindowMatrix() const
    Compute the Window Matrix which takes projected coords into Window coordinates. To converted local coodinates into window coordinates use v_window = v_local * MVPW matrix, @@ -236,27 +244,27 @@ viewport::computeWindowMatrix(), the ModelView and Projection Matrix can either current osg::State object, via osgUtil::SceneView or CullVisitor.

    - +

    ovirtual void apply(State& state) const

    - +

    ovirtual ~Viewport()

    - +

    oint _x

    - +

    oint _y

    - +

    oint _width

    - +

    oint _height

    diff --git a/doc/doc++/osg/clampArray3BetweenRange.html b/doc/doc++/osg/clampArray3BetweenRange.html index f463e96a1..033531360 100644 --- a/doc/doc++/osg/clampArray3BetweenRange.html +++ b/doc/doc++/osg/clampArray3BetweenRange.html @@ -7,7 +7,7 @@ -

    template<class A, class T>inline void osg::clampArray3BetweenRange

    (A& value,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if array4 elements are between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    +

    template<class A, class T>inline void osg::clampArray3BetweenRange

    (A& value,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if array4 elements are between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    diff --git a/doc/doc++/osg/clampArray3GEQUAL.html b/doc/doc++/osg/clampArray3GEQUAL.html index 14c0145f2..0a079c73e 100644 --- a/doc/doc++/osg/clampArray3GEQUAL.html +++ b/doc/doc++/osg/clampArray3GEQUAL.html @@ -7,7 +7,7 @@ -

    template<class A, class T>inline void osg::clampArray3GEQUAL

    (A& value,
      const T minValue,
      const char* valueName)

    if array4 elements are greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class A, class T>inline void osg::clampArray3GEQUAL

    (A& value,
      const T minValue,
      const char* valueName)

    if array4 elements are greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    diff --git a/doc/doc++/osg/clampArray3LEQUAL.html b/doc/doc++/osg/clampArray3LEQUAL.html index e2e7ca1c5..00606d1dd 100644 --- a/doc/doc++/osg/clampArray3LEQUAL.html +++ b/doc/doc++/osg/clampArray3LEQUAL.html @@ -7,7 +7,7 @@ -

    template<class A, class T>inline void osg::clampArray3LEQUAL

    (A& value,
      const T maxValue,
      const char* valueName)

    if array4 elements are is less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class A, class T>inline void osg::clampArray3LEQUAL

    (A& value,
      const T maxValue,
      const char* valueName)

    if array4 elements are is less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    diff --git a/doc/doc++/osg/clampArray4BetweenRange.html b/doc/doc++/osg/clampArray4BetweenRange.html index 25f7bfdd5..0f8a1dc83 100644 --- a/doc/doc++/osg/clampArray4BetweenRange.html +++ b/doc/doc++/osg/clampArray4BetweenRange.html @@ -7,7 +7,7 @@ -

    template<class A, class T>inline void osg::clampArray4BetweenRange

    (A& value,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if array4 elements are between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    +

    template<class A, class T>inline void osg::clampArray4BetweenRange

    (A& value,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if array4 elements are between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    diff --git a/doc/doc++/osg/clampArray4GEQUAL.html b/doc/doc++/osg/clampArray4GEQUAL.html index 3bbd24e39..30e72ed83 100644 --- a/doc/doc++/osg/clampArray4GEQUAL.html +++ b/doc/doc++/osg/clampArray4GEQUAL.html @@ -7,7 +7,7 @@ -

    template<class A, class T>inline void osg::clampArray4GEQUAL

    (A& value,
      const T minValue,
      const char* valueName)

    if array4 elements are greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class A, class T>inline void osg::clampArray4GEQUAL

    (A& value,
      const T minValue,
      const char* valueName)

    if array4 elements are greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    diff --git a/doc/doc++/osg/clampArray4LEQUAL.html b/doc/doc++/osg/clampArray4LEQUAL.html index c7285a724..19e796452 100644 --- a/doc/doc++/osg/clampArray4LEQUAL.html +++ b/doc/doc++/osg/clampArray4LEQUAL.html @@ -7,7 +7,7 @@ -

    template<class A, class T>inline void osg::clampArray4LEQUAL

    (A& value,
      const unsigned int first,
      const unsigned int last,
      const T maxValue,
      const char* valueName)

    if array4 elements are is less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class A, class T>inline void osg::clampArray4LEQUAL

    (A& value,
      unsigned int first,
      unsigned int last,
      const T maxValue,
      const char* valueName)

    if array4 elements are is less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    diff --git a/doc/doc++/osg/clampArrayElementBetweenRange.html b/doc/doc++/osg/clampArrayElementBetweenRange.html index fcb3063d9..8466c3814 100644 --- a/doc/doc++/osg/clampArrayElementBetweenRange.html +++ b/doc/doc++/osg/clampArrayElementBetweenRange.html @@ -7,7 +7,7 @@ -

    template<class A, class T>inline void osg::clampArrayElementBetweenRange

    (A& value,
      const unsigned int i,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if array element value[i] is between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    +

    template<class A, class T>inline void osg::clampArrayElementBetweenRange

    (A& value,
      unsigned int i,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if array element value[i] is between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    diff --git a/doc/doc++/osg/clampArrayElementGEQUAL.html b/doc/doc++/osg/clampArrayElementGEQUAL.html index d98b47ee1..6f5932367 100644 --- a/doc/doc++/osg/clampArrayElementGEQUAL.html +++ b/doc/doc++/osg/clampArrayElementGEQUAL.html @@ -7,7 +7,7 @@ -

    template<class A, class T>inline void osg::clampArrayElementGEQUAL

    (A& value,
      const unsigned int i,
      const T minValue,
      const char* valueName)

    if array element value[i] is greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class A, class T>inline void osg::clampArrayElementGEQUAL

    (A& value,
      unsigned int i,
      const T minValue,
      const char* valueName)

    if array element value[i] is greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    diff --git a/doc/doc++/osg/clampArrayElementLEQUAL.html b/doc/doc++/osg/clampArrayElementLEQUAL.html index 8dbb004fa..aa1d19da3 100644 --- a/doc/doc++/osg/clampArrayElementLEQUAL.html +++ b/doc/doc++/osg/clampArrayElementLEQUAL.html @@ -7,7 +7,7 @@ -

    template<class A, class T>inline void osg::clampArrayElementLEQUAL

    (A& value,
      const unsigned int i,
      const T maxValue,
      const char* valueName)

    if array element value[i] is less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class A, class T>inline void osg::clampArrayElementLEQUAL

    (A& value,
      unsigned int i,
      const T maxValue,
      const char* valueName)

    if array element value[i] is less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    diff --git a/doc/doc++/osg/clampArrayElementsBetweenRange.html b/doc/doc++/osg/clampArrayElementsBetweenRange.html index fd401b73e..5562c9b6c 100644 --- a/doc/doc++/osg/clampArrayElementsBetweenRange.html +++ b/doc/doc++/osg/clampArrayElementsBetweenRange.html @@ -7,7 +7,7 @@ -

    template<class A, class T>inline void osg::clampArrayElementsBetweenRange

    (A& value,
      const unsigned int first,
      const unsigned int last,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if array elements are between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    +

    template<class A, class T>inline void osg::clampArrayElementsBetweenRange

    (A& value,
      unsigned int first,
      unsigned int last,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if array elements are between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    diff --git a/doc/doc++/osg/clampArrayElementsGEQUAL.html b/doc/doc++/osg/clampArrayElementsGEQUAL.html index c205ac80b..30899ee87 100644 --- a/doc/doc++/osg/clampArrayElementsGEQUAL.html +++ b/doc/doc++/osg/clampArrayElementsGEQUAL.html @@ -7,7 +7,7 @@ -

    template<class A, class T>inline void osg::clampArrayElementsGEQUAL

    (A& value,
      const unsigned int first,
      const unsigned int last,
      const T minValue,
      const char* valueName)

    if array elements are greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class A, class T>inline void osg::clampArrayElementsGEQUAL

    (A& value,
      unsigned int first,
      unsigned int last,
      const T minValue,
      const char* valueName)

    if array elements are greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    diff --git a/doc/doc++/osg/clampArrayElementsLEQUAL.html b/doc/doc++/osg/clampArrayElementsLEQUAL.html index aaaef5171..6d1f7b619 100644 --- a/doc/doc++/osg/clampArrayElementsLEQUAL.html +++ b/doc/doc++/osg/clampArrayElementsLEQUAL.html @@ -7,7 +7,7 @@ -

    template<class A, class T>inline void osg::clampArrayElementsLEQUAL

    (A& value,
      const unsigned int first,
      const unsigned int last,
      const T maxValue,
      const char* valueName)

    if array elements are less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class A, class T>inline void osg::clampArrayElementsLEQUAL

    (A& value,
      unsigned int first,
      unsigned int last,
      const T maxValue,
      const char* valueName)

    if array elements are less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    diff --git a/doc/doc++/osg/clampBetweenRange.html b/doc/doc++/osg/clampBetweenRange.html index 2a226d4e8..711266bbc 100644 --- a/doc/doc++/osg/clampBetweenRange.html +++ b/doc/doc++/osg/clampBetweenRange.html @@ -7,7 +7,7 @@ -

    template<class T>inline void osg::clampBetweenRange

    (T& value,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if value is between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    +

    template<class T>inline void osg::clampBetweenRange

    (T& value,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if value is between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    diff --git a/doc/doc++/osg/clampGEQUAL.html b/doc/doc++/osg/clampGEQUAL.html index 2412d1774..ea6decc01 100644 --- a/doc/doc++/osg/clampGEQUAL.html +++ b/doc/doc++/osg/clampGEQUAL.html @@ -7,7 +7,7 @@ -

    template<class T>inline void osg::clampGEQUAL

    (T& value,
      const T minValue,
      const char* valueName)

    if value is greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class T>inline void osg::clampGEQUAL

    (T& value,
      const T minValue,
      const char* valueName)

    if value is greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    diff --git a/doc/doc++/osg/clampLEQUAL.html b/doc/doc++/osg/clampLEQUAL.html index df37557f5..3098e0d54 100644 --- a/doc/doc++/osg/clampLEQUAL.html +++ b/doc/doc++/osg/clampLEQUAL.html @@ -7,7 +7,7 @@ -

    template<class T>inline void osg::clampLEQUAL

    (T& value,
      const T maxValue,
      const char* valueName)

    if value is less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class T>inline void osg::clampLEQUAL

    (T& value,
      const T maxValue,
      const char* valueName)

    if value is less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    diff --git a/doc/doc++/osg/createGeodeForImage.2.html b/doc/doc++/osg/createGeodeForImage.2.html index 13d8b69d1..76eed66f5 100644 --- a/doc/doc++/osg/createGeodeForImage.2.html +++ b/doc/doc++/osg/createGeodeForImage.2.html @@ -7,7 +7,7 @@ -

    SG_EXPORT extern Geode* osg::createGeodeForImage

    (Image* image,
      const float s,
      const float t)

    Convenience function to be used by images loaders to generate a valid geode to return for readNode().
    +

    SG_EXPORT extern Geode* osg::createGeodeForImage

    (Image* image,
      float s,
      float t)

    Convenience function to be used by images loaders to generate a valid geode to return for readNode().
    diff --git a/doc/doc++/osg/fast_back_stack.html b/doc/doc++/osg/fast_back_stack.html index cbd8dee42..159236d3e 100644 --- a/doc/doc++/osg/fast_back_stack.html +++ b/doc/doc++/osg/fast_back_stack.html @@ -7,44 +7,44 @@ -

    template<class T> class osg::fast_back_stack

    Simple stack implementation that keeps the back() cached locally for fast access rather than at the back of the vector which is the traditional stack implementation.
    +

    template<class T> class osg::fast_back_stack

    Simple stack implementation that keeps the back() cached locally for fast access rather than at the back of the vector which is the traditional stack implementation.

    Public Fields

    -[more]T _value +[more]T _value
    -[more]std::vector<T> _stack +[more]std::vector<T> _stack
    -[more]unsigned int _size +[more]unsigned int _size

    Public Methods

    -[more]inline fast_back_stack() +[more]inline fast_back_stack()
    -[more]inline fast_back_stack(const fast_back_stack& fbs) +[more]inline fast_back_stack(const fast_back_stack& fbs)
    -[more]inline fast_back_stack(const T& value) +[more]inline fast_back_stack(const T& value)
    -[more]fast_back_stack& operator = (const fast_back_stack& fbs) +[more]fast_back_stack& operator = (const fast_back_stack& fbs)
    -[more]inline void clear() +[more]inline void clear()
    -[more]inline bool empty() const +[more]inline bool empty() const
    -[more]inline unsigned int size() const +[more]inline unsigned int size() const
    -[more]inline T& back() +[more]inline T& back()
    -[more]inline const T& back() const +[more]inline const T& back() const
    -[more]inline void push_back() +[more]inline void push_back()
    -[more]inline void push_back(const T& value) +[more]inline void push_back(const T& value)
    -[more]inline void pop_back() +[more]inline void pop_back()

    @@ -62,63 +62,63 @@ back can be accessed.
    - +
    oinline fast_back_stack()

    - -

    oinline fast_back_stack(const fast_back_stack& fbs) + +
    oinline fast_back_stack(const fast_back_stack& fbs)

    - -

    oinline fast_back_stack(const T& value) + +
    oinline fast_back_stack(const T& value)

    - +

    ofast_back_stack& operator = (const fast_back_stack& fbs)

    - +

    oinline void clear()

    - +

    oinline bool empty() const

    - +

    oinline unsigned int size() const

    - -

    oinline T& back() + +
    oinline T& back()

    - -

    oinline const T& back() const + +
    oinline const T& back() const

    - +

    oinline void push_back()

    - -

    oinline void push_back(const T& value) + +
    oinline void push_back(const T& value)

    - +

    oinline void pop_back()

    - -

    oT _value + +
    oT _value

    - -

    ostd::vector<T> _stack + +
    ostd::vector<T> _stack

    - +

    ounsigned int _size

    diff --git a/doc/doc++/osg/for_each_triangle.html b/doc/doc++/osg/for_each_triangle.html index 694e1e89d..6b5361812 100644 --- a/doc/doc++/osg/for_each_triangle.html +++ b/doc/doc++/osg/for_each_triangle.html @@ -7,7 +7,7 @@ -

    template<class T> void osg::for_each_triangle

    (GeoSet& gset,
      T& op)

    Template function for iterating through a GeoSet operating on triangles with templated functor.
    +

    template<class T> void osg::for_each_triangle

    (GeoSet& gset,
      T& op)

    Template function for iterating through a GeoSet operating on triangles with templated functor.
    diff --git a/doc/doc++/osg/index.html b/doc/doc++/osg/index.html index 149956265..7a437aa95 100644 --- a/doc/doc++/osg/index.html +++ b/doc/doc++/osg/index.html @@ -15,8 +15,8 @@

    Functions

    @@ -124,15 +124,15 @@

    -

    oconst bool validObject() +
    obool validObject()

    -

    oconst bool validImage() +
    obool validImage()

    -

    oconst bool validNode() +
    obool validNode()

    @@ -152,19 +152,19 @@

    -

    oconst ReadStatus status() const +
    oReadStatus status() const

    -

    oconst bool success() const +
    obool success() const

    -

    oconst bool error() const +
    obool error() const

    -

    oconst bool notHandled() const +
    obool notHandled() const

    diff --git a/doc/doc++/osgDB/WriteResult.html b/doc/doc++/osgDB/WriteResult.html index 4006a5be8..c25df26b4 100644 --- a/doc/doc++/osgDB/WriteResult.html +++ b/doc/doc++/osgDB/WriteResult.html @@ -22,13 +22,13 @@

    [more]const std::string& message() const
    -[more]const WriteStatus status() const +[more]WriteStatus status() const
    -[more]const bool success() const +[more]bool success() const
    -[more]const bool error() const +[more]bool error() const
    -[more]const bool notHandled() const +[more]bool notHandled() const

    @@ -90,19 +90,19 @@

    -

    oconst WriteStatus status() const +
    oWriteStatus status() const

    -

    oconst bool success() const +
    obool success() const

    -

    oconst bool error() const +
    obool error() const

    -

    oconst bool notHandled() const +
    obool notHandled() const

    diff --git a/doc/doc++/osgGA/CameraManipulator.html b/doc/doc++/osgGA/CameraManipulator.html index a080605a1..8183d137a 100644 --- a/doc/doc++/osgGA/CameraManipulator.html +++ b/doc/doc++/osgGA/CameraManipulator.html @@ -10,11 +10,11 @@

    class OSGGA_EXPORT osgGA::CameraManipulator

    Inheritance:

    - - - - - + + + + +
    @@ -22,47 +22,47 @@

    Public Methods

    -[more]virtual void setCamera(osg::Camera*) +[more]virtual void setCamera(osg::Camera*)
    Attach a camera to the manipulator to be used for specifying view
    -[more]virtual const osg::Camera* getCamera() const +[more]virtual const osg::Camera* getCamera() const
    Get the attached camera
    -[more]virtual osg::Camera* getCamera() +[more]virtual osg::Camera* getCamera()
    Get the attached camera
    -[more]virtual void setNode(osg::Node*) +[more]virtual void setNode(osg::Node*)
    Attach a node to the manipulator, automatically detaching any previously attached node.
    -[more]virtual const osg::Node* getNode() const +[more]virtual const osg::Node* getNode() const
    Return const node if attached
    -[more]virtual osg::Node* getNode() +[more]virtual osg::Node* getNode()
    Return node if attached
    -[more]virtual void home(const GUIEventAdapter&, GUIActionAdapter&) +[more]virtual void home(const GUIEventAdapter&, GUIActionAdapter&)
    Move the camera to the default position.
    -[more]virtual void init(const GUIEventAdapter&, GUIActionAdapter&) +[more]virtual void init(const GUIEventAdapter&, GUIActionAdapter&)
    Start/restart the manipulator.
    -[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Handle events, return true if handled, false otherwise.
    -[more]virtual void accept(GUIEventHandlerVisitor& v) +[more]virtual void accept(GUIEventHandlerVisitor& v)
    Handle visitations

    Protected Fields

    -[more]osg::ref_ptr<osg::Camera> _camera +[more]osg::ref_ptr<osg::Camera> _camera

    Protected Methods

    -[more] CameraManipulator() +[more] CameraManipulator()
    -[more]virtual ~CameraManipulator() +[more]virtual ~CameraManipulator()

    @@ -89,22 +89,22 @@ in response to GUI events.
    - +
    ovirtual void setCamera(osg::Camera*)
    Attach a camera to the manipulator to be used for specifying view

    - +

    ovirtual const osg::Camera* getCamera() const
    Get the attached camera

    - +

    ovirtual osg::Camera* getCamera()
    Get the attached camera

    - +

    ovirtual void setNode(osg::Node*)
    Attach a node to the manipulator, automatically detaching any previously attached node. @@ -112,49 +112,49 @@ setNode(NULL) detaches previous nodes. May be ignored by manipulators which do not require a reference model.

    - +

    ovirtual const osg::Node* getNode() const
    Return const node if attached

    - +

    ovirtual osg::Node* getNode()
    Return node if attached

    - +

    ovirtual void home(const GUIEventAdapter&, GUIActionAdapter&)
    Move the camera to the default position. May be ignored by manipulators if home functionality is not appropriate.

    - +

    ovirtual void init(const GUIEventAdapter&, GUIActionAdapter&)
    Start/restart the manipulator. FIXME: what does this actually mean? Provide examples.

    - +

    ovirtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Handle events, return true if handled, false otherwise.

    - +

    ovirtual void accept(GUIEventHandlerVisitor& v)
    Handle visitations

    - +

    o CameraManipulator()

    - +

    ovirtual ~CameraManipulator()

    - +

    oosg::ref_ptr<osg::Camera> _camera

    @@ -163,6 +163,7 @@ FIXME: what does this actually mean? Provide examples. KeySwitchCameraManipulator
    FlightManipulator
    DriveManipulator
    +AnimationPathManipulator

    Alphabetic index HTML hierarchy of classes or Java

    diff --git a/doc/doc++/osgGA/CompositeGUIEventHandler.html b/doc/doc++/osgGA/CompositeGUIEventHandler.html index 28e5c5b00..de0c66655 100644 --- a/doc/doc++/osgGA/CompositeGUIEventHandler.html +++ b/doc/doc++/osgGA/CompositeGUIEventHandler.html @@ -23,27 +23,32 @@

    Public Methods

    -[more]typedef std::vector< osg::ref_ptr<GUIEventHandler> >virtual ChildList bool handle(const GUIEventAdapter& ea, GUIActionAdapter& aa) +[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& aa)
    -[more]virtual const CompositeGUIEventHandler* getComposite() const +[more]virtual const CompositeGUIEventHandler* getComposite() const
    -[more]virtual CompositeGUIEventHandler* getComposite() +[more]virtual CompositeGUIEventHandler* getComposite()
    -[more]virtual void accept(GUIEventHandlerVisitor& v) +[more]virtual void accept(GUIEventHandlerVisitor& v)
    -[more]virtual bool addChild(GUIEventHandler* geh) +[more]virtual bool addChild(GUIEventHandler* geh)
    -[more]virtual bool removeChild(GUIEventHandler* geh) +[more]virtual bool removeChild(GUIEventHandler* geh)
    -[more]const int getNumChildren() const +[more]const int getNumChildren() const
    -[more]GUIEventHandler* getChild( int i) +[more]GUIEventHandler* getChild( int i)
    -[more]const GUIEventHandler* getChild( int i ) const +[more]const GUIEventHandler* getChild( int i ) const
    -[more]bool containsNode( const GUIEventHandler* node ) const +[more]bool containsNode( const GUIEventHandler* node ) const
    -[more]ChildList::iterator findChild( const GUIEventHandler* node ) +[more]ChildList::iterator findChild( const GUIEventHandler* node ) +

    + +

    +

    Public Members

    +[more]typedef std::vector< osg::ref_ptr<GUIEventHandler> > ChildList

    @@ -58,48 +63,52 @@ CompositeGUIEventHandler allows GUIEventHandlers to be composed into hierarchies
    + + +
    otypedef std::vector< osg::ref_ptr<GUIEventHandler> > ChildList +

    - -

    otypedef std::vector< osg::ref_ptr<GUIEventHandler> >virtual ChildList bool handle(const GUIEventAdapter& ea, GUIActionAdapter& aa) + +
    ovirtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& aa)

    - +

    ovirtual const CompositeGUIEventHandler* getComposite() const

    - +

    ovirtual CompositeGUIEventHandler* getComposite()

    - +

    ovirtual void accept(GUIEventHandlerVisitor& v)

    - +

    ovirtual bool addChild(GUIEventHandler* geh)

    - +

    ovirtual bool removeChild(GUIEventHandler* geh)

    - +

    oconst int getNumChildren() const

    - +

    oGUIEventHandler* getChild( int i)

    - +

    oconst GUIEventHandler* getChild( int i ) const

    - +

    obool containsNode( const GUIEventHandler* node ) const

    - +

    oChildList::iterator findChild( const GUIEventHandler* node )

    diff --git a/doc/doc++/osgGA/DriveManipulator.html b/doc/doc++/osgGA/DriveManipulator.html index 670753731..7fa277a99 100644 --- a/doc/doc++/osgGA/DriveManipulator.html +++ b/doc/doc++/osgGA/DriveManipulator.html @@ -23,21 +23,69 @@

    Public Methods

    -[more] DriveManipulator() +[more] DriveManipulator()
    -[more]virtual ~DriveManipulator() +[more]virtual ~DriveManipulator()
    -[more]virtual void setNode(osg::Node*) +[more]virtual void setNode(osg::Node*)
    -[more]virtual const osg::Node* getNode() const +[more]virtual const osg::Node* getNode() const
    -[more]virtual osg::Node* getNode() +[more]virtual osg::Node* getNode()
    -[more]virtual void home(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual void home(const GUIEventAdapter& ea, GUIActionAdapter& us)
    -[more]virtual void init(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual void init(const GUIEventAdapter& ea, GUIActionAdapter& us)
    -[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) +

    + +

    +

    Protected Fields

    +[more]osg::ref_ptr<const GUIEventAdapter> _ga_t1 +
    +[more]osg::ref_ptr<const GUIEventAdapter> _ga_t0 +
    +[more]osg::ref_ptr<osg::Node> _node +
    +[more]float _modelScale +
    +[more]float _velocity +
    +[more]float _height +
    +[more]float _buffer +
    +[more]SpeedControlMode _speedMode +
    +[more]osg::Vec3 _eye +
    +[more]osg::Quat _rotation +
    +[more]float _distance +

    + +

    +

    Protected Methods

    +[more]void flushMouseEventStack() +
    Reset the internal GUIEvent stack +
    +[more]void addMouseEvent(const GUIEventAdapter& ea) +
    Add the current mouse GUIEvent to internal stack +
    +[more]void computeLocalDataFromCamera() +
    +[more]void computeCameraFromLocalData() +
    +[more]void computeCameraFromLocalData(const osg::Vec3& lv, const osg::Vec3& up) +
    +[more]bool calcMovement() +
    For the give mouse movement calculate the movement of the camera. +

    + +

    +

    Protected Members

    +[more]enum SpeedControlMode

    @@ -82,47 +130,123 @@ right simultaneously) stops dead.
    - +
    o DriveManipulator()

    - +

    ovirtual ~DriveManipulator()

    - +

    ovirtual void setNode(osg::Node*)

    - +

    ovirtual const osg::Node* getNode() const

    - +

    ovirtual osg::Node* getNode()

    - +

    ovirtual void home(const GUIEventAdapter& ea, GUIActionAdapter& us)

    - +

    ovirtual void init(const GUIEventAdapter& ea, GUIActionAdapter& us)

    - +

    ovirtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) +

    + + +

    ovoid flushMouseEventStack() +
    Reset the internal GUIEvent stack +

    + + +

    ovoid addMouseEvent(const GUIEventAdapter& ea) +
    Add the current mouse GUIEvent to internal stack +

    + + +

    ovoid computeLocalDataFromCamera() +

    + + +

    ovoid computeCameraFromLocalData() +

    + + +

    ovoid computeCameraFromLocalData(const osg::Vec3& lv, const osg::Vec3& up) +

    + + +

    obool calcMovement() +
    For the give mouse movement calculate the movement of the camera. +Return true is camera has moved and a redraw is required. +

    + + +

    oosg::ref_ptr<const GUIEventAdapter> _ga_t1 +

    + + +

    oosg::ref_ptr<const GUIEventAdapter> _ga_t0 +

    + + +

    oosg::ref_ptr<osg::Node> _node +

    + + +

    ofloat _modelScale +

    + + +

    ofloat _velocity +

    + + +

    ofloat _height +

    + + +

    ofloat _buffer +

    + + +

    oenum SpeedControlMode

    - +
    o USE_MOUSE_Y_FOR_SPEED

    - +

    o USE_MOUSE_BUTTONS_FOR_SPEED

    -
    + + + +
    oSpeedControlMode _speedMode +

    + + +

    oosg::Vec3 _eye +

    + + +

    oosg::Quat _rotation +

    + + +

    ofloat _distance +

    This class has no child classes.
    diff --git a/doc/doc++/osgGA/FlightManipulator.html b/doc/doc++/osgGA/FlightManipulator.html index 5b74cf062..b9a407aec 100644 --- a/doc/doc++/osgGA/FlightManipulator.html +++ b/doc/doc++/osgGA/FlightManipulator.html @@ -23,29 +23,66 @@

    Public Methods

    -[more] FlightManipulator() +[more] FlightManipulator()
    -[more]virtual ~FlightManipulator() +[more]virtual ~FlightManipulator()
    -[more]virtual void setNode(osg::Node*) +[more]virtual void setNode(osg::Node*)
    -[more]virtual const osg::Node* getNode() const +[more]virtual const osg::Node* getNode() const
    -[more]virtual osg::Node* getNode() +[more]virtual osg::Node* getNode()
    -[more]virtual void home(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual void home(const GUIEventAdapter& ea, GUIActionAdapter& us)
    -[more]virtual void init(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual void init(const GUIEventAdapter& ea, GUIActionAdapter& us)
    -[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)
    -[more]void setYawControlMode(YawControlMode ycm) +[more]void setYawControlMode(YawControlMode ycm)
    Configure the Yaw control for the flight model.

    Public Members

    -[more]enum YawControlMode +[more]enum YawControlMode +

    + +

    +

    Protected Fields

    +[more]osg::ref_ptr<const GUIEventAdapter> _ga_t1 +
    +[more]osg::ref_ptr<const GUIEventAdapter> _ga_t0 +
    +[more]osg::ref_ptr<osg::Node> _node +
    +[more]float _modelScale +
    +[more]float _velocity +
    +[more]YawControlMode _yawMode +
    +[more]osg::Vec3 _eye +
    +[more]osg::Quat _rotation +
    +[more]float _distance +

    + +

    +

    Protected Methods

    +[more]void flushMouseEventStack() +
    Reset the internal GUIEvent stack +
    +[more]void addMouseEvent(const GUIEventAdapter& ea) +
    Add the current mouse GUIEvent to internal stack +
    +[more]void computeLocalDataFromCamera() +
    +[more]void computeCameraFromLocalData() +
    +[more]bool calcMovement() +
    For the give mouse movement calculate the movement of the camera.

    @@ -90,55 +127,115 @@ button (or left and right simultaneously) stops dead.
    - +
    o FlightManipulator()

    - +

    ovirtual ~FlightManipulator()

    - +

    ovirtual void setNode(osg::Node*)

    - +

    ovirtual const osg::Node* getNode() const

    - +

    ovirtual osg::Node* getNode()

    - +

    ovirtual void home(const GUIEventAdapter& ea, GUIActionAdapter& us)

    - +

    ovirtual void init(const GUIEventAdapter& ea, GUIActionAdapter& us)

    - +

    ovirtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)

    - +

    oenum YawControlMode

    - +
    o YAW_AUTOMATICALLY_WHEN_BANKED

    - +

    o NO_AUTOMATIC_YAW

    - -
    ovoid setYawControlMode(YawControlMode ycm) + +
    ovoid setYawControlMode(YawControlMode ycm)
    Configure the Yaw control for the flight model. +

    + + +

    ovoid flushMouseEventStack() +
    Reset the internal GUIEvent stack +

    + + +

    ovoid addMouseEvent(const GUIEventAdapter& ea) +
    Add the current mouse GUIEvent to internal stack +

    + + +

    ovoid computeLocalDataFromCamera() +

    + + +

    ovoid computeCameraFromLocalData() +

    + + +

    obool calcMovement() +
    For the give mouse movement calculate the movement of the camera. +Return true is camera has moved and a redraw is required. +

    + + +

    oosg::ref_ptr<const GUIEventAdapter> _ga_t1 +

    + + +

    oosg::ref_ptr<const GUIEventAdapter> _ga_t0 +

    + + +

    oosg::ref_ptr<osg::Node> _node +

    + + +

    ofloat _modelScale +

    + + +

    ofloat _velocity +

    + + +

    oYawControlMode _yawMode +

    + + +

    oosg::Vec3 _eye +

    + + +

    oosg::Quat _rotation +

    + + +

    ofloat _distance

    This class has no child classes.
    diff --git a/doc/doc++/osgGA/GUIActionAdapter.html b/doc/doc++/osgGA/GUIActionAdapter.html index 94e48b01a..0bb8339fd 100644 --- a/doc/doc++/osgGA/GUIActionAdapter.html +++ b/doc/doc++/osgGA/GUIActionAdapter.html @@ -13,13 +13,13 @@

    Public Methods

    -[more]virtual void requestRedraw() = 0 +[more]virtual void requestRedraw() = 0
    requestRedraw() requests a single redraw
    -[more]virtual void requestContinuousUpdate(bool needed=true) = 0 +[more]virtual void requestContinuousUpdate(bool needed=true) = 0
    requestContinousUpdate(bool) is for en/disabling a throw or idle callback to be requested by a GUIEventHandler (typically a CameraManipulator, though other GUIEventHandler's may also provide functionality).
    -[more]virtual void requestWarpPointer(int x, int y) = 0 +[more]virtual void requestWarpPointer(int x, int y) = 0
    requestWarpPointer(int,int) is requesting a repositioning of the mouse pointer to a specified x,y location on the window.

    @@ -63,13 +63,13 @@ then you then respond the flag being set in your own leisure.
    - +
    ovirtual void requestRedraw() = 0
    requestRedraw() requests a single redraw

    - +

    ovirtual void requestContinuousUpdate(bool needed=true) = 0
    requestContinousUpdate(bool) is for en/disabling a throw or idle @@ -79,7 +79,7 @@ GUI toolkits can respond to this immediately by registering an idle/timed callback, or can delay setting the callback and update at their own leisure.

    - +

    ovirtual void requestWarpPointer(int x, int y) = 0
    requestWarpPointer(int,int) is requesting a repositioning of the mouse pointer diff --git a/doc/doc++/osgGA/GUIEventAdapter.html b/doc/doc++/osgGA/GUIEventAdapter.html index 1f95c1447..c66a47ca0 100644 --- a/doc/doc++/osgGA/GUIEventAdapter.html +++ b/doc/doc++/osgGA/GUIEventAdapter.html @@ -23,52 +23,52 @@

    Public Methods

    -[more]virtual EventType getEventType() const = 0 +[more]virtual EventType getEventType() const = 0
    Get the EventType of the GUI event
    -[more]virtual int getKey() const = 0 +[more]virtual int getKey() const = 0
    key pressed, return -1 if inappr opriate for this event.
    -[more]virtual int getButton() const = 0 +[more]virtual int getButton() const = 0
    button pressed/released, return -1 if inappropriate for this event
    -[more]virtual int getXmin() const = 0 +[more]virtual int getXmin() const = 0
    window minimum x.
    -[more]virtual int getXmax() const = 0 +[more]virtual int getXmax() const = 0
    window maximum x.
    -[more]virtual int getYmin() const = 0 +[more]virtual int getYmin() const = 0
    window minimum y.
    -[more]virtual int getYmax() const = 0 +[more]virtual int getYmax() const = 0
    window maximum y.
    -[more]virtual int getX() const = 0 +[more]virtual int getX() const = 0
    current mouse x position
    -[more]virtual int getY() const = 0 +[more]virtual int getY() const = 0
    current mouse y position
    -[more]virtual unsigned int getButtonMask() const = 0 +[more]virtual unsigned int getButtonMask() const = 0
    current mouse button state
    -[more]virtual double time() const = 0 +[more]virtual double time() const = 0
    time in seconds of event.

    Public Members

    -[more]enum MouseButtonMask +[more]enum MouseButtonMask
    -[more]enum EventType +[more]enum EventType

    Protected Methods

    -[more] GUIEventAdapter() +[more] GUIEventAdapter()
    -[more]virtual ~GUIEventAdapter() +[more]virtual ~GUIEventAdapter()
    Force users to create on heap, so that multiple referencing is safe

    @@ -88,122 +88,122 @@ as appropriate.
    - +
    oenum MouseButtonMask

    - +
    o LEFT_MOUSE_BUTTON

    - +

    o MIDDLE_MOUSE_BUTTON

    - +

    o RIGHT_MOUSE_BUTTON

    - +
    oenum EventType

    - +
    o PUSH

    - +

    o RELEASE

    - +

    o DRAG

    - +

    o MOVE

    - +

    o KEYBOARD

    - +

    o FRAME

    - +

    o RESIZE

    - +

    o NONE

    - -
    ovirtual EventType getEventType() const = 0 + +
    ovirtual EventType getEventType() const = 0
    Get the EventType of the GUI event

    - +

    ovirtual int getKey() const = 0
    key pressed, return -1 if inappr opriate for this event.

    - +

    ovirtual int getButton() const = 0
    button pressed/released, return -1 if inappropriate for this event

    - +

    ovirtual int getXmin() const = 0
    window minimum x.

    - +

    ovirtual int getXmax() const = 0
    window maximum x.

    - +

    ovirtual int getYmin() const = 0
    window minimum y.

    - +

    ovirtual int getYmax() const = 0
    window maximum y.

    - +

    ovirtual int getX() const = 0
    current mouse x position

    - +

    ovirtual int getY() const = 0
    current mouse y position

    - +

    ovirtual unsigned int getButtonMask() const = 0
    current mouse button state

    - +

    ovirtual double time() const = 0
    time in seconds of event.

    - +

    o GUIEventAdapter()

    - +

    ovirtual ~GUIEventAdapter()
    Force users to create on heap, so that multiple referencing is safe

    diff --git a/doc/doc++/osgGA/GUIEventHandler.html b/doc/doc++/osgGA/GUIEventHandler.html index a183e4ef0..f515cb114 100644 --- a/doc/doc++/osgGA/GUIEventHandler.html +++ b/doc/doc++/osgGA/GUIEventHandler.html @@ -22,16 +22,16 @@

    Public Methods

    -[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) = 0 +[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) = 0
    Handle events, return true if handled, false otherwise.
    -[more]virtual const CompositeGUIEventHandler* getComposite() const +[more]virtual const CompositeGUIEventHandler* getComposite() const
    Returns 0 if this GUIEventHandler is not a CompositeGUIEventHandler.
    -[more]virtual CompositeGUIEventHandler* getComposite() +[more]virtual CompositeGUIEventHandler* getComposite()
    Returns 0 if this GUIEventHandler is not a CompositeGUIEventHandler.
    -[more]virtual void accept(GUIEventHandlerVisitor&) = 0 +[more]virtual void accept(GUIEventHandlerVisitor&) = 0
    Accept visits from GUIEventHandler visitors

    @@ -59,22 +59,22 @@ This request is made via the GUIActionAdapter class.
    - +
    ovirtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) = 0
    Handle events, return true if handled, false otherwise.

    - +

    ovirtual const CompositeGUIEventHandler* getComposite() const
    Returns 0 if this GUIEventHandler is not a CompositeGUIEventHandler.

    - +

    ovirtual CompositeGUIEventHandler* getComposite()
    Returns 0 if this GUIEventHandler is not a CompositeGUIEventHandler.

    - +

    ovirtual void accept(GUIEventHandlerVisitor&) = 0
    Accept visits from GUIEventHandler visitors

    diff --git a/doc/doc++/osgGA/GUIEventHandlerVisitor.html b/doc/doc++/osgGA/GUIEventHandlerVisitor.html index 5cc9bbd05..8bcb2522f 100644 --- a/doc/doc++/osgGA/GUIEventHandlerVisitor.html +++ b/doc/doc++/osgGA/GUIEventHandlerVisitor.html @@ -23,26 +23,26 @@

    Public Methods

    -[more]virtual void visit(GUIEventHandler&) +[more]virtual void visit(GUIEventHandler&)
    -[more]virtual void visit(CompositeGUIEventHandler&) +[more]virtual void visit(CompositeGUIEventHandler&)
    -[more]virtual void visit(CameraManipulator&) +[more]virtual void visit(CameraManipulator&)
    -[more]virtual void visit(StateSetManipulator&) +[more]virtual void visit(StateSetManipulator&)
    -[more]const GUIEventAdapter* getGUIEventAdapter() +[more]const GUIEventAdapter* getGUIEventAdapter()
    Get the GUI EventAdapter associated with this GUIEventHandlerVisitor
    -[more]GUIActionAdapter* getGUIActionAdapter() +[more]GUIActionAdapter* getGUIActionAdapter()
    Get the GUI Action Adapter associated with this GEH Visitor

    Protected Methods

    -[more] GUIEventHandlerVisitor(GUIEventAdapter* in, GUIActionAdapter* out) +[more] GUIEventHandlerVisitor(GUIEventAdapter* in, GUIActionAdapter* out)
    -[more]virtual ~GUIEventHandlerVisitor() +[more]virtual ~GUIEventHandlerVisitor()

    @@ -60,37 +60,37 @@ need only override visit operations for the types of object they're interested i
    - +
    ovirtual void visit(GUIEventHandler&)

    - +

    ovirtual void visit(CompositeGUIEventHandler&)

    - +

    ovirtual void visit(CameraManipulator&)

    - +

    ovirtual void visit(StateSetManipulator&)

    - +

    oconst GUIEventAdapter* getGUIEventAdapter()
    Get the GUI EventAdapter associated with this GUIEventHandlerVisitor

    - +

    oGUIActionAdapter* getGUIActionAdapter()
    Get the GUI Action Adapter associated with this GEH Visitor

    - +

    o GUIEventHandlerVisitor(GUIEventAdapter* in, GUIActionAdapter* out)

    - +

    ovirtual ~GUIEventHandlerVisitor()

    diff --git a/doc/doc++/osgGA/General.html b/doc/doc++/osgGA/General.html index f78d60139..5fc2a9a36 100644 --- a/doc/doc++/osgGA/General.html +++ b/doc/doc++/osgGA/General.html @@ -10,6 +10,9 @@
    +o#define +OSGGA_ANIMATION_PATH_MANIPULATOR
    + o#define OSGGA_CAMERAMANIPULATOR
    diff --git a/doc/doc++/osgGA/HIER.html b/doc/doc++/osgGA/HIER.html index 41b0c2102..f82561e68 100644 --- a/doc/doc++/osgGA/HIER.html +++ b/doc/doc++/osgGA/HIER.html @@ -15,6 +15,7 @@
  • osgGA::CameraManipulator
    •  - - - - - + + + + + diff --git a/doc/doc++/osgGA/KeySwitchCameraManipulator.html b/doc/doc++/osgGA/KeySwitchCameraManipulator.html index f612c4bf7..9c309d277 100644 --- a/doc/doc++/osgGA/KeySwitchCameraManipulator.html +++ b/doc/doc++/osgGA/KeySwitchCameraManipulator.html @@ -23,29 +23,29 @@

    Public Methods

    -[more]void addCameraManipulator(int key, std::string name, CameraManipulator* cm) +[more]void addCameraManipulator(int key, std::string name, CameraManipulator* cm)
    Add a camera manipulator with an associated name, and a key to trigger the switch,
    -[more]void addNumberedCameraManipulator(CameraManipulator* cm) +[more]void addNumberedCameraManipulator(CameraManipulator* cm)
    Add a camera manipulator with an autogenerated keybinding which is '1' + previous number of camera's registerd
    -[more]virtual void setCamera(osg::Camera* c) +[more]virtual void setCamera(osg::Camera* c)
    -[more]virtual const osg::Camera* getCamera() const +[more]virtual const osg::Camera* getCamera() const
    -[more]virtual osg::Camera* getCamera() +[more]virtual osg::Camera* getCamera()
    -[more]virtual void setNode(osg::Node* n) +[more]virtual void setNode(osg::Node* n)
    -[more]virtual const osg::Node* getNode() const +[more]virtual const osg::Node* getNode() const
    -[more]virtual osg::Node* getNode() +[more]virtual osg::Node* getNode()
    -[more]virtual void home(const GUIEventAdapter& ee, GUIActionAdapter& aa) +[more]virtual void home(const GUIEventAdapter& ee, GUIActionAdapter& aa)
    -[more]virtual void init(const GUIEventAdapter& ee, GUIActionAdapter& aa) +[more]virtual void init(const GUIEventAdapter& ee, GUIActionAdapter& aa)
    -[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)

    @@ -84,52 +84,52 @@ and the associated switch keys, can be configured.
    - +
    ovoid addCameraManipulator(int key, std::string name, CameraManipulator* cm)
    Add a camera manipulator with an associated name, and a key to trigger the switch,

    - +

    ovoid addNumberedCameraManipulator(CameraManipulator* cm)
    Add a camera manipulator with an autogenerated keybinding which is '1' + previous number of camera's registerd

    - +

    ovirtual void setCamera(osg::Camera* c)

    - +

    ovirtual const osg::Camera* getCamera() const

    - +

    ovirtual osg::Camera* getCamera()

    - +

    ovirtual void setNode(osg::Node* n)

    - +

    ovirtual const osg::Node* getNode() const

    - +

    ovirtual osg::Node* getNode()

    - +

    ovirtual void home(const GUIEventAdapter& ee, GUIActionAdapter& aa)

    - +

    ovirtual void init(const GUIEventAdapter& ee, GUIActionAdapter& aa)

    - +

    ovirtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)

    diff --git a/doc/doc++/osgGA/SetSceneViewVisitor.html b/doc/doc++/osgGA/SetSceneViewVisitor.html index e37b1cad5..7c13cb894 100644 --- a/doc/doc++/osgGA/SetSceneViewVisitor.html +++ b/doc/doc++/osgGA/SetSceneViewVisitor.html @@ -23,13 +23,13 @@

    Public Methods

    -[more] SetSceneViewVisitor(GUIEventAdapter* in, GUIActionAdapter* out, osgUtil::SceneView* sv) +[more] SetSceneViewVisitor(GUIEventAdapter* in, GUIActionAdapter* out, osgUtil::SceneView* sv)
    -[more]virtual ~SetSceneViewVisitor() +[more]virtual ~SetSceneViewVisitor()
    -[more]virtual void visit(CameraManipulator& cm) +[more]virtual void visit(CameraManipulator& cm)
    -[more]virtual void visit(StateSetManipulator& cm) +[more]virtual void visit(StateSetManipulator& cm)

    @@ -54,19 +54,19 @@ view
    - +
    o SetSceneViewVisitor(GUIEventAdapter* in, GUIActionAdapter* out, osgUtil::SceneView* sv)

    - +

    ovirtual ~SetSceneViewVisitor()

    - +

    ovirtual void visit(CameraManipulator& cm)

    - +

    ovirtual void visit(StateSetManipulator& cm)

    diff --git a/doc/doc++/osgGA/StateSetManipulator.html b/doc/doc++/osgGA/StateSetManipulator.html index 8778aec0c..7e539a222 100644 --- a/doc/doc++/osgGA/StateSetManipulator.html +++ b/doc/doc++/osgGA/StateSetManipulator.html @@ -23,35 +23,35 @@

    Public Methods

    -[more] StateSetManipulator() +[more] StateSetManipulator()
    -[more]virtual ~StateSetManipulator() +[more]virtual ~StateSetManipulator()
    -[more]virtual void setStateSet(osg::StateSet*) +[more]virtual void setStateSet(osg::StateSet*)
    attach a geostate to the manipulator to be used for specifying view
    -[more]virtual osg::StateSet* getStateSet() +[more]virtual osg::StateSet* getStateSet()
    get the attached a geostate
    -[more]virtual const osg::StateSet* getStateSet() const +[more]virtual const osg::StateSet* getStateSet() const
    get the attached a geostate
    -[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Handle events, return true if handled, false otherwise
    -[more]virtual void accept(GUIEventHandlerVisitor&) +[more]virtual void accept(GUIEventHandlerVisitor&)
    Handle visitations

    Protected Fields

    -[more]osg::ref_ptr<osg::StateSet> _drawState +[more]osg::ref_ptr<osg::StateSet> _drawState
    -[more]bool _backface +[more]bool _backface
    -[more]bool _lighting +[more]bool _lighting
    -[more]bool _texture +[more]bool _texture

    @@ -75,52 +75,52 @@ be returned to at some point :-\
    - +
    o StateSetManipulator()

    - +

    ovirtual ~StateSetManipulator()

    - +

    ovirtual void setStateSet(osg::StateSet*)
    attach a geostate to the manipulator to be used for specifying view

    - +

    ovirtual osg::StateSet* getStateSet()
    get the attached a geostate

    - +

    ovirtual const osg::StateSet* getStateSet() const
    get the attached a geostate

    - +

    ovirtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Handle events, return true if handled, false otherwise

    - +

    ovirtual void accept(GUIEventHandlerVisitor&)
    Handle visitations

    - +

    oosg::ref_ptr<osg::StateSet> _drawState

    - +

    obool _backface

    - +

    obool _lighting

    - +

    obool _texture

    diff --git a/doc/doc++/osgGA/TrackballManipulator.html b/doc/doc++/osgGA/TrackballManipulator.html index 9e2a8fc80..d2c326e7d 100644 --- a/doc/doc++/osgGA/TrackballManipulator.html +++ b/doc/doc++/osgGA/TrackballManipulator.html @@ -22,29 +22,73 @@

    Public Methods

    -[more] TrackballManipulator() +[more] TrackballManipulator()
    -[more]virtual ~TrackballManipulator() +[more]virtual ~TrackballManipulator()
    -[more]virtual void setNode(osg::Node*) +[more]virtual void setNode(osg::Node*)
    Attach a node to the manipulator.
    -[more]virtual const osg::Node* getNode() const +[more]virtual const osg::Node* getNode() const
    Return node if attached
    -[more]virtual osg::Node* getNode() +[more]virtual osg::Node* getNode()
    Return node if attached
    -[more]virtual void home(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual void home(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Move the camera to the default position.
    -[more]virtual void init(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual void init(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Start/restart the manipulator
    -[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)
    handle events, return true if handled, false otherwise

    +

    +

    Protected Fields

    +[more]osg::ref_ptr<const GUIEventAdapter> _ga_t1 +
    +[more]osg::ref_ptr<const GUIEventAdapter> _ga_t0 +
    +[more]osg::ref_ptr<osg::Node> _node +
    +[more]float _modelScale +
    +[more]float _minimumZoomScale +
    +[more]bool _thrown +
    +[more]osg::Vec3 _center +
    +[more]osg::Quat _rotation +
    +[more]float _distance +

    + +

    +

    Protected Methods

    +[more]void flushMouseEventStack() +
    Reset the internal GUIEvent stack +
    +[more]void addMouseEvent(const GUIEventAdapter& ea) +
    Add the current mouse GUIEvent to internal stack +
    +[more]void computeLocalDataFromCamera() +
    +[more]void computeCameraFromLocalData() +
    +[more]bool calcMovement() +
    For the give mouse movement calculate the movement of the camera. +
    +[more]void trackball(osg::Vec3& axis, float& angle, float p1x, float p1y, float p2x, float p2y) +
    +[more]float tb_project_to_sphere(float r, float x, float y) +
    +[more]bool isMouseMoving() +
    Check the speed at which the mouse is moving. +

    +

    Inherited from CameraManipulator:

    @@ -82,15 +126,15 @@
    - +
    o TrackballManipulator()

    - +

    ovirtual ~TrackballManipulator()

    - +

    ovirtual void setNode(osg::Node*)
    Attach a node to the manipulator. Automatically detaches previously attached node. @@ -98,30 +142,104 @@ setNode(NULL) detaches previously nodes. Is ignored by manipulators which do not require a reference model.

    - +

    ovirtual const osg::Node* getNode() const
    Return node if attached

    - +

    ovirtual osg::Node* getNode()
    Return node if attached

    - +

    ovirtual void home(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Move the camera to the default position. May be ignored by manipulators if home functionality is not appropriate.

    - +

    ovirtual void init(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Start/restart the manipulator

    - +

    ovirtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)
    handle events, return true if handled, false otherwise +

    + + +

    ovoid flushMouseEventStack() +
    Reset the internal GUIEvent stack +

    + + +

    ovoid addMouseEvent(const GUIEventAdapter& ea) +
    Add the current mouse GUIEvent to internal stack +

    + + +

    ovoid computeLocalDataFromCamera() +

    + + +

    ovoid computeCameraFromLocalData() +

    + + +

    obool calcMovement() +
    For the give mouse movement calculate the movement of the camera. +Return true is camera has moved and a redraw is required. +

    + + +

    ovoid trackball(osg::Vec3& axis, float& angle, float p1x, float p1y, float p2x, float p2y) +

    + + +

    ofloat tb_project_to_sphere(float r, float x, float y) +

    + + +

    obool isMouseMoving() +
    Check the speed at which the mouse is moving. +If speed is below a threshold then return false, otherwise return true. +

    + + +

    oosg::ref_ptr<const GUIEventAdapter> _ga_t1 +

    + + +

    oosg::ref_ptr<const GUIEventAdapter> _ga_t0 +

    + + +

    oosg::ref_ptr<osg::Node> _node +

    + + +

    ofloat _modelScale +

    + + +

    ofloat _minimumZoomScale +

    + + +

    obool _thrown +

    + + +

    oosg::Vec3 _center +

    + + +

    oosg::Quat _rotation +

    + + +

    ofloat _distance

    This class has no child classes.
    diff --git a/doc/doc++/osgGA/index.html b/doc/doc++/osgGA/index.html index cc919a3ff..cd9efa3fc 100644 --- a/doc/doc++/osgGA/index.html +++ b/doc/doc++/osgGA/index.html @@ -23,6 +23,7 @@

    Macros

    @@ -285,7 +315,7 @@ only available for backwards compatibility.

    -

    oconst unsigned int getNumViewports() const +
    ounsigned int getNumViewports() const

    @@ -301,15 +331,15 @@ only available for backwards compatibility.

    -

    ovirtual float app(unsigned int viewport) +
    ovirtual float app(unsigned int viewport)

    -

    ovirtual float cull(unsigned int viewport) +
    ovirtual float cull(unsigned int viewport)

    -

    ovirtual float draw(unsigned int viewport) +
    ovirtual float draw(unsigned int viewport)

    @@ -337,232 +367,285 @@ only available for backwards compatibility.

    -

    ounsigned int registerCameraManipulator(osgGA::CameraManipulator* cm, unsigned int viewport = 0) +
    ounsigned int registerCameraManipulator(osgGA::CameraManipulator* cm, unsigned int viewport = 0)

    -

    ovoid selectCameraManipulator(unsigned int pos, unsigned int viewport = 0) +
    ovoid selectCameraManipulator(unsigned int pos, unsigned int viewport = 0)

    - + -

    ovoid setEventHandler(osgGA::GUIEventHandler* handler, unsigned int viewport = 0) +
    ovoid prependEventHandler(osgGA::GUIEventHandler* handler, unsigned int viewport = 0) +

    + + +

    ovoid appendEventHandler(osgGA::GUIEventHandler* handler, unsigned int viewport = 0)

    - +

    ovirtual void requestRedraw()

    - +

    ovirtual void requestContinuousUpdate(bool )

    - +

    ovirtual void requestWarpPointer(int x, int y)

    + + +

    ovirtual void requestShutdown() +

    + + +

    ovirtual void toggleFullScreen() +
    Toggle fullscreen +

    - +

    ovoid readCommandLine(std::vector<std::string>& commandLine)
    read the command line string list, removing any matched control sequences

    - +

    ovoid setDisplaySettings(osg::DisplaySettings* ds)

    - +

    oosg::DisplaySettings* getDisplaySettings()

    - +

    oconst osg::DisplaySettings* getDisplaySettings() const

    + + +

    otypedef std::vector<osg::ref_ptr<osgGA::CameraManipulator> > CameraManipList +

    + + +

    otypedef std::list<osg::ref_ptr<osgGA::GUIEventHandler> > EventHandlerList +

    + + +

    ovoid setRecordingAnimationPath(bool on) +

    + + +

    obool getRecordingAnimationPath() const +

    + + +

    ovoid setAnimationPath(osg::AnimationPath* path) +

    + + +

    oosg::AnimationPath* getAnimationPath() +

    + + +

    oconst osg::AnimationPath* getAnimationPath() const +

    - -

    otypedef std::vector<osg::ref_ptr<osgGA::CameraManipulator> >virtual CameraManipList void clear() + +
    ovirtual void clear()

    - +

    ovirtual void display()

    - +

    ovirtual void reshape(GLint w, GLint h)

    - +

    ovirtual void mouseMotion(int x, int y)

    - +

    ovirtual void mousePassiveMotion(int x, int y)

    - +

    ovirtual void mouse(int button, int state, int x, int y)

    - +

    ovirtual void keyboard(unsigned char key, int x, int y)

    - +

    ovoid setFocusedViewport(unsigned int pos)

    - - -

    oint mapWindowXYToSceneView(int x, int y) + + +
    oint mapWindowXYToViewport(int x, int y)

    - -

    ovoid showStats(const unsigned int i) + +
    ovoid showStats(unsigned int i)

    - +

    ostatic Viewer* s_theViewer

    - +

    ostruct ViewportDef

    - +
    oosg::ref_ptr<osgUtil::SceneView> sceneView

    - +

    ofloat viewport[4]

    - +

    oosg::ref_ptr<osgGA::CameraManipulator> _cameraManipulator

    - -

    oCameraManipList _cameraManipList + +
    oCameraManipList _cameraManipList

    - - -

    oosg::ref_ptr<osgGA::GUIEventHandler> _eventHandler + + +
    oEventHandlerList _eventHandlerList

    + + +
    otypedef std::vector<ViewportDef> ViewportList +

    - -

    otypedef std::vector<ViewportDef> ViewportList ViewportList _viewportList + +
    oViewportList _viewportList

    - +

    ounsigned int _focusedViewport

    - +

    ostd::string _saveFileName

    - +

    obool _viewFrustumCullingActive

    - +

    obool _smallFeatureCullingActive

    - +

    oint polymode

    - +

    oint texture

    - +

    oint backface

    - +

    oint lighting

    - +

    oint flat_shade

    - +

    ofloat frRate

    - +

    oint _printStats

    - +

    ostruct StatsRecord

    - +
    o StatsRecord()

    - +

    ofloat timeApp

    - +

    ofloat timeCull

    - +

    ofloat timeDraw

    - +

    ofloat timeFrame

    - +

    oosg::Timer_t frameend

    - -
    oStatsRecord times[3] + +
    oStatsRecord times[3]

    - +

    obool _useDisplayLists

    - +

    oosg::Timer _timer

    - +

    oosg::Timer_t _initialTick

    - +

    oosg::Timer_t _lastFrameTick

    - +

    oosg::Timer_t _frameTick

    - +

    oosg::Timer_t clockTick()

    - +

    oosg::Timer_t frameTick()

    - +

    oosg::ref_ptr<osg::FrameStamp> _frameStamp

    - +

    oosg::ref_ptr<osg::DisplaySettings> _displaySettings +

    + + +

    obool _recordingAnimationPath +

    + + +

    oosg::ref_ptr<osg::AnimationPath> _animationPath

    This class has no child classes.
    diff --git a/doc/doc++/osgParticle/Emitter.html b/doc/doc++/osgParticle/Emitter.html index 4802efdc6..9749065f8 100644 --- a/doc/doc++/osgParticle/Emitter.html +++ b/doc/doc++/osgParticle/Emitter.html @@ -82,7 +82,7 @@
    oinline void setParticleSystem(ParticleSystem* ps)
    -oinline const bool computeBound() const +oinline bool computeBound() const
    oinline const osg::Matrix& getLocalToWorldMatrix()
    diff --git a/doc/doc++/osgParticle/General.html b/doc/doc++/osgParticle/General.html index 88a7b3e58..e23f3d70b 100644 --- a/doc/doc++/osgParticle/General.html +++ b/doc/doc++/osgParticle/General.html @@ -88,6 +88,9 @@ o#define OSGPARTICLE_RANGE_
    +o#define +OSGPARTICLE_SECTORPLACER_
    + o#define OSGPARTICLE_SEGMENTPLACER_
    diff --git a/doc/doc++/osgParticle/ModularEmitter.html b/doc/doc++/osgParticle/ModularEmitter.html index 81a6bd8eb..723e06cd2 100644 --- a/doc/doc++/osgParticle/ModularEmitter.html +++ b/doc/doc++/osgParticle/ModularEmitter.html @@ -113,7 +113,7 @@
    oinline void setParticleSystem(ParticleSystem* ps)
    -oinline const bool computeBound() const +oinline bool computeBound() const
    oinline const osg::Matrix& getLocalToWorldMatrix()
    diff --git a/doc/doc++/osgParticle/ModularProgram.html b/doc/doc++/osgParticle/ModularProgram.html index 50909acb1..4b3450af0 100644 --- a/doc/doc++/osgParticle/ModularProgram.html +++ b/doc/doc++/osgParticle/ModularProgram.html @@ -29,19 +29,19 @@
    [more] META_Node(osgParticle, ModularProgram)
    -[more]inline int numOperators() const +[more]inline int numOperators() const
    Get the number of operators
    -[more]inline void addOperator(Operator* o) +[more]inline void addOperator(Operator* o)
    Add an operator to the list.
    -[more]inline Operator* getOperator(int i) +[more]inline Operator* getOperator(int i)
    Get a pointer to an operator in the list
    -[more]inline const Operator* getOperator(int i) const +[more]inline const Operator* getOperator(int i) const
    Get a const pointer to an operator in the list
    -[more]inline void removeOperator(int i) +[more]inline void removeOperator(int i)
    Remove an operator from the list

    @@ -93,7 +93,7 @@
    oinline void setParticleSystem(ParticleSystem* ps)
    -oinline const bool computeBound() const +oinline bool computeBound() const
    oinline const osg::Matrix& getLocalToWorldMatrix()
    @@ -149,27 +149,27 @@ All operators will be applied to each particle in the same order they've been ad
    ovoid execute(double dt)

    - +

    oinline int numOperators() const
    Get the number of operators

    - +

    oinline void addOperator(Operator* o)
    Add an operator to the list.

    - +

    oinline Operator* getOperator(int i)
    Get a pointer to an operator in the list

    - +

    oinline const Operator* getOperator(int i) const
    Get a const pointer to an operator in the list

    - +

    oinline void removeOperator(int i)
    Remove an operator from the list

    diff --git a/doc/doc++/osgParticle/MultiSegmentPlacer.html b/doc/doc++/osgParticle/MultiSegmentPlacer.html index 5bb7251a1..516173f00 100644 --- a/doc/doc++/osgParticle/MultiSegmentPlacer.html +++ b/doc/doc++/osgParticle/MultiSegmentPlacer.html @@ -32,25 +32,25 @@ [more]void place(Particle* P) const

    Place a partice.
    -[more]inline int numVertices() const +[more]inline int numVertices() const
    Get the number of vertices which define the segments
    -[more]inline const osg::Vec3& getVertex(int i) const +[more]inline const osg::Vec3& getVertex(int i) const
    Get a vertex
    -[more]inline void setVertex(int i, const osg::Vec3 &v) +[more]inline void setVertex(int i, const osg::Vec3 &v)
    Set a vertex
    -[more]inline void setVertex(int i, float x, float y, float z) +[more]inline void setVertex(int i, float x, float y, float z)
    Set a vertex
    -[more]inline void addVertex(const osg::Vec3 &v) +[more]inline void addVertex(const osg::Vec3 &v)
    Add a vertex
    -[more]inline void addVertex(float x, float y, float z) +[more]inline void addVertex(float x, float y, float z)
    Add a vertex
    -[more]inline void removeVertex(int i) +[more]inline void removeVertex(int i)
    Remove a vertex

    @@ -109,37 +109,37 @@ specified sequence of connected segments.
    oMultiSegmentPlacer& operator=(const MultiSegmentPlacer &)

    - +

    oinline int numVertices() const
    Get the number of vertices which define the segments

    - +

    oinline const osg::Vec3& getVertex(int i) const
    Get a vertex

    - +

    oinline void setVertex(int i, const osg::Vec3 &v)
    Set a vertex

    - +

    oinline void setVertex(int i, float x, float y, float z)
    Set a vertex

    - +

    oinline void addVertex(const osg::Vec3 &v)
    Add a vertex

    - +

    oinline void addVertex(float x, float y, float z)
    Add a vertex

    - +

    oinline void removeVertex(int i)
    Remove a vertex

    diff --git a/doc/doc++/osgParticle/Particle.html b/doc/doc++/osgParticle/Particle.html index de7fa3dc5..da9a47f6d 100644 --- a/doc/doc++/osgParticle/Particle.html +++ b/doc/doc++/osgParticle/Particle.html @@ -50,7 +50,7 @@ [more]inline const rangef& getAlphaRange() const

    Get the minimum and maximum values for alpha
    -[more]inline const rangev4& getColorRange() const +[more]inline const rangev4& getColorRange() const
    Get the minimum and maximum values for color
    [more]inline const Interpolator* getSizeInterpolator() const @@ -83,7 +83,7 @@ [more]inline void setAlphaRange(const rangef &r)
    Set the minimum and maximum values for alpha
    -[more]inline void setColorRange(const rangev4 &r) +[more]inline void setColorRange(const rangev4 &r)
    Set the minimum and maximum values for color
    [more]inline void setSizeInterpolator(Interpolator* ri) @@ -116,10 +116,10 @@ [more]inline void setMass(float m)
    Set the mass of the particle.
    -[more]inline void beginRender() +[more]inline void beginRender() const
    Perform some pre-rendering tasks.
    -[more]inline void endRender() +[more]inline void endRender() const
    Perform some post-rendering tasks.
    [more]inline float getCurrentSize() const @@ -244,7 +244,7 @@ For built-in operators to work correctly, lengths must be expressed in meters.

    -

    oinline const rangev4& getColorRange() const +
    oinline const rangev4& getColorRange() const
    Get the minimum and maximum values for color

    @@ -303,7 +303,7 @@ return true until the particle is updated again

    -

    oinline void setColorRange(const rangev4 &r) +
    oinline void setColorRange(const rangev4 &r)
    Set the minimum and maximum values for color

    @@ -362,12 +362,12 @@ For built-in operators to work correctly, remember that the mass is expressed in

    -

    oinline void beginRender() +
    oinline void beginRender() const
    Perform some pre-rendering tasks. Called automatically by particle systems.

    -

    oinline void endRender() +
    oinline void endRender() const
    Perform some post-rendering tasks. Called automatically by particle systems.

    diff --git a/doc/doc++/osgParticle/ParticleProcessor.html b/doc/doc++/osgParticle/ParticleProcessor.html index 46a7889c2..d0dd54630 100644 --- a/doc/doc++/osgParticle/ParticleProcessor.html +++ b/doc/doc++/osgParticle/ParticleProcessor.html @@ -58,7 +58,7 @@ [more]inline void setParticleSystem(ParticleSystem* ps)

    Set the destination particle system
    -[more]inline const bool computeBound() const +[more]inline bool computeBound() const
    [more]inline const osg::Matrix& getLocalToWorldMatrix()
    Get the current local-to-world transformation matrix (valid only during cull traversal) @@ -196,7 +196,7 @@ transformations when needed.

    -

    oinline const bool computeBound() const +
    oinline bool computeBound() const

    diff --git a/doc/doc++/osgParticle/ParticleSystem.html b/doc/doc++/osgParticle/ParticleSystem.html index dad10437f..938f262da 100644 --- a/doc/doc++/osgParticle/ParticleSystem.html +++ b/doc/doc++/osgParticle/ParticleSystem.html @@ -44,84 +44,84 @@ [more]virtual void update(double dt)

    Update the particles.
    -[more]inline ParticleSystem::Alignment getParticleAlignment() const +[more]inline ParticleSystem::Alignment getParticleAlignment() const
    -[more]inline void setParticleAlignment(Alignment a) +[more]inline void setParticleAlignment(Alignment a)
    Set the alignment type of particles
    -[more]inline const osg::Vec3& getAlignVectorX() const +[more]inline const osg::Vec3& getAlignVectorX() const
    Get the X-axis alignment vector
    -[more]inline void setAlignVectorX(const osg::Vec3 &v) +[more]inline void setAlignVectorX(const osg::Vec3 &v)
    Set the X-axis alignment vector
    -[more]inline const osg::Vec3& getAlignVectorY() const +[more]inline const osg::Vec3& getAlignVectorY() const
    Get the Y-axis alignment vector
    -[more]inline void setAlignVectorY(const osg::Vec3 &v) +[more]inline void setAlignVectorY(const osg::Vec3 &v)
    Set the Y-axis alignment vector
    -[more]inline void setAlignVectors(const osg::Vec3 &X, const osg::Vec3 &Y) +[more]inline void setAlignVectors(const osg::Vec3 &X, const osg::Vec3 &Y)
    Set the alignment vectors
    -[more]inline bool isFrozen() const +[more]inline bool isFrozen() const
    Return true if the particle system is frozen
    -[more]inline void setFrozen(bool v) +[more]inline void setFrozen(bool v)
    Set or reset the frozen state.
    -[more]inline const osg::BoundingBox& getDefaultBoundingBox() const +[more]inline const osg::BoundingBox& getDefaultBoundingBox() const
    Get the default bounding box
    -[more]inline void setDefaultBoundingBox(const osg::BoundingBox &bbox) +[more]inline void setDefaultBoundingBox(const osg::BoundingBox &bbox)
    Set the default bounding box.
    -[more]inline bool getDoublePassRendering() const +[more]inline bool getDoublePassRendering() const
    Get the double pass rendering flag
    -[more]inline void setDoublePassRendering(bool v) +[more]inline void setDoublePassRendering(bool v)
    Set the double pass rendering flag.
    -[more]inline int numParticles() const +[more]inline int numParticles() const
    Get the number of allocated particles (alive + dead)
    -[more]inline int numDeadParticles() const +[more]inline int numDeadParticles() const
    Get the number of dead particles
    -[more]inline Particle* getParticle(int i) +[more]inline Particle* getParticle(int i)
    Get a pointer to the i-th particle
    -[more]inline const Particle* getParticle(int i) const +[more]inline const Particle* getParticle(int i) const
    Get a const pointer to the i-th particle
    -[more]inline void destroyParticle(int i) +[more]inline void destroyParticle(int i)
    -[more]inline int getLastFrameNumber() const +[more]inline int getLastFrameNumber() const
    Get the last frame number
    -[more]inline const bool computeBound() const +[more]inline bool computeBound() const
    -[more]inline void update_bounds(const osg::Vec3 &p, float r) +[more]inline void update_bounds(const osg::Vec3 &p, float r)
    -[more]inline const Particle& getDefaultParticleTemplate() const +[more]inline const Particle& getDefaultParticleTemplate() const
    Get a reference to the default particle template
    -[more]inline void setDefaultParticleTemplate(const Particle &p) +[more]inline void setDefaultParticleTemplate(const Particle &p)
    Set the default particle template (particle is copied)
    -[more]inline bool getFreezeOnCull() const +[more]inline bool getFreezeOnCull() const
    Get whether the particle system can freeze when culled
    -[more]inline void setFreezeOnCull(bool v) +[more]inline void setFreezeOnCull(bool v)
    Set whether the particle system can freeze when culled (default is true)
    -[more]inline int getLevelOfDetail() const +[more]inline int getLevelOfDetail() const
    (EXPERIMENTAL) Get the level of detail
    -[more]inline void setLevelOfDetail(int v) +[more]inline void setLevelOfDetail(int v)
    (EXPERIMENTAL) Set the level of detail.
    -[more]inline Particle* createParticle(const Particle* ptemplate) +[more]inline Particle* createParticle(const Particle* ptemplate)

    @@ -135,11 +135,11 @@
    [more]ParticleSystem& operator=(const ParticleSystem &)
    -[more]inline virtual const bool computeBound() const +[more]inline virtual bool computeBound() const
    -[more]virtual void drawImmediateMode(osg::State &state) +[more]virtual void drawImplementation(osg::State &state) const
    -[more]void single_pass_render(osg::State &state, const osg::Matrix &modelview) +[more]void single_pass_render(osg::State &state, const osg::Matrix &modelview) const

    @@ -216,80 +216,80 @@ If texturefile is empty, then texturing is turned off.

    -

    oinline virtual const bool computeBound() const +
    oinline virtual bool computeBound() const

    - + -

    ovirtual void drawImmediateMode(osg::State &state) +
    ovirtual void drawImplementation(osg::State &state) const

    -

    ovoid single_pass_render(osg::State &state, const osg::Matrix &modelview) +
    ovoid single_pass_render(osg::State &state, const osg::Matrix &modelview) const

    - +

    oinline ParticleSystem::Alignment getParticleAlignment() const

    - +

    oinline void setParticleAlignment(Alignment a)
    Set the alignment type of particles

    - +

    oinline const osg::Vec3& getAlignVectorX() const
    Get the X-axis alignment vector

    - +

    oinline void setAlignVectorX(const osg::Vec3 &v)
    Set the X-axis alignment vector

    - +

    oinline const osg::Vec3& getAlignVectorY() const
    Get the Y-axis alignment vector

    - +

    oinline void setAlignVectorY(const osg::Vec3 &v)
    Set the Y-axis alignment vector

    - +

    oinline void setAlignVectors(const osg::Vec3 &X, const osg::Vec3 &Y)
    Set the alignment vectors

    - +

    oinline bool isFrozen() const
    Return true if the particle system is frozen

    - +

    oinline void setFrozen(bool v)
    Set or reset the frozen state. When the particle system is frozen, emitters and programs won't do anything on it.

    - +

    oinline const osg::BoundingBox& getDefaultBoundingBox() const
    Get the default bounding box

    - +

    oinline void setDefaultBoundingBox(const osg::BoundingBox &bbox)
    Set the default bounding box. The default bounding box is used when a real bounding box cannot be computed, for example because no particles has been updated yet.

    - +

    oinline bool getDoublePassRendering() const
    Get the double pass rendering flag

    - +

    oinline void setDoublePassRendering(bool v)
    Set the double pass rendering flag. Double pass rendering avoids overdraw problems between particle systems @@ -299,75 +299,75 @@ If you set the default attributes with setDefaultAttributes, then t system will fall into a transparent bin.

    - +

    oinline int numParticles() const
    Get the number of allocated particles (alive + dead)

    - +

    oinline int numDeadParticles() const
    Get the number of dead particles

    - +

    oinline Particle* getParticle(int i)
    Get a pointer to the i-th particle

    - +

    oinline const Particle* getParticle(int i) const
    Get a const pointer to the i-th particle

    - +

    oinline void destroyParticle(int i)

    - +

    oinline int getLastFrameNumber() const
    Get the last frame number

    - -

    oinline const bool computeBound() const + +
    oinline bool computeBound() const

    - +

    oinline void update_bounds(const osg::Vec3 &p, float r)

    - +

    oinline const Particle& getDefaultParticleTemplate() const
    Get a reference to the default particle template

    - +

    oinline void setDefaultParticleTemplate(const Particle &p)
    Set the default particle template (particle is copied)

    - +

    oinline bool getFreezeOnCull() const
    Get whether the particle system can freeze when culled

    - +

    oinline void setFreezeOnCull(bool v)
    Set whether the particle system can freeze when culled (default is true)

    - +

    oinline int getLevelOfDetail() const
    (EXPERIMENTAL) Get the level of detail

    - +

    oinline void setLevelOfDetail(int v)
    (EXPERIMENTAL) Set the level of detail. The total number of particles is divided by the detail value to get the actual number of particles to be drawn. This value must be greater than zero.

    - +

    oinline Particle* createParticle(const Particle* ptemplate)

    diff --git a/doc/doc++/osgParticle/ParticleSystemUpdater.html b/doc/doc++/osgParticle/ParticleSystemUpdater.html index bbc26a13f..559a95055 100644 --- a/doc/doc++/osgParticle/ParticleSystemUpdater.html +++ b/doc/doc++/osgParticle/ParticleSystemUpdater.html @@ -31,27 +31,27 @@

    [more]virtual void traverse(osg::NodeVisitor &nv)
    -[more]inline const bool computeBound() const +[more]inline bool computeBound() const
    -[more]inline int numParticleSystems() const +[more]inline int numParticleSystems() const
    Return the number of particle systems on the list
    -[more]inline void addParticleSystem(ParticleSystem* ps) +[more]inline void addParticleSystem(ParticleSystem* ps)
    Add a particle system to the list
    -[more]inline const ParticleSystem* getParticleSystem(int i) const +[more]inline const ParticleSystem* getParticleSystem(int i) const
    Get a const particle system from the list
    -[more]inline ParticleSystem* getParticleSystem(int i) +[more]inline ParticleSystem* getParticleSystem(int i)
    Get a particle system from the list
    -[more]inline void removeParticleSystem(int i) +[more]inline void removeParticleSystem(int i)
    Remove a particle system from the list (by index)
    -[more]inline int findParticleSystem(ParticleSystem* ps) const +[more]inline int findParticleSystem(ParticleSystem* ps) const
    Find a particle system
    -[more]inline bool removeParticleSystem(ParticleSystem* ps) +[more]inline bool removeParticleSystem(ParticleSystem* ps)
    Remove a particle system from the list (by pointer)

    @@ -61,7 +61,7 @@
    [more]ParticleSystemUpdater& operator=(const ParticleSystemUpdater &)
    -[more]inline virtual const bool computeBound() const +[more]inline virtual bool computeBound() const

    @@ -101,44 +101,44 @@ When a ParticleSystemUpdater is traversed by a cull visitor, it cal

    -

    oinline virtual const bool computeBound() const +
    oinline virtual bool computeBound() const

    - -

    oinline const bool computeBound() const + +
    oinline bool computeBound() const

    - +

    oinline int numParticleSystems() const
    Return the number of particle systems on the list

    - +

    oinline void addParticleSystem(ParticleSystem* ps)
    Add a particle system to the list

    - +

    oinline const ParticleSystem* getParticleSystem(int i) const
    Get a const particle system from the list

    - +

    oinline ParticleSystem* getParticleSystem(int i)
    Get a particle system from the list

    - +

    oinline void removeParticleSystem(int i)
    Remove a particle system from the list (by index)

    - +

    oinline int findParticleSystem(ParticleSystem* ps) const
    Find a particle system

    - +

    oinline bool removeParticleSystem(ParticleSystem* ps)
    Remove a particle system from the list (by pointer)

    diff --git a/doc/doc++/osgParticle/Program.html b/doc/doc++/osgParticle/Program.html index 691267c3b..fc0dfd7b4 100644 --- a/doc/doc++/osgParticle/Program.html +++ b/doc/doc++/osgParticle/Program.html @@ -72,7 +72,7 @@

    oinline void setParticleSystem(ParticleSystem* ps)
    -oinline const bool computeBound() const +oinline bool computeBound() const
    oinline const osg::Matrix& getLocalToWorldMatrix()
    diff --git a/doc/doc++/osgParticle/SectorPlacer.html b/doc/doc++/osgParticle/SectorPlacer.html index 6ae51b324..ac33008dd 100644 --- a/doc/doc++/osgParticle/SectorPlacer.html +++ b/doc/doc++/osgParticle/SectorPlacer.html @@ -23,39 +23,39 @@

    Public Methods

    -[more] META_Object(osgParticle, SectorPlacer) +[more] META_Object(osgParticle, SectorPlacer)
    -[more]inline SectorPlacer() +[more]inline SectorPlacer()
    -[more]inline SectorPlacer(const SectorPlacer &copy, const osg::CopyOp &copyop) +[more]inline SectorPlacer(const SectorPlacer &copy, const osg::CopyOp &copyop)
    -[more]inline const rangef& getRadiusRange() const +[more]inline const rangef& getRadiusRange() const
    Get the range of possible values for radius
    -[more]inline const rangef& getPhiRange() const +[more]inline const rangef& getPhiRange() const
    Get the range of possible values for the central angle
    -[more]inline void setRadiusRange(const rangef &r) +[more]inline void setRadiusRange(const rangef &r)
    Set the range of possible values for radius
    -[more]inline void setRadiusRange(float r1, float r2) +[more]inline void setRadiusRange(float r1, float r2)
    Set the range of possible values for radius
    -[more]inline void setPhiRange(const rangef &r) +[more]inline void setPhiRange(const rangef &r)
    Set the range of possible values for the central angle
    -[more]inline void setPhiRange(float r1, float r2) +[more]inline void setPhiRange(float r1, float r2)
    Set the range of possible values for the central angle
    -[more]inline void place(Particle* P) const +[more]inline void place(Particle* P) const
    Place a particle.

    Protected Methods

    -[more]virtual ~SectorPlacer() +[more]virtual ~SectorPlacer()
    -[more]SectorPlacer& operator=(const SectorPlacer &) +[more]SectorPlacer& operator=(const SectorPlacer &)

    @@ -92,57 +92,57 @@ for radius, and a range of values for the central angle (sometimes
    - +
    o META_Object(osgParticle, SectorPlacer)

    - +

    ovirtual ~SectorPlacer()

    - +

    oSectorPlacer& operator=(const SectorPlacer &)

    - +

    oinline SectorPlacer()

    - -

    oinline SectorPlacer(const SectorPlacer &copy, const osg::CopyOp &copyop) + +
    oinline SectorPlacer(const SectorPlacer &copy, const osg::CopyOp &copyop)

    - +

    oinline const rangef& getRadiusRange() const
    Get the range of possible values for radius

    - +

    oinline const rangef& getPhiRange() const
    Get the range of possible values for the central angle

    - +

    oinline void setRadiusRange(const rangef &r)
    Set the range of possible values for radius

    - +

    oinline void setRadiusRange(float r1, float r2)
    Set the range of possible values for radius

    - +

    oinline void setPhiRange(const rangef &r)
    Set the range of possible values for the central angle

    - +

    oinline void setPhiRange(float r1, float r2)
    Set the range of possible values for the central angle

    - +

    oinline void place(Particle* P) const
    Place a particle. Do not call it manually.

    diff --git a/doc/doc++/osgParticle/SegmentPlacer.html b/doc/doc++/osgParticle/SegmentPlacer.html index 6f8b70e99..8ec96591e 100644 --- a/doc/doc++/osgParticle/SegmentPlacer.html +++ b/doc/doc++/osgParticle/SegmentPlacer.html @@ -23,42 +23,42 @@

    Public Methods

    -[more] META_Object(osgParticle, SegmentPlacer) +[more] META_Object(osgParticle, SegmentPlacer)
    -[more]inline SegmentPlacer() +[more]inline SegmentPlacer()
    -[more]inline SegmentPlacer(const SegmentPlacer &copy, const osg::CopyOp &copyop) +[more]inline SegmentPlacer(const SegmentPlacer &copy, const osg::CopyOp &copyop)
    -[more]inline const osg::Vec3& getVertexA() const +[more]inline const osg::Vec3& getVertexA() const
    get vertex A
    -[more]inline const osg::Vec3& getVertexB() const +[more]inline const osg::Vec3& getVertexB() const
    get vertex B
    -[more]inline void setSegment(const osg::Vec3 &A, const osg::Vec3 &B) +[more]inline void setSegment(const osg::Vec3 &A, const osg::Vec3 &B)
    Set both vertices
    -[more]inline void place(Particle* P) const +[more]inline void place(Particle* P) const
    Place a particle.
    -[more]inline void setVertexA(const osg::Vec3 &v) +[more]inline void setVertexA(const osg::Vec3 &v)
    Set vertex A of the segment as a vector
    -[more]inline void setVertexA(float x, float y, float z) +[more]inline void setVertexA(float x, float y, float z)
    Set vertex A of the segment as three floats
    -[more]inline void setVertexB(const osg::Vec3 &v) +[more]inline void setVertexB(const osg::Vec3 &v)
    Set vertex B of the segment as a vector
    -[more]inline void setVertexB(float x, float y, float z) +[more]inline void setVertexB(float x, float y, float z)
    Set vertex B of the segment as three floats

    Protected Methods

    -[more]virtual ~SegmentPlacer() +[more]virtual ~SegmentPlacer()
    -[more]SegmentPlacer& operator=(const SegmentPlacer &) +[more]SegmentPlacer& operator=(const SegmentPlacer &)

    @@ -85,62 +85,62 @@ within that segment.
    - +
    o META_Object(osgParticle, SegmentPlacer)

    - +

    ovirtual ~SegmentPlacer()

    - +

    oSegmentPlacer& operator=(const SegmentPlacer &)

    - +

    oinline SegmentPlacer()

    - -

    oinline SegmentPlacer(const SegmentPlacer &copy, const osg::CopyOp &copyop) + +
    oinline SegmentPlacer(const SegmentPlacer &copy, const osg::CopyOp &copyop)

    - +

    oinline const osg::Vec3& getVertexA() const
    get vertex A

    - +

    oinline const osg::Vec3& getVertexB() const
    get vertex B

    - +

    oinline void setSegment(const osg::Vec3 &A, const osg::Vec3 &B)
    Set both vertices

    - +

    oinline void place(Particle* P) const
    Place a particle. This method is called by ModularEmitter, do not call it manually.

    - +

    oinline void setVertexA(const osg::Vec3 &v)
    Set vertex A of the segment as a vector

    - +

    oinline void setVertexA(float x, float y, float z)
    Set vertex A of the segment as three floats

    - +

    oinline void setVertexB(const osg::Vec3 &v)
    Set vertex B of the segment as a vector

    - +

    oinline void setVertexB(float x, float y, float z)
    Set vertex B of the segment as three floats

    diff --git a/doc/doc++/osgParticle/Shooter.html b/doc/doc++/osgParticle/Shooter.html index d4ef93f50..5a97ed49d 100644 --- a/doc/doc++/osgParticle/Shooter.html +++ b/doc/doc++/osgParticle/Shooter.html @@ -23,25 +23,25 @@

    Public Methods

    -[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    -[more]virtual bool isSameKindAs(const osg::Object* obj) const +[more]virtual bool isSameKindAs(const osg::Object* obj) const
    -[more]virtual void shoot(Particle* P) const = 0 +[more]virtual void shoot(Particle* P) const = 0
    Shoot a particle.
    -[more]inline Shooter() +[more]inline Shooter()
    -[more]inline Shooter(const Shooter &copy, const osg::CopyOp &copyop) +[more]inline Shooter(const Shooter &copy, const osg::CopyOp &copyop)

    Protected Methods

    -[more]virtual ~Shooter() +[more]virtual ~Shooter()
    -[more]Shooter& operator=(const Shooter &) +[more]Shooter& operator=(const Shooter &)

    @@ -54,39 +54,39 @@ Descendants of this class must override the shoot() method. - +
    ovirtual const char* libraryName() const

    - +

    ovirtual const char* className() const

    - +

    ovirtual bool isSameKindAs(const osg::Object* obj) const

    - +

    ovirtual void shoot(Particle* P) const = 0
    Shoot a particle. Must be overriden by descendants. This method should only set the velocity vector of particle P, leaving other attributes unchanged.

    - +

    ovirtual ~Shooter()

    - +

    oShooter& operator=(const Shooter &)

    - +

    oinline Shooter()

    - -

    oinline Shooter(const Shooter &copy, const osg::CopyOp &copyop) + +
    oinline Shooter(const Shooter &copy, const osg::CopyOp &copyop)

    Direct child classes: diff --git a/doc/doc++/osgParticle/VariableRateCounter.html b/doc/doc++/osgParticle/VariableRateCounter.html index 54f89b73b..5e728df85 100644 --- a/doc/doc++/osgParticle/VariableRateCounter.html +++ b/doc/doc++/osgParticle/VariableRateCounter.html @@ -22,24 +22,24 @@

    Public Methods

    -[more]virtual const char* className() const +[more]virtual const char* className() const
    -[more]virtual bool isSameKindAs(const osg::Object* obj) const +[more]virtual bool isSameKindAs(const osg::Object* obj) const
    -[more]inline VariableRateCounter() +[more]inline VariableRateCounter()
    -[more]inline VariableRateCounter(const VariableRateCounter &copy, const osg::CopyOp &copyop) +[more]inline VariableRateCounter(const VariableRateCounter &copy, const osg::CopyOp &copyop)
    -[more]inline const rangef& getRateRange() const +[more]inline const rangef& getRateRange() const
    -[more]inline void setRateRange(const rangef &r) +[more]inline void setRateRange(const rangef &r)
    -[more]inline void setRateRange(float minrange, float maxrange) +[more]inline void setRateRange(float minrange, float maxrange)

    Protected Methods

    -[more]virtual ~VariableRateCounter() +[more]virtual ~VariableRateCounter()

    @@ -65,35 +65,35 @@
    - +
    ovirtual const char* className() const

    - +

    ovirtual bool isSameKindAs(const osg::Object* obj) const

    - +

    ovirtual ~VariableRateCounter()

    - +

    oinline VariableRateCounter()

    - -

    oinline VariableRateCounter(const VariableRateCounter &copy, const osg::CopyOp &copyop) + +
    oinline VariableRateCounter(const VariableRateCounter &copy, const osg::CopyOp &copyop)

    - +

    oinline const rangef& getRateRange() const

    - +

    oinline void setRateRange(const rangef &r)

    - +

    oinline void setRateRange(float minrange, float maxrange)

    diff --git a/doc/doc++/osgParticle/index.html b/doc/doc++/osgParticle/index.html index 259425da5..3c6a3264b 100644 --- a/doc/doc++/osgParticle/index.html +++ b/doc/doc++/osgParticle/index.html @@ -48,7 +48,7 @@
  • OSGPARTICLE_RADIALSHOOTER_
  • OSGPARTICLE_RANDOMRATECOUNTER_
  • OSGPARTICLE_RANGE_ -
  • OSGPARTICLE_SECTORPLACER_ Range of osg::Vec4s +
  • OSGPARTICLE_SECTORPLACER_
  • OSGPARTICLE_SEGMENTPLACER_
  • OSGPARTICLE_SHOOTER_
  • OSGPARTICLE_VARIABLERATECOUNTER_ diff --git a/doc/doc++/osgParticle/osgParticle.html b/doc/doc++/osgParticle/osgParticle.html index 8b7568865..5d229b243 100644 --- a/doc/doc++/osgParticle/osgParticle.html +++ b/doc/doc++/osgParticle/osgParticle.html @@ -84,6 +84,9 @@ typedef range<osg::Vec2> range<osg::Vec3> rangev3
    Range of osg::Vec3s
    +typedef range<osg::Vec4> rangev4 +
    Range of osg::Vec4s +
    class SectorPlacer: public CenteredPlacer
    A sector-shaped particle placer.
    diff --git a/doc/doc++/osgText/BitmapFont.html b/doc/doc++/osgText/BitmapFont.html index 29b9b3fa3..4091e8736 100644 --- a/doc/doc++/osgText/BitmapFont.html +++ b/doc/doc++/osgText/BitmapFont.html @@ -57,11 +57,11 @@
    obool open(const std::string& font)
    -ovirtual bool create(osg::State& state, int pointSize, const unsigned int res = 72 ) +ovirtual bool create(osg::State& state, int pointSize, unsigned int res = 72 )
    ovirtual bool create(osg::State& state)
    -ovirtual void output(osg::State& state, const char* text) +ovirtual void output(osg::State& state, const char* text) const
    ovirtual bool isOk(void) const
    diff --git a/doc/doc++/osgText/Font.html b/doc/doc++/osgText/Font.html index 0eadb68bc..a221172ea 100644 --- a/doc/doc++/osgText/Font.html +++ b/doc/doc++/osgText/Font.html @@ -36,11 +36,11 @@
    [more]bool open(const std::string& font)
    -[more]virtual bool create(osg::State& state, int pointSize, const unsigned int res = 72 ) +[more]virtual bool create(osg::State& state, int pointSize, unsigned int res = 72 )
    [more]virtual bool create(osg::State& state)
    -[more]virtual void output(osg::State& state, const char* text) +[more]virtual void output(osg::State& state, const char* text) const
    [more]virtual bool isOk(void) const
    @@ -131,7 +131,7 @@

    -

    ovirtual bool create(osg::State& state, int pointSize, const unsigned int res = 72 ) +
    ovirtual bool create(osg::State& state, int pointSize, unsigned int res = 72 )

    @@ -139,7 +139,7 @@

    -

    ovirtual void output(osg::State& state, const char* text) +
    ovirtual void output(osg::State& state, const char* text) const

    diff --git a/doc/doc++/osgText/OutlineFont.html b/doc/doc++/osgText/OutlineFont.html index 21ad6f8fa..91c5499ed 100644 --- a/doc/doc++/osgText/OutlineFont.html +++ b/doc/doc++/osgText/OutlineFont.html @@ -62,11 +62,11 @@

    obool open(const std::string& font)
    -ovirtual bool create(osg::State& state, int pointSize, const unsigned int res = 72 ) +ovirtual bool create(osg::State& state, int pointSize, unsigned int res = 72 )
    ovirtual bool create(osg::State& state)
    -ovirtual void output(osg::State& state, const char* text) +ovirtual void output(osg::State& state, const char* text) const
    ovirtual bool isOk(void) const
    diff --git a/doc/doc++/osgText/Paragraph.html b/doc/doc++/osgText/Paragraph.html index 5c39a336b..9d248cea4 100644 --- a/doc/doc++/osgText/Paragraph.html +++ b/doc/doc++/osgText/Paragraph.html @@ -36,7 +36,7 @@
    [more]void setMaximumNoCharactersPerLine(unsigned int maxCharsPerLine)
    -[more]const unsigned int getMaximumNoCharactersPerLine() const +[more]unsigned int getMaximumNoCharactersPerLine() const
    [more]void setText(const std::string& text)
    @@ -114,7 +114,7 @@

    -

    oconst unsigned int getMaximumNoCharactersPerLine() const +
    ounsigned int getMaximumNoCharactersPerLine() const

    diff --git a/doc/doc++/osgText/PixmapFont.html b/doc/doc++/osgText/PixmapFont.html index bb53c5528..87463982c 100644 --- a/doc/doc++/osgText/PixmapFont.html +++ b/doc/doc++/osgText/PixmapFont.html @@ -57,11 +57,11 @@

    obool open(const std::string& font)
    -ovirtual bool create(osg::State& state, int pointSize, const unsigned int res = 72 ) +ovirtual bool create(osg::State& state, int pointSize, unsigned int res = 72 )
    ovirtual bool create(osg::State& state)
    -ovirtual void output(osg::State& state, const char* text) +ovirtual void output(osg::State& state, const char* text) const
    ovirtual bool isOk(void) const
    diff --git a/doc/doc++/osgText/PolygonFont.html b/doc/doc++/osgText/PolygonFont.html index 85bda2d4e..4a2de3d19 100644 --- a/doc/doc++/osgText/PolygonFont.html +++ b/doc/doc++/osgText/PolygonFont.html @@ -64,11 +64,11 @@
    obool open(const std::string& font)
    -ovirtual bool create(osg::State& state, int pointSize, const unsigned int res = 72 ) +ovirtual bool create(osg::State& state, int pointSize, unsigned int res = 72 )
    ovirtual bool create(osg::State& state)
    -ovirtual void output(osg::State& state, const char* text) +ovirtual void output(osg::State& state, const char* text) const
    ovirtual bool isOk(void) const
    diff --git a/doc/doc++/osgText/RasterFont.html b/doc/doc++/osgText/RasterFont.html index d6f04b62c..b4b132c63 100644 --- a/doc/doc++/osgText/RasterFont.html +++ b/doc/doc++/osgText/RasterFont.html @@ -44,11 +44,11 @@
    obool open(const std::string& font)
    -ovirtual bool create(osg::State& state, int pointSize, const unsigned int res = 72 ) +ovirtual bool create(osg::State& state, int pointSize, unsigned int res = 72 )
    ovirtual bool create(osg::State& state)
    -ovirtual void output(osg::State& state, const char* text) +ovirtual void output(osg::State& state, const char* text) const
    ovirtual bool isOk(void) const
    diff --git a/doc/doc++/osgText/Text.html b/doc/doc++/osgText/Text.html index 1aeee78fb..11f5f4a7c 100644 --- a/doc/doc++/osgText/Text.html +++ b/doc/doc++/osgText/Text.html @@ -74,11 +74,11 @@
    [more]const std::string& getText() const
    -[more]virtual void drawImmediateMode(osg::State& state) +[more]virtual void drawImplementation(osg::State& state) const
    -[more]virtual void drawBoundingBox(void) +[more]virtual void drawBoundingBox(void) const
    -[more]virtual void drawAlignment(void) +[more]virtual void drawAlignment(void) const
    [more]const osg::Vec3& getAlignmentPos() const

    • @@ -123,7 +123,7 @@
    [more]virtual void setDefaults(void)
    -[more]virtual const bool computeBound(void) const +[more]virtual bool computeBound(void) const
    [more]virtual void calcBounds(osg::Vec3* min, osg::Vec3* max) const
    @@ -326,17 +326,17 @@
    oconst std::string& getText() const

    - + -

    ovirtual void drawImmediateMode(osg::State& state) +
    ovirtual void drawImplementation(osg::State& state) const

    -

    ovirtual void drawBoundingBox(void) +
    ovirtual void drawBoundingBox(void) const

    -

    ovirtual void drawAlignment(void) +
    ovirtual void drawAlignment(void) const

    @@ -382,7 +382,7 @@

    -

    ovirtual const bool computeBound(void) const +
    ovirtual bool computeBound(void) const

    diff --git a/doc/doc++/osgText/TextureFont.html b/doc/doc++/osgText/TextureFont.html index 2a8830564..e09aaa6eb 100644 --- a/doc/doc++/osgText/TextureFont.html +++ b/doc/doc++/osgText/TextureFont.html @@ -59,11 +59,11 @@

    obool open(const std::string& font)
    -ovirtual bool create(osg::State& state, int pointSize, const unsigned int res = 72 ) +ovirtual bool create(osg::State& state, int pointSize, unsigned int res = 72 )
    ovirtual bool create(osg::State& state)
    -ovirtual void output(osg::State& state, const char* text) +ovirtual void output(osg::State& state, const char* text) const
    ovirtual bool isOk(void) const
    diff --git a/doc/doc++/osgText/VectorFont.html b/doc/doc++/osgText/VectorFont.html index ac3f78205..0c6f29662 100644 --- a/doc/doc++/osgText/VectorFont.html +++ b/doc/doc++/osgText/VectorFont.html @@ -49,11 +49,11 @@
    obool open(const std::string& font)
    -ovirtual bool create(osg::State& state, int pointSize, const unsigned int res = 72 ) +ovirtual bool create(osg::State& state, int pointSize, unsigned int res = 72 )
    ovirtual bool create(osg::State& state)
    -ovirtual void output(osg::State& state, const char* text) +ovirtual void output(osg::State& state, const char* text) const
    ovirtual bool isOk(void) const
    diff --git a/doc/doc++/osgUtil/CombineLODsVisitor.html b/doc/doc++/osgUtil/CombineLODsVisitor.html index 39e89ef6e..035bc7c42 100644 --- a/doc/doc++/osgUtil/CombineLODsVisitor.html +++ b/doc/doc++/osgUtil/CombineLODsVisitor.html @@ -21,18 +21,23 @@
    +

    +

    Public Fields

    +[more]GroupList _groupList +

    +

    Public Methods

    -[more] CombineLODsVisitor() +[more] CombineLODsVisitor()
    -[more]virtual void apply(osg::LOD& lod) +[more]virtual void apply(osg::LOD& lod)
    -[more]void combineLODs() +[more]void combineLODs()

    Public Members

    -[more]typedef std::set<osg::Group*> GroupList GroupList _groupList +[more]typedef std::set<osg::Group*> GroupList

    @@ -44,20 +49,24 @@ complementary ranges
    + + +
    otypedef std::set<osg::Group*> GroupList +

    - -

    otypedef std::set<osg::Group*> GroupList GroupList _groupList + +
    oGroupList _groupList

    - +

    o CombineLODsVisitor()

    - +

    ovirtual void apply(osg::LOD& lod)

    - +

    ovoid combineLODs()

    diff --git a/doc/doc++/osgUtil/ConvertGeoSetsToGeometryVisitor.html b/doc/doc++/osgUtil/ConvertGeoSetsToGeometryVisitor.html index 011f0de17..33a8d3237 100644 --- a/doc/doc++/osgUtil/ConvertGeoSetsToGeometryVisitor.html +++ b/doc/doc++/osgUtil/ConvertGeoSetsToGeometryVisitor.html @@ -23,11 +23,11 @@

    Public Methods

    -[more] ConvertGeoSetsToGeometryVisitor() +[more] ConvertGeoSetsToGeometryVisitor()
    -[more]virtual void apply(osg::Geode& geode) +[more]virtual void apply(osg::Geode& geode)
    -[more]virtual void apply(osg::Node& node) +[more]virtual void apply(osg::Node& node)

    @@ -39,15 +39,15 @@
    - +
    o ConvertGeoSetsToGeometryVisitor()

    - +

    ovirtual void apply(osg::Geode& geode)

    - +

    ovirtual void apply(osg::Node& node)

    diff --git a/doc/doc++/osgUtil/CullVisitor.html b/doc/doc++/osgUtil/CullVisitor.html index 481e858ab..ae363c079 100644 --- a/doc/doc++/osgUtil/CullVisitor.html +++ b/doc/doc++/osgUtil/CullVisitor.html @@ -23,186 +23,186 @@

    Public Methods

    -[more] CullVisitor() +[more] CullVisitor()
    -[more]virtual ~CullVisitor() +[more]virtual ~CullVisitor()
    -[more]virtual CullVisitor* cloneType() const +[more]virtual CullVisitor* cloneType() const
    -[more]virtual void reset() +[more]virtual void reset()
    -[more]virtual void apply(osg::Node&) +[more]virtual float getDistanceToEyePoint(const osg::Vec3& pos, bool withLODBias) const
    -[more]virtual void apply(osg::Geode& node) +[more]virtual float getDistanceFromEyePoint(const osg::Vec3& pos, bool withLODBias) const
    -[more]virtual void apply(osg::Billboard& node) +[more]virtual void apply(osg::Node&)
    -[more]virtual void apply(osg::LightSource& node) +[more]virtual void apply(osg::Geode& node)
    -[more]virtual void apply(osg::ClipNode& node) +[more]virtual void apply(osg::Billboard& node)
    -[more]virtual void apply(osg::Group& node) +[more]virtual void apply(osg::LightSource& node)
    -[more]virtual void apply(osg::Transform& node) +[more]virtual void apply(osg::ClipNode& node)
    -[more]virtual void apply(osg::Projection& node) +[more]virtual void apply(osg::Group& node)
    -[more]virtual void apply(osg::Switch& node) +[more]virtual void apply(osg::Transform& node)
    -[more]virtual void apply(osg::LOD& node) +[more]virtual void apply(osg::Projection& node)
    -[more]virtual void apply(osg::ClearNode& node) +[more]virtual void apply(osg::Switch& node)
    -[more]virtual void apply(osg::OccluderNode& node) +[more]virtual void apply(osg::LOD& node)
    -[more]virtual void apply(osg::Impostor& node) +[more]virtual void apply(osg::ClearNode& node)
    -[more]void setClearNode(const osg::ClearNode* earthSky) +[more]virtual void apply(osg::OccluderNode& node)
    -[more]const osg::ClearNode* getClearNode() const +[more]virtual void apply(osg::Impostor& node)
    -[more]void setImpostorsActive(const bool active) +[more]void setClearNode(const osg::ClearNode* earthSky) +
    +[more]const osg::ClearNode* getClearNode() const +
    +[more]void setImpostorsActive(bool active)
    Switch the creation of Impostors on or off.
    -[more]const bool getImpostorsActive() const +[more]bool getImpostorsActive() const
    Get whether impostors are active or not.
    -[more]void setImpostorPixelErrorThreshold(const float numPixels) +[more]void setImpostorPixelErrorThreshold(float numPixels)
    Set the impostor error threshold.
    -[more]const float getImpostorPixelErrorThreshold() const +[more]float getImpostorPixelErrorThreshold() const
    Get the impostor error threshold
    -[more]void setDepthSortImpostorSprites(const bool doDepthSort) +[more]void setDepthSortImpostorSprites(bool doDepthSort)
    Set whether ImpsotorSprite's should be placed in a depth sorted bin for rendering
    -[more]const bool setDepthSortImpostorSprites() const +[more]bool setDepthSortImpostorSprites() const
    Get whether ImpsotorSprite's are depth sorted bin for rendering
    -[more]void setNumberOfFrameToKeepImpostorSprites(const int numFrames) +[more]void setNumberOfFrameToKeepImpostorSprites(int numFrames)
    Set the number of frames that an ImpsotorSprite's is kept whilst not being beyond, before being recycled
    -[more]const int getNumberOfFrameToKeepImpostorSprites() const +[more]int getNumberOfFrameToKeepImpostorSprites() const
    Get the number of frames that an ImpsotorSprite's is kept whilst not being beyond, before being recycled
    -[more]void setComputeNearFarMode(ComputeNearFarMode cnfm) +[more]void setComputeNearFarMode(ComputeNearFarMode cnfm)
    -[more]ComputeNearFarMode getComputeNearFarMode() const +[more]ComputeNearFarMode getComputeNearFarMode() const
    -[more]void setTransparencySortMode(TransparencySortMode tsm) -
    -[more]inline void pushStateSet(const osg::StateSet* ss) +[more]inline void pushStateSet(const osg::StateSet* ss)
    Push state set on the current state group.
    -[more]inline void popStateSet() +[more]inline void popStateSet()
    Pop the top state set and hence associated state group.
    -[more]inline void setRenderGraph(RenderGraph* rg) +[more]inline void setRenderGraph(RenderGraph* rg)
    -[more]inline RenderGraph* getRootRenderGraph() +[more]inline RenderGraph* getRootRenderGraph()
    -[more]inline RenderGraph* getCurrentRenderGraph() +[more]inline RenderGraph* getCurrentRenderGraph()
    -[more]inline void setRenderStage(RenderStage* rg) +[more]inline void setRenderStage(RenderStage* rg)
    -[more]inline RenderStage* getRenderStage() +[more]inline RenderStage* getRenderStage()
    -[more]inline RenderBin* getCurrentRenderBin() +[more]inline RenderBin* getCurrentRenderBin()
    -[more]inline void setCurrentRenderBin(RenderBin* rb) +[more]inline void setCurrentRenderBin(RenderBin* rb)
    -[more]inline const float getCalculatedNearPlane() const +[more]inline float getCalculatedNearPlane() const
    -[more]inline const float getCalculatedFarPlane() const +[more]inline float getCalculatedFarPlane() const
    -[more]void updateCalculatedNearFar(const osg::Matrix& matrix, const osg::Drawable& drawable) +[more]void updateCalculatedNearFar(const osg::Matrix& matrix, const osg::Drawable& drawable)
    -[more]void updateCalculatedNearFar(const osg::Matrix& matrix, const osg::BoundingBox& bb) +[more]void updateCalculatedNearFar(const osg::Matrix& matrix, const osg::BoundingBox& bb)
    -[more]void updateCalculatedNearFar(const osg::Vec3& pos) +[more]void updateCalculatedNearFar(const osg::Vec3& pos)
    -[more]void popProjectionMatrix() +[more]void popProjectionMatrix()
    reimplement CullStack's popProjectionMatrix() adding clamping of the projection matrix to the computed near and far
    -[more]void setState(osg::State* state) +[more]void setState(osg::State* state)
    -[more]osg::State* getState() +[more]osg::State* getState()
    -[more]const osg::State* getState() const +[more]const osg::State* getState() const
    -[more]inline void addDrawable(osg::Drawable* drawable, osg::Matrix* matrix) +[more]inline void addDrawable(osg::Drawable* drawable, osg::Matrix* matrix)
    Add a drawable to current render graph
    -[more]inline void addDrawableAndDepth(osg::Drawable* drawable, osg::Matrix* matrix, const float depth) +[more]inline void addDrawableAndDepth(osg::Drawable* drawable, osg::Matrix* matrix, float depth)
    Add a drawable and depth to current render graphAdd a drawable and depth to current render graph
    -[more]inline void addPositionedAttribute(osg::Matrix* matrix, const osg::StateAttribute* attr) +[more]inline void addPositionedAttribute(osg::Matrix* matrix, const osg::StateAttribute* attr)
    Add an attribute which is positioned related to the modelview matrixAdd an attribute which is positioned related to the modelview matrix
    -[more]inline RenderLeaf* createOrReuseRenderLeaf(osg::Drawable* drawable, osg::Matrix* projection, osg::Matrix* matrix, float depth) +[more]inline RenderLeaf* createOrReuseRenderLeaf(osg::Drawable* drawable, osg::Matrix* projection, osg::Matrix* matrix, float depth)

    Public Members

    -[more]enum ComputeNearFarMode -
    -[more]enum TransparencySortMode +[more]enum ComputeNearFarMode

    Protected Fields

    -[more]osg::ref_ptr<RenderGraph> _rootRenderGraph +[more]osg::ref_ptr<RenderGraph> _rootRenderGraph
    -[more]RenderGraph* _currentRenderGraph +[more]RenderGraph* _currentRenderGraph
    -[more]osg::ref_ptr<RenderStage> _rootRenderStage +[more]osg::ref_ptr<RenderStage> _rootRenderStage
    -[more]RenderBin* _currentRenderBin +[more]RenderBin* _currentRenderBin
    -[more]ComputeNearFarMode _computeNearFar +[more]ComputeNearFarMode _computeNearFar
    -[more]float _computed_znear +[more]float _computed_znear
    -[more]float _computed_zfar +[more]float _computed_zfar
    -[more]osg::ref_ptr<const osg::ClearNode> _clearNode +[more]osg::ref_ptr<const osg::ClearNode> _clearNode
    -[more]TransparencySortMode _tsm +[more]bool _impostorActive
    -[more]bool _impostorActive +[more]bool _depthSortImpostorSprites
    -[more]bool _depthSortImpostorSprites +[more]float _impostorPixelErrorThreshold
    -[more]float _impostorPixelErrorThreshold +[more]int _numFramesToKeepImpostorSprites
    -[more]int _numFramesToKeepImpostorSprites +[more]RenderLeafList _reuseRenderLeafList
    -[more]unsigned int _currentReuseRenderLeafIndex +[more]unsigned int _currentReuseRenderLeafIndex
    -[more]osg::ref_ptr<osg::ImpostorSpriteManager> _impostorSpriteManager +[more]osg::ref_ptr<osg::ImpostorSpriteManager> _impostorSpriteManager
    -[more]osg::ref_ptr<osg::State> _state +[more]osg::ref_ptr<osg::State> _state

    Protected Methods

    -[more] CullVisitor(const CullVisitor&) +[more] CullVisitor(const CullVisitor&)
    prevent unwanted copy construction
    -[more]CullVisitor& operator = (const CullVisitor&) +[more]CullVisitor& operator = (const CullVisitor&)
    prevent unwanted copy operator
    -[more]inline void handle_cull_callbacks_and_traverse(osg::Node& node) +[more]inline void handle_cull_callbacks_and_traverse(osg::Node& node)
    -[more]inline void handle_cull_callbacks_and_accept(osg::Node& node, osg::Node* acceptNode) +[more]inline void handle_cull_callbacks_and_accept(osg::Node& node, osg::Node* acceptNode)
    -[more]osg::ImpostorSprite* createImpostorSprite(osg::Impostor& node) +[more]osg::ImpostorSprite* createImpostorSprite(osg::Impostor& node)
    create an impostor sprite by setting up a pre-rendering stage to generate the impostor texture.

    Protected Members

    -[more]typedef std::vector< osg::ref_ptr<RenderLeaf> > RenderLeafList RenderLeafList _reuseRenderLeafList +[more]typedef std::vector< osg::ref_ptr<RenderLeaf> > RenderLeafList

    @@ -220,84 +220,92 @@ from the eye to the one nearest the eye.
    - +
    o CullVisitor()

    - +

    ovirtual ~CullVisitor()

    - +

    ovirtual CullVisitor* cloneType() const

    - +

    ovirtual void reset()

    + + +

    ovirtual float getDistanceToEyePoint(const osg::Vec3& pos, bool withLODBias) const +

    + + +

    ovirtual float getDistanceFromEyePoint(const osg::Vec3& pos, bool withLODBias) const +

    - +

    ovirtual void apply(osg::Node&)

    - +

    ovirtual void apply(osg::Geode& node)

    - +

    ovirtual void apply(osg::Billboard& node)

    - +

    ovirtual void apply(osg::LightSource& node)

    - +

    ovirtual void apply(osg::ClipNode& node)

    - +

    ovirtual void apply(osg::Group& node)

    - +

    ovirtual void apply(osg::Transform& node)

    - +

    ovirtual void apply(osg::Projection& node)

    - +

    ovirtual void apply(osg::Switch& node)

    - +

    ovirtual void apply(osg::LOD& node)

    - +

    ovirtual void apply(osg::ClearNode& node)

    - +

    ovirtual void apply(osg::OccluderNode& node)

    - +

    ovirtual void apply(osg::Impostor& node)

    - +

    ovoid setClearNode(const osg::ClearNode* earthSky)

    - +

    oconst osg::ClearNode* getClearNode() const

    - -

    ovoid setImpostorsActive(const bool active) + +
    ovoid setImpostorsActive(bool active)
    Switch the creation of Impostors on or off. Setting active to false forces the CullVisitor to use the Impostor LOD children for rendering. Setting active to true forces the @@ -305,89 +313,71 @@ CullVisitor to create the appropriate pre-rendering stages which render to the ImpostorSprite's texture.

    - -

    oconst bool getImpostorsActive() const + +
    obool getImpostorsActive() const
    Get whether impostors are active or not.

    - -

    ovoid setImpostorPixelErrorThreshold(const float numPixels) + +
    ovoid setImpostorPixelErrorThreshold(float numPixels)
    Set the impostor error threshold. Used in calculation of whether impostors remain valid.

    - -

    oconst float getImpostorPixelErrorThreshold() const + +
    ofloat getImpostorPixelErrorThreshold() const
    Get the impostor error threshold

    - -

    ovoid setDepthSortImpostorSprites(const bool doDepthSort) + +
    ovoid setDepthSortImpostorSprites(bool doDepthSort)
    Set whether ImpsotorSprite's should be placed in a depth sorted bin for rendering

    - -

    oconst bool setDepthSortImpostorSprites() const + +
    obool setDepthSortImpostorSprites() const
    Get whether ImpsotorSprite's are depth sorted bin for rendering

    - -

    ovoid setNumberOfFrameToKeepImpostorSprites(const int numFrames) + +
    ovoid setNumberOfFrameToKeepImpostorSprites(int numFrames)
    Set the number of frames that an ImpsotorSprite's is kept whilst not being beyond, before being recycled

    - -

    oconst int getNumberOfFrameToKeepImpostorSprites() const + +
    oint getNumberOfFrameToKeepImpostorSprites() const
    Get the number of frames that an ImpsotorSprite's is kept whilst not being beyond, before being recycled

    - +

    oenum ComputeNearFarMode

    - +
    o DO_NOT_COMPUTE_NEAR_FAR

    - +

    o COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES

    - +

    o COMPUTE_NEAR_FAR_USING_PRIMITIVES

    - -
    ovoid setComputeNearFarMode(ComputeNearFarMode cnfm) + +
    ovoid setComputeNearFarMode(ComputeNearFarMode cnfm)

    - -

    oComputeNearFarMode getComputeNearFarMode() const -

    - - -

    oenum TransparencySortMode -

    - - - -
    o LOOK_VECTOR_DISTANCE -

    - - -

    o OBJECT_EYE_POINT_DISTANCE -

    - - - -
    ovoid setTransparencySortMode(TransparencySortMode tsm) + +
    oComputeNearFarMode getComputeNearFarMode() const

    - +

    oinline void pushStateSet(const osg::StateSet* ss)
    Push state set on the current state group. If the state exists in a child state group of the current @@ -397,186 +387,186 @@ it to the current state group then move the current state group pointer to the new state group.

    - +

    oinline void popStateSet()
    Pop the top state set and hence associated state group. Move the current state group to the parent of the popped state group.

    - +

    oinline void setRenderGraph(RenderGraph* rg)

    - +

    oinline RenderGraph* getRootRenderGraph()

    - +

    oinline RenderGraph* getCurrentRenderGraph()

    - +

    oinline void setRenderStage(RenderStage* rg)

    - +

    oinline RenderStage* getRenderStage()

    - +

    oinline RenderBin* getCurrentRenderBin()

    - +

    oinline void setCurrentRenderBin(RenderBin* rb)

    - -

    oinline const float getCalculatedNearPlane() const + +
    oinline float getCalculatedNearPlane() const

    - -

    oinline const float getCalculatedFarPlane() const + +
    oinline float getCalculatedFarPlane() const

    - +

    ovoid updateCalculatedNearFar(const osg::Matrix& matrix, const osg::Drawable& drawable)

    - +

    ovoid updateCalculatedNearFar(const osg::Matrix& matrix, const osg::BoundingBox& bb)

    - +

    ovoid updateCalculatedNearFar(const osg::Vec3& pos)

    - +

    ovoid popProjectionMatrix()
    reimplement CullStack's popProjectionMatrix() adding clamping of the projection matrix to the computed near and far

    - +

    ovoid setState(osg::State* state)

    - +

    oosg::State* getState()

    - +

    oconst osg::State* getState() const

    - -

    o CullVisitor(const CullVisitor&) + +
    o CullVisitor(const CullVisitor&)
    prevent unwanted copy construction

    - +

    oCullVisitor& operator = (const CullVisitor&)
    prevent unwanted copy operator

    - +

    oinline void handle_cull_callbacks_and_traverse(osg::Node& node)

    - +

    oinline void handle_cull_callbacks_and_accept(osg::Node& node, osg::Node* acceptNode)

    - +

    oosg::ImpostorSprite* createImpostorSprite(osg::Impostor& node)
    create an impostor sprite by setting up a pre-rendering stage to generate the impostor texture.

    - +

    oosg::ref_ptr<RenderGraph> _rootRenderGraph

    - +

    oRenderGraph* _currentRenderGraph

    - +

    oosg::ref_ptr<RenderStage> _rootRenderStage

    - +

    oRenderBin* _currentRenderBin

    - -

    oComputeNearFarMode _computeNearFar + +
    oComputeNearFarMode _computeNearFar

    - +

    ofloat _computed_znear

    - +

    ofloat _computed_zfar

    - +

    oosg::ref_ptr<const osg::ClearNode> _clearNode

    - - -

    oTransparencySortMode _tsm -

    - +

    obool _impostorActive

    - +

    obool _depthSortImpostorSprites

    - +

    ofloat _impostorPixelErrorThreshold

    - +

    oint _numFramesToKeepImpostorSprites

    + + +

    otypedef std::vector< osg::ref_ptr<RenderLeaf> > RenderLeafList +

    - -

    otypedef std::vector< osg::ref_ptr<RenderLeaf> > RenderLeafList RenderLeafList _reuseRenderLeafList + +
    oRenderLeafList _reuseRenderLeafList

    - +

    ounsigned int _currentReuseRenderLeafIndex

    - +

    oosg::ref_ptr<osg::ImpostorSpriteManager> _impostorSpriteManager

    - +

    oosg::ref_ptr<osg::State> _state

    - +

    oinline void addDrawable(osg::Drawable* drawable, osg::Matrix* matrix)
    Add a drawable to current render graph

    - -

    oinline void addDrawableAndDepth(osg::Drawable* drawable, osg::Matrix* matrix, const float depth) + +
    oinline void addDrawableAndDepth(osg::Drawable* drawable, osg::Matrix* matrix, float depth)
    Add a drawable and depth to current render graphAdd a drawable and depth to current render graph

    - +

    oinline void addPositionedAttribute(osg::Matrix* matrix, const osg::StateAttribute* attr)
    Add an attribute which is positioned related to the modelview matrixAdd an attribute which is positioned related to the modelview matrix

    - +

    oinline RenderLeaf* createOrReuseRenderLeaf(osg::Drawable* drawable, osg::Matrix* projection, osg::Matrix* matrix, float depth)

    diff --git a/doc/doc++/osgUtil/DisplayListVisitor.html b/doc/doc++/osgUtil/DisplayListVisitor.html index 7ddb13c9c..6f63be471 100644 --- a/doc/doc++/osgUtil/DisplayListVisitor.html +++ b/doc/doc++/osgUtil/DisplayListVisitor.html @@ -23,24 +23,24 @@

    Public Methods

    -[more] DisplayListVisitor(Mode mode=COMPILE_DISPLAY_LISTS|COMPILE_STATE_ATTRIBUTES) +[more] DisplayListVisitor(Mode mode=COMPILE_DISPLAY_LISTS|COMPILE_STATE_ATTRIBUTES)
    Construct a DisplayListVisior to traverse all child, with set specified display list mode.
    -[more]void setMode(Mode mode) +[more]void setMode(Mode mode)
    Set the operational mode of how the visitor should set up osg::Drawable's
    -[more]Mode getMode() const +[more]Mode getMode() const
    Get the operational mode
    -[more]void setState(osg::State* state) +[more]void setState(osg::State* state)
    Set the State to use during traversal.
    -[more]osg::State* getState() +[more]osg::State* getState()
    -[more]virtual void apply(osg::Node& node) +[more]virtual void apply(osg::Node& node)
    Simply traverse using standard NodeVisitor traverse method
    -[more]virtual void apply(osg::Geode& node) +[more]virtual void apply(osg::Geode& node)
    For each Geode visited set the display list usage according to the _displayListMode

    @@ -48,13 +48,15 @@

    Public Members

    [more]enum ModeValues
    Operation modes of the +
    +[more]typedef unsigned int Mode

    Protected Fields

    -[more]Mode _mode +[more]Mode _mode
    -[more]osg::ref_ptr<osg::State> _state +[more]osg::ref_ptr<osg::State> _state

    @@ -90,49 +92,53 @@ osg::StateAttribute's
    o COMPILE_STATE_ATTRIBUTES

    - + -

    o DisplayListVisitor(Mode mode=COMPILE_DISPLAY_LISTS|COMPILE_STATE_ATTRIBUTES) +
    otypedef unsigned int Mode +

    + + +

    o DisplayListVisitor(Mode mode=COMPILE_DISPLAY_LISTS|COMPILE_STATE_ATTRIBUTES)
    Construct a DisplayListVisior to traverse all child, with set specified display list mode. Default mode is to gset->setUseDisplayList(true).

    - -

    ovoid setMode(Mode mode) + +
    ovoid setMode(Mode mode)
    Set the operational mode of how the visitor should set up osg::Drawable's

    - -

    oMode getMode() const + +
    oMode getMode() const
    Get the operational mode

    - +

    ovoid setState(osg::State* state)
    Set the State to use during traversal.

    - +

    oosg::State* getState()

    - +

    ovirtual void apply(osg::Node& node)
    Simply traverse using standard NodeVisitor traverse method

    - +

    ovirtual void apply(osg::Geode& node)
    For each Geode visited set the display list usage according to the _displayListMode

    - -

    oMode _mode + +
    oMode _mode

    - +

    oosg::ref_ptr<osg::State> _state

    diff --git a/doc/doc++/osgUtil/FlattenStaticTransformsVisitor.html b/doc/doc++/osgUtil/FlattenStaticTransformsVisitor.html index 13b7bdd40..999cf25cd 100644 --- a/doc/doc++/osgUtil/FlattenStaticTransformsVisitor.html +++ b/doc/doc++/osgUtil/FlattenStaticTransformsVisitor.html @@ -23,48 +23,37 @@

    Public Methods

    -[more] FlattenStaticTransformsVisitor(bool ignoreDynamicTransforms=true) +[more] FlattenStaticTransformsVisitor()
    -[more]virtual void apply(osg::Geode& geode) +[more]virtual void apply(osg::Geode& geode)
    -[more]virtual void apply(osg::Billboard& billboard) +[more]virtual void apply(osg::Billboard& geode)
    -[more]virtual void apply(osg::LOD& lod) +[more]virtual void apply(osg::Transform& transform)
    -[more]virtual void apply(osg::Transform& transform) -
    -[more]void removeTransforms() +[more]bool removeTransforms()

    Protected Fields

    -[more]bool _ignoreDynamicTransforms +[more]TransformStack _transformStack
    -[more]MatrixStack _matrixStack +[more]DrawableSet _drawableSet
    -[more]TransformStack _transformStack +[more]BillboardSet _billboardSet
    -[more]TransformMap _transformMap -
    -[more]ObjectMap _objectMap -

    - -

    -

    Protected Methods

    -[more]typedef std::map<osg::Object*,ObjectStruct> ObjectMap void disableObject(osg::Object* object) -
    -[more]void disableObject(ObjectMap::iterator itr) -
    -[more]void disableTransform(osg::Transform* transform) -
    -[more]void doTransform(osg::Object* obj, osg::Matrix& matrix) +[more]TransformSet _transformSet

    Protected Members

    -[more]typedef std::vector<osg::Matrix> MatrixStackstruct TransformStruct +[more]typedef std::vector<osg::Transform*> TransformStack
    -[more]struct ObjectStruct +[more]typedef std::set<osg::Drawable*> DrawableSet +
    +[more]typedef std::set<osg::Billboard*> BillboardSet +
    +[more]typedef std::set<osg::Transform*> TransformSet

    @@ -78,120 +67,56 @@ now redundent transforms
    - -
    o FlattenStaticTransformsVisitor(bool ignoreDynamicTransforms=true) + +
    o FlattenStaticTransformsVisitor()

    - +

    ovirtual void apply(osg::Geode& geode)

    - -

    ovirtual void apply(osg::Billboard& billboard) + +
    ovirtual void apply(osg::Billboard& geode)

    - -

    ovirtual void apply(osg::LOD& lod) -

    - - +

    ovirtual void apply(osg::Transform& transform)

    - -

    ovoid removeTransforms() + +
    obool removeTransforms()

    - - -

    otypedef std::vector<osg::Matrix> MatrixStackstruct TransformStruct -

    - - - -
    otypedef std::set<osg::Object*> ObjectSet TransformStruct() + + +
    otypedef std::vector<osg::Transform*> TransformStack

    - - -

    ovoid add(osg::Object* obj) + + +
    otypedef std::set<osg::Drawable*> DrawableSet

    - - -

    obool _canBeApplied + + +
    otypedef std::set<osg::Billboard*> BillboardSet

    - - -

    oObjectSet _objectSet -

    - - - -
    ostruct ObjectStruct -

    - - - -
    otypedef std::set<osg::Transform*> TransformSet ObjectStruct() -

    - - -

    ovoid add(TransformStack& transforms, osg::Matrix& matrix) -

    - - -

    obool _canBeApplied -

    - - -

    obool _matrixSet -

    - - -

    obool _moreThanOneMatrixRequired -

    - - -

    oosg::Matrix _matrix -

    - - -

    oTransformSet _transformSet -

    - - - -
    otypedef std::map<osg::Object*,ObjectStruct> ObjectMap void disableObject(osg::Object* object) -

    - - -

    ovoid disableObject(ObjectMap::iterator itr) -

    - - -

    ovoid disableTransform(osg::Transform* transform) -

    - - -

    ovoid doTransform(osg::Object* obj, osg::Matrix& matrix) -

    - - -

    obool _ignoreDynamicTransforms -

    - - -

    oMatrixStack _matrixStack + + +
    otypedef std::set<osg::Transform*> TransformSet

    - -

    oTransformStack _transformStack + +
    oTransformStack _transformStack

    - - -

    oTransformMap _transformMap + + +
    oDrawableSet _drawableSet

    - - -

    oObjectMap _objectMap + + +
    oBillboardSet _billboardSet +

    + + +

    oTransformSet _transformSet

    This class has no child classes.
    diff --git a/doc/doc++/osgUtil/General.html b/doc/doc++/osgUtil/General.html index 03957ffa7..88ad7e6d2 100644 --- a/doc/doc++/osgUtil/General.html +++ b/doc/doc++/osgUtil/General.html @@ -13,12 +13,12 @@ o#define OSGUTIL_APPVISITOR
    +o#define +OSGUTIL_CUBEMAPGENERATOR_
    + o#define OSGUTIL_CULLVISITOR
    -o#define -OSGUTIL_DEPTHSORTEDBIN
    - o#define OSGUTIL_DISPLAYLISTVISITOR
    @@ -37,6 +37,12 @@ o#define OSGUTIL_EXPORT
    +o#define +OSGUTIL_HALFWAYMAPGENERATOR_
    + +o#define +OSGUTIL_HIGHLIGHTMAPGENERATOR_
    + o#define OSGUTIL_INSERTIMPOSTORSVISITOR
    @@ -46,6 +52,9 @@ o#define OSGUTIL_OPTIMIZER
    +o#define +OSGUTIL_REFLECTIONMAPGENERATOR_
    + o#define OSGUTIL_RENDERBIN
    diff --git a/doc/doc++/osgUtil/HIER.html b/doc/doc++/osgUtil/HIER.html index e4d2051e8..fb99ca388 100644 --- a/doc/doc++/osgUtil/HIER.html +++ b/doc/doc++/osgUtil/HIER.html @@ -12,6 +12,12 @@
  • osgUtil::AppVisitor
  • osgUtil::Optimizer::CombineLODsVisitor
  • osgUtil::Optimizer::ConvertGeoSetsToGeometryVisitor +
  • osgUtil::CubeMapGenerator +
  • osgUtil::CullVisitor
  • osgUtil::DisplayListVisitor
  • osgUtil::DisplayRequirementsVisitor @@ -24,11 +30,9 @@
  • osgUtil::Optimizer
  • osgUtil::RegisterRenderBinProxy
  • osgUtil::Optimizer::RemoveEmptyNodesVisitor -
  • osgUtil::Optimizer::RemoveLowestStaticTransformsVisitor
  • osgUtil::Optimizer::RemoveRedundentNodesVisitor
  • osgUtil::RenderBin
    •  + + + + + + + @@ -107,13 +114,6 @@ - - - - - - - @@ -134,11 +134,11 @@ - - - - - + + + + + diff --git a/doc/doc++/osgUtil/Hit.html b/doc/doc++/osgUtil/Hit.html index 525635f21..dd2120fae 100644 --- a/doc/doc++/osgUtil/Hit.html +++ b/doc/doc++/osgUtil/Hit.html @@ -12,50 +12,55 @@

    Public Fields

    -[more]float _ratio +[more]float _ratio
    -[more]osg::ref_ptr<osg::LineSegment> _originalLineSegment +[more]osg::ref_ptr<osg::LineSegment> _originalLineSegment
    -[more]osg::ref_ptr<osg::LineSegment> _localLineSegment +[more]osg::ref_ptr<osg::LineSegment> _localLineSegment
    -[more]osg::NodePath _nodePath +[more]osg::NodePath _nodePath
    -[more]osg::ref_ptr<osg::Geode> _geode +[more]osg::ref_ptr<osg::Geode> _geode
    -[more]osg::ref_ptr<osg::Drawable> _drawable +[more]osg::ref_ptr<osg::Drawable> _drawable
    -[more]osg::ref_ptr<osg::Matrix> _matrix +[more]osg::ref_ptr<osg::Matrix> _matrix
    -[more]osg::ref_ptr<osg::Matrix> _inverse +[more]osg::ref_ptr<osg::Matrix> _inverse
    -[more]VecIndexList _vecIndexList +[more]VecIndexList _vecIndexList
    -[more]int _primitiveIndex +[more]int _primitiveIndex
    -[more]osg::Vec3 _intersectPoint +[more]osg::Vec3 _intersectPoint
    -[more]osg::Vec3 _intersectNormal +[more]osg::Vec3 _intersectNormal

    Public Methods

    -[more] Hit() +[more] Hit()
    -[more] Hit(const Hit& hit) +[more] Hit(const Hit& hit)
    -[more] ~Hit() +[more] ~Hit()
    -[more]Hit& operator = (const Hit& hit) +[more]Hit& operator = (const Hit& hit)
    -[more]typedef std::vector<int> VecIndexList bool operator < (const Hit& hit) const +[more]bool operator < (const Hit& hit) const
    -[more]const osg::Vec3& getLocalIntersectPoint() const +[more]const osg::Vec3& getLocalIntersectPoint() const
    -[more]const osg::Vec3& getLocalIntersectNormal() const +[more]const osg::Vec3& getLocalIntersectNormal() const
    -[more]const osg::Vec3 getWorldIntersectPoint() const +[more]const osg::Vec3 getWorldIntersectPoint() const
    -[more]const osg::Vec3 getWorldIntersectNormal() const +[more]const osg::Vec3 getWorldIntersectNormal() const +

    + +

    +

    Public Members

    +[more]typedef std::vector<int> VecIndexList

    @@ -66,87 +71,91 @@
    - +
    o Hit()

    - -

    o Hit(const Hit& hit) + +
    o Hit(const Hit& hit)

    - +

    o ~Hit()

    - +

    oHit& operator = (const Hit& hit)

    + + +

    otypedef std::vector<int> VecIndexList +

    - -

    otypedef std::vector<int> VecIndexList bool operator < (const Hit& hit) const + +
    obool operator < (const Hit& hit) const

    - +

    oconst osg::Vec3& getLocalIntersectPoint() const

    - +

    oconst osg::Vec3& getLocalIntersectNormal() const

    - +

    oconst osg::Vec3 getWorldIntersectPoint() const

    - +

    oconst osg::Vec3 getWorldIntersectNormal() const

    - +

    ofloat _ratio

    - +

    oosg::ref_ptr<osg::LineSegment> _originalLineSegment

    - +

    oosg::ref_ptr<osg::LineSegment> _localLineSegment

    - +

    oosg::NodePath _nodePath

    - +

    oosg::ref_ptr<osg::Geode> _geode

    - +

    oosg::ref_ptr<osg::Drawable> _drawable

    - +

    oosg::ref_ptr<osg::Matrix> _matrix

    - +

    oosg::ref_ptr<osg::Matrix> _inverse

    - -

    oVecIndexList _vecIndexList + +
    oVecIndexList _vecIndexList

    - +

    oint _primitiveIndex

    - +

    oosg::Vec3 _intersectPoint

    - +

    oosg::Vec3 _intersectNormal

    diff --git a/doc/doc++/osgUtil/InsertImpostorsVisitor.html b/doc/doc++/osgUtil/InsertImpostorsVisitor.html index b26f0423c..6332c3134 100644 --- a/doc/doc++/osgUtil/InsertImpostorsVisitor.html +++ b/doc/doc++/osgUtil/InsertImpostorsVisitor.html @@ -23,45 +23,49 @@

    Public Methods

    -[more] InsertImpostorsVisitor() +[more] InsertImpostorsVisitor()
    default to traversing all children
    -[more]void setImpostorThresholdRatio(const float ratio) +[more]void setImpostorThresholdRatio(float ratio)
    -[more]const float getImpostorThresholdRatio() const +[more]float getImpostorThresholdRatio() const
    -[more]void setMaximumNumberOfNestedImpostors(const unsigned int num) +[more]void setMaximumNumberOfNestedImpostors(unsigned int num)
    -[more]const unsigned int getMaximumNumberOfNestedImpostors() const +[more]unsigned int getMaximumNumberOfNestedImpostors() const
    -[more]void reset() +[more]void reset()
    empty visitor, make it ready for next traversal
    -[more]virtual void apply(osg::Node& node) +[more]virtual void apply(osg::Node& node)
    -[more]virtual void apply(osg::Group& node) +[more]virtual void apply(osg::Group& node)
    -[more]virtual void apply(osg::LOD& node) +[more]virtual void apply(osg::LOD& node)
    -[more]virtual void apply(osg::Impostor& node) +[more]virtual void apply(osg::Impostor& node)
    -[more]void insertImpostors() +[more]void insertImpostors()

    Protected Fields

    -[more]LODList _lodList +[more]GroupList _groupList
    -[more]float _impostorThresholdRatio +[more]LODList _lodList
    -[more]unsigned int _maximumNumNestedImpostors +[more]float _impostorThresholdRatio
    -[more]unsigned int _numNestedImpostors +[more]unsigned int _maximumNumNestedImpostors +
    +[more]unsigned int _numNestedImpostors

    Protected Members

    -[more]typedef std::vector< osg::LOD* > LODList GroupList _groupList +[more]typedef std::vector< osg::Group* > GroupList +
    +[more]typedef std::vector< osg::LOD* > LODList

    @@ -74,69 +78,77 @@ For example of usage see src/Demos/osgimpostor.
    - +
    o InsertImpostorsVisitor()
    default to traversing all children

    - -

    ovoid setImpostorThresholdRatio(const float ratio) + +
    ovoid setImpostorThresholdRatio(float ratio)

    - -

    oconst float getImpostorThresholdRatio() const + +
    ofloat getImpostorThresholdRatio() const

    - -

    ovoid setMaximumNumberOfNestedImpostors(const unsigned int num) + +
    ovoid setMaximumNumberOfNestedImpostors(unsigned int num)

    - -

    oconst unsigned int getMaximumNumberOfNestedImpostors() const + +
    ounsigned int getMaximumNumberOfNestedImpostors() const

    - +

    ovoid reset()
    empty visitor, make it ready for next traversal

    - +

    ovirtual void apply(osg::Node& node)

    - +

    ovirtual void apply(osg::Group& node)

    - +

    ovirtual void apply(osg::LOD& node)

    - +

    ovirtual void apply(osg::Impostor& node)

    - +

    ovoid insertImpostors()

    + + +

    otypedef std::vector< osg::Group* > GroupList +

    + + +

    otypedef std::vector< osg::LOD* > LODList +

    - -

    otypedef std::vector< osg::LOD* > LODList GroupList _groupList + +
    oGroupList _groupList

    - -

    oLODList _lodList + +
    oLODList _lodList

    - +

    ofloat _impostorThresholdRatio

    - +

    ounsigned int _maximumNumNestedImpostors

    - +

    ounsigned int _numNestedImpostors

    diff --git a/doc/doc++/osgUtil/IntersectState.html b/doc/doc++/osgUtil/IntersectState.html index 9cef2b35d..c345edaac 100644 --- a/doc/doc++/osgUtil/IntersectState.html +++ b/doc/doc++/osgUtil/IntersectState.html @@ -22,32 +22,40 @@

    Public Fields

    -[more]osg::ref_ptr<osg::Matrix> _matrix +[more]osg::ref_ptr<osg::Matrix> _matrix
    -[more]osg::ref_ptr<osg::Matrix> _inverse +[more]osg::ref_ptr<osg::Matrix> _inverse +
    +[more]LineSegmentList _segList +
    +[more]LineSegmentMaskStack _segmentMaskStack

    Public Methods

    -[more] IntersectState() +[more] IntersectState()
    -[more]bool isCulled(const osg::BoundingSphere& bs, LineSegmentmentMask& segMaskOut) +[more]bool isCulled(const osg::BoundingSphere& bs, LineSegmentMask& segMaskOut)
    -[more]bool isCulled(const osg::BoundingBox& bb, LineSegmentmentMask& segMaskOut) +[more]bool isCulled(const osg::BoundingBox& bb, LineSegmentMask& segMaskOut)
    -[more]void addLineSegmentPair(osg::LineSegment* first, osg::LineSegment* second) +[more]void addLineSegmentPair(osg::LineSegment* first, osg::LineSegment* second)

    Public Members

    -[more]typedef std::vector< LineSegmentPair > LineSegmentList LineSegmentList _segList +[more]typedef std::pair<osg::ref_ptr<osg::LineSegment>,osg::ref_ptr<osg::LineSegment> > LineSegmentPair
    -[more]typedef std::vector<LineSegmentmentMask> LineSegmentmentMaskStack LineSegmentmentMaskStack _segmentMaskStack +[more]typedef std::vector< LineSegmentPair > LineSegmentList +
    +[more]typedef unsigned int LineSegmentMask +
    +[more]typedef std::vector<LineSegmentMask> LineSegmentMaskStack

    Protected Methods

    -[more] ~IntersectState() +[more] ~IntersectState()

    @@ -58,39 +66,55 @@
    - +
    o IntersectState()

    - +

    oosg::ref_ptr<osg::Matrix> _matrix

    - +

    oosg::ref_ptr<osg::Matrix> _inverse

    + + +

    otypedef std::pair<osg::ref_ptr<osg::LineSegment>,osg::ref_ptr<osg::LineSegment> > LineSegmentPair +

    + + +

    otypedef std::vector< LineSegmentPair > LineSegmentList +

    - -

    otypedef std::vector< LineSegmentPair > LineSegmentList LineSegmentList _segList + +
    oLineSegmentList _segList +

    + + +

    otypedef unsigned int LineSegmentMask +

    + + +

    otypedef std::vector<LineSegmentMask> LineSegmentMaskStack

    - -

    otypedef std::vector<LineSegmentmentMask> LineSegmentmentMaskStack LineSegmentmentMaskStack _segmentMaskStack + +
    oLineSegmentMaskStack _segmentMaskStack

    - -

    obool isCulled(const osg::BoundingSphere& bs, LineSegmentmentMask& segMaskOut) + +
    obool isCulled(const osg::BoundingSphere& bs, LineSegmentMask& segMaskOut)

    - -

    obool isCulled(const osg::BoundingBox& bb, LineSegmentmentMask& segMaskOut) + +
    obool isCulled(const osg::BoundingBox& bb, LineSegmentMask& segMaskOut)

    - +

    ovoid addLineSegmentPair(osg::LineSegment* first, osg::LineSegment* second)

    - +

    o ~IntersectState()

    diff --git a/doc/doc++/osgUtil/IntersectVisitor.html b/doc/doc++/osgUtil/IntersectVisitor.html index 05877ca18..9167c820b 100644 --- a/doc/doc++/osgUtil/IntersectVisitor.html +++ b/doc/doc++/osgUtil/IntersectVisitor.html @@ -23,61 +23,70 @@

    Public Methods

    -[more] IntersectVisitor() +[more] IntersectVisitor()
    -[more]virtual ~IntersectVisitor() +[more]virtual ~IntersectVisitor()
    -[more]void reset() +[more]void reset()
    -[more]void addLineSegment(osg::LineSegment* seg) +[more]void addLineSegment(osg::LineSegment* seg)
    Add a line segment to use for intersection testing during scene traversal
    -[more]typedef std::map<osg::LineSegment*,HitList > LineSegmentHitListMap HitList& getHitList(osg::LineSegment* seg) +[more]HitList& getHitList(osg::LineSegment* seg)
    -[more]int getNumHits(osg::LineSegment* seg) +[more]int getNumHits(osg::LineSegment* seg)
    -[more]bool hits() +[more]bool hits()
    -[more]virtual void apply(osg::Node&) +[more]virtual void apply(osg::Node&)
    -[more]virtual void apply(osg::Geode& node) +[more]virtual void apply(osg::Geode& node)
    -[more]virtual void apply(osg::Billboard& node) +[more]virtual void apply(osg::Billboard& node)
    -[more]virtual void apply(osg::Group& node) +[more]virtual void apply(osg::Group& node)
    -[more]virtual void apply(osg::Transform& node) +[more]virtual void apply(osg::Transform& node)
    -[more]virtual void apply(osg::Switch& node) +[more]virtual void apply(osg::Switch& node)
    -[more]virtual void apply(osg::LOD& node) +[more]virtual void apply(osg::LOD& node) +

    + +

    +

    Public Members

    +[more]typedef std::vector<Hit> HitList +
    +[more]typedef std::map<osg::LineSegment*,HitList > LineSegmentHitListMap

    Protected Fields

    -[more]osg::NodePath _nodePath +[more]IntersectStateStack _intersectStateStack
    -[more]LineSegmentHitListMap _segHitList +[more]osg::NodePath _nodePath +
    +[more]LineSegmentHitListMap _segHitList

    Protected Methods

    -[more]bool intersect(osg::Drawable& gset) +[more]bool intersect(osg::Drawable& gset)
    -[more]void pushMatrix(const osg::Matrix& matrix) +[more]void pushMatrix(const osg::Matrix& matrix)
    -[more]void popMatrix() +[more]void popMatrix()
    -[more]bool enterNode(osg::Node& node) +[more]bool enterNode(osg::Node& node)
    -[more]void leaveNode() +[more]void leaveNode()

    Protected Members

    class IntersectState: public osg::Referenced
    -[more]typedef std::vector<osg::ref_ptr<IntersectState> > IntersectStateStack IntersectStateStack _intersectStateStack +[more]typedef std::vector<osg::ref_ptr<IntersectState> > IntersectStateStack

    @@ -89,93 +98,105 @@ class IntersectState: public osg::Refe
    - +
    o IntersectVisitor()

    - +

    ovirtual ~IntersectVisitor()

    - +

    ovoid reset()

    - +

    ovoid addLineSegment(osg::LineSegment* seg)
    Add a line segment to use for intersection testing during scene traversal

    + + +

    otypedef std::vector<Hit> HitList +

    + + +

    otypedef std::map<osg::LineSegment*,HitList > LineSegmentHitListMap +

    - -

    otypedef std::map<osg::LineSegment*,HitList > LineSegmentHitListMap HitList& getHitList(osg::LineSegment* seg) + +
    oHitList& getHitList(osg::LineSegment* seg)

    - +

    oint getNumHits(osg::LineSegment* seg)

    - +

    obool hits()

    - +

    ovirtual void apply(osg::Node&)

    - +

    ovirtual void apply(osg::Geode& node)

    - +

    ovirtual void apply(osg::Billboard& node)

    - +

    ovirtual void apply(osg::Group& node)

    - +

    ovirtual void apply(osg::Transform& node)

    - +

    ovirtual void apply(osg::Switch& node)

    - +

    ovirtual void apply(osg::LOD& node)

    - +

    obool intersect(osg::Drawable& gset)

    - +

    ovoid pushMatrix(const osg::Matrix& matrix)

    - +

    ovoid popMatrix()

    - +

    obool enterNode(osg::Node& node)

    - +

    ovoid leaveNode()

    + + +

    otypedef std::vector<osg::ref_ptr<IntersectState> > IntersectStateStack +

    - -

    otypedef std::vector<osg::ref_ptr<IntersectState> > IntersectStateStack IntersectStateStack _intersectStateStack + +
    oIntersectStateStack _intersectStateStack

    - +

    oosg::NodePath _nodePath

    - -

    oLineSegmentHitListMap _segHitList + +
    oLineSegmentHitListMap _segHitList

    This class has no child classes.
    diff --git a/doc/doc++/osgUtil/LeafDepthSortFunctor.html b/doc/doc++/osgUtil/LeafDepthSortFunctor.html index 6ec082274..a0de035de 100644 --- a/doc/doc++/osgUtil/LeafDepthSortFunctor.html +++ b/doc/doc++/osgUtil/LeafDepthSortFunctor.html @@ -11,7 +11,7 @@

    -[more]const bool operator() (const osg::ref_ptr<RenderLeaf>& lhs, const osg::ref_ptr<RenderLeaf>& rhs) +[more]bool operator() (const osg::ref_ptr<RenderLeaf>& lhs, const osg::ref_ptr<RenderLeaf>& rhs)

    @@ -21,8 +21,8 @@
    - -
    oconst bool operator() (const osg::ref_ptr<RenderLeaf>& lhs, const osg::ref_ptr<RenderLeaf>& rhs) + +
    obool operator() (const osg::ref_ptr<RenderLeaf>& lhs, const osg::ref_ptr<RenderLeaf>& rhs)

    Alphabetic index HTML hierarchy of classes or Java


    diff --git a/doc/doc++/osgUtil/MergeGeometryVisitor.html b/doc/doc++/osgUtil/MergeGeometryVisitor.html index 3fdead264..ce289ff71 100644 --- a/doc/doc++/osgUtil/MergeGeometryVisitor.html +++ b/doc/doc++/osgUtil/MergeGeometryVisitor.html @@ -22,26 +22,26 @@

    Public Methods

    -[more] MergeGeometryVisitor() +[more] MergeGeometryVisitor()
    default to traversing all children
    -[more]virtual void apply(osg::Geode& geode) +[more]virtual void apply(osg::Geode& geode)
    -[more]virtual void apply(osg::Billboard&) +[more]virtual void apply(osg::Billboard&)
    -[more]static bool mergeGeode(osg::Geode& geode) +[more]static bool mergeGeode(osg::Geode& geode)
    -[more]static bool mergeGeometry(osg::Geometry& lhs, osg::Geometry& rhs) +[more]static bool mergeGeometry(osg::Geometry& lhs, osg::Geometry& rhs)
    -[more]static bool mergePrimitive(osg::DrawArrays& lhs, osg::DrawArrays& rhs) +[more]static bool mergePrimitive(osg::DrawArrays& lhs, osg::DrawArrays& rhs)
    -[more]static bool mergePrimitive(osg::DrawArrayLengths& lhs, osg::DrawArrayLengths& rhs) +[more]static bool mergePrimitive(osg::DrawArrayLengths& lhs, osg::DrawArrayLengths& rhs)
    -[more]static bool mergePrimitive(osg::DrawElementsUByte& lhs, osg::DrawElementsUByte& rhs) +[more]static bool mergePrimitive(osg::DrawElementsUByte& lhs, osg::DrawElementsUByte& rhs)
    -[more]static bool mergePrimitive(osg::DrawElementsUShort& lhs, osg::DrawElementsUShort& rhs) +[more]static bool mergePrimitive(osg::DrawElementsUShort& lhs, osg::DrawElementsUShort& rhs)
    -[more]static bool mergePrimitive(osg::DrawElementsUInt& lhs, osg::DrawElementsUInt& rhs) +[more]static bool mergePrimitive(osg::DrawElementsUInt& lhs, osg::DrawElementsUInt& rhs)

    @@ -52,44 +52,44 @@
    - +
    o MergeGeometryVisitor()
    default to traversing all children

    - +

    ovirtual void apply(osg::Geode& geode)

    - +

    ovirtual void apply(osg::Billboard&)

    - +

    ostatic bool mergeGeode(osg::Geode& geode)

    - +

    ostatic bool mergeGeometry(osg::Geometry& lhs, osg::Geometry& rhs)

    - +

    ostatic bool mergePrimitive(osg::DrawArrays& lhs, osg::DrawArrays& rhs)

    - +

    ostatic bool mergePrimitive(osg::DrawArrayLengths& lhs, osg::DrawArrayLengths& rhs)

    - +

    ostatic bool mergePrimitive(osg::DrawElementsUByte& lhs, osg::DrawElementsUByte& rhs)

    - +

    ostatic bool mergePrimitive(osg::DrawElementsUShort& lhs, osg::DrawElementsUShort& rhs)

    - +

    ostatic bool mergePrimitive(osg::DrawElementsUInt& lhs, osg::DrawElementsUInt& rhs)

    diff --git a/doc/doc++/osgUtil/Optimizer.html b/doc/doc++/osgUtil/Optimizer.html index cb873fbf3..5750b3b06 100644 --- a/doc/doc++/osgUtil/Optimizer.html +++ b/doc/doc++/osgUtil/Optimizer.html @@ -13,15 +13,15 @@

    Public Methods

    -[more] Optimizer() +[more] Optimizer()
    -[more]virtual void optimize(osg::Node* node, unsigned int options = ALL_OPTIMIZATIONS) +[more]virtual void optimize(osg::Node* node, unsigned int options = ALL_OPTIMIZATIONS)
    traverse the node and its subgraph with a series of optimization visitors, specificied by the OptizationOptions

    Public Members

    -[more]enum OptimizationOptions +[more]enum OptimizationOptions
    class OSGUTIL_EXPORT ConvertGeoSetsToGeometryVisitor: public osg::NodeVisitor
    ConvertGeoSetsToGeometryVisitor all the old GeoSet Drawables to the new Geometry Drawables @@ -29,9 +29,6 @@ class OSGUTIL_EXPORT ConvertG class OSGUTIL_EXPORT FlattenStaticTransformsVisitor: public osg::NodeVisitor
    Flatten Static Trasform nodes by applying their transform to the geometry on the leaves of the scene graph, then removing the now redundent transforms
    -class OSGUTIL_EXPORT RemoveLowestStaticTransformsVisitor: public osg::NodeVisitor -
    Remove the lowest static transforms in the scene -
    class OSGUTIL_EXPORT RemoveEmptyNodesVisitor: public osg::NodeVisitor
    Remove rendundent nodes, such as groups with one single child
    @@ -57,38 +54,38 @@ For example of usage see src/Demos/osgimpostor.
    - +
    o Optimizer()

    - +

    oenum OptimizationOptions

    - +
    o FLATTEN_STATIC_TRANSFORMS

    - +

    o REMOVE_REDUNDENT_NODES

    - +

    o COMBINE_ADJACENT_LODS

    - +

    o SHARE_DUPLICATE_STATE

    - +

    o ALL_OPTIMIZATIONS

    - -
    ovirtual void optimize(osg::Node* node, unsigned int options = ALL_OPTIMIZATIONS) + +
    ovirtual void optimize(osg::Node* node, unsigned int options = ALL_OPTIMIZATIONS)
    traverse the node and its subgraph with a series of optimization visitors, specificied by the OptizationOptions

    diff --git a/doc/doc++/osgUtil/RegisterRenderBinProxy.html b/doc/doc++/osgUtil/RegisterRenderBinProxy.html index ea6954891..5b6129a78 100644 --- a/doc/doc++/osgUtil/RegisterRenderBinProxy.html +++ b/doc/doc++/osgUtil/RegisterRenderBinProxy.html @@ -2,25 +2,25 @@ - template<class T> class osgUtil::RegisterRenderBinProxy + class osgUtil::RegisterRenderBinProxy -

    template<class T> class osgUtil::RegisterRenderBinProxy

    Proxy class for automatic registration of renderbins with the RenderBin prototypelist
    +

    class osgUtil::RegisterRenderBinProxy

    Proxy class for automatic registration of renderbins with the RenderBin prototypelist

    Public Methods

    -[more] RegisterRenderBinProxy() +[more] RegisterRenderBinProxy(const std::string& binName, RenderBin* proto)
    -[more] ~RegisterRenderBinProxy() +[more] ~RegisterRenderBinProxy()

    Protected Fields

    -[more]osg::ref_ptr<T> _rb +[more]osg::ref_ptr<RenderBin> _rb

    @@ -32,16 +32,16 @@
    - -
    o RegisterRenderBinProxy() + +
    o RegisterRenderBinProxy(const std::string& binName, RenderBin* proto)

    - +

    o ~RegisterRenderBinProxy()

    - -

    oosg::ref_ptr<T> _rb + +
    oosg::ref_ptr<RenderBin> _rb

    This class has no child classes.
    diff --git a/doc/doc++/osgUtil/RemoveEmptyNodesVisitor.html b/doc/doc++/osgUtil/RemoveEmptyNodesVisitor.html index 92494b100..f316d753d 100644 --- a/doc/doc++/osgUtil/RemoveEmptyNodesVisitor.html +++ b/doc/doc++/osgUtil/RemoveEmptyNodesVisitor.html @@ -21,20 +21,25 @@
    +

    +

    Public Fields

    +[more]NodeList _redundentNodeList +

    +

    Public Methods

    -[more] RemoveEmptyNodesVisitor() +[more] RemoveEmptyNodesVisitor()
    -[more]virtual void apply(osg::Geode& geode) +[more]virtual void apply(osg::Geode& geode)
    -[more]virtual void apply(osg::Group& group) +[more]virtual void apply(osg::Group& group)
    -[more]void removeEmptyNodes() +[more]void removeEmptyNodes()

    Public Members

    -[more]typedef std::set<osg::Node*> NodeList NodeList _redundentNodeList +[more]typedef std::set<osg::Node*> NodeList

    @@ -45,24 +50,28 @@
    Remove rendundent nodes, such as groups with one single child
    + + +
    otypedef std::set<osg::Node*> NodeList +

    - -

    otypedef std::set<osg::Node*> NodeList NodeList _redundentNodeList + +
    oNodeList _redundentNodeList

    - +

    o RemoveEmptyNodesVisitor()

    - +

    ovirtual void apply(osg::Geode& geode)

    - +

    ovirtual void apply(osg::Group& group)

    - +

    ovoid removeEmptyNodes()

    diff --git a/doc/doc++/osgUtil/RemoveRedundentNodesVisitor.html b/doc/doc++/osgUtil/RemoveRedundentNodesVisitor.html index 801d4d81d..2ad6dd470 100644 --- a/doc/doc++/osgUtil/RemoveRedundentNodesVisitor.html +++ b/doc/doc++/osgUtil/RemoveRedundentNodesVisitor.html @@ -21,20 +21,25 @@
    +

    +

    Public Fields

    +[more]NodeList _redundentNodeList +

    +

    Public Methods

    -[more] RemoveRedundentNodesVisitor() +[more] RemoveRedundentNodesVisitor()
    -[more]virtual void apply(osg::Group& group) +[more]virtual void apply(osg::Group& group)
    -[more]virtual void apply(osg::Transform& transform) +[more]virtual void apply(osg::Transform& transform)
    -[more]void removeRedundentNodes() +[more]void removeRedundentNodes()

    Public Members

    -[more]typedef std::set<osg::Node*> NodeList NodeList _redundentNodeList +[more]typedef std::set<osg::Node*> NodeList

    @@ -45,24 +50,28 @@
    Remove rendundent nodes, such as groups with one single child
    + + +
    otypedef std::set<osg::Node*> NodeList +

    - -

    otypedef std::set<osg::Node*> NodeList NodeList _redundentNodeList + +
    oNodeList _redundentNodeList

    - +

    o RemoveRedundentNodesVisitor()

    - +

    ovirtual void apply(osg::Group& group)

    - +

    ovirtual void apply(osg::Transform& transform)

    - +

    ovoid removeRedundentNodes()

    diff --git a/doc/doc++/osgUtil/RenderBin.html b/doc/doc++/osgUtil/RenderBin.html index 1a8603f0e..de1377a48 100644 --- a/doc/doc++/osgUtil/RenderBin.html +++ b/doc/doc++/osgUtil/RenderBin.html @@ -11,11 +11,11 @@

    Inheritance:

    - - - - - + + + + +
    @@ -23,95 +23,118 @@

    Public Fields

    -[more]int _binNum +[more]int _binNum
    -[more]RenderBin* _parent +[more]RenderBin* _parent
    -[more]RenderStage* _stage +[more]RenderStage* _stage
    -[more]RenderBinList _bins +[more]RenderBinList _bins
    -[more]RenderGraphList _renderGraphList +[more]RenderGraphList _renderGraphList
    -[more]RenderLeafList _renderLeafList +[more]RenderLeafList _renderLeafList
    -[more]SortMode _sortMode +[more]SortMode _sortMode
    -[more]osg::ref_ptr<SortCallback> _sortLocalCallback +[more]osg::ref_ptr<SortCallback> _sortCallback +
    +[more]osg::ref_ptr<DrawCallback> _drawCallback +
    +[more]static RenderBinPrototypeList s_renderBinPrototypeList

    Public Methods

    -[more]typedef std::map< int, osg::ref_ptr<RenderBin> >static RenderBinList RenderBin* createRenderBin(const std::string& binName) +[more]static RenderBin* createRenderBin(const std::string& binName)
    -[more]static void addRenderBinPrototype(RenderBin* proto) +[more]static RenderBin* getRenderBinPrototype(const std::string& binName)
    -[more]static void removeRenderBinPrototype(RenderBin* proto) +[more]static void addRenderBinPrototype(const std::string& binName, RenderBin* proto)
    -[more] RenderBin() +[more]static void removeRenderBinPrototype(RenderBin* proto)
    -[more]virtual osg::Object* cloneType() const +[more] RenderBin(SortMode mode=SORT_BY_STATE)
    -[more]virtual osg::Object* clone(const osg::CopyOp&) const +[more] RenderBin(const RenderBin& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) +
    Copy constructor using CopyOp to manage deep vs shallow copy
    -[more]virtual bool isSameKindAs(const osg::Object* obj) const +[more]virtual osg::Object* cloneType() const
    -[more]virtual const char* libraryName() const +[more]virtual osg::Object* clone(const osg::CopyOp& copyop) const
    -[more]virtual const char* className() const +[more]virtual bool isSameKindAs(const osg::Object* obj) const
    -[more]virtual void reset() +[more]virtual const char* libraryName() const
    -[more]RenderBin* find_or_insert(int binNum, const std::string& binName) +[more]virtual const char* className() const
    -[more]void addRenderGraph(RenderGraph* rg) +[more]virtual void reset()
    -[more]void sort() +[more]RenderBin* find_or_insert(int binNum, const std::string& binName)
    -[more]void setSortMode(SortMode mode) +[more]void addRenderGraph(RenderGraph* rg)
    -[more]SortMode getSortMode() const +[more]void sort()
    -[more]virtual void sort_local() +[more]virtual void sortImplementation()
    -[more]virtual void sort_local_by_state() +[more]void setSortMode(SortMode mode)
    -[more]virtual void sort_local_front_to_back() +[more]SortMode getSortMode() const
    -[more]virtual void sort_local_back_to_front() +[more]virtual void sortByState()
    -[more]void setSortLocalCallback(SortCallback* sortCallback) +[more]virtual void sortFrontToBack()
    -[more]SortCallback* getSortLocalCallback() +[more]virtual void sortBackToFront()
    -[more]const SortCallback* getSortLocalCallback() const +[more]void setSortCallback(SortCallback* sortCallback)
    -[more]virtual void draw(osg::State& state, RenderLeaf*& previous) +[more]SortCallback* getSortCallback()
    -[more]virtual void draw_local(osg::State& state, RenderLeaf*& previous) +[more]const SortCallback* getSortCallback() const
    -[more]bool getStats(osg::Statistics* primStats) +[more]virtual void draw(osg::State& state, RenderLeaf*& previous) +
    +[more]virtual void drawImplementation(osg::State& state, RenderLeaf*& previous) +
    +[more]void setDrawCallback(DrawCallback* drawCallback) +
    +[more]DrawCallback* getDrawCallback() +
    +[more]const DrawCallback* getDrawCallback() const +
    +[more]bool getStats(osg::Statistics* primStats)
    extract stats for current draw list.
    -[more]void getPrims(osg::Statistics* primStats) +[more]void getPrims(osg::Statistics* primStats)
    -[more]bool getPrims(osg::Statistics* primStats, const int nbin) +[more]bool getPrims(osg::Statistics* primStats, int nbin)
    -[more]void copyLeavesFromRenderGraphListToRenderLeafList() +[more]void copyLeavesFromRenderGraphListToRenderLeafList()

    Public Members

    -[more]enum SortMode +[more]typedef std::vector<RenderLeaf*> RenderLeafList
    -[more]struct SortCallback: public osg::Referenced +[more]typedef std::vector<RenderGraph*> RenderGraphList
    -[more]typedef std::map< std::string, osg::ref_ptr<RenderBin> >static RenderBinPrototypeList RenderBinPrototypeList s_renderBinPrototypeList +[more]typedef std::map< int, osg::ref_ptr<RenderBin> > RenderBinList +
    +[more]enum SortMode +
    +[more]struct SortCallback: public osg::Referenced +
    +[more]struct DrawCallback: public osg::Referenced +
    +[more]typedef std::map< std::string, osg::ref_ptr<RenderBin> > RenderBinPrototypeList

    Protected Methods

    -[more]virtual ~RenderBin() +[more]virtual ~RenderBin()

    @@ -123,191 +146,241 @@ RenderBin base class
    + + +
    otypedef std::vector<RenderLeaf*> RenderLeafList +

    + + +

    otypedef std::vector<RenderGraph*> RenderGraphList +

    + + +

    otypedef std::map< int, osg::ref_ptr<RenderBin> > RenderBinList +

    - -

    otypedef std::map< int, osg::ref_ptr<RenderBin> >static RenderBinList RenderBin* createRenderBin(const std::string& binName) + +
    ostatic RenderBin* createRenderBin(const std::string& binName) +

    + + +

    ostatic RenderBin* getRenderBinPrototype(const std::string& binName)

    - -

    ostatic void addRenderBinPrototype(RenderBin* proto) + +
    ostatic void addRenderBinPrototype(const std::string& binName, RenderBin* proto)

    - +

    ostatic void removeRenderBinPrototype(RenderBin* proto)

    - - -

    o RenderBin() -

    - - -

    ovirtual osg::Object* cloneType() const -

    - - -

    ovirtual osg::Object* clone(const osg::CopyOp&) const -

    - - -

    ovirtual bool isSameKindAs(const osg::Object* obj) const -

    - - -

    ovirtual const char* libraryName() const -

    - - -

    ovirtual const char* className() const -

    - - -

    ovirtual void reset() -

    - - -

    oRenderBin* find_or_insert(int binNum, const std::string& binName) -

    - - -

    ovoid addRenderGraph(RenderGraph* rg) -

    - - -

    ovoid sort() -

    - +

    oenum SortMode

    - +
    o SORT_BY_STATE

    - +

    o SORT_FRONT_TO_BACK

    - - -

    o SORT_BACK_TO_FONT + + +
    o SORT_BACK_TO_FRONT

    + + +
    o RenderBin(SortMode mode=SORT_BY_STATE) +

    + + +

    o RenderBin(const RenderBin& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) +
    Copy constructor using CopyOp to manage deep vs shallow copy +

    + + +

    ovirtual osg::Object* cloneType() const +

    + + +

    ovirtual osg::Object* clone(const osg::CopyOp& copyop) const +

    + + +

    ovirtual bool isSameKindAs(const osg::Object* obj) const +

    + + +

    ovirtual const char* libraryName() const +

    + + +

    ovirtual const char* className() const +

    + + +

    ovirtual void reset() +

    + + +

    oRenderBin* find_or_insert(int binNum, const std::string& binName) +

    + + +

    ovoid addRenderGraph(RenderGraph* rg) +

    + + +

    ovoid sort() +

    + + +

    ovirtual void sortImplementation() +

    - -

    ovoid setSortMode(SortMode mode) + +
    ovoid setSortMode(SortMode mode)

    - -

    oSortMode getSortMode() const + +
    oSortMode getSortMode() const

    - - -

    ovirtual void sort_local() + + +
    ovirtual void sortByState()

    - - -

    ovirtual void sort_local_by_state() + + +
    ovirtual void sortFrontToBack()

    - - -

    ovirtual void sort_local_front_to_back() -

    - - -

    ovirtual void sort_local_back_to_front() + + +
    ovirtual void sortBackToFront()

    - +

    ostruct SortCallback: public osg::Referenced

    - - -
    ovirtual void sort(RenderBin*) = 0 + + +
    ovirtual void sortImplementation(RenderBin*) = 0

    - - -
    ovoid setSortLocalCallback(SortCallback* sortCallback) + + +
    ovoid setSortCallback(SortCallback* sortCallback)

    - - -

    oSortCallback* getSortLocalCallback() + + +
    oSortCallback* getSortCallback()

    - - -

    oconst SortCallback* getSortLocalCallback() const + + +
    oconst SortCallback* getSortCallback() const

    - +

    ovirtual void draw(osg::State& state, RenderLeaf*& previous)

    - - -

    ovirtual void draw_local(osg::State& state, RenderLeaf*& previous) + + +
    ovirtual void drawImplementation(osg::State& state, RenderLeaf*& previous) +

    + + +

    ostruct DrawCallback: public osg::Referenced +

    + + + +
    ovirtual void drawImplementation(RenderBin* bin, osg::State& state, RenderLeaf*& previous) = 0 +

    + + + +
    ovoid setDrawCallback(DrawCallback* drawCallback) +

    + + +

    oDrawCallback* getDrawCallback() +

    + + +

    oconst DrawCallback* getDrawCallback() const

    - +

    obool getStats(osg::Statistics* primStats)
    extract stats for current draw list.

    - +

    ovoid getPrims(osg::Statistics* primStats)

    - -

    obool getPrims(osg::Statistics* primStats, const int nbin) + +
    obool getPrims(osg::Statistics* primStats, int nbin)

    - +

    ovoid copyLeavesFromRenderGraphListToRenderLeafList()

    - +

    oint _binNum

    - +

    oRenderBin* _parent

    - +

    oRenderStage* _stage

    - -

    oRenderBinList _bins + +
    oRenderBinList _bins

    - -

    oRenderGraphList _renderGraphList + +
    oRenderGraphList _renderGraphList

    - -

    oRenderLeafList _renderLeafList + +
    oRenderLeafList _renderLeafList

    - -

    oSortMode _sortMode + +
    oSortMode _sortMode

    - - -

    oosg::ref_ptr<SortCallback> _sortLocalCallback + + +
    oosg::ref_ptr<SortCallback> _sortCallback +

    + + +

    oosg::ref_ptr<DrawCallback> _drawCallback +

    + + +

    otypedef std::map< std::string, osg::ref_ptr<RenderBin> > RenderBinPrototypeList

    - -

    otypedef std::map< std::string, osg::ref_ptr<RenderBin> >static RenderBinPrototypeList RenderBinPrototypeList s_renderBinPrototypeList + +
    ostatic RenderBinPrototypeList s_renderBinPrototypeList

    - +

    ovirtual ~RenderBin()

    Direct child classes:
    RenderStage
    -DepthSortedBin

    Alphabetic index HTML hierarchy of classes or Java

    diff --git a/doc/doc++/osgUtil/RenderGraph.html b/doc/doc++/osgUtil/RenderGraph.html index 7ebf0a33c..1faa0b7bd 100644 --- a/doc/doc++/osgUtil/RenderGraph.html +++ b/doc/doc++/osgUtil/RenderGraph.html @@ -22,66 +22,74 @@

    Public Fields

    -[more]osg::ref_ptr<const osg::StateSet> _stateset +[more]RenderGraph* _parent
    -[more]int _depth +[more]osg::ref_ptr<const osg::StateSet> _stateset
    -[more]ChildList _children +[more]int _depth
    -[more]LeafList _leaves +[more]ChildList _children
    -[more]mutable float _averageDistance +[more]LeafList _leaves
    -[more]osg::ref_ptr<osg::Referenced> _userData +[more]mutable float _averageDistance +
    +[more]mutable float _minimumDistance +
    +[more]osg::ref_ptr<osg::Referenced> _userData

    Public Methods

    -[more] RenderGraph() +[more] RenderGraph()
    -[more] RenderGraph(RenderGraph* parent, const osg::StateSet* stateset) +[more] RenderGraph(RenderGraph* parent, const osg::StateSet* stateset)
    -[more] ~RenderGraph() +[more] ~RenderGraph()
    -[more]RenderGraph* cloneType() const +[more]RenderGraph* cloneType() const
    -[more]void setUserData(osg::Referenced* obj) +[more]void setUserData(osg::Referenced* obj)
    -[more]osg::Referenced* getUserData() +[more]osg::Referenced* getUserData()
    -[more]const osg::Referenced* getUserData() const +[more]const osg::Referenced* getUserData() const
    -[more]inline const bool empty() const +[more]inline bool empty() const
    return true if all of drawables, lights and children are empty
    -[more]inline const bool leaves_empty() const +[more]inline bool leaves_empty() const
    -[more]inline const float getAverageDistance() const +[more]inline float getAverageDistance() const
    -[more]inline void sortFrontToBack() +[more]inline float getMinimumDistance() const
    -[more]void reset() +[more]inline void sortFrontToBack() +
    +[more]void reset()
    reset the internal contents of a RenderGraph, including deleting all children
    -[more]void clean() +[more]void clean()
    recursively clean the RenderGraph of all its drawables, lights and depths.
    -[more]void prune() +[more]void prune()
    recursively prune the RenderGraph of empty children
    -[more]inline RenderGraph* find_or_insert(const osg::StateSet* stateset) +[more]inline RenderGraph* find_or_insert(const osg::StateSet* stateset)
    -[more]inline void addLeaf(RenderLeaf* leaf) +[more]inline void addLeaf(RenderLeaf* leaf)
    add a render leaf
    -[more]static inline void moveRenderGraph(osg::State& state, RenderGraph* sg_curr, RenderGraph* sg_new) +[more]static inline void moveRenderGraph(osg::State& state, RenderGraph* sg_curr, RenderGraph* sg_new)
    -[more]inline static void moveToRootRenderGraph(osg::State& state, RenderGraph* sg_curr) +[more]inline static void moveToRootRenderGraph(osg::State& state, RenderGraph* sg_curr)

    Public Members

    -[more]typedef std::vector< osg::ref_ptr<RenderLeaf> > LeafList RenderGraph* _parent +[more]typedef std::map< const osg::StateSet*, osg::ref_ptr<RenderGraph> > ChildList +
    +[more]typedef std::vector< osg::ref_ptr<RenderLeaf> > LeafList

    @@ -91,110 +99,126 @@

    Documentation

    + + +
    otypedef std::map< const osg::StateSet*, osg::ref_ptr<RenderGraph> > ChildList +

    + + +

    otypedef std::vector< osg::ref_ptr<RenderLeaf> > LeafList +

    - -

    otypedef std::vector< osg::ref_ptr<RenderLeaf> > LeafList RenderGraph* _parent + +
    oRenderGraph* _parent

    - +

    oosg::ref_ptr<const osg::StateSet> _stateset

    - +

    oint _depth

    - -

    oChildList _children + +
    oChildList _children

    - -

    oLeafList _leaves + +
    oLeafList _leaves

    - +

    omutable float _averageDistance

    + + +

    omutable float _minimumDistance +

    - +

    oosg::ref_ptr<osg::Referenced> _userData

    - +

    o RenderGraph()

    - -

    o RenderGraph(RenderGraph* parent, const osg::StateSet* stateset) + +
    o RenderGraph(RenderGraph* parent, const osg::StateSet* stateset)

    - +

    o ~RenderGraph()

    - +

    oRenderGraph* cloneType() const

    - +

    ovoid setUserData(osg::Referenced* obj)

    - +

    oosg::Referenced* getUserData()

    - +

    oconst osg::Referenced* getUserData() const

    - -

    oinline const bool empty() const + +
    oinline bool empty() const
    return true if all of drawables, lights and children are empty

    - -

    oinline const bool leaves_empty() const + +
    oinline bool leaves_empty() const

    - -

    oinline const float getAverageDistance() const + +
    oinline float getAverageDistance() const +

    + + +

    oinline float getMinimumDistance() const

    - +

    oinline void sortFrontToBack()

    - +

    ovoid reset()
    reset the internal contents of a RenderGraph, including deleting all children

    - +

    ovoid clean()
    recursively clean the RenderGraph of all its drawables, lights and depths. Leaves children intact, and ready to be populated again.

    - +

    ovoid prune()
    recursively prune the RenderGraph of empty children

    - +

    oinline RenderGraph* find_or_insert(const osg::StateSet* stateset)

    - +

    oinline void addLeaf(RenderLeaf* leaf)
    add a render leaf

    - +

    ostatic inline void moveRenderGraph(osg::State& state, RenderGraph* sg_curr, RenderGraph* sg_new)

    - +

    oinline static void moveToRootRenderGraph(osg::State& state, RenderGraph* sg_curr)

    diff --git a/doc/doc++/osgUtil/RenderLeaf.html b/doc/doc++/osgUtil/RenderLeaf.html index cca3187e7..b9eb74c63 100644 --- a/doc/doc++/osgUtil/RenderLeaf.html +++ b/doc/doc++/osgUtil/RenderLeaf.html @@ -23,26 +23,26 @@

    Public Fields

    -[more]RenderGraph* _parent +[more]RenderGraph* _parent
    -[more]osg::Drawable* _drawable +[more]osg::Drawable* _drawable
    -[more]osg::ref_ptr<osg::Matrix> _projection +[more]osg::ref_ptr<osg::Matrix> _projection
    -[more]osg::ref_ptr<osg::Matrix> _modelview +[more]osg::ref_ptr<osg::Matrix> _modelview
    -[more]float _depth +[more]float _depth

    Public Methods

    -[more]inline RenderLeaf(osg::Drawable* drawable, osg::Matrix* projection, osg::Matrix* modelview, float depth=0.0f) +[more]inline RenderLeaf(osg::Drawable* drawable, osg::Matrix* projection, osg::Matrix* modelview, float depth=0.0f)
    -[more]inline void set(osg::Drawable* drawable, osg::Matrix* projection, osg::Matrix* modelview, float depth=0.0f) +[more]inline void set(osg::Drawable* drawable, osg::Matrix* projection, osg::Matrix* modelview, float depth=0.0f)
    -[more]inline void reset() +[more]inline void reset()
    -[more]virtual void render(osg::State& state, RenderLeaf* previous) +[more]virtual void render(osg::State& state, RenderLeaf* previous)

    @@ -54,39 +54,39 @@
    - +
    oinline RenderLeaf(osg::Drawable* drawable, osg::Matrix* projection, osg::Matrix* modelview, float depth=0.0f)

    - +

    oinline void set(osg::Drawable* drawable, osg::Matrix* projection, osg::Matrix* modelview, float depth=0.0f)

    - +

    oinline void reset()

    - +

    ovirtual void render(osg::State& state, RenderLeaf* previous)

    - +

    oRenderGraph* _parent

    - +

    oosg::Drawable* _drawable

    - +

    oosg::ref_ptr<osg::Matrix> _projection

    - +

    oosg::ref_ptr<osg::Matrix> _modelview

    - +

    ofloat _depth

    diff --git a/doc/doc++/osgUtil/RenderStage.html b/doc/doc++/osgUtil/RenderStage.html index 89ea59288..baaa6709e 100644 --- a/doc/doc++/osgUtil/RenderStage.html +++ b/doc/doc++/osgUtil/RenderStage.html @@ -23,106 +23,114 @@

    Public Fields

    -[more]DependencyList _dependencyList +[more]bool _stageDrawnThisFrame
    -[more]osg::ref_ptr<osg::Viewport> _viewport +[more]DependencyList _dependencyList
    -[more]GLbitfield _clearMask +[more]osg::ref_ptr<osg::Viewport> _viewport
    -[more]osg::ref_ptr<osg::ColorMask> _colorMask +[more]GLbitfield _clearMask
    -[more]osg::Vec4 _clearColor +[more]osg::ref_ptr<osg::ColorMask> _colorMask
    -[more]osg::Vec4 _clearAccum +[more]osg::Vec4 _clearColor
    -[more]double _clearDepth +[more]osg::Vec4 _clearAccum
    -[more]int _clearStencil +[more]double _clearDepth
    -[more]mutable osg::ref_ptr<RenderStageLighting> _renderStageLighting +[more]int _clearStencil +
    +[more]mutable osg::ref_ptr<RenderStageLighting> _renderStageLighting

    Public Methods

    -[more] RenderStage() +[more] RenderStage(SortMode mode=SORT_BY_STATE)
    -[more]virtual osg::Object* cloneType() const +[more] RenderStage(const RenderStage& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)
    -[more]virtual osg::Object* clone(const osg::CopyOp&) const +[more]virtual osg::Object* cloneType() const
    -[more]virtual bool isSameKindAs(const osg::Object* obj) const +[more]virtual osg::Object* clone(const osg::CopyOp& copyop) const
    -[more]virtual const char* className() const +[more]virtual bool isSameKindAs(const osg::Object* obj) const
    -[more]virtual void reset() +[more]virtual const char* className() const
    -[more]void setViewport(osg::Viewport* viewport) +[more]virtual void reset() +
    +[more]void setViewport(osg::Viewport* viewport)
    Set the viewport
    -[more]const osg::Viewport* getViewport() const +[more]const osg::Viewport* getViewport() const
    Get the const viewport.
    -[more]osg::Viewport* getViewport() +[more]osg::Viewport* getViewport()
    Get the viewport.
    -[more]void setClearMask(const GLbitfield mask) +[more]void setClearMask(GLbitfield mask)
    Set the clear mask used in glClear().
    -[more]const GLbitfield getClearMask() const +[more]GLbitfield getClearMask() const
    Get the clear mask
    -[more]void setColorMask(osg::ColorMask* cm) +[more]void setColorMask(osg::ColorMask* cm)
    -[more]osg::ColorMask* getColorMask() +[more]osg::ColorMask* getColorMask()
    -[more]const osg::ColorMask* getColorMask() const +[more]const osg::ColorMask* getColorMask() const
    -[more]void setClearColor(const osg::Vec4& color) +[more]void setClearColor(const osg::Vec4& color)
    Set the clear color used in glClearColor().
    -[more]const osg::Vec4& getClearColor() const +[more]const osg::Vec4& getClearColor() const
    Get the clear color
    -[more]void setClearAccum(const osg::Vec4& color) +[more]void setClearAccum(const osg::Vec4& color)
    Set the clear accum used in glClearAccum().
    -[more]const osg::Vec4& getClearAccum() const +[more]const osg::Vec4& getClearAccum() const
    Get the clear accum
    -[more]void setClearDepth(const double depth) +[more]void setClearDepth(double depth)
    Set the clear depth used in glClearDepth().
    -[more]const double getClearDepth() const +[more]double getClearDepth() const
    Get the clear depth
    -[more]void setClearStencil(const int stencil) +[more]void setClearStencil(int stencil)
    Set the clear stencil value used in glClearStencil().
    -[more]const int getClearStencil() const +[more]int getClearStencil() const
    Get the clear color
    -[more]void setRenderStageLighting(RenderStageLighting* rsl) +[more]void setRenderStageLighting(RenderStageLighting* rsl)
    -[more]RenderStageLighting* getRenderStageLighting() const +[more]RenderStageLighting* getRenderStageLighting() const
    -[more]virtual void addPositionedAttribute(osg::Matrix* matrix, const osg::StateAttribute* attr) +[more]virtual void addPositionedAttribute(osg::Matrix* matrix, const osg::StateAttribute* attr)
    -[more]virtual void draw(osg::State& state, RenderLeaf*& previous) +[more]virtual void drawPreRenderStages(osg::State& state, RenderLeaf*& previous)
    -[more]void addToDependencyList(RenderStage* rs) +[more]virtual void draw(osg::State& state, RenderLeaf*& previous)
    -[more]bool getStats(osg::Statistics* primStats) +[more]virtual void drawImplementation(osg::State& state, RenderLeaf*& previous) +
    +[more]void addToDependencyList(RenderStage* rs) +
    +[more]bool getStats(osg::Statistics* primStats)
    extract stats for current draw list.

    Public Members

    -[more]typedef std::vector< osg::ref_ptr<RenderStage> > DependencyList bool _stageDrawnThisFrame +[more]typedef std::vector< osg::ref_ptr<RenderStage> > DependencyList

    Protected Methods

    -[more]virtual ~RenderStage() +[more]virtual ~RenderStage()

    @@ -136,22 +144,28 @@
    oRenderStage* _stage
    -oRenderBinList _bins +oRenderBinList _bins
    -oRenderGraphList _renderGraphList +oRenderGraphList _renderGraphList
    -oRenderLeafList _renderLeafList +oRenderLeafList _renderLeafList
    -oSortMode _sortMode +oSortMode _sortMode
    -oosg::ref_ptr<SortCallback> _sortLocalCallback +oosg::ref_ptr<SortCallback> _sortCallback +
    +oosg::ref_ptr<DrawCallback> _drawCallback +
    +ostatic RenderBinPrototypeList s_renderBinPrototypeList

    Public Methods

    -otypedef std::map< int, osg::ref_ptr<RenderBin> >static RenderBinList RenderBin* createRenderBin(const std::string& binName) +ostatic RenderBin* createRenderBin(const std::string& binName)
    -ostatic void addRenderBinPrototype(RenderBin* proto) +ostatic RenderBin* getRenderBinPrototype(const std::string& binName) +
    +ostatic void addRenderBinPrototype(const std::string& binName, RenderBin* proto)
    ostatic void removeRenderBinPrototype(RenderBin* proto)
    @@ -163,40 +177,52 @@
    ovoid sort()
    -ovoid setSortMode(SortMode mode) +ovirtual void sortImplementation()
    -oSortMode getSortMode() const +ovoid setSortMode(SortMode mode)
    -ovirtual void sort_local() +oSortMode getSortMode() const
    -ovirtual void sort_local_by_state() +ovirtual void sortByState()
    -ovirtual void sort_local_front_to_back() +ovirtual void sortFrontToBack()
    -ovirtual void sort_local_back_to_front() +ovirtual void sortBackToFront()
    -ovoid setSortLocalCallback(SortCallback* sortCallback) +ovoid setSortCallback(SortCallback* sortCallback)
    -oSortCallback* getSortLocalCallback() +oSortCallback* getSortCallback()
    -oconst SortCallback* getSortLocalCallback() const +oconst SortCallback* getSortCallback() const
    -ovirtual void draw_local(osg::State& state, RenderLeaf*& previous) +ovoid setDrawCallback(DrawCallback* drawCallback) +
    +oDrawCallback* getDrawCallback() +
    +oconst DrawCallback* getDrawCallback() const
    ovoid getPrims(osg::Statistics* primStats)
    -obool getPrims(osg::Statistics* primStats, const int nbin) +obool getPrims(osg::Statistics* primStats, int nbin)
    ovoid copyLeavesFromRenderGraphListToRenderLeafList()

    Public Members

    +otypedef std::vector<RenderLeaf*> RenderLeafList +
    +otypedef std::vector<RenderGraph*> RenderGraphList +
    +otypedef std::map< int, osg::ref_ptr<RenderBin> > RenderBinList +
    oenum SortMode
    ostruct SortCallback: public osg::Referenced
    -otypedef std::map< std::string, osg::ref_ptr<RenderBin> >static RenderBinPrototypeList RenderBinPrototypeList s_renderBinPrototypeList +ostruct DrawCallback: public osg::Referenced +
    +otypedef std::map< std::string, osg::ref_ptr<RenderBin> > RenderBinPrototypeList

    @@ -215,178 +241,194 @@ like multistage pixel shading or impostors.
    - -
    o RenderStage() + +
    o RenderStage(SortMode mode=SORT_BY_STATE) +

    + + +

    o RenderStage(const RenderStage& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY)

    - +

    ovirtual osg::Object* cloneType() const

    - -

    ovirtual osg::Object* clone(const osg::CopyOp&) const + +
    ovirtual osg::Object* clone(const osg::CopyOp& copyop) const

    - +

    ovirtual bool isSameKindAs(const osg::Object* obj) const

    - +

    ovirtual const char* className() const

    - +

    ovirtual void reset()

    - +

    ovoid setViewport(osg::Viewport* viewport)
    Set the viewport

    - +

    oconst osg::Viewport* getViewport() const
    Get the const viewport.

    - +

    oosg::Viewport* getViewport()
    Get the viewport.

    - -

    ovoid setClearMask(const GLbitfield mask) + +
    ovoid setClearMask(GLbitfield mask)
    Set the clear mask used in glClear(). Defaults to GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT.

    - -

    oconst GLbitfield getClearMask() const + +
    oGLbitfield getClearMask() const
    Get the clear mask

    - +

    ovoid setColorMask(osg::ColorMask* cm)

    - +

    oosg::ColorMask* getColorMask()

    - +

    oconst osg::ColorMask* getColorMask() const

    - +

    ovoid setClearColor(const osg::Vec4& color)
    Set the clear color used in glClearColor(). glClearColor is only called if mask & GL_COLOR_BUFFER_BIT is true

    - +

    oconst osg::Vec4& getClearColor() const
    Get the clear color

    - +

    ovoid setClearAccum(const osg::Vec4& color)
    Set the clear accum used in glClearAccum(). glClearAcumm is only called if mask & GL_ACCUM_BUFFER_BIT is true

    - +

    oconst osg::Vec4& getClearAccum() const
    Get the clear accum

    - -

    ovoid setClearDepth(const double depth) + +
    ovoid setClearDepth(double depth)
    Set the clear depth used in glClearDepth(). Defaults to 1.0 glClearDepth is only called if mask & GL_DEPTH_BUFFER_BIT is true

    - -

    oconst double getClearDepth() const + +
    odouble getClearDepth() const
    Get the clear depth

    - -

    ovoid setClearStencil(const int stencil) + +
    ovoid setClearStencil(int stencil)
    Set the clear stencil value used in glClearStencil(). Defaults to 1.0 glClearStencil is only called if mask & GL_STENCIL_BUFFER_BIT is true

    - -

    oconst int getClearStencil() const + +
    oint getClearStencil() const
    Get the clear color

    - +

    ovoid setRenderStageLighting(RenderStageLighting* rsl)

    - +

    oRenderStageLighting* getRenderStageLighting() const

    - +

    ovirtual void addPositionedAttribute(osg::Matrix* matrix, const osg::StateAttribute* attr)

    + + +

    ovirtual void drawPreRenderStages(osg::State& state, RenderLeaf*& previous) +

    - +

    ovirtual void draw(osg::State& state, RenderLeaf*& previous)

    + + +

    ovirtual void drawImplementation(osg::State& state, RenderLeaf*& previous) +

    - +

    ovoid addToDependencyList(RenderStage* rs)

    - +

    obool getStats(osg::Statistics* primStats)
    extract stats for current draw list.

    + + +

    otypedef std::vector< osg::ref_ptr<RenderStage> > DependencyList +

    - -

    otypedef std::vector< osg::ref_ptr<RenderStage> > DependencyList bool _stageDrawnThisFrame + +
    obool _stageDrawnThisFrame

    - -

    oDependencyList _dependencyList + +
    oDependencyList _dependencyList

    - +

    oosg::ref_ptr<osg::Viewport> _viewport

    - +

    oGLbitfield _clearMask

    - +

    oosg::ref_ptr<osg::ColorMask> _colorMask

    - +

    oosg::Vec4 _clearColor

    - +

    oosg::Vec4 _clearAccum

    - +

    odouble _clearDepth

    - +

    oint _clearStencil

    - +

    omutable osg::ref_ptr<RenderStageLighting> _renderStageLighting

    - +

    ovirtual ~RenderStage()

    diff --git a/doc/doc++/osgUtil/RenderStageLighting.html b/doc/doc++/osgUtil/RenderStageLighting.html index 4de55caae..0c36629ef 100644 --- a/doc/doc++/osgUtil/RenderStageLighting.html +++ b/doc/doc++/osgUtil/RenderStageLighting.html @@ -23,33 +23,40 @@

    Public Fields

    -[more]AttrMatrixList _attrList +[more]AttrMatrixList _attrList

    Public Methods

    -[more] RenderStageLighting() +[more] RenderStageLighting()
    -[more]virtual osg::Object* cloneType() const +[more]virtual osg::Object* cloneType() const
    -[more]virtual osg::Object* clone(const osg::CopyOp&) const +[more]virtual osg::Object* clone(const osg::CopyOp&) const
    -[more]virtual bool isSameKindAs(const osg::Object* obj) const +[more]virtual bool isSameKindAs(const osg::Object* obj) const
    -[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    -[more]virtual void reset() +[more]virtual void reset()
    -[more]typedef std::vector< AttrMatrixPair >virtual AttrMatrixList void addPositionedAttribute(osg::Matrix* matrix, const osg::StateAttribute* attr) +[more]virtual void addPositionedAttribute(osg::Matrix* matrix, const osg::StateAttribute* attr)
    -[more]virtual void draw(osg::State& state, RenderLeaf*& previous) +[more]virtual void draw(osg::State& state, RenderLeaf*& previous) +

    + +

    +

    Public Members

    +[more]typedef std::pair< const osg::StateAttribute*, osg::ref_ptr<osg::Matrix> > AttrMatrixPair +
    +[more]typedef std::vector< AttrMatrixPair > AttrMatrixList

    Protected Methods

    -[more]virtual ~RenderStageLighting() +[more]virtual ~RenderStageLighting()

    @@ -62,47 +69,55 @@ RenderBin base class
    - +
    o RenderStageLighting()

    - +

    ovirtual osg::Object* cloneType() const

    - +

    ovirtual osg::Object* clone(const osg::CopyOp&) const

    - +

    ovirtual bool isSameKindAs(const osg::Object* obj) const

    - +

    ovirtual const char* libraryName() const

    - +

    ovirtual const char* className() const

    - +

    ovirtual void reset()

    + + +

    otypedef std::pair< const osg::StateAttribute*, osg::ref_ptr<osg::Matrix> > AttrMatrixPair +

    + + +

    otypedef std::vector< AttrMatrixPair > AttrMatrixList +

    - -

    otypedef std::vector< AttrMatrixPair >virtual AttrMatrixList void addPositionedAttribute(osg::Matrix* matrix, const osg::StateAttribute* attr) + +
    ovirtual void addPositionedAttribute(osg::Matrix* matrix, const osg::StateAttribute* attr)

    - +

    ovirtual void draw(osg::State& state, RenderLeaf*& previous)

    - -

    oAttrMatrixList _attrList + +
    oAttrMatrixList _attrList

    - +

    ovirtual ~RenderStageLighting()

    diff --git a/doc/doc++/osgUtil/RenderToTextureStage.html b/doc/doc++/osgUtil/RenderToTextureStage.html index 0dda5c3be..a91091541 100644 --- a/doc/doc++/osgUtil/RenderToTextureStage.html +++ b/doc/doc++/osgUtil/RenderToTextureStage.html @@ -23,41 +23,41 @@

    Public Methods

    -[more] RenderToTextureStage() +[more] RenderToTextureStage()
    -[more]virtual osg::Object* cloneType() const +[more]virtual osg::Object* cloneType() const
    -[more]virtual osg::Object* clone(const osg::CopyOp&) const +[more]virtual osg::Object* clone(const osg::CopyOp&) const
    -[more]virtual bool isSameKindAs(const osg::Object* obj) const +[more]virtual bool isSameKindAs(const osg::Object* obj) const
    -[more]virtual const char* libraryName() const +[more]virtual const char* libraryName() const
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    -[more]virtual void reset() +[more]virtual void reset()
    -[more]void setTexture(osg::Texture2D* texture) +[more]void setTexture(osg::Texture2D* texture)
    -[more]osg::Texture2D* getTexture() +[more]osg::Texture2D* getTexture()
    -[more]void setImage(osg::Image* image) +[more]void setImage(osg::Image* image)
    -[more]osg::Image* getImage() +[more]osg::Image* getImage()
    -[more]virtual void draw(osg::State& state, RenderLeaf*& previous) +[more]virtual void draw(osg::State& state, RenderLeaf*& previous)

    Protected Fields

    -[more]osg::ref_ptr<osg::Texture2D> _texture +[more]osg::ref_ptr<osg::Texture2D> _texture
    -[more]osg::ref_ptr<osg::Image> _image +[more]osg::ref_ptr<osg::Image> _image

    Protected Methods

    -[more]virtual ~RenderToTextureStage() +[more]virtual ~RenderToTextureStage()

    @@ -65,7 +65,9 @@

    Public Fields

    -oDependencyList _dependencyList +obool _stageDrawnThisFrame +
    +oDependencyList _dependencyList
    oosg::ref_ptr<osg::Viewport> _viewport
    @@ -92,9 +94,9 @@
    oosg::Viewport* getViewport()
    -ovoid setClearMask(const GLbitfield mask) +ovoid setClearMask(GLbitfield mask)
    -oconst GLbitfield getClearMask() const +oGLbitfield getClearMask() const
    ovoid setColorMask(osg::ColorMask* cm)
    @@ -110,13 +112,13 @@
    oconst osg::Vec4& getClearAccum() const
    -ovoid setClearDepth(const double depth) +ovoid setClearDepth(double depth)
    -oconst double getClearDepth() const +odouble getClearDepth() const
    -ovoid setClearStencil(const int stencil) +ovoid setClearStencil(int stencil)
    -oconst int getClearStencil() const +oint getClearStencil() const
    ovoid setRenderStageLighting(RenderStageLighting* rsl)
    @@ -124,6 +126,10 @@
    ovirtual void addPositionedAttribute(osg::Matrix* matrix, const osg::StateAttribute* attr)
    +ovirtual void drawPreRenderStages(osg::State& state, RenderLeaf*& previous) +
    +ovirtual void drawImplementation(osg::State& state, RenderLeaf*& previous) +
    ovoid addToDependencyList(RenderStage* rs)
    obool getStats(osg::Statistics* primStats) @@ -131,7 +137,7 @@

    Public Members

    -otypedef std::vector< osg::ref_ptr<RenderStage> > DependencyList bool _stageDrawnThisFrame +otypedef std::vector< osg::ref_ptr<RenderStage> > DependencyList

    @@ -145,22 +151,28 @@
    oRenderStage* _stage
    -oRenderBinList _bins +oRenderBinList _bins
    -oRenderGraphList _renderGraphList +oRenderGraphList _renderGraphList
    -oRenderLeafList _renderLeafList +oRenderLeafList _renderLeafList
    -oSortMode _sortMode +oSortMode _sortMode
    -oosg::ref_ptr<SortCallback> _sortLocalCallback +oosg::ref_ptr<SortCallback> _sortCallback +
    +oosg::ref_ptr<DrawCallback> _drawCallback +
    +ostatic RenderBinPrototypeList s_renderBinPrototypeList

    Public Methods

    -otypedef std::map< int, osg::ref_ptr<RenderBin> >static RenderBinList RenderBin* createRenderBin(const std::string& binName) +ostatic RenderBin* createRenderBin(const std::string& binName)
    -ostatic void addRenderBinPrototype(RenderBin* proto) +ostatic RenderBin* getRenderBinPrototype(const std::string& binName) +
    +ostatic void addRenderBinPrototype(const std::string& binName, RenderBin* proto)
    ostatic void removeRenderBinPrototype(RenderBin* proto)
    @@ -170,40 +182,52 @@
    ovoid sort()
    -ovoid setSortMode(SortMode mode) +ovirtual void sortImplementation()
    -oSortMode getSortMode() const +ovoid setSortMode(SortMode mode)
    -ovirtual void sort_local() +oSortMode getSortMode() const
    -ovirtual void sort_local_by_state() +ovirtual void sortByState()
    -ovirtual void sort_local_front_to_back() +ovirtual void sortFrontToBack()
    -ovirtual void sort_local_back_to_front() +ovirtual void sortBackToFront()
    -ovoid setSortLocalCallback(SortCallback* sortCallback) +ovoid setSortCallback(SortCallback* sortCallback)
    -oSortCallback* getSortLocalCallback() +oSortCallback* getSortCallback()
    -oconst SortCallback* getSortLocalCallback() const +oconst SortCallback* getSortCallback() const
    -ovirtual void draw_local(osg::State& state, RenderLeaf*& previous) +ovoid setDrawCallback(DrawCallback* drawCallback) +
    +oDrawCallback* getDrawCallback() +
    +oconst DrawCallback* getDrawCallback() const
    ovoid getPrims(osg::Statistics* primStats)
    -obool getPrims(osg::Statistics* primStats, const int nbin) +obool getPrims(osg::Statistics* primStats, int nbin)
    ovoid copyLeavesFromRenderGraphListToRenderLeafList()

    Public Members

    +otypedef std::vector<RenderLeaf*> RenderLeafList +
    +otypedef std::vector<RenderGraph*> RenderGraphList +
    +otypedef std::map< int, osg::ref_ptr<RenderBin> > RenderBinList +
    oenum SortMode
    ostruct SortCallback: public osg::Referenced
    -otypedef std::map< std::string, osg::ref_ptr<RenderBin> >static RenderBinPrototypeList RenderBinPrototypeList s_renderBinPrototypeList +ostruct DrawCallback: public osg::Referenced +
    +otypedef std::map< std::string, osg::ref_ptr<RenderBin> > RenderBinPrototypeList

    @@ -217,63 +241,63 @@ Generally used as a pre-rendering stage.
    - +
    o RenderToTextureStage()

    - +

    ovirtual osg::Object* cloneType() const

    - +

    ovirtual osg::Object* clone(const osg::CopyOp&) const

    - +

    ovirtual bool isSameKindAs(const osg::Object* obj) const

    - +

    ovirtual const char* libraryName() const

    - +

    ovirtual const char* className() const

    - +

    ovirtual void reset()

    - +

    ovoid setTexture(osg::Texture2D* texture)

    - +

    oosg::Texture2D* getTexture()

    - +

    ovoid setImage(osg::Image* image)

    - +

    oosg::Image* getImage()

    - +

    ovirtual void draw(osg::State& state, RenderLeaf*& previous)

    - +

    ovirtual ~RenderToTextureStage()

    - +

    oosg::ref_ptr<osg::Texture2D> _texture

    - +

    oosg::ref_ptr<osg::Image> _image

    diff --git a/doc/doc++/osgUtil/SceneView.html b/doc/doc++/osgUtil/SceneView.html index 8a58f8a9f..969208ae6 100644 --- a/doc/doc++/osgUtil/SceneView.html +++ b/doc/doc++/osgUtil/SceneView.html @@ -23,278 +23,292 @@

    Public Methods

    -[more] SceneView(osg::DisplaySettings* ds=NULL) +[more] SceneView(osg::DisplaySettings* ds=NULL)
    Construct a default scene view
    -[more]void setDefaults() +[more]void setDefaults()
    Set scene view to use default global state, light, camera and render visitor
    -[more]void setSceneData(osg::Node* node) +[more]void setSceneData(osg::Node* node)
    Set the data which to view.
    -[more]osg::Node* getSceneData() +[more]osg::Node* getSceneData()
    Get the scene data which to view.
    -[more]const osg::Node* getSceneData() const +[more]const osg::Node* getSceneData() const
    Get the const scene data which to view.
    -[more]void setViewport(osg::Viewport* viewport) +[more]void setViewport(osg::Viewport* viewport)
    Set the viewport of the scene view to use specfied osg::Viewport.
    -[more]void setViewport(int x, int y, int width, int height) +[more]void setViewport(int x, int y, int width, int height)
    Set the viewport of the scene view to specified dimensions.
    -[more]const osg::Viewport* getViewport() const +[more]const osg::Viewport* getViewport() const
    Get the const viewport.
    -[more]osg::Viewport* getViewport() +[more]osg::Viewport* getViewport()
    Get the viewport.
    -[more]void getViewport(int& x, int& y, int& width, int& height) +[more]void getViewport(int& x, int& y, int& width, int& height)
    Get the viewport of the scene view.
    -[more]inline void setDisplaySettings(osg::DisplaySettings* vs) +[more]inline void setDisplaySettings(osg::DisplaySettings* vs)
    Set the DisplaySettings.
    -[more]inline const osg::DisplaySettings* getDisplaySettings() const +[more]inline const osg::DisplaySettings* getDisplaySettings() const
    Get the const DisplaySettings
    -[more]inline osg::DisplaySettings* getDisplaySettings() +[more]inline osg::DisplaySettings* getDisplaySettings()
    Get the DisplaySettings
    -[more]void setBackgroundColor(const osg::Vec4& color) +[more]void setBackgroundColor(const osg::Vec4& color)
    Set the background color used in glClearColor().
    -[more]const osg::Vec4& getBackgroundColor() const +[more]const osg::Vec4& getBackgroundColor() const
    Get the background color
    -[more]void setGlobalStateSet(osg::StateSet* state) +[more]void setGlobalStateSet(osg::StateSet* state)
    -[more]osg::StateSet* getGlobalStateSet() +[more]osg::StateSet* getGlobalStateSet()
    -[more]const osg::StateSet* getGlobalStateSet() const +[more]const osg::StateSet* getGlobalStateSet() const
    -[more]void setLightingMode(LightingMode mode) +[more]void setLightingMode(LightingMode mode)
    -[more]LightingMode getLightingMode() const +[more]LightingMode getLightingMode() const
    -[more]void setLight(osg::Light* light) +[more]void setLight(osg::Light* light)
    -[more]osg::Light* getLight() +[more]osg::Light* getLight()
    -[more]const osg::Light* getLight() const +[more]const osg::Light* getLight() const
    -[more]void setState(osg::State* state) +[more]void setState(osg::State* state)
    -[more]osg::State* getState() +[more]osg::State* getState()
    -[more]const osg::State* getState() const +[more]const osg::State* getState() const
    -[more]void setCamera(osg::Camera* camera) +[more]void setCamera(osg::Camera* camera)
    set an osg::Camera for the scene view to use for setting projection and modelview matrices internaly.
    -[more]osg::Camera* getCamera() +[more]osg::Camera* getCamera()
    -[more]const osg::Camera* getCamera() const +[more]const osg::Camera* getCamera() const
    -[more]void setProjectionMatrix(osg::Matrix* matrix) +[more]void setProjectionMatrix(osg::Matrix* matrix)
    set a projection matrix.
    -[more]osg::Matrix* getProjectionMatrix() +[more]osg::Matrix* getProjectionMatrix()
    -[more]const osg::Matrix* getProjectionMatrix() const +[more]const osg::Matrix* getProjectionMatrix() const
    -[more]void setModelViewMatrix(osg::Matrix* matrix) +[more]void setModelViewMatrix(osg::Matrix* matrix)
    set a modelview matrix.
    -[more]osg::Matrix* getModelViewMatrix() +[more]osg::Matrix* getModelViewMatrix()
    -[more]const osg::Matrix* getModelViewMatrix() const +[more]const osg::Matrix* getModelViewMatrix() const
    -[more]void setInitVisitor(osg::NodeVisitor* av) +[more]void setInitVisitor(osg::NodeVisitor* av)
    -[more]osg::NodeVisitor* getInitVisitor() +[more]osg::NodeVisitor* getInitVisitor()
    -[more]const osg::NodeVisitor* getInitVisitor() const +[more]const osg::NodeVisitor* getInitVisitor() const
    -[more]void setAppVisitor(osg::NodeVisitor* av) +[more]void setAppVisitor(osg::NodeVisitor* av)
    -[more]osg::NodeVisitor* getAppVisitor() +[more]osg::NodeVisitor* getAppVisitor()
    -[more]const osg::NodeVisitor* getAppVisitor() const +[more]const osg::NodeVisitor* getAppVisitor() const
    -[more]void setCullVisitor(osgUtil::CullVisitor* cv) +[more]void setCullVisitor(osgUtil::CullVisitor* cv)
    -[more]osgUtil::CullVisitor* getCullVisitor() +[more]osgUtil::CullVisitor* getCullVisitor()
    -[more]const osgUtil::CullVisitor* getCullVisitor() const +[more]const osgUtil::CullVisitor* getCullVisitor() const
    -[more]void setRenderGraph(osgUtil::RenderGraph* rg) +[more]void setRenderGraph(osgUtil::RenderGraph* rg)
    -[more]osgUtil::RenderGraph* getRenderGraph() +[more]osgUtil::RenderGraph* getRenderGraph()
    -[more]const osgUtil::RenderGraph* getRenderGraph() const +[more]const osgUtil::RenderGraph* getRenderGraph() const
    -[more]void setRenderStage(osgUtil::RenderStage* rs) +[more]void setRenderStage(osgUtil::RenderStage* rs)
    -[more]osgUtil::RenderStage* getRenderStage() +[more]osgUtil::RenderStage* getRenderStage()
    -[more]const osgUtil::RenderStage* getRenderStage() const +[more]const osgUtil::RenderStage* getRenderStage() const
    -[more]void setCullMask(const osg::Node::NodeMask nm) +[more]void setCullMask(const osg::Node::NodeMask nm)
    -[more]const osg::Node::NodeMask getCullMask() const +[more]const osg::Node::NodeMask getCullMask() const
    -[more]void setCullMaskLeft(const osg::Node::NodeMask nm) +[more]void setCullMaskLeft(const osg::Node::NodeMask nm)
    -[more]const osg::Node::NodeMask getCullMaskLeft() const +[more]const osg::Node::NodeMask getCullMaskLeft() const
    -[more]void setCullMaskRight(const osg::Node::NodeMask nm) +[more]void setCullMaskRight(const osg::Node::NodeMask nm)
    -[more]const osg::Node::NodeMask getCullMaskRight() const +[more]const osg::Node::NodeMask getCullMaskRight() const
    -[more]void setLODBias(float bias) +[more]void setLODBias(float bias)
    Set the LOD bias for the CullVisitor to use
    -[more]float getLODBias() const +[more]float getLODBias() const
    Get the LOD bias
    -[more]void setSmallFeatureCullingPixelSize(float value) +[more]void setSmallFeatureCullingPixelSize(float value)
    Set the Small Feature Culling Pixel Size
    -[more]float getSmallFeatureCullingPixelSize() const +[more]float getSmallFeatureCullingPixelSize() const
    Get the Small Feature Culling Pixel Size
    -[more]void setCullingMode(osg::CullStack::CullingMode mode) +[more]void setCullingMode(osg::CullStack::CullingMode mode)
    Set the culling mode for the CullVisitor to use
    -[more]osg::CullStack::CullingMode getCullingMode() const +[more]osg::CullStack::CullingMode getCullingMode() const
    Returns the current CullingMode
    -[more]void setComputeNearFarMode(CullVisitor::ComputeNearFarMode cnfm) +[more]void setComputeNearFarMode(CullVisitor::ComputeNearFarMode cnfm)
    Set the ComputeNearFarMode for the CullVisitor to use
    -[more]CullVisitor::ComputeNearFarMode getComputeNearFarMode() const +[more]CullVisitor::ComputeNearFarMode getComputeNearFarMode() const
    Get the ComputeNearFarMode
    -[more]void setPrioritizeTextures(bool pt) +[more]void setFusionDistance(FusionDistanceMode mode, float value=1.0f) +
    Set the FusionDistanceMode and Value. +
    +[more]FusionDistanceMode getFusionDistanceMode() const +
    Get the FusionDistanceMode +
    +[more]float getFusionDistanceValue() const +
    Get the FusionDistanceValue. +
    +[more]void setPrioritizeTextures(bool pt)
    set whether the draw method should call renderer->prioritizeTexture
    -[more]bool getPrioritizeTextures() const +[more]bool getPrioritizeTextures() const
    get whether the draw method should call renderer->prioritizeTexture
    -[more]bool projectWindowIntoObject(const osg::Vec3& window, osg::Vec3& object) const +[more]bool projectWindowIntoObject(const osg::Vec3& window, osg::Vec3& object) const
    Calculate, via glUnProject, the object coordinates of a window point.
    -[more]bool projectWindowXYIntoObject(int x, int y, osg::Vec3& near_point, osg::Vec3& far_point) const +[more]bool projectWindowXYIntoObject(int x, int y, osg::Vec3& near_point, osg::Vec3& far_point) const
    Calculate, via glUnProject, the object coordinates of a window x,y when projected onto the near and far planes.
    -[more]bool projectObjectIntoWindow(const osg::Vec3& object, osg::Vec3& window) const +[more]bool projectObjectIntoWindow(const osg::Vec3& object, osg::Vec3& window) const
    Calculate, via glProject, the object coordinates of a window.
    -[more]inline void setFrameStamp(osg::FrameStamp* fs) +[more]inline void setFrameStamp(osg::FrameStamp* fs)
    Set the frame stamp for the current frame
    -[more]inline const osg::FrameStamp* getFrameStamp() const +[more]inline const osg::FrameStamp* getFrameStamp() const
    Set the frame stamp for the current frame
    -[more]virtual void init() +[more]virtual void init()
    Do init traversal of attached scene graph using Init NodeVisitor.
    -[more]virtual void app() +[more]virtual void app()
    Do app traversal of attached scene graph using App NodeVisitor
    -[more]virtual void cull() +[more]virtual void cull()
    Do cull traversal of attached scene graph using Cull NodeVisitor
    -[more]virtual void draw() +[more]virtual void draw()
    Do draw traversal of draw bins generated by cull traversal

    Public Members

    -[more]enum LightingMode +[more]enum LightingMode +
    +[more]enum FusionDistanceMode +
    FusionDistanceMode is used only when working in stereo

    Protected Fields

    -[more]osg::ref_ptr<osg::Node> _sceneData +[more]osg::ref_ptr<osg::Node> _sceneData
    -[more]osg::ref_ptr<osg::StateSet> _globalState +[more]osg::ref_ptr<osg::StateSet> _globalState
    -[more]osg::ref_ptr<osg::Light> _light +[more]osg::ref_ptr<osg::Light> _light
    -[more]osg::ref_ptr<osg::Camera> _camera +[more]osg::ref_ptr<osg::Camera> _camera
    -[more]osg::ref_ptr<osg::Matrix> _projectionMatrix +[more]osg::ref_ptr<osg::Matrix> _projectionMatrix
    -[more]osg::ref_ptr<osg::Matrix> _modelviewMatrix +[more]osg::ref_ptr<osg::Matrix> _modelviewMatrix
    -[more]osg::ref_ptr<osg::DisplaySettings> _displaySettings +[more]osg::ref_ptr<osg::DisplaySettings> _displaySettings
    -[more]osg::ref_ptr<osg::State> _state +[more]osg::ref_ptr<osg::State> _state
    -[more]bool _initCalled +[more]bool _initCalled
    -[more]osg::ref_ptr<osg::NodeVisitor> _initVisitor +[more]osg::ref_ptr<osg::NodeVisitor> _initVisitor
    -[more]osg::ref_ptr<osg::NodeVisitor> _appVisitor +[more]osg::ref_ptr<osg::NodeVisitor> _appVisitor
    -[more]osg::Node::NodeMask _cullMask +[more]osg::Node::NodeMask _cullMask
    -[more]osg::ref_ptr<osgUtil::CullVisitor> _cullVisitor +[more]osg::ref_ptr<osgUtil::CullVisitor> _cullVisitor
    -[more]osg::ref_ptr<osgUtil::RenderGraph> _rendergraph +[more]osg::ref_ptr<osgUtil::RenderGraph> _rendergraph
    -[more]osg::ref_ptr<osgUtil::RenderStage> _renderStage +[more]osg::ref_ptr<osgUtil::RenderStage> _renderStage
    -[more]osg::Node::NodeMask _cullMaskLeft +[more]osg::Node::NodeMask _cullMaskLeft
    -[more]osg::ref_ptr<osgUtil::CullVisitor> _cullVisitorLeft +[more]osg::ref_ptr<osgUtil::CullVisitor> _cullVisitorLeft
    -[more]osg::ref_ptr<osgUtil::RenderGraph> _rendergraphLeft +[more]osg::ref_ptr<osgUtil::RenderGraph> _rendergraphLeft
    -[more]osg::ref_ptr<osgUtil::RenderStage> _renderStageLeft +[more]osg::ref_ptr<osgUtil::RenderStage> _renderStageLeft
    -[more]osg::Node::NodeMask _cullMaskRight +[more]osg::Node::NodeMask _cullMaskRight
    -[more]osg::ref_ptr<osgUtil::CullVisitor> _cullVisitorRight +[more]osg::ref_ptr<osgUtil::CullVisitor> _cullVisitorRight
    -[more]osg::ref_ptr<osgUtil::RenderGraph> _rendergraphRight +[more]osg::ref_ptr<osgUtil::RenderGraph> _rendergraphRight
    -[more]osg::ref_ptr<osgUtil::RenderStage> _renderStageRight +[more]osg::ref_ptr<osgUtil::RenderStage> _renderStageRight
    -[more]osg::ref_ptr<osg::FrameStamp> _frameStamp +[more]osg::ref_ptr<osg::FrameStamp> _frameStamp
    -[more]osg::Vec4 _backgroundColor +[more]osg::Vec4 _backgroundColor
    -[more]CullVisitor::ComputeNearFarMode _computeNearFar +[more]CullVisitor::ComputeNearFarMode _computeNearFar
    -[more]osg::CullStack::CullingMode _cullingMode +[more]osg::CullStack::CullingMode _cullingMode
    -[more]float _LODBias +[more]float _LODBias
    -[more]float _smallFeatureCullingPixelSize +[more]float _smallFeatureCullingPixelSize
    -[more]osg::ref_ptr<osg::Viewport> _viewport +[more]FusionDistanceMode _fusionDistanceMode
    -[more]LightingMode _lightingMode +[more]float _fusionDistanceValue
    -[more]bool _prioritizeTextures +[more]osg::ref_ptr<osg::Viewport> _viewport +
    +[more]LightingMode _lightingMode +
    +[more]bool _prioritizeTextures

    Protected Methods

    -[more]virtual ~SceneView() +[more]virtual ~SceneView()
    -[more]virtual void cullStage(osg::Matrix* projection, osg::Matrix* modelview, osgUtil::CullVisitor* cullVisitor, osgUtil::RenderGraph* rendergraph, osgUtil::RenderStage* renderStage) +[more]virtual void cullStage(osg::Matrix* projection, osg::Matrix* modelview, osgUtil::CullVisitor* cullVisitor, osgUtil::RenderGraph* rendergraph, osgUtil::RenderStage* renderStage)
    Do cull traversal of attached scene graph using Cull NodeVisitor
    -[more]virtual void drawStage(osgUtil::RenderStage* renderStage) +[more]const osg::Matrix computeMVPW() const
    -[more]const osg::Matrix computeMVPW() const -
    -[more]void clearArea(int x, int y, int width, int height, const osg::Vec4& color) +[more]void clearArea(int x, int y, int width, int height, const osg::Vec4& color)

    @@ -309,149 +323,149 @@ methods for setting up the view and rendering it.
    - +
    o SceneView(osg::DisplaySettings* ds=NULL)
    Construct a default scene view

    - +

    ovoid setDefaults()
    Set scene view to use default global state, light, camera and render visitor

    - +

    ovoid setSceneData(osg::Node* node)
    Set the data which to view. The data will typically be an osg::Scene but can be any osg::Node type.

    - +

    oosg::Node* getSceneData()
    Get the scene data which to view. The data will typically be an osg::Scene but can be any osg::Node type.

    - +

    oconst osg::Node* getSceneData() const
    Get the const scene data which to view. The data will typically be an osg::Scene but can be any osg::Node type.

    - +

    ovoid setViewport(osg::Viewport* viewport)
    Set the viewport of the scene view to use specfied osg::Viewport.

    - +

    ovoid setViewport(int x, int y, int width, int height)
    Set the viewport of the scene view to specified dimensions.

    - +

    oconst osg::Viewport* getViewport() const
    Get the const viewport.

    - +

    oosg::Viewport* getViewport()
    Get the viewport.

    - +

    ovoid getViewport(int& x, int& y, int& width, int& height)
    Get the viewport of the scene view.

    - +

    oinline void setDisplaySettings(osg::DisplaySettings* vs)
    Set the DisplaySettings.

    - +

    oinline const osg::DisplaySettings* getDisplaySettings() const
    Get the const DisplaySettings

    - +

    oinline osg::DisplaySettings* getDisplaySettings()
    Get the DisplaySettings

    - +

    ovoid setBackgroundColor(const osg::Vec4& color)
    Set the background color used in glClearColor(). Defaults to an off blue color.

    - +

    oconst osg::Vec4& getBackgroundColor() const
    Get the background color

    - +

    ovoid setGlobalStateSet(osg::StateSet* state)

    - +

    oosg::StateSet* getGlobalStateSet()

    - +

    oconst osg::StateSet* getGlobalStateSet() const

    - +

    oenum LightingMode

    - +
    o HEADLIGHT

    - +

    o SKY_LIGHT

    - +

    o NO_SCENEVIEW_LIGHT

    - -
    ovoid setLightingMode(LightingMode mode) + +
    ovoid setLightingMode(LightingMode mode)

    - -

    oLightingMode getLightingMode() const + +
    oLightingMode getLightingMode() const

    - +

    ovoid setLight(osg::Light* light)

    - +

    oosg::Light* getLight()

    - +

    oconst osg::Light* getLight() const

    - +

    ovoid setState(osg::State* state)

    - +

    oosg::State* getState()

    - +

    oconst osg::State* getState() const

    - +

    ovoid setCamera(osg::Camera* camera)
    set an osg::Camera for the scene view to use for setting projection and modelview matrices internaly. However, the projection matrix from the camera will be overriden by a projection matrix which is set explicitly @@ -460,175 +474,212 @@ Also, the model matrix from the camera will be overriden by a modelview matrix w via setModelViewMatrix(..), see below.

    - +

    oosg::Camera* getCamera()

    - +

    oconst osg::Camera* getCamera() const

    - +

    ovoid setProjectionMatrix(osg::Matrix* matrix)
    set a projection matrix. Note, this will override a camera's projection matrix if it is not NULL.

    - +

    oosg::Matrix* getProjectionMatrix()

    - +

    oconst osg::Matrix* getProjectionMatrix() const

    - +

    ovoid setModelViewMatrix(osg::Matrix* matrix)
    set a modelview matrix. Note, this will override a camera's modelview matrix if it is not NULL.

    - +

    oosg::Matrix* getModelViewMatrix()

    - +

    oconst osg::Matrix* getModelViewMatrix() const

    - +

    ovoid setInitVisitor(osg::NodeVisitor* av)

    - +

    oosg::NodeVisitor* getInitVisitor()

    - +

    oconst osg::NodeVisitor* getInitVisitor() const

    - +

    ovoid setAppVisitor(osg::NodeVisitor* av)

    - +

    oosg::NodeVisitor* getAppVisitor()

    - +

    oconst osg::NodeVisitor* getAppVisitor() const

    - +

    ovoid setCullVisitor(osgUtil::CullVisitor* cv)

    - +

    oosgUtil::CullVisitor* getCullVisitor()

    - +

    oconst osgUtil::CullVisitor* getCullVisitor() const

    - +

    ovoid setRenderGraph(osgUtil::RenderGraph* rg)

    - +

    oosgUtil::RenderGraph* getRenderGraph()

    - +

    oconst osgUtil::RenderGraph* getRenderGraph() const

    - +

    ovoid setRenderStage(osgUtil::RenderStage* rs)

    - +

    oosgUtil::RenderStage* getRenderStage()

    - +

    oconst osgUtil::RenderStage* getRenderStage() const

    - +

    ovoid setCullMask(const osg::Node::NodeMask nm)

    - +

    oconst osg::Node::NodeMask getCullMask() const

    - +

    ovoid setCullMaskLeft(const osg::Node::NodeMask nm)

    - +

    oconst osg::Node::NodeMask getCullMaskLeft() const

    - +

    ovoid setCullMaskRight(const osg::Node::NodeMask nm)

    - +

    oconst osg::Node::NodeMask getCullMaskRight() const

    - +

    ovoid setLODBias(float bias)
    Set the LOD bias for the CullVisitor to use

    - +

    ofloat getLODBias() const
    Get the LOD bias

    - +

    ovoid setSmallFeatureCullingPixelSize(float value)
    Set the Small Feature Culling Pixel Size

    - +

    ofloat getSmallFeatureCullingPixelSize() const
    Get the Small Feature Culling Pixel Size

    - +

    ovoid setCullingMode(osg::CullStack::CullingMode mode)
    Set the culling mode for the CullVisitor to use

    - +

    oosg::CullStack::CullingMode getCullingMode() const
    Returns the current CullingMode

    - +

    ovoid setComputeNearFarMode(CullVisitor::ComputeNearFarMode cnfm)
    Set the ComputeNearFarMode for the CullVisitor to use

    - +

    oCullVisitor::ComputeNearFarMode getComputeNearFarMode() const
    Get the ComputeNearFarMode

    + + +

    oenum FusionDistanceMode +
    FusionDistanceMode is used only when working in stereo +

    + + + +
    o USE_CAMERA_FUSION_DISTANCE +
    Use fusion distance from the attached camera if one exist +

    + + +

    o USE_FUSION_DISTANCE_VALUE +
    Use fusion distance from the value set on the SceneView +

    + + +

    o PROPORTIONAL_TO_SCREEN_DISTANCE +
    Compute the fusion distance by multiplying the screen distance by the fusion distance value +

    + + + +
    ovoid setFusionDistance(FusionDistanceMode mode, float value=1.0f) +
    Set the FusionDistanceMode and Value. Note, is used only when working in stereo. +

    + + +

    oFusionDistanceMode getFusionDistanceMode() const +
    Get the FusionDistanceMode +

    + + +

    ofloat getFusionDistanceValue() const +
    Get the FusionDistanceValue. Note, only used for USE_FUSION_DISTANCE_VALUE & PROPORTIONAL_TO_SCREEN_DISTANCE modes. +

    - +

    ovoid setPrioritizeTextures(bool pt)
    set whether the draw method should call renderer->prioritizeTexture

    - +

    obool getPrioritizeTextures() const
    get whether the draw method should call renderer->prioritizeTexture

    - +

    obool projectWindowIntoObject(const osg::Vec3& window, osg::Vec3& object) const
    Calculate, via glUnProject, the object coordinates of a window point. Note, current implementation requires that SceneView::draw() has been previously called @@ -637,7 +688,7 @@ windows coordinates are calculated relative to the bottom left of the window. Returns true on successful projection.

    - +

    obool projectWindowXYIntoObject(int x, int y, osg::Vec3& near_point, osg::Vec3& far_point) const
    Calculate, via glUnProject, the object coordinates of a window x,y when projected onto the near and far planes. @@ -647,7 +698,7 @@ windows coordinates are calculated relative to the bottom left of the window. Returns true on successful projection.

    - +

    obool projectObjectIntoWindow(const osg::Vec3& object, osg::Vec3& window) const
    Calculate, via glProject, the object coordinates of a window. Note, current implementation requires that SceneView::draw() has been previously called @@ -658,17 +709,17 @@ so you may need to pass in (mouseX,window_height-mouseY,...). Returns true on successful projection.

    - +

    oinline void setFrameStamp(osg::FrameStamp* fs)
    Set the frame stamp for the current frame

    - +

    oinline const osg::FrameStamp* getFrameStamp() const
    Set the frame stamp for the current frame

    - +

    ovirtual void init()
    Do init traversal of attached scene graph using Init NodeVisitor. The init traversal is called once for each SceneView, and should @@ -679,167 +730,171 @@ elsewhere. Also init() should only ever be called within a valid graphics context.

    - +

    ovirtual void app()
    Do app traversal of attached scene graph using App NodeVisitor

    - +

    ovirtual void cull()
    Do cull traversal of attached scene graph using Cull NodeVisitor

    - +

    ovirtual void draw()
    Do draw traversal of draw bins generated by cull traversal

    - +

    ovirtual ~SceneView()

    - +

    ovirtual void cullStage(osg::Matrix* projection, osg::Matrix* modelview, osgUtil::CullVisitor* cullVisitor, osgUtil::RenderGraph* rendergraph, osgUtil::RenderStage* renderStage)
    Do cull traversal of attached scene graph using Cull NodeVisitor

    - - -

    ovirtual void drawStage(osgUtil::RenderStage* renderStage) -

    - +

    oconst osg::Matrix computeMVPW() const

    - +

    ovoid clearArea(int x, int y, int width, int height, const osg::Vec4& color)

    - +

    oosg::ref_ptr<osg::Node> _sceneData

    - +

    oosg::ref_ptr<osg::StateSet> _globalState

    - +

    oosg::ref_ptr<osg::Light> _light

    - +

    oosg::ref_ptr<osg::Camera> _camera

    - +

    oosg::ref_ptr<osg::Matrix> _projectionMatrix

    - +

    oosg::ref_ptr<osg::Matrix> _modelviewMatrix

    - +

    oosg::ref_ptr<osg::DisplaySettings> _displaySettings

    - +

    oosg::ref_ptr<osg::State> _state

    - +

    obool _initCalled

    - +

    oosg::ref_ptr<osg::NodeVisitor> _initVisitor

    - +

    oosg::ref_ptr<osg::NodeVisitor> _appVisitor

    - +

    oosg::Node::NodeMask _cullMask

    - +

    oosg::ref_ptr<osgUtil::CullVisitor> _cullVisitor

    - +

    oosg::ref_ptr<osgUtil::RenderGraph> _rendergraph

    - +

    oosg::ref_ptr<osgUtil::RenderStage> _renderStage

    - +

    oosg::Node::NodeMask _cullMaskLeft

    - +

    oosg::ref_ptr<osgUtil::CullVisitor> _cullVisitorLeft

    - +

    oosg::ref_ptr<osgUtil::RenderGraph> _rendergraphLeft

    - +

    oosg::ref_ptr<osgUtil::RenderStage> _renderStageLeft

    - +

    oosg::Node::NodeMask _cullMaskRight

    - +

    oosg::ref_ptr<osgUtil::CullVisitor> _cullVisitorRight

    - +

    oosg::ref_ptr<osgUtil::RenderGraph> _rendergraphRight

    - +

    oosg::ref_ptr<osgUtil::RenderStage> _renderStageRight

    - +

    oosg::ref_ptr<osg::FrameStamp> _frameStamp

    - +

    oosg::Vec4 _backgroundColor

    - +

    oCullVisitor::ComputeNearFarMode _computeNearFar

    - +

    oosg::CullStack::CullingMode _cullingMode

    - +

    ofloat _LODBias

    - +

    ofloat _smallFeatureCullingPixelSize

    + + +

    oFusionDistanceMode _fusionDistanceMode +

    + + +

    ofloat _fusionDistanceValue +

    - +

    oosg::ref_ptr<osg::Viewport> _viewport

    - -

    oLightingMode _lightingMode + +
    oLightingMode _lightingMode

    - +

    obool _prioritizeTextures

    diff --git a/doc/doc++/osgUtil/SmoothingVisitor.html b/doc/doc++/osgUtil/SmoothingVisitor.html index 9fb7c4be7..514b8c681 100644 --- a/doc/doc++/osgUtil/SmoothingVisitor.html +++ b/doc/doc++/osgUtil/SmoothingVisitor.html @@ -23,13 +23,13 @@

    Public Methods

    -[more] SmoothingVisitor() +[more] SmoothingVisitor()
    default to traversing all children
    -[more]static void smooth(osg::Geometry& geoset) +[more]static void smooth(osg::Geometry& geoset)
    smooth geoset by creating per vertex normals
    -[more]virtual void apply(osg::Geode& geode) +[more]virtual void apply(osg::Geode& geode)
    apply smoothing method to all geode geosets

    @@ -43,17 +43,17 @@ osg::GeoSet's which contains surface primitives
    - +
    o SmoothingVisitor()
    default to traversing all children

    - +

    ostatic void smooth(osg::Geometry& geoset)
    smooth geoset by creating per vertex normals

    - +

    ovirtual void apply(osg::Geode& geode)
    apply smoothing method to all geode geosets

    diff --git a/doc/doc++/osgUtil/StateVisitor.html b/doc/doc++/osgUtil/StateVisitor.html index bdf5452af..5a176ea5a 100644 --- a/doc/doc++/osgUtil/StateVisitor.html +++ b/doc/doc++/osgUtil/StateVisitor.html @@ -23,27 +23,34 @@

    Public Methods

    -[more] StateVisitor() +[more] StateVisitor()
    default to traversing all children
    -[more]virtual void reset() +[more]virtual void reset()
    empty visitor, make it ready for next traversal
    -[more]virtual void apply(osg::Node& node) +[more]virtual void apply(osg::Node& node)
    -[more]virtual void apply(osg::Geode& geode) +[more]virtual void apply(osg::Geode& geode)
    -[more]void optimize() +[more]void optimize() +

    + +

    +

    Protected Fields

    +[more]StateSetMap _statesets

    Protected Methods

    -[more]void addStateSet(osg::StateSet* stateset, osg::Object* obj) +[more]void addStateSet(osg::StateSet* stateset, osg::Object* obj)

    Protected Members

    -[more]typedef std::map<osg::StateSet*,ObjectSet> StateSetMap StateSetMap _statesets +[more]typedef std::set<osg::Object*> ObjectSet +
    +[more]typedef std::map<osg::StateSet*,ObjectSet> StateSetMap

    @@ -57,34 +64,42 @@ and whole StateSets
    - +
    o StateVisitor()
    default to traversing all children

    - +

    ovirtual void reset()
    empty visitor, make it ready for next traversal

    - +

    ovirtual void apply(osg::Node& node)

    - +

    ovirtual void apply(osg::Geode& geode)

    - +

    ovoid optimize()

    - +

    ovoid addStateSet(osg::StateSet* stateset, osg::Object* obj)

    + + +

    otypedef std::set<osg::Object*> ObjectSet +

    + + +

    otypedef std::map<osg::StateSet*,ObjectSet> StateSetMap +

    - -

    otypedef std::map<osg::StateSet*,ObjectSet> StateSetMap StateSetMap _statesets + +
    oStateSetMap _statesets

    This class has no child classes.
    diff --git a/doc/doc++/osgUtil/Tesselator.html b/doc/doc++/osgUtil/Tesselator.html index afca106fe..35c772cee 100644 --- a/doc/doc++/osgUtil/Tesselator.html +++ b/doc/doc++/osgUtil/Tesselator.html @@ -13,75 +13,83 @@

    Public Methods

    -[more] Tesselator() +[more] Tesselator()
    -[more] ~Tesselator() +[more] ~Tesselator()
    -[more]void beginTesselation() +[more]void beginTesselation()
    -[more]void beginContour() +[more]void beginContour()
    -[more]void addVertex(osg::Vec3* vertex) +[more]void addVertex(osg::Vec3* vertex)
    -[more]void endContour() +[more]void endContour()
    -[more]void endTesselation() +[more]void endTesselation()
    -[more]typedef std::vector< osg::ref_ptr<Prim> > PrimList PrimList& getPrimList() +[more]PrimList& getPrimList()
    -[more]void retesselatePolygons(osg::Geometry& geom) +[more]void retesselatePolygons(osg::Geometry& geom)
    -[more]void reset() +[more]void reset()

    Public Members

    -[more]enum InputBoundaryDirection +[more]enum InputBoundaryDirection
    -[more]typedef std::vector<osg::Vec3*> VertexPointListstruct Prim: public osg::Referenced +[more]typedef std::vector<osg::Vec3*> VertexPointList +
    +[more]struct Prim: public osg::Referenced +
    +[more]typedef std::vector< osg::ref_ptr<Prim> > PrimList

    Protected Fields

    -[more]PrimList _primList +[more]GLUtesselator* _tobj
    -[more]Vec3dList _coordData +[more]PrimList _primList
    -[more]NewVertexList _newVertexList +[more]Vec3dList _coordData
    -[more]GLenum _errorCode +[more]NewVertexList _newVertexList +
    +[more]GLenum _errorCode

    Protected Methods

    -[more]void begin(GLenum mode) +[more]void begin(GLenum mode)
    -[more]void vertex(osg::Vec3* vertex) +[more]void vertex(osg::Vec3* vertex)
    -[more]void combine(osg::Vec3* vertex, void* vertex_data[4], GLfloat weight[4]) +[more]void combine(osg::Vec3* vertex, void* vertex_data[4], GLfloat weight[4])
    -[more]void end() +[more]void end()
    -[more]void error(GLenum errorCode) +[more]void error(GLenum errorCode)
    -[more]static void CALLBACK beginCallback(GLenum which, void* userData) +[more]static void CALLBACK beginCallback(GLenum which, void* userData)
    -[more]static void CALLBACK vertexCallback(GLvoid* data, void* userData) +[more]static void CALLBACK vertexCallback(GLvoid* data, void* userData)
    -[more]static void CALLBACK combineCallback(GLdouble coords[3], void* vertex_data[4], GLfloat weight[4], void** outData, void* useData) +[more]static void CALLBACK combineCallback(GLdouble coords[3], void* vertex_data[4], GLfloat weight[4], void** outData, void* useData)
    -[more]static void CALLBACK endCallback(void* userData) +[more]static void CALLBACK endCallback(void* userData)
    -[more]static void CALLBACK errorCallback(GLenum errorCode, void* userData) +[more]static void CALLBACK errorCallback(GLenum errorCode, void* userData)

    Protected Members

    -[more]struct Vec3d +[more]struct Vec3d
    -[more]struct NewVertex +[more]struct NewVertex
    -[more]typedef std::vector<Vec3d*> Vec3dList GLUtesselator* _tobj +[more]typedef std::map<osg::Vec3*,NewVertex> NewVertexList +
    +[more]typedef std::vector<Vec3d*> Vec3dList

    @@ -96,195 +104,215 @@ a small set of code for doing this job better.
    - +
    o Tesselator()

    - +

    o ~Tesselator()

    - +

    oenum InputBoundaryDirection

    - +
    o CLOCK_WISE

    - +

    o COUNTER_CLOCK_WISE

    + + +
    otypedef std::vector<osg::Vec3*> VertexPointList +

    - -

    otypedef std::vector<osg::Vec3*> VertexPointListstruct Prim: public osg::Referenced + +
    ostruct Prim: public osg::Referenced

    - +
    o Prim(GLenum mode)

    + + +

    otypedef std::vector<osg::Vec3*> VecList +

    - -

    otypedef std::vector<osg::Vec3*> VecList GLenum _mode + +
    oGLenum _mode

    - -

    oVecList _vertices + +
    oVecList _vertices

    - +
    ovoid beginTesselation()

    - +

    ovoid beginContour()

    - -

    ovoid addVertex(osg::Vec3* vertex) + +
    ovoid addVertex(osg::Vec3* vertex)

    - +

    ovoid endContour()

    - +

    ovoid endTesselation()

    + + +

    otypedef std::vector< osg::ref_ptr<Prim> > PrimList +

    - -

    otypedef std::vector< osg::ref_ptr<Prim> > PrimList PrimList& getPrimList() + +
    oPrimList& getPrimList()

    - +

    ovoid retesselatePolygons(osg::Geometry& geom)

    - +

    ovoid reset()

    - +

    ovoid begin(GLenum mode)

    - -

    ovoid vertex(osg::Vec3* vertex) + +
    ovoid vertex(osg::Vec3* vertex)

    - -

    ovoid combine(osg::Vec3* vertex, void* vertex_data[4], GLfloat weight[4]) + +
    ovoid combine(osg::Vec3* vertex, void* vertex_data[4], GLfloat weight[4])

    - +

    ovoid end()

    - +

    ovoid error(GLenum errorCode)

    - +

    ostatic void CALLBACK beginCallback(GLenum which, void* userData)

    - +

    ostatic void CALLBACK vertexCallback(GLvoid* data, void* userData)

    - +

    ostatic void CALLBACK combineCallback(GLdouble coords[3], void* vertex_data[4], GLfloat weight[4], void** outData, void* useData)

    - +

    ostatic void CALLBACK endCallback(void* userData)

    - +

    ostatic void CALLBACK errorCallback(GLenum errorCode, void* userData)

    - +

    ostruct Vec3d

    - +
    odouble _v[3]

    - +
    ostruct NewVertex

    - +
    o NewVertex()

    - -

    o NewVertex(const NewVertex& nv) + +
    o NewVertex(const NewVertex& nv)

    - +

    o NewVertex(float f1, osg::Vec3* v1, float f2, osg::Vec3* v2, float f3, osg::Vec3* v3, float f4, osg::Vec3* v4)

    - +

    ofloat _f1

    - +

    oosg::Vec3* _v1

    - +

    ofloat _f2

    - +

    oosg::Vec3* _v2

    - +

    ofloat _f3

    - +

    oosg::Vec3* _v3

    - +

    ofloat _f4

    - +

    oosg::Vec3* _v4

    + + +
    otypedef std::map<osg::Vec3*,NewVertex> NewVertexList +

    + + +

    otypedef std::vector<Vec3d*> Vec3dList +

    - -

    otypedef std::vector<Vec3d*> Vec3dList GLUtesselator* _tobj + +
    oGLUtesselator* _tobj

    - -

    oPrimList _primList + +
    oPrimList _primList

    - -

    oVec3dList _coordData + +
    oVec3dList _coordData

    - -

    oNewVertexList _newVertexList + +
    oNewVertexList _newVertexList

    - +

    oGLenum _errorCode

    diff --git a/doc/doc++/osgUtil/TransformCallback.html b/doc/doc++/osgUtil/TransformCallback.html index 96857143d..93a5110ba 100644 --- a/doc/doc++/osgUtil/TransformCallback.html +++ b/doc/doc++/osgUtil/TransformCallback.html @@ -22,22 +22,22 @@

    Public Methods

    -[more] TransformCallback(const osg::Vec3& pivot, const osg::Vec3& axis, float angularVelocity) +[more] TransformCallback(const osg::Vec3& pivot, const osg::Vec3& axis, float angularVelocity)
    -[more]virtual void operator() (osg::Node* node, osg::NodeVisitor* nv) +[more]virtual void operator() (osg::Node* node, osg::NodeVisitor* nv)

    Protected Fields

    -[more]float _angular_velocity +[more]float _angular_velocity
    -[more]osg::Vec3 _pivot +[more]osg::Vec3 _pivot
    -[more]osg::Vec3 _axis +[more]osg::Vec3 _axis
    -[more]int _previousTraversalNumber +[more]int _previousTraversalNumber
    -[more]double _previousTime +[more]double _previousTime

    @@ -48,31 +48,31 @@
    - +
    o TransformCallback(const osg::Vec3& pivot, const osg::Vec3& axis, float angularVelocity)

    - +

    ovirtual void operator() (osg::Node* node, osg::NodeVisitor* nv)

    - +

    ofloat _angular_velocity

    - +

    oosg::Vec3 _pivot

    - +

    oosg::Vec3 _axis

    - +

    oint _previousTraversalNumber

    - +

    odouble _previousTime

    diff --git a/doc/doc++/osgUtil/TriStripVisitor.html b/doc/doc++/osgUtil/TriStripVisitor.html index 5a654f995..29c8d0a9a 100644 --- a/doc/doc++/osgUtil/TriStripVisitor.html +++ b/doc/doc++/osgUtil/TriStripVisitor.html @@ -23,13 +23,13 @@

    Public Methods

    -[more] TriStripVisitor() +[more] TriStripVisitor()
    default to traversing all children
    -[more]static void stripify(osg::Geometry& drawable) +[more]static void stripify(osg::Geometry& drawable)
    convert mesh primitives in Geometry into Tri Strips using NvTriStrip.
    -[more]virtual void apply(osg::Geode& geode) +[more]virtual void apply(osg::Geode& geode)
    apply stripify method to all geode geometry

    @@ -43,19 +43,19 @@ The current implemention is based up NVidia's NvTriStrip.
    - +
    o TriStripVisitor()
    default to traversing all children

    - +

    ostatic void stripify(osg::Geometry& drawable)
    convert mesh primitives in Geometry into Tri Strips using NvTriStrip. Converts all primitive types except points and lines, linestrips which it leaves unchanged.

    - +

    ovirtual void apply(osg::Geode& geode)
    apply stripify method to all geode geometry

    diff --git a/doc/doc++/osgUtil/index.html b/doc/doc++/osgUtil/index.html index fd6a6825d..ad284eea2 100644 --- a/doc/doc++/osgUtil/index.html +++ b/doc/doc++/osgUtil/index.html @@ -22,8 +22,8 @@
  • OSGUTIL_EXPORT_ +
  • OSGUTIL_HALFWAYMAPGENERATOR_ +
  • OSGUTIL_HIGHLIGHTMAPGENERATOR_
  • OSGUTIL_INSERTIMPOSTORSVISITOR
  • OSGUTIL_INTERSECTVISITOR
  • OSGUTIL_OPTIMIZER +
  • OSGUTIL_REFLECTIONMAPGENERATOR_
  • OSGUTIL_RENDERBIN
  • OSGUTIL_RENDERGRAPH
  • OSGUTIL_RENDERLEAF diff --git a/doc/doc++/osgUtil/osgUtil.html b/doc/doc++/osgUtil/osgUtil.html index dd79add70..35a8e82c6 100644 --- a/doc/doc++/osgUtil/osgUtil.html +++ b/doc/doc++/osgUtil/osgUtil.html @@ -14,17 +14,24 @@ class OSGUTIL_EXPORT AppVisitor: public osg::NodeVisitor
    Basic AppVisitor implementation for animating a scene.
    +class OSGUTIL_EXPORT CubeMapGenerator: public osg::Referenced +
    This is the base class for cube map generators. +
    class OSGUTIL_EXPORT CullVisitor: public osg::NodeVisitor, public osg::CullStack
    Basic NodeVisitor implementation for rendering a scene.
    -class OSGUTIL_EXPORT DepthSortedBin: public RenderBin -
    class OSGUTIL_EXPORT DisplayListVisitor: public osg::NodeVisitor
    Visitor for traversing scene graph and setting each osg::Drawable's _useDisplayList flag, with option to immediately compile osg::Drawable OpenGL Display lists and osg::StateAttribute's
    class OSGUTIL_EXPORT DisplayRequirementsVisitor: public osg::NodeVisitor
    A visitor for traversing a scene graph establishing the OpenGL visuals are required to support rendering of that scene graph.
    +class OSGUTIL_EXPORT HalfWayMapGenerator: public CubeMapGenerator +
    This cube map generator produces an Half-way vector map, useful for hardware-based specular lighting effects. +
    +class OSGUTIL_EXPORT HighlightMapGenerator: public CubeMapGenerator +
    This cube map generator produces a specular highlight map. +
    class OSGUTIL_EXPORT InsertImpostorsVisitor: public osg::NodeVisitor
    Insert impostor nodes into scene graph.
    @@ -36,10 +43,13 @@ class OSGUTIL_EXPORT IntersectVisitorOptimizer
    Insert impostor nodes into scene graph.
    +class ReflectionMapGenerator: public CubeMapGenerator +
    This is the most simple cube map generator. +
    class OSGUTIL_EXPORT RenderBin: public osg::Object
    RenderBin base class
    -template<class T> class RegisterRenderBinProxy +class RegisterRenderBinProxy
    Proxy class for automatic registration of renderbins with the RenderBin prototypelist
    struct LeafDepthSortFunctor