diff --git a/AUTHORS.txt b/AUTHORS.txt index 3690562b6..4949da310 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -20,6 +20,11 @@ Don Burns - first version of sgv. - osghangglide database & osgtgz plugins. +Marco Jez + - osgParticle + - osgFX + - IO support for osgText. + Brede Johansen - flt loader. - osg::Point. @@ -27,6 +32,12 @@ Brede Johansen - osg::VertexProgram - assistance on visual studio workspace files. +Neil Salter + - osgGA + - unit test framework + - osgSim::SphereSegment and osgSim::ScalarBar + - web site. + Karsten Weiss - 1st iteration of impostor implemtentation. - rpm spec file. @@ -38,19 +49,12 @@ Graeme Harkness - reworking of old sgv into osgGLUT and a slim line Demos/sgv. - Demos/cube. -Neil Salter - - first incarnation of osgUtil, Camera and Manipulators. - - web site. Ben Discoe - osgWX and wxsgv demos for integration of OSG with wxWindows. - png plugin. - fixes to OBJ plugin. - -Marco Jez - - osgParticle - - IO support for osgText. - + Mike Weiblen - osgGL2 @@ -91,6 +95,9 @@ Sasa Bistrovic - option for detailed calculation of the near clipping plane during cull traversal. - osg::DOFTransform +Vivek Rajan + - Inventor based .iv/.wrl plugin. + Nikolaus Hanekamp - added support billboards to Open Flight loader. diff --git a/NEWS.txt b/NEWS.txt index a2190ef70..f58ae6ac1 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -3,13 +3,32 @@ OSG News (most significant items from ChangeLog) OpenSceneGraph-0.9.6 - >>> osgFX Special Effects nodekit, Improved build support, thread safety and robustness. + >>> osgFX Special Effects nodekit, support for double Matrix traversals, + >>> improved build support, thread safety and robustness. The new osgFX nodekit, written by Marco Jez, adds a set of decorator - nodes that add can be convienantly added above subgraphs in your scene + nodes that add can be conveniently added above subgraphs in your scene to add special a range of special rendering effects. Effects include AnisotopicLight, Scribe, Specular Highlights and Cartoon rendering. + Support for double Matrices has been added with the new Matrixd class, + and complimented by the a Matrixf class. The original Matrix class is + now a typedef which can be set to either Matrixf (the default) or + Matrixd, When the Matrix typedef is set to Matrixd and the OSG and + dependent apps are recompiled all internal operations such a cull traversals + will now be double with double matrices which much improved numerical + precision, making it ideal for datasets where a large values are contained + with transforms in the scene graph (such as with whole earth databases), + and when a transforms are nested which creates requires concatenation of + a number of matrices to get the final model view matrices. + + The osgGA::MatrixManipulators (which are used to control the camera + position) and osgProducer/OpenProducer have been moved across to using + exclusively double Matrices. This has been done to improve numerical + precision when computing camera positions, whilst having little impact + on performance since camera operations are only done a small number of + times per frame. + Work has been on OpenThreads and OpenProducer, in particular to improve thread safety and robustness on the Win32 platform. Reported crashes on exit from osgProducer::Viewer based apps, and freezes during runtime @@ -17,7 +36,18 @@ OpenSceneGraph-0.9.6 Threading problems which caused crashes in recent updates of the Terrapage loader have also been fixed, and additional internal changes have been made - to improve the Terrapage loader's abilty to hit constant frame rates. + to improve the Terrapage loader's ability to hit constant frame rates. + + A new .iv/.wrl loader plugin, written by Vivek Rajan, at Magic Earth, + has been added to the distribution which uses with OpenInventor or Coin + to load model, converting them into OSG equivalents. Coin has support + for VRML97 models, so can be used to import such models into the OSG. + Since the new plugin is dependent on OpenInventor or Coin the compilation + is optional, but off by default. To compile this plugin under Unix, set + the environmental variable USE_INVENTOR or USE_COIN and recompile. + Windows .dsp project file does to current exist, but should be + possible to add this. + 23rd July 2003 - OpenSceneGraph-0.9.5 diff --git a/doc/doc++/osg/AlphaFunc.html b/doc/doc++/osg/AlphaFunc.html index cb6e57269..f6e525ed5 100644 --- a/doc/doc++/osg/AlphaFunc.html +++ b/doc/doc++/osg/AlphaFunc.html @@ -28,14 +28,14 @@ [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(ComparisonFunction func, float ref) +[more]inline void setFunction(ComparisonFunction func, float ref)
[more]inline ComparisonFunction getFunction() const
@@ -76,7 +76,7 @@
ovirtual const char* className() const
-ovirtual Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -109,9 +109,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -176,7 +176,7 @@

-

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

@@ -185,7 +185,7 @@

-

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

@@ -227,7 +227,7 @@ -

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

diff --git a/doc/doc++/osg/AnimationPath.html b/doc/doc++/osg/AnimationPath.html index f6ebeb755..430e9d21b 100644 --- a/doc/doc++/osg/AnimationPath.html +++ b/doc/doc++/osg/AnimationPath.html @@ -29,51 +29,56 @@

[more] META_Object(osg, AnimationPath)
-[more]bool getMatrix(double time, Matrix& matrix) const +[more]bool getMatrix(double time, Matrixf& matrix) const
get the transformation matrix for a point in time
-[more]bool getInverse(double time, Matrix& matrix) const +[more]bool getMatrix(double time, Matrixd& matrix) const +
get the transformation matrix for a point in time +
+[more]bool getInverse(double time, Matrixf& matrix) const
get the inverse transformation matrix for a point in time
-[more]virtual bool getInterpolatedControlPoint(double time, ControlPoint& controlPoint) const +[more]bool getInverse(double time, Matrixd& matrix) 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 +[more]double getFirstTime() const
-[more]double getLastTime() const +[more]double getLastTime() const
-[more]double getPeriod() const +[more]double getPeriod() const
-[more]void setLoopMode(LoopMode lm) +[more]void setLoopMode(LoopMode lm)
-[more]LoopMode getLoopMode() const +[more]LoopMode getLoopMode() const
-[more]TimeControlPointMap& getTimeControlPointMap() +[more]TimeControlPointMap& getTimeControlPointMap()
-[more]const TimeControlPointMap& getTimeControlPointMap() const +[more]const TimeControlPointMap& getTimeControlPointMap() const

Public Members

[more]struct ControlPoint
-[more]enum LoopMode +[more]enum LoopMode
-[more]typedef std::map<double,ControlPoint> TimeControlPointMap +[more]typedef std::map<double,ControlPoint> TimeControlPointMap

Protected Fields

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

Protected Methods

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

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -180,7 +185,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)

@@ -196,97 +201,114 @@ be attached directly to Transform nodes to move subgraphs around the scene.

-

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

-

oinline void getMatrix(Matrix& matrix) const +
oinline void getMatrix(Matrixf& matrix) const +

+ + +

oinline void getMatrix(Matrixd& matrix) const

- -

oinline void getInverse(Matrix& matrix) const + +
oinline void getInverse(Matrixf& matrix) const +

+ + +

oinline void getInverse(Matrixd& matrix) const

-

obool getMatrix(double time, Matrix& matrix) const +
obool getMatrix(double time, Matrixf& matrix) const +
get the transformation matrix for a point in time +

+ + +

obool getMatrix(double time, Matrixd& matrix) const
get the transformation matrix for a point in time

- -

obool getInverse(double time, Matrix& matrix) const + +
obool getInverse(double time, Matrixf& matrix) const
get the inverse transformation matrix for a point in time

+ + +

obool getInverse(double time, Matrixd& matrix) 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)

- +

odouble getFirstTime() const

- +

odouble getLastTime() const

- +

odouble getPeriod() const

- +

oenum LoopMode

- +
o SWING

- +

o LOOP

- +

o NO_LOOPING

- -
ovoid setLoopMode(LoopMode lm) + +
ovoid setLoopMode(LoopMode lm)

- -

oLoopMode getLoopMode() const + +
oLoopMode getLoopMode() const

- +

otypedef std::map<double,ControlPoint> TimeControlPointMap

- -

oTimeControlPointMap& getTimeControlPointMap() + +
oTimeControlPointMap& getTimeControlPointMap()

- -

oconst TimeControlPointMap& getTimeControlPointMap() const + +
oconst TimeControlPointMap& getTimeControlPointMap() const

- +

ovirtual ~AnimationPath()

- -

oTimeControlPointMap _timeControlPointMap + +
oTimeControlPointMap _timeControlPointMap

- -

oLoopMode _loopMode + +
oLoopMode _loopMode

This class has no child classes.
diff --git a/doc/doc++/osg/AnimationPathCallback.html b/doc/doc++/osg/AnimationPathCallback.html index 7448f7a26..4e8ac44f3 100644 --- a/doc/doc++/osg/AnimationPathCallback.html +++ b/doc/doc++/osg/AnimationPathCallback.html @@ -68,7 +68,7 @@

Public Methods

-oMETA_Object(osg, NodeCallback) ()(Node* node, NodeVisitor* nv) +oMETA_Object(osg, NodeCallback) ()(Node* node, NodeVisitor* nv)
ovoid traverse(Node* node, NodeVisitor* nv)
@@ -96,9 +96,9 @@
ovirtual const char* className() const
-oinline void setDataVariance(DataVariance dv) +oinline void setDataVariance(DataVariance dv)
-oinline DataVariance getDataVariance() const +oinline DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -114,7 +114,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

diff --git a/doc/doc++/osg/ApplicationUsage.html b/doc/doc++/osg/ApplicationUsage.html index 3e9969bb6..f2b1e2c69 100644 --- a/doc/doc++/osg/ApplicationUsage.html +++ b/doc/doc++/osg/ApplicationUsage.html @@ -18,7 +18,7 @@
[more] ApplicationUsage(const std::string& commandLineUsage)
-[more]void setApplicationName(const std::string& name) +[more]void setApplicationName(const std::string& name)
[more]const std::string& getApplicationName() const
@@ -98,7 +98,7 @@

-

ovoid setApplicationName(const std::string& name) +
ovoid setApplicationName(const std::string& name)

diff --git a/doc/doc++/osg/Array.html b/doc/doc++/osg/Array.html index ccef62814..f84ed412d 100644 --- a/doc/doc++/osg/Array.html +++ b/doc/doc++/osg/Array.html @@ -81,9 +81,9 @@

ovirtual Object* clone(const CopyOp&) const
-oinline void setDataVariance(DataVariance dv) +oinline void setDataVariance(DataVariance dv)
-oinline DataVariance getDataVariance() const +oinline DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -99,7 +99,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

diff --git a/doc/doc++/osg/AutoTransform.html b/doc/doc++/osg/AutoTransform.html index ceb82f103..4652fb7a9 100644 --- a/doc/doc++/osg/AutoTransform.html +++ b/doc/doc++/osg/AutoTransform.html @@ -51,9 +51,9 @@
[more]inline const Quat& getRotation() const
-[more]inline void setScale(float scale) +[more]inline void setScale(float scale)
-[more]inline void setScale(const Vec3& scale) +[more]inline void setScale(const Vec3& scale)
[more]inline const Vec3& getScale() const
@@ -73,9 +73,9 @@
[more]bool getAutoScaleToScreen() const
-[more]virtual bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const +[more]virtual bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const
-[more]virtual bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const +[more]virtual bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const

@@ -104,7 +104,7 @@
[more]mutable bool _matrixDirty
-[more]mutable osg::Matrix _cachedMatrix +[more]mutable osg::Matrix _cachedMatrix

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

@@ -161,9 +161,9 @@

Protected Fields

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

@@ -207,7 +207,7 @@

Protected Fields

-oNodeList _children +oNodeList _children

@@ -217,15 +217,15 @@

Public Methods

ovirtual void ascend(NodeVisitor& nv)
-oinline void setName( const std::string& name ) +oinline void setName( const std::string& name )
-oinline void setName( const char* name ) +oinline void setName( const char* name )
oinline const std::string& getName() const
-oinline const ParentList& getParents() const +oinline const ParentList& getParents() const
-oinline ParentList getParents() +oinline ParentList getParents()
oinline Group* getParent(unsigned int i)
@@ -259,13 +259,13 @@
obool containsOccluderNodes() const
-oinline void setNodeMask(NodeMask nm) +oinline void setNodeMask(NodeMask nm)
-oinline NodeMask getNodeMask() const +oinline NodeMask getNodeMask() const
-oinline const DescriptionList& getDescriptions() const +oinline const DescriptionList& getDescriptions() const
-oinline DescriptionList& getDescriptions() +oinline DescriptionList& getDescriptions()
oinline const std::string& getDescription(unsigned int i) const
@@ -305,7 +305,7 @@
ostd::string _name
-oParentList _parents +oParentList _parents
oref_ptr<NodeCallback> _updateCallback
@@ -319,9 +319,9 @@
ounsigned int _numChildrenWithOccluderNodes
-oNodeMask _nodeMask +oNodeMask _nodeMask
-oDescriptionList _descriptions +oDescriptionList _descriptions
oref_ptr<StateSet> _stateset

@@ -344,9 +344,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -459,11 +459,11 @@ to keep its children relative to screen space coordinates

-

oinline void setScale(float scale) +
oinline void setScale(float scale)

-

oinline void setScale(const Vec3& scale) +
oinline void setScale(const Vec3& scale)

@@ -503,11 +503,11 @@ to keep its children relative to screen space coordinates

-

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

-

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

@@ -567,7 +567,7 @@ to keep its children relative to screen space coordinates

-

omutable osg::Matrix _cachedMatrix +
omutable osg::Matrix _cachedMatrix

This class has no child classes.
diff --git a/doc/doc++/osg/Billboard.html b/doc/doc++/osg/Billboard.html index 7b1a9d533..d9d327896 100644 --- a/doc/doc++/osg/Billboard.html +++ b/doc/doc++/osg/Billboard.html @@ -69,9 +69,9 @@ [more]virtual bool removeDrawable( Drawable* gset )
Remove Drawable and associated position from Billboard.
-[more]inline 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 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

@@ -140,7 +140,7 @@

Protected Fields

-oDrawableList _drawables +oDrawableList _drawables

@@ -172,15 +172,15 @@
ovirtual void traverse(NodeVisitor& )
-oinline void setName( const std::string& name ) +oinline void setName( const std::string& name )
-oinline void setName( const char* name ) +oinline void setName( const char* name )
oinline const std::string& getName() const
-oinline const ParentList& getParents() const +oinline const ParentList& getParents() const
-oinline ParentList getParents() +oinline ParentList getParents()
oinline Group* getParent(unsigned int i)
@@ -214,13 +214,13 @@
obool containsOccluderNodes() const
-oinline void setNodeMask(NodeMask nm) +oinline void setNodeMask(NodeMask nm)
-oinline NodeMask getNodeMask() const +oinline NodeMask getNodeMask() const
-oinline const DescriptionList& getDescriptions() const +oinline const DescriptionList& getDescriptions() const
-oinline DescriptionList& getDescriptions() +oinline DescriptionList& getDescriptions()
oinline const std::string& getDescription(unsigned int i) const
@@ -260,7 +260,7 @@
ostd::string _name
-oParentList _parents +oParentList _parents
oref_ptr<NodeCallback> _updateCallback
@@ -274,9 +274,9 @@
ounsigned int _numChildrenWithOccluderNodes
-oNodeMask _nodeMask +oNodeMask _nodeMask
-oDescriptionList _descriptions +oDescriptionList _descriptions
oref_ptr<StateSet> _stateset

@@ -299,9 +299,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -470,11 +470,11 @@ and do not the reference count of gset is left unchanged.

-

oinline 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 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

diff --git a/doc/doc++/osg/BlendFunc.html b/doc/doc++/osg/BlendFunc.html index 490268915..e9576cb1a 100644 --- a/doc/doc++/osg/BlendFunc.html +++ b/doc/doc++/osg/BlendFunc.html @@ -30,12 +30,12 @@ [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
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( GLenum source, GLenum destination )
@@ -82,7 +82,7 @@
ovirtual const char* className() const
-ovirtual Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -115,9 +115,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -186,7 +186,7 @@

-

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

@@ -195,7 +195,7 @@

-

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

diff --git a/doc/doc++/osg/BoundingBox.html b/doc/doc++/osg/BoundingBox.html index ed4e084bd..d9c3d6189 100644 --- a/doc/doc++/osg/BoundingBox.html +++ b/doc/doc++/osg/BoundingBox.html @@ -80,7 +80,7 @@ [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) @@ -229,7 +229,7 @@ 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.

diff --git a/doc/doc++/osg/Box.html b/doc/doc++/osg/Box.html index 7f46e5a7d..42601c817 100644 --- a/doc/doc++/osg/Box.html +++ b/doc/doc++/osg/Box.html @@ -22,49 +22,49 @@

Public Methods

-[more] Box() +[more] Box()
-[more] Box(const osg::Vec3& center, float width) +[more] Box(const osg::Vec3& center, float width)
-[more] Box(const osg::Vec3& center, float lengthX, float lengthY, float lengthZ) +[more] Box(const osg::Vec3& center, float lengthX, float lengthY, float lengthZ)
-[more] Box(const Box& box, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Box(const Box& box, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
-[more] META_Shape(osg, Box) +[more] META_Shape(osg, Box)
-[more]inline bool valid() const +[more]inline bool valid() const
-[more]inline void set(const Vec3& center, const Vec3& halfLengths) +[more]inline void set(const Vec3& center, const Vec3& halfLengths)
-[more]inline void setCenter(const Vec3& center) +[more]inline void setCenter(const Vec3& center)
-[more]inline const Vec3& getCenter() const +[more]inline const Vec3& getCenter() const
-[more]inline void setHalfLengths(const Vec3& halfLengths) +[more]inline void setHalfLengths(const Vec3& halfLengths)
-[more]inline const Vec3& getHalfLengths() const +[more]inline const Vec3& getHalfLengths() const
-[more]inline void setRotation(const Quat& quat) +[more]inline void setRotation(const Quat& quat)
-[more]inline const Quat& getRotation() const +[more]inline const Quat& getRotation() const
-[more]inline Matrix getRotationMatrix() const +[more]inline Matrix getRotationMatrix() const
-[more]inline bool zeroRotation() const +[more]inline bool zeroRotation() const

Protected Fields

-[more]Vec3 _center +[more]Vec3 _center
-[more]Vec3 _halfLengths +[more]Vec3 _halfLengths
-[more]Quat _rotation +[more]Quat _rotation

Protected Methods

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

@@ -92,9 +92,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -148,79 +148,79 @@
- +
o Box()

- -

o Box(const osg::Vec3& center, float width) + +
o Box(const osg::Vec3& center, float width)

- +

o Box(const osg::Vec3& center, float lengthX, float lengthY, float lengthZ)

- -

o Box(const Box& box, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o Box(const Box& box, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

- +

o META_Shape(osg, Box)

- +

oinline bool valid() const

- +

oinline void set(const Vec3& center, const Vec3& halfLengths)

- +

oinline void setCenter(const Vec3& center)

- +

oinline const Vec3& getCenter() const

- +

oinline void setHalfLengths(const Vec3& halfLengths)

- +

oinline const Vec3& getHalfLengths() const

- +

oinline void setRotation(const Quat& quat)

- +

oinline const Quat& getRotation() const

- -

oinline Matrix getRotationMatrix() const + +
oinline Matrix getRotationMatrix() const

- +

oinline bool zeroRotation() const

- +

ovirtual ~Box()

- +

oVec3 _center

- +

oVec3 _halfLengths

- +

oQuat _rotation

diff --git a/doc/doc++/osg/ClearNode.html b/doc/doc++/osg/ClearNode.html index 59d20dc97..43ac3bb47 100644 --- a/doc/doc++/osg/ClearNode.html +++ b/doc/doc++/osg/ClearNode.html @@ -90,7 +90,7 @@

Protected Fields

-oNodeList _children +oNodeList _children

@@ -121,15 +121,15 @@
ovirtual void ascend(NodeVisitor& nv)
-oinline void setName( const std::string& name ) +oinline void setName( const std::string& name )
-oinline void setName( const char* name ) +oinline void setName( const char* name )
oinline const std::string& getName() const
-oinline const ParentList& getParents() const +oinline const ParentList& getParents() const
-oinline ParentList getParents() +oinline ParentList getParents()
oinline Group* getParent(unsigned int i)
@@ -163,13 +163,13 @@
obool containsOccluderNodes() const
-oinline void setNodeMask(NodeMask nm) +oinline void setNodeMask(NodeMask nm)
-oinline NodeMask getNodeMask() const +oinline NodeMask getNodeMask() const
-oinline const DescriptionList& getDescriptions() const +oinline const DescriptionList& getDescriptions() const
-oinline DescriptionList& getDescriptions() +oinline DescriptionList& getDescriptions()
oinline const std::string& getDescription(unsigned int i) const
@@ -209,7 +209,7 @@
ostd::string _name
-oParentList _parents +oParentList _parents
oref_ptr<NodeCallback> _updateCallback
@@ -223,9 +223,9 @@
ounsigned int _numChildrenWithOccluderNodes
-oNodeMask _nodeMask +oNodeMask _nodeMask
-oDescriptionList _descriptions +oDescriptionList _descriptions
oref_ptr<StateSet> _stateset

@@ -248,9 +248,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

diff --git a/doc/doc++/osg/ClipNode.html b/doc/doc++/osg/ClipNode.html index 548e29163..a68edd3a1 100644 --- a/doc/doc++/osg/ClipNode.html +++ b/doc/doc++/osg/ClipNode.html @@ -118,7 +118,7 @@

Protected Fields

-oNodeList _children +oNodeList _children

@@ -144,15 +144,15 @@
ovirtual void ascend(NodeVisitor& nv)
-oinline void setName( const std::string& name ) +oinline void setName( const std::string& name )
-oinline void setName( const char* name ) +oinline void setName( const char* name )
oinline const std::string& getName() const
-oinline const ParentList& getParents() const +oinline const ParentList& getParents() const
-oinline ParentList getParents() +oinline ParentList getParents()
oinline Group* getParent(unsigned int i)
@@ -186,13 +186,13 @@
obool containsOccluderNodes() const
-oinline void setNodeMask(NodeMask nm) +oinline void setNodeMask(NodeMask nm)
-oinline NodeMask getNodeMask() const +oinline NodeMask getNodeMask() const
-oinline const DescriptionList& getDescriptions() const +oinline const DescriptionList& getDescriptions() const
-oinline DescriptionList& getDescriptions() +oinline DescriptionList& getDescriptions()
oinline const std::string& getDescription(unsigned int i) const
@@ -232,7 +232,7 @@
ostd::string _name
-oParentList _parents +oParentList _parents
oref_ptr<NodeCallback> _updateCallback
@@ -246,9 +246,9 @@
ounsigned int _numChildrenWithOccluderNodes
-oNodeMask _nodeMask +oNodeMask _nodeMask
-oDescriptionList _descriptions +oDescriptionList _descriptions
oref_ptr<StateSet> _stateset

@@ -271,9 +271,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

diff --git a/doc/doc++/osg/ClipPlane.html b/doc/doc++/osg/ClipPlane.html index cc4d8b5e7..5142bf07b 100644 --- a/doc/doc++/osg/ClipPlane.html +++ b/doc/doc++/osg/ClipPlane.html @@ -29,17 +29,17 @@
[more]inline ClipPlane(unsigned int no, const Plane& plane)
-[more]inline ClipPlane(unsigned int no, double a, double b, double c, 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)
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
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)
Set the clip plane, using a Vec4 to define plane. @@ -50,7 +50,7 @@ [more]void setClipPlane(const double* plane)
Set the clip plane, using a double[4] to define plane.
-[more]void setClipPlane(double a, double b, double c, 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 @@ -99,7 +99,7 @@
ovirtual const char* className() const
-ovirtual Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -132,9 +132,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -202,7 +202,7 @@

-

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

@@ -211,7 +211,7 @@

-

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

@@ -220,7 +220,7 @@

-

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

@@ -239,7 +239,7 @@

-

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

diff --git a/doc/doc++/osg/CollectOccludersVisitor.html b/doc/doc++/osg/CollectOccludersVisitor.html index a33e1c17b..890eb74b9 100644 --- a/doc/doc++/osg/CollectOccludersVisitor.html +++ b/doc/doc++/osg/CollectOccludersVisitor.html @@ -98,9 +98,9 @@

Public Methods

-oinline void setVisitorType(VisitorType type) +oinline void setVisitorType(VisitorType type)
-oinline VisitorType getVisitorType() const +oinline VisitorType getVisitorType() const
oinline void setTraversalNumber(int fn)
@@ -120,9 +120,9 @@
oinline bool validNodeMask(const osg::Node& node) const
-oinline void setTraversalMode(TraversalMode mode) +oinline void setTraversalMode(TraversalMode mode)
-oinline TraversalMode getTraversalMode() const +oinline TraversalMode getTraversalMode() const
oinline void setUserData(Referenced* obj)
@@ -140,10 +140,6 @@
oconst NodePath& getNodePath() const
-ovirtual bool getLocalToWorldMatrix(Matrix& matrix, Node* node) -
-ovirtual bool getWorldToLocalMatrix(Matrix& matrix, Node* node) -
ovirtual osg::Vec3 getEyePoint() const
ovoid setDatabaseRequestHandler(DatabaseRequestHandler* handler) @@ -165,13 +161,13 @@ class DatabaseRequestHandler:

Protected Fields

-oVisitorType _visitorType +oVisitorType _visitorType
oint _traversalNumber
oref_ptr<FrameStamp> _frameStamp
-oTraversalMode _traversalMode +oTraversalMode _traversalMode
oNode::NodeMask _traversalMask
@@ -222,11 +218,11 @@ class DatabaseRequestHandler:
ovoid popViewport()
-ovoid pushProjectionMatrix(osg::RefMatrix* matrix) +ovoid pushProjectionMatrix(osg::RefMatrix* matrix)
ovoid popProjectionMatrix()
-ovoid pushModelViewMatrix(osg::RefMatrix* matrix) +ovoid pushModelViewMatrix(osg::RefMatrix* matrix)
ovoid popModelViewMatrix()
@@ -274,13 +270,13 @@ class DatabaseRequestHandler:
oinline osg::Viewport* getViewport()
-oinline osg::RefMatrix& getModelViewMatrix() +oinline osg::RefMatrix& getModelViewMatrix()
-oinline osg::RefMatrix& getProjectionMatrix() +oinline osg::RefMatrix& getProjectionMatrix()
-oinline osg::Matrix getWindowMatrix() +oinline osg::Matrix getWindowMatrix()
-oinline const osg::RefMatrix& getMVPW() +oinline const osg::RefMatrix& getMVPW()
oinline const osg::Vec3& getEyeLocal() const
@@ -290,15 +286,15 @@ class DatabaseRequestHandler:
oinline Viewport* getViewport()
-oinline RefMatrix& getModelViewMatrix() +oinline RefMatrix& getModelViewMatrix()
-oinline RefMatrix& getProjectionMatrix() +oinline RefMatrix& getProjectionMatrix()
-oinline Matrix getWindowMatrix() +oinline Matrix getWindowMatrix()
-oinline const RefMatrix& getMVPW() +oinline const RefMatrix& getMVPW()
-oinline RefMatrix* createOrReuseMatrix(const osg::Matrix& value) +oinline RefMatrix* createOrReuseMatrix(const osg::Matrix& value)

@@ -344,7 +340,7 @@ class DatabaseRequestHandler:
ounsigned int _bbCornerFar
-oref_ptr<osg::RefMatrix> _identity +oref_ptr<osg::RefMatrix> _identity
oMatrixList _reuseMatrixList
@@ -359,18 +355,18 @@ class DatabaseRequestHandler:
ovoid computeFrustumVolume()
-oinline osg::RefMatrix* createOrReuseMatrix(const osg::Matrix& value) +oinline osg::RefMatrix* createOrReuseMatrix(const osg::Matrix& value)

Protected Members

-otypedef fast_back_stack< ref_ptr<RefMatrix> > MatrixStack +otypedef fast_back_stack< ref_ptr<RefMatrix> > MatrixStack
otypedef fast_back_stack<ref_ptr<Viewport> > ViewportStack
otypedef fast_back_stack<Vec3> EyePointStack
-otypedef std::vector< osg::ref_ptr<osg::RefMatrix> > MatrixList +otypedef std::vector< osg::ref_ptr<osg::RefMatrix> > MatrixList

diff --git a/doc/doc++/osg/ColorMask.html b/doc/doc++/osg/ColorMask.html index 1f396e6f3..a5cb7cb6d 100644 --- a/doc/doc++/osg/ColorMask.html +++ b/doc/doc++/osg/ColorMask.html @@ -25,41 +25,43 @@

Public Methods

[more] ColorMask()
-[more] ColorMask(const ColorMask& cm, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] ColorMask(bool red, bool green, bool blue, bool alpha) +
+[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 bool getRedMask() const +[more]inline bool getRedMask() const
-[more]inline bool getGreenMask() const +[more]inline bool getGreenMask() const
-[more]inline bool getBlueMask() const +[more]inline bool getBlueMask() const
-[more]inline 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 +79,7 @@
ovirtual const char* className() const
-ovirtual Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -87,7 +89,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 +114,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -174,60 +176,64 @@

-

o ColorMask(const ColorMask& cm, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +
o ColorMask(bool red, bool green, bool blue, bool alpha) +

+ + +

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 bool getRedMask() const

- +

oinline bool getGreenMask() const

- +

oinline bool getBlueMask() 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 2065aaf72..a69da0645 100644 --- a/doc/doc++/osg/ColorMatrix.html +++ b/doc/doc++/osg/ColorMatrix.html @@ -28,18 +28,18 @@ [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
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 @@ -48,7 +48,7 @@

Protected Fields

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

@@ -71,7 +71,7 @@
ovirtual const char* className() const
-ovirtual 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(DataVariance dv) +oinline void setDataVariance(DataVariance dv)
-oinline DataVariance getDataVariance() const +oinline DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -124,7 +124,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -173,7 +173,7 @@

-

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

@@ -182,17 +182,17 @@

-

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

-

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

-

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

@@ -206,7 +206,7 @@

-

oMatrix _matrix +
oMatrix _matrix

This class has no child classes.
diff --git a/doc/doc++/osg/CompositeShape.html b/doc/doc++/osg/CompositeShape.html index 39805dd54..879ea5623 100644 --- a/doc/doc++/osg/CompositeShape.html +++ b/doc/doc++/osg/CompositeShape.html @@ -22,55 +22,55 @@

Public Methods

-[more] CompositeShape() +[more] CompositeShape()
-[more] CompositeShape(const CompositeShape& cs, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] CompositeShape(const CompositeShape& cs, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
-[more] META_Shape(osg, CompositeShape) +[more] META_Shape(osg, CompositeShape)
-[more]void setShape(Shape* shape) +[more]void setShape(Shape* shape)
Set the shape that encloses all of the children
-[more]Shape* getShape() +[more]Shape* getShape()
Get the shape that encloses all of the children
-[more]const Shape* getShape() const +[more]const Shape* getShape() const
Get the const shape that encloses all of the children
-[more]unsigned int getNumChildren() const +[more]unsigned int getNumChildren() const
Get the number of children of this composite shape
-[more]Shape* getChild(unsigned int i) +[more]Shape* getChild(unsigned int i)
Get a child
-[more]const Shape* getChild(unsigned int i) const +[more]const Shape* getChild(unsigned int i) const
Get a const child
-[more]void addChild(Shape* shape) +[more]void addChild(Shape* shape)
Add a child to the list
-[more]void removeChild(unsigned int i) +[more]void removeChild(unsigned int i)
remove a child from the list
-[more]unsigned int findChildNo(Shape* shape) const +[more]unsigned int findChildNo(Shape* shape) const
find the index number of child, if child is not found then it returns getNumChildren(), so should be used in similar sytle of STL's result!=end()

Public Members

-[more]typedef std::vector< ref_ptr<Shape> > ChildList +[more]typedef std::vector< ref_ptr<Shape> > ChildList

Protected Fields

-[more]ref_ptr<Shape> _shape +[more]ref_ptr<Shape> _shape
-[more]ChildList _children +[more]ChildList _children

Protected Methods

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

@@ -98,9 +98,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -154,78 +154,78 @@
- +
otypedef std::vector< ref_ptr<Shape> > ChildList

- +

o CompositeShape()

- -

o CompositeShape(const CompositeShape& cs, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o CompositeShape(const CompositeShape& cs, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

- +

o META_Shape(osg, CompositeShape)

- +

ovoid setShape(Shape* shape)
Set the shape that encloses all of the children

- +

oShape* getShape()
Get the shape that encloses all of the children

- +

oconst Shape* getShape() const
Get the const shape that encloses all of the children

- +

ounsigned int getNumChildren() const
Get the number of children of this composite shape

- +

oShape* getChild(unsigned int i)
Get a child

- +

oconst Shape* getChild(unsigned int i) const
Get a const child

- +

ovoid addChild(Shape* shape)
Add a child to the list

- +

ovoid removeChild(unsigned int i)
remove a child from the list

- +

ounsigned int findChildNo(Shape* shape) const
find the index number of child, if child is not found then it returns getNumChildren(), so should be used in similar sytle of STL's result!=end()

- +

o ~CompositeShape()

- +

oref_ptr<Shape> _shape

- -

oChildList _children + +
oChildList _children

This class has no child classes.
diff --git a/doc/doc++/osg/Cone.html b/doc/doc++/osg/Cone.html index 60ebef65a..0680bd0a8 100644 --- a/doc/doc++/osg/Cone.html +++ b/doc/doc++/osg/Cone.html @@ -22,57 +22,57 @@

Public Methods

-[more] Cone() +[more] Cone()
-[more] Cone(const osg::Vec3& center, float radius, float height) +[more] Cone(const osg::Vec3& center, float radius, float height)
-[more] Cone(const Cone& cone, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Cone(const Cone& cone, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
-[more] META_Shape(osg, Cone) +[more] META_Shape(osg, Cone)
-[more]inline bool valid() const +[more]inline bool valid() const
-[more]inline void set(const Vec3& center, float radius, float height) +[more]inline void set(const Vec3& center, float radius, float height)
-[more]inline void setCenter(const Vec3& center) +[more]inline void setCenter(const Vec3& center)
-[more]inline const Vec3& getCenter() const +[more]inline const Vec3& getCenter() const
-[more]inline void setRadius(float radius) +[more]inline void setRadius(float radius)
-[more]inline float getRadius() const +[more]inline float getRadius() const
-[more]inline void setHeight(float height) +[more]inline void setHeight(float height)
-[more]inline float getHeight() const +[more]inline float getHeight() const
-[more]inline void setRotation(const Quat& quat) +[more]inline void setRotation(const Quat& quat)
-[more]inline const Quat& getRotation() const +[more]inline const Quat& getRotation() const
-[more]inline Matrix getRotationMatrix() const +[more]inline Matrix getRotationMatrix() const
-[more]inline bool zeroRotation() const +[more]inline bool zeroRotation() const
-[more]inline float getBaseOffsetFactor() const +[more]inline float getBaseOffsetFactor() const
-[more]inline float getBaseOffset() const +[more]inline float getBaseOffset() const

Protected Fields

-[more]Vec3 _center +[more]Vec3 _center
-[more]float _radius +[more]float _radius
-[more]float _height +[more]float _height
-[more]Quat _rotation +[more]Quat _rotation

Protected Methods

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

@@ -100,9 +100,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -156,95 +156,95 @@
- +
o Cone()

- -

o Cone(const osg::Vec3& center, float radius, float height) + +
o Cone(const osg::Vec3& center, float radius, float height)

- -

o Cone(const Cone& cone, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o Cone(const Cone& cone, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

- +

o META_Shape(osg, Cone)

- +

oinline bool valid() const

- -

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

- +

oinline void setCenter(const Vec3& center)

- +

oinline const Vec3& getCenter() const

- +

oinline void setRadius(float radius)

- +

oinline float getRadius() const

- -

oinline void setHeight(float height) + +
oinline void setHeight(float height)

- +

oinline float getHeight() const

- +

oinline void setRotation(const Quat& quat)

- +

oinline const Quat& getRotation() const

- -

oinline Matrix getRotationMatrix() const + +
oinline Matrix getRotationMatrix() const

- +

oinline bool zeroRotation() const

- +

oinline float getBaseOffsetFactor() const

- +

oinline float getBaseOffset() const

- +

ovirtual ~Cone()

- +

oVec3 _center

- +

ofloat _radius

- +

ofloat _height

- +

oQuat _rotation

diff --git a/doc/doc++/osg/ConstShapeVisitor.html b/doc/doc++/osg/ConstShapeVisitor.html index fae6f7b3a..a24947a30 100644 --- a/doc/doc++/osg/ConstShapeVisitor.html +++ b/doc/doc++/osg/ConstShapeVisitor.html @@ -12,9 +12,9 @@

Public Methods

-[more] ConstShapeVisitor() +[more] ConstShapeVisitor()
-[more]virtual void apply(const CompositeShape&) +[more]virtual void apply(const CompositeShape&)

@@ -25,11 +25,11 @@
- +
o ConstShapeVisitor()

- +

ovirtual void apply(const CompositeShape&)

diff --git a/doc/doc++/osg/ConvexHull.html b/doc/doc++/osg/ConvexHull.html index 2507b2586..3ad3c8b5e 100644 --- a/doc/doc++/osg/ConvexHull.html +++ b/doc/doc++/osg/ConvexHull.html @@ -22,16 +22,16 @@

Public Methods

-[more] ConvexHull() +[more] ConvexHull()
-[more] ConvexHull(const ConvexHull& hull, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] ConvexHull(const ConvexHull& hull, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
-[more] META_Shape(osg, TriangleMesh) +[more] META_Shape(osg, TriangleMesh)

Protected Methods

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

@@ -84,9 +84,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -140,19 +140,19 @@
- +
o ConvexHull()

- -

o ConvexHull(const ConvexHull& hull, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o ConvexHull(const ConvexHull& hull, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

- +

o META_Shape(osg, TriangleMesh)

- +

o ~ConvexHull()

diff --git a/doc/doc++/osg/ConvexPlanarOccluder.html b/doc/doc++/osg/ConvexPlanarOccluder.html index 47bcc135c..751748420 100644 --- a/doc/doc++/osg/ConvexPlanarOccluder.html +++ b/doc/doc++/osg/ConvexPlanarOccluder.html @@ -74,9 +74,9 @@
ovirtual const char* className() const
-oinline void setDataVariance(DataVariance dv) +oinline void setDataVariance(DataVariance dv)
-oinline DataVariance getDataVariance() const +oinline DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -92,7 +92,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

diff --git a/doc/doc++/osg/CopyOp.html b/doc/doc++/osg/CopyOp.html index ad1420ae2..5f1414656 100644 --- a/doc/doc++/osg/CopyOp.html +++ b/doc/doc++/osg/CopyOp.html @@ -17,7 +17,7 @@
[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
@@ -129,7 +129,7 @@ during copy construction and clone operation

-

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

diff --git a/doc/doc++/osg/CullFace.html b/doc/doc++/osg/CullFace.html index 5243917df..c326dc694 100644 --- a/doc/doc++/osg/CullFace.html +++ b/doc/doc++/osg/CullFace.html @@ -28,12 +28,12 @@ [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
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(Mode mode)
@@ -72,7 +72,7 @@
ovirtual const char* className() const
-ovirtual Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -105,9 +105,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

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

-

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

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

-

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

diff --git a/doc/doc++/osg/CullStack.html b/doc/doc++/osg/CullStack.html index 6773aa696..f3ef8a6d7 100644 --- a/doc/doc++/osg/CullStack.html +++ b/doc/doc++/osg/CullStack.html @@ -39,11 +39,11 @@

[more]void popViewport()
-[more]void pushProjectionMatrix(osg::RefMatrix* matrix) +[more]void pushProjectionMatrix(osg::RefMatrix* matrix)
[more]void popProjectionMatrix()
-[more]void pushModelViewMatrix(osg::RefMatrix* matrix) +[more]void pushModelViewMatrix(osg::RefMatrix* matrix)
[more]void popModelViewMatrix()
@@ -95,13 +95,13 @@
[more]inline osg::Viewport* getViewport()
-[more]inline osg::RefMatrix& getModelViewMatrix() +[more]inline osg::RefMatrix& getModelViewMatrix()
-[more]inline osg::RefMatrix& getProjectionMatrix() +[more]inline osg::RefMatrix& getProjectionMatrix()
-[more]inline osg::Matrix getWindowMatrix() +[more]inline osg::Matrix getWindowMatrix()
-[more]inline const osg::RefMatrix& getMVPW() +[more]inline const osg::RefMatrix& getMVPW()
[more]inline const osg::Vec3& getEyeLocal() const
@@ -111,15 +111,15 @@
[more]inline Viewport* getViewport()
-[more]inline RefMatrix& getModelViewMatrix() +[more]inline RefMatrix& getModelViewMatrix()
-[more]inline RefMatrix& getProjectionMatrix() +[more]inline RefMatrix& getProjectionMatrix()
-[more]inline Matrix getWindowMatrix() +[more]inline Matrix getWindowMatrix()
-[more]inline const RefMatrix& getMVPW() +[more]inline const RefMatrix& getMVPW()
-[more]inline RefMatrix* createOrReuseMatrix(const osg::Matrix& value) +[more]inline RefMatrix* createOrReuseMatrix(const osg::Matrix& value)

@@ -165,7 +165,7 @@
[more]unsigned int _bbCornerFar
-[more]ref_ptr<osg::RefMatrix> _identity +[more]ref_ptr<osg::RefMatrix> _identity
[more]MatrixList _reuseMatrixList
@@ -180,18 +180,18 @@
[more]void computeFrustumVolume()
-[more]inline osg::RefMatrix* createOrReuseMatrix(const osg::Matrix& value) +[more]inline osg::RefMatrix* createOrReuseMatrix(const osg::Matrix& value)

Protected Members

-[more]typedef fast_back_stack< ref_ptr<RefMatrix> > MatrixStack +[more]typedef fast_back_stack< ref_ptr<RefMatrix> > MatrixStack
[more]typedef fast_back_stack<ref_ptr<Viewport> > ViewportStack
[more]typedef fast_back_stack<Vec3> EyePointStack
-[more]typedef std::vector< osg::ref_ptr<osg::RefMatrix> > MatrixList +[more]typedef std::vector< osg::ref_ptr<osg::RefMatrix> > MatrixList

@@ -224,9 +224,9 @@ and the CullingSet.
o NO_CULLING

- + -

o VIEW_FRUSTUM_CULLING +
o VIEW_FRUSTUM_SIDES_CULLING

@@ -236,16 +236,24 @@ and the CullingSet.

o FAR_PLANE_CULLING

- + +

o VIEW_FRUSTUM_CULLING +

+ +

o SMALL_FEATURE_CULLING

- +

o SHADOW_OCCLUSION_CULLING

+ + +

o DEFAULT_CULLING +

- +

o ENABLE_ALL_CULLING

@@ -279,7 +287,7 @@ and the CullingSet.

-

ovoid pushProjectionMatrix(osg::RefMatrix* matrix) +
ovoid pushProjectionMatrix(osg::RefMatrix* matrix)

@@ -287,7 +295,7 @@ and the CullingSet.

-

ovoid pushModelViewMatrix(osg::RefMatrix* matrix) +
ovoid pushModelViewMatrix(osg::RefMatrix* matrix)

@@ -391,19 +399,19 @@ and the CullingSet.

-

oinline osg::RefMatrix& getModelViewMatrix() +
oinline osg::RefMatrix& getModelViewMatrix()

-

oinline osg::RefMatrix& getProjectionMatrix() +
oinline osg::RefMatrix& getProjectionMatrix()

-

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

-

oinline const osg::RefMatrix& getMVPW() +
oinline const osg::RefMatrix& getMVPW()

@@ -443,7 +451,7 @@ and the CullingSet.

-

otypedef fast_back_stack< ref_ptr<RefMatrix> > MatrixStack +
otypedef fast_back_stack< ref_ptr<RefMatrix> > MatrixStack

@@ -503,11 +511,11 @@ and the CullingSet.

-

oref_ptr<osg::RefMatrix> _identity +
oref_ptr<osg::RefMatrix> _identity

-

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

@@ -519,7 +527,7 @@ and the CullingSet.

-

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

@@ -527,23 +535,23 @@ and the CullingSet.

-

oinline RefMatrix& getModelViewMatrix() +
oinline RefMatrix& getModelViewMatrix()

-

oinline RefMatrix& getProjectionMatrix() +
oinline RefMatrix& getProjectionMatrix()

-

oinline Matrix getWindowMatrix() +
oinline Matrix getWindowMatrix()

-

oinline const RefMatrix& getMVPW() +
oinline const RefMatrix& getMVPW()

-

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

Direct child classes: diff --git a/doc/doc++/osg/CullingSet.html b/doc/doc++/osg/CullingSet.html index fe98b8385..4fe8ad889 100644 --- a/doc/doc++/osg/CullingSet.html +++ b/doc/doc++/osg/CullingSet.html @@ -25,7 +25,7 @@

Public Methods

[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]void setCullingMask(Mask mask)
@@ -136,7 +136,7 @@

-

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

@@ -151,21 +151,41 @@

oenum MaskValues

- + +
o NO_CULLING +

+ + +

o VIEW_FRUSTUM_SIDES_CULLING +

+ + +

o NEAR_PLANE_CULLING +

+ + +

o FAR_PLANE_CULLING +

+ +

o VIEW_FRUSTUM_CULLING

- +

o SMALL_FEATURE_CULLING

- +

o SHADOW_OCCLUSION_CULLING

- - -

o ALL_CULLING + + +
o DEFAULT_CULLING +

+ + +

o ENABLE_ALL_CULLING

diff --git a/doc/doc++/osg/Cylinder.html b/doc/doc++/osg/Cylinder.html index f9e20a1ed..26648d82a 100644 --- a/doc/doc++/osg/Cylinder.html +++ b/doc/doc++/osg/Cylinder.html @@ -22,53 +22,53 @@

Public Methods

-[more] Cylinder() +[more] Cylinder()
-[more] Cylinder(const osg::Vec3& center, float radius, float height) +[more] Cylinder(const osg::Vec3& center, float radius, float height)
-[more] Cylinder(const Cylinder& cylinder, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Cylinder(const Cylinder& cylinder, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
-[more] META_Shape(osg, Cylinder) +[more] META_Shape(osg, Cylinder)
-[more]inline bool valid() const +[more]inline bool valid() const
-[more]inline void set(const Vec3& center, float radius, float height) +[more]inline void set(const Vec3& center, float radius, float height)
-[more]inline void setCenter(const Vec3& center) +[more]inline void setCenter(const Vec3& center)
-[more]inline const Vec3& getCenter() const +[more]inline const Vec3& getCenter() const
-[more]inline void setRadius(float radius) +[more]inline void setRadius(float radius)
-[more]inline float getRadius() const +[more]inline float getRadius() const
-[more]inline void setHeight(float height) +[more]inline void setHeight(float height)
-[more]inline float getHeight() const +[more]inline float getHeight() const
-[more]inline void setRotation(const Quat& quat) +[more]inline void setRotation(const Quat& quat)
-[more]inline const Quat& getRotation() const +[more]inline const Quat& getRotation() const
-[more]inline Matrix getRotationMatrix() const +[more]inline Matrix getRotationMatrix() const
-[more]bool zeroRotation() const +[more]bool zeroRotation() const

Protected Fields

-[more]Vec3 _center +[more]Vec3 _center
-[more]float _radius +[more]float _radius
-[more]float _height +[more]float _height
-[more]Quat _rotation +[more]Quat _rotation

Protected Methods

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

@@ -96,9 +96,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -152,87 +152,87 @@
- +
o Cylinder()

- -

o Cylinder(const osg::Vec3& center, float radius, float height) + +
o Cylinder(const osg::Vec3& center, float radius, float height)

- -

o Cylinder(const Cylinder& cylinder, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o Cylinder(const Cylinder& cylinder, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

- +

o META_Shape(osg, Cylinder)

- +

oinline bool valid() const

- -

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

- +

oinline void setCenter(const Vec3& center)

- +

oinline const Vec3& getCenter() const

- +

oinline void setRadius(float radius)

- +

oinline float getRadius() const

- -

oinline void setHeight(float height) + +
oinline void setHeight(float height)

- +

oinline float getHeight() const

- +

oinline void setRotation(const Quat& quat)

- +

oinline const Quat& getRotation() const

- -

oinline Matrix getRotationMatrix() const + +
oinline Matrix getRotationMatrix() const

- +

obool zeroRotation() const

- +

ovirtual ~Cylinder()

- +

oVec3 _center

- +

ofloat _radius

- +

ofloat _height

- +

oQuat _rotation

diff --git a/doc/doc++/osg/DOFTransform.html b/doc/doc++/osg/DOFTransform.html index b0eda4a96..ee804be3a 100644 --- a/doc/doc++/osg/DOFTransform.html +++ b/doc/doc++/osg/DOFTransform.html @@ -55,49 +55,49 @@
[more]void updateCurrentHPR(const Vec3& hpr)
-[more]void setMinTranslate(const Vec3& translate) +[more]void setMinTranslate(const Vec3& translate)
[more]const Vec3& getMinTranslate() const
-[more]void setMaxTranslate(const Vec3& translate) +[more]void setMaxTranslate(const Vec3& translate)
[more]const Vec3& getMaxTranslate() const
-[more]void setIncrementTranslate(const Vec3& translate) +[more]void setIncrementTranslate(const Vec3& translate)
[more]const Vec3& getIncrementTranslate() const
-[more]void setCurrentTranslate(const Vec3& translate) +[more]void setCurrentTranslate(const Vec3& translate)
[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]void setMaxScale(const Vec3& scale) +[more]void setMaxScale(const Vec3& scale)
[more]const Vec3& getMaxScale() const
-[more]void setIncrementScale(const Vec3& scale) +[more]void setIncrementScale(const Vec3& scale)
[more]const Vec3& getIncrementScale() const
-[more]void setCurrentScale(const Vec3& scale) +[more]void setCurrentScale(const Vec3& scale)
[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)
@@ -109,9 +109,9 @@
[more]void animate()
-[more]virtual bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const +[more]virtual bool computeLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const
-[more]virtual bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const +[more]virtual bool computeWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const

@@ -140,9 +140,9 @@
[more]Vec3 _incrementScale
-[more]Matrix _Put +[more]Matrix _Put
-[more]Matrix _inversePut +[more]Matrix _inversePut
[more]unsigned long _limitationFlags
@@ -174,19 +174,19 @@
ovirtual const PositionAttitudeTransform* asPositionAttitudeTransform() const
-ovoid setReferenceFrame(ReferenceFrame rf) +ovoid setReferenceFrame(ReferenceFrame rf)
-oReferenceFrame getReferenceFrame() const +oReferenceFrame getReferenceFrame() const
-ovoid setComputeTransformCallback(ComputeTransformCallback* ctc) +ovoid setComputeTransformCallback(ComputeTransformCallback* ctc)
-oComputeTransformCallback* getComputeTransformCallback() +oComputeTransformCallback* getComputeTransformCallback()
-oconst ComputeTransformCallback* getComputeTransformCallback() const +oconst ComputeTransformCallback* getComputeTransformCallback() const
-oinline bool getLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const +oinline bool getLocalToWorldMatrix(Matrix& matrix, NodeVisitor* nv) const
-oinline bool getWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const +oinline bool getWorldToLocalMatrix(Matrix& matrix, NodeVisitor* nv) const

@@ -198,9 +198,9 @@

Protected Fields

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

@@ -242,7 +242,7 @@

Protected Fields

-oNodeList _children +oNodeList _children

@@ -264,15 +264,15 @@
ovirtual void ascend(NodeVisitor& nv)
-oinline void setName( const std::string& name ) +oinline void setName( const std::string& name )
-oinline void setName( const char* name ) +oinline void setName( const char* name )
oinline const std::string& getName() const
-oinline const ParentList& getParents() const +oinline const ParentList& getParents() const
-oinline ParentList getParents() +oinline ParentList getParents()
oinline Group* getParent(unsigned int i)
@@ -306,13 +306,13 @@
obool containsOccluderNodes() const
-oinline void setNodeMask(NodeMask nm) +oinline void setNodeMask(NodeMask nm)
-oinline NodeMask getNodeMask() const +oinline NodeMask getNodeMask() const
-oinline const DescriptionList& getDescriptions() const +oinline const DescriptionList& getDescriptions() const
-oinline DescriptionList& getDescriptions() +oinline DescriptionList& getDescriptions()
oinline const std::string& getDescription(unsigned int i) const
@@ -352,7 +352,7 @@
ostd::string _name
-oParentList _parents +oParentList _parents
oref_ptr<NodeCallback> _updateCallback
@@ -366,9 +366,9 @@
ounsigned int _numChildrenWithOccluderNodes
-oNodeMask _nodeMask +oNodeMask _nodeMask
-oDescriptionList _descriptions +oDescriptionList _descriptions
oref_ptr<StateSet> _stateset

@@ -391,9 +391,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -511,7 +511,7 @@

-

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

@@ -519,7 +519,7 @@

-

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

@@ -527,7 +527,7 @@

-

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

@@ -535,7 +535,7 @@

-

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

@@ -543,11 +543,11 @@

-

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

-

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

@@ -555,7 +555,7 @@

-

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

@@ -563,7 +563,7 @@

-

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

@@ -571,7 +571,7 @@

-

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

@@ -579,23 +579,23 @@

-

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

-

ovoid setPutMatrix(const Matrix& put) +
ovoid setPutMatrix(const Matrix& put)

-

oinline const Matrix& getPutMatrix() const +
oinline const Matrix& getPutMatrix() const

-

ovoid setInversePutMatrix(const Matrix& inversePut) +
ovoid setInversePutMatrix(const Matrix& inversePut)

-

oinline const Matrix& getInversePutMatrix() const +
oinline const Matrix& getInversePutMatrix() const

@@ -619,11 +619,11 @@

-

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

-

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

@@ -679,11 +679,11 @@

-

oMatrix _Put +
oMatrix _Put

-

oMatrix _inversePut +
oMatrix _inversePut

diff --git a/doc/doc++/osg/DatabaseRequestHandler.html b/doc/doc++/osg/DatabaseRequestHandler.html index 2289ce400..72d78de0e 100644 --- a/doc/doc++/osg/DatabaseRequestHandler.html +++ b/doc/doc++/osg/DatabaseRequestHandler.html @@ -23,12 +23,12 @@

Public Methods

-[more]virtual void requestNodeFile(const std::string& fileName, osg::Group* group) = 0 +[more]virtual void requestNodeFile(const std::string& fileName, osg::Group* group) = 0

Protected Methods

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

@@ -65,11 +65,11 @@
- +
ovirtual void requestNodeFile(const std::string& fileName, osg::Group* group) = 0

- +

ovirtual ~DatabaseRequestHandler()

diff --git a/doc/doc++/osg/DeleteHandler.html b/doc/doc++/osg/DeleteHandler.html index 7915a9d8e..9ef5f9057 100644 --- a/doc/doc++/osg/DeleteHandler.html +++ b/doc/doc++/osg/DeleteHandler.html @@ -13,14 +13,14 @@

Public Methods

-[more]virtual ~DeleteHandler() +[more]virtual ~DeleteHandler()
-[more]virtual void flush() +[more]virtual void flush()
flush any cache of objects that need to be deleted by doing an actual delete
-[more]inline void doDelete(const Referenced* object) +[more]inline void doDelete(const Referenced* object)
-[more]virtual void requestDelete(const Referenced* object) +[more]virtual void requestDelete(const Referenced* object)
Request the deletion of an object.

@@ -39,20 +39,20 @@ DeleteHandler's memory.
- +
ovirtual ~DeleteHandler()

- +

ovirtual void flush()
flush any cache of objects that need to be deleted by doing an actual delete

- +

oinline void doDelete(const Referenced* object)

- +

ovirtual void requestDelete(const Referenced* object)
Request the deletion of an object. Depending on users implementation of DeleteHandler, the delete of the object may occur diff --git a/doc/doc++/osg/Depth.html b/doc/doc++/osg/Depth.html index 401ecf19e..e231b5c77 100644 --- a/doc/doc++/osg/Depth.html +++ b/doc/doc++/osg/Depth.html @@ -28,12 +28,12 @@ [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
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(Function func)
@@ -88,7 +88,7 @@
ovirtual const char* className() const
-ovirtual Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -121,9 +121,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -226,7 +226,7 @@

-

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

@@ -235,7 +235,7 @@

-

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

diff --git a/doc/doc++/osg/DisplaySettings.html b/doc/doc++/osg/DisplaySettings.html index 181a920da..d023eb3e6 100644 --- a/doc/doc++/osg/DisplaySettings.html +++ b/doc/doc++/osg/DisplaySettings.html @@ -55,7 +55,7 @@

[more]float getEyeSeparation() const
-[more]void setScreenDistance(float distance) +[more]void setScreenDistance(float distance)
[more]float getScreenDistance() const
@@ -63,7 +63,7 @@
[more]SplitStereoHorizontalEyeMapping getSplitStereoHorizontalEyeMapping() const
-[more]void setSplitStereoHorizontalSeparation(int s) +[more]void setSplitStereoHorizontalSeparation(int s)
[more]int getSplitStereoHorizontalSeparation() const
@@ -71,7 +71,7 @@
[more]SplitStereoVerticalEyeMapping getSplitStereoVerticalEyeMapping() const
-[more]void setSplitStereoVerticalSeparation(int s) +[more]void setSplitStereoVerticalSeparation(int s)
[more]int getSplitStereoVerticalSeparation() const
@@ -79,7 +79,7 @@
[more]bool getSplitStereoAutoAjustAspectRatio() const
-[more]void setScreenHeight(float height) +[more]void setScreenHeight(float height)
[more]float getScreenHeight() const
@@ -289,7 +289,7 @@ have been set up, and the status of stereo viewing

-

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

@@ -319,7 +319,7 @@ have been set up, and the status of stereo viewing

-

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

@@ -349,7 +349,7 @@ have been set up, and the status of stereo viewing

-

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

@@ -365,7 +365,7 @@ have been set up, and the status of stereo viewing

-

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

diff --git a/doc/doc++/osg/DrawArrayLengths.html b/doc/doc++/osg/DrawArrayLengths.html index 793a26aaf..2011e5692 100644 --- a/doc/doc++/osg/DrawArrayLengths.html +++ b/doc/doc++/osg/DrawArrayLengths.html @@ -22,51 +22,51 @@

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] DrawArrayLengths(GLenum mode, GLint first) +[more] DrawArrayLengths(GLenum mode, GLint first)
-[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) const +[more]virtual void accept(Drawable::PrimitiveFunctor& functor) const
-[more]virtual unsigned int getNumIndices() const +[more]virtual unsigned int getNumIndices() const
-[more]virtual unsigned int index(unsigned int pos) const +[more]virtual unsigned int index(unsigned int pos) const
-[more]virtual void offsetIndices(int offset) +[more]virtual void offsetIndices(int offset)
-[more]virtual unsigned int getNumPrimitives() const +[more]virtual unsigned int getNumPrimitives() const

Protected Fields

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

Protected Methods

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

@@ -74,7 +74,7 @@

Public Methods

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

Protected Fields

-oType _primitiveType +oType _primitiveType
oGLenum _mode

@@ -100,9 +100,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -156,83 +156,83 @@
- +
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)

- -

o DrawArrayLengths(GLenum mode, GLint first) + +
o DrawArrayLengths(GLenum mode, GLint first)

- +

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) const

- +

ovirtual unsigned int getNumIndices() const

- +

ovirtual unsigned int index(unsigned int pos) const

- -

ovirtual void offsetIndices(int offset) + +
ovirtual void offsetIndices(int offset)

- +

ovirtual unsigned int getNumPrimitives() const

- +

ovirtual ~DrawArrayLengths()

- +

oGLint _first

diff --git a/doc/doc++/osg/DrawArrays.html b/doc/doc++/osg/DrawArrays.html index 610be4ab8..7c0e6523c 100644 --- a/doc/doc++/osg/DrawArrays.html +++ b/doc/doc++/osg/DrawArrays.html @@ -22,53 +22,53 @@

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) const +[more]virtual void accept(Drawable::PrimitiveFunctor& functor) const
-[more]virtual unsigned int getNumIndices() const +[more]virtual unsigned int getNumIndices() const
-[more]virtual unsigned int index(unsigned int pos) const +[more]virtual unsigned int index(unsigned int pos) const
-[more]virtual void offsetIndices(int offset) +[more]virtual void offsetIndices(int offset)

Protected Fields

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

Protected Methods

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

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

Public Methods

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

Protected Fields

-oType _primitiveType +oType _primitiveType
oGLenum _mode

@@ -104,9 +104,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -160,87 +160,87 @@
- +
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) const

- +

ovirtual unsigned int getNumIndices() const

- +

ovirtual unsigned int index(unsigned int pos) const

- -

ovirtual void offsetIndices(int offset) + +
ovirtual void offsetIndices(int offset)

- +

ovirtual ~DrawArrays()

- +

oGLint _first

- +

oGLsizei _count

diff --git a/doc/doc++/osg/DrawElementsUByte.html b/doc/doc++/osg/DrawElementsUByte.html index 7e3787c27..25bff2f7e 100644 --- a/doc/doc++/osg/DrawElementsUByte.html +++ b/doc/doc++/osg/DrawElementsUByte.html @@ -22,38 +22,38 @@

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]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) const +[more]virtual void accept(Drawable::PrimitiveFunctor& functor) const
-[more]virtual unsigned int getNumIndices() const +[more]virtual unsigned int getNumIndices() const
-[more]virtual unsigned int index(unsigned int pos) const +[more]virtual unsigned int index(unsigned int pos) const
-[more]virtual void offsetIndices(int offset) +[more]virtual void offsetIndices(int offset)

Protected Methods

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

@@ -61,7 +61,7 @@

Public Methods

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

Protected Fields

-oType _primitiveType +oType _primitiveType
oGLenum _mode

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

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -145,63 +145,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)

- +

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) const

- +

ovirtual unsigned int getNumIndices() const

- +

ovirtual unsigned int index(unsigned int pos) const

- -

ovirtual void offsetIndices(int offset) + +
ovirtual void offsetIndices(int offset)

- +

ovirtual ~DrawElementsUByte()

diff --git a/doc/doc++/osg/DrawElementsUInt.html b/doc/doc++/osg/DrawElementsUInt.html index b76d7f33d..707abc2fc 100644 --- a/doc/doc++/osg/DrawElementsUInt.html +++ b/doc/doc++/osg/DrawElementsUInt.html @@ -22,38 +22,38 @@

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]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) const +[more]virtual void accept(Drawable::PrimitiveFunctor& functor) const
-[more]virtual unsigned int getNumIndices() const +[more]virtual unsigned int getNumIndices() const
-[more]virtual unsigned int index(unsigned int pos) const +[more]virtual unsigned int index(unsigned int pos) const
-[more]virtual void offsetIndices(int offset) +[more]virtual void offsetIndices(int offset)

Protected Methods

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

@@ -61,7 +61,7 @@

Public Methods

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

Protected Fields

-oType _primitiveType +oType _primitiveType
oGLenum _mode

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

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -145,63 +145,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)

- +

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) const

- +

ovirtual unsigned int getNumIndices() const

- +

ovirtual unsigned int index(unsigned int pos) const

- -

ovirtual void offsetIndices(int offset) + +
ovirtual void offsetIndices(int offset)

- +

ovirtual ~DrawElementsUInt()

diff --git a/doc/doc++/osg/DrawElementsUShort.html b/doc/doc++/osg/DrawElementsUShort.html index a6dc5eb62..742587f12 100644 --- a/doc/doc++/osg/DrawElementsUShort.html +++ b/doc/doc++/osg/DrawElementsUShort.html @@ -22,40 +22,40 @@

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) const +[more]virtual void accept(Drawable::PrimitiveFunctor& functor) const
-[more]virtual unsigned int getNumIndices() const +[more]virtual unsigned int getNumIndices() const
-[more]virtual unsigned int index(unsigned int pos) const +[more]virtual unsigned int index(unsigned int pos) const
-[more]virtual void offsetIndices(int offset) +[more]virtual void offsetIndices(int offset)

Protected Methods

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

@@ -63,7 +63,7 @@

Public Methods

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

Protected Fields

-oType _primitiveType +oType _primitiveType
oGLenum _mode

@@ -91,9 +91,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -147,67 +147,67 @@
- +
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) const

- +

ovirtual unsigned int getNumIndices() const

- +

ovirtual unsigned int index(unsigned int pos) const

- -

ovirtual void offsetIndices(int offset) + +
ovirtual void offsetIndices(int offset)

- +

ovirtual ~DrawElementsUShort()

diff --git a/doc/doc++/osg/DrawPixels.html b/doc/doc++/osg/DrawPixels.html index 9b63db9f5..8161bcd6f 100644 --- a/doc/doc++/osg/DrawPixels.html +++ b/doc/doc++/osg/DrawPixels.html @@ -52,9 +52,9 @@
[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]bool getUseSubImage() const
@@ -257,9 +257,9 @@ class SG_EXPORT Extensions: public

Public Methods

-oinline void setDataVariance(DataVariance dv) +oinline void setDataVariance(DataVariance dv)
-oinline DataVariance getDataVariance() const +oinline DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -275,7 +275,7 @@ class SG_EXPORT Extensions: public

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -371,11 +371,11 @@ images using glDrawPixels

-

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

diff --git a/doc/doc++/osg/Drawable.html b/doc/doc++/osg/Drawable.html index abe10ed58..0755ebba7 100644 --- a/doc/doc++/osg/Drawable.html +++ b/doc/doc++/osg/Drawable.html @@ -261,9 +261,9 @@ class SG_EXPORT Extensions: public ovirtual Object* clone(const CopyOp&) const

-oinline void setDataVariance(DataVariance dv) +oinline void setDataVariance(DataVariance dv)
-oinline DataVariance getDataVariance() const +oinline DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -279,7 +279,7 @@ class SG_EXPORT Extensions: public

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

diff --git a/doc/doc++/osg/Extensions.3.html b/doc/doc++/osg/Extensions.3.html index ba90b6163..37ceaaeb8 100644 --- a/doc/doc++/osg/Extensions.3.html +++ b/doc/doc++/osg/Extensions.3.html @@ -23,95 +23,95 @@

Public Methods

-[more] Extensions() +[more] Extensions()
-[more] Extensions(const Extensions& rhs) +[more] Extensions(const Extensions& rhs)
-[more]void lowestCommonDenominator(const Extensions& rhs) +[more]void lowestCommonDenominator(const Extensions& rhs)
-[more]void setupGLExtenions() +[more]void setupGLExtenions()
-[more]void setMultiTexturingSupported(bool flag) +[more]void setMultiTexturingSupported(bool flag)
-[more]bool isMultiTexturingSupported() const +[more]bool isMultiTexturingSupported() const
-[more]void setTextureFilterAnisotropicSupported(bool flag) +[more]void setTextureFilterAnisotropicSupported(bool flag)
-[more]bool isTextureFilterAnisotropicSupported() const +[more]bool isTextureFilterAnisotropicSupported() const
-[more]void setTextureCompressionARBSupported(bool flag) +[more]void setTextureCompressionARBSupported(bool flag)
-[more]bool isTextureCompressionARBSupported() const +[more]bool isTextureCompressionARBSupported() const
-[more]void setTextureCompressionS3TCSupported(bool flag) +[more]void setTextureCompressionS3TCSupported(bool flag)
-[more]bool isTextureCompressionS3TCSupported() const +[more]bool isTextureCompressionS3TCSupported() const
-[more]void setTextureMirroredRepeatSupported(bool flag) +[more]void setTextureMirroredRepeatSupported(bool flag)
-[more]bool isTextureMirroredRepeatSupported() const +[more]bool isTextureMirroredRepeatSupported() const
-[more]void setTextureEdgeClampSupported(bool flag) +[more]void setTextureEdgeClampSupported(bool flag)
-[more]bool isTextureEdgeClampSupported() const +[more]bool isTextureEdgeClampSupported() const
-[more]void setTextureBorderClampSupported(bool flag) +[more]void setTextureBorderClampSupported(bool flag)
-[more]bool isTextureBorderClampSupported() const +[more]bool isTextureBorderClampSupported() const
-[more]void setGenerateMipMapSupported(bool flag) +[more]void setGenerateMipMapSupported(bool flag)
-[more]bool isGenerateMipMapSupported() const +[more]bool isGenerateMipMapSupported() const
-[more]void setMaxTextureSize(GLint maxsize) +[more]void setMaxTextureSize(GLint maxsize)
-[more]GLint maxTextureSize() const +[more]GLint maxTextureSize() const
-[more]bool isCompressedTexImage2DSupported() const +[more]bool isCompressedTexImage2DSupported() const
-[more]void setCompressedTexImage2DProc(void* ptr) +[more]void setCompressedTexImage2DProc(void* ptr)
-[more]void glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* data) const +[more]void glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* data) const
-[more]void setCompressedTexSubImage2DProc(void* ptr) +[more]void setCompressedTexSubImage2DProc(void* ptr)
-[more]void glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei type, const GLvoid* data) const +[more]void glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei type, const GLvoid* data) const
-[more]void setGetCompressedTexImageProc(void* ptr) +[more]void setGetCompressedTexImageProc(void* ptr)
-[more]void glGetCompressedTexImage(GLenum target, GLint level, GLvoid* data) const +[more]void glGetCompressedTexImage(GLenum target, GLint level, GLvoid* data) const

Protected Fields

-[more]bool _isMultiTexturingSupported +[more]bool _isMultiTexturingSupported
-[more]bool _isTextureFilterAnisotropicSupported +[more]bool _isTextureFilterAnisotropicSupported
-[more]bool _isTextureCompressionARBSupported +[more]bool _isTextureCompressionARBSupported
-[more]bool _isTextureCompressionS3TCSupported +[more]bool _isTextureCompressionS3TCSupported
-[more]bool _isTextureMirroredRepeatSupported +[more]bool _isTextureMirroredRepeatSupported
-[more]bool _isTextureEdgeClampSupported +[more]bool _isTextureEdgeClampSupported
-[more]bool _isTextureBorderClampSupported +[more]bool _isTextureBorderClampSupported
-[more]bool _isGenerateMipMapSupported +[more]bool _isGenerateMipMapSupported
-[more]GLint _maxTextureSize +[more]GLint _maxTextureSize
-[more]void* _glCompressedTexImage2D +[more]void* _glCompressedTexImage2D
-[more]void* _glCompressedTexSubImage2D +[more]void* _glCompressedTexSubImage2D
-[more]void* _glGetCompressedTexImage +[more]void* _glGetCompressedTexImage

Protected Methods

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

@@ -150,171 +150,171 @@ check for the extensions or use the associated functions
- +
o Extensions()

- -

o Extensions(const Extensions& rhs) + +
o Extensions(const Extensions& rhs)

- +

ovoid lowestCommonDenominator(const Extensions& rhs)

- +

ovoid setupGLExtenions()

- +

ovoid setMultiTexturingSupported(bool flag)

- +

obool isMultiTexturingSupported() const

- +

ovoid setTextureFilterAnisotropicSupported(bool flag)

- +

obool isTextureFilterAnisotropicSupported() const

- +

ovoid setTextureCompressionARBSupported(bool flag)

- +

obool isTextureCompressionARBSupported() const

- +

ovoid setTextureCompressionS3TCSupported(bool flag)

- +

obool isTextureCompressionS3TCSupported() const

- +

ovoid setTextureMirroredRepeatSupported(bool flag)

- +

obool isTextureMirroredRepeatSupported() const

- +

ovoid setTextureEdgeClampSupported(bool flag)

- +

obool isTextureEdgeClampSupported() const

- +

ovoid setTextureBorderClampSupported(bool flag)

- +

obool isTextureBorderClampSupported() const

- +

ovoid setGenerateMipMapSupported(bool flag)

- +

obool isGenerateMipMapSupported() const

- +

ovoid setMaxTextureSize(GLint maxsize)

- +

oGLint maxTextureSize() const

- +

obool isCompressedTexImage2DSupported() const

- -

ovoid setCompressedTexImage2DProc(void* ptr) + +
ovoid setCompressedTexImage2DProc(void* ptr)

- -

ovoid glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* data) const + +
ovoid glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* data) const

- -

ovoid setCompressedTexSubImage2DProc(void* ptr) + +
ovoid setCompressedTexSubImage2DProc(void* ptr)

- -

ovoid glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei type, const GLvoid* data) const + +
ovoid glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei type, const GLvoid* data) const

- -

ovoid setGetCompressedTexImageProc(void* ptr) + +
ovoid setGetCompressedTexImageProc(void* ptr)

- -

ovoid glGetCompressedTexImage(GLenum target, GLint level, GLvoid* data) const + +
ovoid glGetCompressedTexImage(GLenum target, GLint level, GLvoid* data) const

- +

o ~Extensions()

- +

obool _isMultiTexturingSupported

- +

obool _isTextureFilterAnisotropicSupported

- +

obool _isTextureCompressionARBSupported

- +

obool _isTextureCompressionS3TCSupported

- +

obool _isTextureMirroredRepeatSupported

- +

obool _isTextureEdgeClampSupported

- +

obool _isTextureBorderClampSupported

- +

obool _isGenerateMipMapSupported

- +

oGLint _maxTextureSize

- +

ovoid* _glCompressedTexImage2D

- +

ovoid* _glCompressedTexSubImage2D

- +

ovoid* _glGetCompressedTexImage

diff --git a/doc/doc++/osg/Extensions.4.html b/doc/doc++/osg/Extensions.4.html index c824db9fd..2ab795e22 100644 --- a/doc/doc++/osg/Extensions.4.html +++ b/doc/doc++/osg/Extensions.4.html @@ -23,63 +23,63 @@

Public Methods

-[more] Extensions() +[more] Extensions()
-[more] Extensions(const Extensions& rhs) +[more] Extensions(const Extensions& rhs)
-[more]void lowestCommonDenominator(const Extensions& rhs) +[more]void lowestCommonDenominator(const Extensions& rhs)
-[more]void setupGLExtenions() +[more]void setupGLExtenions()
-[more]void setTexture3DSupported(bool flag) +[more]void setTexture3DSupported(bool flag)
-[more]bool isTexture3DSupported() const +[more]bool isTexture3DSupported() const
-[more]void setTexture3DFast(bool flag) +[more]void setTexture3DFast(bool flag)
-[more]bool isTexture3DFast() const +[more]bool isTexture3DFast() const
-[more]void setMaxTexture3DSize(GLint maxsize) +[more]void setMaxTexture3DSize(GLint maxsize)
-[more]GLint maxTexture3DSize() const +[more]GLint maxTexture3DSize() const
-[more]void setTexImage3DProc(void* ptr) +[more]void setTexImage3DProc(void* ptr)
-[more]void glTexImage3D( GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels) const +[more]void glTexImage3D( GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels) const
-[more]void setTexSubImage3DProc(void* ptr) +[more]void setTexSubImage3DProc(void* ptr)
-[more]void glTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels) const +[more]void glTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels) const
-[more]void setCopyTexSubImage3DProc(void* ptr) +[more]void setCopyTexSubImage3DProc(void* ptr)
-[more]void glCopyTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height ) const +[more]void glCopyTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height ) const
-[more]void setBuild3DMipmapsProc(void* ptr) +[more]void setBuild3DMipmapsProc(void* ptr)
-[more]void gluBuild3DMipmaps( GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* data) const +[more]void gluBuild3DMipmaps( GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* data) const

Protected Fields

-[more]bool _isTexture3DSupported +[more]bool _isTexture3DSupported
-[more]bool _isTexture3DFast +[more]bool _isTexture3DFast
-[more]GLint _maxTexture3DSize +[more]GLint _maxTexture3DSize
-[more]void* _glTexImage3D +[more]void* _glTexImage3D
-[more]void* _glTexSubImage3D +[more]void* _glTexSubImage3D
-[more]void* _glCopyTexSubImage3D +[more]void* _glCopyTexSubImage3D
-[more]void* _gluBuild3DMipmaps +[more]void* _gluBuild3DMipmaps

Protected Methods

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

@@ -118,107 +118,107 @@ check for the extensions or use the associated functions
- +
o Extensions()

- -

o Extensions(const Extensions& rhs) + +
o Extensions(const Extensions& rhs)

- +

ovoid lowestCommonDenominator(const Extensions& rhs)

- +

ovoid setupGLExtenions()

- +

ovoid setTexture3DSupported(bool flag)

- +

obool isTexture3DSupported() const

- +

ovoid setTexture3DFast(bool flag)

- +

obool isTexture3DFast() const

- +

ovoid setMaxTexture3DSize(GLint maxsize)

- +

oGLint maxTexture3DSize() const

- -

ovoid setTexImage3DProc(void* ptr) + +
ovoid setTexImage3DProc(void* ptr)

- -

ovoid glTexImage3D( GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels) const + +
ovoid glTexImage3D( GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels) const

- -

ovoid setTexSubImage3DProc(void* ptr) + +
ovoid setTexSubImage3DProc(void* ptr)

- -

ovoid glTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels) const + +
ovoid glTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels) const

- -

ovoid setCopyTexSubImage3DProc(void* ptr) + +
ovoid setCopyTexSubImage3DProc(void* ptr)

- -

ovoid glCopyTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height ) const + +
ovoid glCopyTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height ) const

- -

ovoid setBuild3DMipmapsProc(void* ptr) + +
ovoid setBuild3DMipmapsProc(void* ptr)

- -

ovoid gluBuild3DMipmaps( GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* data) const + +
ovoid gluBuild3DMipmaps( GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* data) const

- +

o ~Extensions()

- +

obool _isTexture3DSupported

- +

obool _isTexture3DFast

- +

oGLint _maxTexture3DSize

- +

ovoid* _glTexImage3D

- +

ovoid* _glTexSubImage3D

- +

ovoid* _glCopyTexSubImage3D

- +

ovoid* _gluBuild3DMipmaps

diff --git a/doc/doc++/osg/Extensions.5.html b/doc/doc++/osg/Extensions.5.html index 4f14a6c79..a508b28e6 100644 --- a/doc/doc++/osg/Extensions.5.html +++ b/doc/doc++/osg/Extensions.5.html @@ -23,27 +23,27 @@

Public Methods

-[more] Extensions() +[more] Extensions()
-[more] Extensions(const Extensions& rhs) +[more] Extensions(const Extensions& rhs)
-[more]void lowestCommonDenominator(const Extensions& rhs) +[more]void lowestCommonDenominator(const Extensions& rhs)
-[more]void setupGLExtenions() +[more]void setupGLExtenions()
-[more]void setCubeMapSupported(bool flag) +[more]void setCubeMapSupported(bool flag)
-[more]bool isCubeMapSupported() const +[more]bool isCubeMapSupported() const

Protected Fields

-[more]bool _isCubeMapSupported +[more]bool _isCubeMapSupported

Protected Methods

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

@@ -82,35 +82,35 @@ check for the extensions or use the associated functions
- +
o Extensions()

- -

o Extensions(const Extensions& rhs) + +
o Extensions(const Extensions& rhs)

- +

ovoid lowestCommonDenominator(const Extensions& rhs)

- +

ovoid setupGLExtenions()

- +

ovoid setCubeMapSupported(bool flag)

- +

obool isCubeMapSupported() const

- +

o ~Extensions()

- +

obool _isCubeMapSupported

diff --git a/doc/doc++/osg/Extensions.6.html b/doc/doc++/osg/Extensions.6.html index d1eb0687b..bd60da821 100644 --- a/doc/doc++/osg/Extensions.6.html +++ b/doc/doc++/osg/Extensions.6.html @@ -23,47 +23,47 @@

Public Methods

-[more] Extensions() +[more] Extensions()
-[more] Extensions(const Extensions& rhs) +[more] Extensions(const Extensions& rhs)
-[more]void lowestCommonDenominator(const Extensions& rhs) +[more]void lowestCommonDenominator(const Extensions& rhs)
-[more]void setupGLExtenions() +[more]void setupGLExtenions()
-[more]void setVertexProgramSupported(bool flag) +[more]void setVertexProgramSupported(bool flag)
-[more]bool isVertexProgramSupported() const +[more]bool isVertexProgramSupported() const
-[more]void glBindProgram(GLenum target, GLuint id) const +[more]void glBindProgram(GLenum target, GLuint id) const
-[more]void glGenPrograms(GLsizei n, GLuint* programs) const +[more]void glGenPrograms(GLsizei n, GLuint* programs) const
-[more]void glDeletePrograms(GLsizei n, GLuint* programs) const +[more]void glDeletePrograms(GLsizei n, GLuint* programs) const
-[more]void glProgramString(GLenum target, GLenum format, GLsizei len, const void* string) const +[more]void glProgramString(GLenum target, GLenum format, GLsizei len, const void* string) const
-[more]void glProgramLocalParameter4fv(GLenum target, GLuint index, const GLfloat* params) const +[more]void glProgramLocalParameter4fv(GLenum target, GLuint index, const GLfloat* params) const

Protected Fields

-[more]bool _isVertexProgramSupported +[more]bool _isVertexProgramSupported
-[more]void* _glBindProgram +[more]void* _glBindProgram
-[more]void* _glGenPrograms +[more]void* _glGenPrograms
-[more]void* _glDeletePrograms +[more]void* _glDeletePrograms
-[more]void* _glProgramString +[more]void* _glProgramString
-[more]void* _glProgramLocalParameter4fv +[more]void* _glProgramLocalParameter4fv

Protected Methods

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

@@ -102,75 +102,75 @@ check for the extensions or use the associated functions
- +
o Extensions()

- -

o Extensions(const Extensions& rhs) + +
o Extensions(const Extensions& rhs)

- +

ovoid lowestCommonDenominator(const Extensions& rhs)

- +

ovoid setupGLExtenions()

- +

ovoid setVertexProgramSupported(bool flag)

- +

obool isVertexProgramSupported() const

- +

ovoid glBindProgram(GLenum target, GLuint id) const

- +

ovoid glGenPrograms(GLsizei n, GLuint* programs) const

- +

ovoid glDeletePrograms(GLsizei n, GLuint* programs) const

- +

ovoid glProgramString(GLenum target, GLenum format, GLsizei len, const void* string) const

- +

ovoid glProgramLocalParameter4fv(GLenum target, GLuint index, const GLfloat* params) const

- +

o ~Extensions()

- +

obool _isVertexProgramSupported

- +

ovoid* _glBindProgram

- +

ovoid* _glGenPrograms

- +

ovoid* _glDeletePrograms

- +

ovoid* _glProgramString

- +

ovoid* _glProgramLocalParameter4fv

diff --git a/doc/doc++/osg/Extensions.html b/doc/doc++/osg/Extensions.html index 65a8ea163..debf4d854 100644 --- a/doc/doc++/osg/Extensions.html +++ b/doc/doc++/osg/Extensions.html @@ -47,125 +47,173 @@
[more]bool isMultiTexSupported() const
-[more]void glSecondaryColor3ubv(const GLubyte* coord) const +[more]void setOcclusionQuerySupported(bool flag)
-[more]void glSecondaryColor3fv(const GLfloat* coord) const +[more]bool isOcclusionQuerySupported() const
-[more]void glFogCoordfv(const GLfloat* coord) const +[more]void glSecondaryColor3ubv(const GLubyte* coord) const
-[more]void glMultiTexCoord1f(GLenum target, GLfloat coord) const +[more]void glSecondaryColor3fv(const GLfloat* coord) const
-[more]void glMultiTexCoord2fv(GLenum target, const GLfloat* coord) const +[more]void glFogCoordfv(const GLfloat* coord) const
-[more]void glMultiTexCoord3fv(GLenum target, const GLfloat* coord) const +[more]void glMultiTexCoord1f(GLenum target, GLfloat coord) const
-[more]void glMultiTexCoord4fv(GLenum target, const GLfloat* coord) const +[more]void glMultiTexCoord2fv(GLenum target, const GLfloat* coord) const
-[more]void glVertexAttrib1s(unsigned int index, GLshort s) const +[more]void glMultiTexCoord3fv(GLenum target, const GLfloat* coord) const
-[more]void glVertexAttrib1f(unsigned int index, GLfloat f) const +[more]void glMultiTexCoord4fv(GLenum target, const GLfloat* coord) const
-[more]void glVertexAttrib2fv(unsigned int index, const GLfloat* v) const +[more]void glVertexAttrib1s(unsigned int index, GLshort s) const
-[more]void glVertexAttrib3fv(unsigned int index, const GLfloat* v) const +[more]void glVertexAttrib1f(unsigned int index, GLfloat f) const
-[more]void glVertexAttrib4fv(unsigned int index, const GLfloat* v) const +[more]void glVertexAttrib2fv(unsigned int index, const GLfloat* v) const
-[more]void glVertexAttrib4ubv(unsigned int index, const GLubyte* v) const +[more]void glVertexAttrib3fv(unsigned int index, const GLfloat* v) const
-[more]void glVertexAttrib4Nubv(unsigned int index, const GLubyte* v) const +[more]void glVertexAttrib4fv(unsigned int index, const GLfloat* v) const
-[more]void glGenBuffers(GLsizei n, GLuint* buffers) const +[more]void glVertexAttrib4ubv(unsigned int index, const GLubyte* v) const
-[more]void glBindBuffer(GLenum target, GLuint buffer) const +[more]void glVertexAttrib4Nubv(unsigned int index, const GLubyte* v) const
-[more]void glBufferData(GLenum target, GLsizeiptrARB size, const GLvoid* data, GLenum usage) const +[more]void glGenBuffers(GLsizei n, GLuint* buffers) const
-[more]void glBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid* data) const +[more]void glBindBuffer(GLenum target, GLuint buffer) const
-[more]void glDeleteBuffers(GLsizei n, const GLuint* buffers) const +[more]void glBufferData(GLenum target, GLsizeiptrARB size, const GLvoid* data, GLenum usage) const +
+[more]void glBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid* data) const +
+[more]void glDeleteBuffers(GLsizei n, const GLuint* buffers) const +
+[more]void glGenOcclusionQueries( GLsizei n, GLuint* ids ) const +
+[more]void glDeleteOcclusionQueries( GLsizei n, const GLuint* ids ) const +
+[more]GLboolean glIsOcclusionQuery( GLuint id ) const +
+[more]void glBeginOcclusionQuery( GLuint id ) const +
+[more]void glEndOcclusionQuery() const +
+[more]void glGetOcclusionQueryiv( GLuint id, GLenum pname, GLint* params ) const +
+[more]void glGetOcclusionQueryuiv( GLuint id, GLenum pname, GLuint* params ) const

Protected Fields

-[more]bool _isVertexProgramSupported +[more]bool _isVertexProgramSupported
-[more]bool _isSecondaryColorSupported +[more]bool _isSecondaryColorSupported
-[more]bool _isFogCoordSupported +[more]bool _isFogCoordSupported
-[more]bool _isMultiTexSupported +[more]bool _isMultiTexSupported
-[more]FogCoordProc _glFogCoordfv +[more]bool _isOcclusionQuerySupported
-[more]SecondaryColor3ubvProc _glSecondaryColor3ubv +[more]FogCoordProc _glFogCoordfv
-[more]SecondaryColor3fvProc _glSecondaryColor3fv +[more]SecondaryColor3ubvProc _glSecondaryColor3ubv
-[more]VertexAttrib1sProc _glVertexAttrib1s +[more]SecondaryColor3fvProc _glSecondaryColor3fv
-[more]VertexAttrib1fProc _glVertexAttrib1f +[more]VertexAttrib1sProc _glVertexAttrib1s
-[more]VertexAttribfvProc _glVertexAttrib2fv +[more]VertexAttrib1fProc _glVertexAttrib1f
-[more]VertexAttribfvProc _glVertexAttrib3fv +[more]VertexAttribfvProc _glVertexAttrib2fv
-[more]VertexAttribfvProc _glVertexAttrib4fv +[more]VertexAttribfvProc _glVertexAttrib3fv
-[more]VertexAttribubvProc _glVertexAttrib4ubv +[more]VertexAttribfvProc _glVertexAttrib4fv
-[more]VertexAttribubvProc _glVertexAttrib4Nubv +[more]VertexAttribubvProc _glVertexAttrib4ubv
-[more]MultiTexCoord1fProc _glMultiTexCoord1f +[more]VertexAttribubvProc _glVertexAttrib4Nubv
-[more]MultiTexCoordfvProc _glMultiTexCoord2fv +[more]MultiTexCoord1fProc _glMultiTexCoord1f
-[more]MultiTexCoordfvProc _glMultiTexCoord3fv +[more]MultiTexCoordfvProc _glMultiTexCoord2fv
-[more]MultiTexCoordfvProc _glMultiTexCoord4fv +[more]MultiTexCoordfvProc _glMultiTexCoord3fv
-[more]GenBuffersProc _glGenBuffers +[more]MultiTexCoordfvProc _glMultiTexCoord4fv
-[more]BindBufferProc _glBindBuffer +[more]GenBuffersProc _glGenBuffers
-[more]BufferDataProc _glBufferData +[more]BindBufferProc _glBindBuffer
-[more]BufferSubDataProc _glBufferSubData +[more]BufferDataProc _glBufferData
-[more]DeleteBuffersProc _glDeleteBuffers +[more]BufferSubDataProc _glBufferSubData +
+[more]DeleteBuffersProc _glDeleteBuffers +
+[more]GenOcclusionQueriesProc _glGenOcclusionQueries +
+[more]DeleteOcclusionQueriesProc _glDeleteOcclusionQueries +
+[more]IsOcclusionQueryProc _glIsOcclusionQuery +
+[more]BeginOcclusionQueryProc _glBeginOcclusionQuery +
+[more]EndOcclusionQueryProc _glEndOcclusionQuery +
+[more]GetOcclusionQueryivProc _glGetOcclusionQueryiv +
+[more]GetOcclusionQueryuivProc _glGetOcclusionQueryuiv

Protected Methods

-[more]typedef void (APIENTRY * FogCoordProc)(const GLfloat* coord) +[more]typedef void (APIENTRY * FogCoordProc)(const GLfloat* coord)
-[more]typedef void (APIENTRY * VertexAttrib1sProc)(unsigned int index, GLshort s) +[more]typedef void (APIENTRY * VertexAttrib1sProc)(unsigned int index, GLshort s)
-[more]typedef void (APIENTRY * VertexAttrib1fProc)(unsigned int index, GLfloat f) +[more]typedef void (APIENTRY * VertexAttrib1fProc)(unsigned int index, GLfloat f)
-[more]typedef void (APIENTRY * VertexAttribfvProc)(unsigned int index, const GLfloat* v) +[more]typedef void (APIENTRY * VertexAttribfvProc)(unsigned int index, const GLfloat* v)
-[more]typedef void (APIENTRY * VertexAttribubvProc)(unsigned int index, const GLubyte* v) +[more]typedef void (APIENTRY * VertexAttribubvProc)(unsigned int index, const GLubyte* v)
-[more]typedef void (APIENTRY * SecondaryColor3ubvProc)(const GLubyte* coord) +[more]typedef void (APIENTRY * SecondaryColor3ubvProc)(const GLubyte* coord)
-[more]typedef void (APIENTRY * SecondaryColor3fvProc)(const GLfloat* coord) +[more]typedef void (APIENTRY * SecondaryColor3fvProc)(const GLfloat* coord)
-[more]typedef void (APIENTRY * MultiTexCoord1fProc)(GLenum target, GLfloat coord) +[more]typedef void (APIENTRY * MultiTexCoord1fProc)(GLenum target, GLfloat coord)
-[more]typedef void (APIENTRY * MultiTexCoordfvProc)(GLenum target, const GLfloat* coord) +[more]typedef void (APIENTRY * MultiTexCoordfvProc)(GLenum target, const GLfloat* coord)
-[more]typedef void (APIENTRY * GenBuffersProc)(GLsizei n, GLuint* buffers) +[more]typedef void (APIENTRY * GenBuffersProc)(GLsizei n, GLuint* buffers)
-[more]typedef void (APIENTRY * BindBufferProc)(GLenum target, GLuint buffer) +[more]typedef void (APIENTRY * BindBufferProc)(GLenum target, GLuint buffer)
-[more]typedef void (APIENTRY * BufferDataProc)(GLenum target, GLsizeiptrARB size, const GLvoid* data, GLenum usage) +[more]typedef void (APIENTRY * BufferDataProc)(GLenum target, GLsizeiptrARB size, const GLvoid* data, GLenum usage)
-[more]typedef void (APIENTRY * BufferSubDataProc)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid* data) +[more]typedef void (APIENTRY * BufferSubDataProc)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid* data)
-[more]typedef void (APIENTRY * DeleteBuffersProc)(GLsizei n, const GLuint* buffers) +[more]typedef void (APIENTRY * DeleteBuffersProc)(GLsizei n, const GLuint* buffers)
-[more] ~Extensions() +[more]typedef void (APIENTRY * GenOcclusionQueriesProc)( GLsizei n, GLuint* ids ) +
+[more]typedef void (APIENTRY * DeleteOcclusionQueriesProc)( GLsizei n, const GLuint* ids ) +
+[more]typedef GLboolean (APIENTRY * IsOcclusionQueryProc)( GLuint id ) +
+[more]typedef void (APIENTRY * BeginOcclusionQueryProc)( GLuint id ) +
+[more]typedef void (APIENTRY * EndOcclusionQueryProc)() +
+[more]typedef void (APIENTRY * GetOcclusionQueryivProc)( GLuint id, GLenum pname, GLint* params ) +
+[more]typedef void (APIENTRY * GetOcclusionQueryuivProc)( GLuint id, GLenum pname, GLuint* params ) +
+[more] ~Extensions()

@@ -251,233 +299,329 @@ check for the extensions or use the associated functions
obool isMultiTexSupported() const

- + +

ovoid setOcclusionQuerySupported(bool flag) +

+ + +

obool isOcclusionQuerySupported() const +

+ +

ovoid glSecondaryColor3ubv(const GLubyte* coord) const

- +

ovoid glSecondaryColor3fv(const GLfloat* coord) const

- +

ovoid glFogCoordfv(const GLfloat* coord) const

- +

ovoid glMultiTexCoord1f(GLenum target, GLfloat coord) const

- +

ovoid glMultiTexCoord2fv(GLenum target, const GLfloat* coord) const

- +

ovoid glMultiTexCoord3fv(GLenum target, const GLfloat* coord) const

- +

ovoid glMultiTexCoord4fv(GLenum target, const GLfloat* coord) const

- -

ovoid glVertexAttrib1s(unsigned int index, GLshort s) const + +
ovoid glVertexAttrib1s(unsigned int index, GLshort s) const

- +

ovoid glVertexAttrib1f(unsigned int index, GLfloat f) const

- +

ovoid glVertexAttrib2fv(unsigned int index, const GLfloat* v) const

- +

ovoid glVertexAttrib3fv(unsigned int index, const GLfloat* v) const

- +

ovoid glVertexAttrib4fv(unsigned int index, const GLfloat* v) const

- +

ovoid glVertexAttrib4ubv(unsigned int index, const GLubyte* v) const

- +

ovoid glVertexAttrib4Nubv(unsigned int index, const GLubyte* v) const

- +

ovoid glGenBuffers(GLsizei n, GLuint* buffers) const

- +

ovoid glBindBuffer(GLenum target, GLuint buffer) const

- -

ovoid glBufferData(GLenum target, GLsizeiptrARB size, const GLvoid* data, GLenum usage) const + +
ovoid glBufferData(GLenum target, GLsizeiptrARB size, const GLvoid* data, GLenum usage) const

- -

ovoid glBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid* data) const + +
ovoid glBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid* data) const

- +

ovoid glDeleteBuffers(GLsizei n, const GLuint* buffers) const

+ + +

ovoid glGenOcclusionQueries( GLsizei n, GLuint* ids ) const +

+ + +

ovoid glDeleteOcclusionQueries( GLsizei n, const GLuint* ids ) const +

+ + +

oGLboolean glIsOcclusionQuery( GLuint id ) const +

+ + +

ovoid glBeginOcclusionQuery( GLuint id ) const +

+ + +

ovoid glEndOcclusionQuery() const +

+ + +

ovoid glGetOcclusionQueryiv( GLuint id, GLenum pname, GLint* params ) const +

+ + +

ovoid glGetOcclusionQueryuiv( GLuint id, GLenum pname, GLuint* params ) const +

- +

otypedef void (APIENTRY * FogCoordProc)(const GLfloat* coord)

- -

otypedef void (APIENTRY * VertexAttrib1sProc)(unsigned int index, GLshort s) + +
otypedef void (APIENTRY * VertexAttrib1sProc)(unsigned int index, GLshort s)

- +

otypedef void (APIENTRY * VertexAttrib1fProc)(unsigned int index, GLfloat f)

- +

otypedef void (APIENTRY * VertexAttribfvProc)(unsigned int index, const GLfloat* v)

- +

otypedef void (APIENTRY * VertexAttribubvProc)(unsigned int index, const GLubyte* v)

- +

otypedef void (APIENTRY * SecondaryColor3ubvProc)(const GLubyte* coord)

- +

otypedef void (APIENTRY * SecondaryColor3fvProc)(const GLfloat* coord)

- +

otypedef void (APIENTRY * MultiTexCoord1fProc)(GLenum target, GLfloat coord)

- +

otypedef void (APIENTRY * MultiTexCoordfvProc)(GLenum target, const GLfloat* coord)

- +

otypedef void (APIENTRY * GenBuffersProc)(GLsizei n, GLuint* buffers)

- +

otypedef void (APIENTRY * BindBufferProc)(GLenum target, GLuint buffer)

- -

otypedef void (APIENTRY * BufferDataProc)(GLenum target, GLsizeiptrARB size, const GLvoid* data, GLenum usage) + +
otypedef void (APIENTRY * BufferDataProc)(GLenum target, GLsizeiptrARB size, const GLvoid* data, GLenum usage)

- -

otypedef void (APIENTRY * BufferSubDataProc)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid* data) + +
otypedef void (APIENTRY * BufferSubDataProc)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid* data)

- +

otypedef void (APIENTRY * DeleteBuffersProc)(GLsizei n, const GLuint* buffers)

+ + +

otypedef void (APIENTRY * GenOcclusionQueriesProc)( GLsizei n, GLuint* ids ) +

+ + +

otypedef void (APIENTRY * DeleteOcclusionQueriesProc)( GLsizei n, const GLuint* ids ) +

+ + +

otypedef GLboolean (APIENTRY * IsOcclusionQueryProc)( GLuint id ) +

+ + +

otypedef void (APIENTRY * BeginOcclusionQueryProc)( GLuint id ) +

+ + +

otypedef void (APIENTRY * EndOcclusionQueryProc)() +

+ + +

otypedef void (APIENTRY * GetOcclusionQueryivProc)( GLuint id, GLenum pname, GLint* params ) +

+ + +

otypedef void (APIENTRY * GetOcclusionQueryuivProc)( GLuint id, GLenum pname, GLuint* params ) +

- +

o ~Extensions()

- +

obool _isVertexProgramSupported

- +

obool _isSecondaryColorSupported

- +

obool _isFogCoordSupported

- +

obool _isMultiTexSupported

+ + +

obool _isOcclusionQuerySupported +

- +

oFogCoordProc _glFogCoordfv

- +

oSecondaryColor3ubvProc _glSecondaryColor3ubv

- +

oSecondaryColor3fvProc _glSecondaryColor3fv

- +

oVertexAttrib1sProc _glVertexAttrib1s

- +

oVertexAttrib1fProc _glVertexAttrib1f

- +

oVertexAttribfvProc _glVertexAttrib2fv

- +

oVertexAttribfvProc _glVertexAttrib3fv

- +

oVertexAttribfvProc _glVertexAttrib4fv

- +

oVertexAttribubvProc _glVertexAttrib4ubv

- +

oVertexAttribubvProc _glVertexAttrib4Nubv

- +

oMultiTexCoord1fProc _glMultiTexCoord1f

- +

oMultiTexCoordfvProc _glMultiTexCoord2fv

- +

oMultiTexCoordfvProc _glMultiTexCoord3fv

- +

oMultiTexCoordfvProc _glMultiTexCoord4fv

- +

oGenBuffersProc _glGenBuffers

- +

oBindBufferProc _glBindBuffer

- +

oBufferDataProc _glBufferData

- +

oBufferSubDataProc _glBufferSubData

- +

oDeleteBuffersProc _glDeleteBuffers +

+ + +

oGenOcclusionQueriesProc _glGenOcclusionQueries +

+ + +

oDeleteOcclusionQueriesProc _glDeleteOcclusionQueries +

+ + +

oIsOcclusionQueryProc _glIsOcclusionQuery +

+ + +

oBeginOcclusionQueryProc _glBeginOcclusionQuery +

+ + +

oEndOcclusionQueryProc _glEndOcclusionQuery +

+ + +

oGetOcclusionQueryivProc _glGetOcclusionQueryiv +

+ + +

oGetOcclusionQueryuivProc _glGetOcclusionQueryuiv

This class has no child classes.
diff --git a/doc/doc++/osg/Fog.html b/doc/doc++/osg/Fog.html index 6d7dd0292..258282c37 100644 --- a/doc/doc++/osg/Fog.html +++ b/doc/doc++/osg/Fog.html @@ -28,12 +28,12 @@ [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
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( Mode mode )
@@ -43,11 +43,11 @@
[more]inline float getDensity() const
-[more]inline void setStart( float start ) +[more]inline void setStart( float start )
[more]inline float getStart() const
-[more]inline void setEnd( float end ) +[more]inline void setEnd( float end )
[more]inline float getEnd() const
@@ -104,7 +104,7 @@
ovirtual const char* className() const
-ovirtual Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -137,9 +137,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -204,7 +204,7 @@

-

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

@@ -213,7 +213,7 @@

-

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

@@ -251,7 +251,7 @@

-

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

@@ -259,7 +259,7 @@

-

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

diff --git a/doc/doc++/osg/FragmentProgram.html b/doc/doc++/osg/FragmentProgram.html index 43b3cebc7..de65b3146 100644 --- a/doc/doc++/osg/FragmentProgram.html +++ b/doc/doc++/osg/FragmentProgram.html @@ -28,12 +28,12 @@ [more] FragmentProgram(const FragmentProgram& vp, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

Copy constructor using CopyOp to manage deep vs shallow copy
-[more] META_StateAttribute(osg, FragmentProgram, FRAGMENTPROGRAM) +[more] META_StateAttribute(osg, FragmentProgram, FRAGMENTPROGRAM)
[more]virtual int compare(const osg::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 GLuint& getFragmentProgramID(unsigned int contextID) const
Get the handle to the fragment program id for the current context @@ -50,7 +50,7 @@ [more]inline void setProgramLocalParameter(const GLuint index, const Vec4& p)
Program Parameters
-[more]inline void setMatrix(const GLenum mode, const Matrix& matrix) +[more]inline void setMatrix(const GLenum mode, const Matrix& matrix)
Matrix
[more]void dirtyFragmentProgramObject() @@ -101,7 +101,7 @@ class SG_EXPORT Extensions: public <
[more]typedef std::map<GLuint,Vec4> LocalParamList
-[more]typedef std::map<GLenum,Matrix> MatrixList +[more]typedef std::map<GLenum,Matrix> MatrixList

@@ -119,7 +119,7 @@ class SG_EXPORT Extensions: public <
ovirtual const char* className() const
-ovirtual Type getType() const +ovirtual Type getType() const
ovirtual bool isTextureAttribute() const
@@ -150,9 +150,9 @@ class SG_EXPORT Extensions: public <

Public Methods

-oinline void setDataVariance(DataVariance dv) +oinline void setDataVariance(DataVariance dv)
-oinline DataVariance getDataVariance() const +oinline DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -168,7 +168,7 @@ class SG_EXPORT Extensions: public <

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -217,7 +217,7 @@ class SG_EXPORT Extensions: public <

-

o META_StateAttribute(osg, FragmentProgram, FRAGMENTPROGRAM) +
o META_StateAttribute(osg, FragmentProgram, FRAGMENTPROGRAM)

@@ -226,7 +226,7 @@ class SG_EXPORT Extensions: public <

-

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

@@ -255,7 +255,7 @@ class SG_EXPORT Extensions: public <

-

oinline void setMatrix(const GLenum mode, const Matrix& matrix) +
oinline void setMatrix(const GLenum mode, const Matrix& matrix)
Matrix

@@ -328,7 +328,7 @@ but need to ensure that they all use the same low common denominator extensions.

-

otypedef std::map<GLenum,Matrix> MatrixList +
otypedef std::map<GLenum,Matrix> MatrixList

diff --git a/doc/doc++/osg/FrontFace.html b/doc/doc++/osg/FrontFace.html index 6e3ad2964..aacab74f5 100644 --- a/doc/doc++/osg/FrontFace.html +++ b/doc/doc++/osg/FrontFace.html @@ -28,7 +28,7 @@ [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
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs @@ -70,7 +70,7 @@
ovirtual const char* className() const
-ovirtual 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(DataVariance dv) +oinline void setDataVariance(DataVariance dv)
-oinline DataVariance getDataVariance() const +oinline DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -123,7 +123,7 @@

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

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

-

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

diff --git a/doc/doc++/osg/General.html b/doc/doc++/osg/General.html index fdf0b055a..430edca89 100644 --- a/doc/doc++/osg/General.html +++ b/doc/doc++/osg/General.html @@ -196,8 +196,17 @@ oifdefined(__CYGWIN__) (__MINGW32__)(dllimport)

-o#define -OSG_GLEXTENSIONS
+odefine _WCHAR_T_DEFINED endif ifndef __gl_h_inline endif void +glLoadMatrix(const float* mat)
+ +oinline void +glLoadMatrix(const double* mat)
+ +oinline void +glMultMatrix(const float* mat)
+ +oinline void +glMultMatrix(const double* mat)
o#define WIN32_LEAN_AND_MEAN
@@ -259,6 +268,12 @@ o#define OSG_MATRIXTRANSFORM
+o#define +OSG_MATRIXD
+ +o#define +OSG_MATRIXF
+ o#define OSG_NODE
diff --git a/doc/doc++/osg/Geode.html b/doc/doc++/osg/Geode.html index caf6ae65f..34f751940 100644 --- a/doc/doc++/osg/Geode.html +++ b/doc/doc++/osg/Geode.html @@ -23,62 +23,62 @@

Public Methods

-[more] 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 bool addDrawable( Drawable* drawable ) +[more]virtual bool addDrawable( Drawable* drawable )
Add Drawable to Geode.
-[more]virtual bool removeDrawable( Drawable* drawable ) +[more]virtual bool removeDrawable( Drawable* drawable )
Remove Drawable from Geode.
-[more]virtual bool removeDrawable(unsigned int i, unsigned int numDrawablesToRemove=1) +[more]virtual bool removeDrawable(unsigned int i, unsigned int numDrawablesToRemove=1)
Remove drawable(s) from the specified position in Geode's drawable list
-[more]virtual bool replaceDrawable( Drawable* origDraw, Drawable* newDraw ) +[more]virtual bool replaceDrawable( Drawable* origDraw, Drawable* newDraw )
Replace specified Drawable with another Drawable.
-[more]virtual bool setDrawable( unsigned int i, Drawable* drawable ) +[more]virtual bool setDrawable( unsigned int i, Drawable* drawable )
set drawable at position i.
-[more]inline unsigned int getNumDrawables() const +[more]inline unsigned int getNumDrawables() const
return the number of drawable's
-[more]inline Drawable* getDrawable( unsigned int i ) +[more]inline Drawable* getDrawable( unsigned int i )
return drawable at position i
-[more]inline const Drawable* getDrawable( unsigned int i ) const +[more]inline const Drawable* getDrawable( unsigned int i ) const
return drawable at position i
-[more]inline bool containsDrawable(const Drawable* gset) const +[more]inline bool containsDrawable(const Drawable* gset) const
return true if drawable is contained within Geode
-[more]inline unsigned int getDrawableIndex( const Drawable* node ) const +[more]inline unsigned int getDrawableIndex( const Drawable* node ) const
Get the index number of drawable, return a value between 0 and _drawablessize()-1 if found, if not found then return _drawablessize()
-[more]void compileDrawables(State& state) +[more]void compileDrawables(State& state)
compile OpenGL Display List for each drawable

Public Members

-[more]typedef std::vector< ref_ptr<Drawable> > DrawableList +[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 bool computeBound() const +[more]virtual bool computeBound() const

@@ -110,15 +110,15 @@
ovirtual void traverse(NodeVisitor& )
-oinline void setName( const std::string& name ) +oinline void setName( const std::string& name )
-oinline void setName( const char* name ) +oinline void setName( const char* name )
oinline const std::string& getName() const
-oinline const ParentList& getParents() const +oinline const ParentList& getParents() const
-oinline ParentList getParents() +oinline ParentList getParents()
oinline Group* getParent(unsigned int i)
@@ -152,13 +152,13 @@
obool containsOccluderNodes() const
-oinline void setNodeMask(NodeMask nm) +oinline void setNodeMask(NodeMask nm)
-oinline NodeMask getNodeMask() const +oinline NodeMask getNodeMask() const
-oinline const DescriptionList& getDescriptions() const +oinline const DescriptionList& getDescriptions() const
-oinline DescriptionList& getDescriptions() +oinline DescriptionList& getDescriptions()
oinline const std::string& getDescription(unsigned int i) const
@@ -198,7 +198,7 @@
ostd::string _name
-oParentList _parents +oParentList _parents
oref_ptr<NodeCallback> _updateCallback
@@ -212,9 +212,9 @@
ounsigned int _numChildrenWithOccluderNodes
-oNodeMask _nodeMask +oNodeMask _nodeMask
-oDescriptionList _descriptions +oDescriptionList _descriptions
oref_ptr<StateSet> _stateset

@@ -237,9 +237,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -294,24 +294,24 @@
- +
otypedef std::vector< ref_ptr<Drawable> > DrawableList

- +

o Geode()

- -

o Geode(const Geode&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
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 bool addDrawable( Drawable* drawable )
Add Drawable to Geode. If gset is not NULL and is not contained in Geode then increment its @@ -320,26 +320,26 @@ sphere to force it to recompute on next getBound() and return true for success. Otherwise return false.

- +

ovirtual bool removeDrawable( Drawable* drawable )
Remove Drawable from Geode. Equivalent to setDrawabke(getDrawableIndex(orignChild),node), see docs for setNode for futher details on implementation.

- +

ovirtual bool removeDrawable(unsigned int i, unsigned int numDrawablesToRemove=1)
Remove drawable(s) from the specified position in Geode's drawable list

- +

ovirtual bool replaceDrawable( Drawable* origDraw, Drawable* newDraw )
Replace specified Drawable with another Drawable. Equivalent to setDrawable(getDrawableIndex(orignChild),node), see docs for setDrawable for futher details on implementation.

- +

ovirtual bool setDrawable( unsigned int i, Drawable* drawable )
set drawable at position i. return true if set correctly, false on failure (if node==NULL || i is out of range). @@ -351,48 +351,48 @@ add newGset. If newGset is NULL then return false and do not remove origGset.

- +

oinline unsigned int getNumDrawables() const
return the number of drawable's

- +

oinline Drawable* getDrawable( unsigned int i )
return drawable at position i

- +

oinline const Drawable* getDrawable( unsigned int i ) const
return drawable at position i

- +

oinline bool containsDrawable(const Drawable* gset) const
return true if drawable is contained within Geode

- +

oinline unsigned int getDrawableIndex( const Drawable* node ) const
Get the index number of drawable, return a value between 0 and _drawablessize()-1 if found, if not found then return _drawablessize()

- +

ovoid compileDrawables(State& state)
compile OpenGL Display List for each drawable

- +

ovirtual ~Geode()

- +

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 240012423..82f7c0a28 100644 --- a/doc/doc++/osg/Geometry.html +++ b/doc/doc++/osg/Geometry.html @@ -22,310 +22,334 @@

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]virtual Geometry* asGeometry() +[more]virtual Geometry* asGeometry()
-[more]virtual const Geometry* asGeometry() const +[more]virtual const Geometry* asGeometry() const
-[more]void setVertexArray(Array* array) +[more]void setVertexArray(Array* array)
-[more]Array* getVertexArray() +[more]Array* getVertexArray()
-[more]const Array* getVertexArray() const +[more]const Array* getVertexArray() const
-[more]void setVertexIndices(IndexArray* array) +[more]void setVertexIndices(IndexArray* array)
-[more]IndexArray* getVertexIndices() +[more]IndexArray* getVertexIndices()
-[more]const IndexArray* getVertexIndices() const +[more]const IndexArray* getVertexIndices() const
-[more]void setNormalBinding(AttributeBinding ab) +[more]void setNormalBinding(AttributeBinding ab)
-[more]AttributeBinding getNormalBinding() const +[more]AttributeBinding getNormalBinding() const
-[more]void setNormalArray(Vec3Array* array) +[more]void setNormalArray(Vec3Array* array)
-[more]Vec3Array* getNormalArray() +[more]Vec3Array* getNormalArray()
-[more]const Vec3Array* getNormalArray() const +[more]const Vec3Array* getNormalArray() const
-[more]void setNormalIndices(IndexArray* array) +[more]void setNormalIndices(IndexArray* array)
-[more]IndexArray* getNormalIndices() +[more]IndexArray* getNormalIndices()
-[more]const IndexArray* getNormalIndices() const +[more]const IndexArray* getNormalIndices() const
-[more]void setColorBinding(AttributeBinding ab) +[more]void setColorBinding(AttributeBinding ab)
-[more]AttributeBinding getColorBinding() const +[more]AttributeBinding getColorBinding() const
-[more]void setColorArray(Array* array) +[more]void setColorArray(Array* array)
-[more]Array* getColorArray() +[more]Array* getColorArray()
-[more]const Array* getColorArray() const +[more]const Array* getColorArray() const
-[more]void setColorIndices(IndexArray* array) +[more]void setColorIndices(IndexArray* array)
-[more]IndexArray* getColorIndices() +[more]IndexArray* getColorIndices()
-[more]const IndexArray* getColorIndices() const +[more]const IndexArray* getColorIndices() const
-[more]void setSecondaryColorBinding(AttributeBinding ab) +[more]void setSecondaryColorBinding(AttributeBinding ab)
-[more]AttributeBinding getSecondaryColorBinding() const +[more]AttributeBinding getSecondaryColorBinding() const
-[more]void setSecondaryColorArray(Array* array) +[more]void setSecondaryColorArray(Array* array)
-[more]Array* getSecondaryColorArray() +[more]Array* getSecondaryColorArray()
-[more]const Array* getSecondaryColorArray() const +[more]const Array* getSecondaryColorArray() const
-[more]void setSecondaryColorIndices(IndexArray* array) +[more]void setSecondaryColorIndices(IndexArray* array)
-[more]IndexArray* getSecondaryColorIndices() +[more]IndexArray* getSecondaryColorIndices()
-[more]const IndexArray* getSecondaryColorIndices() const +[more]const IndexArray* getSecondaryColorIndices() const
-[more]void setFogCoordBinding(AttributeBinding ab) +[more]void setFogCoordBinding(AttributeBinding ab)
-[more]AttributeBinding getFogCoordBinding() const +[more]AttributeBinding getFogCoordBinding() const
-[more]void setFogCoordArray(Array* array) +[more]void setFogCoordArray(Array* array)
-[more]Array* getFogCoordArray() +[more]Array* getFogCoordArray()
-[more]const Array* getFogCoordArray() const +[more]const Array* getFogCoordArray() const
-[more]void setFogCoordIndices(IndexArray* array) +[more]void setFogCoordIndices(IndexArray* array)
-[more]IndexArray* getFogCoordIndices() +[more]IndexArray* getFogCoordIndices()
-[more]const IndexArray* getFogCoordIndices() const +[more]const IndexArray* getFogCoordIndices() const
-[more]void setTexCoordArray(unsigned int unit, Array*) +[more]void setTexCoordArray(unsigned int unit, Array*)
-[more]Array* getTexCoordArray(unsigned int unit) +[more]Array* getTexCoordArray(unsigned int unit)
-[more]const Array* getTexCoordArray(unsigned int unit) const +[more]const Array* getTexCoordArray(unsigned int unit) const
-[more]void setTexCoordIndices(unsigned int unit, IndexArray*) +[more]void setTexCoordIndices(unsigned int unit, IndexArray*)
-[more]IndexArray* getTexCoordIndices(unsigned int unit) +[more]IndexArray* getTexCoordIndices(unsigned int unit)
-[more]const IndexArray* getTexCoordIndices(unsigned int unit) const +[more]const IndexArray* getTexCoordIndices(unsigned int unit) const
-[more]unsigned int getNumTexCoordArrays() const +[more]unsigned int getNumTexCoordArrays() const
-[more]TexCoordArrayList& getTexCoordArrayList() +[more]TexCoordArrayList& getTexCoordArrayList()
-[more]const TexCoordArrayList& getTexCoordArrayList() const +[more]const TexCoordArrayList& getTexCoordArrayList() const
-[more]void setArray(AttributeType type, Array* array) +[more]void setArray(AttributeType type, Array* array)
-[more]Array* getArray(AttributeType type) +[more]Array* getArray(AttributeType type)
-[more]const Array* getArray(AttributeType type) const +[more]const Array* getArray(AttributeType type) const
-[more]void setIndices(AttributeType type, IndexArray* indices) +[more]void setIndices(AttributeType type, IndexArray* indices)
-[more]IndexArray* getIndices(AttributeType type) +[more]IndexArray* getIndices(AttributeType type)
-[more]const IndexArray* getIndices(AttributeType type) const +[more]const IndexArray* getIndices(AttributeType type) const
-[more]void setNormalize(AttributeType type, GLboolean normalize) +[more]void setNormalize(AttributeType type, GLboolean normalize)
-[more]GLboolean getNormalize(AttributeType type) const +[more]GLboolean getNormalize(AttributeType type) const
-[more]void setBinding(AttributeType type, AttributeBinding binding) +[more]void setBinding(AttributeType type, AttributeBinding binding)
-[more]AttributeBinding getBinding(AttributeType type) const +[more]AttributeBinding getBinding(AttributeType type) const
-[more]unsigned int getNumArrays() const +[more]unsigned int getNumArrays() const
-[more]AttributeData& getAttributeData(unsigned int type) +[more]AttributeData& getAttributeData(unsigned int type)
-[more]const AttributeData& getAttributeData(unsigned int type) const +[more]const AttributeData& getAttributeData(unsigned int type) const
-[more]void setAttributeList(AttributeList& al) +[more]void setAttributeList(AttributeList& al)
-[more]AttributeList& getAttributeList() +[more]AttributeList& getAttributeList()
-[more]const AttributeList& getAttributeList() const +[more]const AttributeList& getAttributeList() const
-[more]void setVertexAttribArray(unsigned int index, bool normalize, Array* array, AttributeBinding ab=BIND_OFF) +[more]void setVertexAttribArray(unsigned int index, GLboolean normalize, Array* array, AttributeBinding ab=BIND_OFF)
-[more]Array* getVertexAttribArray(unsigned int index) +[more]Array* getVertexAttribArray(unsigned int index)
-[more]const Array* getVertexAttribArray(unsigned int index) const +[more]const Array* getVertexAttribArray(unsigned int index) const
-[more]bool getVertexAttribNormalize(unsigned int index, GLboolean &ret) const +[more]bool getVertexAttribNormalize(unsigned int index, GLboolean &ret) const
-[more]bool getVertexAttribBinding(unsigned int index, AttributeBinding& ab) const +[more]bool getVertexAttribBinding(unsigned int index, AttributeBinding& ab) const
-[more]void setVertexAttribIndices(unsigned int index, IndexArray* array) +[more]void setVertexAttribIndices(unsigned int index, IndexArray* array)
-[more]IndexArray* getVertexAttribIndices(unsigned int index) +[more]IndexArray* getVertexAttribIndices(unsigned int index)
-[more]const IndexArray* getVertexAttribIndices(unsigned int index) const +[more]const IndexArray* getVertexAttribIndices(unsigned int index) const
-[more]unsigned int getNumVertexAttribArrays() const +[more]unsigned int getNumVertexAttribArrays() const
-[more]VertexAttribArrayList& getVertexAttribArrayList() +[more]VertexAttribArrayList& getVertexAttribArrayList()
-[more]const VertexAttribArrayList& getVertexAttribArrayList() const +[more]const VertexAttribArrayList& getVertexAttribArrayList() const
-[more]void setPrimitiveSetList(const PrimitiveSetList& primitives) +[more]void setPrimitiveSetList(const PrimitiveSetList& primitives)
-[more]PrimitiveSetList& getPrimitiveSetList() +[more]PrimitiveSetList& getPrimitiveSetList()
-[more]const PrimitiveSetList& getPrimitiveSetList() const +[more]const PrimitiveSetList& getPrimitiveSetList() const
-[more]unsigned int getNumPrimitiveSets() const +[more]unsigned int getNumPrimitiveSets() const
-[more]PrimitiveSet* getPrimitiveSet(unsigned int pos) +[more]PrimitiveSet* getPrimitiveSet(unsigned int pos)
-[more]const PrimitiveSet* getPrimitiveSet(unsigned int pos) const +[more]const PrimitiveSet* getPrimitiveSet(unsigned int pos) const
-[more]bool addPrimitiveSet(PrimitiveSet* primitiveset) +[more]bool addPrimitiveSet(PrimitiveSet* primitiveset)
Add a primitive set to the geometry
-[more]bool setPrimitiveSet(unsigned int i, PrimitiveSet* primitiveset) +[more]bool setPrimitiveSet(unsigned int i, PrimitiveSet* primitiveset)
Set a primitive set to the specified position in geometry's primitive set list
-[more]bool insertPrimitiveSet(unsigned int i, PrimitiveSet* primitiveset) +[more]bool insertPrimitiveSet(unsigned int i, PrimitiveSet* primitiveset)
Insert a primitive set to the specified position in geometry's primitive set list
-[more]bool removePrimitiveSet(unsigned int i, unsigned int numElementsToRemove=1) +[more]bool removePrimitiveSet(unsigned int i, unsigned int numElementsToRemove=1)
Remove primitive set(s) from the specified position in geometry's primitive set list
-[more]unsigned int getPrimitiveSetIndex(const PrimitiveSet* primitiveset) const +[more]unsigned int getPrimitiveSetIndex(const PrimitiveSet* primitiveset) const
Get the index number of a primitive set, return a value between 0 and getNumPrimitiveSet()-1 if found, if not found then return getNumPrimitiveSet().
-[more]inline bool areFastPathsUsed() const +[more]void setFastPathHint(bool on) +
Set whether fast paths should be used when supported +
+[more]bool getFastPathHint() const +
Get whether fast paths should be used when supported +
+[more]inline bool areFastPathsUsed() const
return true if OpenGL fast paths will be used with drawing this Geometry.
-[more]bool computeFastPathsUsed() +[more]bool computeFastPathsUsed()
-[more]bool verifyBindings() const +[more]bool verifyBindings() const
-[more]void computeCorrectBindingsAndArraySizes() +[more]void computeCorrectBindingsAndArraySizes()
-[more]virtual void drawImplementation(State& state) const +[more]bool suitableForOptimization() const +
+[more]void copyToAndOptimize(Geometry& target) +
+[more]void computeInternalOptimizedGeometry() +
+[more]void removeInternalOptimizedGeometry() +
+[more]void setInternalOptimizedGeometry(osg::Geometry* geometry) +
+[more]osg::Geometry* getInternalOptimizedGeometry() +
+[more]const osg::Geometry* getInternalOptimizedGeometry() const +
+[more]virtual void drawImplementation(State& state) const
draw Geometry directly ignoring an OpenGL display list which could be attached.
-[more]virtual bool supports(AttributeFunctor&) const +[more]virtual bool supports(AttributeFunctor&) const
return true, osg::Geometry does support accept(AttributeFunctor&)
-[more]virtual void accept(AttributeFunctor& af) +[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 bool supports(ConstAttributeFunctor&) const +[more]virtual bool supports(ConstAttributeFunctor&) const
return true, osg::Geometry does support accept(ConstAttributeFunctor&)
-[more]virtual void accept(ConstAttributeFunctor& af) const +[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 +[more]virtual bool supports(PrimitiveFunctor&) const
return true, osg::Geometry does support accept(PrimitiveFunctor&)
-[more]virtual void accept(PrimitiveFunctor& pf) const +[more]virtual void accept(PrimitiveFunctor& pf) const
accept a PrimitiveFunctor and call its methods to tell it about the interal primitives that this Drawable has

Public Members

-[more]enum AttributeBinding +[more]enum AttributeBinding
-[more]template<typename T> struct AttributeData +[more]template<typename T> struct AttributeData
-[more]struct ArrayPair +[more]struct ArrayPair
-[more]typedef std::vector< ArrayPair > TexCoordArrayList +[more]typedef std::vector< ArrayPair > TexCoordArrayList
-[more]typedef std::vector<AttributeData> AttributeList +[more]typedef std::vector<AttributeData> AttributeList
-[more]typedef std::pair< GLboolean, ArrayPair > VertexAttribNormArrayPair +[more]typedef std::pair< GLboolean, ArrayPair > VertexAttribNormArrayPair
-[more]typedef std::vector< VertexAttribNormArrayPair > VertexAttribArrayList +[more]typedef std::vector< VertexAttribNormArrayPair > VertexAttribArrayList
-[more]typedef std::vector< AttributeBinding > VertexAttribBindingList +[more]typedef std::vector< AttributeBinding > VertexAttribBindingList
-[more]typedef std::vector< ref_ptr<PrimitiveSet> > PrimitiveSetList +[more]typedef std::vector< ref_ptr<PrimitiveSet> > PrimitiveSetList

Protected Fields

-[more]PrimitiveSetList _primitives +[more]PrimitiveSetList _primitives
-[more]AttributeList _attributeList +[more]AttributeList _attributeList
-[more]ref_ptr<Array> _vertexArray +[more]ref_ptr<Array> _vertexArray
-[more]ref_ptr<IndexArray> _vertexIndices +[more]ref_ptr<IndexArray> _vertexIndices
-[more]mutable unsigned int _vertexOffset +[more]mutable unsigned int _vertexOffset
-[more]mutable AttributeBinding _normalBinding +[more]mutable AttributeBinding _normalBinding
-[more]ref_ptr<Vec3Array> _normalArray +[more]ref_ptr<Vec3Array> _normalArray
-[more]ref_ptr<IndexArray> _normalIndices +[more]ref_ptr<IndexArray> _normalIndices
-[more]mutable unsigned int _normalOffset +[more]mutable unsigned int _normalOffset
-[more]mutable AttributeBinding _colorBinding +[more]mutable AttributeBinding _colorBinding
-[more]ref_ptr<Array> _colorArray +[more]ref_ptr<Array> _colorArray
-[more]ref_ptr<IndexArray> _colorIndices +[more]ref_ptr<IndexArray> _colorIndices
-[more]mutable unsigned int _colorOffset +[more]mutable unsigned int _colorOffset
-[more]mutable AttributeBinding _secondaryColorBinding +[more]mutable AttributeBinding _secondaryColorBinding
-[more]ref_ptr<Array> _secondaryColorArray +[more]ref_ptr<Array> _secondaryColorArray
-[more]ref_ptr<IndexArray> _secondaryColorIndices +[more]ref_ptr<IndexArray> _secondaryColorIndices
-[more]mutable unsigned int _secondaryColorOffset +[more]mutable unsigned int _secondaryColorOffset
-[more]mutable AttributeBinding _fogCoordBinding +[more]mutable AttributeBinding _fogCoordBinding
-[more]ref_ptr<Array> _fogCoordArray +[more]ref_ptr<Array> _fogCoordArray
-[more]ref_ptr<IndexArray> _fogCoordIndices +[more]ref_ptr<IndexArray> _fogCoordIndices
-[more]mutable unsigned int _fogCoordOffset +[more]mutable unsigned int _fogCoordOffset
-[more]TexCoordArrayList _texCoordList +[more]TexCoordArrayList _texCoordList
-[more]VertexAttribArrayList _vertexAttribList +[more]VertexAttribArrayList _vertexAttribList
-[more]mutable VertexAttribBindingList _vertexAttribBindingList +[more]mutable VertexAttribBindingList _vertexAttribBindingList
-[more]mutable bool _fastPath +[more]mutable bool _fastPath +
+[more]bool _fastPathHint +
+[more]ref_ptr<Geometry> _internalOptimizedGeometry

Protected Methods

-[more]Geometry& operator = (const Geometry&) +[more]Geometry& operator = (const Geometry&)
-[more]virtual ~Geometry() +[more]virtual ~Geometry()

@@ -484,9 +508,9 @@ class SG_EXPORT Extensions: public

Public Methods

-oinline void setDataVariance(DataVariance dv) +oinline void setDataVariance(DataVariance dv)
-oinline DataVariance getDataVariance() const +oinline DataVariance getDataVariance() const
oinline void setUserData(Referenced* obj)
@@ -502,7 +526,7 @@ class SG_EXPORT Extensions: public

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -538,501 +562,511 @@ class SG_EXPORT Extensions: public - +
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

- -
otemplate<typename T> struct AttributeData + +
otemplate<typename T> struct AttributeData

- +
o AttributeData()

- -

oref_ptr<T> _array + +
oref_ptr<T> _array

- +

oref_ptr<IndexArray> _indices

- -

oAttributeBinding _binding + +
oAttributeBinding _binding

- +

oGLboolean _normalize

- +

ounsigned int _offset

- +
ovoid setVertexArray(Array* array)

- +

oArray* getVertexArray()

- +

oconst Array* 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)

- +

oVec3Array* getNormalArray()

- +

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(Array* array)

- +

oArray* getFogCoordArray()

- +

oconst Array* getFogCoordArray() const

- +

ovoid setFogCoordIndices(IndexArray* array)

- +

oIndexArray* getFogCoordIndices()

- +

oconst IndexArray* getFogCoordIndices() const

- +

ostruct ArrayPair

- +
o ArrayPair()

- -

o ArrayPair(const ArrayPair& rhs) + +
o ArrayPair(const ArrayPair& rhs)

- -

oArrayPair& operator = (const ArrayPair& rhs) + +
oArrayPair& operator = (const ArrayPair& rhs)

- +

oref_ptr<Array> first

- +

oref_ptr<IndexArray> second

- +

omutable unsigned int offset

- -
otypedef std::vector< ArrayPair > TexCoordArrayList + +
otypedef std::vector< ArrayPair > TexCoordArrayList

- +

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

- +

ovoid setArray(AttributeType type, Array* array)

- +

oArray* getArray(AttributeType type)

- +

oconst Array* getArray(AttributeType type) const

- +

ovoid setIndices(AttributeType type, IndexArray* indices)

- +

oIndexArray* getIndices(AttributeType type)

- +

oconst IndexArray* getIndices(AttributeType type) const

- -

ovoid setNormalize(AttributeType type, GLboolean normalize) + +
ovoid setNormalize(AttributeType type, GLboolean normalize)

- +

oGLboolean getNormalize(AttributeType type) const

- -

ovoid setBinding(AttributeType type, AttributeBinding binding) + +
ovoid setBinding(AttributeType type, AttributeBinding binding)

- -

oAttributeBinding getBinding(AttributeType type) const + +
oAttributeBinding getBinding(AttributeType type) const

- +

ounsigned int getNumArrays() const

- -

oAttributeData& getAttributeData(unsigned int type) + +
oAttributeData& getAttributeData(unsigned int type)

- -

oconst AttributeData& getAttributeData(unsigned int type) const + +
oconst AttributeData& getAttributeData(unsigned int type) const

- -

otypedef std::vector<AttributeData> AttributeList + +
otypedef std::vector<AttributeData> AttributeList

- -

ovoid setAttributeList(AttributeList& al) + +
ovoid setAttributeList(AttributeList& al)

- -

oAttributeList& getAttributeList() + +
oAttributeList& getAttributeList()

- -

oconst AttributeList& getAttributeList() const + +
oconst AttributeList& getAttributeList() const

- -

otypedef std::pair< GLboolean, ArrayPair > VertexAttribNormArrayPair + +
otypedef std::pair< GLboolean, ArrayPair > VertexAttribNormArrayPair

- -

otypedef std::vector< VertexAttribNormArrayPair > VertexAttribArrayList + +
otypedef std::vector< VertexAttribNormArrayPair > VertexAttribArrayList

- -

otypedef std::vector< AttributeBinding > VertexAttribBindingList + +
otypedef std::vector< AttributeBinding > VertexAttribBindingList

- -

ovoid setVertexAttribArray(unsigned int index, bool normalize, Array* array, AttributeBinding ab=BIND_OFF) + +
ovoid setVertexAttribArray(unsigned int index, GLboolean normalize, Array* array, AttributeBinding ab=BIND_OFF)

- +

oArray* getVertexAttribArray(unsigned int index)

- +

oconst Array* getVertexAttribArray(unsigned int index) const

- +

obool getVertexAttribNormalize(unsigned int index, GLboolean &ret) const

- -

obool getVertexAttribBinding(unsigned int index, AttributeBinding& ab) const + +
obool getVertexAttribBinding(unsigned int index, AttributeBinding& ab) const

- +

ovoid setVertexAttribIndices(unsigned int index, IndexArray* array)

- +

oIndexArray* getVertexAttribIndices(unsigned int index)

- +

oconst IndexArray* getVertexAttribIndices(unsigned int index) const

- +

ounsigned int getNumVertexAttribArrays() const

- -

oVertexAttribArrayList& getVertexAttribArrayList() + +
oVertexAttribArrayList& getVertexAttribArrayList()

- -

oconst VertexAttribArrayList& getVertexAttribArrayList() const + +
oconst VertexAttribArrayList& getVertexAttribArrayList() const

- +

otypedef std::vector< ref_ptr<PrimitiveSet> > PrimitiveSetList

- -

ovoid setPrimitiveSetList(const PrimitiveSetList& primitives) + +
ovoid setPrimitiveSetList(const PrimitiveSetList& primitives)

- -

oPrimitiveSetList& getPrimitiveSetList() + +
oPrimitiveSetList& getPrimitiveSetList()

- -

oconst PrimitiveSetList& getPrimitiveSetList() const + +
oconst PrimitiveSetList& getPrimitiveSetList() const

- +

ounsigned int getNumPrimitiveSets() const

- +

oPrimitiveSet* getPrimitiveSet(unsigned int pos)

- +

oconst PrimitiveSet* getPrimitiveSet(unsigned int pos) const

- +

obool addPrimitiveSet(PrimitiveSet* primitiveset)
Add a primitive set to the geometry

- +

obool setPrimitiveSet(unsigned int i, PrimitiveSet* primitiveset)
Set a primitive set to the specified position in geometry's primitive set list

- +

obool insertPrimitiveSet(unsigned int i, PrimitiveSet* primitiveset)
Insert a primitive set to the specified position in geometry's primitive set list

- +

obool removePrimitiveSet(unsigned int i, unsigned int numElementsToRemove=1)
Remove primitive set(s) from the specified position in geometry's primitive set list

- +

ounsigned int getPrimitiveSetIndex(const PrimitiveSet* primitiveset) const
Get the index number of a primitive set, return a value between 0 and getNumPrimitiveSet()-1 if found, if not found then return getNumPrimitiveSet(). When checking for a valid find value use if ((value=geoemtry->getPrimitiveSetIndex(primitive))!=geometry.getNumPrimitiveSet()) as

+ + +

ovoid setFastPathHint(bool on) +
Set whether fast paths should be used when supported +

+ + +

obool getFastPathHint() const +
Get whether fast paths should be used when supported +

- +

oinline bool 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 @@ -1040,161 +1074,197 @@ use glBegin()/glVertex.../glEnd(). Use of per primitive bindings or per vertex i arrays will drop the rendering path off the fast path.

- +

obool computeFastPathsUsed()

- +

obool verifyBindings() const

- +

ovoid computeCorrectBindingsAndArraySizes()

+ + +

obool suitableForOptimization() const +

+ + +

ovoid copyToAndOptimize(Geometry& target) +

+ + +

ovoid computeInternalOptimizedGeometry() +

+ + +

ovoid removeInternalOptimizedGeometry() +

+ + +

ovoid setInternalOptimizedGeometry(osg::Geometry* geometry) +

+ + +

oosg::Geometry* getInternalOptimizedGeometry() +

+ + +

oconst osg::Geometry* getInternalOptimizedGeometry() const +

- +

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(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 PrimitiveFunctor and call its methods to tell it about the interal primitives that this Drawable has

- +

oGeometry& operator = (const Geometry&)

- +

ovirtual ~Geometry()

- -

oPrimitiveSetList _primitives + +
oPrimitiveSetList _primitives

- -

oAttributeList _attributeList + +
oAttributeList _attributeList

- +

oref_ptr<Array> _vertexArray

- +

oref_ptr<IndexArray> _vertexIndices

- +

omutable unsigned int _vertexOffset

- -

omutable AttributeBinding _normalBinding + +
omutable AttributeBinding _normalBinding

- +

oref_ptr<Vec3Array> _normalArray

- +

oref_ptr<IndexArray> _normalIndices

- +

omutable unsigned int _normalOffset

- -

omutable AttributeBinding _colorBinding + +
omutable AttributeBinding _colorBinding

- +

oref_ptr<Array> _colorArray

- +

oref_ptr<IndexArray> _colorIndices

- +

omutable unsigned int _colorOffset

- -

omutable AttributeBinding _secondaryColorBinding + +
omutable AttributeBinding _secondaryColorBinding

- +

oref_ptr<Array> _secondaryColorArray

- +

oref_ptr<IndexArray> _secondaryColorIndices

- +

omutable unsigned int _secondaryColorOffset

- -

omutable AttributeBinding _fogCoordBinding + +
omutable AttributeBinding _fogCoordBinding

- +

oref_ptr<Array> _fogCoordArray

- +

oref_ptr<IndexArray> _fogCoordIndices

- +

omutable unsigned int _fogCoordOffset

- -

oTexCoordArrayList _texCoordList + +
oTexCoordArrayList _texCoordList

- -

oVertexAttribArrayList _vertexAttribList + +
oVertexAttribArrayList _vertexAttribList

- -

omutable VertexAttribBindingList _vertexAttribBindingList + +
omutable VertexAttribBindingList _vertexAttribBindingList

- +

omutable bool _fastPath +

+ + +

obool _fastPathHint +

+ + +

oref_ptr<Geometry> _internalOptimizedGeometry

This class has no child classes.
diff --git a/doc/doc++/osg/Grid.html b/doc/doc++/osg/Grid.html index cb605afa5..3384b6ad9 100644 --- a/doc/doc++/osg/Grid.html +++ b/doc/doc++/osg/Grid.html @@ -22,32 +22,32 @@

Public Methods

-[more] Grid() +[more] Grid()
-[more] Grid(const Grid& mesh, const CopyOp& copyop=CopyOp::SHALLOW_COPY) +[more] Grid(const Grid& mesh, const CopyOp& copyop=CopyOp::SHALLOW_COPY)
-[more] META_Shape(osg, Grid) +[more] META_Shape(osg, Grid)
-[more]void allocateGrid(unsigned int numColumns, unsigned int numRows) +[more]void allocateGrid(unsigned int numColumns, unsigned int numRows)
-[more]void setHeight(unsigned int c, unsigned int r, float value) +[more]void setHeight(unsigned int c, unsigned int r, float value)
-[more]virtual float getHeight(unsigned int c, unsigned int r) const +[more]virtual float getHeight(unsigned int c, unsigned int r) const

Protected Fields

-[more]HeightList _heights +[more]HeightList _heights

Protected Methods

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

Protected Members

-[more]typedef std::vector<float> HeightList +[more]typedef std::vector<float> HeightList

@@ -81,13 +81,13 @@
oinline float getYInterval() const
-ovirtual Vec3 getNormal(unsigned int c, unsigned int r) const +ovirtual Vec3 getNormal(unsigned int c, unsigned int r) const
oinline void setRotation(const Quat& quat)
oinline const Quat& getRotation() const
-oinline Matrix getRotationMatrix() const +oinline Matrix getRotationMatrix() const
oinline bool zeroRotation() const

@@ -122,9 +122,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -178,40 +178,40 @@
- +
o Grid()

- -

o Grid(const Grid& mesh, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
o Grid(const Grid& mesh, const CopyOp& copyop=CopyOp::SHALLOW_COPY)

- +

o META_Shape(osg, Grid)

- +

ovoid allocateGrid(unsigned int numColumns, unsigned int numRows)

- -

ovoid setHeight(unsigned int c, unsigned int r, float value) + +
ovoid setHeight(unsigned int c, unsigned int r, float value)

- -

ovirtual float getHeight(unsigned int c, unsigned int r) const + +
ovirtual float getHeight(unsigned int c, unsigned int r) const

- +

o ~Grid()

- +

otypedef std::vector<float> HeightList

- -

oHeightList _heights + +
oHeightList _heights

This class has no child classes.
diff --git a/doc/doc++/osg/Group.html b/doc/doc++/osg/Group.html index a91ecb349..67bb36b07 100644 --- a/doc/doc++/osg/Group.html +++ b/doc/doc++/osg/Group.html @@ -23,62 +23,62 @@

Public Methods

-[more] 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 Group* asGroup() +[more]virtual Group* asGroup()
-[more]virtual const Group* asGroup() const +[more]virtual const Group* asGroup() const
-[more]virtual void traverse(NodeVisitor& nv) +[more]virtual void traverse(NodeVisitor& nv)
-[more]virtual bool addChild( Node* child ) +[more]virtual bool addChild( Node* child )
Add Node to Group.
-[more]virtual bool insertChild( unsigned int index, Node* child ) +[more]virtual bool insertChild( unsigned int index, Node* child )
Insert Node to Group at specific location.
-[more]virtual bool removeChild( Node* child ) +[more]virtual bool removeChild( Node* child )
Remove Node from Group.
-[more]virtual bool removeChild(unsigned int pos, unsigned int numChildrenToRemove=1) +[more]virtual bool removeChild(unsigned int pos, unsigned int numChildrenToRemove=1)
-[more]virtual bool replaceChild( Node* origChild, Node* newChild ) +[more]virtual bool replaceChild( Node* origChild, Node* newChild )
Replace specified Node with another Node.
-[more]inline unsigned int getNumChildren() const +[more]inline unsigned int getNumChildren() const
return the number of chilren nodes
-[more]virtual bool setChild( unsigned int i, Node* node ) +[more]virtual bool setChild( unsigned int i, Node* node )
set child node at position i.
-[more]inline Node* getChild( unsigned int i ) +[more]inline Node* getChild( unsigned int i )
return child node at position i
-[more]inline const Node* getChild( 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 unsigned int getChildIndex( const Node* node ) const +[more]inline unsigned int getChildIndex( const Node* node ) const
Get the index number of child, return a value between 0 and _childrensize()-1 if found, if not found then return _childrensize()

Protected Fields

-[more]NodeList _children +[more]NodeList _children

Protected Methods

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

@@ -104,15 +104,15 @@
ovirtual void ascend(NodeVisitor& nv)
-oinline void setName( const std::string& name ) +oinline void setName( const std::string& name )
-oinline void setName( const char* name ) +oinline void setName( const char* name )
oinline const std::string& getName() const
-oinline const ParentList& getParents() const +oinline const ParentList& getParents() const
-oinline ParentList getParents() +oinline ParentList getParents()
oinline Group* getParent(unsigned int i)
@@ -146,13 +146,13 @@
obool containsOccluderNodes() const
-oinline void setNodeMask(NodeMask nm) +oinline void setNodeMask(NodeMask nm)
-oinline NodeMask getNodeMask() const +oinline NodeMask getNodeMask() const
-oinline const DescriptionList& getDescriptions() const +oinline const DescriptionList& getDescriptions() const
-oinline DescriptionList& getDescriptions() +oinline DescriptionList& getDescriptions()
oinline const std::string& getDescription(unsigned int i) const
@@ -192,7 +192,7 @@
ostd::string _name
-oParentList _parents +oParentList _parents
oref_ptr<NodeCallback> _updateCallback
@@ -206,9 +206,9 @@
ounsigned int _numChildrenWithOccluderNodes
-oNodeMask _nodeMask +oNodeMask _nodeMask
-oDescriptionList _descriptions +oDescriptionList _descriptions
oref_ptr<StateSet> _stateset

@@ -231,9 +231,9 @@

Public Methods

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

Protected Fields

-oDataVariance _dataVariance +oDataVariance _dataVariance
oref_ptr<Referenced> _userData

@@ -290,32 +290,32 @@ with memory management handled automatically via osg::Referenced.
- +
o Group()

- -

o Group(const Group&, const CopyOp& copyop=CopyOp::SHALLOW_COPY) + +
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 @@ -324,7 +324,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 insertChild( unsigned int index, Node* child )
Insert Node to Group at specific location. The new child node is inserted into the child list @@ -332,7 +332,7 @@ before the node at the specified index. No nodes are removed from the group with this operation.

- +

ovirtual bool removeChild( Node* child )
Remove Node from Group. If Node is contained in Group then remove it from the child @@ -342,23 +342,23 @@ return true for success. If Node is not found then return false and do not change the reference count of the Node.

- +

ovirtual bool removeChild(unsigned int pos, unsigned int numChildrenToRemove=1)

- +

ovirtual bool replaceChild( Node* origChild, Node* newChild )
Replace specified Node with another Node. Equivalent to setChild(getChildIndex(orignChild),node), see docs for setChild for futher details on implementation.

- +

oinline unsigned int getNumChildren() const
return the number of chilren nodes

- +

ovirtual bool setChild( unsigned int i, Node* node )
set child node at position i. return true if set correctly, false on failure (if node==NULL || i is out of range). @@ -370,38 +370,38 @@ add newNode. If newNode is NULL then return false and do not remove origNode. Also returns false if newChild is a Scene node.

- +

oinline Node* getChild( unsigned int i )
return child node at position i

- +

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 unsigned int getChildIndex( const Node* node ) const
Get the index number of child, return a value between 0 and _childrensize()-1 if found, if not found then return _childrensize()

- +

ovirtual ~Group()

- +

ovirtual bool computeBound() const

- -

oNodeList _children + +
oNodeList _children

Direct child classes: diff --git a/doc/doc++/osg/HIER.html b/doc/doc++/osg/HIER.html index 9bda0eaab..97078917d 100644 --- a/doc/doc++/osg/HIER.html +++ b/doc/doc++/osg/HIER.html @@ -27,9 +27,13 @@
  • osg::CollectOccludersVisitor
  • osg::DeleteHandler -
  • osg::Matrix + +
  • osg::Matrixf
  • osg::Plane -
  • osg::RefMatrix +
  • osg::RefMatrixd +
  • osg::RefMatrixf
  • osg::Shape