diff --git a/doc/doc++/osg/AlphaFunc.html b/doc/doc++/osg/AlphaFunc.html index 1ee547237..7e183602d 100644 --- a/doc/doc++/osg/AlphaFunc.html +++ b/doc/doc++/osg/AlphaFunc.html @@ -7,7 +7,7 @@ -

class SG_EXPORT osg::AlphaFunc

Encapsulte OpenGL glAlphaFunc
+

class SG_EXPORT osg::AlphaFunc

Encapsulate OpenGL glAlphaFunc

Inheritance:

@@ -25,14 +25,14 @@

Public Methods

[more] AlphaFunc()
-[more] META_StateAttribute(AlphaFunc, ALPHAFUNC) +[more] META_StateAttribute(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 setStateSetModes(StateSet& ds, const GLModeValue value) const +[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const
-[more]inline void setFunction(const ComparisonFunction func, const float ref) +[more]inline void setFunction(const ComparisonFunction func, const float ref)
[more]inline const ComparisonFunction getFunction() const
@@ -69,7 +69,7 @@
ovirtual const char* className() const
-ovirtual const Type getType() const +ovirtual const Type getType() const
obool operator < (const StateAttribute& rhs) const
@@ -122,7 +122,7 @@

Documentation

-
Encapsulte OpenGL glAlphaFunc
+
Encapsulate OpenGL glAlphaFunc
@@ -131,7 +131,7 @@

-

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

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

-

ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const +
ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const

@@ -182,7 +182,7 @@ -

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

diff --git a/doc/doc++/osg/Billboard.html b/doc/doc++/osg/Billboard.html index 03f2f32a4..edcee50b4 100644 --- a/doc/doc++/osg/Billboard.html +++ b/doc/doc++/osg/Billboard.html @@ -46,10 +46,10 @@

Get the position of specified drawable.
[more]inline PositionList& getPositionList() -
Get the PostionList from the billboard +
Get the PositionList from the billboard
[more]inline const PositionList& getPositionList() const -
Get a const PostionList from the billboard +
Get a const PositionList from the billboard
[more]virtual const bool addDrawable( Drawable* gset )
Add Drawable to Billboard with default position(0,0,0); If gset not NULL and is not contained in Billboard then increment its reference count, and dirty the bounding box to cause it to recompute on next getBound() and return true for success. @@ -139,7 +139,7 @@
oinline const std::string& getName() const
-oinline const ParentList& getParents() const +oinline const ParentList& getParents() const
oinline Group* getParent(const int i)
@@ -155,23 +155,25 @@
oinline const int getNumChildrenRequiringAppTraversal() const
-oinline void setUserData(void* data, MemoryAdapter* ma=0L) +ovoid setCullingActive(const bool active)
-oinline void* getUserData() +oinline const bool getCullingActive() const
-oinline const void* getUserData() const +oinline const int getNumChildrenWithCullingDisabled() const
-oinline MemoryAdapter* getMemoryAdapter() +oinline void setUserData(osg::Referenced* obj)
-oinline const MemoryAdapter* getMemoryAdapter() const +oinline Referenced* getUserData() +
+oinline const Referenced* getUserData() const
oinline void setNodeMask(const NodeMask nm)
oinline const NodeMask getNodeMask() const
-oinline const DescriptionList& getDescriptions() const +oinline const DescriptionList& getDescriptions() const
-oinline DescriptionList& getDescriptions() +oinline DescriptionList& getDescriptions()
oinline const std::string& getDescription(const int i) const
@@ -207,19 +209,21 @@
ostd::string _name
-oParentList _parents +oParentList _parents
oref_ptr<NodeCallback> _appCallback
oint _numChildrenRequiringAppTraversal
-ovoid* _userData +obool _cullingActive
-oref_ptr<MemoryAdapter> _memoryAdapter +oint _numChildrenWithCullingDisabled +
+oosg::ref_ptr<Referenced> _userData
oNodeMask _nodeMask
-oDescriptionList _descriptions +oDescriptionList _descriptions
oref_ptr<StateSet> _dstate

@@ -227,6 +231,8 @@

Protected Methods

ovoid setNumChildrenRequiringAppTraversal(const int num) +
+ovoid setNumChildrenWithCullingDisabled(const int num)

@@ -257,8 +263,7 @@

Documentation

Billboard - a Geode which orientates its child osg::Drawable's to face -the eye point. -Typical uses are for trees, or particle explosions.
+the eye point. Typical uses are for trees, or particle explosions.
@@ -325,12 +330,12 @@ Typical uses are for trees, or particle explosions.
oinline PositionList& getPositionList() -
Get the PostionList from the billboard +
Get the PositionList from the billboard

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

diff --git a/doc/doc++/osg/BoundingBox.html b/doc/doc++/osg/BoundingBox.html index 836956615..777d740cd 100644 --- a/doc/doc++/osg/BoundingBox.html +++ b/doc/doc++/osg/BoundingBox.html @@ -22,61 +22,72 @@

Public Methods

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

@@ -104,113 +115,132 @@ bounding box

-

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

- + +

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

+ + +

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

+ +

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

- +

oinline const bool isValid() const
return true if the bounding box contains valid values, false if the bounding box is effectively unset/empty

+ + +

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

+ + +

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

- +

oinline float& xMin()

- +

oinline const float xMin() const

- +

oinline float& yMin()

- +

oinline const float yMin() const

- +

oinline float& zMin()

- +

oinline const float zMin() const

- +

oinline float& xMax()

- +

oinline const float xMax() const

- +

oinline float& yMax()

- +

oinline const float yMax() const

- +

oinline float& zMax()

- +

oinline const float zMax() const

- +

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

- +

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

- +

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

- +

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

- +

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

- +

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

- +

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

- +

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

diff --git a/doc/doc++/osg/BoundingSphere.html b/doc/doc++/osg/BoundingSphere.html index b120caac2..36f0e76d2 100644 --- a/doc/doc++/osg/BoundingSphere.html +++ b/doc/doc++/osg/BoundingSphere.html @@ -23,43 +23,49 @@ [more] BoundingSphere()
construct to invalid values to represent an unset bounding sphere
-[more]inline void init() +[more] BoundingSphere(const Vec3& center, float radius) +
construct to specified bounding sphere +
+[more]inline void init()
initialize to invalid values to represent an unset bounding sphere
-[more]inline const bool isValid() const +[more]inline const bool isValid() const
return true if the bounding sphere contains valid values, false if the bounding sphere is effectively unset
-[more]inline Vec3& center() +[more]inline void set(const Vec3& center, float radius) +
set bounding sphere +
+[more]inline Vec3& center()
return the center of the bounding sphere
-[more]inline const Vec3& center() const +[more]inline const Vec3& center() const
return the const center of the bounding sphere
-[more]inline float& radius() +[more]inline float& radius()
return the radius of the bounding sphere
-[more]inline const float radius() const +[more]inline const float radius() const
return the const radius of the bounding sphere
-[more]inline const float radius2() const +[more]inline const float radius2() const
return the radius squared.
-[more]void expandBy(const Vec3& v) -
If the vertex is outwith the sphere expand to ecompass vertex. +[more]void expandBy(const Vec3& v) +
If the vertex is out-with the sphere expand to encompass vertex.
-[more]void expandRadiusBy(const Vec3& v) +[more]void expandRadiusBy(const Vec3& v)
If the vertex is outwith the sphere expand radius to ecompass vertex.
-[more]void expandBy(const BoundingSphere& sh) +[more]void expandBy(const BoundingSphere& sh)
If incomming sphere is outwith the sphere expand to ecompass incomming sphere.
-[more]void expandRadiusBy(const BoundingSphere& sh) +[more]void expandRadiusBy(const BoundingSphere& sh)
If incomming sphere is outwith the sphere expand radius to ecompass incomming sphere.
-[more]inline const bool contains(const Vec3& v) const +[more]inline const bool contains(const Vec3& v) const
return true is vertex v is within the sphere
-[more]inline const bool intersects( const BoundingSphere& bs ) const +[more]inline const bool intersects( const BoundingSphere& bs ) const
return true if bounding sphere's intersect each other

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

Documentation

General purpose bounding sphere class for enclosing nodes/objects/vertices. Used to bound internal osg::Node's in the scene, -to assist in view frustrum culling etc. Similar in function to BoundingBox +to assist in view frustum culling etc. Similar in function to BoundingBox but is quicker for evaluating culling, but generally encloses a greater volume than a BoundingBox so will not cull so aggressively.
@@ -88,62 +94,72 @@ than a BoundingBox so will not cull so aggressively.
o BoundingSphere()
construct to invalid values to represent an unset bounding sphere

- + +

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

+ +

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

- +

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

+ + +

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

- +

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

- +

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

- +

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

- +

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

- +

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

- +

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

- +

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

- +

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

- +

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

- +

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

- +

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

diff --git a/doc/doc++/osg/Camera.html b/doc/doc++/osg/Camera.html index 1de788180..7c82477f6 100644 --- a/doc/doc++/osg/Camera.html +++ b/doc/doc++/osg/Camera.html @@ -23,215 +23,258 @@

Public Methods

-[more] Camera() +[more] Camera(DisplaySettings* ds=NULL)
-[more]virtual ~Camera() +[more] Camera(const Camera&)
-[more]const ProjectionType getProjectionType() const +[more]Camera& operator=(const Camera&) +
+[more]virtual ~Camera() +
+[more]const ProjectionType getProjectionType() const
Get the projection type set by setOtho,setOtho2D,setFrustum, and set perspective methods
-[more]void setOrtho(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) -
Set a orthographics projection. +[more]void setOrtho(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) +
Set a orthographic projection.
-[more]void setOrtho2D(const double left, const double right, const double bottom, const double top) -
Set a 2D orthographics projection. +[more]void setOrtho2D(const double left, const double right, const double bottom, const double top) +
Set a 2D orthographic projection.
-[more]void setFrustum(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar) +[more]void setFrustum(const double left, const double right, const double bottom, const double top, const double zNear, const double zFar)
Set a perspective projection.
-[more]void setPerspective(const double fovy, const double aspectRatio, const double zNear, const double zFar) -
Set a sysmetical perspective projection, See gluPerspective for further details. +[more]void setPerspective(const double fovy, const double aspectRatio, const double zNear, const double zFar) +
Set a symmetrical perspective projection, See gluPerspective for further details.
-[more]void setFOV(const double fovx, const double fovy, const double zNear, const double zFar) -
Set a sysmetical perspective projection using field of view +[more]void setFOV(const double fovx, const double fovy, const double zNear, const double zFar) +
Set a sysmmetical perspective projection using field of view
-[more]void setNearFar(const double zNear, const double zFar) +[more]void setNearFar(const double zNear, const double zFar)
Set the near and far clipping planes
-[more]void setAdjustAspectRatioMode(const AdjustAspectRatioMode aam) +[more]void setAdjustAspectRatioMode(const AdjustAspectRatioMode aam)
Set the way that the vertical or horizontal dimensions of the window are adjusted on a resize.
-[more]const AdjustAspectRatioMode getAdjustAspectRatioMode() const +[more]const AdjustAspectRatioMode getAdjustAspectRatioMode() const
Get the way that the vertical or horizontal dimensions of the window are adjusted on a resize.
-[more]void adjustAspectRatio(const double newAspectRatio) -
Adjust the clipping planes to account for a new window aspcect ratio. +[more]void adjustAspectRatio(const double newAspectRatio) +
Adjust the clipping planes to account for a new window aspect ratio.
-[more]void adjustAspectRatio(const double newAspectRatio, const AdjustAspectRatioMode aa) -
Adjust the clipping planes to account for a new window aspcect ratio. +[more]void adjustAspectRatio(const double newAspectRatio, const AdjustAspectRatioMode aa) +
Adjust the clipping planes to account for a new window aspect ratio.
-[more]const double left() const +[more]const double left() const
-[more]const double right() const +[more]const double right() const
-[more]const double top() const +[more]const double top() const
-[more]const double bottom() const +[more]const double bottom() const
-[more]const double zNear() const +[more]const double zNear() const
-[more]const double zFar() const +[more]const double zFar() const
-[more]const double calc_fovy() const -
Calculate and return the equivilant fovx for the current project setting. +[more]const double calc_fovy() const +
Calculate and return the equivalent fovx for the current project setting.
-[more]const double calc_fovx() const -
Calculate and return the equivilant fovy for the current project setting. +[more]const double calc_fovx() const +
Calculate and return the equivalent fovy for the current project setting.
-[more]const double calc_aspectRatio() const +[more]const double calc_aspectRatio() const
Calculate and return the projection aspect ratio.
-[more]const Matrix& getProjectionMatrix() const +[more]const Matrix& getProjectionMatrix() const
-[more]const LookAtType getLookAtType() const +[more]const LookAtType getLookAtType() const
-[more]void home() +[more]void home()
hardwired home view for now, looking straight down the Z axis at the origin, with 'up' being the y axis
-[more]void setView(const Vec3& eyePoint, const Vec3& lookPoint, const Vec3& upVector) +[more]void setView(const Vec3& eyePoint, const Vec3& lookPoint, const Vec3& upVector)
Set the View, the up vector should be orthogonal to the look vector.
-[more]void setLookAt(const Vec3& eye, const Vec3& center, const Vec3& up) -
set the position and orientaion of the camera, using the same convention as gluLookAt +[more]void setLookAt(const Vec3& eye, const Vec3& center, const Vec3& up) +
set the position and orientation of the camera, using the same convention as gluLookAt
-[more]void setLookAt(const double eyeX, const double eyeY, const double eyeZ, const double centerX, const double centerY, const double centerZ, const double upX, const double upY, const double upZ) -
set the position and orientaion of the camera, using the same convention as gluLookAt +[more]void setLookAt(const double eyeX, const double eyeY, const double eyeZ, const double centerX, const double centerY, const double centerZ, const double upX, const double upY, const double upZ) +
set the position and orientation of the camera, using the same convention as gluLookAt
-[more]void transformLookAt(const Matrix& matrix) +[more]void transformLookAt(const Matrix& matrix)
post multiple the existing eye point and orientation by matrix.
-[more]void ensureOrthogonalUpVector() +[more]void ensureOrthogonalUpVector()
-[more]inline const Vec3& getEyePoint() const +[more]inline const Vec3& getEyePoint() const
get the eye point.
-[more]inline const Vec3& getCenterPoint() const +[more]inline const Vec3& getCenterPoint() const
get the center point.
-[more]inline const Vec3& getUpVector() const +[more]inline const Vec3& getUpVector() const
get the up vector
-[more]const Vec3 getLookVector() const +[more]const Vec3 getLookVector() const
calculate look vector
-[more]const Vec3 getSideVector() const +[more]const Vec3 getSideVector() const
calculate side vector
-[more]inline const float getFocalLength() const -
get focal distance +[more]inline float getLookDistance() const +
calculate the look distance which is the distance between the eye and the center
-[more]void attachTransform(const TransformMode mode, Matrix* modelTransform=0) +[more]void attachTransform(const TransformMode mode, Matrix* modelTransform=0)
Attach a transform matrix which is applied after the camera look at.
-[more]void dirtyTransform() +[more]void dirtyTransform()
must be called after you modify an attachedTransform.
-[more]Matrix* getTransform(const TransformMode mode) +[more]Matrix* getTransform(const TransformMode mode)
-[more]const Matrix* getTransform(const TransformMode mode) const +[more]const Matrix* getTransform(const TransformMode mode) const
-[more]const Vec3 getEyePoint_Model() const +[more]const Vec3 getEyePoint_Model() const
-[more]const Vec3 getCenterPoint_Model() const +[more]const Vec3 getCenterPoint_Model() const
-[more]const Vec3 getLookVector_Model() const +[more]const Vec3 getLookVector_Model() const
-[more]const Vec3 getUpVector_Model() const +[more]const Vec3 getUpVector_Model() const
-[more]const Vec3 getSideVector_Model() const +[more]const Vec3 getSideVector_Model() const
-[more]const Matrix& getModelViewMatrix() const +[more]const Matrix& getModelViewMatrix() const
Get the ModelView matrix.
-[more]void setUseNearClippingPlane(const bool use) +[more]void setUseNearClippingPlane(const bool use) +
Switch on/off the use of the near clipping plane which creating the getClippingVolume(), uses the camera _znear value for the position of the near clipping plane.
-[more]const bool getUseNearClippingPlane() const +[more]const bool getUseNearClippingPlane() const +
get whether the ClippingVolume uses a near clipping plane
-[more]void setUseFarClippingPlane(const bool use) +[more]void setUseFarClippingPlane(const bool use) +
Switch on/off the use of the far clipping plane which creating the getClippingVolume(), uses the camera _zfar value for the position of the far clipping plane.
-[more]const bool getUseFarClippingPlane() const +[more]const bool getUseFarClippingPlane() const +
Get whether the ClippingVolume uses a far clipping plane
-[more]const ClippingVolume& getClippingVolume() const +[more]const ClippingVolume& getClippingVolume() const
get the view frustum clipping in model coordinates
-[more]const bool project(const Vec3& obj, const Viewport& viewport, Vec3& win) const +[more]const bool project(const Vec3& obj, const Viewport& viewport, Vec3& win) const
Map object coordinates into windows coordinates.
-[more]const bool unproject(const Vec3& win, const Viewport& viewport, Vec3& obj) const +[more]const bool unproject(const Vec3& win, const Viewport& viewport, Vec3& obj) const
Map window coordinates into object coordinates. +
+[more]void setFusionDistanceMode(FusionDistanceMode mode) +
Set the mode of the fusion distance function which in use to calculate the fusion distance used in stereo rendering. +
+[more]FusionDistanceMode getFusionDistanceMode() const +
Get the mode of the fusion distance function +
+[more]void setFusionDistanceRatio(float ratio) +
Set the ratio of the fusion distance function which in use to calculate the fusion distance used in stereo rendering. +
+[more]float getFusionDistanceRatio() const +
Get the ratio of the fusion distance function +
+[more]const float getFusionDistance() const +
Calculate and return the fusion distance, using the FusionDistanceFunction +
+[more]void setScreenDistance(float screenDistance) +
Set the physical distance between the viewers eyes and the display system. +
+[more]const float getScreenDistance() const +
Get the physical distance between the viewers eyes and the display system +
+[more]void adjustEyeOffsetForStereo(const osg::Vec3& offset) +
Convinience method for adjusting the project and model view to account for and eye offset, as used in stereo work, assumes that the users will use a seperate camera for each eye, adjustEyePointForStereo() being used to specialize the camera for each eye view +
+[more]virtual void apply(State& state) +
Set up the OpenGL projection and model view matrices

Public Members

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

Protected Fields

-[more]ProjectionType _projectionType +[more]ProjectionType _projectionType
-[more]AdjustAspectRatioMode _adjustAspectRatioMode +[more]AdjustAspectRatioMode _adjustAspectRatioMode
-[more]double _left +[more]double _left
-[more]double _right +[more]double _right
-[more]double _bottom +[more]double _bottom
-[more]double _top +[more]double _top
-[more]double _zNear +[more]double _zNear
-[more]double _zFar +[more]double _zFar
-[more]LookAtType _lookAtType +[more]LookAtType _lookAtType
-[more]Vec3 _eye +[more]Vec3 _eye
-[more]Vec3 _center +[more]Vec3 _center
-[more]Vec3 _up +[more]Vec3 _up
-[more]double _focalLength +[more]TransformMode _attachedTransformMode
-[more]TransformMode _attachedTransformMode +[more]ref_ptr<Matrix> _eyeToModelTransform
-[more]ref_ptr<Matrix> _eyeToModelTransform +[more]ref_ptr<Matrix> _modelToEyeTransform
-[more]ref_ptr<Matrix> _modelToEyeTransform +[more]bool _useNearClippingPlane
-[more]bool _useNearClippingPlane +[more]bool _useFarClippingPlane
-[more]bool _useFarClippingPlane +[more]mutable bool _dirty
-[more]mutable bool _dirty +[more]mutable ref_ptr<Matrix> _projectionMatrix
-[more]mutable ref_ptr<Matrix> _projectionMatrix +[more]mutable ref_ptr<Matrix> _modelViewMatrix
-[more]mutable ref_ptr<Matrix> _modelViewMatrix +[more]mutable ClippingVolume _clippingVolume
-[more]mutable ClippingVolume _clippingVolume +[more]mutable ref_ptr<Matrix> _mp
-[more]mutable ref_ptr<Matrix> _MP +[more]mutable ref_ptr<Matrix> _inversemp
-[more]mutable ref_ptr<Matrix> _inverseMP +[more]bool _useEyeOffset +
+[more]osg::Vec3 _eyeOffset +
+[more]float _screenDistance +
+[more]FusionDistanceMode _fusionDistanceMode +
+[more]float _fusionDistanceRatio

Protected Methods

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

@@ -261,83 +304,91 @@
Camera class for encapsulating the view position and orientation and projection (lens) used. Creates a projection and modelview matrices which can be used to set OpenGL's PROJECTION and MODELVIEW matrices -represectively.
+respectively.
-
o Camera() +
o Camera(DisplaySettings* ds=NULL) +

+ + +

o Camera(const Camera&) +

+ + +

oCamera& operator=(const Camera&)

- +

ovirtual ~Camera()

- +

oenum ProjectionType
Range of projection types. -OTHO2D is a special case of OTHO where the near and far planes +ORTHO2D is a special case of ORTHO where the near and far planes are equal to -1 and 1 respectively. -PRESPECTIVE is a special case of FRUSTUM where the left & right -and bottom and top and symetrical. +PERSPECTIVE is a special case of FRUSTUM where the left & right +and bottom and top and symmetrical.

- +
o ORTHO

- +

o ORTHO2D

- +

o FRUSTUM

- +

o PERSPECTIVE

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

- -

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

- -

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

- -

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

- -

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

- -

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

- -

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

- +

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

- +
o ADJUST_VERTICAL

- +

o ADJUST_HORIZONTAL

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

- -

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

- +

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

- -

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

- +

oconst double left() const

- +

oconst double right() const

- +

oconst double top() const

- +

oconst double bottom() const

- +

oconst double zNear() const

- +

oconst double zFar() const

- +

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

- +

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

- +

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

- +

oconst Matrix& getProjectionMatrix() const

- +

oenum LookAtType

- +
o USE_HOME_POSITON

- +

o USE_EYE_AND_QUATERNION

- +

o USE_EYE_CENTER_AND_UP

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

- +

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

- +

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

- -

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

- +

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

- +

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

- +

ovoid ensureOrthogonalUpVector()

- +

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

- +

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

- +

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

- +

oconst Vec3 getLookVector() const
calculate look vector

- +

oconst Vec3 getSideVector() const
calculate side vector

- - -

oinline const float getFocalLength() const -
get focal distance + + +
oinline float getLookDistance() const +
calculate the look distance which is the distance between the eye and the center

- +

oenum TransformMode

- +
o EYE_TO_MODEL

- +

o MODEL_TO_EYE

- +

o NO_ATTACHED_TRANSFORM

- -
ovoid attachTransform(const TransformMode mode, Matrix* modelTransform=0) + +
ovoid attachTransform(const TransformMode mode, Matrix* modelTransform=0)
Attach a transform matrix which is applied after the camera look at. The attached matrix can work in two ways, either as transform of the eye into the model coordinates - EYE_TO_MODEL, or as a transform of the -model to the eye - MODEL_TO_EYE. The former is equivilant to attaching -a camera internal to the scene graph. The later is equivilant to adding +model to the eye - MODEL_TO_EYE. The former is equivalent to attaching +a camera internal to the scene graph. The later is equivalent to adding a osg::Transform at root of the scene to move the scene to the eye point. Typical used in conjunction with the LookAt position set to home, in which case it is simply treated as a model view matrix. -If the same behaviour as IRIS Performer's setViewMat is desired +If the same behavior as IRIS Performer's setViewMat is desired then set the LookAt to be (0,0,0),(0,1,0),(0,0,1) since Performer's default direction is along the y axis, unlike OpenGL and the default OSG. If modelTransfor is NULL then do not use any model transform - just use the @@ -556,187 +607,274 @@ if you modify the attached transform then you must call dirtyTransform, to allow the OSG to update matrices accordingly.

- +

ovoid dirtyTransform()
must be called after you modify an attachedTransform.

- -

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

- -

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

- +

oconst Vec3 getEyePoint_Model() const

- +

oconst Vec3 getCenterPoint_Model() const

- +

oconst Vec3 getLookVector_Model() const

- +

oconst Vec3 getUpVector_Model() const

- +

oconst Vec3 getSideVector_Model() const

- +

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

- +

ovoid setUseNearClippingPlane(const bool use) +
Switch on/off the use of the near clipping plane which creating the +getClippingVolume(), uses the camera _znear value for the position of the +near clipping plane. By default this value is off.

- +

oconst bool getUseNearClippingPlane() const +
get whether the ClippingVolume uses a near clipping plane

- +

ovoid setUseFarClippingPlane(const bool use) +
Switch on/off the use of the far clipping plane which creating the +getClippingVolume(), uses the camera _zfar value for the position +of the far clipping plane. By default this value is off.

- +

oconst bool getUseFarClippingPlane() const +
Get whether the ClippingVolume uses a far clipping plane

- +

oconst ClippingVolume& getClippingVolume() const
get the view frustum clipping in model coordinates

- +

oconst bool project(const Vec3& obj, const Viewport& viewport, Vec3& win) const
Map object coordinates into windows coordinates. -Equivilant to gluProject(...). +Equivalent to gluProject(...).

- +

oconst bool unproject(const Vec3& win, const Viewport& viewport, Vec3& obj) const
Map window coordinates into object coordinates. -Equivilant to gluUnProject(...). +Equivalent to gluUnProject(...).

- - -

o Camera(const Camera&) + + +
oenum FusionDistanceMode +

+ + + +
o PROPORTIONAL_TO_LOOK_DISTANCE

- - -

oCamera& operator=(const Camera&) + + +
o PROPORTIONAL_TO_SCREEN_DISTANCE +

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

+ + +

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

+ + +

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

+ + +

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

+ + +

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

+ + +

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

+ + +

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

+ + +

ovoid adjustEyeOffsetForStereo(const osg::Vec3& offset) +
Convinience method for adjusting the project and model view to account for +and eye offset, as used in stereo work, assumes that the users will use +a seperate camera for each eye, adjustEyePointForStereo() being used to +specialize the camera for each eye view +

+ + +

ovirtual void apply(State& state) +
Set up the OpenGL projection and model view matrices +

+ + +

ovoid copy(const Camera&)

- -

oProjectionType _projectionType + +
oProjectionType _projectionType

- -

oAdjustAspectRatioMode _adjustAspectRatioMode + +
oAdjustAspectRatioMode _adjustAspectRatioMode

- +

odouble _left

- +

odouble _right

- +

odouble _bottom

- +

odouble _top

- +

odouble _zNear

- +

odouble _zFar

- -

oLookAtType _lookAtType + +
oLookAtType _lookAtType

- +

oVec3 _eye

- +

oVec3 _center

- +

oVec3 _up

- - -

odouble _focalLength -

- -

oTransformMode _attachedTransformMode + +
oTransformMode _attachedTransformMode

- +

oref_ptr<Matrix> _eyeToModelTransform

- +

oref_ptr<Matrix> _modelToEyeTransform

- +

obool _useNearClippingPlane

- +

obool _useFarClippingPlane

- +

omutable bool _dirty

- +

omutable ref_ptr<Matrix> _projectionMatrix

- +

omutable ref_ptr<Matrix> _modelViewMatrix

- +

omutable ClippingVolume _clippingVolume

- - -

omutable ref_ptr<Matrix> _MP + + +
omutable ref_ptr<Matrix> _mp

- - -

omutable ref_ptr<Matrix> _inverseMP + + +
omutable ref_ptr<Matrix> _inversemp

- +

ovoid calculateMatricesAndClippingVolume() const +

+ + +

obool _useEyeOffset +

+ + +

oosg::Vec3 _eyeOffset +

+ + +

ofloat _screenDistance +

+ + +

oFusionDistanceMode _fusionDistanceMode +

+ + +

ofloat _fusionDistanceRatio

This class has no child classes.
diff --git a/doc/doc++/osg/ClipPlane.html b/doc/doc++/osg/ClipPlane.html index 4fc5e2f87..e2b771cda 100644 --- a/doc/doc++/osg/ClipPlane.html +++ b/doc/doc++/osg/ClipPlane.html @@ -25,12 +25,12 @@

Public Methods

[more] ClipPlane()
-[more] META_StateAttribute(ClipPlane, (Type)(CLIPPLANE+_clipPlaneNum)) +[more] META_StateAttribute(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 setStateSetModes(StateSet& ds, const GLModeValue value) const +[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const
[more]void setClipPlane(const Vec4& plane)
Set the clip plane, using a Vec4 to define plane. @@ -83,7 +83,7 @@
ovirtual const char* className() const
-ovirtual const Type getType() const +ovirtual const Type getType() const
obool operator < (const StateAttribute& rhs) const
@@ -145,7 +145,7 @@

-

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

@@ -154,7 +154,7 @@

-

ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const +
ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const

diff --git a/doc/doc++/osg/ClippingVolume.html b/doc/doc++/osg/ClippingVolume.html index 4ab30379d..3bec1c9fa 100644 --- a/doc/doc++/osg/ClippingVolume.html +++ b/doc/doc++/osg/ClippingVolume.html @@ -7,7 +7,7 @@ -

class SG_EXPORT osg::ClippingVolume

A ClippingVolume class for represecting convex clipping volumes made up
+

class SG_EXPORT osg::ClippingVolume

A ClippingVolume class for representing convex clipping volumes made up
@@ -71,7 +71,7 @@

Documentation

-
A ClippingVolume class for represecting convex clipping volumes made up
+
A ClippingVolume class for representing convex clipping volumes made up
@@ -134,7 +134,7 @@ Using a mask to determine which planes should be used for the check, and modifying the mask to turn off planes which wouldn't contribute to clipping of any internal objects. This feature is used in osgUtil::CullVisitor -to prevent redundent plane checking. +to prevent redundant plane checking.

@@ -148,7 +148,7 @@ to prevent redundent plane checking. Using a mask to determine which planes should be used for the check, and modifying the mask to turn off planes which wouldn't contribute to clipping of any internal objects. This feature is used in osgUtil::CullVisitor -to prevent redundent plane checking. +to prevent redundant plane checking.

diff --git a/doc/doc++/osg/ColorMask.html b/doc/doc++/osg/ColorMask.html index c54438e4d..df105f820 100644 --- a/doc/doc++/osg/ColorMask.html +++ b/doc/doc++/osg/ColorMask.html @@ -7,7 +7,7 @@ -

class SG_EXPORT osg::ColorMask

Encapsulte OpenGL glColorMaskFunc/Op/Mask functions
+

class SG_EXPORT osg::ColorMask

Encapsulate OpenGL glColorMaskFunc/Op/Mask functions

Inheritance:

@@ -25,7 +25,7 @@

Public Methods

[more] ColorMask()
-[more] META_StateAttribute(ColorMask, COLORMASK) +[more] META_StateAttribute(ColorMask, COLORMASK)
[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 const Type getType() const +ovirtual const Type getType() const
obool operator < (const StateAttribute& rhs) const
@@ -78,7 +78,7 @@
obool operator != (const StateAttribute& rhs) const
-ovirtual void setStateSetModes(StateSet&, const GLModeValue) const +ovirtual void setStateSetModes(StateSet&, const GLModeValue) const
ovirtual void compile(State&) const

@@ -125,7 +125,7 @@

Documentation

-
Encapsulte OpenGL glColorMaskFunc/Op/Mask functions
+
Encapsulate OpenGL glColorMaskFunc/Op/Mask functions
@@ -134,7 +134,7 @@

-

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

diff --git a/doc/doc++/osg/CullFace.html b/doc/doc++/osg/CullFace.html index 35688b273..8a683b4da 100644 --- a/doc/doc++/osg/CullFace.html +++ b/doc/doc++/osg/CullFace.html @@ -23,35 +23,35 @@

Public Methods

-[more] CullFace() +[more] CullFace()
-[more] META_StateAttribute(CullFace, CULLFACE) +[more] META_StateAttribute(CullFace, CULLFACE)
-[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
-[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const +[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const
-[more]inline void setMode(const Mode mode) +[more]inline void setMode(const Mode mode)
-[more]inline const Mode getMode() const +[more]inline const Mode getMode() const
-[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

Public Members

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

Protected Fields

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

Protected Methods

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

@@ -65,7 +65,7 @@
ovirtual const char* className() const
-ovirtual const Type getType() const +ovirtual const Type getType() const
obool operator < (const StateAttribute& rhs) const
@@ -122,59 +122,59 @@
- +
o CullFace()

- -

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

- +

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

- -

ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const + +
ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const

- +

oenum Mode

- +
o FRONT

- +

o BACK

- +

o FRONT_AND_BACK

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

- -

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

- +

ovirtual void apply(State& state) const

- +

ovirtual ~CullFace()

- -

oMode _mode + +
oMode _mode

This class has no child classes.
diff --git a/doc/doc++/osg/Depth.html b/doc/doc++/osg/Depth.html index ee3461b38..fb117c901 100644 --- a/doc/doc++/osg/Depth.html +++ b/doc/doc++/osg/Depth.html @@ -7,7 +7,7 @@ -

class SG_EXPORT osg::Depth

Encapsulte OpenGL glDepthFunc/Mask/Range functions
+

class SG_EXPORT osg::Depth

Encapsulate OpenGL glDepthFunc/Mask/Range functions

Inheritance:

@@ -23,51 +23,51 @@

Public Methods

-[more] Depth() +[more] Depth()
-[more] META_StateAttribute(Depth, DEPTH) +[more] META_StateAttribute(Depth, DEPTH)
-[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
-[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const +[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const
-[more]inline void setFunction(const Function func) +[more]inline void setFunction(const Function func)
-[more]inline const Function getFunction() const +[more]inline const Function getFunction() const
-[more]inline void setWriteMask(const bool mask) +[more]inline void setWriteMask(const bool mask)
-[more]inline const bool getWriteMask() const +[more]inline const bool getWriteMask() const
-[more]inline void setRange(const double zNear, const double zFar) +[more]inline void setRange(const double zNear, const double zFar)
-[more]inline const double getZNear() const +[more]inline const double getZNear() const
-[more]inline const double getZFar() const +[more]inline const double getZFar() const
-[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

Public Members

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

Protected Fields

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

Protected Methods

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

@@ -81,7 +81,7 @@
ovirtual const char* className() const
-ovirtual const Type getType() const +ovirtual const Type getType() const
obool operator < (const StateAttribute& rhs) const
@@ -134,114 +134,114 @@

Documentation

-
Encapsulte OpenGL glDepthFunc/Mask/Range functions
+
Encapsulate OpenGL glDepthFunc/Mask/Range functions
- +
o Depth()

- -

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

- +

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

- -

ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const + +
ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const

- +

oenum Function

- +
o NEVER

- +

o LESS

- +

o EQUAL

- +

o LEQUAL

- +

o GREATER

- +

o NOTEQUAL

- +

o GEQUAL

- +

o ALWAYS

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

- -

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

- +

oinline void setWriteMask(const bool mask)

- +

oinline const bool getWriteMask() const

- -

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

- +

oinline const double getZNear() const

- +

oinline const double getZFar() const

- +

ovirtual void apply(State& state) const

- +

ovirtual ~Depth()

- -

oFunction _func + +
oFunction _func

- +

obool _depthWriteMask

- +

odouble _zNear

- +

odouble _zFar

diff --git a/doc/doc++/osg/Drawable.html b/doc/doc++/osg/Drawable.html index 58d49f657..0e8b2da45 100644 --- a/doc/doc++/osg/Drawable.html +++ b/doc/doc++/osg/Drawable.html @@ -7,7 +7,7 @@ -

class SG_EXPORT osg::Drawable

Pure virtual base class for drawable Geomtery.
+

class SG_EXPORT osg::Drawable

Pure virtual base class for drawable Geometry.

Inheritance:

@@ -23,87 +23,104 @@

Public Methods

-[more] Drawable() +[more] Drawable()
-[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
-[more]virtual const char* className() const +[more]virtual const char* className() const
-[more]inline void setStateSet(StateSet* state) +[more]inline void setStateSet(StateSet* state)
Set the StateSet attached to the Drawable.
-[more]inline StateSet* getStateSet() +[more]inline StateSet* getStateSet()
Get the attached StateSet
-[more]inline const StateSet* getStateSet() const +[more]inline const StateSet* getStateSet() const
Get the attached const StateSet
-[more]void setSupportsDisplayList(const bool flag) -
Set the drawable to it can or cannot be used inconjunction with OpenGL display lists. +[more]void setSupportsDisplayList(const bool flag) +
Set the drawable to it can or cannot be used in conjunction with OpenGL display lists.
-[more]inline const bool getSupportsDisplayList() const -
Get whether display lists are supportd for this drawable instance +[more]inline const bool getSupportsDisplayList() const +
Get whether display lists are supported for this drawable instance
-[more]void setUseDisplayList(const bool flag) +[more]void setUseDisplayList(const bool flag)
When set to true, force the draw method to use OpenGL Display List for rendering.
-[more]inline const bool getUseDisplayList() const +[more]inline const bool getUseDisplayList() const
Return whether OpenGL display lists are being used for rendering
-[more]void dirtyDisplayList() +[more]void dirtyDisplayList()
Force a recompile on next draw() of any OpenGL display list associated with this geoset
-[more]inline void dirtyBound() +[more]inline void dirtyBound() +
Dirty the bounding box, forcing a computeBound() on the next call to getBound().
-[more]inline const BoundingBox& getBound() const +[more]inline const BoundingBox& getBound() const
get bounding box of geoset.
-[more]inline void draw(State& state) -
draw OpenGL primitives. -
-[more]void compile(State& state) +[more]void compile(State& state)
Immediately compile this drawable into an OpenGL Display List.
-[more]virtual void drawImmediateMode(State& state) = 0 +[more]virtual void drawImmediateMode(State& state) = 0
draw directly ignoring an OpenGL display list which could be attached.
-[more]static void deleteDisplayList(uint contextID, uint globj) +[more]static void deleteDisplayList(uint contextID, uint globj)
use deleteDisplayList instead of glDeleteList to allow OpenGL display list to cached until they can be deleted by the OpenGL context in which they were created, specified by contextID
-[more]static void flushDeletedDisplayLists(uint contextID) +[more]static void flushDeletedDisplayLists(uint contextID)
flush all the cached display list which need to be deleted in the OpenGL context related to contextID +
+[more]virtual bool getStats(Statistics&) +
Collect Stistics count from Drawable +
+[more]virtual AttributeBitMask suppportsAttributeOperation() const +
return the attributes supported by applyAttrbuteOperation() as an AttributeBitMask +
+[more]virtual AttributeBitMask applyAttributeOperation(AttributeFunctor&) +
return the attributes successully applied in applyAttributeUpdate +
+[more]inline void draw(State& state) +
draw OpenGL primitives. +

+ +

+

Public Members

+[more]typedef uint AttributeBitMaskenum AttributeBitMaskValues +
+class AttributeFunctor

Protected Fields

-[more]ref_ptr<StateSet> _dstate +[more]ref_ptr<StateSet> _dstate
-[more]bool _supportsDisplayList +[more]bool _supportsDisplayList
-[more]bool _useDisplayList +[more]bool _useDisplayList
-[more]mutable BoundingBox _bbox +[more]mutable BoundingBox _bbox
-[more]mutable bool _bbox_computed +[more]mutable bool _bbox_computed

Protected Methods

-[more] Drawable(const Drawable&) +[more] Drawable(const Drawable&)
-[more]Drawable& operator = (const Drawable&) +[more]Drawable& operator = (const Drawable&)
-[more]virtual ~Drawable() +[more]virtual ~Drawable()
-[more]virtual const bool computeBound() const = 0 +[more]virtual const bool computeBound() const = 0
compute the bounding box of the drawable.

Protected Members

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

@@ -136,46 +153,59 @@

Documentation

-
Pure virtual base class for drawable Geomtery. Contains no drawing primitives +
Pure virtual base class for drawable Geometry. Contains no drawing primitives directly, these are provided by subclasses such as GeoSet. State attributes for a Drawable are maintained in StateSet which the Drawable maintains a referenced counted pointer to. Both Drawable's and StateSet's can -be shared for optimal memory usage and graphics performance.
+be shared for optimal memory usage and graphics performance. + +

Subclasses should provide an instance of getStats(Statistics *st) if the subclass +contains drawing primitives. This member function should add the primitives it +draws into the Statistics class; for example add the number of quads, triangles etc +created. For an example see GeoSet.cpp: +getStats(osgUtil::Statistics *stat). +Failure to implement this routine will only result in the stats displayed for +your drawable being wrong. +Another example is in the InfinitePlane class- this draws a normal geoset AND +its own special set of quads, so this case of getPrims calls: +the normal geoset stats gs->getStats(..), and then adds the number of quads +rendered directly (it is rendered in a display list, but we do know how many +quads are in the display list).

- +
o Drawable()

- +

ovirtual bool isSameKindAs(const Object* obj) const

- +

ovirtual const char* className() const

- +

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

- +

oinline StateSet* getStateSet()
Get the attached StateSet

- +

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

- +

ovoid setSupportsDisplayList(const bool flag) -
Set the drawable to it can or cannot be used inconjunction with OpenGL +
Set the drawable to it can or cannot be used in conjunction with OpenGL display lists. With set to true, calls to Drawable::setUseDisplayList, whereas when set to false, no display lists can be created and calls to setUseDisplayList are ignored, and a warning is produced. The later @@ -184,63 +214,57 @@ on objects with dynamic internal data such as continuous Level of Detail algorithms.

- +

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

- +

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

- +

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

- +

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

- +

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

- +

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

- - -

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

- +

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

- +

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

- +

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

- +

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

+ + +

ovirtual bool getStats(Statistics&) +
Collect Stistics count from Drawable +

+ + +

otypedef uint AttributeBitMaskenum AttributeBitMaskValues +

+ + + +
o COORDS +

+ + +

o NORMALS +

+ + +

o COLORS +

+ + +

o TEXTURE_COORDS +

+ + +

o TEXTURE_COORDS_0 +

+ + +

o TEXTURE_COORDS_1 +

+ + +

o TEXTURE_COORDS_2 +

+ + +

o TEXTURE_COORDS_3 +

+ + + +
ovirtual AttributeBitMask suppportsAttributeOperation() const +
return the attributes supported by applyAttrbuteOperation() as an AttributeBitMask +

+ + +

ovirtual AttributeBitMask applyAttributeOperation(AttributeFunctor&) +
return the attributes successully applied in applyAttributeUpdate +

- -

o Drawable(const Drawable&) + +
o Drawable(const Drawable&)

- +

oDrawable& operator = (const Drawable&)

- +

ovirtual ~Drawable()

- +

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

- +

oref_ptr<StateSet> _dstate

- +

obool _supportsDisplayList

- +

obool _useDisplayList

- +

otypedef std::vector<uint> GLObjectList mutable GLObjectList _globjList

- +

omutable BoundingBox _bbox

- +

omutable bool _bbox_computed

- +

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

+ + +

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

Direct child classes: diff --git a/doc/doc++/osg/Fog.html b/doc/doc++/osg/Fog.html index daeabad0a..1fa3bdbbc 100644 --- a/doc/doc++/osg/Fog.html +++ b/doc/doc++/osg/Fog.html @@ -23,59 +23,59 @@

Public Methods

-[more] Fog() +[more] Fog()
-[more] META_StateAttribute(Fog, FOG) +[more] META_StateAttribute(Fog, FOG)
-[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
-[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const +[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const
-[more]inline void setMode( const Mode mode ) +[more]inline void setMode( const Mode mode )
-[more]inline Mode getMode() const +[more]inline Mode getMode() const
-[more]inline void setDensity( const float density ) +[more]inline void setDensity( const float density )
-[more]inline const float getDensity() const +[more]inline const float getDensity() const
-[more]inline void setStart( const float start ) +[more]inline void setStart( const float start )
-[more]inline const float getStart() const +[more]inline const float getStart() const
-[more]inline void setEnd( const float end ) +[more]inline void setEnd( const float end )
-[more]inline const float getEnd() const +[more]inline const float getEnd() const
-[more]inline void setColor( const Vec4 &color ) +[more]inline void setColor( const Vec4 &color )
-[more]inline const Vec4& getColor() const +[more]inline const Vec4& getColor() const
-[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

Public Members

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

Protected Fields

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

Protected Methods

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

@@ -89,7 +89,7 @@
ovirtual const char* className() const
-ovirtual const Type getType() const +ovirtual const Type getType() const
obool operator < (const StateAttribute& rhs) const
@@ -146,106 +146,106 @@
- +
o Fog()

- -

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

- +

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

- -

ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const + +
ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const

- +

oenum Mode

- +
o LINEAR

- +

o EXP

- +

o EXP2

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

- -

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

- +

oinline void setDensity( const float density )

- +

oinline const float getDensity() const

- -

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

- +

oinline const float getStart() const

- -

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

- +

oinline const float getEnd() const

- +

oinline void setColor( const Vec4 &color )

- +

oinline const Vec4& getColor() const

- +

ovirtual void apply(State& state) const

- +

ovirtual ~Fog()

- -

oMode _mode + +
oMode _mode

- +

ofloat _density

- +

ofloat _start

- +

ofloat _end

- +

oVec4 _color

diff --git a/doc/doc++/osg/FrameStamp.html b/doc/doc++/osg/FrameStamp.html index e24f4ec49..764aa7269 100644 --- a/doc/doc++/osg/FrameStamp.html +++ b/doc/doc++/osg/FrameStamp.html @@ -23,50 +23,50 @@

Public Methods

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

Protected Fields

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

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

- -

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

- +

o ~FrameStamp()

- +

oFrameStamp& operator = (const FrameStamp& fs)

- +

ovoid setFrameNumber(int fnum)

- +

oint getFrameNumber() const

- +

ovoid setReferenceTime(double refTime)

- +

odouble getReferenceTime() const

- +

ovoid setCalanderTime(const tm& calanderTime)

- +

ovoid getCalanderTime(tm& calanderTime) const

- +

oint _frameNumber

- +

odouble _referenceTime

- +

oint tm_sec

- +

oint tm_min

- +

oint tm_hour

- +

oint tm_mday

- +

oint tm_mon

- +

oint tm_year

- +

oint tm_wday

- +

oint tm_yday

- +

oint tm_isdst

diff --git a/doc/doc++/osg/FrontFace.html b/doc/doc++/osg/FrontFace.html index 6132eeda4..2ca9568e8 100644 --- a/doc/doc++/osg/FrontFace.html +++ b/doc/doc++/osg/FrontFace.html @@ -23,33 +23,33 @@

Public Methods

-[more] FrontFace() +[more] FrontFace()
-[more] META_StateAttribute(FrontFace, FRONTFACE) +[more] META_StateAttribute(FrontFace, FRONTFACE)
-[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
-[more]inline void setMode(const Mode mode) +[more]inline void setMode(const Mode mode)
-[more]inline const Mode getMode() const +[more]inline const Mode getMode() const
-[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

Public Members

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

Protected Fields

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

Protected Methods

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

@@ -63,7 +63,7 @@
ovirtual const char* className() const
-ovirtual const Type getType() const +ovirtual const Type getType() const
obool operator < (const StateAttribute& rhs) const
@@ -71,7 +71,7 @@
obool operator != (const StateAttribute& rhs) const
-ovirtual void setStateSetModes(StateSet&, const GLModeValue) const +ovirtual void setStateSetModes(StateSet&, const GLModeValue) const
ovirtual void compile(State&) const

@@ -122,51 +122,51 @@
- +
o FrontFace()

- -

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

- +

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

- +

oenum Mode

- +
o CLOCKWISE

- +

o COUNTER_CLOCKWISE

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

- -

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

- +

ovirtual void apply(State& state) const

- +

ovirtual ~FrontFace()

- -

oMode _mode + +
oMode _mode

This class has no child classes.
diff --git a/doc/doc++/osg/General.html b/doc/doc++/osg/General.html index cdd8f0eef..b9743f3c5 100644 --- a/doc/doc++/osg/General.html +++ b/doc/doc++/osg/General.html @@ -37,15 +37,24 @@ o#define OSG_COLORMASK
+o#define +OSG_COLORMATRIX
+ o#define OSG_CULLFACE
o#define OSG_DEPTH
+o#define +OSG_DisplaySettings
+ o#define OSG_DRAWABLE
+o#define +OSG_EARTHSKY
+ o#define OSG_EXPORT
@@ -70,6 +79,9 @@ o#define OSG_FRAMESTAMP
+ousing +std::tm
+ o#define OSG_FRONTFACE
@@ -103,6 +115,9 @@ o#define OSG_GLEXTENSIONS
+o#define +OSG_GLU
+ o#define OSG_GROUP
@@ -124,12 +139,81 @@ o#define OSG_LINESEGMENT
+o#define +OSG_LineWidth
+ o#define OSG_LOD
o#define OSG_MATERIAL
+o#define +__OSG_MATH
+ +o#define +M_E
+ +o#define +M_LOG2E
+ +o#define +M_LOG10E
+ +o#define +M_LN2
+ +o#define +M_LN10
+ +o#define +M_PI
+ +o#define +M_PI_2
+ +o#define +M_PI_4
+ +o#define +M_1_PI
+ +o#define +M_2_PI
+ +o#define +M_2_SQRTPI
+ +o#define +M_SQRT2
+ +o#define +M_SQRT1_2
+ +o#define +acosf(float)
+ +o#define +asinf(float)
+ +o#define +cosf(float)
+ +o#define +sinf(float)
+ +o#define +logf(float)
+ +o#define +floorf(float)
+ +o#define +powf(float)
+ +o#define +sqrtf(float)
+ o#define OSG_MATRIX
@@ -184,6 +268,9 @@ o#define OSG_STATESET
+o#define +OSGUTIL_STATISTICS
+ o#define OSG_STENCIL
@@ -203,7 +290,7 @@ OSG_TEXTURE
o#define -GL_TEXTURE_MAX_ANISOTROPY_EXT(GLenum)
+GL_TEXTURE_MAX_ANISOTROPY_EXT
o#define GL_COMPRESSED_ALPHA_ARB
@@ -253,8 +340,11 @@ o#define GL_MIRRORED_REPEAT_IBM
+o#define +GL_CLAMP_TO_EDGE
+ o#define -GL_GENERATE_MIPMAP_SGIS(GLenum)
+GL_GENERATE_MIPMAP_SGIS
o#define GL_GENERATE_MIPMAP_HINT_SGIS
@@ -262,6 +352,9 @@ o#define OSG_TIMER
+opragmaoptimize("", on) +(x)(".byte 0x0f, 0x31" : "=A" (x))
+ o#define OSG_TRANSFORM
@@ -271,6 +364,9 @@ o#define OSG_TYPES
+otypedef uchar +ubyte
+ o#define OSG_VEC2
diff --git a/doc/doc++/osg/GeoSet.html b/doc/doc++/osg/GeoSet.html index a278ba7cd..790368bb7 100644 --- a/doc/doc++/osg/GeoSet.html +++ b/doc/doc++/osg/GeoSet.html @@ -23,284 +23,307 @@

Public Methods

-[more] GeoSet() +[more] GeoSet()
-[more]virtual Object* clone() const +[more]virtual Object* clone() const
-[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
-[more]virtual const char* className() const +[more]virtual const char* className() const
-[more]inline void setNumPrims( const int n ) +[more]inline void setNumPrims( const int n )
-[more]inline const int getNumPrims() const +[more]inline const int getNumPrims() const
-[more]void setPrimType( const PrimitiveType type ) +[more]void setPrimType( const PrimitiveType type )
-[more]inline const PrimitiveType getPrimType() const +[more]inline const PrimitiveType getPrimType() const
-[more]inline void setPrimLengths( int* lens ) +[more]inline void setPrimLengths( int* lens )
-[more]inline int* getPrimLengths() +[more]inline int* getPrimLengths()
-[more]inline const int* getPrimLengths() const +[more]inline const int* getPrimLengths() const
-[more]void computeNumVerts() +[more]void computeNumVerts() const
-[more]inline const int getNumCoords() const +[more]inline const int getNumCoords() const
get the number of coords required by the defined primitives.
-[more]inline Vec3* getCoords() +[more]inline Vec3* getCoords()
get a pointer to Vec3 coord array.
-[more]inline const Vec3* getCoords() const +[more]inline const Vec3* getCoords() const
get a const pointer to Vec3 coord array.
-[more]inline const int getNumCoordIndices() const +[more]inline const int getNumCoordIndices() const
get the number of indices required by the defined primitives.
-[more]inline IndexPointer& getCoordIndices() +[more]inline IndexPointer& getCoordIndices()
get the coord index array.
-[more]inline const IndexPointer& getCoordIndices() const +[more]inline const IndexPointer& getCoordIndices() const
get the const coord index array.
-[more]void setCoords( Vec3* cp ) +[more]void setCoords( Vec3* cp )
set the coords (ie the geometry) of the geoset
-[more]void setCoords( Vec3* cp, ushort* ci ) +[more]void setCoords( Vec3* cp, ushort* ci )
set the coords (ie the geometry) and ushort indices of the geoset.
-[more]void setCoords( Vec3* cp, uint* ci ) +[more]void setCoords( Vec3* cp, uint* ci )
set the coords (ie the geometry) and uint indices of the geoset.
-[more]void setCoords( Vec3* cp, IndexPointer& ip ) +[more]void setCoords( Vec3* cp, IndexPointer& ip )
set the coords (ie the geometry) and indices of the geoset
-[more]inline const int getNumNormals() const +[more]inline const int getNumNormals() const
get the number of normals required by the defined primitives and normals binding
-[more]inline Vec3* getNormals() +[more]inline Vec3* getNormals()
get a pointer to Vec3 normal array.
-[more]inline const Vec3* getNormals() const +[more]inline const Vec3* getNormals() const
get a const pointer to Vec3 normal array.
-[more]inline int getNumNormalIndices() const +[more]inline int getNumNormalIndices() const
get the number of normal indices required by the defined primitives and normals binding
-[more]inline IndexPointer& getNormalIndices() +[more]inline IndexPointer& getNormalIndices()
get the normal index array.
-[more]inline const IndexPointer& getNormalIndices() const +[more]inline const IndexPointer& getNormalIndices() const
get the const normal index array.
-[more]void setNormals( Vec3* np ) +[more]void setNormals( Vec3* np )
set the normals of the geoset
-[more]void setNormals( Vec3* np, ushort* ni ) +[more]void setNormals( Vec3* np, ushort* ni )
set the normals and normal indices of the geoset
-[more]void setNormals( Vec3* np, uint* ni ) +[more]void setNormals( Vec3* np, uint* ni )
set the normals and normal indices of the geoset
-[more]void setNormals( Vec3* np, IndexPointer& ip ) +[more]void setNormals( Vec3* np, IndexPointer& ip )
set the normals and normal indices of the geoset
-[more]void setNormalBinding( const BindingType binding ) +[more]void setNormalBinding( const BindingType binding )
set the normals binding to the vertices/primitives/overall
-[more]inline const BindingType getNormalBinding() const +[more]inline const BindingType getNormalBinding() const
-[more]inline const int getNumColors() const +[more]inline const int getNumColors() const
get the number of colors required by the defined primitives and color binding
-[more]inline Vec4* getColors() +[more]inline Vec4* getColors()
get a pointer to Vec4 color array.
-[more]inline const Vec4* getColors() const +[more]inline const Vec4* getColors() const
get a pointer to Vec4 color array.
-[more]inline int getNumColorIndices() const +[more]inline int getNumColorIndices() const
get the number of colors indices required by the defined primitives and color binding
-[more]inline IndexPointer& getColorIndices() +[more]inline IndexPointer& getColorIndices()
get the color index array.
-[more]inline const IndexPointer& getColorIndices() const +[more]inline const IndexPointer& getColorIndices() const
get the const color index array.
-[more]void setColors( Vec4* cp ) +[more]void setColors( Vec4* cp )
set the colors of the geoset
-[more]void setColors( Vec4* cp, ushort* li ) +[more]void setColors( Vec4* cp, ushort* li )
set the colors and color indices of the geoset
-[more]void setColors( Vec4* cp, uint* li ) +[more]void setColors( Vec4* cp, uint* li )
set the colors and color indices of the geoset
-[more]void setColors( Vec4* cp, IndexPointer& ip ) +[more]void setColors( Vec4* cp, IndexPointer& ip )
set the colors and color indices of the geoset
-[more]void setColorBinding( BindingType binding ) +[more]void setColorBinding( BindingType binding )
set the color binding to the vertices/primitives/overall
-[more]inline BindingType getColorBinding() const +[more]inline BindingType getColorBinding() const
-[more]inline const int getNumTextureCoords() const +[more]inline const int getNumTextureCoords() const
get the number of texture coords required by the defined primitives and textures binding
-[more]inline Vec2* getTextureCoords() +[more]inline Vec2* getTextureCoords()
get a pointer to Vec4 color array.
-[more]inline const Vec2* getTextureCoords() const +[more]inline const Vec2* getTextureCoords() const
get a pointer to Vec4 color array.
-[more]inline const int getNumTextureIndices() const +[more]inline const int getNumTextureIndices() const
get the number of texture coord indices required by the defined primitives and texture binding
-[more]inline IndexPointer& getTextureIndices() +[more]inline IndexPointer& getTextureIndices()
get the texture index array.
-[more]inline const IndexPointer& getTextureIndices() const +[more]inline const IndexPointer& getTextureIndices() const
get the texture index array.
-[more]void setTextureCoords( Vec2* tc ) +[more]void setTextureCoords( Vec2* tc )
set the texture coords of the geoset
-[more]void setTextureCoords( Vec2* tc, ushort* ti ) +[more]void setTextureCoords( Vec2* tc, ushort* ti )
set the texture coords and texture coord indices of the geoset
-[more]void setTextureCoords( Vec2* tc, uint* ti ) +[more]void setTextureCoords( Vec2* tc, uint* ti )
set the texture coords and texture coord indices of the geoset
-[more]void setTextureCoords( Vec2* tc, IndexPointer& ip ) +[more]void setTextureCoords( Vec2* tc, IndexPointer& ip )
set the texture coords and texture indices of the geoset
-[more]void setTextureBinding( const BindingType binding ) +[more]void setTextureBinding( const BindingType binding )
set the texture coord binding to the vertices/primitives/overall
-[more]inline const BindingType getTextureBinding() const +[more]inline const BindingType getTextureBinding() const
-[more]inline const int getNumInterleavedCoords() const +[more]inline const int getNumInterleavedCoords() const
get the number of texture coords required by the defined primitives and textures binding
-[more]inline void* getInterleavedArray() +[more]inline void* getInterleavedArray()
get a pointer to interleaved float array.
-[more]inline const void* getInterleavedArray() const +[more]inline const void* getInterleavedArray() const
get a const pointer to interleaved float array.
-[more]inline const int getNumIterleavedIndices() const +[more]inline const int getNumInterleavedIndices() const
get the number of texture coord indices required by the defined primitives and texture binding
-[more]inline IndexPointer& getInterleavedIndices() +[more]inline IndexPointer& getInterleavedIndices()
get the texture index array.
-[more]inline const IndexPointer& getInterleavedIndices() const +[more]inline const IndexPointer& getInterleavedIndices() const
get the interleaved index array.
-[more]inline const InterleaveArrayType getInterleavedFromat() const +[more]inline const InterleaveArrayType getInterleavedFormat() const
get the interleaved array storage format.
-[more]void setInterleavedArray( const InterleaveArrayType format, float* ia ) +[more]void setInterleavedArray( const InterleaveArrayType format, float* ia )
set the interleaved arrays of the geoset
-[more]void setInterleavedArray( const InterleaveArrayType format, float* ia, ushort* iai ) +[more]void setInterleavedArray( const InterleaveArrayType format, float* ia, ushort* iai )
-[more]void setInterleavedArray( const InterleaveArrayType format, float* ia, uint* iai ) +[more]void setInterleavedArray( const InterleaveArrayType format, float* ia, uint* iai )
-[more]void setInterleavedArray( const InterleaveArrayType format, float* ia, IndexPointer& iai ) +[more]void setInterleavedArray( const InterleaveArrayType format, float* ia, IndexPointer& iai )
-[more]virtual void drawImmediateMode(State& state) +[more]virtual void drawImmediateMode(State& state)
draw geoset directly ignoring an OpenGL display list which could be attached.
-[more]const bool check() const +[more]const bool check() const +
+[more]void setAttributeDeleteFunctor(AttributeDeleteFunctor* adf) +
set an alternative AttributeDeleteFunction to handle attribute arrays attached to this Geoset +
+[more]AttributeDeleteFunctor* getAttributeDeleteFunctor() +
get the current AttributeDeleteFunction to handle attribute arrays attached to this Geoset +
+[more]const AttributeDeleteFunctor* getAttributeDeleteFunctor() const +
get the current AttributeDeleteFunction to handle attribute arrays attached to this Geoset +
+[more]bool getStats(Statistics &) +
Statistics collection for each drawable- 260901 +
+[more]virtual AttributeBitMask suppportsAttributeOperation() const +
return the attributes supported by applyAttrbuteUpdate() as an AttributeBitMask +
+[more]virtual AttributeBitMask applyAttributeOperation(AttributeFunctor& auf) +
return the attributes successully applied in applyAttributeUpdate

Public Members

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

Protected Fields

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

Protected Methods

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

@@ -328,13 +351,20 @@
oinline const BoundingBox& getBound() const
-oinline void draw(State& state) -
ovoid compile(State& state)
ostatic void deleteDisplayList(uint contextID, uint globj)
ostatic void flushDeletedDisplayLists(uint contextID) +
+oinline void draw(State& state) +

+ +

+

Public Members

+otypedef uint AttributeBitMaskenum AttributeBitMaskValues +
+class AttributeFunctor

@@ -391,699 +421,748 @@ be shared for optimal memory usage and graphics performance.
- +
oenum PrimitiveType

- +
o NO_TYPE

- +

o POINTS

- +

o LINES

- +

o LINE_STRIP

- +

o FLAT_LINE_STRIP

- +

o LINE_LOOP

- +

o TRIANGLES

- +

o TRIANGLE_STRIP

- +

o FLAT_TRIANGLE_STRIP

- +

o TRIANGLE_FAN

- +

o FLAT_TRIANGLE_FAN

- +

o QUADS

- +

o QUAD_STRIP

- +

o POLYGON

- +
oenum BindingType

- +
o BIND_OFF

- +

o BIND_OVERALL

- +

o BIND_PERPRIM

- +

o BIND_PERVERTEX

- +

o BIND_DEFAULT

- +
oenum InterleaveArrayType

- +
o IA_OFF

- +

o IA_V2F

- +

o IA_V3F

- +

o IA_C4UB_V2F

- +

o IA_C4UB_V3F

- +

o IA_C3F_V3F

- +

o IA_N3F_V3F

- +

o IA_C4F_N3F_V3F

- +

o IA_T2F_V3F

- +

o IA_T4F_V4F

- +

o IA_T2F_C4UB_V3F

- +

o IA_T2F_C3F_V3F

- +

o IA_T2F_N3F_V3F

- +

o IA_T2F_C4F_N3F_V3F

- +

o IA_T4F_C4F_N3F_V4F

- +
ostruct IndexPointer

- -
ouint _size + +
omutable uint _size

- +

obool _is_ushort

- +

ounion

- +
oushort* _ushort

- +

ouint* _uint

- +
o IndexPointer()

- -

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

- +

oinline const bool valid() const

- +

oinline const bool null() const

- +

oinline void setToNull()

- -

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

- -

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

- +

oinline const uint maxIndex() const

- +

oinline const uint operator [] (const uint pos) const

- +
o GeoSet()

- +

ovirtual Object* clone() const

- +

ovirtual bool isSameKindAs(const Object* obj) const

- +

ovirtual const char* className() const

- +

oinline void setNumPrims( const int n )

- +

oinline const int getNumPrims() const

- -

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

- -

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

- +

oinline void setPrimLengths( int* lens )

- +

oinline int* getPrimLengths()

- +

oinline const int* getPrimLengths() const

- -

ovoid computeNumVerts() + +
ovoid computeNumVerts() const

- +

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

- +

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

- +

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

- +

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

- -

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

- -

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

- +

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

- +

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

- +

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

- -

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

- +

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

- +

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

- +

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

- +

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

- -

oinline IndexPointer& getNormalIndices() + +
oinline IndexPointer& getNormalIndices()
get the normal index array.

- -

oinline const IndexPointer& getNormalIndices() const + +
oinline const IndexPointer& getNormalIndices() const
get the const normal index array.

- +

ovoid setNormals( Vec3* np )
set the normals of the geoset

- +

ovoid setNormals( Vec3* np, ushort* ni )
set the normals and normal indices of the geoset

- +

ovoid setNormals( Vec3* np, uint* ni )
set the normals and normal indices of the geoset

- -

ovoid setNormals( Vec3* np, IndexPointer& ip ) + +
ovoid setNormals( Vec3* np, IndexPointer& ip )
set the normals and normal indices of the geoset

- -

ovoid setNormalBinding( const BindingType binding ) + +
ovoid setNormalBinding( const BindingType binding )
set the normals binding to the vertices/primitives/overall

- -

oinline const BindingType getNormalBinding() const + +
oinline const BindingType getNormalBinding() const

- +

oinline const int getNumColors() const
get the number of colors required by the defined primitives and color binding

- +

oinline Vec4* getColors()
get a pointer to Vec4 color array.

- +

oinline const Vec4* getColors() const
get a pointer to Vec4 color array.

- +

oinline int getNumColorIndices() const
get the number of colors indices required by the defined primitives and color binding

- -

oinline IndexPointer& getColorIndices() + +
oinline IndexPointer& getColorIndices()
get the color index array.

- -

oinline const IndexPointer& getColorIndices() const + +
oinline const IndexPointer& getColorIndices() const
get the const color index array.

- +

ovoid setColors( Vec4* cp )
set the colors of the geoset

- +

ovoid setColors( Vec4* cp, ushort* li )
set the colors and color indices of the geoset

- +

ovoid setColors( Vec4* cp, uint* li )
set the colors and color indices of the geoset

- -

ovoid setColors( Vec4* cp, IndexPointer& ip ) + +
ovoid setColors( Vec4* cp, IndexPointer& ip )
set the colors and color indices of the geoset

- -

ovoid setColorBinding( BindingType binding ) + +
ovoid setColorBinding( BindingType binding )
set the color binding to the vertices/primitives/overall

- -

oinline BindingType getColorBinding() const + +
oinline BindingType getColorBinding() const

- +

oinline const int getNumTextureCoords() const
get the number of texture coords required by the defined primitives and textures binding

- +

oinline Vec2* getTextureCoords()
get a pointer to Vec4 color array.

- +

oinline const Vec2* getTextureCoords() const
get a pointer to Vec4 color array.

- +

oinline const int getNumTextureIndices() const
get the number of texture coord indices required by the defined primitives and texture binding

- -

oinline IndexPointer& getTextureIndices() + +
oinline IndexPointer& getTextureIndices()
get the texture index array.

- -

oinline const IndexPointer& getTextureIndices() const + +
oinline const IndexPointer& getTextureIndices() const
get the texture index array.

- +

ovoid setTextureCoords( Vec2* tc )
set the texture coords of the geoset

- +

ovoid setTextureCoords( Vec2* tc, ushort* ti )
set the texture coords and texture coord indices of the geoset

- +

ovoid setTextureCoords( Vec2* tc, uint* ti )
set the texture coords and texture coord indices of the geoset

- -

ovoid setTextureCoords( Vec2* tc, IndexPointer& ip ) + +
ovoid setTextureCoords( Vec2* tc, IndexPointer& ip )
set the texture coords and texture indices of the geoset

- -

ovoid setTextureBinding( const BindingType binding ) + +
ovoid setTextureBinding( const BindingType binding )
set the texture coord binding to the vertices/primitives/overall

- -

oinline const BindingType getTextureBinding() const + +
oinline const BindingType getTextureBinding() const

- +

oinline const int getNumInterleavedCoords() const
get the number of texture coords required by the defined primitives and textures binding

- +

oinline void* getInterleavedArray()
get a pointer to interleaved float array.

- +

oinline const void* getInterleavedArray() const
get a const pointer to interleaved float array.

- - -

oinline const int getNumIterleavedIndices() const + + +
oinline const int getNumInterleavedIndices() const
get the number of texture coord indices required by the defined primitives and texture binding

- -

oinline IndexPointer& getInterleavedIndices() + +
oinline IndexPointer& getInterleavedIndices()
get the texture index array.

- -

oinline const IndexPointer& getInterleavedIndices() const + +
oinline const IndexPointer& getInterleavedIndices() const
get the interleaved index array.

- - -

oinline const InterleaveArrayType getInterleavedFromat() const + + +
oinline const InterleaveArrayType getInterleavedFormat() const
get the interleaved array storage format.

- -

ovoid setInterleavedArray( const InterleaveArrayType format, float* ia ) + +
ovoid setInterleavedArray( const InterleaveArrayType format, float* ia )
set the interleaved arrays of the geoset

- -

ovoid setInterleavedArray( const InterleaveArrayType format, float* ia, ushort* iai ) + +
ovoid setInterleavedArray( const InterleaveArrayType format, float* ia, ushort* iai )

- -

ovoid setInterleavedArray( const InterleaveArrayType format, float* ia, uint* iai ) + +
ovoid setInterleavedArray( const InterleaveArrayType format, float* ia, uint* iai )

- -

ovoid setInterleavedArray( const InterleaveArrayType format, float* ia, IndexPointer& iai ) + +
ovoid setInterleavedArray( const InterleaveArrayType format, float* ia, IndexPointer& iai )

- +

ovirtual void drawImmediateMode(State& state)
draw geoset directly ignoring an OpenGL display list which could be attached. This is the internal draw method which does the drawing itself, and is the method to override when deriving from GeoSet for user-drawn objects.

- +

oconst bool check() const

+ + +

ostruct AttributeDeleteFunctor: public osg::Referenced +
function object which is used to handling the clean up of attribute arrays +associated with GeoSet's. A default is provided which assumes that all +momory attached to the GeoSet is owned by this GeoSet and can be deleted +using delete []. If this is not the cause derive your own AttributeDeleteFunctor +a specify your own memory deletion operation. +

+ + + +
ovirtual void operator() (GeoSet* gset) +

+ + + +
ovoid setAttributeDeleteFunctor(AttributeDeleteFunctor* adf) +
set an alternative AttributeDeleteFunction to handle attribute arrays attached to this Geoset +

+ + +

oAttributeDeleteFunctor* getAttributeDeleteFunctor() +
get the current AttributeDeleteFunction to handle attribute arrays attached to this Geoset +

+ + +

oconst AttributeDeleteFunctor* getAttributeDeleteFunctor() const +
get the current AttributeDeleteFunction to handle attribute arrays attached to this Geoset +

+ + +

obool getStats(Statistics &) +
Statistics collection for each drawable- 260901 +

+ + +

ovirtual AttributeBitMask suppportsAttributeOperation() const +
return the attributes supported by applyAttrbuteUpdate() as an AttributeBitMask +

+ + +

ovirtual AttributeBitMask applyAttributeOperation(AttributeFunctor& auf) +
return the attributes successully applied in applyAttributeUpdate +

- -

o GeoSet(const GeoSet&) + +
o GeoSet(const GeoSet&)

- +

oGeoSet& operator = (const GeoSet&)

- +

ovirtual ~GeoSet()

- +

ovirtual const bool computeBound() const

+ + +

oref_ptr<AttributeDeleteFunctor> _adf +

- +

oint _numprims

- -

oPrimitiveType _primtype + +
oPrimitiveType _primtype

- +

oint _needprimlen

- +

ounsigned int _oglprimtype

- +

oint* _primLengths

- -

ounsigned char _primlength + +
omutable unsigned char _primlength

- +

ounsigned char _flat_shaded_skip

- -

oint _numcoords + +
omutable int _numcoords

- +

oVec3* _coords

- -

oIndexPointer _cindex + +
oIndexPointer _cindex

- -

oBindingType _normal_binding + +
oBindingType _normal_binding

- -

oint _numnormals + +
omutable int _numnormals

- +

oVec3* _normals

- -

oIndexPointer _nindex + +
oIndexPointer _nindex

- -

oBindingType _color_binding + +
oBindingType _color_binding

- -

oint _numcolors + +
omutable int _numcolors

- +

oVec4* _colors

- -

oIndexPointer _colindex + +
oIndexPointer _colindex

- -

oBindingType _texture_binding + +
oBindingType _texture_binding

- -

oint _numtcoords + +
omutable int _numtcoords

- +

oVec2* _tcoords

- -

oIndexPointer _tindex + +
oIndexPointer _tindex

- +

ovoid* _iarray

- -

oIndexPointer _iaindex + +
oIndexPointer _iaindex

- -

oInterleaveArrayType _iaformat + +
oInterleaveArrayType _iaformat

- +

ounsigned int _ogliaformat

- +

oint _fast_path

- +

ovoid set_fast_path( void )

- +

ovoid draw_fast_path( void )

- +

ovoid draw_alternate_path( void )

diff --git a/doc/doc++/osg/Geode.html b/doc/doc++/osg/Geode.html index aad6f7886..dc670d677 100644 --- a/doc/doc++/osg/Geode.html +++ b/doc/doc++/osg/Geode.html @@ -23,51 +23,51 @@

Public Methods

-[more]typedef std::vector< ref_ptr<Drawable> > DrawableList Geode() +[more]typedef std::vector< ref_ptr<Drawable> > DrawableList Geode()
-[more] META_Node(Geode) +[more] META_Node(Geode)
-[more]virtual const bool addDrawable( Drawable* drawable ) +[more]virtual const bool addDrawable( Drawable* drawable )
Add Drawable to Geode.
-[more]virtual const bool removeDrawable( Drawable* drawable ) +[more]virtual const bool removeDrawable( Drawable* drawable )
Remove Drawable from Geode.
-[more]virtual const bool replaceDrawable( Drawable* origDraw, Drawable* newDraw ) +[more]virtual const bool replaceDrawable( Drawable* origDraw, Drawable* newDraw )
Replace specified Drawable with another Drawable.
-[more]inline const int getNumDrawables() const +[more]inline const int getNumDrawables() const
return the number of geoset's
-[more]inline Drawable* getDrawable( const int i ) +[more]inline Drawable* getDrawable( const int i )
return geoset at position i
-[more]inline const Drawable* getDrawable( const int i ) const +[more]inline const Drawable* getDrawable( const int i ) const
return geoset at position i
-[more]inline const bool containsDrawable(const Drawable* gset) const +[more]inline const bool containsDrawable(const Drawable* gset) const
return true if geoset is contained within Geode
-[more]inline DrawableList::iterator findDrawable(const Drawable* gset) -
return the iterator postion for specified Drawable. +[more]inline DrawableList::iterator findDrawable(const Drawable* gset) +
return the iterator position for specified Drawable.
-[more]inline DrawableList::const_iterator findDrawable(const Drawable* gset) const -
return the const_iterator postion for specified Drawable. +[more]inline DrawableList::const_iterator findDrawable(const Drawable* gset) const +
return the const_iterator position for specified Drawable.
-[more]void compileDrawables(State& state) -
complile OpenGL Display List for each geoset +[more]void compileDrawables(State& state) +
compile OpenGL Display List for each geoset

Protected Fields

-[more]DrawableList _drawables +[more]DrawableList _drawables

Protected Methods

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

@@ -93,7 +93,7 @@
oinline const std::string& getName() const
-oinline const ParentList& getParents() const +oinline const ParentList& getParents() const
oinline Group* getParent(const int i)
@@ -109,23 +109,25 @@
oinline const int getNumChildrenRequiringAppTraversal() const
-oinline void setUserData(void* data, MemoryAdapter* ma=0L) +ovoid setCullingActive(const bool active)
-oinline void* getUserData() +oinline const bool getCullingActive() const
-oinline const void* getUserData() const +oinline const int getNumChildrenWithCullingDisabled() const
-oinline MemoryAdapter* getMemoryAdapter() +oinline void setUserData(osg::Referenced* obj)
-oinline const MemoryAdapter* getMemoryAdapter() const +oinline Referenced* getUserData() +
+oinline const Referenced* getUserData() const
oinline void setNodeMask(const NodeMask nm)
oinline const NodeMask getNodeMask() const
-oinline const DescriptionList& getDescriptions() const +oinline const DescriptionList& getDescriptions() const
-oinline DescriptionList& getDescriptions() +oinline DescriptionList& getDescriptions()
oinline const std::string& getDescription(const int i) const
@@ -161,19 +163,21 @@
ostd::string _name
-oParentList _parents +oParentList _parents
oref_ptr<NodeCallback> _appCallback
oint _numChildrenRequiringAppTraversal
-ovoid* _userData +obool _cullingActive
-oref_ptr<MemoryAdapter> _memoryAdapter +oint _numChildrenWithCullingDisabled +
+oosg::ref_ptr<Referenced> _userData
oNodeMask _nodeMask
-oDescriptionList _descriptions +oDescriptionList _descriptions
oref_ptr<StateSet> _dstate

@@ -181,6 +185,8 @@

Protected Methods

ovoid setNumChildrenRequiringAppTraversal(const int num) +
+ovoid setNumChildrenWithCullingDisabled(const int num)

@@ -214,15 +220,15 @@
- +
otypedef std::vector< ref_ptr<Drawable> > DrawableList Geode()

- +

o META_Node(Geode)

- +

ovirtual const bool addDrawable( Drawable* drawable )
Add Drawable to Geode. If gset is not NULL and is not contained in Geode then increment its @@ -231,7 +237,7 @@ sphere to force it to recompute on next getBound() and return true for success. Otherwise return false.

- +

ovirtual const bool removeDrawable( Drawable* drawable )
Remove Drawable from Geode. If gset is contained in Geode then remove it from the geoset @@ -241,7 +247,7 @@ return true for success. If gset is not found then return false and do not change the reference count of gset.

- +

ovirtual const bool replaceDrawable( Drawable* origDraw, Drawable* newDraw )
Replace specified Drawable with another Drawable. Decrement the reference count origGSet and increments the @@ -252,52 +258,52 @@ add newGset. If newGset is NULL then return false and do not remove origGset.

- +

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

- +

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

- +

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

- +

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

- +

oinline DrawableList::iterator findDrawable(const Drawable* gset) -
return the iterator postion for specified Drawable. +
return the iterator position for specified Drawable. return _geoset.end() if gset not is contained in Geode.

- +

oinline DrawableList::const_iterator findDrawable(const Drawable* gset) const -
return the const_iterator postion for specified Drawable. +
return the const_iterator position for specified Drawable. return _geoset.end() if gset not is contained in Geode.

- +

ovoid compileDrawables(State& state) -
complile OpenGL Display List for each geoset +
compile OpenGL Display List for each geoset

- +

ovirtual ~Geode()

- +

ovirtual const bool computeBound() const

- +

oDrawableList _drawables

diff --git a/doc/doc++/osg/Group.html b/doc/doc++/osg/Group.html index c4fb29099..6645d744a 100644 --- a/doc/doc++/osg/Group.html +++ b/doc/doc++/osg/Group.html @@ -11,11 +11,11 @@

Inheritance:

- - - - - + + + + +
@@ -23,50 +23,50 @@

Public Methods

-[more]typedef std::vector<ref_ptr<Node> > ChildList Group() +[more]typedef std::vector<ref_ptr<Node> > ChildList Group()
-[more] META_Node(Group) +[more] META_Node(Group)
-[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 removeChild( Node* child ) +[more]virtual bool removeChild( Node* child )
Remove Node from Group.
-[more]virtual bool replaceChild( Node* origChild, Node* newChild ) +[more]virtual bool replaceChild( Node* origChild, Node* newChild )
Replace specified Node with another Node.
-[more]inline const int getNumChildren() const +[more]inline const int getNumChildren() const
return the number of chilren nodes
-[more]inline Node* getChild( const int i ) +[more]inline Node* getChild( const int i )
return child node at position i
-[more]inline const Node* getChild( const int i ) const +[more]inline const Node* getChild( const int i ) const
return child node at position i
-[more]inline bool containsNode( const Node* node ) const +[more]inline bool containsNode( const Node* node ) const
return true if node is contained within Group
-[more]inline ChildList::iterator findNode( const Node* node ) -
return the iterator postion for specified Node. +[more]inline ChildList::iterator findNode( const Node* node ) +
return the iterator position for specified Node.
-[more]inline ChildList::const_iterator findNode( const Node* node ) const -
return the const_iterator postion for specified Node. +[more]inline ChildList::const_iterator findNode( const Node* node ) const +
return the const_iterator position for specified Node.

Protected Fields

-[more]ChildList _children +[more]ChildList _children

Protected Methods

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

@@ -90,7 +90,7 @@
oinline const std::string& getName() const
-oinline const ParentList& getParents() const +oinline const ParentList& getParents() const
oinline Group* getParent(const int i)
@@ -106,23 +106,25 @@
oinline const int getNumChildrenRequiringAppTraversal() const
-oinline void setUserData(void* data, MemoryAdapter* ma=0L) +ovoid setCullingActive(const bool active)
-oinline void* getUserData() +oinline const bool getCullingActive() const
-oinline const void* getUserData() const +oinline const int getNumChildrenWithCullingDisabled() const
-oinline MemoryAdapter* getMemoryAdapter() +oinline void setUserData(osg::Referenced* obj)
-oinline const MemoryAdapter* getMemoryAdapter() const +oinline Referenced* getUserData() +
+oinline const Referenced* getUserData() const
oinline void setNodeMask(const NodeMask nm)
oinline const NodeMask getNodeMask() const
-oinline const DescriptionList& getDescriptions() const +oinline const DescriptionList& getDescriptions() const
-oinline DescriptionList& getDescriptions() +oinline DescriptionList& getDescriptions()
oinline const std::string& getDescription(const int i) const
@@ -158,19 +160,21 @@
ostd::string _name
-oParentList _parents +oParentList _parents
oref_ptr<NodeCallback> _appCallback
oint _numChildrenRequiringAppTraversal
-ovoid* _userData +obool _cullingActive
-oref_ptr<MemoryAdapter> _memoryAdapter +oint _numChildrenWithCullingDisabled +
+oosg::ref_ptr<Referenced> _userData
oNodeMask _nodeMask
-oDescriptionList _descriptions +oDescriptionList _descriptions
oref_ptr<StateSet> _dstate

@@ -178,6 +182,8 @@

Protected Methods

ovoid setNumChildrenRequiringAppTraversal(const int num) +
+ovoid setNumChildrenWithCullingDisabled(const int num)

@@ -213,19 +219,19 @@ with memory management handled automatically via osg::Referenced.
- +
otypedef std::vector<ref_ptr<Node> > ChildList Group()

- +

o META_Node(Group)

- +

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 @@ -234,7 +240,7 @@ sphere to force it to recompute on next getBound() and return true for success. Otherwise return false. Scene nodes can't be added as child nodes.

- +

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

- +

ovirtual bool replaceChild( Node* origChild, Node* newChild )
Replace specified Node with another Node. Decrement the reference count origNode and increments the @@ -255,47 +261,47 @@ add newNode. If newNode is NULL then return false and do not remove origNode. Also returns false if newChild is a Scene node.

- +

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

- +

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

- +

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

- +

oinline bool containsNode( const Node* node ) const
return true if node is contained within Group

- +

oinline ChildList::iterator findNode( const Node* node ) -
return the iterator postion for specified Node. -return _chilren.end() if node is not contained in Group. +
return the iterator position for specified Node. +return _children.end() if node is not contained in Group.

- +

oinline ChildList::const_iterator findNode( const Node* node ) const -
return the const_iterator postion for specified Node. -return _chilren.end() if node is not contained in Group. +
return the const_iterator position for specified Node. +return _children.end() if node is not contained in Group.

- +

ovirtual ~Group()

- +

ovirtual const bool computeBound() const

- +

oChildList _children

@@ -303,6 +309,7 @@ return _chilren.end() if node is not contained in Group.
Transform
Switch
LOD
+EarthSky

Alphabetic index HTML hierarchy of classes or Java

diff --git a/doc/doc++/osg/HIER.html b/doc/doc++/osg/HIER.html index c8769f7a2..6332602d4 100644 --- a/doc/doc++/osg/HIER.html +++ b/doc/doc++/osg/HIER.html @@ -9,15 +9,16 @@

Hierarchy of Classes

  • osg::State diff --git a/doc/doc++/osg/HIERjava.html b/doc/doc++/osg/HIERjava.html index dd327c531..02437d10b 100644 --- a/doc/doc++/osg/HIERjava.html +++ b/doc/doc++/osg/HIERjava.html @@ -30,7 +30,7 @@
    • - + @@ -50,11 +50,11 @@ - - - - - + + + + + diff --git a/doc/doc++/osg/Image.html b/doc/doc++/osg/Image.html index c91c90c8c..c631c0cc7 100644 --- a/doc/doc++/osg/Image.html +++ b/doc/doc++/osg/Image.html @@ -23,80 +23,86 @@

    Public Methods

    -[more] Image() +[more] Image()
    -[more]virtual Object* clone() const +[more]virtual Object* clone() const
    -[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    -[more]inline const std::string& getFileName() const +[more]inline const std::string& getFileName() const
    -[more]void setFileName(const std::string& fileName) +[more]void setFileName(const std::string& fileName)
    -[more]void setImage(const int s, const int t, const int r, const int internalFormat, const unsigned int pixelFormat, const unsigned int dataType, unsigned char* data, const int packing=-1) +[more]void setImage(const int s, const int t, const int r, const int internalFormat, const unsigned int pixelFormat, const unsigned int dataType, unsigned char* data, const int packing=-1)
    set the image data and format.
    -[more]inline const int s() const +[more]inline const int s() const
    Width of image
    -[more]inline const int t() const +[more]inline const int t() const
    Height of image
    -[more]inline const int r() const +[more]inline const int r() const
    Depth of image
    -[more]inline const int internalFormat() const +[more]inline const int internalFormat() const
    -[more]inline const unsigned int pixelFormat() const +[more]inline const unsigned int pixelFormat() const
    -[more]inline const unsigned int dataType() const +[more]inline const unsigned int dataType() const
    -[more]inline const unsigned int packing() const +[more]inline const unsigned int packing() const
    -[more]inline unsigned char* data() +[more]inline unsigned char* data()
    raw image data
    -[more]inline const unsigned char* data() const +[more]inline const unsigned char* data() const
    raw const image data
    -[more]void scaleImage(const int s, const int t, const int r) +[more]void scaleImage(const int s, const int t, const int r)
    Scale image to specified size.
    -[more]void ensureDimensionsArePowerOfTwo() +[more]void ensureDimensionsArePowerOfTwo()
    Ensure image dimensions are a power of two.
    -[more]inline const unsigned int getModifiedTag() const -
    Get modified tag value. +[more]inline void dirty() +
    Dirty the image, which increments the modified flag, to force osg::Texture to reload the image +
    +[more]inline void setModifiedTag(const unsigned int value) +
    Set the modified tag value, only used by osg::Texture when using texture subloading. +
    +[more]inline const unsigned int getModifiedTag() const +
    Get modified tag value, only used by osg::Texture when using texture subloading.

    Protected Fields

    -[more]std::string _fileName +[more]std::string _fileName
    -[more]int _s +[more]int _s
    -[more]int _t +[more]int _t
    -[more]int _r +[more]int _r
    -[more]int _internalFormat +[more]int _internalFormat
    -[more]unsigned int _pixelFormat +[more]unsigned int _pixelFormat
    -[more]unsigned int _dataType +[more]unsigned int _dataType
    -[more]unsigned int _packing +[more]unsigned int _packing
    -[more]unsigned char* _data +[more]unsigned char* _data
    -[more]unsigned int _modifiedTag +[more]unsigned int _modifiedTag

    Protected Methods

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

    @@ -130,138 +136,148 @@
    - +
    o Image()

    - +

    ovirtual Object* clone() const

    - +

    ovirtual bool isSameKindAs(const Object* obj) const

    - +

    ovirtual const char* className() const

    - +

    oinline const std::string& getFileName() const

    - +

    ovoid setFileName(const std::string& fileName)

    - -

    ovoid setImage(const int s, const int t, const int r, const int internalFormat, const unsigned int pixelFormat, const unsigned int dataType, unsigned char* data, const int packing=-1) + +
    ovoid setImage(const int s, const int t, const int r, const int internalFormat, const unsigned int pixelFormat, const unsigned int dataType, unsigned char* data, const int packing=-1)
    set the image data and format. note, when the packing value is negative (the default is -1) this method assumes a _packing width of 1 if the width is not a multiple of 4, -otherwise automatically sets to _packing to 4. If a postive +otherwise automatically sets to _packing to 4. If a positive value of packing is supplied than _packing is simply set to that value.

    - +

    oinline const int s() const
    Width of image

    - +

    oinline const int t() const
    Height of image

    - +

    oinline const int r() const
    Depth of image

    - +

    oinline const int internalFormat() const

    - +

    oinline const unsigned int pixelFormat() const

    - +

    oinline const unsigned int dataType() const

    - +

    oinline const unsigned int packing() const

    - +

    oinline unsigned char* data()
    raw image data

    - +

    oinline const unsigned char* data() const
    raw const image data

    - -

    ovoid scaleImage(const int s, const int t, const int r) + +
    ovoid scaleImage(const int s, const int t, const int r)
    Scale image to specified size.

    - +

    ovoid ensureDimensionsArePowerOfTwo()
    Ensure image dimensions are a power of two. Mip Mapped texture require the image dimensions to be power of two.

    + + +

    oinline void dirty() +
    Dirty the image, which increments the modified flag, to force osg::Texture to reload the image +

    + + +

    oinline void setModifiedTag(const unsigned int value) +
    Set the modified tag value, only used by osg::Texture when using texture subloading. +

    - +

    oinline const unsigned int getModifiedTag() const -
    Get modified tag value. +
    Get modified tag value, only used by osg::Texture when using texture subloading.

    - +

    ovirtual ~Image()

    - +

    ostd::string _fileName

    - +

    oint _s

    - +

    oint _t

    - +

    oint _r

    - +

    oint _internalFormat

    - +

    ounsigned int _pixelFormat

    - +

    ounsigned int _dataType

    - +

    ounsigned int _packing

    - +

    ounsigned char* _data

    - +

    ounsigned int _modifiedTag

    diff --git a/doc/doc++/osg/Impostor.html b/doc/doc++/osg/Impostor.html index fdfb33be8..64404314d 100644 --- a/doc/doc++/osg/Impostor.html +++ b/doc/doc++/osg/Impostor.html @@ -23,45 +23,45 @@

    Public Methods

    -[more] Impostor() +[more] Impostor()
    -[more] META_Node(Impostor) +[more] META_Node(Impostor)
    -[more]inline void setImpostorThreshold(float distance) +[more]inline void setImpostorThreshold(float distance)
    Set the Impostor threshold distance.
    -[more]inline void setImpostorThresholdToBound(float ratio=1.0f) +[more]inline void setImpostorThresholdToBound(float ratio=1.0f)
    Set the Impostor threshold distance relative to the node's bounding sphere's radius
    -[more]inline const float getImpostorThreshold() const +[more]inline const float getImpostorThreshold() const
    -[more]inline const float getImpostorThreshold2() const +[more]inline const float getImpostorThreshold2() const
    -[more]ImpostorSprite* findBestImpostorSprite(const osg::Vec3& currLocalEyePoint) +[more]ImpostorSprite* findBestImpostorSprite(const osg::Vec3& currLocalEyePoint)
    Find the ImposterSprite which fits the current eye point best
    -[more]void addImpostorSprite(ImpostorSprite* is) +[more]void addImpostorSprite(ImpostorSprite* is)
    Add an ImpostorSprite to the Impostor
    -[more]inline ImpostorSpriteList& getImpostorSpriteList() +[more]inline ImpostorSpriteList& getImpostorSpriteList()
    Get the list of ImpostorSprites attached to this Impostor
    -[more]inline const ImpostorSpriteList& getImpostorSpriteList() const +[more]inline const ImpostorSpriteList& getImpostorSpriteList() const
    Get a const list of ImpostorSprites attached to this const Impostor

    Protected Fields

    -[more]ImpostorSpriteList _impostorSpriteList +[more]ImpostorSpriteList _impostorSpriteList
    -[more]float _impostorThreshold +[more]float _impostorThreshold

    Protected Methods

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

    @@ -77,7 +77,7 @@
    oinline const int getNumRanges() const
    -oinline void setCenter(const Vec3 &center) +oinline void setCenter(const Vec3 &center)
    oinline const Vec3& getCenter() const
    @@ -146,7 +146,7 @@
    oinline const std::string& getName() const
    -oinline const ParentList& getParents() const +oinline const ParentList& getParents() const
    oinline Group* getParent(const int i)
    @@ -162,23 +162,25 @@
    oinline const int getNumChildrenRequiringAppTraversal() const
    -oinline void setUserData(void* data, MemoryAdapter* ma=0L) +ovoid setCullingActive(const bool active)
    -oinline void* getUserData() +oinline const bool getCullingActive() const
    -oinline const void* getUserData() const +oinline const int getNumChildrenWithCullingDisabled() const
    -oinline MemoryAdapter* getMemoryAdapter() +oinline void setUserData(osg::Referenced* obj)
    -oinline const MemoryAdapter* getMemoryAdapter() const +oinline Referenced* getUserData() +
    +oinline const Referenced* getUserData() const
    oinline void setNodeMask(const NodeMask nm)
    oinline const NodeMask getNodeMask() const
    -oinline const DescriptionList& getDescriptions() const +oinline const DescriptionList& getDescriptions() const
    -oinline DescriptionList& getDescriptions() +oinline DescriptionList& getDescriptions()
    oinline const std::string& getDescription(const int i) const
    @@ -214,19 +216,21 @@
    ostd::string _name
    -oParentList _parents +oParentList _parents
    oref_ptr<NodeCallback> _appCallback
    oint _numChildrenRequiringAppTraversal
    -ovoid* _userData +obool _cullingActive
    -oref_ptr<MemoryAdapter> _memoryAdapter +oint _numChildrenWithCullingDisabled +
    +oosg::ref_ptr<Referenced> _userData
    oNodeMask _nodeMask
    -oDescriptionList _descriptions +oDescriptionList _descriptions
    oref_ptr<StateSet> _dstate

    @@ -234,6 +238,8 @@

    Protected Methods

    ovoid setNumChildrenRequiringAppTraversal(const int num) +
    +ovoid setNumChildrenWithCullingDisabled(const int num)

    @@ -284,7 +290,7 @@ them.

    All you need to do to use Impostors is to set up the visible range values for each LOD child of the Impostor, as per osg::LOD, and set an Impostor threshold to tell the renderer at what distance -the Impsotor's image caching should cut in. The osg::CullVisitor +the Impostor's image caching should cut in. The osg::CullVisitor automatically handles all the setting of pre-rendering stages to calculate the required ImpostorSprites (which encapsulates the image cache and quad), and updates them as the view point changes. If you @@ -303,68 +309,68 @@ geometry.

    - +
    o Impostor()

    - +

    o META_Node(Impostor)

    - -

    oinline void setImpostorThreshold(float distance) + +
    oinline void setImpostorThreshold(float distance)
    Set the Impostor threshold distance. For eye points further than this threshold the Imposter is used if appropriate, otherwise the LOD children as chosen as per a standard LOD node.

    - +

    oinline void setImpostorThresholdToBound(float ratio=1.0f)
    Set the Impostor threshold distance relative to the node's bounding sphere's radius

    - +

    oinline const float getImpostorThreshold() const

    - +

    oinline const float getImpostorThreshold2() const

    - +

    oImpostorSprite* findBestImpostorSprite(const osg::Vec3& currLocalEyePoint)
    Find the ImposterSprite which fits the current eye point best

    - +

    ovoid addImpostorSprite(ImpostorSprite* is)
    Add an ImpostorSprite to the Impostor

    - +

    oinline ImpostorSpriteList& getImpostorSpriteList()
    Get the list of ImpostorSprites attached to this Impostor

    - +

    oinline const ImpostorSpriteList& getImpostorSpriteList() const
    Get a const list of ImpostorSprites attached to this const Impostor

    - +

    ovirtual ~Impostor()

    - +

    ovirtual const bool computeBound() const

    - +

    oImpostorSpriteList _impostorSpriteList

    - +

    ofloat _impostorThreshold

    diff --git a/doc/doc++/osg/ImpostorSprite.html b/doc/doc++/osg/ImpostorSprite.html index 5d5b2681f..badaf045d 100644 --- a/doc/doc++/osg/ImpostorSprite.html +++ b/doc/doc++/osg/ImpostorSprite.html @@ -23,106 +23,108 @@

    Public Methods

    -[more] ImpostorSprite() +[more] ImpostorSprite()
    -[more]virtual Object* clone() const +[more]virtual Object* clone() const
    -[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    -[more]void setParent(Impostor* parent) +[more]void setParent(Impostor* parent)
    Set the parent, which must be an Impostor.
    -[more]Impostor* getParent() +[more]Impostor* getParent()
    Get the parent, which is an Impostor.
    -[more]const Impostor* getParent() const +[more]const Impostor* getParent() const
    Get the const parent, which is an Impostor.
    -[more]inline void setStoredLocalEyePoint(const Vec3& v) +[more]inline void setStoredLocalEyePoint(const Vec3& v)
    Set the eye point for when the ImpsotorSprite was snapped
    -[more]inline const Vec3& getStoredLocalEyePoint() const +[more]inline const Vec3& getStoredLocalEyePoint() const
    Get the eye point for when the ImpsotorSprite was snapped
    -[more]inline void setLastFrameUsed(const int frameNumber) +[more]inline void setLastFrameUsed(const int frameNumber)
    Set the frame number for when the ImpostorSprite was last used in rendering
    -[more]inline int getLastFrameUsed() const +[more]inline int getLastFrameUsed() const
    Get the frame number for when the ImpostorSprite was last used in rendering
    -[more]inline Vec3* getCoords() +[more]inline Vec3* getCoords()
    Get the coordinates of the corners of the quad.
    -[more]inline const Vec3* getCoords() const +[more]inline const Vec3* getCoords() const
    Get the const coordinates of the corners of the quad
    -[more]inline Vec2* getTexCoords() +[more]inline Vec2* getTexCoords()
    Get the texture coordinates of the corners of the quad.
    -[more]inline const Vec2* getTexCoords() const +[more]inline const Vec2* getTexCoords() const
    Get the const texture coordinates of the corners of the quad
    -[more]inline Vec3* getControlCoords() +[more]inline Vec3* getControlCoords()
    Get the control coordinates of the corners of the quad.
    -[more]inline const Vec3* getControlCoords() const +[more]inline const Vec3* getControlCoords() const
    Get the const control coordinates of the corners of the quad
    -[more]const float calcPixelError(const Camera& camera, const Viewport& viewport, const osg::Matrix* matrix) const +[more]const float calcPixelError(const Camera& camera, const Viewport& viewport, const osg::Matrix* matrix) const
    calculate the pixel error value for current camera position and object position
    -[more]void setTexture(Texture* tex, int s, int t) +[more]void setTexture(Texture* tex, int s, int t)
    -[more]Texture* getTexture() +[more]Texture* getTexture()
    -[more]const Texture* getTexture() const +[more]const Texture* getTexture() const
    -[more]const int s() const +[more]const int s() const
    -[more]const int t() const +[more]const int t() const
    -[more]virtual void drawImmediateMode(State& state) +[more]virtual void drawImmediateMode(State& state)
    draw ImpostorSprite directly. +
    +[more]bool getStats(Statistics &stat)

    Protected Fields

    -[more]Impostor* _parent +[more]Impostor* _parent
    -[more]ImpostorSpriteManager* _ism +[more]ImpostorSpriteManager* _ism
    -[more]ImpostorSprite* _previous +[more]ImpostorSprite* _previous
    -[more]ImpostorSprite* _next +[more]ImpostorSprite* _next
    -[more]int _lastFrameUsed +[more]int _lastFrameUsed
    -[more]Vec3 _storedLocalEyePoint +[more]Vec3 _storedLocalEyePoint
    -[more]Vec3 _coords[4] +[more]Vec3 _coords[4]
    -[more]Vec2 _texcoords[4] +[more]Vec2 _texcoords[4]
    -[more]Vec3 _controlcoords[4] +[more]Vec3 _controlcoords[4]
    -[more]Texture* _texture +[more]Texture* _texture
    -[more]int _s +[more]int _s
    -[more]int _t +[more]int _t

    Protected Methods

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

    @@ -150,13 +152,24 @@
    oinline const BoundingBox& getBound() const
    -oinline void draw(State& state) -
    ovoid compile(State& state)
    ostatic void deleteDisplayList(uint contextID, uint globj)
    ostatic void flushDeletedDisplayLists(uint contextID) +
    +ovirtual AttributeBitMask suppportsAttributeOperation() const +
    +ovirtual AttributeBitMask applyAttributeOperation(AttributeFunctor&) +
    +oinline void draw(State& state) +

    + +

    +

    Public Members

    +otypedef uint AttributeBitMaskenum AttributeBitMaskValues +
    +class AttributeFunctor

    @@ -207,197 +220,201 @@
    An ImposterSprite is a textured quad which is rendered in place a 3D geometry. The ImposterSprite is generated by rendering the original 3D geometry to a texture as an image cache. The ImpostorSprite is -automatiacally generatated by the osgUtil::CullVisitor so it not +automatically generated by the osgUtil::CullVisitor so it not necessary to deal with it directly.
    - +
    o ImpostorSprite()

    - +

    ovirtual Object* clone() const

    - +

    ovirtual bool isSameKindAs(const Object* obj) const

    - +

    ovirtual const char* className() const

    - +

    ovoid setParent(Impostor* parent)
    Set the parent, which must be an Impostor. Unlike conventional Drawables, ImpostorSprite's can only ever have one parent.

    - +

    oImpostor* getParent()
    Get the parent, which is an Impostor.

    - +

    oconst Impostor* getParent() const
    Get the const parent, which is an Impostor.

    - +

    oinline void setStoredLocalEyePoint(const Vec3& v)
    Set the eye point for when the ImpsotorSprite was snapped

    - +

    oinline const Vec3& getStoredLocalEyePoint() const
    Get the eye point for when the ImpsotorSprite was snapped

    - +

    oinline void setLastFrameUsed(const int frameNumber)
    Set the frame number for when the ImpostorSprite was last used in rendering

    - +

    oinline int getLastFrameUsed() const
    Get the frame number for when the ImpostorSprite was last used in rendering

    - +

    oinline Vec3* getCoords()
    Get the coordinates of the corners of the quad. Stored in the order, [0] - top_left, [1] - bottom_left, [2] - bottom_right, [3] - top_left.

    - +

    oinline const Vec3* getCoords() const
    Get the const coordinates of the corners of the quad

    - +

    oinline Vec2* getTexCoords()
    Get the texture coordinates of the corners of the quad. Stored in the order, [0] - top_left, [1] - bottom_left, [2] - bottom_right, [3] - top_left.

    - +

    oinline const Vec2* getTexCoords() const
    Get the const texture coordinates of the corners of the quad

    - +

    oinline Vec3* getControlCoords()
    Get the control coordinates of the corners of the quad. -The control coordinates are the cornders of the quad projected +The control coordinates are the corners of the quad projected out onto the front face of bounding box which enclosed the impostor geometry when it was pre-rendered into the impostor sprite's texture. At the point of creation/or update of the impostor sprite the control -coords will lie ontop of the coorners of the quad in screen space - with a pixel error +coords will lie on top of the corners of the quad in screen space - with a pixel error or zero. Once the camera moves relative to the impostor sprite the -control coords will nolonger lie ontop of the corners of the quad in +control coords will no longer lie on top of the corners of the quad in screen space - a pixel error will have accumulated. This pixel error -can then be used to dertermine whether the impostor needs to be updated. +can then be used to determine whether the impostor needs to be updated. Stored in the order, [0] - top_left, [1] - bottom_left, [2] - bottom_right, [3] - top_left.

    - +

    oinline const Vec3* getControlCoords() const
    Get the const control coordinates of the corners of the quad

    - +

    oconst float calcPixelError(const Camera& camera, const Viewport& viewport, const osg::Matrix* matrix) const
    calculate the pixel error value for current camera position and object position

    - -

    ovoid setTexture(Texture* tex, int s, int t) + +
    ovoid setTexture(Texture* tex, int s, int t)

    - +

    oTexture* getTexture()

    - +

    oconst Texture* getTexture() const

    - +

    oconst int s() const

    - +

    oconst int t() const

    - +

    ovirtual void drawImmediateMode(State& state)
    draw ImpostorSprite directly.

    + + +

    obool getStats(Statistics &stat) +

    - -

    o ImpostorSprite(const ImpostorSprite&) + +
    o ImpostorSprite(const ImpostorSprite&)

    - +

    oImpostorSprite& operator = (const ImpostorSprite&)

    - +

    ovirtual ~ImpostorSprite()

    - +

    ovirtual const bool computeBound() const

    - +

    oImpostor* _parent

    - +

    oImpostorSpriteManager* _ism

    - +

    oImpostorSprite* _previous

    - +

    oImpostorSprite* _next

    - +

    oint _lastFrameUsed

    - +

    oVec3 _storedLocalEyePoint

    - +

    oVec3 _coords[4]

    - +

    oVec2 _texcoords[4]

    - +

    oVec3 _controlcoords[4]

    - +

    oTexture* _texture

    - +

    oint _s

    - +

    oint _t

    diff --git a/doc/doc++/osg/ImpostorSpriteManager.html b/doc/doc++/osg/ImpostorSpriteManager.html index 4f75a54b3..b26d32496 100644 --- a/doc/doc++/osg/ImpostorSpriteManager.html +++ b/doc/doc++/osg/ImpostorSpriteManager.html @@ -23,35 +23,35 @@

    Public Methods

    -[more] ImpostorSpriteManager() +[more] ImpostorSpriteManager()
    -[more]const bool empty() const +[more]const bool empty() const
    -[more]ImpostorSprite* first() +[more]ImpostorSprite* first()
    -[more]ImpostorSprite* last() +[more]ImpostorSprite* last()
    -[more]void push_back(ImpostorSprite* is) +[more]void push_back(ImpostorSprite* is)
    -[more]void remove(ImpostorSprite* is) +[more]void remove(ImpostorSprite* is)
    -[more]ImpostorSprite* createOrReuseImpostorSprite(int s, int t, int frameNumber) +[more]ImpostorSprite* createOrReuseImpostorSprite(int s, int t, int frameNumber)

    Protected Fields

    -[more]ref_ptr<TexEnv> _texenv +[more]ref_ptr<TexEnv> _texenv
    -[more]ref_ptr<AlphaFunc> _alphafunc +[more]ref_ptr<AlphaFunc> _alphafunc
    -[more]ImpostorSprite* _first +[more]ImpostorSprite* _first
    -[more]ImpostorSprite* _last +[more]ImpostorSprite* _last

    Protected Methods

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

    @@ -82,51 +82,51 @@
    - +
    o ImpostorSpriteManager()

    - +

    oconst bool empty() const

    - +

    oImpostorSprite* first()

    - +

    oImpostorSprite* last()

    - +

    ovoid push_back(ImpostorSprite* is)

    - +

    ovoid remove(ImpostorSprite* is)

    - -

    oImpostorSprite* createOrReuseImpostorSprite(int s, int t, int frameNumber) + +
    oImpostorSprite* createOrReuseImpostorSprite(int s, int t, int frameNumber)

    - +

    o ~ImpostorSpriteManager()

    - +

    oref_ptr<TexEnv> _texenv

    - +

    oref_ptr<AlphaFunc> _alphafunc

    - +

    oImpostorSprite* _first

    - +

    oImpostorSprite* _last

    diff --git a/doc/doc++/osg/LOD.html b/doc/doc++/osg/LOD.html index d685cac29..60e56fd53 100644 --- a/doc/doc++/osg/LOD.html +++ b/doc/doc++/osg/LOD.html @@ -23,46 +23,46 @@

    Public Methods

    -[more] LOD() +[more] LOD()
    -[more] META_Node(LOD) +[more] META_Node(LOD)
    -[more]virtual void traverse(NodeVisitor& nv) +[more]virtual void traverse(NodeVisitor& nv)
    -[more]void setRange(const unsigned int index, const float range) +[more]void setRange(const unsigned int index, const float range)
    Sets the value of range list element index to range which is a floating point distance specified in world coordinates.
    -[more]inline const float getRange(const unsigned int index) const +[more]inline const float getRange(const unsigned int index) const
    returns the range for specified index
    -[more]inline const int getNumRanges() const +[more]inline const int getNumRanges() const
    returns the number of ranges currently set
    -[more]inline void setCenter(const Vec3 &center) +[more]inline void setCenter(const Vec3 &center)
    Sets the object-space point which defines the center of the osg::LOD.
    -[more]inline const Vec3& getCenter() const +[more]inline const Vec3& getCenter() const
    return the LOD center point.
    -[more]const int evaluate(const Vec3& eye_local, const float bias=1.0f) const +[more]const int evaluate(const Vec3& eye_local, const float bias=1.0f) const
    return the child to traverse.

    Protected Fields

    -[more]RangeList _rangeList2 +[more]RangeList _rangeList2
    -[more]Vec3 _center +[more]Vec3 _center

    Protected Methods

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

    Protected Members

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

    @@ -120,7 +120,7 @@
    oinline const std::string& getName() const
    -oinline const ParentList& getParents() const +oinline const ParentList& getParents() const
    oinline Group* getParent(const int i)
    @@ -136,23 +136,25 @@
    oinline const int getNumChildrenRequiringAppTraversal() const
    -oinline void setUserData(void* data, MemoryAdapter* ma=0L) +ovoid setCullingActive(const bool active)
    -oinline void* getUserData() +oinline const bool getCullingActive() const
    -oinline const void* getUserData() const +oinline const int getNumChildrenWithCullingDisabled() const
    -oinline MemoryAdapter* getMemoryAdapter() +oinline void setUserData(osg::Referenced* obj)
    -oinline const MemoryAdapter* getMemoryAdapter() const +oinline Referenced* getUserData() +
    +oinline const Referenced* getUserData() const
    oinline void setNodeMask(const NodeMask nm)
    oinline const NodeMask getNodeMask() const
    -oinline const DescriptionList& getDescriptions() const +oinline const DescriptionList& getDescriptions() const
    -oinline DescriptionList& getDescriptions() +oinline DescriptionList& getDescriptions()
    oinline const std::string& getDescription(const int i) const
    @@ -188,19 +190,21 @@
    ostd::string _name
    -oParentList _parents +oParentList _parents
    oref_ptr<NodeCallback> _appCallback
    oint _numChildrenRequiringAppTraversal
    -ovoid* _userData +obool _cullingActive
    -oref_ptr<MemoryAdapter> _memoryAdapter +oint _numChildrenWithCullingDisabled +
    +oosg::ref_ptr<Referenced> _userData
    oNodeMask _nodeMask
    -oDescriptionList _descriptions +oDescriptionList _descriptions
    oref_ptr<StateSet> _dstate

    @@ -208,6 +212,8 @@

    Protected Methods

    ovoid setNumChildrenRequiringAppTraversal(const int num) +
    +ovoid setNumChildrenWithCullingDisabled(const int num)

    @@ -246,67 +252,67 @@ also be chosen.
    - +
    o LOD()

    - +

    o META_Node(LOD)

    - +

    ovirtual void traverse(NodeVisitor& nv)

    - +

    ovoid setRange(const unsigned int index, const float range)
    Sets the value of range list element index to range which is a floating point distance specified in world coordinates. -Range list automatically expands to accomodate values beyond +Range list automatically expands to accommodate values beyond the current getNumRanges().

    - +

    oinline const float getRange(const unsigned int index) const
    returns the range for specified index

    - +

    oinline const int getNumRanges() const
    returns the number of ranges currently set

    - -

    oinline void setCenter(const Vec3 &center) + +
    oinline void setCenter(const Vec3 &center)
    Sets the object-space point which defines the center of the osg::LOD. center is affected by any transforms in the hierarchy above the osg::LOD.

    - +

    oinline const Vec3& getCenter() const
    return the LOD center point.

    - +

    oconst int evaluate(const Vec3& eye_local, const float bias=1.0f) const
    return the child to traverse. Selected by the distance between the eye point in local -coordinates and the LOD center, mutliplied by the bias. +coordinates and the LOD center, multiplied by the bias.

    - +

    ovirtual ~LOD()

    - +

    otypedef std::vector<float> RangeList RangeList _rangeList

    - +

    oRangeList _rangeList2

    - +

    oVec3 _center

    diff --git a/doc/doc++/osg/Light.html b/doc/doc++/osg/Light.html index 6c12724c0..93014e0be 100644 --- a/doc/doc++/osg/Light.html +++ b/doc/doc++/osg/Light.html @@ -23,120 +23,118 @@

    Public Methods

    -[more] Light() +[more] Light()
    -[more] META_StateAttribute(Light, (Type)(LIGHT_0+_lightnum)) +[more] META_StateAttribute(Light, (Type)(LIGHT_0+_lightnum))
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]inline void on() -
    Turn the light on. +[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const
    -[more]inline void off() -
    Turn the light off. +[more]void setLightNum(const int num) +
    Set which OpenGL light to operate on
    -[more]virtual void apply(State& state) const -
    Apply the light's state to the OpenGL state machine. +[more]const int getLightNum() const +
    Get which OpenGL light this osg::Light operates on
    -[more]inline void setAmbient( const Vec4& ambient ) +[more]inline void setAmbient( const Vec4& ambient )
    Set the ambient component of the light.
    -[more]inline const Vec4& getAmbient() const +[more]inline const Vec4& getAmbient() const
    Get the ambient component of the light.
    -[more]inline void setDiffuse( const Vec4& diffuse ) +[more]inline void setDiffuse( const Vec4& diffuse )
    Set the diffuse component of the light.
    -[more]inline const Vec4& getDiffuse() const +[more]inline const Vec4& getDiffuse() const
    Get the diffuse component of the light.
    -[more]inline void setSpecular( const Vec4& specular ) +[more]inline void setSpecular( const Vec4& specular )
    Set the specular component of the light.
    -[more]inline const Vec4& getSpecular() const +[more]inline const Vec4& getSpecular() const
    Get the specular component of the light.
    -[more]inline void setPosition( const Vec4& position ) +[more]inline void setPosition( const Vec4& position )
    Set the position of the light.
    -[more]inline const Vec4& getPosition() const +[more]inline const Vec4& getPosition() const
    Get the position of the light.
    -[more]inline void setDirection( const Vec3& direction ) +[more]inline void setDirection( const Vec3& direction )
    Set the direction of the light.
    -[more]inline const Vec3& getDirection() const +[more]inline const Vec3& getDirection() const
    Get the direction of the light.
    -[more]inline void setConstantAttenuation( const float constant_attenuation ) +[more]inline void setConstantAttenuation( const float constant_attenuation )
    Set the constant attenuation of the light.
    -[more]inline const float getConstantAttenuation() const +[more]inline const float getConstantAttenuation() const
    Get the constant attenuation of the light.
    -[more]inline void setLinearAttenuation( const float linear_attenuation ) +[more]inline void setLinearAttenuation( const float linear_attenuation )
    Set the linear attenuation of the light.
    -[more]inline const float getLinearAttenuation() const +[more]inline const float getLinearAttenuation() const
    Get the linear attenuation of the light.
    -[more]inline void setQuadraticAttenuation( const float quadratic_attenuation ) +[more]inline void setQuadraticAttenuation( const float quadratic_attenuation )
    Set the quadratic attenuation of the light.
    -[more]inline const float getQuadraticAttenuation() const +[more]inline const float getQuadraticAttenuation() const
    Get the quadratic attenuation of the light.
    -[more]inline void setSpotExponent( const float spot_exponent ) +[more]inline void setSpotExponent( const float spot_exponent )
    Set the spot exponent of the light.
    -[more]inline const float getSpotExponent() const +[more]inline const float getSpotExponent() const
    Get the spot exponent of the light.
    -[more]inline void setSpotCutoff( const float spot_cutoff ) +[more]inline void setSpotCutoff( const float spot_cutoff )
    Set the spot cutoff of the light.
    -[more]inline const float getSpotCutoff() const +[more]inline const float getSpotCutoff() const
    Get the spot cutoff of the light.
    -[more]void captureLightState() +[more]void captureLightState()
    Capture the lighting settings of the current OpenGL state and store them in this object +
    +[more]virtual void apply(State& state) const +
    Apply the light's state to the OpenGL state machine.

    Protected Fields

    -[more]int _lightnum +[more]int _lightnum
    -[more]bool _on +[more]Vec4 _ambient
    -[more]Vec4 _ambient +[more]Vec4 _diffuse
    -[more]Vec4 _diffuse +[more]Vec4 _specular
    -[more]Vec4 _specular +[more]Vec4 _position
    -[more]Vec4 _position +[more]Vec3 _direction
    -[more]Vec3 _direction +[more]float _constant_attenuation
    -[more]float _constant_attenuation +[more]float _linear_attenuation
    -[more]float _linear_attenuation +[more]float _quadratic_attenuation
    -[more]float _quadratic_attenuation +[more]float _spot_exponent
    -[more]float _spot_exponent -
    -[more]float _spot_cutoff -
    -[more]static int _currentLightNum +[more]float _spot_cutoff

    Protected Methods

    -[more]virtual ~Light() +[more]virtual ~Light()
    -[more]void init() +[more]void init()
    Initialize the light's settings with some decent defaults.

    @@ -151,7 +149,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual const Type getType() const
    obool operator < (const StateAttribute& rhs) const
    @@ -159,8 +157,6 @@
    obool operator != (const StateAttribute& rhs) const
    -ovirtual void setStateSetModes(StateSet&, const GLModeValue) const -
    ovirtual void compile(State&) const

    @@ -210,204 +206,196 @@
    - +
    o Light()

    - -

    o META_StateAttribute(Light, (Type)(LIGHT_0+_lightnum)) + +
    o META_StateAttribute(Light, (Type)(LIGHT_0+_lightnum))

    - +

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

    - - -

    oinline void on() -
    -Turn the light on. -Calling this method doesn't directly affect OpenGL's lighting mode. + + +
    ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const

    - - -

    oinline void off() -
    -Turn the light off. -Calling this method doesn't directly affect OpenGL's lighting mode. + + +
    ovoid setLightNum(const int num) +
    Set which OpenGL light to operate on

    - - -

    ovirtual void apply(State& state) const -
    Apply the light's state to the OpenGL state machine. + + +
    oconst int getLightNum() const +
    Get which OpenGL light this osg::Light operates on

    - +

    oinline void setAmbient( const Vec4& ambient )
    Set the ambient component of the light.

    - +

    oinline const Vec4& getAmbient() const
    Get the ambient component of the light.

    - +

    oinline void setDiffuse( const Vec4& diffuse )
    Set the diffuse component of the light.

    - +

    oinline const Vec4& getDiffuse() const
    Get the diffuse component of the light.

    - +

    oinline void setSpecular( const Vec4& specular )
    Set the specular component of the light.

    - +

    oinline const Vec4& getSpecular() const
    Get the specular component of the light.

    - +

    oinline void setPosition( const Vec4& position )
    Set the position of the light.

    - +

    oinline const Vec4& getPosition() const
    Get the position of the light.

    - +

    oinline void setDirection( const Vec3& direction )
    Set the direction of the light.

    - +

    oinline const Vec3& getDirection() const
    Get the direction of the light.

    - +

    oinline void setConstantAttenuation( const float constant_attenuation )
    Set the constant attenuation of the light.

    - +

    oinline const float getConstantAttenuation() const
    Get the constant attenuation of the light.

    - +

    oinline void setLinearAttenuation( const float linear_attenuation )
    Set the linear attenuation of the light.

    - +

    oinline const float getLinearAttenuation() const
    Get the linear attenuation of the light.

    - +

    oinline void setQuadraticAttenuation( const float quadratic_attenuation )
    Set the quadratic attenuation of the light.

    - +

    oinline const float getQuadraticAttenuation() const
    Get the quadratic attenuation of the light.

    - +

    oinline void setSpotExponent( const float spot_exponent )
    Set the spot exponent of the light.

    - +

    oinline const float getSpotExponent() const
    Get the spot exponent of the light.

    - +

    oinline void setSpotCutoff( const float spot_cutoff )
    Set the spot cutoff of the light.

    - +

    oinline const float getSpotCutoff() const
    Get the spot cutoff of the light.

    - +

    ovoid captureLightState()
    Capture the lighting settings of the current OpenGL state and store them in this object

    + + +

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

    - +

    ovirtual ~Light()

    - +

    ovoid init()
    Initialize the light's settings with some decent defaults.

    - +

    oint _lightnum

    - - -

    obool _on -

    - +

    oVec4 _ambient

    - +

    oVec4 _diffuse

    - +

    oVec4 _specular

    - +

    oVec4 _position

    - +

    oVec3 _direction

    - +

    ofloat _constant_attenuation

    - +

    ofloat _linear_attenuation

    - +

    ofloat _quadratic_attenuation

    - +

    ofloat _spot_exponent

    - +

    ofloat _spot_cutoff -

    - - -

    ostatic int _currentLightNum

    This class has no child classes.
    diff --git a/doc/doc++/osg/LightSource.html b/doc/doc++/osg/LightSource.html index 2c08bf6bc..11be2fc8d 100644 --- a/doc/doc++/osg/LightSource.html +++ b/doc/doc++/osg/LightSource.html @@ -23,30 +23,30 @@

    Public Methods

    -[more] LightSource() +[more] LightSource()
    -[more] META_Node(LightSource) +[more] META_Node(LightSource)
    -[more]inline void setLight(Light* light) +[more]inline void setLight(Light* light)
    Set the attached light
    -[more]inline Light* getLight() +[more]inline Light* getLight()
    Get the attached light
    -[more]inline const Light* getLight() const +[more]inline const Light* getLight() const
    Get the const attached light

    Protected Fields

    -[more]ref_ptr<Light> _light +[more]ref_ptr<Light> _light

    Protected Methods

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

    @@ -72,7 +72,7 @@
    oinline const std::string& getName() const
    -oinline const ParentList& getParents() const +oinline const ParentList& getParents() const
    oinline Group* getParent(const int i)
    @@ -88,23 +88,25 @@
    oinline const int getNumChildrenRequiringAppTraversal() const
    -oinline void setUserData(void* data, MemoryAdapter* ma=0L) +ovoid setCullingActive(const bool active)
    -oinline void* getUserData() +oinline const bool getCullingActive() const
    -oinline const void* getUserData() const +oinline const int getNumChildrenWithCullingDisabled() const
    -oinline MemoryAdapter* getMemoryAdapter() +oinline void setUserData(osg::Referenced* obj)
    -oinline const MemoryAdapter* getMemoryAdapter() const +oinline Referenced* getUserData() +
    +oinline const Referenced* getUserData() const
    oinline void setNodeMask(const NodeMask nm)
    oinline const NodeMask getNodeMask() const
    -oinline const DescriptionList& getDescriptions() const +oinline const DescriptionList& getDescriptions() const
    -oinline DescriptionList& getDescriptions() +oinline DescriptionList& getDescriptions()
    oinline const std::string& getDescription(const int i) const
    @@ -140,19 +142,21 @@
    ostd::string _name
    -oParentList _parents +oParentList _parents
    oref_ptr<NodeCallback> _appCallback
    oint _numChildrenRequiringAppTraversal
    -ovoid* _userData +obool _cullingActive
    -oref_ptr<MemoryAdapter> _memoryAdapter +oint _numChildrenWithCullingDisabled +
    +oosg::ref_ptr<Referenced> _userData
    oNodeMask _nodeMask
    -oDescriptionList _descriptions +oDescriptionList _descriptions
    oref_ptr<StateSet> _dstate

    @@ -160,6 +164,8 @@

    Protected Methods

    ovoid setNumChildrenRequiringAppTraversal(const int num) +
    +ovoid setNumChildrenWithCullingDisabled(const int num)

    @@ -193,38 +199,38 @@
    - +
    o LightSource()

    - +

    o META_Node(LightSource)

    - +

    oinline void setLight(Light* light)
    Set the attached light

    - +

    oinline Light* getLight()
    Get the attached light

    - +

    oinline const Light* getLight() const
    Get the const attached light

    - +

    ovirtual ~LightSource()

    - +

    ovirtual const bool computeBound() const

    - +

    oref_ptr<Light> _light

    diff --git a/doc/doc++/osg/LineSegment.html b/doc/doc++/osg/LineSegment.html index 2f6c28483..fa3898415 100644 --- a/doc/doc++/osg/LineSegment.html +++ b/doc/doc++/osg/LineSegment.html @@ -7,7 +7,7 @@ -

    class SG_EXPORT osg::LineSegment

    LineSegmentment class for representing a line segment
    +

    class SG_EXPORT osg::LineSegment

    LineSegment class for representing a line segment

    Inheritance:

    @@ -23,58 +23,60 @@

    Public Methods

    -[more] LineSegment() +[more] LineSegment()
    -[more] LineSegment(const LineSegment& seg) +[more] LineSegment(const LineSegment& seg)
    -[more] LineSegment(const Vec3& s, const Vec3& e) +[more] LineSegment(const Vec3& s, const Vec3& e)
    -[more]virtual ~LineSegment() +[more]virtual ~LineSegment()
    -[more]LineSegment& operator = (const LineSegment& seg) +[more]LineSegment& operator = (const LineSegment& seg)
    -[more]inline void set(const Vec3& s, const Vec3& e) +[more]inline void set(const Vec3& s, const Vec3& e)
    -[more]inline Vec3& start() +[more]inline Vec3& start()
    -[more]inline const Vec3& start() const +[more]inline const Vec3& start() const
    -[more]inline Vec3& end() +[more]inline Vec3& end()
    -[more]inline const Vec3& end() const +[more]inline const Vec3& end() const
    -[more]const bool intersect(const BoundingBox& bb) const +[more]inline const bool valid() const +
    +[more]const bool intersect(const BoundingBox& bb) const
    return true if segment intersects BoundingBox
    -[more]const bool intersect(const BoundingBox& bb, float& r1, float& r2) const +[more]const bool intersect(const BoundingBox& bb, float& r1, float& r2) const
    return true if segment intersects BoundingSphere and return the intersection ratio's
    -[more]const bool intersect(const BoundingSphere& bs) const +[more]const bool intersect(const BoundingSphere& bs) const
    return true if segment intersects BoundingSphere
    -[more]const bool intersect(const BoundingSphere& bs, float& r1, float& r2) const +[more]const bool intersect(const BoundingSphere& bs, float& r1, float& r2) const
    return true if segment intersects BoundingSphere and return the intersection ratio's
    -[more]const bool intersect(const Vec3& v1, const Vec3& v2, const Vec3& v3, float& r) +[more]const bool intersect(const Vec3& v1, const Vec3& v2, const Vec3& v3, float& r)
    return true if segment intersects triangle and set ratio long segment.
    -[more]inline void mult(const LineSegment& seg, const Matrix& m) +[more]inline void mult(const LineSegment& seg, const Matrix& m)
    post multiply a segment by matrix
    -[more]inline void mult(const Matrix& m, const LineSegment& seg) +[more]inline void mult(const Matrix& m, const LineSegment& seg)
    pre multiply a segment by matrix

    Protected Fields

    -[more]Vec3 _s +[more]Vec3 _s
    -[more]Vec3 _e +[more]Vec3 _e

    Protected Methods

    -[more]static const bool intersectAndClip(Vec3& s, Vec3& e, const BoundingBox& bb) +[more]static const bool intersectAndClip(Vec3& s, Vec3& e, const BoundingBox& bb)

    @@ -99,94 +101,98 @@

    Documentation

    -
    LineSegmentment class for representing a line segment
    +
    LineSegment class for representing a line segment
    - +
    o LineSegment()

    - -

    o LineSegment(const LineSegment& seg) + +
    o LineSegment(const LineSegment& seg)

    - -

    o LineSegment(const Vec3& s, const Vec3& e) + +
    o LineSegment(const Vec3& s, const Vec3& e)

    - +

    ovirtual ~LineSegment()

    - +

    oLineSegment& operator = (const LineSegment& seg)

    - -

    oinline void set(const Vec3& s, const Vec3& e) + +
    oinline void set(const Vec3& s, const Vec3& e)

    - +

    oinline Vec3& start()

    - +

    oinline const Vec3& start() const

    - +

    oinline Vec3& end()

    - +

    oinline const Vec3& end() const

    + + +

    oinline const bool valid() const +

    - +

    oconst bool intersect(const BoundingBox& bb) const
    return true if segment intersects BoundingBox

    - +

    oconst bool intersect(const BoundingBox& bb, float& r1, float& r2) const
    return true if segment intersects BoundingSphere and return the intersection ratio's

    - +

    oconst bool intersect(const BoundingSphere& bs) const
    return true if segment intersects BoundingSphere

    - +

    oconst bool intersect(const BoundingSphere& bs, float& r1, float& r2) const
    return true if segment intersects BoundingSphere and return the intersection ratio's

    - -

    oconst bool intersect(const Vec3& v1, const Vec3& v2, const Vec3& v3, float& r) + +
    oconst bool intersect(const Vec3& v1, const Vec3& v2, const Vec3& v3, float& r)
    return true if segment intersects triangle and set ratio long segment.

    - +

    oinline void mult(const LineSegment& seg, const Matrix& m)
    post multiply a segment by matrix

    - +

    oinline void mult(const Matrix& m, const LineSegment& seg)
    pre multiply a segment by matrix

    - -

    ostatic const bool intersectAndClip(Vec3& s, Vec3& e, const BoundingBox& bb) + +
    ostatic const bool intersectAndClip(Vec3& s, Vec3& e, const BoundingBox& bb)

    - +

    oVec3 _s

    - +

    oVec3 _e

    diff --git a/doc/doc++/osg/Material.html b/doc/doc++/osg/Material.html index 5c44dc164..c09191628 100644 --- a/doc/doc++/osg/Material.html +++ b/doc/doc++/osg/Material.html @@ -23,112 +23,112 @@

    Public Methods

    -[more] Material() +[more] Material()
    -[more] META_StateAttribute(Material, MATERIAL) +[more] META_StateAttribute(Material, MATERIAL)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const +[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const
    -[more]inline void setColorMode(const ColorMode mode) +[more]inline void setColorMode(const ColorMode mode)
    -[more]inline const ColorMode getColorMode() const +[more]inline const ColorMode getColorMode() const
    -[more]void setAmbient( const Face face, const Vec4& ambient ) +[more]void setAmbient( const Face face, const Vec4& ambient )
    -[more]const Vec4& getAmbient(const Face face) const +[more]const Vec4& getAmbient(const Face face) const
    -[more]inline const bool getAmbientFrontAndBack() const +[more]inline const bool getAmbientFrontAndBack() const
    -[more]void setDiffuse( const Face face, const Vec4& diffuse ) +[more]void setDiffuse( const Face face, const Vec4& diffuse )
    -[more]const Vec4& getDiffuse(const Face face) const +[more]const Vec4& getDiffuse(const Face face) const
    -[more]inline const bool getDiffuseFrontAndBack() const +[more]inline const bool getDiffuseFrontAndBack() const
    -[more]void setSpecular( const Face face, const Vec4& specular ) +[more]void setSpecular( const Face face, const Vec4& specular )
    Set specular value of specified face(s) of the material, valid specular[03] range is 00 to 10
    -[more]const Vec4& getSpecular(const Face face) const +[more]const Vec4& getSpecular(const Face face) const
    Get the specular value for specified face
    -[more]inline const bool getSpecularFrontAndBack() const +[more]inline const bool getSpecularFrontAndBack() const
    Get the whether specular values are equal for front and back faces
    -[more]void setEmission( const Face face, const Vec4& emission ) -
    Set emmision value of specified face(s) of the material, valid emmison[03] range is 00 to 10 +[more]void setEmission( const Face face, const Vec4& emission ) +
    Set emission value of specified face(s) of the material, valid emmison[03] range is 00 to 10
    -[more]const Vec4& getEmission(const Face face) const +[more]const Vec4& getEmission(const Face face) const
    Get the emmsion value for specified face
    -[more]inline const bool getEmissionFrontAndBack() const -
    Get the whether emmision values are equal for front and back faces +[more]inline const bool getEmissionFrontAndBack() const +
    Get the whether emission values are equal for front and back faces
    -[more]void setShininess( const Face face, float shininess ) +[more]void setShininess( const Face face, float shininess )
    Set shininess of specified face(s) of the material, valid shininess range is 00 to 10
    -[more]const float getShininess(const Face face) const +[more]const float getShininess(const Face face) const
    Get the shininess value for specified face
    -[more]inline const bool getShininessFrontAndBack() const +[more]inline const bool getShininessFrontAndBack() const
    Get the whether shininess values are equal for front and back faces
    -[more]void setTransparency(const Face face, float trans) -
    Set the alpha value of ambient,diffuse,specular and emmission colors, of specified face, to 1-transparancy. +[more]void setTransparency(const Face face, float trans) +
    Set the alpha value of ambient,diffuse,specular and emission colors, of specified face, to 1-transparency.
    -[more]void setAlpha(const Face face, float alpha) -
    Set the alpha value of ambient,diffuse,specular and emmission colors. +[more]void setAlpha(const Face face, float alpha) +
    Set the alpha value of ambient,diffuse,specular and emission colors.

    Public Members

    -[more]enum Face +[more]enum Face
    -[more]enum ColorMode +[more]enum ColorMode

    Protected Fields

    -[more]ColorMode _colorMode +[more]ColorMode _colorMode
    -[more]bool _ambientFrontAndBack +[more]bool _ambientFrontAndBack
    -[more]Vec4 _ambientFront +[more]Vec4 _ambientFront
    -[more]Vec4 _ambientBack +[more]Vec4 _ambientBack
    -[more]bool _diffuseFrontAndBack +[more]bool _diffuseFrontAndBack
    -[more]Vec4 _diffuseFront +[more]Vec4 _diffuseFront
    -[more]Vec4 _diffuseBack +[more]Vec4 _diffuseBack
    -[more]bool _specularFrontAndBack +[more]bool _specularFrontAndBack
    -[more]Vec4 _specularFront +[more]Vec4 _specularFront
    -[more]Vec4 _specularBack +[more]Vec4 _specularBack
    -[more]bool _emissionFrontAndBack +[more]bool _emissionFrontAndBack
    -[more]Vec4 _emissionFront +[more]Vec4 _emissionFront
    -[more]Vec4 _emissionBack +[more]Vec4 _emissionBack
    -[more]bool _shininessFrontAndBack +[more]bool _shininessFrontAndBack
    -[more]float _shininessFront +[more]float _shininessFront
    -[more]float _shininessBack +[more]float _shininessBack

    Protected Methods

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

    @@ -142,7 +142,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual const Type getType() const
    obool operator < (const StateAttribute& rhs) const
    @@ -199,231 +199,231 @@
    - +
    o Material()

    - -

    o META_StateAttribute(Material, MATERIAL) + +
    o META_StateAttribute(Material, MATERIAL)

    - +

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

    - -

    ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const + +
    ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const

    - +

    ovirtual void apply(State& state) const

    - +

    oenum Face

    - +
    o FRONT

    - +

    o BACK

    - +

    o FRONT_AND_BACK

    - +
    oenum ColorMode

    - +
    o AMBIENT

    - +

    o DIFFUSE

    - +

    o SPECULAR

    - +

    o EMISSION

    - +

    o AMBIENT_AND_DIFFUSE

    - +

    o OFF

    - -
    oinline void setColorMode(const ColorMode mode) + +
    oinline void setColorMode(const ColorMode mode)

    - -

    oinline const ColorMode getColorMode() const + +
    oinline const ColorMode getColorMode() const

    - -

    ovoid setAmbient( const Face face, const Vec4& ambient ) + +
    ovoid setAmbient( const Face face, const Vec4& ambient )

    - -

    oconst Vec4& getAmbient(const Face face) const + +
    oconst Vec4& getAmbient(const Face face) const

    - +

    oinline const bool getAmbientFrontAndBack() const

    - -

    ovoid setDiffuse( const Face face, const Vec4& diffuse ) + +
    ovoid setDiffuse( const Face face, const Vec4& diffuse )

    - -

    oconst Vec4& getDiffuse(const Face face) const + +
    oconst Vec4& getDiffuse(const Face face) const

    - +

    oinline const bool getDiffuseFrontAndBack() const

    - -

    ovoid setSpecular( const Face face, const Vec4& specular ) + +
    ovoid setSpecular( const Face face, const Vec4& specular )
    Set specular value of specified face(s) of the material, valid specular[03] range is 00 to 10

    - -

    oconst Vec4& getSpecular(const Face face) const + +
    oconst Vec4& getSpecular(const Face face) const
    Get the specular value for specified face

    - +

    oinline const bool getSpecularFrontAndBack() const
    Get the whether specular values are equal for front and back faces

    - -

    ovoid setEmission( const Face face, const Vec4& emission ) -
    Set emmision value of specified face(s) of the material, + +
    ovoid setEmission( const Face face, const Vec4& emission ) +
    Set emission value of specified face(s) of the material, valid emmison[03] range is 00 to 10

    - -

    oconst Vec4& getEmission(const Face face) const + +
    oconst Vec4& getEmission(const Face face) const
    Get the emmsion value for specified face

    - +

    oinline const bool getEmissionFrontAndBack() const -
    Get the whether emmision values are equal for front and back faces +
    Get the whether emission values are equal for front and back faces

    - -

    ovoid setShininess( const Face face, float shininess ) + +
    ovoid setShininess( const Face face, float shininess )
    Set shininess of specified face(s) of the material, valid shininess range is 00 to 10

    - -

    oconst float getShininess(const Face face) const + +
    oconst float getShininess(const Face face) const
    Get the shininess value for specified face

    - +

    oinline const bool getShininessFrontAndBack() const
    Get the whether shininess values are equal for front and back faces

    - -

    ovoid setTransparency(const Face face, float trans) -
    Set the alpha value of ambient,diffuse,specular and emmission colors, -of specified face, to 1-transparancy. Valid transparancy range is 0.0 to 1.0. + +
    ovoid setTransparency(const Face face, float trans) +
    Set the alpha value of ambient,diffuse,specular and emission colors, +of specified face, to 1-transparency. Valid transparency range is 0.0 to 1.0.

    - -

    ovoid setAlpha(const Face face, float alpha) -
    Set the alpha value of ambient,diffuse,specular and emmission colors. -Valid transparancy range is 0.0 to 1.0. + +
    ovoid setAlpha(const Face face, float alpha) +
    Set the alpha value of ambient,diffuse,specular and emission colors. +Valid transparency range is 0.0 to 1.0.

    - +

    ovirtual ~Material()

    - -

    oColorMode _colorMode + +
    oColorMode _colorMode

    - +

    obool _ambientFrontAndBack

    - +

    oVec4 _ambientFront

    - +

    oVec4 _ambientBack

    - +

    obool _diffuseFrontAndBack

    - +

    oVec4 _diffuseFront

    - +

    oVec4 _diffuseBack

    - +

    obool _specularFrontAndBack

    - +

    oVec4 _specularFront

    - +

    oVec4 _specularBack

    - +

    obool _emissionFrontAndBack

    - +

    oVec4 _emissionFront

    - +

    oVec4 _emissionBack

    - +

    obool _shininessFrontAndBack

    - +

    ofloat _shininessFront

    - +

    ofloat _shininessBack

    diff --git a/doc/doc++/osg/Matrix.html b/doc/doc++/osg/Matrix.html index 714b83510..82e36d77e 100644 --- a/doc/doc++/osg/Matrix.html +++ b/doc/doc++/osg/Matrix.html @@ -20,172 +20,141 @@
    -

    -

    Public Fields

    -[more]float _mat[4][4] -
    -[more]bool fully_realized -

    -

    Public Methods

    -[more] META_Object(Matrix) +[more] META_Object(Matrix)
    -[more] Matrix() +[more] Matrix()
    -[more] Matrix( const Matrix& other ) +[more] Matrix( const Matrix& other )
    -[more]explicit Matrix( float const* const def ) +[more]explicit Matrix( float const* const def )
    -[more] Matrix( float a00, float a01, float a02, float a03, float a10, float a11, float a12, float a13, float a20, float a21, float a22, float a23, float a30, float a31, float a32, float a33) +[more] Matrix( float a00, float a01, float a02, float a03, float a10, float a11, float a12, float a13, float a20, float a21, float a22, float a23, float a30, float a31, float a32, float a33)
    -[more]virtual ~Matrix() +[more]virtual ~Matrix()
    -[more]Matrix& operator = (const Matrix& ) +[more]Matrix& operator = (const Matrix& )
    -[more]int compare(const Matrix& m) const +[more]int compare(const Matrix& m) const
    -[more]bool operator < (const Matrix& m) const +[more]bool operator < (const Matrix& m) const
    -[more]bool operator == (const Matrix& m) const +[more]bool operator == (const Matrix& m) const
    -[more]bool operator != (const Matrix& m) const +[more]bool operator != (const Matrix& m) const
    -[more]inline float& operator()(int col, int row) +[more]inline float& operator()(int row, int col)
    -[more]inline float operator()(int col, int row) const +[more]inline float operator()(int row, int col) const
    -[more]void set( float const* const ) +[more]void set( float const* const )
    -[more]void set( float a00, float a01, float a02, float a03, float a10, float a11, float a12, float a13, float a20, float a21, float a22, float a23, float a30, float a31, float a32, float a33) +[more]void set( float a00, float a01, float a02, float a03, float a10, float a11, float a12, float a13, float a20, float a21, float a22, float a23, float a30, float a31, float a32, float a33)
    -[more]const float* values() +[more]float* ptr()
    -[more]void makeIdent() +[more]const float* ptr() const
    -[more]void makeScale( const Vec3& ) +[more]inline void ensureRealized() const
    -[more]void makeScale( float, float, float ) +[more]void makeIdentity()
    -[more]void makeTrans( const Vec3& ) +[more]void makeScale( const Vec3& )
    -[more]void makeTrans( float, float, float ) +[more]void makeScale( float, float, float )
    -[more]void makeRot( const Vec3& from, const Vec3& to ) +[more]void makeTranslate( const Vec3& )
    -[more]void makeRot( float angle, const Vec3& orientation ) +[more]void makeTranslate( float, float, float )
    -[more]void makeRot( float angle, float x, float y, float z ) +[more]void makeRotate( const Vec3& from, const Vec3& to )
    -[more]void makeRot( const Quat& ) +[more]void makeRotate( float angle, const Vec3& axis )
    -[more]void makeRot( float, float, float ) +[more]void makeRotate( float angle, float x, float y, float z )
    -[more]bool invert( const Matrix& ) +[more]void makeRotate( const Quat& )
    -[more]bool invertAffine( const Matrix& ) +[more]void makeRotate( float, float, float )
    -[more]inline static Matrix scale( const Vec3& ) +[more]bool invert( const Matrix& )
    -[more]inline static Matrix scale( float, float, float ) +[more]bool invertAffine( const Matrix& )
    -[more]inline static Matrix trans( const Vec3& ) +[more]inline static Matrix identity( void )
    -[more]inline static Matrix trans( float, float, float ) +[more]inline static Matrix scale( const Vec3& )
    -[more]inline static Matrix rotate( const Vec3&, const Vec3& ) +[more]inline static Matrix scale( float, float, float )
    -[more]inline static Matrix rotate( float, float, float, float ) +[more]inline static Matrix translate( const Vec3& )
    -[more]inline static Matrix rotate( const Quat& ) +[more]inline static Matrix translate( float, float, float )
    -[more]void setTrans( float tx, float ty, float tz ) +[more]inline static Matrix rotate( const Vec3&, const Vec3& )
    -[more]void setTrans( const Vec3& v ) +[more]inline static Matrix rotate( float, float, float, float )
    -[more]Vec3 getTrans() const +[more]inline static Matrix rotate( float angle, const Vec3& axis)
    -[more]void copy( const Matrix& ) +[more]inline static Matrix rotate( const Quat& )
    -[more]void preScale( float sx, float sy, float sz, const Matrix& m ) +[more]void setTrans( float tx, float ty, float tz )
    -[more]void postScale( const Matrix& m, float sx, float sy, float sz ) +[more]void setTrans( const Vec3& v )
    -[more]void preScale( float sx, float sy, float sz ) +[more]Vec3 getTrans() const
    -[more]void postScale( float sx, float sy, float sz ) -
    -[more]void preTrans( float tx, float ty, float tz, const Matrix& m ) -
    -[more]void postTrans( const Matrix& m, float tx, float ty, float tz ) -
    -[more]void preTrans( float tx, float ty, float tz) -
    -[more]void postTrans( float tx, float ty, float tz ) -
    -[more]void preRot( float deg, float x, float y, float z, const Matrix& m ) -
    -[more]void postRot( const Matrix& m, float deg, float x, float y, float z ) -
    -[more]void preRot( float deg, float x, float y, float z ) -
    -[more]void postRot( float deg, float x, float y, float z ) -
    -[more]inline static Vec3 transform3x3(const Vec3& v, const Matrix& m) +[more]inline static Vec3 transform3x3(const Vec3& v, const Matrix& m)
    apply apply an 3x3 transform of v*M[02,02]
    -[more]inline static Vec3 transform3x3(const Matrix& m, const Vec3& v) +[more]inline static Vec3 transform3x3(const Matrix& m, const Vec3& v)
    apply apply an 3x3 transform of M[02,02]*v
    -[more]void mult( const Matrix&, const Matrix& ) -
    nd of Deprecated methods +[more]void mult( const Matrix&, const Matrix& )
    -[more]void preMult( const Matrix& ) +[more]void preMult( const Matrix& )
    -[more]void postMult( const Matrix& ) +[more]void postMult( const Matrix& )
    -[more]inline MatrixProduct operator * ( const Matrix& other ) const +[more]inline void operator *= ( const Matrix& other )
    -[more]inline void operator *= ( const Matrix& other ) +[more]inline Matrix operator * ( const Matrix &m ) const
    -[more]inline void operator = ( const MatrixProduct& p ) +[more]inline Matrix identity(void)
    -[more] Matrix( const MatrixProduct& p ) +[more]inline Matrix scale(float sx, float sy, float sz)
    -[more]inline Matrix scale(float sx, float sy, float sz) +[more]inline Matrix scale(const Vec3& v )
    -[more]inline Matrix scale(const Vec3& v ) +[more]inline Matrix translate(float tx, float ty, float tz)
    -[more]inline Matrix trans(float tx, float ty, float tz) +[more]inline Matrix translate(const Vec3& v )
    -[more]inline Matrix trans(const Vec3& v ) +[more]inline Matrix rotate( const Quat& q )
    -[more]inline Matrix rotate( const Quat& q ) +[more]inline Matrix rotate(float angle, float x, float y, float z )
    -[more]inline Matrix rotate(float angle, float x, float y, float z ) +[more]inline Matrix rotate(float angle, const Vec3& axis )
    -[more]inline Matrix rotate(const Vec3& from, const Vec3& to ) +[more]inline Matrix rotate(const Vec3& from, const Vec3& to )
    -[more]inline Vec3 postMult( const Vec3& v ) const +[more]inline Vec3 postMult( const Vec3& v ) const
    -[more]inline Vec3 preMult( const Vec3& v ) const +[more]inline Vec3 preMult( const Vec3& v ) const
    -[more]inline Vec4 postMult( const Vec4& v ) const +[more]inline Vec4 postMult( const Vec4& v ) const
    -[more]inline Vec4 preMult( const Vec4& v ) const +[more]inline Vec4 preMult( const Vec4& v ) const
    -[more]inline Vec3 transform3x3(const Vec3& v, const Matrix& m) +[more]inline Vec3 transform3x3(const Vec3& v, const Matrix& m)
    -[more]inline Vec3 transform3x3(const Matrix& m, const Vec3& v) +[more]inline Vec3 transform3x3(const Matrix& m, const Vec3& v)
    -[more]inline Vec3 operator* (const Vec3& v) const +[more]inline Vec3 operator* (const Vec3& v) const
    -[more]inline Vec4 operator* (const Vec4& v) const -

    - -

    -

    Public Members

    -class MatrixProduct +[more]inline Vec4 operator* (const Vec4& v) const

    @@ -224,315 +193,270 @@ class MatrixProduct

    Documentation

    - - -
    ofloat _mat[4][4] -

    - - -

    obool fully_realized -

    - +

    o META_Object(Matrix)

    - +

    o Matrix()

    - -

    o Matrix( const Matrix& other ) + +
    o Matrix( const Matrix& other )

    - +

    oexplicit Matrix( float const* const def )

    - +

    o Matrix( float a00, float a01, float a02, float a03, float a10, float a11, float a12, float a13, float a20, float a21, float a22, float a23, float a30, float a31, float a32, float a33)

    - +

    ovirtual ~Matrix()

    - +

    oMatrix& operator = (const Matrix& )

    - +

    oint compare(const Matrix& m) const

    - +

    obool operator < (const Matrix& m) const

    - +

    obool operator == (const Matrix& m) const

    - +

    obool operator != (const Matrix& m) const

    - -

    oinline float& operator()(int col, int row) + +
    oinline float& operator()(int row, int col)

    - -

    oinline float operator()(int col, int row) const + +
    oinline float operator()(int row, int col) const

    - +

    ovoid set( float const* const )

    - +

    ovoid set( float a00, float a01, float a02, float a03, float a10, float a11, float a12, float a13, float a20, float a21, float a22, float a23, float a30, float a31, float a32, float a33)

    - - -

    oconst float* values() + + +
    ofloat* ptr()

    - - -

    ovoid makeIdent() + + +
    oconst float* ptr() const +

    + + +

    oinline void ensureRealized() const +

    + + +

    ovoid makeIdentity()

    - +

    ovoid makeScale( const Vec3& )

    - +

    ovoid makeScale( float, float, float )

    - - -

    ovoid makeTrans( const Vec3& ) + + +
    ovoid makeTranslate( const Vec3& )

    - - -

    ovoid makeTrans( float, float, float ) + + +
    ovoid makeTranslate( float, float, float )

    - - -

    ovoid makeRot( const Vec3& from, const Vec3& to ) + + +
    ovoid makeRotate( const Vec3& from, const Vec3& to )

    - - -

    ovoid makeRot( float angle, const Vec3& orientation ) + + +
    ovoid makeRotate( float angle, const Vec3& axis )

    - - -

    ovoid makeRot( float angle, float x, float y, float z ) + + +
    ovoid makeRotate( float angle, float x, float y, float z )

    - - -

    ovoid makeRot( const Quat& ) + + +
    ovoid makeRotate( const Quat& )

    - - -

    ovoid makeRot( float, float, float ) + + +
    ovoid makeRotate( float, float, float )

    - +

    obool invert( const Matrix& )

    - +

    obool invertAffine( const Matrix& )

    + + +

    oinline static Matrix identity( void ) +

    - +

    oinline static Matrix scale( const Vec3& )

    - +

    oinline static Matrix scale( float, float, float )

    - - -

    oinline static Matrix trans( const Vec3& ) + + +
    oinline static Matrix translate( const Vec3& )

    - - -

    oinline static Matrix trans( float, float, float ) + + +
    oinline static Matrix translate( float, float, float )

    - +

    oinline static Matrix rotate( const Vec3&, const Vec3& )

    - +

    oinline static Matrix rotate( float, float, float, float )

    - + +

    oinline static Matrix rotate( float angle, const Vec3& axis) +

    + +

    oinline static Matrix rotate( const Quat& )

    - +

    ovoid setTrans( float tx, float ty, float tz )

    - +

    ovoid setTrans( const Vec3& v )

    - +

    oVec3 getTrans() const

    - - -

    ovoid copy( const Matrix& ) -

    - - -

    ovoid preScale( float sx, float sy, float sz, const Matrix& m ) -

    - - -

    ovoid postScale( const Matrix& m, float sx, float sy, float sz ) -

    - - -

    ovoid preScale( float sx, float sy, float sz ) -

    - - -

    ovoid postScale( float sx, float sy, float sz ) -

    - - -

    ovoid preTrans( float tx, float ty, float tz, const Matrix& m ) -

    - - -

    ovoid postTrans( const Matrix& m, float tx, float ty, float tz ) -

    - - -

    ovoid preTrans( float tx, float ty, float tz) -

    - - -

    ovoid postTrans( float tx, float ty, float tz ) -

    - - -

    ovoid preRot( float deg, float x, float y, float z, const Matrix& m ) -

    - - -

    ovoid postRot( const Matrix& m, float deg, float x, float y, float z ) -

    - - -

    ovoid preRot( float deg, float x, float y, float z ) -

    - - -

    ovoid postRot( float deg, float x, float y, float z ) -

    - +

    oinline static Vec3 transform3x3(const Vec3& v, const Matrix& m)
    apply apply an 3x3 transform of v*M[02,02]

    - +

    oinline static Vec3 transform3x3(const Matrix& m, const Vec3& v)
    apply apply an 3x3 transform of M[02,02]*v

    - +

    ovoid mult( const Matrix&, const Matrix& ) -
    nd of Deprecated methods

    - +

    ovoid preMult( const Matrix& )

    - +

    ovoid postMult( const Matrix& )

    - - -

    oinline MatrixProduct operator * ( const Matrix& other ) const -

    - +

    oinline void operator *= ( const Matrix& other )

    - - -

    oinline void operator = ( const MatrixProduct& p ) + + +
    oinline Matrix operator * ( const Matrix &m ) const

    - - -

    o Matrix( const MatrixProduct& p ) + + +
    oinline Matrix identity(void)

    - +

    oinline Matrix scale(float sx, float sy, float sz)

    - +

    oinline Matrix scale(const Vec3& v )

    - - -

    oinline Matrix trans(float tx, float ty, float tz) + + +
    oinline Matrix translate(float tx, float ty, float tz)

    - - -

    oinline Matrix trans(const Vec3& v ) + + +
    oinline Matrix translate(const Vec3& v )

    - +

    oinline Matrix rotate( const Quat& q )

    - -

    oinline Matrix rotate(float angle, float x, float y, float z ) + +
    oinline Matrix rotate(float angle, float x, float y, float z )

    - + +

    oinline Matrix rotate(float angle, const Vec3& axis ) +

    + +

    oinline Matrix rotate(const Vec3& from, const Vec3& to )

    - +

    oinline Vec3 postMult( const Vec3& v ) const

    - +

    oinline Vec3 preMult( const Vec3& v ) const

    - +

    oinline Vec4 postMult( const Vec4& v ) const

    - +

    oinline Vec4 preMult( const Vec4& v ) const

    - +

    oinline Vec3 transform3x3(const Vec3& v, const Matrix& m)

    - +

    oinline Vec3 transform3x3(const Matrix& m, const Vec3& v)

    - +

    oinline Vec3 operator* (const Vec3& v) const

    - +

    oinline Vec4 operator* (const Vec4& v) const

    diff --git a/doc/doc++/osg/MemoryAdapter.html b/doc/doc++/osg/MemoryAdapter.html index 9f5bce2eb..6141725a1 100644 --- a/doc/doc++/osg/MemoryAdapter.html +++ b/doc/doc++/osg/MemoryAdapter.html @@ -23,21 +23,21 @@

    Public Methods

    -[more] MemoryAdapter() +[more] MemoryAdapter()
    -[more]virtual void ref_data(void* ) = 0 +[more]virtual void ref_data(void* ) = 0
    Increment the reference count of the userData
    -[more]virtual void unref_data(void* ) = 0 +[more]virtual void unref_data(void* ) = 0
    Decrement the reference count of the userData.
    -[more]virtual void* clone_data(void* ) +[more]virtual void* clone_data(void* )
    not current used, but will be used in future

    Protected Methods

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

    @@ -70,30 +70,30 @@ which can be attached to osg::Node.
    - +
    o MemoryAdapter()

    - +

    ovirtual void ref_data(void* ) = 0
    Increment the reference count of the userData

    - +

    ovirtual void unref_data(void* ) = 0
    Decrement the reference count of the userData. Is usually implemented such that if reference count is decremented to zero the userData should be deleted. However, this is entirely up to the -discression of the user who is extending this base class. +discretion of the user who is extending this base class.

    - +

    ovirtual void* clone_data(void* )
    not current used, but will be used in future

    - +

    ovirtual ~MemoryAdapter()

    diff --git a/doc/doc++/osg/Node.html b/doc/doc++/osg/Node.html index 95ba3ac84..fdf390646 100644 --- a/doc/doc++/osg/Node.html +++ b/doc/doc++/osg/Node.html @@ -23,158 +23,165 @@

    Public Methods

    -[more] Node() +[more] Node()
    Construct a node.
    -[more]virtual Object* clone() const +[more]virtual Object* clone() const
    return a shallow copy of a node, with Object* return type
    -[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
    return true if this and obj are of the same kind of object
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    return the name of the node's class type
    -[more]virtual void accept(NodeVisitor& nv) +[more]virtual void accept(NodeVisitor& nv)
    Visitor Pattern : calls the apply method of a NodeVisitor with this node's type
    -[more]virtual void ascend(NodeVisitor& nv) +[more]virtual void ascend(NodeVisitor& nv)
    Traverse upwards : calls parents' accept method with NodeVisitor
    -[more]virtual void traverse(NodeVisitor& ) +[more]virtual void traverse(NodeVisitor& )
    Traverse downwards : calls children's accept method with NodeVisitor
    -[more]inline void setName( const std::string& name ) +[more]inline void setName( const std::string& name )
    Set the name of node using C++ style string
    -[more]inline void setName( const char* name ) +[more]inline void setName( const char* name )
    Set the name of node using a C style string
    -[more]inline const std::string& getName() const +[more]inline const std::string& getName() const
    Get the name of node
    -[more]inline const ParentList& getParents() const +[more]inline const ParentList& getParents() const
    Get the parent list of node.
    -[more]inline Group* getParent(const int i) +[more]inline Group* getParent(const int i)
    Get the a copy of parent list of node.
    -[more]inline const Group* getParent(const int i) const +[more]inline const Group* getParent(const int i) const
    Get a single const parent of node.
    -[more]inline const int getNumParents() const +[more]inline const int getNumParents() const
    Get the number of parents of node.
    -[more]void setAppCallback(NodeCallback* nc) +[more]void setAppCallback(NodeCallback* nc)
    Set app node callback, called during app traversal.
    -[more]inline NodeCallback* getAppCallback() +[more]inline NodeCallback* getAppCallback()
    Get app node callback, called during app traversal.
    -[more]inline const NodeCallback* getAppCallback() const +[more]inline const NodeCallback* getAppCallback() const
    Get const app node callback, called during app traversal.
    -[more]inline const int getNumChildrenRequiringAppTraversal() const +[more]inline const int getNumChildrenRequiringAppTraversal() const
    Get the number of Children of this node which require App traversal, since they have an AppCallback attached to them or their children
    -[more]inline void setUserData(void* data, MemoryAdapter* ma=0L) -
    Set user data. +[more]void setCullingActive(const bool active) +
    Set the view frustum/small feature culling of this node to be active or inactive.
    -[more]inline void* getUserData() +[more]inline const bool getCullingActive() const +
    Get the view frustum/small feature _cullingActive flag. +
    +[more]inline const int getNumChildrenWithCullingDisabled() const +
    Get the number of Children of this node which have culling disabled +
    +[more]inline void setUserData(osg::Referenced* obj) +
    Set user data, data must be subclased from Referenced to allow automatic memory handling. +
    +[more]inline Referenced* getUserData()
    Get user data
    -[more]inline const void* getUserData() const +[more]inline const Referenced* getUserData() const
    Get const user data
    -[more]inline MemoryAdapter* getMemoryAdapter() -
    Get the memory adapter associated with _userData -
    -[more]inline const MemoryAdapter* getMemoryAdapter() const -
    Get the const memory adapter associated with _userData -
    -[more]inline void setNodeMask(const NodeMask nm) +[more]inline void setNodeMask(const NodeMask nm)
    Set the node mask.
    -[more]inline const NodeMask getNodeMask() const +[more]inline const NodeMask getNodeMask() const
    Get the node Mask.
    -[more]inline const DescriptionList& getDescriptions() const +[more]inline const DescriptionList& getDescriptions() const
    Get the description list of the const node
    -[more]inline DescriptionList& getDescriptions() +[more]inline DescriptionList& getDescriptions()
    Get the description list of the const node
    -[more]inline const std::string& getDescription(const int i) const +[more]inline const std::string& getDescription(const int i) const
    Get a single const description of the const node
    -[more]inline std::string& getDescription(const int i) +[more]inline std::string& getDescription(const int i)
    Get a single description of the node
    -[more]inline const int getNumDescriptions() const +[more]inline const int getNumDescriptions() const
    Get the number of descriptions of the node
    -[more]void addDescription(const std::string& desc) +[more]void addDescription(const std::string& desc)
    Add a description string to the node
    -[more]inline void setStateSet(osg::StateSet* dstate) +[more]inline void setStateSet(osg::StateSet* dstate)
    set the node's StateSet
    -[more]inline osg::StateSet* getStateSet() +[more]inline osg::StateSet* getStateSet()
    return the node's StateSet
    -[more]inline const osg::StateSet* getStateSet() const +[more]inline const osg::StateSet* getStateSet() const
    return the node's const StateSet
    -[more]inline const BoundingSphere& getBound() const +[more]inline const BoundingSphere& getBound() const
    get the bounding sphere of node.
    -[more]void dirtyBound() +[more]void dirtyBound()
    Mark this node's bounding sphere dirty.

    Public Members

    -[more]typedef std::vector<Group*> ParentList +[more]typedef std::vector<Group*> ParentList
    A vector of osg::Group pointers which is used to store the parent(s) of node
    -[more]typedef std::vector<std::string> DescriptionList +[more]typedef std::vector<std::string> DescriptionList
    A vector of std::string's which are used to describe the object

    Protected Fields

    -[more]mutable BoundingSphere _bsphere +[more]mutable BoundingSphere _bsphere
    -[more]mutable bool _bsphere_computed +[more]mutable bool _bsphere_computed
    -[more]std::string _name +[more]std::string _name
    -[more]ParentList _parents +[more]ParentList _parents
    -[more]ref_ptr<NodeCallback> _appCallback +[more]ref_ptr<NodeCallback> _appCallback
    -[more]int _numChildrenRequiringAppTraversal +[more]int _numChildrenRequiringAppTraversal
    -[more]void* _userData +[more]bool _cullingActive
    -[more]ref_ptr<MemoryAdapter> _memoryAdapter +[more]int _numChildrenWithCullingDisabled
    -[more]NodeMask _nodeMask +[more]osg::ref_ptr<Referenced> _userData
    -[more]DescriptionList _descriptions +[more]NodeMask _nodeMask
    -[more]ref_ptr<StateSet> _dstate +[more]DescriptionList _descriptions +
    +[more]ref_ptr<StateSet> _dstate

    Protected Methods

    -[more]virtual ~Node() +[more]virtual ~Node()
    Node destructor.
    -[more]virtual const bool computeBound() const +[more]virtual const bool computeBound() const
    Compute the bounding sphere around Node's geometry or children.
    -[more]void setNumChildrenRequiringAppTraversal(const int num) +[more]void setNumChildrenRequiringAppTraversal(const int num) +
    +[more]void setNumChildrenWithCullingDisabled(const int num)

    @@ -209,75 +216,75 @@ Provides interface for most common node operations (Composite Pattern). - +
    o Node()
    Construct a node. Initialize the parent list to empty, node name to "" and bounding sphere dirty flag to true.

    - +

    ovirtual Object* clone() const
    return a shallow copy of a node, with Object* return type

    - +

    ovirtual bool isSameKindAs(const Object* obj) const
    return true if this and obj are of the same kind of object

    - +

    ovirtual const char* className() const
    return the name of the node's class type

    - +

    ovirtual void accept(NodeVisitor& nv)
    Visitor Pattern : calls the apply method of a NodeVisitor with this node's type

    - +

    ovirtual void ascend(NodeVisitor& nv)
    Traverse upwards : calls parents' accept method with NodeVisitor

    - +

    ovirtual void traverse(NodeVisitor& )
    Traverse downwards : calls children's accept method with NodeVisitor

    - +

    oinline void setName( const std::string& name )
    Set the name of node using C++ style string

    - +

    oinline void setName( const char* name )
    Set the name of node using a C style string

    - +

    oinline const std::string& getName() const
    Get the name of node

    - +

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

    - -

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

    - +

    oinline Group* getParent(const int i)
    Get the a copy of parent list of node. A copy is returned to prevent modification of the parent list.

    - +

    oinline const Group* getParent(const int i) const
    Get a single const parent of node. @@ -285,134 +292,144 @@ Get a single const parent of node.
    Parameters:
    i - index of the parent to get.
    Returns:
    the parent i.

    - +

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

    - +

    ovoid setAppCallback(NodeCallback* nc)
    Set app node callback, called during app traversal.

    - +

    oinline NodeCallback* getAppCallback()
    Get app node callback, called during app traversal.

    - +

    oinline const NodeCallback* getAppCallback() const
    Get const app node callback, called during app traversal.

    - +

    oinline const int getNumChildrenRequiringAppTraversal() const
    Get the number of Children of this node which require App traversal, since they have an AppCallback attached to them or their children

    + + +

    ovoid setCullingActive(const bool active) +
    Set the view frustum/small feature culling of this node to be active or inactive. +The default value to true for _cullingActive. Used a guide +to the cull traversal. +

    + + +

    oinline const bool getCullingActive() const +
    Get the view frustum/small feature _cullingActive flag. Used a guide +to the cull traversal. +

    + + +

    oinline const int getNumChildrenWithCullingDisabled() const +
    Get the number of Children of this node which have culling disabled +

    - -

    oinline void setUserData(void* data, MemoryAdapter* ma=0L) + +
    oinline void setUserData(osg::Referenced* obj)
    -Set user data. See MemoryAdapter documention for details -of how to specify memory management of _userData. +Set user data, data must be subclased from Referenced to allow +automatic memory handling. If you own data isn't directly +subclassed from Referenced then create and adapter object +which points to your own objects and handles the memory addressing.

    - -

    oinline void* getUserData() + +
    oinline Referenced* getUserData()
    Get user data

    - -

    oinline const void* getUserData() const + +
    oinline const Referenced* getUserData() const
    Get const user data

    - - -

    oinline MemoryAdapter* getMemoryAdapter() -
    Get the memory adapter associated with _userData -

    - - -

    oinline const MemoryAdapter* getMemoryAdapter() const -
    Get the const memory adapter associated with _userData -

    - +

    oinline void setNodeMask(const NodeMask nm)
    Set the node mask. Note, node mask is will be replaced by TraversalMask.

    - +

    oinline const NodeMask getNodeMask() const
    Get the node Mask. Note, node mask is will be replaced by TraversalMask.

    - +

    otypedef std::vector<std::string> DescriptionList
    A vector of std::string's which are used to describe the object

    - -

    oinline const DescriptionList& getDescriptions() const + +
    oinline const DescriptionList& getDescriptions() const
    Get the description list of the const node

    - -

    oinline DescriptionList& getDescriptions() + +
    oinline DescriptionList& getDescriptions()
    Get the description list of the const node

    - +

    oinline const std::string& getDescription(const int i) const
    Get a single const description of the const node

    - +

    oinline std::string& getDescription(const int i)
    Get a single description of the node

    - +

    oinline const int getNumDescriptions() const
    Get the number of descriptions of the node

    - +

    ovoid addDescription(const std::string& desc)
    Add a description string to the node

    - +

    oinline void setStateSet(osg::StateSet* dstate)
    set the node's StateSet

    - +

    oinline osg::StateSet* getStateSet()
    return the node's StateSet

    - +

    oinline const osg::StateSet* getStateSet() const
    return the node's const StateSet

    - +

    oinline const BoundingSphere& getBound() const
    get the bounding sphere of node. Using lazy evaluation computes the bounding sphere if it is 'dirty'.

    - +

    ovoid dirtyBound()
    Mark this node's bounding sphere dirty. Forcing it to be computed on the next call to getBound().

    - +

    ovirtual ~Node()
    Node destructor. Note, is protected so that Nodes cannot be deleted other than by being dereferenced and the reference @@ -423,58 +440,66 @@ forcing all nodes to be created on the heap i.e Node* node = new Node().

    - +

    ovirtual const bool computeBound() const
    Compute the bounding sphere around Node's geometry or children. This method is automatically called by getBound() when the bounding sphere has been marked dirty via dirtyBound().

    - +

    omutable BoundingSphere _bsphere

    - +

    omutable bool _bsphere_computed

    - +

    ostd::string _name

    - -

    oParentList _parents + +
    oParentList _parents

    - +

    oref_ptr<NodeCallback> _appCallback

    - +

    oint _numChildrenRequiringAppTraversal

    - +

    ovoid setNumChildrenRequiringAppTraversal(const int num)

    - - -

    ovoid* _userData + + +
    obool _cullingActive

    - - -

    oref_ptr<MemoryAdapter> _memoryAdapter + + +
    oint _numChildrenWithCullingDisabled +

    + + +

    ovoid setNumChildrenWithCullingDisabled(const int num) +

    + + +

    oosg::ref_ptr<Referenced> _userData

    - +

    oNodeMask _nodeMask

    - -

    oDescriptionList _descriptions + +
    oDescriptionList _descriptions

    - +

    oref_ptr<StateSet> _dstate

    diff --git a/doc/doc++/osg/NodeAcceptOp.html b/doc/doc++/osg/NodeAcceptOp.html index b9edc013e..fa7dd7493 100644 --- a/doc/doc++/osg/NodeAcceptOp.html +++ b/doc/doc++/osg/NodeAcceptOp.html @@ -7,41 +7,41 @@ -

    struct osg::NodeAcceptOp

    Convinience functor for assisting visiting of arrays of osg::Node's
    +

    struct osg::NodeAcceptOp

    Convenience functor for assisting visiting of arrays of osg::Node's

    -[more]NodeVisitor& _nv +[more]NodeVisitor& _nv
    -[more] NodeAcceptOp(NodeVisitor& nv) +[more] NodeAcceptOp(NodeVisitor& nv)
    -[more]void operator () (Node* node) +[more]void operator () (Node* node)
    -[more]void operator () (ref_ptr<Node> node) +[more]void operator () (ref_ptr<Node> node)

    Documentation

    -
    Convinience functor for assisting visiting of arrays of osg::Node's
    +
    Convenience functor for assisting visiting of arrays of osg::Node's
    - +
    oNodeVisitor& _nv

    - +

    o NodeAcceptOp(NodeVisitor& nv)

    - +

    ovoid operator () (Node* node)

    - +

    ovoid operator () (ref_ptr<Node> node)

    Alphabetic index HTML hierarchy of classes or Java

    diff --git a/doc/doc++/osg/NodeCallback.html b/doc/doc++/osg/NodeCallback.html index 4317447c3..a383b2f20 100644 --- a/doc/doc++/osg/NodeCallback.html +++ b/doc/doc++/osg/NodeCallback.html @@ -22,28 +22,41 @@

    Public Fields

    -[more]Requirements _requirements +[more]Requirements _requirements +
    +[more]ref_ptr<NodeCallback> _nestedCallback

    Public Methods

    -[more] NodeCallback(const Requirements ncr=NO_REQUIREMENTS) +[more] NodeCallback(const Requirements ncr=NO_REQUIREMENTS)
    -[more]virtual ~NodeCallback() +[more]virtual ~NodeCallback()
    -[more]inline void setRequirements(const Requirements ncr) +[more]inline void setRequirements(const Requirements ncr)
    Set what values from traversal are required by this NodeCallback
    -[more]inline const Requirements getRequirements() const +[more]inline const Requirements getRequirements() const
    Get what values from traversal are required by this NodeCallback
    -[more]virtual void operator()(Node*, NodeVisitor*) +[more]virtual void operator()(Node*, NodeVisitor*)
    Callback method call by the NodeVisitor when visiting a node +
    +[more]void traverse(Node* node, NodeVisitor* nv) +
    Call any nested callbacks and then traverse the scene graph. +
    +[more]void setNestedCallback(NodeCallback* nc) +
    +[more]NodeCallback* getNestedCallback() +
    +[more]inline void addNestedCallback(NodeCallback* nc) +
    +[more]inline void removeNestedCallback(NodeCallback* nc)

    Public Members

    -[more]enum Requirements +[more]enum Requirements
    The range of values which can be accumulated by the NodeVisitor.

    @@ -74,58 +87,83 @@
    - +
    oenum Requirements
    The range of values which can be accumulated by the NodeVisitor.

    - +
    o NO_REQUIREMENTS

    - +

    o REQUIRES_TRAVERSAL

    - +

    o REQUIRES_PARENT_PATH

    - +

    o REQUIRES_ACCUMULATED_MATRIX

    - +

    o REQUIRES_ACCUMULATED_INVERSE

    - -
    o NodeCallback(const Requirements ncr=NO_REQUIREMENTS) + +
    o NodeCallback(const Requirements ncr=NO_REQUIREMENTS)

    - +

    ovirtual ~NodeCallback()

    - -

    oinline void setRequirements(const Requirements ncr) + +
    oinline void setRequirements(const Requirements ncr)
    Set what values from traversal are required by this NodeCallback

    - -

    oinline const Requirements getRequirements() const + +
    oinline const Requirements getRequirements() const
    Get what values from traversal are required by this NodeCallback

    - +

    ovirtual void operator()(Node*, NodeVisitor*)
    Callback method call by the NodeVisitor when visiting a node

    + + +

    ovoid traverse(Node* node, NodeVisitor* nv) +
    Call any nested callbacks and then traverse the scene graph. +

    + + +

    ovoid setNestedCallback(NodeCallback* nc) +

    + + +

    oNodeCallback* getNestedCallback() +

    + + +

    oinline void addNestedCallback(NodeCallback* nc) +

    + + +

    oinline void removeNestedCallback(NodeCallback* nc) +

    - -

    oRequirements _requirements + +
    oRequirements _requirements +

    + + +

    oref_ptr<NodeCallback> _nestedCallback

    This class has no child classes.
    diff --git a/doc/doc++/osg/NodeVisitor.html b/doc/doc++/osg/NodeVisitor.html index 3d030beba..c5f5e39f5 100644 --- a/doc/doc++/osg/NodeVisitor.html +++ b/doc/doc++/osg/NodeVisitor.html @@ -23,94 +23,96 @@

    Public Methods

    -[more] NodeVisitor(TraversalMode tm=TRAVERSE_NONE) +[more] NodeVisitor(TraversalMode tm=TRAVERSE_NONE)
    -[more]virtual ~NodeVisitor() +[more]virtual ~NodeVisitor()
    -[more]virtual void reset() +[more]virtual void reset()
    Method to call to reset visitor.
    -[more]inline void setTraversalNumber(const int fn) +[more]inline void setTraversalNumber(const int fn)
    Set the traversal number.
    -[more]inline const int getTraversalNumber() const +[more]inline const int getTraversalNumber() const
    Get the traversal number.
    -[more]inline void setFrameStamp(FrameStamp* fs) +[more]inline void setFrameStamp(FrameStamp* fs)
    Set the FrameStamp that this traversal is assoicated with
    -[more]inline const FrameStamp* getFrameStamp() const +[more]inline const FrameStamp* getFrameStamp() const
    Get the FrameStamp that this traversal is assoicated with
    -[more]inline void setTraversalMask(const Node::NodeMask mask) +[more]inline void setTraversalMask(const Node::NodeMask mask)
    Set the TraversalMask of this NodeVisitor.
    -[more]inline const Node::NodeMask getTraversalMask() const +[more]inline const Node::NodeMask getTraversalMask() const
    Get the TraversalMask
    -[more]inline void setNodeMaskOverride(const Node::NodeMask mask) +[more]inline void setNodeMaskOverride(const Node::NodeMask mask)
    Set the NodeMaskOverride mask.
    -[more]inline const Node::NodeMask getNodeMaskOverride() const +[more]inline const Node::NodeMask getNodeMaskOverride() const
    Get the NodeMaskOverride mask
    -[more]inline const bool validNodeMask(const osg::Node& node) const +[more]inline const bool validNodeMask(const osg::Node& node) const
    Method to called by Node and its subclass' Node::accept() method, if the result is true to be used to cull operations of nodes and their subgraphs.
    -[more]void setTraversalMode(const TraversalMode mode) +[more]void setTraversalMode(const TraversalMode mode)
    Set the traversal mode for Node::traverse() to use when deciding which children of a node to traverse.
    -[more]inline const TraversalMode getTraversalMode() const +[more]inline const TraversalMode getTraversalMode() const
    Get the traversal mode
    -[more]void setTraversalVisitor(NodeVisitor* nv) +[more]void setTraversalVisitor(NodeVisitor* nv)
    Set a visitor to handle traversal.
    -[more]NodeVisitor* getTraversalVisitor() +[more]NodeVisitor* getTraversalVisitor()
    Get the traversal visitor, returns NULL if none is attached
    -[more]void traverse(Node& node) +[more]void traverse(Node& node)
    Inline method for handling traversal of a nodes.
    -[more]virtual void apply(Node& node) +[more]virtual void apply(Node& node)
    -[more]virtual void apply(Geode& node) +[more]virtual void apply(Geode& node)
    -[more]virtual void apply(Billboard& node) +[more]virtual void apply(Billboard& node)
    -[more]virtual void apply(LightSource& node) +[more]virtual void apply(LightSource& node)
    -[more]virtual void apply(Group& node) +[more]virtual void apply(Group& node)
    -[more]virtual void apply(Transform& node) +[more]virtual void apply(Transform& node)
    -[more]virtual void apply(Switch& node) +[more]virtual void apply(Switch& node)
    -[more]virtual void apply(Sequence& node) +[more]virtual void apply(Sequence& node)
    -[more]virtual void apply(LOD& node) +[more]virtual void apply(LOD& node)
    -[more]virtual void apply(Impostor& node) +[more]virtual void apply(Impostor& node) +
    +[more]virtual void apply(EarthSky& node)

    Public Members

    -[more]enum TraversalMode +[more]enum TraversalMode

    Protected Fields

    -[more]int _traversalNumber +[more]int _traversalNumber
    -[more]ref_ptr<FrameStamp> _frameStamp +[more]ref_ptr<FrameStamp> _frameStamp
    -[more]ref_ptr<NodeVisitor> _traversalVisitor +[more]ref_ptr<NodeVisitor> _traversalVisitor
    -[more]TraversalMode _traversalMode +[more]TraversalMode _traversalMode
    -[more]Node::NodeMask _traversalMask +[more]Node::NodeMask _traversalMask
    -[more]Node::NodeMask _nodeMaskOverride +[more]Node::NodeMask _nodeMaskOverride

    @@ -138,73 +140,85 @@

    Documentation

    Visitor for type safe operations on osg::Node's. -Based on GOF's Visitor pattern.
    +Based on GOF's Visitor pattern. The NodeVisitor +is useful for developing type safe operations to nodes +in the scene graph (as per Visitor pattern), and adds to this +support for optional scene graph traversal to allow +operations to be applied to whole scenes at once. The Visitor +pattern uses a technique of double dispatch as a mechanism to +called the appropriate apply(..) method of the NodeVisitor. To +use this feature one must use the Node::accept(NodeVisitor) which +is extended in each Node subclass, rather than the NodeVisitor +apply directly. So use root->accept(myVisitor); instead of +myVisitor.apply(*root). The later method will bypass the double +dispatch and the appropriate NodeVisitor::apply(..) method will +not be called.
    - +
    oenum TraversalMode

    - +
    o TRAVERSE_NONE

    - +

    o TRAVERSE_PARENTS

    - +

    o TRAVERSE_ALL_CHILDREN

    - +

    o TRAVERSE_ACTIVE_CHILDREN

    - +

    o TRAVERSE_VISITOR

    - -
    o NodeVisitor(TraversalMode tm=TRAVERSE_NONE) + +
    o NodeVisitor(TraversalMode tm=TRAVERSE_NONE)

    - +

    ovirtual ~NodeVisitor()

    - +

    ovirtual void reset()
    Method to call to reset visitor. Useful for your visitor accumulates -state during a traversal, and you plan to resuse the visitor. +state during a traversal, and you plan to reuse the visitor. To flush that state for the next traversal than call reset() prior to each traversal.

    - +

    oinline void setTraversalNumber(const int fn)
    Set the traversal number. Typically used to denote the frame count.

    - +

    oinline const int getTraversalNumber() const
    Get the traversal number. Typically used to denote the frame count.

    - +

    oinline void setFrameStamp(FrameStamp* fs)
    Set the FrameStamp that this traversal is assoicated with

    - +

    oinline const FrameStamp* getFrameStamp() const
    Get the FrameStamp that this traversal is assoicated with

    - +

    oinline void setTraversalMask(const Node::NodeMask mask)
    Set the TraversalMask of this NodeVisitor. The TraversalMask is used by the NodeVisitor::validNodeMask() method @@ -217,12 +231,12 @@ _nodeMaskOverride to 0xffffffff will allow a visitor to work on all nodes regardless of their own Node::_nodeMask state.

    - +

    oinline const Node::NodeMask getTraversalMask() const
    Get the TraversalMask

    - +

    oinline void setNodeMaskOverride(const Node::NodeMask mask)
    Set the NodeMaskOverride mask. Used in validNodeMask() to determine whether to operate on a node or its @@ -231,12 +245,12 @@ Typically used to force on nodes which may have been switched off by their own Node::_nodeMask.

    - +

    oinline const Node::NodeMask getNodeMaskOverride() const
    Get the NodeMaskOverride mask

    - +

    oinline const bool validNodeMask(const osg::Node& node) const
    Method to called by Node and its subclass' Node::accept() method, if the result is true to be used to cull operations of nodes and their subgraphs. @@ -246,8 +260,8 @@ default values for _traversalMask is 0xffffffff, _nodeMaskOverride is 0x0, and osg::Node::_nodeMask is 0xffffffff.

    - -

    ovoid setTraversalMode(const TraversalMode mode) + +
    ovoid setTraversalMode(const TraversalMode mode)
    Set the traversal mode for Node::traverse() to use when deciding which children of a node to traverse. If a NodeVisitor has been attached via setTraverseVisitor() @@ -255,23 +269,23 @@ and the new mode is not TRAVERSE_VISITOR then the attached visitor is detached. Default mode is TRAVERSE_NONE.

    - -

    oinline const TraversalMode getTraversalMode() const + +
    oinline const TraversalMode getTraversalMode() const
    Get the traversal mode

    - +

    ovoid setTraversalVisitor(NodeVisitor* nv)
    Set a visitor to handle traversal. -Overides the traverse mode setting it to TRAVERSAL_VISITOR. +Overrides the traverse mode setting it to TRAVERSAL_VISITOR.

    - +

    oNodeVisitor* getTraversalVisitor()
    Get the traversal visitor, returns NULL if none is attached

    - +

    ovoid traverse(Node& node)
    Inline method for handling traversal of a nodes. If you intend to use the visitor for actively traversing @@ -279,67 +293,71 @@ the scene graph then make sure the accept() methods call this method unless they handle traversal directly.

    - +

    ovirtual void apply(Node& node)

    - +

    ovirtual void apply(Geode& node)

    - +

    ovirtual void apply(Billboard& node)

    - +

    ovirtual void apply(LightSource& node)

    - +

    ovirtual void apply(Group& node)

    - +

    ovirtual void apply(Transform& node)

    - +

    ovirtual void apply(Switch& node)

    - +

    ovirtual void apply(Sequence& node)

    - +

    ovirtual void apply(LOD& node)

    - +

    ovirtual void apply(Impostor& node)

    + + +

    ovirtual void apply(EarthSky& node) +

    - +

    oint _traversalNumber

    - +

    oref_ptr<FrameStamp> _frameStamp

    - +

    oref_ptr<NodeVisitor> _traversalVisitor

    - -

    oTraversalMode _traversalMode + +
    oTraversalMode _traversalMode

    - +

    oNode::NodeMask _traversalMask

    - +

    oNode::NodeMask _nodeMaskOverride

    diff --git a/doc/doc++/osg/NotifySeverity.html b/doc/doc++/osg/NotifySeverity.html index a77410f84..cd5c46be9 100644 --- a/doc/doc++/osg/NotifySeverity.html +++ b/doc/doc++/osg/NotifySeverity.html @@ -12,19 +12,19 @@

    -[more] ALWAYS +[more] ALWAYS
    -[more] FATAL +[more] FATAL
    -[more] WARN +[more] WARN
    -[more] NOTICE +[more] NOTICE
    -[more] INFO +[more] INFO
    -[more] DEBUG_INFO +[more] DEBUG_INFO
    -[more] DEBUG_FP +[more] DEBUG_FP

    @@ -39,31 +39,31 @@ further details.
    - +
    o ALWAYS

    - +

    o FATAL

    - +

    o WARN

    - +

    o NOTICE

    - +

    o INFO

    - +

    o DEBUG_INFO

    - +

    o DEBUG_FP

    Alphabetic index HTML hierarchy of classes or Java

    diff --git a/doc/doc++/osg/Object.html b/doc/doc++/osg/Object.html index e05b8c093..75112fb7c 100644 --- a/doc/doc++/osg/Object.html +++ b/doc/doc++/osg/Object.html @@ -11,11 +11,11 @@

    Inheritance:

    - - - - - + + + + +
    @@ -23,21 +23,21 @@

    Public Methods

    -[more] Object() +[more] Object()
    Construct an object.
    -[more]virtual Object* clone() const = 0 +[more]virtual Object* clone() const = 0
    return a shallow copy of a node, with Object* return type.
    -[more]virtual bool isSameKindAs(const Object*) const +[more]virtual bool isSameKindAs(const Object*) const
    -[more]virtual const char* className() const = 0 +[more]virtual const char* className() const = 0
    return the name of the object's class type.

    Protected Methods

    -[more]virtual ~Object() +[more]virtual ~Object()
    Object destructor.

    @@ -71,34 +71,34 @@ Based on GOF Composite, Prototype and Template Method patterns.
    - +
    o Object()
    Construct an object. Note Object is a pure virtual base class and therefore cannot be constructed on its own, only derived -classes which overide the clone and className methods are +classes which override the clone and className methods are concrete classes and can be constructed.

    - +

    ovirtual Object* clone() const = 0
    return a shallow copy of a node, with Object* return type. Must be defined by derived classes.

    - +

    ovirtual bool isSameKindAs(const Object*) const

    - +

    ovirtual const char* className() const = 0
    return the name of the object's class type. Must be defined by derived classes.

    - +

    ovirtual ~Object()
    Object destructor. Note, is protected so that Objects cannot -be deleted other than by being derefernced and the reference +be deleted other than by being dereferenced and the reference count being zero (see osg::Referenced), preventing the deletion of nodes which are still in use. This also means that Node's cannot be created on stack i.e Node node will not compile, @@ -107,7 +107,8 @@ forcing all nodes to be created on the heap i.e Node* node

    Direct child classes: -
    StateSet
    +
    Statistics
    +StateSet
    StateAttribute
    Node
    Matrix
    diff --git a/doc/doc++/osg/Plane.html b/doc/doc++/osg/Plane.html index a783f6372..d7967e7e4 100644 --- a/doc/doc++/osg/Plane.html +++ b/doc/doc++/osg/Plane.html @@ -13,68 +13,68 @@

    Public Methods

    -[more]inline Plane() +[more]inline Plane()
    -[more]inline Plane(const Plane& pl) +[more]inline Plane(const Plane& pl)
    -[more]inline Plane(const float a, const float b, const float c, const float d) +[more]inline Plane(const float a, const float b, const float c, const float d)
    -[more]inline Plane(const Vec4& vec) +[more]inline Plane(const Vec4& vec)
    -[more]inline Plane(const Vec3& norm, const float d) +[more]inline Plane(const Vec3& norm, const float d)
    -[more]inline Plane(const Vec3& v1, const Vec3& v2, const Vec3& v3) +[more]inline Plane(const Vec3& v1, const Vec3& v2, const Vec3& v3)
    -[more]inline Plane& operator = (const Plane& pl) +[more]inline Plane& operator = (const Plane& pl)
    -[more]inline void set(const Plane& pl) +[more]inline void set(const Plane& pl)
    -[more]inline void set(const float a, const float b, const float c, const float d) +[more]inline void set(const float a, const float b, const float c, const float d)
    -[more]inline void set(const Vec4& vec) +[more]inline void set(const Vec4& vec)
    -[more]inline void set(const Vec3& norm, const float d) +[more]inline void set(const Vec3& norm, const float d)
    -[more]inline void set(const Vec3& v1, const Vec3& v2, const Vec3& v3) +[more]inline void set(const Vec3& v1, const Vec3& v2, const Vec3& v3)
    -[more]inline void makeUnitLength() +[more]inline void makeUnitLength()
    -[more]inline void calculateUpperLowerBBCorners() +[more]inline void calculateUpperLowerBBCorners()
    calculate the upper and lower bounding box corners to be used in the intersect(BoundingBox&) method for speeding calculations
    -[more]inline const bool valid() const +[more]inline const bool valid() const
    -[more]inline Vec4& asVec4() +[more]inline Vec4& asVec4()
    -[more]inline const Vec4& asVec4() const +[more]inline const Vec4& asVec4() const
    -[more]inline float& operator [] (const int i) +[more]inline float& operator [] (const int i)
    -[more]inline float operator [] (const int i) const +[more]inline float operator [] (const int i) const
    -[more]inline const float distance(const osg::Vec3& v) const +[more]inline const float distance(const osg::Vec3& v) const
    calculate the distance between a point and the plane
    -[more]inline const int intersect(const BoundingSphere& bs) const -
    interesection test between plane and bounding sphere. +[more]inline const int intersect(const BoundingSphere& bs) const +
    intersection test between plane and bounding sphere.
    -[more]inline const int intersect(const BoundingBox& bb) const -
    interesection test between plane and bounding sphere. +[more]inline const int intersect(const BoundingBox& bb) const +
    intersection test between plane and bounding sphere.
    -[more]inline void transform(const osg::Matrix& matrix) +[more]inline void transform(const osg::Matrix& matrix)
    Transform the plane by matrix.
    -[more]inline void transformProvidingInverse(const osg::Matrix& matrix) +[more]inline void transformProvidingInverse(const osg::Matrix& matrix)
    Transform the plane by provide a pre inverted matrix.

    Protected Fields

    -[more]Vec4 _fv +[more]Vec4 _fv
    -[more]unsigned int _upperBBCorner +[more]unsigned int _upperBBCorner
    -[more]unsigned int _lowerBBCorner +[more]unsigned int _lowerBBCorner

    @@ -86,106 +86,106 @@
    - +
    oinline Plane()

    - -

    oinline Plane(const Plane& pl) + +
    oinline Plane(const Plane& pl)

    - +

    oinline Plane(const float a, const float b, const float c, const float d)

    - +

    oinline Plane(const Vec4& vec)

    - +

    oinline Plane(const Vec3& norm, const float d)

    - +

    oinline Plane(const Vec3& v1, const Vec3& v2, const Vec3& v3)

    - +

    oinline Plane& operator = (const Plane& pl)

    - +

    oinline void set(const Plane& pl)

    - +

    oinline void set(const float a, const float b, const float c, const float d)

    - +

    oinline void set(const Vec4& vec)

    - +

    oinline void set(const Vec3& norm, const float d)

    - +

    oinline void set(const Vec3& v1, const Vec3& v2, const Vec3& v3)

    - +

    oinline void makeUnitLength()

    - +

    oinline void calculateUpperLowerBBCorners()
    calculate the upper and lower bounding box corners to be used in the intersect(BoundingBox&) method for speeding calculations

    - +

    oinline const bool valid() const

    - +

    oinline Vec4& asVec4()

    - +

    oinline const Vec4& asVec4() const

    - +

    oinline float& operator [] (const int i)

    - +

    oinline float operator [] (const int i) const

    - +

    oinline const float distance(const osg::Vec3& v) const
    calculate the distance between a point and the plane

    - +

    oinline const int intersect(const BoundingSphere& bs) const -
    interesection test between plane and bounding sphere. +
    intersection test between plane and bounding sphere. return 1 if the bs is completely above plane, return 0 if the bs intersects the plane, return -1 if the bs is completely below the plane.

    - +

    oinline const int intersect(const BoundingBox& bb) const -
    interesection test between plane and bounding sphere. +
    intersection test between plane and bounding sphere. return 1 if the bs is completely above plane, return 0 if the bs intersects the plane, return -1 if the bs is completely below the plane.

    - +

    oinline void transform(const osg::Matrix& matrix)
    Transform the plane by matrix. Note, this operations carries out the calculation of the inverse of the matrix since to transforms @@ -195,27 +195,27 @@ calculated elsewhere then use transformProvidingInverse() instead. See http://www.worldserver.com/turk/computergraphics/NormalTransformations.pdf

    - +

    oinline void transformProvidingInverse(const osg::Matrix& matrix)
    Transform the plane by provide a pre inverted matrix. see transform for details.

    - +

    oVec4 _fv

    - +

    ounsigned int _upperBBCorner

    - +

    ounsigned int _lowerBBCorner

    This class has no child classes.
    -
    Friends:
    inline ostream& operator << (ostream& output, const Plane& pl)

    Alphabetic index HTML hierarchy of classes or Java

    +
    Friends:
    inline std::ostream& operator << (std::ostream& output, const Plane& pl)

    Alphabetic index HTML hierarchy of classes or Java


    This page was generated with the help of DOC++. diff --git a/doc/doc++/osg/Point.html b/doc/doc++/osg/Point.html index 556f9dcdf..55472135d 100644 --- a/doc/doc++/osg/Point.html +++ b/doc/doc++/osg/Point.html @@ -7,7 +7,7 @@ -

    class SG_EXPORT osg::Point

    Point - encapsulates the OpenGL point smmothing and size state
    +

    class SG_EXPORT osg::Point

    Point - encapsulates the OpenGL point smoothing and size state

    Inheritance:

    @@ -23,44 +23,44 @@

    Public Methods

    -[more] Point() +[more] Point()
    -[more] META_StateAttribute(Point, POINT) +[more] META_StateAttribute(Point, POINT)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const +[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const
    -[more]void setSize(const float size) +[more]void setSize(const float size)
    -[more]inline const float getSize() const +[more]inline const float getSize() const
    -[more]void setFadeThresholdSize(const float fadeThresholdSize) +[more]void setFadeThresholdSize(const float fadeThresholdSize)
    -[more]inline const float getFadeThresholdSize() const +[more]inline const float getFadeThresholdSize() const
    -[more]void setDistanceAttenuation(const Vec3& distanceAttenuation) +[more]void setDistanceAttenuation(const Vec3& distanceAttenuation)
    -[more]inline const Vec3& getDistanceAttenuation() const +[more]inline const Vec3& getDistanceAttenuation() const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const
    -[more]static void init_GL_EXT() +[more]static void init_GL_EXT()

    Protected Fields

    -[more]float _size +[more]float _size
    -[more]float _fadeThresholdSize +[more]float _fadeThresholdSize
    -[more]Vec3 _distanceAttenuation +[more]Vec3 _distanceAttenuation

    Protected Methods

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

    @@ -74,7 +74,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual const Type getType() const
    obool operator < (const StateAttribute& rhs) const
    @@ -127,72 +127,72 @@

    Documentation

    -
    Point - encapsulates the OpenGL point smmothing and size state
    +
    Point - encapsulates the OpenGL point smoothing and size state
    - +
    o Point()

    - -

    o META_StateAttribute(Point, POINT) + +
    o META_StateAttribute(Point, POINT)

    - +

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

    - -

    ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const + +
    ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const

    - +

    ovoid setSize(const float size)

    - +

    oinline const float getSize() const

    - +

    ovoid setFadeThresholdSize(const float fadeThresholdSize)

    - +

    oinline const float getFadeThresholdSize() const

    - +

    ovoid setDistanceAttenuation(const Vec3& distanceAttenuation)

    - +

    oinline const Vec3& getDistanceAttenuation() const

    - +

    ovirtual void apply(State& state) const

    - +

    ostatic void init_GL_EXT()

    - +

    ovirtual ~Point()

    - +

    ofloat _size

    - +

    ofloat _fadeThresholdSize

    - +

    oVec3 _distanceAttenuation

    diff --git a/doc/doc++/osg/PolygonMode.html b/doc/doc++/osg/PolygonMode.html index bb2406825..0bdb876e3 100644 --- a/doc/doc++/osg/PolygonMode.html +++ b/doc/doc++/osg/PolygonMode.html @@ -23,41 +23,41 @@

    Public Methods

    -[more] PolygonMode() +[more] PolygonMode()
    -[more] META_StateAttribute(PolygonMode, POLYGONMODE) +[more] META_StateAttribute(PolygonMode, POLYGONMODE)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]void setMode(const Face face, const Mode mode) +[more]void setMode(const Face face, const Mode mode)
    -[more]const Mode getMode(const Face face) const +[more]const Mode getMode(const Face face) const
    -[more]inline const bool getFrontAndBack() const +[more]inline const bool getFrontAndBack() const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

    Public Members

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

    Protected Fields

    -[more]bool _frontAndBack +[more]bool _frontAndBack
    -[more]Mode _modeFront +[more]Mode _modeFront
    -[more]Mode _modeBack +[more]Mode _modeBack

    Protected Methods

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

    @@ -71,7 +71,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual const Type getType() const
    obool operator < (const StateAttribute& rhs) const
    @@ -79,7 +79,7 @@
    obool operator != (const StateAttribute& rhs) const
    -ovirtual void setStateSetModes(StateSet&, const GLModeValue) const +ovirtual void setStateSetModes(StateSet&, const GLModeValue) const
    ovirtual void compile(State&) const

    @@ -130,85 +130,85 @@
    - +
    o PolygonMode()

    - -

    o META_StateAttribute(PolygonMode, POLYGONMODE) + +
    o META_StateAttribute(PolygonMode, POLYGONMODE)

    - +

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

    - +

    oenum Face

    - +
    o FRONT

    - +

    o BACK

    - +

    o FRONT_AND_BACK

    - +
    oenum Mode

    - +
    o POINT

    - +

    o LINE

    - +

    o FILL

    - -
    ovoid setMode(const Face face, const Mode mode) + +
    ovoid setMode(const Face face, const Mode mode)

    - -

    oconst Mode getMode(const Face face) const + +
    oconst Mode getMode(const Face face) const

    - +

    oinline const bool getFrontAndBack() const

    - +

    ovirtual void apply(State& state) const

    - +

    ovirtual ~PolygonMode()

    - +

    obool _frontAndBack

    - -

    oMode _modeFront + +
    oMode _modeFront

    - -

    oMode _modeBack + +
    oMode _modeBack

    This class has no child classes.
    diff --git a/doc/doc++/osg/PolygonOffset.html b/doc/doc++/osg/PolygonOffset.html index 09977a7c2..e381b4d22 100644 --- a/doc/doc++/osg/PolygonOffset.html +++ b/doc/doc++/osg/PolygonOffset.html @@ -23,36 +23,36 @@

    Public Methods

    -[more] PolygonOffset() +[more] PolygonOffset()
    -[more] META_StateAttribute(PolygonOffset, POLYGONOFFSET) +[more] META_StateAttribute(PolygonOffset, POLYGONOFFSET)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const +[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const
    -[more]inline void setFactor(const float factor) +[more]inline void setFactor(const float factor)
    -[more]inline const float getFactor() const +[more]inline const float getFactor() const
    -[more]inline void setUnits(const float units) +[more]inline void setUnits(const float units)
    -[more]inline const float getUnits() const +[more]inline const float getUnits() const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

    Protected Fields

    -[more]float _factor +[more]float _factor
    -[more]float _units +[more]float _units

    Protected Methods

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

    @@ -66,7 +66,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual const Type getType() const
    obool operator < (const StateAttribute& rhs) const
    @@ -123,52 +123,52 @@
    - +
    o PolygonOffset()

    - -

    o META_StateAttribute(PolygonOffset, POLYGONOFFSET) + +
    o META_StateAttribute(PolygonOffset, POLYGONOFFSET)

    - +

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

    - -

    ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const + +
    ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const

    - +

    oinline void setFactor(const float factor)

    - +

    oinline const float getFactor() const

    - +

    oinline void setUnits(const float units)

    - +

    oinline const float getUnits() const

    - +

    ovirtual void apply(State& state) const

    - +

    ovirtual ~PolygonOffset()

    - +

    ofloat _factor

    - +

    ofloat _units

    diff --git a/doc/doc++/osg/Quat.html b/doc/doc++/osg/Quat.html index 920d23731..f7534fb8f 100644 --- a/doc/doc++/osg/Quat.html +++ b/doc/doc++/osg/Quat.html @@ -13,98 +13,98 @@

    Public Fields

    -[more]Vec4 _fv +[more]Vec4 _fv

    Public Methods

    -[more] Quat() +[more] Quat()
    -[more] Quat( float x, float y, float z, float w ) +[more] Quat( float x, float y, float z, float w )
    -[more] Quat( const Vec4& v ) +[more] Quat( const Vec4& v )
    -[more]inline Vec4& asVec4() +[more]inline Vec4& asVec4()
    -[more]inline const Vec4& asVec4() const +[more]inline const Vec4& asVec4() const
    -[more]inline const Vec3 asVec3() const +[more]inline const Vec3 asVec3() const
    -[more]inline void set(const float x, const float y, const float z, const float w) +[more]inline void set(const float x, const float y, const float z, const float w)
    -[more]inline void set(const osg::Vec4& v) +[more]inline void set(const osg::Vec4& v)
    -[more]inline const Quat operator * (const float& rhs) const +[more]inline const Quat operator * (const float& rhs) const
    Multiply by scalar
    -[more]inline Quat& operator *= (const float& rhs) +[more]inline Quat& operator *= (const float& rhs)
    Unary multiply by scalar
    -[more]inline const Quat operator*(const Quat& rhs) const +[more]inline const Quat operator*(const Quat& rhs) const
    Binary multiply
    -[more]inline Quat& operator*=(const Quat& rhs) +[more]inline Quat& operator*=(const Quat& rhs)
    Unary multiply
    -[more]inline const Quat operator / (const float& rhs) const +[more]inline const Quat operator / (const float& rhs) const
    Divide by scalar
    -[more]inline Quat& operator /= (const float& rhs) +[more]inline Quat& operator /= (const float& rhs)
    Unary divide by scalar
    -[more]inline const Quat operator/(const Quat& denom) const +[more]inline const Quat operator/(const Quat& denom) const
    Binary divide
    -[more]inline Quat& operator/=(const Quat& denom) +[more]inline Quat& operator/=(const Quat& denom)
    Unary divide
    -[more]inline const Quat operator + (const Quat& rhs) const +[more]inline const Quat operator + (const Quat& rhs) const
    Binary addition
    -[more]inline Quat& operator += (const Quat& rhs) +[more]inline Quat& operator += (const Quat& rhs)
    Unary addition
    -[more]inline const Quat operator - (const Quat& rhs) const +[more]inline const Quat operator - (const Quat& rhs) const
    Binary subtraction
    -[more]inline Quat& operator -= (const Quat& rhs) +[more]inline Quat& operator -= (const Quat& rhs)
    Unary subtraction
    -[more]inline const Quat operator - () const +[more]inline const Quat operator - () const
    Negation operator - returns the negative of the quaternion.
    -[more]const float length() const +[more]const float length() const
    Length of the quaternion = sqrt( vec .
    -[more]const float length2() const +[more]const float length2() const
    Length of the quaternion = vec .
    -[more]inline const Quat conj() const +[more]inline const Quat conj() const
    Conjugate
    -[more]inline const Quat inverse() const +[more]inline const Quat inverse() const
    Multiplicative inverse method: q^(-1) = q^*/(qq^*)
    -[more]void makeRot( const float angle, const float x, const float y, const float z ) +[more]void makeRotate( const float angle, const float x, const float y, const float z )
    -[more]void makeRot( const float angle, const Vec3& vec ) +[more]void makeRotate( const float angle, const Vec3& vec )
    -[more]void makeRot( const Vec3& vec1, const Vec3& vec2 ) +[more]void makeRotate( const Vec3& vec1, const Vec3& vec2 )
    Make a rotation Quat which will rotate vec1 to vec2.
    -[more]void getRot( float& angle, float& x, float& y, float& z ) const +[more]void getRotate( float& angle, float& x, float& y, float& z ) const
    Return the angle and vector components represented by the quaternion
    -[more]void getRot( float& angle, Vec3& vec ) const +[more]void getRotate( float& angle, Vec3& vec ) const
    Return the angle and vector represented by the quaternion
    -[more]void slerp( const float t, const Quat& from, const Quat& to) +[more]void slerp( const float t, const Quat& from, const Quat& to)
    Spherical Linear Interpolation.
    -[more]void set( const osg::Matrix& m ) +[more]void set( const osg::Matrix& m )
    Set quaternion to be equivalent to specified matrix
    -[more]void get( osg::Matrix& m ) const +[more]void get( osg::Matrix& m ) const
    Get the equivalent matrix for this quaternion

    @@ -117,174 +117,174 @@
    - +
    oVec4 _fv

    - +

    o Quat()

    - -

    o Quat( float x, float y, float z, float w ) + +
    o Quat( float x, float y, float z, float w )

    - +

    o Quat( const Vec4& v )

    - +

    oinline Vec4& asVec4()

    - +

    oinline const Vec4& asVec4() const

    - +

    oinline const Vec3 asVec3() const

    - -

    oinline void set(const float x, const float y, const float z, const float w) + +
    oinline void set(const float x, const float y, const float z, const float w)

    - +

    oinline void set(const osg::Vec4& v)

    - +

    oinline const Quat operator * (const float& rhs) const
    Multiply by scalar

    - +

    oinline Quat& operator *= (const float& rhs)
    Unary multiply by scalar

    - +

    oinline const Quat operator*(const Quat& rhs) const
    Binary multiply

    - +

    oinline Quat& operator*=(const Quat& rhs)
    Unary multiply

    - +

    oinline const Quat operator / (const float& rhs) const
    Divide by scalar

    - +

    oinline Quat& operator /= (const float& rhs)
    Unary divide by scalar

    - +

    oinline const Quat operator/(const Quat& denom) const
    Binary divide

    - +

    oinline Quat& operator/=(const Quat& denom)
    Unary divide

    - +

    oinline const Quat operator + (const Quat& rhs) const
    Binary addition

    - +

    oinline Quat& operator += (const Quat& rhs)
    Unary addition

    - +

    oinline const Quat operator - (const Quat& rhs) const
    Binary subtraction

    - +

    oinline Quat& operator -= (const Quat& rhs)
    Unary subtraction

    - +

    oinline const Quat operator - () const
    Negation operator - returns the negative of the quaternion. Basically just calls operator - () on the Vec4

    - +

    oconst float length() const
    Length of the quaternion = sqrt( vec . vec )

    - +

    oconst float length2() const
    Length of the quaternion = vec . vec

    - +

    oinline const Quat conj() const
    Conjugate

    - +

    oinline const Quat inverse() const
    Multiplicative inverse method: q^(-1) = q^*/(qq^*)

    - - -

    ovoid makeRot( const float angle, const float x, const float y, const float z ) + + +
    ovoid makeRotate( const float angle, const float x, const float y, const float z )

    - - -

    ovoid makeRot( const float angle, const Vec3& vec ) + + +
    ovoid makeRotate( const float angle, const Vec3& vec )

    - - -

    ovoid makeRot( const Vec3& vec1, const Vec3& vec2 ) + + +
    ovoid makeRotate( const Vec3& vec1, const Vec3& vec2 )
    Make a rotation Quat which will rotate vec1 to vec2. Generally take adot product to get the angle between these and then use a cross product to get the rotation axis Watch out for the two special cases of when the vectors are co-incident or opposite in direction.

    - - -

    ovoid getRot( float& angle, float& x, float& y, float& z ) const + + +
    ovoid getRotate( float& angle, float& x, float& y, float& z ) const
    Return the angle and vector components represented by the quaternion

    - - -

    ovoid getRot( float& angle, Vec3& vec ) const + + +
    ovoid getRotate( float& angle, Vec3& vec ) const
    Return the angle and vector represented by the quaternion

    - -

    ovoid slerp( const float t, const Quat& from, const Quat& to) + +
    ovoid slerp( const float t, const Quat& from, const Quat& to)
    Spherical Linear Interpolation. As t goes from 0 to 1, the Quat object goes from "from" to "to".

    - +

    ovoid set( const osg::Matrix& m )
    Set quaternion to be equivalent to specified matrix

    - +

    ovoid get( osg::Matrix& m ) const
    Get the equivalent matrix for this quaternion

    This class has no child classes.
    -
    Friends:
    inline ostream& operator << (ostream& output, const Quat& vec)

    Alphabetic index HTML hierarchy of classes or Java

    +
    Friends:
    inline std::ostream& operator << (std::ostream& output, const Quat& vec)

    Alphabetic index HTML hierarchy of classes or Java


    This page was generated with the help of DOC++. diff --git a/doc/doc++/osg/Referenced.html b/doc/doc++/osg/Referenced.html index 9570c73ab..4eb365696 100644 --- a/doc/doc++/osg/Referenced.html +++ b/doc/doc++/osg/Referenced.html @@ -11,11 +11,11 @@

    Inheritance:

    - - - - - + + + + +
    @@ -23,30 +23,30 @@

    Public Methods

    -[more] Referenced() +[more] Referenced()
    -[more] Referenced(const Referenced&) +[more] Referenced(const Referenced&)
    -[more]inline Referenced& operator = (Referenced&) +[more]inline Referenced& operator = (Referenced&)
    -[more]inline void ref() const +[more]inline void ref() const
    increment the reference count by one, indicating that this object has another pointer which is referencing it
    -[more]inline void unref() const +[more]inline void unref() const
    decrement the reference count by one, indicating that a pointer to this object is referencing it.
    -[more]inline const int referenceCount() const +[more]inline const int referenceCount() const
    return the number pointers currently referencing this object.

    Protected Fields

    -[more]mutable int _refCount +[more]mutable int _refCount

    Protected Methods

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

    @@ -58,42 +58,42 @@
    - +
    o Referenced()

    - -

    o Referenced(const Referenced&) + +
    o Referenced(const Referenced&)

    - +

    oinline Referenced& operator = (Referenced&)

    - +

    oinline void ref() const
    increment the reference count by one, indicating that this object has another pointer which is referencing it

    - +

    oinline void unref() const
    decrement the reference count by one, indicating that a pointer to this object is referencing it. If the -refence count goes to zero, it is assumed that this object -is nolonger referenced and is automatically deleted. +reference count goes to zero, it is assumed that this object +is no longer referenced and is automatically deleted.

    - +

    oinline const int referenceCount() const
    return the number pointers currently referencing this object.

    - +

    ovirtual ~Referenced()

    - +

    omutable int _refCount

    @@ -106,6 +106,7 @@ is nolonger referenced and is automatically deleted. LineSegment
    ImpostorSpriteManager
    FrameStamp
    +DisplaySettings
    Camera
    diff --git a/doc/doc++/osg/State.html b/doc/doc++/osg/State.html index 40ce3d681..cb0aaf14a 100644 --- a/doc/doc++/osg/State.html +++ b/doc/doc++/osg/State.html @@ -23,60 +23,63 @@

    Public Methods

    -[more] State() +[more] State()
    -[more]virtual ~State() +[more]virtual ~State()
    -[more]void pushStateSet(const StateSet* dstate) +[more]void pushStateSet(const StateSet* dstate)
    push stateset onto state stack
    -[more]void popStateSet() +[more]void popStateSet()
    pop drawstate off state stack
    -[more]void reset() +[more]void captureCurrentState(StateSet& stateset) const +
    copy the modes and attributes which captures the current state +
    +[more]void reset()
    reset the state object to an empty stack
    -[more]inline const bool apply_mode(const StateAttribute::GLMode mode, const bool enabled) +[more]inline const bool apply_mode(const StateAttribute::GLMode mode, const bool enabled)
    apply an OpenGL mode if required.
    -[more]inline const bool apply_attribute(const StateAttribute* attribute) +[more]inline const bool apply_attribute(const StateAttribute* attribute)
    apply an attribute if required.
    -[more]void apply(const StateSet* dstate) +[more]void apply(const StateSet* dstate)
    apply stateset
    -[more]void apply() +[more]void apply()
    apply the state
    -[more]void have_applied(const StateAttribute::GLMode mode, const StateAttribute::GLModeValue value) +[more]void have_applied(const StateAttribute::GLMode mode, const StateAttribute::GLModeValue value)
    mode has been set externally, update state to reflect this setting
    -[more]void have_applied(const StateAttribute* attribute) +[more]void have_applied(const StateAttribute* attribute)
    attribute has been applied externally, update state to reflect this setting
    -[more]inline void setContextID(unsigned int contextID) +[more]inline void setContextID(unsigned int contextID)
    Set the current OpenGL context uniqueID.
    -[more]inline const unsigned int getContextID() const +[more]inline const unsigned int getContextID() const
    Get the current OpenGL context unique ID
    -[more]inline void setFrameStamp(FrameStamp* fs) +[more]inline void setFrameStamp(FrameStamp* fs)
    Set the frame stamp for the current frame
    -[more]inline const FrameStamp* getFrameStamp() const +[more]inline const FrameStamp* getFrameStamp() const
    Set the frame stamp for the current frame
    -[more]inline void setCamera(Camera* camera) +[more]inline void setCamera(Camera* camera)
    Set the camera.
    -[more]inline const Camera* getCamera() const +[more]inline const Camera* getCamera() const
    Get the camera
    -[more]void setFineGrainedErrorDetection(const bool flag) -
    Set the hint to OpenGL routines to do fine grained OpenGL error checking +[more]inline void setDisplaySettings(DisplaySettings* vs) +
    Set the DisplaySettings.
    -[more]const bool getFineGrainedErrorDetection() const -
    Get the hint to OpenGL routines to do fine grained OpenGL error checking +[more]inline const DisplaySettings* getDisplaySettings() const +
    Get the DisplaySettings

    @@ -104,142 +107,158 @@

    Documentation

    State class for managing a state stack. -Lazy state updating is used to minize state changes.
    +Lazy state updating is used to minimize state changes.
    - +
    o State()

    - +

    ovirtual ~State()

    - +

    ovoid pushStateSet(const StateSet* dstate)
    push stateset onto state stack

    - +

    ovoid popStateSet()
    pop drawstate off state stack

    + + +

    ovoid captureCurrentState(StateSet& stateset) const +
    copy the modes and attributes which captures the current state +

    - +

    ovoid reset()
    reset the state object to an empty stack

    - +

    oinline const bool apply_mode(const StateAttribute::GLMode mode, const bool enabled)
    apply an OpenGL mode if required.

    - +

    oinline const bool apply_attribute(const StateAttribute* attribute)
    apply an attribute if required.

    - +

    ovoid apply(const StateSet* dstate)
    apply stateset

    - +

    ovoid apply()
    apply the state

    - +

    ovoid have_applied(const StateAttribute::GLMode mode, const StateAttribute::GLModeValue value)
    mode has been set externally, update state to reflect this setting

    - +

    ovoid have_applied(const StateAttribute* attribute)
    attribute has been applied externally, update state to reflect this setting

    - +

    oinline void setContextID(unsigned int contextID)
    Set the current OpenGL context uniqueID. -Note, it is the application developers responsiblity to +Note, it is the application developers responsibility to set up unique ID for each OpenGL context. This value is then used by osg::StateAttribure's and osg::Drawable's to help manage OpenGL display list and texture binds appropriate for each context.

    - +

    oinline const unsigned int getContextID() const
    Get the current OpenGL context unique ID

    - +

    oinline void setFrameStamp(FrameStamp* fs)
    Set the frame stamp for the current frame

    - +

    oinline const FrameStamp* getFrameStamp() const
    Set the frame stamp for the current frame

    - +

    oinline void setCamera(Camera* camera)
    Set the camera. Note, nothing is applied, the camera is just used used in the State object to pass the current camera to Drawables during rendering.

    - +

    oinline const Camera* getCamera() const
    Get the camera

    - - -

    ovoid setFineGrainedErrorDetection(const bool flag) -
    Set the hint to OpenGL routines to do fine grained OpenGL error checking + + +
    oinline void setDisplaySettings(DisplaySettings* vs) +
    Set the DisplaySettings. Note, nothing is applied, the visual settings are just used +used in the State object to pass the current visual settings to Drawables +during rendering.

    - - -

    oconst bool getFineGrainedErrorDetection() const -
    Get the hint to OpenGL routines to do fine grained OpenGL error checking + + +
    oinline const DisplaySettings* getDisplaySettings() const +
    Get the DisplaySettings

    - +
    o ModeStack()

    - +

    obool changed

    - +

    obool last_applied_value

    + + +

    obool global_default_value +

    - +

    oValueVec valueVec

    - +
    o AttributeStack()

    - +

    obool changed +
    apply an attribute if required, passing in attribute and appropriate attribute stack

    - +

    oconst StateAttribute* last_applied_attribute

    + + +

    oref_ptr<StateAttribute> global_default_attribute +

    - +

    oAttributeVec attributeVec

    diff --git a/doc/doc++/osg/StateAttribute.html b/doc/doc++/osg/StateAttribute.html index 7fbbf0ef3..6fb327c31 100644 --- a/doc/doc++/osg/StateAttribute.html +++ b/doc/doc++/osg/StateAttribute.html @@ -7,15 +7,15 @@ -

    class SG_EXPORT osg::StateAttribute

    Base class for state attribues
    +

    class SG_EXPORT osg::StateAttribute

    Base class for state attribuets

    Inheritance:

    - - - - - + + + + +
    @@ -23,62 +23,62 @@

    Public Methods

    -[more] StateAttribute() +[more] StateAttribute()
    -[more]virtual Object* clone() const = 0 +[more]virtual Object* clone() const = 0
    return a shallow copy of a node, with Object* return type
    -[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual bool isSameKindAs(const Object* obj) const
    return true if this and obj are of the same kind of object
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    return the name of the attribute's class type
    -[more]virtual const Type getType() const = 0 -
    return the Type idenitifer of the attribute's class type +[more]virtual const Type getType() const = 0 +
    return the Type identifier of the attribute's class type
    -[more]virtual int compare(const StateAttribute& sa) const = 0 +[more]virtual int compare(const StateAttribute& sa) const = 0
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]bool operator < (const StateAttribute& rhs) const +[more]bool operator < (const StateAttribute& rhs) const
    -[more]bool operator == (const StateAttribute& rhs) const +[more]bool operator == (const StateAttribute& rhs) const
    -[more]bool operator != (const StateAttribute& rhs) const +[more]bool operator != (const StateAttribute& rhs) const
    -[more]virtual void setStateSetModes(StateSet&, const GLModeValue) const +[more]virtual void setStateSetModes(StateSet&, const GLModeValue) const
    -[more]virtual void apply(State&) const = 0 +[more]virtual void apply(State&) const = 0
    apply the OpenGL state attributes.
    -[more]virtual void compile(State&) const +[more]virtual void compile(State&) const
    default to nothing to compile - all state is applied immediately.

    Public Members

    -[more]typedef GLenum GLMode +[more]typedef GLenum GLMode
    GLMode is the value used in glEnable/glDisable(mode)
    -[more]typedef unsigned int GLModeValue +[more]typedef unsigned int GLModeValue
    GLModeValue is used to specified whether an mode is enabled (ON) or disabled (OFF).
    -[more]typedef unsigned int OverrideValue +[more]typedef unsigned int OverrideValue
    Override is used to specified the override behavior of StateAttributes from from parent to children.
    -[more]enum Values +[more]enum Values
    list values which can be used in to set either GLModeValues or OverrideValues.
    -[more]typedef unsigned int Type +[more]typedef unsigned int Type
    Type identifier to differentiate between different state types.
    -[more]enum Types -
    Values of StateAttribute::Type used to aid identification of diffenent StateAttribute subclasses. +[more]enum Types +
    Values of StateAttribute::Type used to aid identification of different StateAttribute subclasses.

    Protected Methods

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

    @@ -108,33 +108,33 @@

    Documentation

    -
    Base class for state attribues
    +
    Base class for state attribuets
    - +
    otypedef GLenum GLMode
    GLMode is the value used in glEnable/glDisable(mode)

    - +

    otypedef unsigned int GLModeValue
    GLModeValue is used to specified whether an mode is enabled (ON) or disabled (OFF). -GLMoveValue is also used to speficy the override behavior of modes from parent to children. +GLMoveValue is also used to specify the override behavior of modes from parent to children. See enum Value description for more details.

    - +

    otypedef unsigned int OverrideValue
    Override is used to specified the override behavior of StateAttributes from from parent to children. See enum Value description for more details.

    - +

    oenum Values
    list values which can be used in to set either GLModeValues -or OverrideValues. When using in conjection with GLModeValues +or OverrideValues. When using in conjunction with GLModeValues all Values have meaning. When using in conjection with StateAttribute OverrideValue only OFF,OVERRIDE and INHERIT are meaningful. However, they are useful when using GLModeValue @@ -143,46 +143,46 @@ StateSet::setAttributeAndModes(..).

    - +
    o OFF
    means that associated GLMode and Override is disabled

    - +

    o ON
    means that associated GLMode is enabled and Override is disabled

    - +

    o OVERRIDE
    Overriding of GLMode's or StateAttributes is enabled

    - +

    o OVERRIDE_OFF
    means that associated GLMode is disabled and Override is enabled

    - +

    o OVERRIDE_ON
    means that associated GLMode and Override is enabled

    - +

    o INHERIT
    means that GLMode or StateAttribute should in inherited from above

    - +
    otypedef unsigned int Type
    Type identifier to differentiate between different state types.

    - +

    oenum Types
    Values of StateAttribute::Type used to aid identification -of diffenent StateAttribute subclasses. Each subclass defines +of different StateAttribute subclasses. Each subclass defines it own value in the virtual Type getType() method. When extending the osg's StateAttribute's simply define your own Type value which is unique, using the StateAttribute::Type @@ -191,210 +191,218 @@ needs to override a standard StateAttriubte then simple use that types value.

    - - -
    o ALPHAFUNC -

    - - -

    o ANTIALIAS -

    - - -

    o COLORTABLE -

    - - -

    o CULLFACE -

    - - -

    o FOG -

    - - -

    o FRONTFACE -

    - - -

    o LIGHT -

    - - -

    o LIGHT_0 -

    - - -

    o LIGHT_1 -

    - - -

    o LIGHT_2 -

    - - -

    o LIGHT_3 -

    - - -

    o LIGHT_4 -

    - - -

    o LIGHT_5 -

    - - -

    o LIGHT_6 -

    - - -

    o LIGHT_7 -

    - - -

    o MATERIAL -

    - - -

    o POINT -

    - - -

    o POLYGONMODE -

    - - -

    o POLYGONOFFSET -

    - - -

    o TEXENV -

    - - -

    o TEXGEN -

    - - -

    o TEXMAT -

    - +

    o TEXTURE

    - +

    o TEXTURE_0

    - +

    o TEXTURE_1

    - +

    o TEXTURE_2

    - +

    o TEXTURE_3

    + + +

    o MATERIAL +

    + + +

    o ALPHAFUNC +

    + + +

    o ANTIALIAS +

    + + +

    o COLORTABLE +

    + + +

    o CULLFACE +

    + + +

    o FOG +

    + + +

    o FRONTFACE +

    + + +

    o LIGHT +

    + + +

    o LIGHT_0 +

    + + +

    o LIGHT_1 +

    + + +

    o LIGHT_2 +

    + + +

    o LIGHT_3 +

    + + +

    o LIGHT_4 +

    + + +

    o LIGHT_5 +

    + + +

    o LIGHT_6 +

    + + +

    o LIGHT_7 +

    + + +

    o POINT +

    + + +

    o LINEWIDTH +

    + + +

    o POLYGONMODE +

    + + +

    o POLYGONOFFSET +

    + + +

    o TEXENV +

    + + +

    o TEXGEN +

    + + +

    o TEXMAT +

    - +

    o TRANSPARENCY

    - +

    o STENCIL

    - +

    o COLORMASK

    - - -

    o CLIPPLANE -

    - - -

    o CLIPPLANE_0 -

    - - -

    o CLIPPLANE_1 -

    - - -

    o CLIPPLANE_2 -

    - - -

    o CLIPPLANE_3 -

    - - -

    o CLIPPLANE_4 -

    - - -

    o CLIPPLANE_5 -

    - +

    o DEPTH

    - +

    o VIEWPORT +

    + + +

    o CLIPPLANE +

    + + +

    o CLIPPLANE_0 +

    + + +

    o CLIPPLANE_1 +

    + + +

    o CLIPPLANE_2 +

    + + +

    o CLIPPLANE_3 +

    + + +

    o CLIPPLANE_4 +

    + + +

    o CLIPPLANE_5 +

    + + +

    o COLORMATRIX

    - +
    o StateAttribute()

    - +

    ovirtual Object* clone() const = 0
    return a shallow copy of a node, with Object* return type

    - +

    ovirtual bool isSameKindAs(const Object* obj) const
    return true if this and obj are of the same kind of object

    - +

    ovirtual const char* className() const
    return the name of the attribute's class type

    - -

    ovirtual const Type getType() const = 0 -
    return the Type idenitifer of the attribute's class type + +
    ovirtual const Type getType() const = 0 +
    return the Type identifier of the attribute's class type

    - +

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

    - +

    obool operator < (const StateAttribute& rhs) const

    - +

    obool operator == (const StateAttribute& rhs) const

    - +

    obool operator != (const StateAttribute& rhs) const

    - -

    ovirtual void setStateSetModes(StateSet&, const GLModeValue) const + +
    ovirtual void setStateSetModes(StateSet&, const GLModeValue) const

    - +

    ovirtual void apply(State&) const = 0
    apply the OpenGL state attributes. The global state for the current OpenGL context is passed @@ -402,12 +410,12 @@ in to allow the StateAttribute to obtain details on the the current context and state.

    - +

    ovirtual void compile(State&) const
    default to nothing to compile - all state is applied immediately.

    - +

    ovirtual ~StateAttribute()

    @@ -423,11 +431,13 @@ the current context and state. PolygonMode
    Point
    Material
    +LineWidth
    Light
    FrontFace
    Fog
    Depth
    CullFace
    +ColorMatrix
    ColorMask
    ClipPlane
    AlphaFunc
    diff --git a/doc/doc++/osg/StateSet.html b/doc/doc++/osg/StateSet.html index a8425010c..5ad315e12 100644 --- a/doc/doc++/osg/StateSet.html +++ b/doc/doc++/osg/StateSet.html @@ -23,122 +23,137 @@

    Public Methods

    -[more] StateSet() +[more] StateSet()
    -[more]virtual Object* clone() const +[more] StateSet(const StateSet&)
    -[more]virtual bool isSameKindAs(const Object* obj) const +[more]virtual Object* clone() const
    -[more]virtual const char* className() const +[more]virtual bool isSameKindAs(const Object* obj) const
    -[more]void setGlobalDefaults() +[more]virtual const char* className() const +
    +[more]int compare(const StateSet& rhs, bool compareAttributeContents=false) const +
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs +
    +[more]bool operator < (const StateSet& rhs) const +
    +[more]bool operator == (const StateSet& rhs) const +
    +[more]bool operator != (const StateSet& rhs) const +
    +[more]void setGlobalDefaults()
    set all the modes to on or off so that it defines a complete state, typically used for a default global state
    -[more]void setAllToInherit() -
    set all the modes to inherit, typically used to signifiy nodes which inherit all of their modes for the global state +[more]void setAllToInherit() +
    set all the modes to inherit, typically used to signify nodes which inherit all of their modes for the global state
    -[more]void setMode(const StateAttribute::GLMode mode, const StateAttribute::GLModeValue value) +[more]void merge(const StateSet& rhs) +
    merge this stateset with stateset rhs, this overrides the rhs if OVERRIDE is specified, otherwise rhs takes precedence +
    +[more]void setMode(const StateAttribute::GLMode mode, const StateAttribute::GLModeValue value)
    set this StateSet to contain specified GLMode and value
    -[more]void setModeToInherit(const StateAttribute::GLMode mode) +[more]void setModeToInherit(const StateAttribute::GLMode mode)
    set this StateSet to inherit specified GLMode type from parents.
    -[more]const StateAttribute::GLModeValue getMode(const StateAttribute::GLMode mode) const +[more]const StateAttribute::GLModeValue getMode(const StateAttribute::GLMode mode) const
    get specified GLModeValue for specified GLMode.
    -[more]inline ModeList& getModeList() +[more]inline ModeList& getModeList()
    return the list of all GLModes contained in this StateSet
    -[more]inline const ModeList& getModeList() const +[more]inline const ModeList& getModeList() const
    return the const list of all GLModes contained in this const StateSet
    -[more]void setAttribute(StateAttribute* attribute, const StateAttribute::OverrideValue value=StateAttribute::OFF) +[more]void setAttribute(StateAttribute* attribute, const StateAttribute::OverrideValue value=StateAttribute::OFF)
    set this StateSet to contain specified attribute and override flag
    -[more]void setAttributeAndModes(StateAttribute* attribute, const StateAttribute::GLModeValue value=StateAttribute::ON) -
    set this StateSet to contain specified attribute and set the associated GLMode's to specifed value +[more]void setAttributeAndModes(StateAttribute* attribute, const StateAttribute::GLModeValue value=StateAttribute::ON) +
    set this StateSet to contain specified attribute and set the associated GLMode's to specified value
    -[more]void setAttributeToInherit(const StateAttribute::Type type) +[more]void setAttributeToInherit(const StateAttribute::Type type)
    set this StateSet to inherit specified attribute type from parents.
    -[more]const StateAttribute* getAttribute(const StateAttribute::Type type) const +[more]StateAttribute* getAttribute(const StateAttribute::Type type)
    get specified StateAttribute for specified type.
    -[more]const RefAttributePair* getAttributePair(const StateAttribute::Type type) const +[more]const StateAttribute* getAttribute(const StateAttribute::Type type) const +
    get specified const StateAttribute for specified type. +
    +[more]const RefAttributePair* getAttributePair(const StateAttribute::Type type) const
    get specified RefAttributePair for specified type.
    -[more]inline AttributeList& getAttributeList() +[more]inline AttributeList& getAttributeList()
    return the list of all StateAttributes contained in this StateSet
    -[more]inline const AttributeList& getAttributeList() const +[more]inline const AttributeList& getAttributeList() const
    return the const list of all StateAttributes contained in this const StateSet
    -[more]void setRenderingHint(const int hint) +[more]void setRenderingHint(const int hint)
    set the RenderingHint of the StateSet.
    -[more]inline const int getRenderingHint() const +[more]inline const int getRenderingHint() const
    get the RenderingHint of the StateSet
    -[more]void setRenderBinDetails(const int binNum, const std::string& binName, const RenderBinMode mode=USE_RENDERBIN_DETAILS) +[more]void setRenderBinDetails(const int binNum, const std::string& binName, const RenderBinMode mode=USE_RENDERBIN_DETAILS)
    set the render bin details
    -[more]void setRendingBinToInherit() +[more]void setRendingBinToInherit()
    set the render bin details to inherit
    -[more]inline const RenderBinMode getRenderBinMode() const +[more]inline const RenderBinMode getRenderBinMode() const
    get the render bin mode
    -[more]inline const bool useRenderBinDetails() const +[more]inline const bool useRenderBinDetails() const
    get whether the render bin details are set and should be used
    -[more]inline const int getBinNumber() const +[more]inline const int getBinNumber() const
    get the render bin number
    -[more]inline const std::string& getBinName() const +[more]inline const std::string& getBinName() const
    get the render bin name
    -[more]void compile(State& state) const +[more]void compile(State& state) const
    call compile on all StateAttributes contained within this StateSet

    Public Members

    -[more]typedef std::map<StateAttribute::GLMode,StateAttribute::GLModeValue> ModeList +[more]typedef std::map<StateAttribute::GLMode,StateAttribute::GLModeValue> ModeList
    a container to map GLModes to their respective GLModeValues
    -[more]typedef std::pair<ref_ptr<StateAttribute>,StateAttribute::OverrideValue> RefAttributePair +[more]typedef std::pair<ref_ptr<StateAttribute>,StateAttribute::OverrideValue> RefAttributePair
    simple pairing between an attribute and its override flag
    -[more]typedef std::map<StateAttribute::Type,RefAttributePair> AttributeList +[more]typedef std::map<StateAttribute::Type,RefAttributePair> AttributeList
    a container to map StateAttribyte::Types to their respective RefAttributePair
    -[more]enum RenderingHint +[more]enum RenderingHint
    -[more]enum RenderBinMode +[more]enum RenderBinMode

    Protected Fields

    -[more]ModeList _modeList +[more]ModeList _modeList
    -[more]AttributeList _attributeList +[more]AttributeList _attributeList
    -[more]int _renderingHint +[more]int _renderingHint
    -[more]RenderBinMode _binMode +[more]RenderBinMode _binMode
    -[more]int _binNum +[more]int _binNum
    -[more]std::string _binName +[more]std::string _binName

    Protected Methods

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

    @@ -168,140 +183,173 @@

    Documentation

    Encapsulates OpenGL state modes and attributes. -Used to specificy textures etc of osg::Drawable's which hold references +Used to specific textures etc of osg::Drawable's which hold references to a single osg::StateSet. StateSet can be shared between Drawable's and is recommend if possible as it minimize expensive state changes in the graphics pipeline.
    - +
    o StateSet()

    + + +

    o StateSet(const StateSet&) +

    - +

    ovirtual Object* clone() const

    - +

    ovirtual bool isSameKindAs(const Object* obj) const

    - +

    ovirtual const char* className() const

    + + +

    oint compare(const StateSet& rhs, bool compareAttributeContents=false) const +
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs +

    + + +

    obool operator < (const StateSet& rhs) const +

    + + +

    obool operator == (const StateSet& rhs) const +

    + + +

    obool operator != (const StateSet& rhs) const +

    - +

    ovoid setGlobalDefaults()
    set all the modes to on or off so that it defines a complete state, typically used for a default global state

    - +

    ovoid setAllToInherit() -
    set all the modes to inherit, typically used to signifiy +
    set all the modes to inherit, typically used to signify nodes which inherit all of their modes for the global state

    + + +

    ovoid merge(const StateSet& rhs) +
    merge this stateset with stateset rhs, this overrides +the rhs if OVERRIDE is specified, otherwise rhs takes precedence +

    - +

    otypedef std::map<StateAttribute::GLMode,StateAttribute::GLModeValue> ModeList
    a container to map GLModes to their respective GLModeValues

    - +

    ovoid setMode(const StateAttribute::GLMode mode, const StateAttribute::GLModeValue value)
    set this StateSet to contain specified GLMode and value

    - +

    ovoid setModeToInherit(const StateAttribute::GLMode mode)
    set this StateSet to inherit specified GLMode type from parents. has the effect of deleting any GlMode of specified type from StateSet.

    - +

    oconst StateAttribute::GLModeValue getMode(const StateAttribute::GLMode mode) const
    get specified GLModeValue for specified GLMode. returns INHERIT if no GLModeValue is contained within StateSet.

    - -

    oinline ModeList& getModeList() + +
    oinline ModeList& getModeList()
    return the list of all GLModes contained in this StateSet

    - -

    oinline const ModeList& getModeList() const + +
    oinline const ModeList& getModeList() const
    return the const list of all GLModes contained in this const StateSet

    - +

    otypedef std::pair<ref_ptr<StateAttribute>,StateAttribute::OverrideValue> RefAttributePair
    simple pairing between an attribute and its override flag

    - -

    otypedef std::map<StateAttribute::Type,RefAttributePair> AttributeList + +
    otypedef std::map<StateAttribute::Type,RefAttributePair> AttributeList
    a container to map StateAttribyte::Types to their respective RefAttributePair

    - +

    ovoid setAttribute(StateAttribute* attribute, const StateAttribute::OverrideValue value=StateAttribute::OFF)
    set this StateSet to contain specified attribute and override flag

    - +

    ovoid setAttributeAndModes(StateAttribute* attribute, const StateAttribute::GLModeValue value=StateAttribute::ON) -
    set this StateSet to contain specified attribute and set the associated GLMode's to specifed value +
    set this StateSet to contain specified attribute and set the associated GLMode's to specified value

    - +

    ovoid setAttributeToInherit(const StateAttribute::Type type)
    set this StateSet to inherit specified attribute type from parents. has the effect of deleting any state attributes of specified type from StateSet.

    - -

    oconst StateAttribute* getAttribute(const StateAttribute::Type type) const + +
    oStateAttribute* getAttribute(const StateAttribute::Type type)
    get specified StateAttribute for specified type. returns NULL if no type is contained within StateSet.

    + + +

    oconst StateAttribute* getAttribute(const StateAttribute::Type type) const +
    get specified const StateAttribute for specified type. +returns NULL if no type is contained within const StateSet. +

    - -

    oconst RefAttributePair* getAttributePair(const StateAttribute::Type type) const + +
    oconst RefAttributePair* getAttributePair(const StateAttribute::Type type) const
    get specified RefAttributePair for specified type. returns NULL if no type is contained within StateSet.

    - -

    oinline AttributeList& getAttributeList() + +
    oinline AttributeList& getAttributeList()
    return the list of all StateAttributes contained in this StateSet

    - -

    oinline const AttributeList& getAttributeList() const + +
    oinline const AttributeList& getAttributeList() const
    return the const list of all StateAttributes contained in this const StateSet

    - +

    oenum RenderingHint

    - +
    o DEFAULT_BIN

    - +

    o OPAQUE_BIN

    - +

    o TRANSPARENT_BIN

    - +
    ovoid setRenderingHint(const int hint)
    set the RenderingHint of the StateSet. RenderingHint is used by osgUtil::Renderer to determine which @@ -310,101 +358,97 @@ objects OPAQUE_BIN would typical used, which TRANSPARENT_BIN should be used for objects which need to be depth sorted.

    - +

    oinline const int getRenderingHint() const
    get the RenderingHint of the StateSet

    - +

    oenum RenderBinMode

    - +
    o INHERIT_RENDERBIN_DETAILS

    - +

    o USE_RENDERBIN_DETAILS

    - +

    o OVERRIDE_RENDERBIN_DETAILS

    - +

    o ENCLOSE_RENDERBIN_DETAILS

    - -
    ovoid setRenderBinDetails(const int binNum, const std::string& binName, const RenderBinMode mode=USE_RENDERBIN_DETAILS) + +
    ovoid setRenderBinDetails(const int binNum, const std::string& binName, const RenderBinMode mode=USE_RENDERBIN_DETAILS)
    set the render bin details

    - +

    ovoid setRendingBinToInherit()
    set the render bin details to inherit

    - -

    oinline const RenderBinMode getRenderBinMode() const + +
    oinline const RenderBinMode getRenderBinMode() const
    get the render bin mode

    - +

    oinline const bool useRenderBinDetails() const
    get whether the render bin details are set and should be used

    - +

    oinline const int getBinNumber() const
    get the render bin number

    - +

    oinline const std::string& getBinName() const
    get the render bin name

    - +

    ovoid compile(State& state) const
    call compile on all StateAttributes contained within this StateSet

    - +

    ovirtual ~StateSet()

    - - -

    o StateSet(const StateSet&) -

    - +

    oStateSet& operator = (const StateSet&)

    - -

    oModeList _modeList + +
    oModeList _modeList

    - -

    oAttributeList _attributeList + +
    oAttributeList _attributeList

    - +

    oint _renderingHint

    - -

    oRenderBinMode _binMode + +
    oRenderBinMode _binMode

    - +

    oint _binNum

    - +

    ostd::string _binName

    diff --git a/doc/doc++/osg/Stencil.html b/doc/doc++/osg/Stencil.html index 20d337388..b8d7e593d 100644 --- a/doc/doc++/osg/Stencil.html +++ b/doc/doc++/osg/Stencil.html @@ -7,7 +7,7 @@ -

    class SG_EXPORT osg::Stencil

    Encapsulte OpenGL glStencilFunc/Op/Mask functions
    +

    class SG_EXPORT osg::Stencil

    Encapsulate OpenGL glStencilFunc/Op/Mask functions

    Inheritance:

    @@ -23,69 +23,69 @@

    Public Methods

    -[more] Stencil() +[more] Stencil()
    -[more] META_StateAttribute(Stencil, STENCIL) +[more] META_StateAttribute(Stencil, STENCIL)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const +[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const
    -[more]inline void setFunction(const Function func, int ref, uint mask) +[more]inline void setFunction(const Function func, int ref, uint mask)
    -[more]inline const Function getFunction() const +[more]inline const Function getFunction() const
    -[more]inline const int getFunctionRef() const +[more]inline const int getFunctionRef() const
    -[more]inline const uint getFunctionMask() const +[more]inline const uint getFunctionMask() const
    -[more]inline void setOperation(const Operation sfail, const Operation zfail, const Operation zpass) +[more]inline void setOperation(const Operation sfail, const Operation zfail, const Operation zpass)
    set the operations to apply when the various stencil and depth tests fail or pass.
    -[more]inline const Operation getStencilFailOperation() const +[more]inline const Operation getStencilFailOperation() const
    get the operation when the stencil test fails
    -[more]inline const Operation getStencilPassAndDepthFailOperation() const +[more]inline const Operation getStencilPassAndDepthFailOperation() const
    get the operation when the stencil test passes but the depth test fails
    -[more]inline const Operation getStencilPassAndDepthPassOperation() const +[more]inline const Operation getStencilPassAndDepthPassOperation() const
    get the operation when both the stencil test and the depth test pass
    -[more]inline void setWriteMask(uint mask) +[more]inline void setWriteMask(uint mask)
    -[more]inline const uint getWriteMask() const +[more]inline const uint getWriteMask() const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

    Public Members

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

    Protected Fields

    -[more]Function _func +[more]Function _func
    -[more]int _funcRef +[more]int _funcRef
    -[more]uint _funcMask +[more]uint _funcMask
    -[more]Operation _sfail +[more]Operation _sfail
    -[more]Operation _zfail +[more]Operation _zfail
    -[more]Operation _zpass +[more]Operation _zpass
    -[more]uint _writeMask +[more]uint _writeMask

    Protected Methods

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

    @@ -99,7 +99,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual const Type getType() const
    obool operator < (const StateAttribute& rhs) const
    @@ -152,178 +152,178 @@

    Documentation

    -
    Encapsulte OpenGL glStencilFunc/Op/Mask functions
    +
    Encapsulate OpenGL glStencilFunc/Op/Mask functions
    - +
    o Stencil()

    - -

    o META_StateAttribute(Stencil, STENCIL) + +
    o META_StateAttribute(Stencil, STENCIL)

    - +

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

    - -

    ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const + +
    ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const

    - +

    oenum Function

    - +
    o NEVER

    - +

    o LESS

    - +

    o EQUAL

    - +

    o LEQUAL

    - +

    o GREATER

    - +

    o NOTEQUAL

    - +

    o GEQUAL

    - +

    o ALWAYS

    - -
    oinline void setFunction(const Function func, int ref, uint mask) + +
    oinline void setFunction(const Function func, int ref, uint mask)

    - -

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

    - +

    oinline const int getFunctionRef() const

    - +

    oinline const uint getFunctionMask() const

    - +

    oenum Operation

    - +
    o KEEP

    - +

    o ZERO

    - +

    o REPLACE

    - +

    o INCR

    - +

    o DECR

    - +

    o INVERT

    - -
    oinline void setOperation(const Operation sfail, const Operation zfail, const Operation zpass) + +
    oinline void setOperation(const Operation sfail, const Operation zfail, const Operation zpass)
    set the operations to apply when the various stencil and depth -tests fail or pass. First paramater is to control the operation -when the stencil test fails. The second paramter is to control the -operatiorn when the stencil test passes, but depth test fails. The +tests fail or pass. First parameter is to control the operation +when the stencil test fails. The second parameter is to control the +operation when the stencil test passes, but depth test fails. The third parameter controls the operation when both the stencil test and depth pass. Ordering of parameter is the same as if using glStencilOp(,,).

    - -

    oinline const Operation getStencilFailOperation() const + +
    oinline const Operation getStencilFailOperation() const
    get the operation when the stencil test fails

    - -

    oinline const Operation getStencilPassAndDepthFailOperation() const + +
    oinline const Operation getStencilPassAndDepthFailOperation() const
    get the operation when the stencil test passes but the depth test fails

    - -

    oinline const Operation getStencilPassAndDepthPassOperation() const + +
    oinline const Operation getStencilPassAndDepthPassOperation() const
    get the operation when both the stencil test and the depth test pass

    - +

    oinline void setWriteMask(uint mask)

    - +

    oinline const uint getWriteMask() const

    - +

    ovirtual void apply(State& state) const

    - +

    ovirtual ~Stencil()

    - -

    oFunction _func + +
    oFunction _func

    - +

    oint _funcRef

    - +

    ouint _funcMask

    - -

    oOperation _sfail + +
    oOperation _sfail

    - -

    oOperation _zfail + +
    oOperation _zfail

    - -

    oOperation _zpass + +
    oOperation _zpass

    - +

    ouint _writeMask

    diff --git a/doc/doc++/osg/Switch.html b/doc/doc++/osg/Switch.html index 597bb01b8..105393102 100644 --- a/doc/doc++/osg/Switch.html +++ b/doc/doc++/osg/Switch.html @@ -23,34 +23,34 @@

    Public Methods

    -[more] Switch() +[more] Switch()
    -[more] META_Node(Switch) +[more] META_Node(Switch)
    -[more]virtual void traverse(NodeVisitor& nv) +[more]virtual void traverse(NodeVisitor& nv)
    -[more]inline void setValue(const int value) +[more]inline void setValue(const int value)
    Selects the active child Node or enables a special SwitchType mode.
    -[more]inline const int getValue() const +[more]inline const int getValue() const
    Returns the number of the active child Node or the SwitchType

    Public Members

    -[more]enum SwitchType +[more]enum SwitchType
    Special mode values for the Switch.

    Protected Fields

    -[more]int _value +[more]int _value
    The current Switch value.

    Protected Methods

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

    @@ -108,7 +108,7 @@
    oinline const std::string& getName() const
    -oinline const ParentList& getParents() const +oinline const ParentList& getParents() const
    oinline Group* getParent(const int i)
    @@ -124,23 +124,25 @@
    oinline const int getNumChildrenRequiringAppTraversal() const
    -oinline void setUserData(void* data, MemoryAdapter* ma=0L) +ovoid setCullingActive(const bool active)
    -oinline void* getUserData() +oinline const bool getCullingActive() const
    -oinline const void* getUserData() const +oinline const int getNumChildrenWithCullingDisabled() const
    -oinline MemoryAdapter* getMemoryAdapter() +oinline void setUserData(osg::Referenced* obj)
    -oinline const MemoryAdapter* getMemoryAdapter() const +oinline Referenced* getUserData() +
    +oinline const Referenced* getUserData() const
    oinline void setNodeMask(const NodeMask nm)
    oinline const NodeMask getNodeMask() const
    -oinline const DescriptionList& getDescriptions() const +oinline const DescriptionList& getDescriptions() const
    -oinline DescriptionList& getDescriptions() +oinline DescriptionList& getDescriptions()
    oinline const std::string& getDescription(const int i) const
    @@ -176,19 +178,21 @@
    ostd::string _name
    -oParentList _parents +oParentList _parents
    oref_ptr<NodeCallback> _appCallback
    oint _numChildrenRequiringAppTraversal
    -ovoid* _userData +obool _cullingActive
    -oref_ptr<MemoryAdapter> _memoryAdapter +oint _numChildrenWithCullingDisabled +
    +oosg::ref_ptr<Referenced> _userData
    oNodeMask _nodeMask
    -oDescriptionList _descriptions +oDescriptionList _descriptions
    oref_ptr<StateSet> _dstate

    @@ -196,6 +200,8 @@

    Protected Methods

    ovoid setNumChildrenRequiringAppTraversal(const int num) +
    +ovoid setNumChildrenWithCullingDisabled(const int num)

    @@ -232,7 +238,7 @@ to represent the different states of a traffic light.
    - +
    oenum SwitchType
    Special mode values for the Switch. Use these if you want to @@ -240,50 +246,50 @@ turn on/off all child nodes.

    - +
    o ALL_CHILDREN_ON
    Turn on all children.

    - +

    o ALL_CHILDREN_OFF
    Turn off all children.

    - +
    o Switch()

    - +

    o META_Node(Switch)

    - +

    ovirtual void traverse(NodeVisitor& nv)

    - +

    oinline void setValue(const int value)
    Selects the active child Node or enables a special SwitchType mode.
    Parameters:
    value - the number of the active child -(first child == number 0) or SwitchType. Invalid values +(first child == number 0) or SwitchType. Invalid values will be ignored.

    - +

    oinline const int getValue() const
    Returns the number of the active child Node or the SwitchType

    - +

    ovirtual ~Switch()

    - +

    oint _value
    The current Switch value.

    diff --git a/doc/doc++/osg/TexEnv.html b/doc/doc++/osg/TexEnv.html index 4ad3e1163..284014edf 100644 --- a/doc/doc++/osg/TexEnv.html +++ b/doc/doc++/osg/TexEnv.html @@ -23,33 +23,33 @@

    Public Methods

    -[more] TexEnv( void ) +[more] TexEnv( void )
    -[more] META_StateAttribute(TexEnv, TEXENV) +[more] META_StateAttribute(TexEnv, TEXENV)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]void setMode( const Mode mode ) +[more]void setMode( const Mode mode )
    -[more]const Mode getMode() const +[more]const Mode getMode() const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

    Public Members

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

    Protected Fields

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

    Protected Methods

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

    @@ -63,7 +63,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual const Type getType() const
    obool operator < (const StateAttribute& rhs) const
    @@ -71,7 +71,7 @@
    obool operator != (const StateAttribute& rhs) const
    -ovirtual void setStateSetModes(StateSet&, const GLModeValue) const +ovirtual void setStateSetModes(StateSet&, const GLModeValue) const
    ovirtual void compile(State&) const

    @@ -122,59 +122,59 @@
    - +
    o TexEnv( void )

    - -

    o META_StateAttribute(TexEnv, TEXENV) + +
    o META_StateAttribute(TexEnv, TEXENV)

    - +

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

    - +

    oenum Mode

    - +
    o DECAL

    - +

    o MODULATE

    - +

    o BLEND

    - +

    o REPLACE

    - -
    ovoid setMode( const Mode mode ) + +
    ovoid setMode( const Mode mode )

    - -

    oconst Mode getMode() const + +
    oconst Mode getMode() const

    - +

    ovirtual void apply(State& state) const

    - +

    ovirtual ~TexEnv( void )

    - -

    oMode _mode + +
    oMode _mode

    This class has no child classes.
    diff --git a/doc/doc++/osg/TexGen.html b/doc/doc++/osg/TexGen.html index 5a4cdcc21..59ca8d36e 100644 --- a/doc/doc++/osg/TexGen.html +++ b/doc/doc++/osg/TexGen.html @@ -23,50 +23,50 @@

    Public Methods

    -[more] TexGen( void ) +[more] TexGen( void )
    -[more] META_StateAttribute(TexGen, TEXGEN) +[more] META_StateAttribute(TexGen, TEXGEN)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const +[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const
    -[more]inline void setMode( const Mode mode ) +[more]inline void setMode( const Mode mode )
    -[more]const Mode getMode() const +[more]const Mode getMode() const
    -[more]void setPlane(const Coord which, const Vec4& plane) +[more]void setPlane(const Coord which, const Vec4& plane)
    -[more]const Vec4& getPlane(const Coord which) const +[more]const Vec4& getPlane(const Coord which) const

    Public Members

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

    Protected Fields

    -[more]Mode _mode +[more]Mode _mode
    -[more]Vec4 _plane_s +[more]Vec4 _plane_s
    additional texgen coefficents for GL_OBJECT_PLANE or GL_EYE_PLANE,
    -[more]Vec4 _plane_t +[more]Vec4 _plane_t
    -[more]Vec4 _plane_r +[more]Vec4 _plane_r
    -[more]Vec4 _plane_q +[more]Vec4 _plane_q

    Protected Methods

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

    @@ -80,7 +80,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual const Type getType() const
    obool operator < (const StateAttribute& rhs) const
    @@ -137,105 +137,105 @@
    - +
    o TexGen( void )

    - -

    o META_StateAttribute(TexGen, TEXGEN) + +
    o META_StateAttribute(TexGen, TEXGEN)

    - +

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

    - -

    ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const + +
    ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const

    - +

    ovirtual void apply(State& state) const

    - +

    oenum Mode

    - +
    o OBJECT_LINEAR

    - +

    o EYE_LINEAR

    - +

    o SPHERE_MAP

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

    - -

    oconst Mode getMode() const + +
    oconst Mode getMode() const

    - +

    oenum Coord

    - +
    o S

    - +

    o T

    - +

    o R

    - +

    o Q

    - -
    ovoid setPlane(const Coord which, const Vec4& plane) + +
    ovoid setPlane(const Coord which, const Vec4& plane)

    - -

    oconst Vec4& getPlane(const Coord which) const + +
    oconst Vec4& getPlane(const Coord which) const

    - +

    ovirtual ~TexGen( void )

    - -

    oMode _mode + +
    oMode _mode

    - +

    oVec4 _plane_s
    additional texgen coefficents for GL_OBJECT_PLANE or GL_EYE_PLANE,

    - +

    oVec4 _plane_t

    - +

    oVec4 _plane_r

    - +

    oVec4 _plane_q

    diff --git a/doc/doc++/osg/TexMat.html b/doc/doc++/osg/TexMat.html index a0abbc151..aafaa6731 100644 --- a/doc/doc++/osg/TexMat.html +++ b/doc/doc++/osg/TexMat.html @@ -23,34 +23,34 @@

    Public Methods

    -[more] TexMat( void ) +[more] TexMat( void )
    -[more] META_StateAttribute(TexMat, TEXMAT) +[more] META_StateAttribute(TexMat, TEXMAT)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]inline void setMatrix(const Matrix& matrix) +[more]inline void setMatrix(const Matrix& matrix)
    Set the texture matrix
    -[more]inline Matrix& getMatrix() +[more]inline Matrix& getMatrix()
    Get the texture matrix
    -[more]inline const Matrix& getMatrix() const +[more]inline const Matrix& getMatrix() const
    Get the const texture matrix
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const
    apply as OpenGL texture matrix

    Protected Fields

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

    Protected Methods

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

    @@ -64,7 +64,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual const Type getType() const
    obool operator < (const StateAttribute& rhs) const
    @@ -72,7 +72,7 @@
    obool operator != (const StateAttribute& rhs) const
    -ovirtual void setStateSetModes(StateSet&, const GLModeValue) const +ovirtual void setStateSetModes(StateSet&, const GLModeValue) const
    ovirtual void compile(State&) const

    @@ -123,44 +123,44 @@
    - +
    o TexMat( void )

    - -

    o META_StateAttribute(TexMat, TEXMAT) + +
    o META_StateAttribute(TexMat, TEXMAT)

    - +

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

    - +

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

    - +

    oinline Matrix& getMatrix()
    Get the texture matrix

    - +

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

    - +

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

    - +

    ovirtual ~TexMat( void )

    - +

    oMatrix _matrix

    diff --git a/doc/doc++/osg/Texture.html b/doc/doc++/osg/Texture.html index 62efb766f..595365ed9 100644 --- a/doc/doc++/osg/Texture.html +++ b/doc/doc++/osg/Texture.html @@ -23,160 +23,160 @@

    Public Methods

    -[more] Texture() +[more] Texture()
    -[more] META_StateAttribute(Texture, (Type)(TEXTURE_0+_textureUnit)) +[more] META_StateAttribute(Texture, (Type)(TEXTURE_0+_textureUnit))
    -[more]virtual int compare(const StateAttribute& rhs) const +[more]virtual int compare(const StateAttribute& rhs) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const +[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const
    -[more]void setImage(Image* image) +[more]void setImage(Image* image)
    Set the texture image.
    -[more]Image* getImage() +[more]Image* getImage()
    Get the texture image.
    -[more]inline const Image* getImage() const +[more]inline const Image* getImage() const
    Get the const texture image.
    -[more]void copyTexImage2D(State& state, int x, int y, int width, int height ) +[more]void copyTexImage2D(State& state, int x, int y, int width, int height )
    Copy pixels into a 2D texture imageAs per glCopyTexImage2D.
    -[more]void copyTexSubImage2D(State& state, int xoffset, int yoffset, int x, int y, int width, int height ) +[more]void copyTexSubImage2D(State& state, int xoffset, int yoffset, int x, int y, int width, int height )
    Copy a two-dimensional texture subimage.
    -[more]inline void setTextureUnit(const unsigned int textureUnit) +[more]inline void setTextureUnit(const unsigned int textureUnit)
    Set the texture unit.
    -[more]inline const unsigned int getTextureUnit() const +[more]inline const unsigned int getTextureUnit() const
    get the texture unit
    -[more]void setWrap(const WrapParameter which, const WrapMode wrap) +[more]void setWrap(const WrapParameter which, const WrapMode wrap)
    Set the texture wrap mode
    -[more]const WrapMode getWrap(const WrapParameter which) const +[more]const WrapMode getWrap(const WrapParameter which) const
    Get the texture wrap mode
    -[more]void setFilter(const FilterParameter which, const FilterMode filter) +[more]void setFilter(const FilterParameter which, const FilterMode filter)
    Set the texture filter mode
    -[more]const FilterMode getFilter(const FilterParameter which) const +[more]const FilterMode getFilter(const FilterParameter which) const
    Get the texture filter mode
    -[more]inline void setInternalFormatMode(const InternalFormatMode mode) +[more]inline void setInternalFormatMode(const InternalFormatMode mode)
    Set the internal format mode.
    -[more]inline const InternalFormatMode getInternalFormatMode() const +[more]inline const InternalFormatMode getInternalFormatMode() const
    Get the internal format mode
    -[more]inline void setInternalFormatValue(const int internalFormat) +[more]inline void setInternalFormatValue(const int internalFormat)
    Set the internal format to use when creating OpenGL textures.
    -[more]inline const int getInternalFormatValue() const +[more]inline const int getInternalFormatValue() const
    Get the internal format to use when creating OpenGL textures
    -[more]inline const uint getTextureObject(const uint contextID) const +[more]inline const uint getTextureObject(const uint contextID) const
    return the OpenGL texture object for specified context
    -[more]inline const uint getTextureObjectSize() const +[more]inline const uint getTextureObjectSize() const
    return the memory size of texture object.
    -[more]inline void setSubloadMode(const SubloadMode mode) +[more]inline void setSubloadMode(const SubloadMode mode)
    Set the texture subload mode.
    -[more]inline const SubloadMode getSubloadMode() const +[more]inline const SubloadMode getSubloadMode() const
    Get the texture subload mode.
    -[more]inline void setSubloadOffset(const int x, const int y) +[more]inline void setSubloadOffset(const int x, const int y)
    Set the texture subload offsets.
    -[more]inline void getSubloadOffset(int& x, int& y) const +[more]inline void getSubloadOffset(int& x, int& y) const
    Get the texture subload offsets.
    -[more]inline GLuint& getHandle(const uint contextID) const +[more]inline GLuint& getHandle(const uint contextID) const
    Get the handle to the texture object for the current context
    -[more]void dirtyTextureObject() +[more]void dirtyTextureObject()
    Force a recompile on next apply() of associated OpenGL texture objects
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const
    On first apply (unless already compiled), create the minmapped texture and bind it, subsequent apply will simple bind to texture
    -[more]virtual void compile(State& state) const +[more]virtual void compile(State& state) const
    Compile the texture mip maps.
    -[more]virtual void applyImmediateMode(State& state) const +[more]virtual void applyImmediateMode(State& state) const
    Method which does the creation of the texture itself, and does not set or use texture binding.
    -[more]static void deleteTextureObject(uint contextID, GLuint handle) +[more]static void deleteTextureObject(uint contextID, GLuint handle)
    use deleteTextureObject instead of glDeleteTextures to allow OpenGL texture objects to cached until they can be deleted by the OpenGL context in which they were created, specified by contextID
    -[more]static void flushDeletedTextureObjects(uint contextID) +[more]static void flushDeletedTextureObjects(uint contextID)
    flush all the cached display list which need to be deleted in the OpenGL context related to contextID

    Public Members

    -[more]enum WrapParameter +[more]enum WrapParameter
    -[more]enum WrapMode +[more]enum WrapMode
    -[more]enum FilterParameter +[more]enum FilterParameter
    -[more]enum FilterMode +[more]enum FilterMode
    -[more]enum InternalFormatMode +[more]enum InternalFormatMode
    -[more]enum SubloadMode +[more]enum SubloadMode

    Protected Fields

    -[more]mutable uint _textureObjectSize +[more]mutable uint _textureObjectSize
    -[more]mutable ref_ptr<Image> _image +[more]mutable ref_ptr<Image> _image
    -[more]unsigned int _textureUnit +[more]unsigned int _textureUnit
    -[more]WrapMode _wrap_s +[more]WrapMode _wrap_s
    -[more]WrapMode _wrap_t +[more]WrapMode _wrap_t
    -[more]WrapMode _wrap_r +[more]WrapMode _wrap_r
    -[more]FilterMode _min_filter +[more]FilterMode _min_filter
    -[more]FilterMode _mag_filter +[more]FilterMode _mag_filter
    -[more]InternalFormatMode _internalFormatMode +[more]InternalFormatMode _internalFormatMode
    -[more]int _internalFormatValue +[more]int _internalFormatValue
    -[more]mutable unsigned int _textureWidth +[more]mutable unsigned int _textureWidth
    -[more]mutable unsigned int _textureHeight +[more]mutable unsigned int _textureHeight
    -[more]SubloadMode _subloadMode +[more]SubloadMode _subloadMode
    -[more]unsigned int _subloadOffsX +[more]unsigned int _subloadOffsX
    -[more]unsigned int _subloadOffsY +[more]unsigned int _subloadOffsY

    Protected Methods

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

    Protected Members

    -[more]typedef std::vector<GLuint> TextureNameList mutable TextureNameList _handleList +[more]typedef std::vector<GLuint> TextureNameList mutable TextureNameList _handleList
    -[more]typedef std::vector<uint> ImageModifiedTag mutable ImageModifiedTag _modifiedTag +[more]typedef std::vector<uint> ImageModifiedTag mutable ImageModifiedTag _modifiedTag
    -[more]typedef std::map<uint,std::set<uint> >static DeletedTextureObjectCache DeletedTextureObjectCache s_deletedTextureObjectCache +[more]typedef std::map<uint,std::set<uint> >static DeletedTextureObjectCache DeletedTextureObjectCache s_deletedTextureObjectCache

    @@ -190,7 +190,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual const Type getType() const
    obool operator < (const StateAttribute& rhs) const
    @@ -245,56 +245,56 @@
    - +
    o Texture()

    - -

    o META_StateAttribute(Texture, (Type)(TEXTURE_0+_textureUnit)) + +
    o META_StateAttribute(Texture, (Type)(TEXTURE_0+_textureUnit))

    - +

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

    - -

    ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const + +
    ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const

    - +

    ovoid setImage(Image* image)
    Set the texture image.

    - +

    oImage* getImage()
    Get the texture image.

    - +

    oinline const Image* getImage() const
    Get the const texture image.

    - -

    ovoid copyTexImage2D(State& state, int x, int y, int width, int height ) + +
    ovoid copyTexImage2D(State& state, int x, int y, int width, int height )
    Copy pixels into a 2D texture imageAs per glCopyTexImage2D. Creates an OpenGL texture object from the current OpenGL background framebuffer contents at pos \a x, \a y with width \a width and height \a height. \a width and \a height must be a power of two.

    - -

    ovoid copyTexSubImage2D(State& state, int xoffset, int yoffset, int x, int y, int width, int height ) + +
    ovoid copyTexSubImage2D(State& state, int xoffset, int yoffset, int x, int y, int width, int height )
    Copy a two-dimensional texture subimage. As per glCopyTexSubImage2D. -Updates portion of an exisiting OpenGL texture object from the current OpenGL background +Updates portion of an existing OpenGL texture object from the current OpenGL background framebuffer contents at pos \a x, \a y with width \a width and height \a height. \a width and \a height must be a power of two, and writing into the texture with offset \a xoffset and \a yoffset.

    - +

    oinline void setTextureUnit(const unsigned int textureUnit)
    Set the texture unit. Valid values are 0,1,2,3. @@ -302,248 +302,252 @@ Default value of texture unit is 0. note, multi-texturing not fully implemented yet... April 2001.

    - +

    oinline const unsigned int getTextureUnit() const
    get the texture unit

    - +

    oenum WrapParameter

    - +
    o WRAP_S

    - +

    o WRAP_T

    - +

    o WRAP_R

    - +
    oenum WrapMode

    - +
    o CLAMP

    + + +

    o CLAMP_TO_EDGE +

    - +

    o REPEAT

    - +

    o MIRROR

    - -
    ovoid setWrap(const WrapParameter which, const WrapMode wrap) + +
    ovoid setWrap(const WrapParameter which, const WrapMode wrap)
    Set the texture wrap mode

    - -

    oconst WrapMode getWrap(const WrapParameter which) const + +
    oconst WrapMode getWrap(const WrapParameter which) const
    Get the texture wrap mode

    - +

    oenum FilterParameter

    - +
    o MIN_FILTER

    - +

    o MAG_FILTER

    - +
    oenum FilterMode

    - +
    o LINEAR

    - +

    o LINEAR_MIPMAP_LINEAR

    - +

    o LINEAR_MIPMAP_NEAREST

    - +

    o NEAREST

    - +

    o NEAREST_MIPMAP_LINEAR

    - +

    o NEAREST_MIPMAP_NEAREST

    - +

    o ANISOTROPIC

    - -
    ovoid setFilter(const FilterParameter which, const FilterMode filter) + +
    ovoid setFilter(const FilterParameter which, const FilterMode filter)
    Set the texture filter mode

    - -

    oconst FilterMode getFilter(const FilterParameter which) const + +
    oconst FilterMode getFilter(const FilterParameter which) const
    Get the texture filter mode

    - +

    oenum InternalFormatMode

    - +
    o USE_IMAGE_DATA_FORMAT

    - +

    o USE_USER_DEFINED_FORMAT

    - +

    o USE_ARB_COMPRESSION

    - +

    o USE_S3TC_DXT1_COMPRESSION

    - +

    o USE_S3TC_DXT3_COMPRESSION

    - +

    o USE_S3TC_DXT5_COMPRESSION

    - -
    oinline void setInternalFormatMode(const InternalFormatMode mode) + +
    oinline void setInternalFormatMode(const InternalFormatMode mode)
    Set the internal format mode. Note, If the mode is set USE_IMAGE_DATA_FORMAT, USE_ARB_COMPRESSION, USE_S3TC_COMPRESSION the internalFormat is automatically selected, and will overwrite the previous _internalFormatValue.

    - -

    oinline const InternalFormatMode getInternalFormatMode() const + +
    oinline const InternalFormatMode getInternalFormatMode() const
    Get the internal format mode

    - -

    oinline void setInternalFormatValue(const int internalFormat) + +
    oinline void setInternalFormatValue(const int internalFormat)
    Set the internal format to use when creating OpenGL textures. Also sets the internalFormatMode to USE_USER_DEFINED_FORMAT.

    - +

    oinline const int getInternalFormatValue() const
    Get the internal format to use when creating OpenGL textures

    - +

    oinline const uint getTextureObject(const uint contextID) const
    return the OpenGL texture object for specified context

    - +

    oinline const uint getTextureObjectSize() const
    return the memory size of texture object. Texture object size can be used for estimating the cost of -uploading the texture to graphics hardware, which inturn can +uploading the texture to graphics hardware, which in turn can be used for setting texture residence priorities.

    - +

    oenum SubloadMode

    - +
    o OFF

    - +

    o AUTO

    - +

    o IF_DIRTY

    - -
    oinline void setSubloadMode(const SubloadMode mode) + +
    oinline void setSubloadMode(const SubloadMode mode)
    Set the texture subload mode.

    - -

    oinline const SubloadMode getSubloadMode() const + +
    oinline const SubloadMode getSubloadMode() const
    Get the texture subload mode.

    - -

    oinline void setSubloadOffset(const int x, const int y) + +
    oinline void setSubloadOffset(const int x, const int y)
    Set the texture subload offsets.

    - -

    oinline void getSubloadOffset(int& x, int& y) const + +
    oinline void getSubloadOffset(int& x, int& y) const
    Get the texture subload offsets.

    - +

    oinline GLuint& getHandle(const uint contextID) const
    Get the handle to the texture object for the current context

    - +

    ovoid dirtyTextureObject()
    Force a recompile on next apply() of associated OpenGL texture objects

    - +

    ovirtual void apply(State& state) const
    On first apply (unless already compiled), create the minmapped texture and bind it, subsequent apply will simple bind to texture

    - +

    ovirtual void compile(State& state) const
    Compile the texture mip maps. Implemented by simply calling apply().

    - +

    ovirtual void applyImmediateMode(State& state) const
    Method which does the creation of the texture itself, and does not set or use texture binding.

    - +

    ostatic void deleteTextureObject(uint contextID, GLuint handle)
    use deleteTextureObject instead of glDeleteTextures to allow OpenGL texture objects to cached until they can be deleted @@ -551,85 +555,85 @@ by the OpenGL context in which they were created, specified by contextID

    - +

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

    - +

    ovirtual ~Texture()

    - +

    otypedef std::vector<GLuint> TextureNameList mutable TextureNameList _handleList

    - +

    otypedef std::vector<uint> ImageModifiedTag mutable ImageModifiedTag _modifiedTag

    - +

    omutable uint _textureObjectSize

    - +

    omutable ref_ptr<Image> _image

    - +

    ounsigned int _textureUnit

    - -

    oWrapMode _wrap_s + +
    oWrapMode _wrap_s

    - -

    oWrapMode _wrap_t + +
    oWrapMode _wrap_t

    - -

    oWrapMode _wrap_r + +
    oWrapMode _wrap_r

    - -

    oFilterMode _min_filter + +
    oFilterMode _min_filter

    - -

    oFilterMode _mag_filter + +
    oFilterMode _mag_filter

    - -

    oInternalFormatMode _internalFormatMode + +
    oInternalFormatMode _internalFormatMode

    - +

    oint _internalFormatValue

    - +

    omutable unsigned int _textureWidth

    - +

    omutable unsigned int _textureHeight

    - -

    oSubloadMode _subloadMode + +
    oSubloadMode _subloadMode

    - +

    ounsigned int _subloadOffsX

    - +

    ounsigned int _subloadOffsY

    - +

    otypedef std::map<uint,std::set<uint> >static DeletedTextureObjectCache DeletedTextureObjectCache s_deletedTextureObjectCache

    diff --git a/doc/doc++/osg/Timer.html b/doc/doc++/osg/Timer.html index d457b58d9..b092f4221 100644 --- a/doc/doc++/osg/Timer.html +++ b/doc/doc++/osg/Timer.html @@ -13,21 +13,21 @@

    Public Methods

    -[more] Timer() +[more] Timer()
    -[more] ~Timer() +[more] ~Timer()
    -[more]inline double delta_s( Timer_t t1, Timer_t t2 ) const +[more]inline double delta_s( Timer_t t1, Timer_t t2 ) const
    -[more]inline double delta_m( Timer_t t1, Timer_t t2 ) const +[more]inline double delta_m( Timer_t t1, Timer_t t2 ) const
    -[more]inline double delta_u( Timer_t t1, Timer_t t2 ) const +[more]inline double delta_u( Timer_t t1, Timer_t t2 ) const
    -[more]inline double delta_n( Timer_t t1, Timer_t t2 ) const +[more]inline double delta_n( Timer_t t1, Timer_t t2 ) const
    -[more]inline Timer_t tick() +[more]inline Timer_t tick()
    -[more]inline Timer_t tick( void ) +[more]inline Timer_t tick( void )

    @@ -39,35 +39,35 @@
    - +
    o Timer()

    - +

    o ~Timer()

    - +

    oinline double delta_s( Timer_t t1, Timer_t t2 ) const

    - +

    oinline double delta_m( Timer_t t1, Timer_t t2 ) const

    - +

    oinline double delta_u( Timer_t t1, Timer_t t2 ) const

    - +

    oinline double delta_n( Timer_t t1, Timer_t t2 ) const

    - +

    oinline Timer_t tick()

    - +

    oinline Timer_t tick( void )

    diff --git a/doc/doc++/osg/Transform.html b/doc/doc++/osg/Transform.html index 7a40a1081..74aceeaee 100644 --- a/doc/doc++/osg/Transform.html +++ b/doc/doc++/osg/Transform.html @@ -23,37 +23,47 @@

    Public Methods

    -[more] Transform() +[more] Transform()
    -[more] Transform(const Matrix& matix) +[more] Transform(const Matrix& matix)
    -[more] META_Node(Transform) +[more] META_Node(Transform)
    -[more]void setMatrix(const Matrix& mat ) +[more]inline void setType(Type type) +
    Set the Transform Type, which can be DYNAMIC - the Marix value is updated duing the main loop, or STATIC - the Matrix is constant throughut the life of the main loop.
    -[more]inline Matrix& getMatrix() +[more]inline const Type getType() const +
    Get the Transform Type
    -[more]inline const Matrix& getMatrix() const +[more]inline const Matrix& getMatrix() const
    -[more]void preMult( const Matrix& mat ) +[more]inline void setMatrix(const Matrix& mat )
    -[more]void preScale( const float sx, const float sy, const float sz ) +[more]inline void preMult( const Matrix& mat ) +
    preMult trasforms relative to the childrens coordinate system
    -[more]void preTranslate( const float tx, const float ty, const float tz ) -
    -[more]void preRotate( const float deg, const float x, const float y, const float z ) +[more]inline void postMult( const Matrix& mat ) +
    postMult trasforms relative to the parents coordinate system +

    + +

    +

    Public Members

    +[more]enum Type +
    Range of type that the Transform can be

    Protected Fields

    -[more]ref_ptr<Matrix> _matrix +[more]Type _type +
    +[more]ref_ptr<Matrix> _matrix

    Protected Methods

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

    @@ -108,7 +118,7 @@
    oinline const std::string& getName() const
    -oinline const ParentList& getParents() const +oinline const ParentList& getParents() const
    oinline Group* getParent(const int i)
    @@ -124,23 +134,25 @@
    oinline const int getNumChildrenRequiringAppTraversal() const
    -oinline void setUserData(void* data, MemoryAdapter* ma=0L) +ovoid setCullingActive(const bool active)
    -oinline void* getUserData() +oinline const bool getCullingActive() const
    -oinline const void* getUserData() const +oinline const int getNumChildrenWithCullingDisabled() const
    -oinline MemoryAdapter* getMemoryAdapter() +oinline void setUserData(osg::Referenced* obj)
    -oinline const MemoryAdapter* getMemoryAdapter() const +oinline Referenced* getUserData() +
    +oinline const Referenced* getUserData() const
    oinline void setNodeMask(const NodeMask nm)
    oinline const NodeMask getNodeMask() const
    -oinline const DescriptionList& getDescriptions() const +oinline const DescriptionList& getDescriptions() const
    -oinline DescriptionList& getDescriptions() +oinline DescriptionList& getDescriptions()
    oinline const std::string& getDescription(const int i) const
    @@ -176,19 +188,21 @@
    ostd::string _name
    -oParentList _parents +oParentList _parents
    oref_ptr<NodeCallback> _appCallback
    oint _numChildrenRequiringAppTraversal
    -ovoid* _userData +obool _cullingActive
    -oref_ptr<MemoryAdapter> _memoryAdapter +oint _numChildrenWithCullingDisabled +
    +oosg::ref_ptr<Referenced> _userData
    oNodeMask _nodeMask
    -oDescriptionList _descriptions +oDescriptionList _descriptions
    oref_ptr<StateSet> _dstate

    @@ -196,6 +210,8 @@

    Protected Methods

    ovoid setNumChildrenRequiringAppTraversal(const int num) +
    +ovoid setNumChildrenWithCullingDisabled(const int num)

    @@ -228,59 +244,84 @@
    Transform - is group which all children are transformed by the the Transform's osg::Matrix. Typical uses of the Transform is for positioning objects within a scene or -producing trakerball functionality or for animatiion.
    +producing trakerball functionality or for animation.
    - +
    o Transform()

    - +

    o Transform(const Matrix& matix)

    - +

    o META_Node(Transform)

    - - -

    ovoid setMatrix(const Matrix& mat ) + + +
    oenum Type +
    Range of type that the Transform can be +

    + + + +
    o DYNAMIC +

    + + +

    o STATIC +

    + + + +
    oinline void setType(Type type) +
    Set the Transform Type, which can be DYNAMIC - the Marix +value is updated duing the main loop, or STATIC - the Matrix +is constant throughut the life of the main loop. STATIC +Transforms can be optimized away is some instances, which +can improve performanc so unless you plan to modify the +Matrix explicity set the Matrix to STATIC. The default +value is DYNAMIC. +

    + + +

    oinline const Type getType() const +
    Get the Transform Type

    - -

    oinline Matrix& getMatrix() -

    - - +

    oinline const Matrix& getMatrix() const

    + + +

    oinline void setMatrix(const Matrix& mat ) +

    - -

    ovoid preMult( const Matrix& mat ) + +
    oinline void preMult( const Matrix& mat ) +
    preMult trasforms relative to the childrens coordinate system

    - - -

    ovoid preScale( const float sx, const float sy, const float sz ) -

    - - -

    ovoid preTranslate( const float tx, const float ty, const float tz ) -

    - - -

    ovoid preRotate( const float deg, const float x, const float y, const float z ) + + +
    oinline void postMult( const Matrix& mat ) +
    postMult trasforms relative to the parents coordinate system

    - +

    ovirtual ~Transform()

    - +

    ovirtual const bool computeBound() const

    + + +

    oType _type +

    - +

    oref_ptr<Matrix> _matrix

    diff --git a/doc/doc++/osg/Transparency.html b/doc/doc++/osg/Transparency.html index 116a7e24b..ea7008ebc 100644 --- a/doc/doc++/osg/Transparency.html +++ b/doc/doc++/osg/Transparency.html @@ -7,7 +7,7 @@ -

    class SG_EXPORT osg::Transparency

    Transparancy - encapsulates the OpenGL transparancy state
    +

    class SG_EXPORT osg::Transparency

    Transparency - encapsulates the OpenGL blend/transparency state

    Inheritance:

    @@ -23,43 +23,43 @@

    Public Methods

    -[more] Transparency() +[more] Transparency()
    -[more] META_StateAttribute(Transparency, TRANSPARENCY) +[more] META_StateAttribute(Transparency, TRANSPARENCY)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const +[more]virtual void setStateSetModes(StateSet& ds, const GLModeValue value) const
    -[more]inline void setFunction( const int source, const int destination ) +[more]inline void setFunction( const int source, const int destination )
    -[more]void setSource(const int source) +[more]void setSource(const int source)
    -[more]inline const int getSource() const +[more]inline const int getSource() const
    -[more]void setDestination(const int destination) +[more]void setDestination(const int destination)
    -[more]inline const int getDestination() const +[more]inline const int getDestination() const
    -[more]virtual void apply(State& state) const +[more]virtual void apply(State& state) const

    Public Members

    -[more]enum TransparencyMode +[more]enum TransparencyMode

    Protected Fields

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

    Protected Methods

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

    @@ -73,7 +73,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual const Type getType() const
    obool operator < (const StateAttribute& rhs) const
    @@ -126,110 +126,110 @@

    Documentation

    -
    Transparancy - encapsulates the OpenGL transparancy state
    +
    Transparency - encapsulates the OpenGL blend/transparency state
    - +
    o Transparency()

    - -

    o META_StateAttribute(Transparency, TRANSPARENCY) + +
    o META_StateAttribute(Transparency, TRANSPARENCY)

    - +

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

    - -

    ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const + +
    ovirtual void setStateSetModes(StateSet& ds, const GLModeValue value) const

    - +

    oenum TransparencyMode

    - +
    o DST_ALPHA

    - +

    o DST_COLOR

    - +

    o ONE

    - +

    o ONE_MINUS_DST_ALPHA

    - +

    o ONE_MINUS_DST_COLOR

    - +

    o ONE_MINUS_SRC_ALPHA

    - +

    o ONE_MINUS_SRC_COLOR

    - +

    o SRC_ALPHA

    - +

    o SRC_ALPHA_SATURATE

    - +

    o SRC_COLOR

    - +

    o ZERO

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

    - +

    ovoid setSource(const int source)

    - +

    oinline const int getSource() const

    - +

    ovoid setDestination(const int destination)

    - +

    oinline const int getDestination() const

    - +

    ovirtual void apply(State& state) const

    - +

    ovirtual ~Transparency()

    - +

    oint _source_factor

    - +

    oint _destination_factor

    diff --git a/doc/doc++/osg/Vec2.html b/doc/doc++/osg/Vec2.html index c8d7ce624..4852caa2d 100644 --- a/doc/doc++/osg/Vec2.html +++ b/doc/doc++/osg/Vec2.html @@ -13,74 +13,82 @@

    Public Fields

    -[more]float _v[2] +[more]float _v[2]

    Public Methods

    -[more] Vec2() +[more] Vec2()
    -[more] Vec2(float x, float y) +[more] Vec2(float x, float y)
    -[more]const bool operator == (const Vec2& v) const +[more]inline const bool operator == (const Vec2& v) const
    -[more]const bool operator < (const Vec2& v) const +[more]inline const bool operator != (const Vec2& v) const
    -[more]inline float* ptr() +[more]inline const bool operator < (const Vec2& v) const
    -[more]inline const float* ptr() const +[more]inline float* ptr()
    -[more]inline void set( float x, float y ) +[more]inline const float* ptr() const
    -[more]inline float& operator [] (int i) +[more]inline void set( float x, float y )
    -[more]inline const float operator [] (int i) const +[more]inline float& operator [] (int i)
    -[more]inline float& x() +[more]inline const float operator [] (int i) const
    -[more]inline float& y() +[more]inline float& x()
    -[more]inline const float x() const +[more]inline float& y()
    -[more]inline const float y() const +[more]inline const float x() const
    -[more]inline const float operator * (const Vec2& rhs) const +[more]inline const float y() const +
    +[more]inline const bool valid() const +
    +[more]inline const bool isNaN() const +
    +[more]inline const bool isInfinite() const +
    +[more]inline const float operator * (const Vec2& rhs) const
    dot product
    -[more]inline const Vec2 operator * (const float& rhs) const +[more]inline const Vec2 operator * (const float& rhs) const
    multiply by scalar
    -[more]inline Vec2& operator *= (const float& rhs) +[more]inline Vec2& operator *= (const float& rhs)
    unary multiply by scalar
    -[more]inline const Vec2 operator / (const float& rhs) const +[more]inline const Vec2 operator / (const float& rhs) const
    divide by scalar
    -[more]inline Vec2& operator /= (const float& rhs) +[more]inline Vec2& operator /= (const float& rhs)
    unary divide by scalar
    -[more]inline const Vec2 operator + (const Vec2& rhs) const +[more]inline const Vec2 operator + (const Vec2& rhs) const
    binary vector add
    -[more]inline Vec2& operator += (const Vec2& rhs) +[more]inline Vec2& operator += (const Vec2& rhs)
    unary vector add.
    -[more]inline const Vec2 operator - (const Vec2& rhs) const -
    binary vector subract +[more]inline const Vec2 operator - (const Vec2& rhs) const +
    binary vector subtract
    -[more]inline Vec2& operator -= (const Vec2& rhs) -
    unary vector subract +[more]inline Vec2& operator -= (const Vec2& rhs) +
    unary vector subtract
    -[more]inline const Vec2 operator - () const +[more]inline const Vec2 operator - () const
    negation operator.
    -[more]inline const float length() const +[more]inline const float length() const
    Length of the vector = sqrt( vec .
    -[more]inline const float length2( void ) const +[more]inline const float length2( void ) const
    Length squared of the vector = vec .
    -[more]inline const float normalize() +[more]inline const float normalize()
    normalize the vector so that it has length unity returns the previous length of the vector

    @@ -97,124 +105,140 @@ BTW: Vec2 * float is okay
    - +
    o Vec2()

    - -

    o Vec2(float x, float y) + +
    o Vec2(float x, float y)

    - +

    ofloat _v[2]

    - -

    oconst bool operator == (const Vec2& v) const + +
    oinline const bool operator == (const Vec2& v) const +

    + + +

    oinline const bool operator != (const Vec2& v) const

    - -

    oconst bool operator < (const Vec2& v) const + +
    oinline const bool operator < (const Vec2& v) const

    - +

    oinline float* ptr()

    - +

    oinline const float* ptr() const

    - -

    oinline void set( float x, float y ) + +
    oinline void set( float x, float y )

    - +

    oinline float& operator [] (int i)

    - +

    oinline const float operator [] (int i) const

    - +

    oinline float& x()

    - +

    oinline float& y()

    - +

    oinline const float x() const

    - +

    oinline const float y() const

    + + +

    oinline const bool valid() const +

    + + +

    oinline const bool isNaN() const +

    + + +

    oinline const bool isInfinite() const +

    - +

    oinline const float operator * (const Vec2& rhs) const
    dot product

    - +

    oinline const Vec2 operator * (const float& rhs) const
    multiply by scalar

    - +

    oinline Vec2& operator *= (const float& rhs)
    unary multiply by scalar

    - +

    oinline const Vec2 operator / (const float& rhs) const
    divide by scalar

    - +

    oinline Vec2& operator /= (const float& rhs)
    unary divide by scalar

    - +

    oinline const Vec2 operator + (const Vec2& rhs) const
    binary vector add

    - +

    oinline Vec2& operator += (const Vec2& rhs)
    unary vector add. Slightly more efficient because no temporary intermediate object.

    - +

    oinline const Vec2 operator - (const Vec2& rhs) const -
    binary vector subract +
    binary vector subtract

    - +

    oinline Vec2& operator -= (const Vec2& rhs) -
    unary vector subract +
    unary vector subtract

    - +

    oinline const Vec2 operator - () const
    negation operator. Returns the negative of the Vec2

    - +

    oinline const float length() const
    Length of the vector = sqrt( vec . vec )

    - +

    oinline const float length2( void ) const
    Length squared of the vector = vec . vec

    - +

    oinline const float normalize()
    normalize the vector so that it has length unity returns the previous length of the vector @@ -222,7 +246,7 @@ returns the previous length of the vector
    This class has no child classes.
    -
    Friends:
    inline ostream& operator << (ostream& output, const Vec2& vec)

    Alphabetic index HTML hierarchy of classes or Java

    +
    Friends:
    inline std::ostream& operator << (std::ostream& output, const Vec2& vec)

    Alphabetic index HTML hierarchy of classes or Java


    This page was generated with the help of DOC++. diff --git a/doc/doc++/osg/Vec3.html b/doc/doc++/osg/Vec3.html index 35e2c6057..700bba6f5 100644 --- a/doc/doc++/osg/Vec3.html +++ b/doc/doc++/osg/Vec3.html @@ -13,81 +13,89 @@

    Public Fields

    -[more]float _v[3] +[more]float _v[3]

    Public Methods

    -[more] Vec3() +[more] Vec3()
    -[more] Vec3(float x, float y, float z) +[more] Vec3(float x, float y, float z)
    -[more]inline const bool operator == (const Vec3& v) const +[more]inline const bool operator == (const Vec3& v) const
    -[more]inline const bool operator < (const Vec3& v) const +[more]inline const bool operator != (const Vec3& v) const
    -[more]inline float* ptr() +[more]inline const bool operator < (const Vec3& v) const
    -[more]inline const float* ptr() const +[more]inline float* ptr()
    -[more]inline void set( float x, float y, float z) +[more]inline const float* ptr() const
    -[more]inline float& operator [] (int i) +[more]inline void set( float x, float y, float z)
    -[more]inline const float operator [] (int i) const +[more]inline float& operator [] (int i)
    -[more]inline float& x() +[more]inline const float operator [] (int i) const
    -[more]inline float& y() +[more]inline float& x()
    -[more]inline float& z() +[more]inline float& y()
    -[more]inline const float x() const +[more]inline float& z()
    -[more]inline const float y() const +[more]inline const float x() const
    -[more]inline const float z() const +[more]inline const float y() const
    -[more]inline float operator * (const Vec3& rhs) const +[more]inline const float z() const +
    +[more]inline const bool valid() const +
    +[more]inline const bool isNaN() const +
    +[more]inline const bool isInfinite() const +
    +[more]inline float operator * (const Vec3& rhs) const
    dot product
    -[more]inline const Vec3 operator ^ (const Vec3& rhs) const +[more]inline const Vec3 operator ^ (const Vec3& rhs) const
    cross product
    -[more]inline const Vec3 operator * (const float& rhs) const +[more]inline const Vec3 operator * (const float& rhs) const
    multiply by scalar
    -[more]inline Vec3& operator *= (const float& rhs) +[more]inline Vec3& operator *= (const float& rhs)
    unary multiply by scalar
    -[more]inline const Vec3 operator / (const float& rhs) const +[more]inline const Vec3 operator / (const float& rhs) const
    divide by scalar
    -[more]inline Vec3& operator /= (const float& rhs) +[more]inline Vec3& operator /= (const float& rhs)
    unary divide by scalar
    -[more]inline const Vec3 operator + (const Vec3& rhs) const +[more]inline const Vec3 operator + (const Vec3& rhs) const
    binary vector add
    -[more]inline Vec3& operator += (const Vec3& rhs) +[more]inline Vec3& operator += (const Vec3& rhs)
    unary vector add.
    -[more]inline const Vec3 operator - (const Vec3& rhs) const -
    binary vector subract +[more]inline const Vec3 operator - (const Vec3& rhs) const +
    binary vector subtract
    -[more]inline Vec3& operator -= (const Vec3& rhs) -
    unary vector subract +[more]inline Vec3& operator -= (const Vec3& rhs) +
    unary vector subtract
    -[more]inline const Vec3 operator - () const +[more]inline const Vec3 operator - () const
    negation operator.
    -[more]inline const float length() const +[more]inline const float length() const
    Length of the vector = sqrt( vec .
    -[more]inline const float length2() const +[more]inline const float length2() const
    Length squared of the vector = vec .
    -[more]inline const float normalize() +[more]inline const float normalize()
    normalize the vector so that it has length unity returns the previous length of the vector

    @@ -104,137 +112,153 @@ Vec3 * float is okay
    - +
    o Vec3()

    - -

    o Vec3(float x, float y, float z) + +
    o Vec3(float x, float y, float z)

    - +

    ofloat _v[3]

    - +

    oinline const bool operator == (const Vec3& v) const

    + + +

    oinline const bool operator != (const Vec3& v) const +

    - +

    oinline const bool operator < (const Vec3& v) const

    - +

    oinline float* ptr()

    - +

    oinline const float* ptr() const

    - -

    oinline void set( float x, float y, float z) + +
    oinline void set( float x, float y, float z)

    - +

    oinline float& operator [] (int i)

    - +

    oinline const float operator [] (int i) const

    - +

    oinline float& x()

    - +

    oinline float& y()

    - +

    oinline float& z()

    - +

    oinline const float x() const

    - +

    oinline const float y() const

    - +

    oinline const float z() const

    + + +

    oinline const bool valid() const +

    + + +

    oinline const bool isNaN() const +

    + + +

    oinline const bool isInfinite() const +

    - +

    oinline float operator * (const Vec3& rhs) const
    dot product

    - +

    oinline const Vec3 operator ^ (const Vec3& rhs) const
    cross product

    - +

    oinline const Vec3 operator * (const float& rhs) const
    multiply by scalar

    - +

    oinline Vec3& operator *= (const float& rhs)
    unary multiply by scalar

    - +

    oinline const Vec3 operator / (const float& rhs) const
    divide by scalar

    - +

    oinline Vec3& operator /= (const float& rhs)
    unary divide by scalar

    - +

    oinline const Vec3 operator + (const Vec3& rhs) const
    binary vector add

    - +

    oinline Vec3& operator += (const Vec3& rhs)
    unary vector add. Slightly more efficient because no temporary intermediate object

    - +

    oinline const Vec3 operator - (const Vec3& rhs) const -
    binary vector subract +
    binary vector subtract

    - +

    oinline Vec3& operator -= (const Vec3& rhs) -
    unary vector subract +
    unary vector subtract

    - +

    oinline const Vec3 operator - () const
    negation operator. Returns the negative of the Vec3

    - +

    oinline const float length() const
    Length of the vector = sqrt( vec . vec )

    - +

    oinline const float length2() const
    Length squared of the vector = vec . vec

    - +

    oinline const float normalize()
    normalize the vector so that it has length unity returns the previous length of the vector @@ -242,7 +266,7 @@ returns the previous length of the vector
    This class has no child classes.
    -
    Friends:
    inline ostream& operator << (ostream& output, const Vec3& vec)

    Alphabetic index HTML hierarchy of classes or Java

    +
    Friends:
    inline std::ostream& operator << (std::ostream& output, const Vec3& vec)

    Alphabetic index HTML hierarchy of classes or Java


    This page was generated with the help of DOC++. diff --git a/doc/doc++/osg/Vec4.html b/doc/doc++/osg/Vec4.html index 9ce3f7646..4035907aa 100644 --- a/doc/doc++/osg/Vec4.html +++ b/doc/doc++/osg/Vec4.html @@ -13,82 +13,90 @@

    Public Fields

    -[more]float _v[4] +[more]float _v[4]

    Public Methods

    -[more] Vec4() +[more] Vec4()
    -[more] Vec4(float x, float y, float z, float w) +[more] Vec4(float x, float y, float z, float w)
    -[more]inline const bool operator == (const Vec4& v) const +[more]inline const bool operator == (const Vec4& v) const
    -[more]inline const bool operator < (const Vec4& v) const +[more]inline const bool operator != (const Vec4& v) const
    -[more]inline float* ptr() +[more]inline const bool operator < (const Vec4& v) const
    -[more]inline const float* ptr() const +[more]inline float* ptr()
    -[more]inline void set( float x, float y, float z, float w) +[more]inline const float* ptr() const
    -[more]inline float& operator [] (const int i) +[more]inline void set( float x, float y, float z, float w)
    -[more]inline float operator [] (const int i) const +[more]inline float& operator [] (const int i)
    -[more]inline float& x() +[more]inline float operator [] (const int i) const
    -[more]inline float& y() +[more]inline float& x()
    -[more]inline float& z() +[more]inline float& y()
    -[more]inline float& w() +[more]inline float& z()
    -[more]inline float x() const +[more]inline float& w()
    -[more]inline float y() const +[more]inline float x() const
    -[more]inline float z() const +[more]inline float y() const
    -[more]inline float w() const +[more]inline float z() const
    -[more]inline float operator * (const Vec4& rhs) const +[more]inline float w() const +
    +[more]inline const bool valid() const +
    +[more]inline const bool isNaN() const +
    +[more]inline const bool isInfinite() const +
    +[more]inline float operator * (const Vec4& rhs) const
    dot product
    -[more]inline Vec4 operator * (const float& rhs) const +[more]inline Vec4 operator * (const float& rhs) const
    multiply by scalar
    -[more]inline Vec4& operator *= (const float& rhs) +[more]inline Vec4& operator *= (const float& rhs)
    unary multiply by scalar
    -[more]inline Vec4 operator / (const float& rhs) const +[more]inline Vec4 operator / (const float& rhs) const
    divide by scalar
    -[more]inline Vec4& operator /= (const float& rhs) +[more]inline Vec4& operator /= (const float& rhs)
    unary divide by scalar
    -[more]inline Vec4 operator + (const Vec4& rhs) const +[more]inline Vec4 operator + (const Vec4& rhs) const
    binary vector add
    -[more]inline Vec4& operator += (const Vec4& rhs) +[more]inline Vec4& operator += (const Vec4& rhs)
    unary vector add.
    -[more]inline Vec4 operator - (const Vec4& rhs) const -
    binary vector subract +[more]inline Vec4 operator - (const Vec4& rhs) const +
    binary vector subtract
    -[more]inline Vec4& operator -= (const Vec4& rhs) -
    unary vector subract +[more]inline Vec4& operator -= (const Vec4& rhs) +
    unary vector subtract
    -[more]inline const Vec4 operator - () const +[more]inline const Vec4 operator - () const
    negation operator.
    -[more]inline const float length() const +[more]inline const float length() const
    Length of the vector = sqrt( vec .
    -[more]inline const float length2() const +[more]inline const float length2() const
    Length squared of the vector = vec .
    -[more]inline const float normalize() +[more]inline const float normalize()
    normalize the vector so that it has length unity returns the previous length of the vector

    @@ -105,140 +113,156 @@ Vec4 * float is okay
    - +
    o Vec4()

    - -

    o Vec4(float x, float y, float z, float w) + +
    o Vec4(float x, float y, float z, float w)

    - +

    ofloat _v[4]

    - +

    oinline const bool operator == (const Vec4& v) const

    + + +

    oinline const bool operator != (const Vec4& v) const +

    - +

    oinline const bool operator < (const Vec4& v) const

    - +

    oinline float* ptr()

    - +

    oinline const float* ptr() const

    - -

    oinline void set( float x, float y, float z, float w) + +
    oinline void set( float x, float y, float z, float w)

    - +

    oinline float& operator [] (const int i)

    - +

    oinline float operator [] (const int i) const

    - +

    oinline float& x()

    - +

    oinline float& y()

    - +

    oinline float& z()

    - +

    oinline float& w()

    - +

    oinline float x() const

    - +

    oinline float y() const

    - +

    oinline float z() const

    - +

    oinline float w() const

    + + +

    oinline const bool valid() const +

    + + +

    oinline const bool isNaN() const +

    + + +

    oinline const bool isInfinite() const +

    - +

    oinline float operator * (const Vec4& rhs) const
    dot product

    - +

    oinline Vec4 operator * (const float& rhs) const
    multiply by scalar

    - +

    oinline Vec4& operator *= (const float& rhs)
    unary multiply by scalar

    - +

    oinline Vec4 operator / (const float& rhs) const
    divide by scalar

    - +

    oinline Vec4& operator /= (const float& rhs)
    unary divide by scalar

    - +

    oinline Vec4 operator + (const Vec4& rhs) const
    binary vector add

    - +

    oinline Vec4& operator += (const Vec4& rhs)
    unary vector add. Slightly more efficient because no temporary intermediate object

    - +

    oinline Vec4 operator - (const Vec4& rhs) const -
    binary vector subract +
    binary vector subtract

    - +

    oinline Vec4& operator -= (const Vec4& rhs) -
    unary vector subract +
    unary vector subtract

    - +

    oinline const Vec4 operator - () const
    negation operator. Returns the negative of the Vec4

    - +

    oinline const float length() const
    Length of the vector = sqrt( vec . vec )

    - +

    oinline const float length2() const
    Length squared of the vector = vec . vec

    - +

    oinline const float normalize()
    normalize the vector so that it has length unity returns the previous length of the vector @@ -246,7 +270,7 @@ returns the previous length of the vector
    This class has no child classes.
    -
    Friends:
    inline ostream& operator << (ostream& output, const Vec4& vec)

    Alphabetic index HTML hierarchy of classes or Java

    +
    Friends:
    inline std::ostream& operator << (std::ostream& output, const Vec4& vec)

    Alphabetic index HTML hierarchy of classes or Java


    This page was generated with the help of DOC++. diff --git a/doc/doc++/osg/Viewport.html b/doc/doc++/osg/Viewport.html index db56cb9e1..4bf8d2f6d 100644 --- a/doc/doc++/osg/Viewport.html +++ b/doc/doc++/osg/Viewport.html @@ -23,45 +23,47 @@

    Public Methods

    -[more] Viewport() +[more] Viewport()
    -[more] META_StateAttribute(Viewport, VIEWPORT) +[more] META_StateAttribute(Viewport, VIEWPORT)
    -[more]virtual int compare(const StateAttribute& sa) const +[more]virtual int compare(const StateAttribute& sa) const
    return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs
    -[more]inline void setViewport(const int x, const int y, const int width, const int height) +[more]inline void setViewport(const int x, const int y, const int width, const int height)
    -[more]void getViewport(int& x, int& y, int& width, int& height) +[more]void getViewport(int& x, int& y, int& width, int& height)
    -[more]inline const int x() const +[more]inline const int x() const
    -[more]inline const int y() const +[more]inline const int y() const
    -[more]inline const int width() const +[more]inline const int width() const
    -[more]inline const int height() const +[more]inline const int height() const
    -[more]inline const float aspectRatio() const -
    return the aspcetRatio of the viewport, which is equal to width/height +[more]inline const bool valid() const
    -[more]virtual void apply(State& state) const +[more]inline const float aspectRatio() const +
    Return the aspcetRatio of the viewport, which is equal to width/height. +
    +[more]virtual void apply(State& state) const

    Protected Fields

    -[more]int _x +[more]int _x
    -[more]int _y +[more]int _y
    -[more]int _width +[more]int _width
    -[more]int _height +[more]int _height

    Protected Methods

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

    @@ -75,7 +77,7 @@
    ovirtual const char* className() const
    -ovirtual const Type getType() const +ovirtual const Type getType() const
    obool operator < (const StateAttribute& rhs) const
    @@ -83,7 +85,7 @@
    obool operator != (const StateAttribute& rhs) const
    -ovirtual void setStateSetModes(StateSet&, const GLModeValue) const +ovirtual void setStateSetModes(StateSet&, const GLModeValue) const
    ovirtual void compile(State&) const

    @@ -134,69 +136,74 @@
    - +
    o Viewport()

    - -

    o META_StateAttribute(Viewport, VIEWPORT) + +
    o META_StateAttribute(Viewport, VIEWPORT)

    - +

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

    - -

    oinline void setViewport(const int x, const int y, const int width, const int height) + +
    oinline void setViewport(const int x, const int y, const int width, const int height)

    - -

    ovoid getViewport(int& x, int& y, int& width, int& height) + +
    ovoid getViewport(int& x, int& y, int& width, int& height)

    - +

    oinline const int x() const

    - +

    oinline const int y() const

    - +

    oinline const int width() const

    - +

    oinline const int height() const

    + + +

    oinline const bool valid() const +

    - +

    oinline const float aspectRatio() const -
    return the aspcetRatio of the viewport, which is equal to width/height +
    Return the aspcetRatio of the viewport, which is equal to width/height. +If height is zero, the potental division by zero is avoid by simply returning 1.0f.

    - +

    ovirtual void apply(State& state) const

    - +

    ovirtual ~Viewport()

    - +

    oint _x

    - +

    oint _y

    - +

    oint _width

    - +

    oint _height

    diff --git a/doc/doc++/osg/clampArray3BetweenRange.html b/doc/doc++/osg/clampArray3BetweenRange.html index 05e0cd68c..076ccf351 100644 --- a/doc/doc++/osg/clampArray3BetweenRange.html +++ b/doc/doc++/osg/clampArray3BetweenRange.html @@ -7,13 +7,13 @@ -

    template<class A, class T>inline void osg::clampArray3BetweenRange

    (A& value,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if array4 elements are between or equal to minValue and maxValue do nothing - legal value, otherise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    +

    template<class A, class T>inline void osg::clampArray3BetweenRange

    (A& value,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if array4 elements are between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.

    Documentation

    if array4 elements are between or equal to minValue and maxValue do nothing - legal value, -otherise clamp value to specified to range and return warning +otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped. Equivilant to calling clampGEQUAL(value,minValue,valueName); clampLEQUAL(value,maxValue,valueName);

    Alphabetic index HTML hierarchy of classes or Java

    diff --git a/doc/doc++/osg/clampArray3GEQUAL.html b/doc/doc++/osg/clampArray3GEQUAL.html index 5bac036eb..fd91bc3d7 100644 --- a/doc/doc++/osg/clampArray3GEQUAL.html +++ b/doc/doc++/osg/clampArray3GEQUAL.html @@ -7,13 +7,13 @@ -

    template<class A, class T>inline void osg::clampArray3GEQUAL

    (A& value,
      const T minValue,
      const char* valueName)

    if array4 elements are greater than or equal to minValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class A, class T>inline void osg::clampArray3GEQUAL

    (A& value,
      const T minValue,
      const char* valueName)

    if array4 elements are greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Documentation

    if array4 elements are greater than or equal to minValue do nothing - legal value, -otherise clamp value to specified maximum value and return warning +otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Alphabetic index HTML hierarchy of classes or Java


    diff --git a/doc/doc++/osg/clampArray3LEQUAL.html b/doc/doc++/osg/clampArray3LEQUAL.html index 163fd0f0b..92c3878bc 100644 --- a/doc/doc++/osg/clampArray3LEQUAL.html +++ b/doc/doc++/osg/clampArray3LEQUAL.html @@ -7,13 +7,13 @@ -

    template<class A, class T>inline void osg::clampArray3LEQUAL

    (A& value,
      const T maxValue,
      const char* valueName)

    if array4 elements are is less than or equal to maxValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class A, class T>inline void osg::clampArray3LEQUAL

    (A& value,
      const T maxValue,
      const char* valueName)

    if array4 elements are is less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Documentation

    if array4 elements are is less than or equal to maxValue do nothing - legal value, -otherise clamp value to specified maximum value and return warning +otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Alphabetic index HTML hierarchy of classes or Java


    diff --git a/doc/doc++/osg/clampArray4BetweenRange.html b/doc/doc++/osg/clampArray4BetweenRange.html index 334871615..15204c739 100644 --- a/doc/doc++/osg/clampArray4BetweenRange.html +++ b/doc/doc++/osg/clampArray4BetweenRange.html @@ -7,13 +7,13 @@ -

    template<class A, class T>inline void osg::clampArray4BetweenRange

    (A& value,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if array4 elements are between or equal to minValue and maxValue do nothing - legal value, otherise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    +

    template<class A, class T>inline void osg::clampArray4BetweenRange

    (A& value,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if array4 elements are between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.

    Documentation

    if array4 elements are between or equal to minValue and maxValue do nothing - legal value, -otherise clamp value to specified to range and return warning +otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped. Equivilant to calling clampGEQUAL(value,minValue,valueName); clampLEQUAL(value,maxValue,valueName);

    Alphabetic index HTML hierarchy of classes or Java

    diff --git a/doc/doc++/osg/clampArray4GEQUAL.html b/doc/doc++/osg/clampArray4GEQUAL.html index d04477559..4370b1072 100644 --- a/doc/doc++/osg/clampArray4GEQUAL.html +++ b/doc/doc++/osg/clampArray4GEQUAL.html @@ -7,13 +7,13 @@ -

    template<class A, class T>inline void osg::clampArray4GEQUAL

    (A& value,
      const T minValue,
      const char* valueName)

    if array4 elements are greater than or equal to minValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class A, class T>inline void osg::clampArray4GEQUAL

    (A& value,
      const T minValue,
      const char* valueName)

    if array4 elements are greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Documentation

    if array4 elements are greater than or equal to minValue do nothing - legal value, -otherise clamp value to specified maximum value and return warning +otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Alphabetic index HTML hierarchy of classes or Java


    diff --git a/doc/doc++/osg/clampArray4LEQUAL.html b/doc/doc++/osg/clampArray4LEQUAL.html index 5090b77cc..90fb01dce 100644 --- a/doc/doc++/osg/clampArray4LEQUAL.html +++ b/doc/doc++/osg/clampArray4LEQUAL.html @@ -7,13 +7,13 @@ -

    template<class A, class T>inline void osg::clampArray4LEQUAL

    (A& value,
      const unsigned int first,
      const unsigned int last,
      const T maxValue,
      const char* valueName)

    if array4 elements are is less than or equal to maxValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class A, class T>inline void osg::clampArray4LEQUAL

    (A& value,
      const unsigned int first,
      const unsigned int last,
      const T maxValue,
      const char* valueName)

    if array4 elements are is less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Documentation

    if array4 elements are is less than or equal to maxValue do nothing - legal value, -otherise clamp value to specified maximum value and return warning +otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Alphabetic index HTML hierarchy of classes or Java


    diff --git a/doc/doc++/osg/clampArrayElementBetweenRange.html b/doc/doc++/osg/clampArrayElementBetweenRange.html index 396c6386b..39cf424eb 100644 --- a/doc/doc++/osg/clampArrayElementBetweenRange.html +++ b/doc/doc++/osg/clampArrayElementBetweenRange.html @@ -7,13 +7,13 @@ -

    template<class A, class T>inline void osg::clampArrayElementBetweenRange

    (A& value,
      const unsigned int i,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if array element value[i] is between or equal to minValue and maxValue do nothing - legal value, otherise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    +

    template<class A, class T>inline void osg::clampArrayElementBetweenRange

    (A& value,
      const unsigned int i,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if array element value[i] is between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.

    Documentation

    if array element value[i] is between or equal to minValue and maxValue do nothing - legal value, -otherise clamp value to specified to range and return warning +otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped. Equivilant to calling clampGEQUAL(value,minValue,valueName); clampLEQUAL(value,maxValue,valueName);

    Alphabetic index HTML hierarchy of classes or Java

    diff --git a/doc/doc++/osg/clampArrayElementGEQUAL.html b/doc/doc++/osg/clampArrayElementGEQUAL.html index 3aa0246c7..62aa9faa1 100644 --- a/doc/doc++/osg/clampArrayElementGEQUAL.html +++ b/doc/doc++/osg/clampArrayElementGEQUAL.html @@ -7,13 +7,13 @@ -

    template<class A, class T>inline void osg::clampArrayElementGEQUAL

    (A& value,
      const unsigned int i,
      const T minValue,
      const char* valueName)

    if array element value[i] is greater than or equal to minValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class A, class T>inline void osg::clampArrayElementGEQUAL

    (A& value,
      const unsigned int i,
      const T minValue,
      const char* valueName)

    if array element value[i] is greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Documentation

    if array element value[i] is greater than or equal to minValue do nothing - legal value, -otherise clamp value to specified maximum value and return warning +otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Alphabetic index HTML hierarchy of classes or Java


    diff --git a/doc/doc++/osg/clampArrayElementLEQUAL.html b/doc/doc++/osg/clampArrayElementLEQUAL.html index d55e9b3f5..d0aa943e6 100644 --- a/doc/doc++/osg/clampArrayElementLEQUAL.html +++ b/doc/doc++/osg/clampArrayElementLEQUAL.html @@ -7,13 +7,13 @@ -

    template<class A, class T>inline void osg::clampArrayElementLEQUAL

    (A& value,
      const unsigned int i,
      const T maxValue,
      const char* valueName)

    if array element value[i] is less than or equal to maxValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class A, class T>inline void osg::clampArrayElementLEQUAL

    (A& value,
      const unsigned int i,
      const T maxValue,
      const char* valueName)

    if array element value[i] is less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Documentation

    if array element value[i] is less than or equal to maxValue do nothing - legal value, -otherise clamp value to specified maximum value and return warning +otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Alphabetic index HTML hierarchy of classes or Java


    diff --git a/doc/doc++/osg/clampArrayElementsBetweenRange.html b/doc/doc++/osg/clampArrayElementsBetweenRange.html index fbe7478e8..99e9eeb14 100644 --- a/doc/doc++/osg/clampArrayElementsBetweenRange.html +++ b/doc/doc++/osg/clampArrayElementsBetweenRange.html @@ -7,14 +7,14 @@ -

    template<class A, class T>inline void osg::clampArrayElementsBetweenRange

    (A& value,
      const unsigned int first,
      const unsigned int last,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if array elements are between or equal to minValue and maxValue do nothing - legal value, otherise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    +

    template<class A, class T>inline void osg::clampArrayElementsBetweenRange

    (A& value,
      const unsigned int first,
      const unsigned int last,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if array elements are between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.

    Documentation

    if array elements are between or equal to minValue and maxValue do nothing - legal value, -otherise clamp value to specified to range and return warning -with valueName specifying which variable was clamped. Equivilant to +otherwise clamp value to specified to range and return warning +with valueName specifying which variable was clamped. Equivalent to calling clampGEQUAL(value,minValue,valueName); clampLEQUAL(value,maxValue,valueName);

    Alphabetic index HTML hierarchy of classes or Java


    diff --git a/doc/doc++/osg/clampArrayElementsGEQUAL.html b/doc/doc++/osg/clampArrayElementsGEQUAL.html index a5970f090..a0da07b7e 100644 --- a/doc/doc++/osg/clampArrayElementsGEQUAL.html +++ b/doc/doc++/osg/clampArrayElementsGEQUAL.html @@ -7,13 +7,13 @@ -

    template<class A, class T>inline void osg::clampArrayElementsGEQUAL

    (A& value,
      const unsigned int first,
      const unsigned int last,
      const T minValue,
      const char* valueName)

    if array elements are greater than or equal to minValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class A, class T>inline void osg::clampArrayElementsGEQUAL

    (A& value,
      const unsigned int first,
      const unsigned int last,
      const T minValue,
      const char* valueName)

    if array elements are greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Documentation

    if array elements are greater than or equal to minValue do nothing - legal value, -otherise clamp value to specified maximum value and return warning +otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Alphabetic index HTML hierarchy of classes or Java


    diff --git a/doc/doc++/osg/clampArrayElementsLEQUAL.html b/doc/doc++/osg/clampArrayElementsLEQUAL.html index 0137ed960..36a27f057 100644 --- a/doc/doc++/osg/clampArrayElementsLEQUAL.html +++ b/doc/doc++/osg/clampArrayElementsLEQUAL.html @@ -7,13 +7,13 @@ -

    template<class A, class T>inline void osg::clampArrayElementsLEQUAL

    (A& value,
      const unsigned int first,
      const unsigned int last,
      const T maxValue,
      const char* valueName)

    if array elements are less than or equal to maxValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class A, class T>inline void osg::clampArrayElementsLEQUAL

    (A& value,
      const unsigned int first,
      const unsigned int last,
      const T maxValue,
      const char* valueName)

    if array elements are less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Documentation

    if array elements are less than or equal to maxValue do nothing - legal value, -otherise clamp value to specified maximum value and return warning +otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Alphabetic index HTML hierarchy of classes or Java


    diff --git a/doc/doc++/osg/clampBetweenRange.html b/doc/doc++/osg/clampBetweenRange.html index 962308212..ce479a763 100644 --- a/doc/doc++/osg/clampBetweenRange.html +++ b/doc/doc++/osg/clampBetweenRange.html @@ -7,13 +7,13 @@ -

    template<class T>inline void osg::clampBetweenRange

    (T& value,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if value is between or equal to minValue and maxValue do nothing - legal value, otherise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    +

    template<class T>inline void osg::clampBetweenRange

    (T& value,
      const T minValue,
      const T maxValue,
      const char* valueName)

    if value is between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.

    Documentation

    if value is between or equal to minValue and maxValue do nothing - legal value, -otherise clamp value to specified to range and return warning +otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped. Equivilant to calling clampGEQUAL(value,minValue,valueName); clampLEQUAL(value,maxValue,valueName);

    Alphabetic index HTML hierarchy of classes or Java

    diff --git a/doc/doc++/osg/clampGEQUAL.html b/doc/doc++/osg/clampGEQUAL.html index dbed848cd..7bb7d2cff 100644 --- a/doc/doc++/osg/clampGEQUAL.html +++ b/doc/doc++/osg/clampGEQUAL.html @@ -7,13 +7,13 @@ -

    template<class T>inline void osg::clampGEQUAL

    (T& value,
      const T minValue,
      const char* valueName)

    if value is greater than or equal to minValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class T>inline void osg::clampGEQUAL

    (T& value,
      const T minValue,
      const char* valueName)

    if value is greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Documentation

    if value is greater than or equal to minValue do nothing - legal value, -otherise clamp value to specified maximum value and return warning +otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Alphabetic index HTML hierarchy of classes or Java


    diff --git a/doc/doc++/osg/clampLEQUAL.html b/doc/doc++/osg/clampLEQUAL.html index 2def19edb..6214cff53 100644 --- a/doc/doc++/osg/clampLEQUAL.html +++ b/doc/doc++/osg/clampLEQUAL.html @@ -7,13 +7,13 @@ -

    template<class T>inline void osg::clampLEQUAL

    (T& value,
      const T maxValue,
      const char* valueName)

    if value is less than or equal to maxValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    +

    template<class T>inline void osg::clampLEQUAL

    (T& value,
      const T maxValue,
      const char* valueName)

    if value is less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Documentation

    if value is less than or equal to maxValue do nothing - legal value, -otherise clamp value to specified maximum value and return warning +otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped

    Alphabetic index HTML hierarchy of classes or Java


    diff --git a/doc/doc++/osg/createGeodeForImage.2.html b/doc/doc++/osg/createGeodeForImage.2.html index b336aa63d..bc2f4bd5b 100644 --- a/doc/doc++/osg/createGeodeForImage.2.html +++ b/doc/doc++/osg/createGeodeForImage.2.html @@ -7,7 +7,7 @@ -

    SG_EXPORT extern Geode* osg::createGeodeForImage

    (Image* image,
      const float s,
      const float t)

    Convenience function to be used by images loaders to generate a valid geode to return for readNode().
    +

    SG_EXPORT extern Geode* osg::createGeodeForImage

    (Image* image,
      const float s,
      const float t)

    Convenience function to be used by images loaders to generate a valid geode to return for readNode().
    diff --git a/doc/doc++/osg/for_each_triangle.html b/doc/doc++/osg/for_each_triangle.html index 7f2c0ec13..98639d180 100644 --- a/doc/doc++/osg/for_each_triangle.html +++ b/doc/doc++/osg/for_each_triangle.html @@ -7,7 +7,7 @@ -

    template<class T> void osg::for_each_triangle

    (GeoSet& gset,
      T& op)

    Template function for iterating through a GeoSet operating on triangles with templated functor.
    +

    template<class T> void osg::for_each_triangle

    (GeoSet& gset,
      T& op)

    Template function for iterating through a GeoSet operating on triangles with templated functor.
    diff --git a/doc/doc++/osg/index.html b/doc/doc++/osg/index.html index f502dd7c6..f10bc7f2a 100644 --- a/doc/doc++/osg/index.html +++ b/doc/doc++/osg/index.html @@ -14,15 +14,21 @@

    Functions

    +

    Variables

    +

    Macros

  • WIN32_LEAN_AND_MEAN
  • WINGDIAPI +
  • __OSG_MATH +
  • acosf +
  • asinf +
  • cosf +
  • floorf +
  • logf +
  • powf +
  • sinf +
  • sqrtf

    Typedefs

    • NodePath A vector of Nodes pointers which is used to describe the path from a root node to a descendant +
    • ubyte

    Hierarchy of classes


    diff --git a/doc/doc++/osg/isGLExtensionSupported.html b/doc/doc++/osg/isGLExtensionSupported.html index d19295028..7a30d44f6 100644 --- a/doc/doc++/osg/isGLExtensionSupported.html +++ b/doc/doc++/osg/isGLExtensionSupported.html @@ -14,7 +14,7 @@

    Documentation

    return true if OpenGL "extension" is supported. note: Must only called within a valid OpenGL context, -undefined behaviour may occur otherwise.
    +undefined behavior may occur otherwise.

    Alphabetic index HTML hierarchy of classes or Java


    This page was generated with the help of DOC++. diff --git a/doc/doc++/osg/mem_ptr.html b/doc/doc++/osg/mem_ptr.html index c1811d1ef..aceec58bf 100644 --- a/doc/doc++/osg/mem_ptr.html +++ b/doc/doc++/osg/mem_ptr.html @@ -7,47 +7,47 @@ -

    template<class T> class osg::mem_ptr

    Smart pointer for handling memory pointers via associated memory adapter
    +

    template<class T> class osg::mem_ptr

    Smart pointer for handling memory pointers via associated memory adapter

    Public Methods

    -[more] mem_ptr() +[more] mem_ptr()
    -[more] mem_ptr(T* t, MemoryAdapter* ma) +[more] mem_ptr(T* t, MemoryAdapter* ma)
    -[more] mem_ptr(const mem_ptr& rp) +[more] mem_ptr(const mem_ptr& rp)
    -[more] ~mem_ptr() +[more] ~mem_ptr()
    -[more]inline mem_ptr& operator = (const mem_ptr& rp) +[more]inline mem_ptr& operator = (const mem_ptr& rp)
    -[more]inline void set(T* t, MemoryAdapter* ma) +[more]inline void set(T* t, MemoryAdapter* ma)
    -[more]inline const bool operator == (const mem_ptr& rp) const +[more]inline const bool operator == (const mem_ptr& rp) const
    -[more]inline const bool operator == (const T* ptr) const +[more]inline const bool operator == (const T* ptr) const
    -[more]inline const bool operator != (const mem_ptr& rp) const +[more]inline const bool operator != (const mem_ptr& rp) const
    -[more]inline const bool operator != (const T* ptr) const +[more]inline const bool operator != (const T* ptr) const
    -[more]inline T& operator*() +[more]inline T& operator*()
    -[more]inline const T& operator*() const +[more]inline const T& operator*() const
    -[more]inline T* operator->() +[more]inline T* operator->()
    -[more]inline const T* operator->() const +[more]inline const T* operator->() const
    -[more]inline const bool operator!() const +[more]inline const bool operator!() const
    -[more]inline const bool valid() const +[more]inline const bool valid() const
    -[more]inline T* get() +[more]inline T* get()
    -[more]inline const T* get() const +[more]inline const T* get() const

    @@ -59,76 +59,76 @@
    - +
    o mem_ptr()

    - -

    o mem_ptr(T* t, MemoryAdapter* ma) + +
    o mem_ptr(T* t, MemoryAdapter* ma)

    - -

    o mem_ptr(const mem_ptr& rp) + +
    o mem_ptr(const mem_ptr& rp)

    - +

    o ~mem_ptr()

    - +

    oinline mem_ptr& operator = (const mem_ptr& rp)

    - -

    oinline void set(T* t, MemoryAdapter* ma) + +
    oinline void set(T* t, MemoryAdapter* ma)

    - +

    oinline const bool operator == (const mem_ptr& rp) const

    - -

    oinline const bool operator == (const T* ptr) const + +
    oinline const bool operator == (const T* ptr) const

    - +

    oinline const bool operator != (const mem_ptr& rp) const

    - -

    oinline const bool operator != (const T* ptr) const + +
    oinline const bool operator != (const T* ptr) const

    - -

    oinline T& operator*() + +
    oinline T& operator*()

    - -

    oinline const T& operator*() const + +
    oinline const T& operator*() const

    - -

    oinline T* operator->() + +
    oinline T* operator->()

    - -

    oinline const T* operator->() const + +
    oinline const T* operator->() const

    - +

    oinline const bool operator!() const

    - +

    oinline const bool valid() const

    - -

    oinline T* get() + +
    oinline T* get()

    - -

    oinline const T* get() const + +
    oinline const T* get() const

    This class has no child classes.
    diff --git a/doc/doc++/osg/notify.html b/doc/doc++/osg/notify.html index 58a2e0dc3..74ddd116c 100644 --- a/doc/doc++/osg/notify.html +++ b/doc/doc++/osg/notify.html @@ -2,12 +2,12 @@ - inline ostream& osg::notify + inline std::ostream& osg::notify -

    inline ostream& osg::notify

    (const NotifySeverity severity=INFO)

    notify messaging function for providing fatal through to verbose debugging messages.
    +

    inline std::ostream& osg::notify

    (const NotifySeverity severity)

    notify messaging function for providing fatal through to verbose debugging messages.
    diff --git a/doc/doc++/osg/osg.html b/doc/doc++/osg/osg.html index b0d6cb775..1097db9d7 100644 --- a/doc/doc++/osg/osg.html +++ b/doc/doc++/osg/osg.html @@ -12,7 +12,7 @@

    class SG_EXPORT AlphaFunc: public StateAttribute -
    Encapsulte OpenGL glAlphaFunc +
    Encapsulate OpenGL glAlphaFunc
    class SG_EXPORT Billboard: public Geode
    Billboard - a Geode which orientates its child osg::Drawable's to face the eye point. @@ -23,71 +23,82 @@ class SG_EXPORT BoundingBox class SG_EXPORT BoundingSphere
    General purpose bounding sphere class for enclosing nodes/objects/vertices.
    -template<class T>inline void clampGEQUAL(T& value, const T minValue, const char* valueName) -
    if value is greater than or equal to minValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped +template<class T>inline void clampGEQUAL(T& value, const T minValue, const char* valueName) +
    if value is greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    -template<class T>inline void clampLEQUAL(T& value, const T maxValue, const char* valueName) -
    if value is less than or equal to maxValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped +template<class T>inline void clampLEQUAL(T& value, const T maxValue, const char* valueName) +
    if value is less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    -template<class T>inline void clampBetweenRange(T& value, const T minValue, const T maxValue, const char* valueName) -
    if value is between or equal to minValue and maxValue do nothing - legal value, otherise clamp value to specified to range and return warning with valueName specifying which variable was clamped. +template<class T>inline void clampBetweenRange(T& value, const T minValue, const T maxValue, const char* valueName) +
    if value is between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    -template<class A, class T>inline void clampArrayElementGEQUAL(A& value, const unsigned int i, const T minValue, const char* valueName) -
    if array element value[i] is greater than or equal to minValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped +template<class A, class T>inline void clampArrayElementGEQUAL(A& value, const unsigned int i, const T minValue, const char* valueName) +
    if array element value[i] is greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    -template<class A, class T>inline void clampArrayElementLEQUAL(A& value, const unsigned int i, const T maxValue, const char* valueName) -
    if array element value[i] is less than or equal to maxValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped +template<class A, class T>inline void clampArrayElementLEQUAL(A& value, const unsigned int i, const T maxValue, const char* valueName) +
    if array element value[i] is less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    -template<class A, class T>inline void clampArrayElementBetweenRange(A& value, const unsigned int i, const T minValue, const T maxValue, const char* valueName) -
    if array element value[i] is between or equal to minValue and maxValue do nothing - legal value, otherise clamp value to specified to range and return warning with valueName specifying which variable was clamped. +template<class A, class T>inline void clampArrayElementBetweenRange(A& value, const unsigned int i, const T minValue, const T maxValue, const char* valueName) +
    if array element value[i] is between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    -template<class A, class T>inline void clampArrayElementsGEQUAL(A& value, const unsigned int first, const unsigned int last, const T minValue, const char* valueName) -
    if array elements are greater than or equal to minValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped +template<class A, class T>inline void clampArrayElementsGEQUAL(A& value, const unsigned int first, const unsigned int last, const T minValue, const char* valueName) +
    if array elements are greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    -template<class A, class T>inline void clampArrayElementsLEQUAL(A& value, const unsigned int first, const unsigned int last, const T maxValue, const char* valueName) -
    if array elements are less than or equal to maxValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped +template<class A, class T>inline void clampArrayElementsLEQUAL(A& value, const unsigned int first, const unsigned int last, const T maxValue, const char* valueName) +
    if array elements are less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    -template<class A, class T>inline void clampArrayElementsBetweenRange(A& value, const unsigned int first, const unsigned int last, const T minValue, const T maxValue, const char* valueName) -
    if array elements are between or equal to minValue and maxValue do nothing - legal value, otherise clamp value to specified to range and return warning with valueName specifying which variable was clamped. +template<class A, class T>inline void clampArrayElementsBetweenRange(A& value, const unsigned int first, const unsigned int last, const T minValue, const T maxValue, const char* valueName) +
    if array elements are between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    -template<class A, class T>inline void clampArray3GEQUAL(A& value, const T minValue, const char* valueName) -
    if array4 elements are greater than or equal to minValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped +template<class A, class T>inline void clampArray3GEQUAL(A& value, const T minValue, const char* valueName) +
    if array4 elements are greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    -template<class A, class T>inline void clampArray3LEQUAL(A& value, const T maxValue, const char* valueName) -
    if array4 elements are is less than or equal to maxValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped +template<class A, class T>inline void clampArray3LEQUAL(A& value, const T maxValue, const char* valueName) +
    if array4 elements are is less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    -template<class A, class T>inline void clampArray3BetweenRange(A& value, const T minValue, const T maxValue, const char* valueName) -
    if array4 elements are between or equal to minValue and maxValue do nothing - legal value, otherise clamp value to specified to range and return warning with valueName specifying which variable was clamped. +template<class A, class T>inline void clampArray3BetweenRange(A& value, const T minValue, const T maxValue, const char* valueName) +
    if array4 elements are between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    -template<class A, class T>inline void clampArray4GEQUAL(A& value, const T minValue, const char* valueName) -
    if array4 elements are greater than or equal to minValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped +template<class A, class T>inline void clampArray4GEQUAL(A& value, const T minValue, const char* valueName) +
    if array4 elements are greater than or equal to minValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    -template<class A, class T>inline void clampArray4LEQUAL(A& value, const unsigned int first, const unsigned int last, const T maxValue, const char* valueName) -
    if array4 elements are is less than or equal to maxValue do nothing - legal value, otherise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped +template<class A, class T>inline void clampArray4LEQUAL(A& value, const unsigned int first, const unsigned int last, const T maxValue, const char* valueName) +
    if array4 elements are is less than or equal to maxValue do nothing - legal value, otherwise clamp value to specified maximum value and return warning with valueName specifying which variable was clamped
    -template<class A, class T>inline void clampArray4BetweenRange(A& value, const T minValue, const T maxValue, const char* valueName) -
    if array4 elements are between or equal to minValue and maxValue do nothing - legal value, otherise clamp value to specified to range and return warning with valueName specifying which variable was clamped. +template<class A, class T>inline void clampArray4BetweenRange(A& value, const T minValue, const T maxValue, const char* valueName) +
    if array4 elements are between or equal to minValue and maxValue do nothing - legal value, otherwise clamp value to specified to range and return warning with valueName specifying which variable was clamped.
    class SG_EXPORT Camera: public osg::Referenced
    Camera class for encapsulating the view position and orientation and projection (lens) used.
    class SG_EXPORT ClippingVolume -
    A ClippingVolume class for represecting convex clipping volumes made up +
    A ClippingVolume class for representing convex clipping volumes made up
    class SG_EXPORT ClipPlane: public StateAttribute
    ClipPlane state class which encapsulates OpenGL glClipPlane() functionality
    class SG_EXPORT ColorMask: public StateAttribute -
    Encapsulte OpenGL glColorMaskFunc/Op/Mask functions +
    Encapsulate OpenGL glColorMaskFunc/Op/Mask functions +
    +class SG_EXPORT ColorMatrix: public StateAttribute +
    Texture Matrix state class for encapsulating OpenGL texture matrix functionality
    class SG_EXPORT CullFace: public StateAttribute
    Class to globally enable/disable OpenGL's polygon culling mode=
    class SG_EXPORT Depth: public StateAttribute -
    Encapsulte OpenGL glDepthFunc/Mask/Range functions +
    Encapsulate OpenGL glDepthFunc/Mask/Range functions +
    +class SG_EXPORT DisplaySettings: public osg::Referenced +
    DisplaySettings class for encapsulating what visuals are required and have been set up, and the status of stereo viewing +
    +[more]#define USE_SEPERATE_COMPILE_AND_EXECUTE
    class SG_EXPORT Drawable: public Object -
    Pure virtual base class for drawable Geomtery. +
    Pure virtual base class for drawable Geometry. +
    +class SG_EXPORT EarthSky: public Group +
    EarthSky is a Group node which controls the clearing of the color and depth buffers at the start of each frame.
    class SG_EXPORT Fog: public StateAttribute
    Fog - encapsulates OpenGL fog state. @@ -104,7 +115,7 @@ class SG_EXPORT Geode: public GeoSet: public Drawable
    Encapsulates OpenGL drawing primitives, geometry and optional binding of normal, color and texture coordinates.
    -template<class T> void for_each_triangle(GeoSet& gset, T& op) +template<class T> void for_each_triangle(GeoSet& gset, T& op)
    Template function for iterating through a GeoSet operating on triangles with templated functor.
    SG_EXPORT extern const bool isGLExtensionSupported(const char* extension) @@ -122,7 +133,7 @@ class SG_EXPORT Image: public Geode* createGeodeForImage(Image* image)
    Convenience function to be used by images loaders to generate a valid geode to return for readNode().
    -SG_EXPORT extern Geode* createGeodeForImage(Image* image, const float s, const float t) +SG_EXPORT extern Geode* createGeodeForImage(Image* image, const float s, const float t)
    Convenience function to be used by images loaders to generate a valid geode to return for readNode().
    class SG_EXPORT Impostor: public LOD @@ -141,7 +152,10 @@ class SG_EXPORT LightSource: public <
    Leaf Node for defining a light in the scene
    class SG_EXPORT LineSegment: public Referenced -
    LineSegmentment class for representing a line segment +
    LineSegment class for representing a line segment +
    +class SG_EXPORT LineWidth: public StateAttribute +
    LineWidth - encapsulates the OpenGL glLineWidth for setting the width of lines in pixels
    class SG_EXPORT LOD: public Group
    LOD - Level Of Detail group node which allows switching between children depending on distance from eye point. @@ -149,18 +163,34 @@ class SG_EXPORT LOD: public Material: public StateAttribute
    Material - encapsulates OpenGL glMaterial state
    +[more]inline double inDegrees(double angle) +
    +[more]inline double inRadians(double angle) +
    +[more]inline double DegreesToRadians(double angle) +
    +[more]inline double RadiansToDegrees(double angle) +
    +[more]inline bool isNaN(float v) +
    +[more]inline bool isNaN(double v) +
    +[more]inline bool isInfinite(float v) +
    +[more]inline bool isInfinite(double v) +
    class SG_EXPORT Matrix: public Object
    -[more]inline Vec3 operator* (const Vec3& v, const Matrix& m ) +[more]inline Vec3 operator* (const Vec3& v, const Matrix& m )
    -[more]inline Vec4 operator* (const Vec4& v, const Matrix& m ) +[more]inline Vec4 operator* (const Vec4& v, const Matrix& m )
    -[more]inline ostream& operator<< (ostream& os, const Matrix& m ) +[more]inline std::ostream& operator<< (std::ostream& os, const Matrix& m )
    class SG_EXPORT MemoryAdapter: public Referenced
    Class for adapting the memory management of external data.
    -template<class T> class mem_ptr +template<class T> class mem_ptr
    Smart pointer for handling memory pointers via associated memory adapter
    #define META_Node(name) @@ -175,7 +205,7 @@ class SG_EXPORT NodeVisitor: public <
    Visitor for type safe operations on osg::Node's.
    struct NodeAcceptOp -
    Convinience functor for assisting visiting of arrays of osg::Node's +
    Convenience functor for assisting visiting of arrays of osg::Node's
    enum NotifySeverity
    Range of notify levels from DEBUG_FP through to FATAL, ALWAYS is reserved for forcing the absorption of all messages. @@ -183,6 +213,12 @@ enum NotifySeverity SG_EXPORT extern NotifySeverity g_NotifyLevel
    global notify level.
    +SG_EXPORT extern std::ofstream* g_NotifyNulStream +
    global notify nul stream. +
    +SG_EXPORT extern bool g_NotifyInit +
    global notify nul stream. +
    SG_EXPORT extern void setNotifyLevel(NotifySeverity severity)
    set the notify level, overriding the default or value set by the environmental variable OSGNOTIFYLEVEL
    @@ -192,9 +228,11 @@ SG_EXPORT extern NotifySeverity initNotifyLevel()
    initialize notify level.
    -inline ostream& notify(const NotifySeverity severity=INFO) +inline std::ostream& notify(const NotifySeverity severity)
    notify messaging function for providing fatal through to verbose debugging messages.
    +[more]inline std::ostream& notify(void) +
    #define META_Object(name)
    META_Object macro define the standard clone, isSameKindAs and className methods.
    @@ -204,10 +242,10 @@ class SG_EXPORT Object: public Plane
    A plane class.
    -[more]inline ostream& operator << (ostream& output, const Plane& pl) +[more]inline std::ostream& operator << (std::ostream& output, const Plane& pl)
    class SG_EXPORT Point: public StateAttribute -
    Point - encapsulates the OpenGL point smmothing and size state +
    Point - encapsulates the OpenGL point smoothing and size state
    class SG_EXPORT PolygonMode: public StateAttribute
    Class to for setting OpenGL's polygon culling mode @@ -218,12 +256,12 @@ class SG_EXPORT PolygonOffset: public < class SG_EXPORT Quat
    A quaternion class.
    -[more]inline ostream& operator << (ostream& output, const Quat& vec) +[more]inline std::ostream& operator << (std::ostream& output, const Quat& vec)
    class SG_EXPORT Referenced
    Base class from providing referencing counted objects
    -template<class T> class ref_ptr +template<class T> class ref_ptr
    Smart pointer for handling referenced counted objects
    #define OSG_GL_DEBUG(message) @@ -242,13 +280,16 @@ class SG_EXPORT State: public StateAttribute: public Object -
    Base class for state attribues +
    Base class for state attribuets
    class SG_EXPORT StateSet: public Object
    Encapsulates OpenGL state modes and attributes.
    +class SG_EXPORT Statistics: public osg::Object +
    Statistics base class. +
    class SG_EXPORT Stencil: public StateAttribute -
    Encapsulte OpenGL glStencilFunc/Op/Mask functions +
    Encapsulate OpenGL glStencilFunc/Op/Mask functions
    class SG_EXPORT Switch: public Group
    Switch is a Group node which allows switching between children. @@ -268,39 +309,11 @@ class SG_EXPORT Texture: public Timer
    A high resolution, low latency time stamper
    -[more]pragmaoptimize("", on) (x)(".byte 0x0f, 0x31" : "=A" (x)) -
    class SG_EXPORT Transform: public Group
    Transform - is group which all children are transformed by the the Transform's osg::Matrix.
    class SG_EXPORT Transparency: public StateAttribute -
    Transparancy - encapsulates the OpenGL transparancy state -
    -[more]#define M_E -
    -[more]#define M_LOG2E -
    -[more]#define M_LOG10E -
    -[more]#define M_LN2 -
    -[more]#define M_LN10 -
    -[more]#define M_PI -
    -[more]#define M_PI_2 -
    -[more]#define M_PI_4 -
    -[more]#define M_1_PI -
    -[more]#define M_2_PI -
    -[more]#define M_2_SQRTPI -
    -[more]#define M_SQRT2 -
    -[more]#define M_SQRT1_2 +
    Transparency - encapsulates the OpenGL blend/transparency state
    class Vec2
    General purpose float pair, uses include representation of texture coordinates. @@ -308,7 +321,7 @@ class Vec2 class Vec3
    General purpose float triple for use as vertices, vectors and normals.
    -[more]inline ostream& operator << (ostream& output, const Vec3& vec) +[more]inline std::ostream& operator << (std::ostream& output, const Vec3& vec)
    class Vec4
    General purpose float quad, uses include representation of colour coordinates. @@ -323,85 +336,69 @@ class SG_EXPORT Viewport: public Documentation
    + + +
    o#define USE_SEPERATE_COMPILE_AND_EXECUTE +

    + + +

    oinline double inDegrees(double angle) +

    + + +

    oinline double inRadians(double angle) +

    + + +

    oinline double DegreesToRadians(double angle) +

    + + +

    oinline double RadiansToDegrees(double angle) +

    + + +

    oinline bool isNaN(float v) +

    + + +

    oinline bool isNaN(double v) +

    + + +

    oinline bool isInfinite(float v) +

    + + +

    oinline bool isInfinite(double v) +

    - +

    oinline Vec3 operator* (const Vec3& v, const Matrix& m )

    - +

    oinline Vec4 operator* (const Vec4& v, const Matrix& m )

    - -

    oinline ostream& operator<< (ostream& os, const Matrix& m ) + +
    oinline std::ostream& operator<< (std::ostream& os, const Matrix& m ) +

    + + +

    oinline std::ostream& notify(void)

    - -

    oinline ostream& operator << (ostream& output, const Plane& pl) + +
    oinline std::ostream& operator << (std::ostream& output, const Plane& pl)

    - -

    oinline ostream& operator << (ostream& output, const Quat& vec) -

    - - -

    opragmaoptimize("", on) (x)(".byte 0x0f, 0x31" : "=A" (x)) -

    - - -

    o#define M_E -

    - - -

    o#define M_LOG2E -

    - - -

    o#define M_LOG10E -

    - - -

    o#define M_LN2 -

    - - -

    o#define M_LN10 -

    - - -

    o#define M_PI -

    - - -

    o#define M_PI_2 -

    - - -

    o#define M_PI_4 -

    - - -

    o#define M_1_PI -

    - - -

    o#define M_2_PI -

    - - -

    o#define M_2_SQRTPI -

    - - -

    o#define M_SQRT2 -

    - - -

    o#define M_SQRT1_2 + +
    oinline std::ostream& operator << (std::ostream& output, const Quat& vec)

    - -

    oinline ostream& operator << (ostream& output, const Vec3& vec) + +
    oinline std::ostream& operator << (std::ostream& output, const Vec3& vec)

    Alphabetic index HTML hierarchy of classes or Java


    diff --git a/doc/doc++/osg/osgGetVersion.html b/doc/doc++/osg/osgGetVersion.html index 930299754..2aa3340f3 100644 --- a/doc/doc++/osg/osgGetVersion.html +++ b/doc/doc++/osg/osgGetVersion.html @@ -14,9 +14,9 @@

    Documentation

    getVersion_osg() returns the library version number. -Numbering conventon : osg_src-0.8-31 will return 0.8.31 from getVersion_osg. +Numbering convention : osg_src-0.8-31 will return 0.8.31 from getVersion_osg. -

    This C function can be also used to check for the existance of the OpenSceneGraph +

    This C function can be also used to check for the existence of the OpenSceneGraph library using autoconf and its m4 macro AC_CHECK_LIB.

    Here is the code to add to your configure.in: diff --git a/doc/doc++/osg/ref_ptr.html b/doc/doc++/osg/ref_ptr.html index be360c83a..4d7510f6d 100644 --- a/doc/doc++/osg/ref_ptr.html +++ b/doc/doc++/osg/ref_ptr.html @@ -7,51 +7,51 @@ -

    template<class T> class osg::ref_ptr

    Smart pointer for handling referenced counted objects
    +

    template<class T> class osg::ref_ptr

    Smart pointer for handling referenced counted objects

    Public Methods

    -[more] ref_ptr() +[more] ref_ptr()
    -[more] ref_ptr(T* t) +[more] ref_ptr(T* t)
    -[more] ref_ptr(const ref_ptr& rp) +[more] ref_ptr(const ref_ptr& rp)
    -[more] ~ref_ptr() +[more] ~ref_ptr()
    -[more]inline ref_ptr& operator = (const ref_ptr& rp) +[more]inline ref_ptr& operator = (const ref_ptr& rp)
    -[more]inline ref_ptr& operator = (T* ptr) +[more]inline ref_ptr& operator = (T* ptr)
    -[more]inline const bool operator == (const ref_ptr& rp) const +[more]inline const bool operator == (const ref_ptr& rp) const
    -[more]inline const bool operator == (const T* ptr) const +[more]inline const bool operator == (const T* ptr) const
    -[more]inline const bool operator != (const ref_ptr& rp) const +[more]inline const bool operator != (const ref_ptr& rp) const
    -[more]inline const bool operator != (const T* ptr) const +[more]inline const bool operator != (const T* ptr) const
    -[more]inline const bool operator < (const ref_ptr& rp) const +[more]inline const bool operator < (const ref_ptr& rp) const
    -[more]inline const bool operator < (const T* ptr) const +[more]inline const bool operator < (const T* ptr) const
    -[more]inline T& operator*() +[more]inline T& operator*()
    -[more]inline const T& operator*() const +[more]inline const T& operator*() const
    -[more]inline T* operator->() +[more]inline T* operator->()
    -[more]inline const T* operator->() const +[more]inline const T* operator->() const
    -[more]inline const bool operator!() const +[more]inline const bool operator!() const
    -[more]inline const bool valid() const +[more]inline const bool valid() const
    -[more]inline T* get() +[more]inline T* get()
    -[more]inline const T* get() const +[more]inline const T* get() const

    @@ -63,84 +63,84 @@
    - +
    o ref_ptr()

    - -

    o ref_ptr(T* t) + +
    o ref_ptr(T* t)

    - -

    o ref_ptr(const ref_ptr& rp) + +
    o ref_ptr(const ref_ptr& rp)

    - +

    o ~ref_ptr()

    - +

    oinline ref_ptr& operator = (const ref_ptr& rp)

    - -

    oinline ref_ptr& operator = (T* ptr) + +
    oinline ref_ptr& operator = (T* ptr)

    - +

    oinline const bool operator == (const ref_ptr& rp) const

    - -

    oinline const bool operator == (const T* ptr) const + +
    oinline const bool operator == (const T* ptr) const

    - +

    oinline const bool operator != (const ref_ptr& rp) const

    - -

    oinline const bool operator != (const T* ptr) const + +
    oinline const bool operator != (const T* ptr) const

    - +

    oinline const bool operator < (const ref_ptr& rp) const

    - -

    oinline const bool operator < (const T* ptr) const + +
    oinline const bool operator < (const T* ptr) const

    - -

    oinline T& operator*() + +
    oinline T& operator*()

    - -

    oinline const T& operator*() const + +
    oinline const T& operator*() const

    - -

    oinline T* operator->() + +
    oinline T* operator->()

    - -

    oinline const T* operator->() const + +
    oinline const T* operator->() const

    - +

    oinline const bool operator!() const

    - +

    oinline const bool valid() const

    - -

    oinline T* get() + +
    oinline T* get()

    - -

    oinline const T* get() const + +
    oinline const T* get() const

    This class has no child classes.
    diff --git a/doc/doc++/osgDB/DotOsgWrapper.html b/doc/doc++/osgDB/DotOsgWrapper.html index b7b7897c5..5787d103c 100644 --- a/doc/doc++/osgDB/DotOsgWrapper.html +++ b/doc/doc++/osgDB/DotOsgWrapper.html @@ -7,7 +7,7 @@ -

    class OSGDB_EXPORT osgDB::DotOsgWrapper

    Wrapper class for specifing read and write functions for extending the osg file format.
    +

    class OSGDB_EXPORT osgDB::DotOsgWrapper

    Wrapper class for specifying read and write functions for extending the osg file format.

    Inheritance:

    @@ -79,7 +79,7 @@

    Documentation

    -
    Wrapper class for specifing read and write functions for extending +
    Wrapper class for specifying read and write functions for extending the osg file format.
    diff --git a/doc/doc++/osgDB/FieldReader.html b/doc/doc++/osgDB/FieldReader.html index 96c0c6c65..13eaf66e4 100644 --- a/doc/doc++/osgDB/FieldReader.html +++ b/doc/doc++/osgDB/FieldReader.html @@ -20,7 +20,7 @@
    [more]virtual FieldReader& operator = (const FieldReader& ic)
    -[more]void attach(istream* input) +[more]void attach(std::istream* input)
    [more]void detach()
    @@ -31,7 +31,7 @@ [more]void ignoreField()
    [more]int getNoNestedBrackets() const -
    no of unmatched `{' encounterd so far in file +
    no of unmatched `{' encountered so far in file

    @@ -59,7 +59,7 @@

    -

    ovoid attach(istream* input) +
    ovoid attach(std::istream* input)

    @@ -80,7 +80,7 @@

    oint getNoNestedBrackets() const -
    no of unmatched `{' encounterd so far in file +
    no of unmatched `{' encountered so far in file

    • This class has no child classes.
    diff --git a/doc/doc++/osgDB/FieldReaderIterator.html b/doc/doc++/osgDB/FieldReaderIterator.html index 84a003725..49ae532b7 100644 --- a/doc/doc++/osgDB/FieldReaderIterator.html +++ b/doc/doc++/osgDB/FieldReaderIterator.html @@ -30,7 +30,7 @@
    [more]virtual FieldReaderIterator& operator = (const FieldReaderIterator& ic)
    -[more]void attach(istream* input) +[more]void attach(std::istream* input)
    [more]void detach()
    @@ -51,7 +51,7 @@ [more]FieldReaderIterator& operator += (int no)
    [more]void advanceOverCurrentFieldOrBlock() -
    increments the itetor of the next simple field or whole block if the current field[0] is an open bracket +
    increments the iterator of the next simple field or whole block if the current field[0] is an open bracket
    [more]void advanceToEndOfCurrentBlock()
    @@ -100,7 +100,7 @@

    -

    ovoid attach(istream* input) +
    ovoid attach(std::istream* input)

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

    ovoid advanceOverCurrentFieldOrBlock() -
    increments the itetor of the next simple field or +
    increments the iterator of the next simple field or whole block if the current field[0] is an open bracket

    diff --git a/doc/doc++/osgDB/HIER.html b/doc/doc++/osgDB/HIER.html index 50e4710b4..d16d19acd 100644 --- a/doc/doc++/osgDB/HIER.html +++ b/doc/doc++/osgDB/HIER.html @@ -17,11 +17,14 @@

  • osgDB::Input +
  • osgDB::ReaderWriter::Options
  • osgDB::Output +
  • osgDB::ReaderWriter::ReadResult
  • osgDB::ReaderWriter
  • osgDB::RegisterDotOsgWrapperProxy
  • osgDB::RegisterReaderWriterProxy -
  • osgDB::Registry +
  • osgDB::Registry +
  • osgDB::ReaderWriter::WriteResult

    Alphabetic index


    This page was generated with the help of DOC++. diff --git a/doc/doc++/osgDB/HIERjava.html b/doc/doc++/osgDB/HIERjava.html index 991dfae66..3e97ec1ba 100644 --- a/doc/doc++/osgDB/HIERjava.html +++ b/doc/doc++/osgDB/HIERjava.html @@ -44,7 +44,7 @@
    • - + @@ -57,6 +57,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/doc++/osgDB/Input.html b/doc/doc++/osgDB/Input.html index 2c1b8c6a8..e711aea5b 100644 --- a/doc/doc++/osgDB/Input.html +++ b/doc/doc++/osgDB/Input.html @@ -23,31 +23,31 @@

    Public Methods

    -[more] Input() +[more] Input()
    -[more]virtual ~Input() +[more]virtual ~Input()
    -[more]virtual osg::Object* readObjectOfType(const osg::Object& compObj) +[more]virtual osg::Object* readObjectOfType(const osg::Object& compObj)
    -[more]virtual osg::Object* readObject() +[more]virtual osg::Object* readObject()
    -[more]virtual osg::Image* readImage() +[more]virtual osg::Image* readImage()
    -[more]virtual osg::Drawable* readDrawable() +[more]virtual osg::Drawable* readDrawable()
    -[more]virtual osg::StateAttribute* readStateAttribute() +[more]virtual osg::StateAttribute* readStateAttribute()
    -[more]virtual osg::Node* readNode() +[more]virtual osg::Node* readNode()
    -[more]virtual osg::Object* readObject(const std::string& fileName) +[more]virtual osg::Object* readObject(const std::string& fileName)
    -[more]virtual osg::Image* readImage(const std::string& fileName) +[more]virtual osg::Image* readImage(const std::string& fileName)
    -[more]virtual osg::Node* readNode(const std::string& fileName) +[more]virtual osg::Node* readNode(const std::string& fileName)
    -[more]virtual osg::Object* getObjectForUniqueID(const std::string& uniqueID) +[more]virtual osg::Object* getObjectForUniqueID(const std::string& uniqueID)
    -[more]virtual void regisiterUniqueIDForObject(const std::string& uniqueID, osg::Object* obj) +[more]virtual void regisiterUniqueIDForObject(const std::string& uniqueID, osg::Object* obj)

    @@ -57,7 +57,7 @@

    Public Methods

    ovirtual FieldReaderIterator& operator = (const FieldReaderIterator& ic)
    -ovoid attach(istream* input) +ovoid attach(std::istream* input)
    ovoid detach()
    @@ -100,55 +100,55 @@
    - +
    o Input()

    - +

    ovirtual ~Input()

    - +

    ovirtual osg::Object* readObjectOfType(const osg::Object& compObj)

    - +

    ovirtual osg::Object* readObject()

    - +

    ovirtual osg::Image* readImage()

    - +

    ovirtual osg::Drawable* readDrawable()

    - +

    ovirtual osg::StateAttribute* readStateAttribute()

    - +

    ovirtual osg::Node* readNode()

    - +

    ovirtual osg::Object* readObject(const std::string& fileName)

    - +

    ovirtual osg::Image* readImage(const std::string& fileName)

    - +

    ovirtual osg::Node* readNode(const std::string& fileName)

    - +

    ovirtual osg::Object* getObjectForUniqueID(const std::string& uniqueID)

    - +

    ovirtual void regisiterUniqueIDForObject(const std::string& uniqueID, osg::Object* obj)

    diff --git a/doc/doc++/osgDB/Output.html b/doc/doc++/osgDB/Output.html index 67bda34c8..cb947e303 100644 --- a/doc/doc++/osgDB/Output.html +++ b/doc/doc++/osgDB/Output.html @@ -12,7 +12,7 @@

    Inheritance:

    - + @@ -23,79 +23,79 @@

    Public Methods

    -[more] Output() +[more] Output()
    -[more] Output(const char* name) +[more] Output(const char* name)
    -[more]virtual ~Output() +[more]virtual ~Output()
    -[more]void open(const char* name) +[more]void open(const char* name)
    -[more]void open(const char* name, int mode) +[more]void open(const char* name, int mode)
    -[more]Output& indent() +[more]Output& indent()
    -[more]inline const int getIndentStep() const +[more]inline const int getIndentStep() const
    -[more]inline void setIndentStep(int step) +[more]inline void setIndentStep(int step)
    -[more]inline const int getIndent() const +[more]inline const int getIndent() const
    -[more]inline void setIndent(int indent) +[more]inline void setIndent(int indent)
    -[more]inline const int getNumIndicesPerLine() const +[more]inline const int getNumIndicesPerLine() const
    -[more]inline void setNumIndicesPerLine(int num) +[more]inline void setNumIndicesPerLine(int num)
    -[more]void moveIn() +[more]void moveIn()
    -[more]void moveOut() +[more]void moveOut()
    -[more]virtual bool writeObject(const osg::Object& obj) +[more]virtual bool writeObject(const osg::Object& obj)
    -[more]bool getUniqueIDForObject(const osg::Object* obj, std::string& uniqueID) +[more]bool getUniqueIDForObject(const osg::Object* obj, std::string& uniqueID)
    -[more]bool createUniqueIDForObject(const osg::Object* obj, std::string& uniqueID) +[more]bool createUniqueIDForObject(const osg::Object* obj, std::string& uniqueID)
    -[more]bool registerUniqueIDForObject(const osg::Object* obj, std::string& uniqueID) +[more]bool registerUniqueIDForObject(const osg::Object* obj, std::string& uniqueID)
    -[more]inline void setPathNameHint(const PathNameHint pnh) +[more]inline void setPathNameHint(const PathNameHint pnh)
    -[more]inline const PathNameHint getPathNameHint() const +[more]inline const PathNameHint getPathNameHint() const
    -[more]virtual const std::string getFileNameForOutput(const std::string& filename) const +[more]virtual const std::string getFileNameForOutput(const std::string& filename) const

    Public Members

    -[more]enum PathNameHint +[more]enum PathNameHint

    Protected Fields

    -[more]int _indent +[more]int _indent
    -[more]int _indentStep +[more]int _indentStep
    -[more]int _numIndicesPerLine +[more]int _numIndicesPerLine
    -[more]std::string _filename +[more]std::string _filename
    -[more]PathNameHint _pathNameHint +[more]PathNameHint _pathNameHint

    Protected Methods

    -[more] Output(const Output&) +[more] Output(const Output&)
    -[more]Output& operator = (const Output&) +[more]Output& operator = (const Output&)
    -[more]virtual void init() +[more]virtual void init()

    Protected Members

    -[more]typedef std::map<const osg::Object*,std::string> UniqueIDToLabelMapping UniqueIDToLabelMapping _objectToUniqueIDMap +[more]typedef std::map<const osg::Object*,std::string> UniqueIDToLabelMapping UniqueIDToLabelMapping _objectToUniqueIDMap

    @@ -108,146 +108,146 @@ Used in output of .osg ASCII files to improve their readability.
    - +
    o Output()

    - +

    o Output(const char* name)

    - +

    ovirtual ~Output()

    - +

    ovoid open(const char* name)

    - +

    ovoid open(const char* name, int mode)

    - +

    oOutput& indent()

    - +

    oinline const int getIndentStep() const

    - +

    oinline void setIndentStep(int step)

    - +

    oinline const int getIndent() const

    - -

    oinline void setIndent(int indent) + +
    oinline void setIndent(int indent)

    - +

    oinline const int getNumIndicesPerLine() const

    - +

    oinline void setNumIndicesPerLine(int num)

    - +

    ovoid moveIn()

    - +

    ovoid moveOut()

    - +

    ovirtual bool writeObject(const osg::Object& obj)

    - +

    obool getUniqueIDForObject(const osg::Object* obj, std::string& uniqueID)

    - +

    obool createUniqueIDForObject(const osg::Object* obj, std::string& uniqueID)

    - +

    obool registerUniqueIDForObject(const osg::Object* obj, std::string& uniqueID)

    - +

    oenum PathNameHint

    - +
    o AS_IS

    - +

    o FULL_PATH

    - +

    o RELATIVE_PATH

    - +

    o FILENAME_ONLY

    - -
    oinline void setPathNameHint(const PathNameHint pnh) + +
    oinline void setPathNameHint(const PathNameHint pnh)

    - -

    oinline const PathNameHint getPathNameHint() const + +
    oinline const PathNameHint getPathNameHint() const

    - +

    ovirtual const std::string getFileNameForOutput(const std::string& filename) const

    - -

    o Output(const Output&) + +
    o Output(const Output&)

    - +

    oOutput& operator = (const Output&)

    - +

    ovirtual void init()

    - +

    oint _indent

    - +

    oint _indentStep

    - +

    oint _numIndicesPerLine

    - +

    otypedef std::map<const osg::Object*,std::string> UniqueIDToLabelMapping UniqueIDToLabelMapping _objectToUniqueIDMap

    - +

    ostd::string _filename

    - -

    oPathNameHint _pathNameHint + +
    oPathNameHint _pathNameHint

    This class has no child classes.
    diff --git a/doc/doc++/osgDB/ReaderWriter.html b/doc/doc++/osgDB/ReaderWriter.html index 93779a0cf..5fd74ac6b 100644 --- a/doc/doc++/osgDB/ReaderWriter.html +++ b/doc/doc++/osgDB/ReaderWriter.html @@ -23,23 +23,32 @@

    Public Methods

    -[more]virtual ~ReaderWriter() +[more]virtual ~ReaderWriter()
    -[more]virtual const char* className() = 0 +[more]virtual const char* className() = 0
    -[more]virtual bool acceptsExtension(const std::string&xtension*/) +[more]virtual bool acceptsExtension(const std::string&xtension*/)
    -[more]virtual osg::Object* readObject(const std::string& ) +[more]virtual ReadResult readObject(const std::string& , const Options* =NULL)
    -[more]virtual osg::Image* readImage(const std::string& ) +[more]virtual ReadResult readImage(const std::string& , const Options* =NULL)
    -[more]virtual osg::Node* readNode(const std::string& ) +[more]virtual ReadResult readNode(const std::string& , const Options* =NULL)
    -[more]virtual bool writeObject(const osg::Object& , const std::string& ) +[more]virtual WriteResult writeObject(const osg::Object& , const std::string& , const Options* =NULL)
    -[more]virtual bool writeImage(const osg::Image& , const std::string& ) +[more]virtual WriteResult writeImage(const osg::Image& , const std::string& , const Options* =NULL)
    -[more]virtual bool writeNode(const osg::Node& , const std::string& ) +[more]virtual WriteResult writeNode(const osg::Node& , const std::string& , const Options* =NULL) +

    + +

    +

    Public Members

    +class Options: public osg::Referenced +
    +class ReadResult +
    +class WriteResult

    @@ -51,40 +60,40 @@
    - +
    ovirtual ~ReaderWriter()

    - +

    ovirtual const char* className() = 0

    - +

    ovirtual bool acceptsExtension(const std::string&xtension*/)

    - -

    ovirtual osg::Object* readObject(const std::string& ) + +
    ovirtual ReadResult readObject(const std::string& , const Options* =NULL)

    - -

    ovirtual osg::Image* readImage(const std::string& ) + +
    ovirtual ReadResult readImage(const std::string& , const Options* =NULL)

    - -

    ovirtual osg::Node* readNode(const std::string& ) + +
    ovirtual ReadResult readNode(const std::string& , const Options* =NULL)

    - -

    ovirtual bool writeObject(const osg::Object& , const std::string& ) + +
    ovirtual WriteResult writeObject(const osg::Object& , const std::string& , const Options* =NULL)

    - -

    ovirtual bool writeImage(const osg::Image& , const std::string& ) + +
    ovirtual WriteResult writeImage(const osg::Image& , const std::string& , const Options* =NULL)

    - -

    ovirtual bool writeNode(const osg::Node& , const std::string& ) + +
    ovirtual WriteResult writeNode(const osg::Node& , const std::string& , const Options* =NULL)

    This class has no child classes.
    diff --git a/doc/doc++/osgDB/RegisterDotOsgWrapperProxy.html b/doc/doc++/osgDB/RegisterDotOsgWrapperProxy.html index d8f2645a5..f55baf75d 100644 --- a/doc/doc++/osgDB/RegisterDotOsgWrapperProxy.html +++ b/doc/doc++/osgDB/RegisterDotOsgWrapperProxy.html @@ -13,14 +13,14 @@

    Public Methods

    -[more] RegisterDotOsgWrapperProxy(osg::Object* proto, const std::string& name, const std::string& associates, DotOsgWrapper::ReadFunc readFunc, DotOsgWrapper::WriteFunc writeFunc, DotOsgWrapper::ReadWriteMode readWriteMode=DotOsgWrapper::READ_AND_WRITE) +[more] RegisterDotOsgWrapperProxy(osg::Object* proto, const std::string& name, const std::string& associates, DotOsgWrapper::ReadFunc readFunc, DotOsgWrapper::WriteFunc writeFunc, DotOsgWrapper::ReadWriteMode readWriteMode=DotOsgWrapper::READ_AND_WRITE)
    -[more] ~RegisterDotOsgWrapperProxy() +[more] ~RegisterDotOsgWrapperProxy()

    Protected Fields

    -[more]osg::ref_ptr<DotOsgWrapper> _wrapper +[more]osg::ref_ptr<DotOsgWrapper> _wrapper

    @@ -32,15 +32,15 @@
    - +
    o RegisterDotOsgWrapperProxy(osg::Object* proto, const std::string& name, const std::string& associates, DotOsgWrapper::ReadFunc readFunc, DotOsgWrapper::WriteFunc writeFunc, DotOsgWrapper::ReadWriteMode readWriteMode=DotOsgWrapper::READ_AND_WRITE)

    - +

    o ~RegisterDotOsgWrapperProxy()

    - +

    oosg::ref_ptr<DotOsgWrapper> _wrapper

    diff --git a/doc/doc++/osgDB/RegisterReaderWriterProxy.html b/doc/doc++/osgDB/RegisterReaderWriterProxy.html index e82c7bd1e..ef160110b 100644 --- a/doc/doc++/osgDB/RegisterReaderWriterProxy.html +++ b/doc/doc++/osgDB/RegisterReaderWriterProxy.html @@ -13,14 +13,14 @@

    Public Methods

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

    Protected Fields

    -[more]osg::ref_ptr<T> _rw +[more]osg::ref_ptr<T> _rw

    @@ -32,15 +32,15 @@
    - +
    o RegisterReaderWriterProxy()

    - +

    o ~RegisterReaderWriterProxy()

    - +

    oosg::ref_ptr<T> _rw

    diff --git a/doc/doc++/osgDB/Registry.html b/doc/doc++/osgDB/Registry.html index b96be6d9c..924a27b6d 100644 --- a/doc/doc++/osgDB/Registry.html +++ b/doc/doc++/osgDB/Registry.html @@ -7,68 +7,77 @@ -

    class OSGDB_EXPORT osgDB::Registry

    Registry is a singleton factory which stores the Objects types available at runtime for loading, and any Object reader or writers which are linked in at runtime for reading non-native file formats.
    +

    class OSGDB_EXPORT osgDB::Registry

    Registry is a singleton factory which stores the reader/writers which are linked in at runtime for reading non-native file formats.

    Public Methods

    -[more] ~Registry() +[more] ~Registry()
    -[more]static Registry* instance() +[more]static Registry* instance()
    -[more]void addFileExtensionAlias(const std::string mapExt, const std::string toExt) +[more]void readCommandLine(std::vector<std::string>& commandLine) +
    read the command line string list, removing any matched control sequences +
    +[more]void addFileExtensionAlias(const std::string mapExt, const std::string toExt)
    register an fileextension alias to mapExt toExt, the later should the the extension name of the readerwriter plugin library.
    -[more]void addDotOsgWrapper(DotOsgWrapper* wrapper) +[more]void addDotOsgWrapper(DotOsgWrapper* wrapper)
    -[more]void removeDotOsgWrapper(DotOsgWrapper* wrapper) +[more]void removeDotOsgWrapper(DotOsgWrapper* wrapper)
    -[more]void addReaderWriter(ReaderWriter* rw) +[more]void addReaderWriter(ReaderWriter* rw)
    -[more]void removeReaderWriter(ReaderWriter* rw) +[more]void removeReaderWriter(ReaderWriter* rw)
    -[more]std::string createLibraryNameForFile(const std::string& fileName) +[more]std::string createLibraryNameForFile(const std::string& fileName)
    create the platform specific library name associated with file
    -[more]std::string createLibraryNameForExt(const std::string& ext) +[more]std::string createLibraryNameForExt(const std::string& ext)
    create the platform specific library name associated with file extension
    -[more]bool loadLibrary(const std::string& fileName) +[more]bool loadLibrary(const std::string& fileName)
    find the library in the SG_LIBRARY_PATH and load it
    -[more]bool closeLibrary(const std::string& fileName) +[more]bool closeLibrary(const std::string& fileName)
    close the attached library with specified name
    -[more]osg::Object* readObjectOfType(const osg::Object& compObj, Input& fr) +[more]osg::Object* readObjectOfType(const osg::Object& compObj, Input& fr)
    -[more]osg::Object* readObject(Input& fr) +[more]osg::Object* readObject(Input& fr)
    -[more]osg::Image* readImage(Input& fr) +[more]osg::Image* readImage(Input& fr)
    -[more]osg::Drawable* readDrawable(Input& fr) +[more]osg::Drawable* readDrawable(Input& fr)
    -[more]osg::StateAttribute* readStateAttribute(Input& fr) +[more]osg::StateAttribute* readStateAttribute(Input& fr)
    -[more]osg::Node* readNode(Input& fr) +[more]osg::Node* readNode(Input& fr)
    -[more]bool writeObject(const osg::Object& obj, Output& fw) +[more]bool writeObject(const osg::Object& obj, Output& fw)
    -[more]osg::Object* readObject(const std::string& fileName) +[more]ReaderWriter::ReadResult readObject(const std::string& fileName)
    -[more]bool writeObject(const osg::Object& obj, const std::string& fileName) +[more]ReaderWriter::WriteResult writeObject(const osg::Object& obj, const std::string& fileName)
    -[more]osg::Image* readImage(const std::string& fileName) +[more]ReaderWriter::ReadResult readImage(const std::string& fileName)
    -[more]bool writeImage(const osg::Image& obj, const std::string& fileName) +[more]ReaderWriter::WriteResult writeImage(const osg::Image& obj, const std::string& fileName)
    -[more]osg::Node* readNode(const std::string& fileName) +[more]ReaderWriter::ReadResult readNode(const std::string& fileName)
    -[more]bool writeNode(const osg::Node& node, const std::string& fileName) +[more]ReaderWriter::WriteResult writeNode(const osg::Node& node, const std::string& fileName)
    -[more]void setCreateNodeFromImage(bool flag) +[more]void setCreateNodeFromImage(bool flag)
    -[more]bool getCreateNodeFromImage() const +[more]bool getCreateNodeFromImage() const +
    +[more]void setOptions(ReaderWriter::Options* opt) +
    +[more]ReaderWriter::Options* getOptions() +
    +[more]const ReaderWriter::Options* getOptions() const

    @@ -78,27 +87,32 @@

    Documentation

    Registry is a singleton factory which stores -the Objects types available at runtime for loading, -and any Object reader or writers which are linked in +the reader/writers which are linked in at runtime for reading non-native file formats. -

    The RegisterObjectProxy can be used to automatically register -at runtime a Object with the Registry. +

    The RegisterDotOsgWrapperProxy can be used to automatically register +DotOsgWrappers, at runtime with the Registry. A DotOsgWrapper encapsulates +the functions that can read and write to the .osg for each osg::Object.

    The RegisterReaderWriterProxy can be used to automatically register at runtime a reader/writer with the Registry.

    - +
    o ~Registry()

    - +

    ostatic Registry* instance()

    + + +

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

    - +

    ovoid addFileExtensionAlias(const std::string mapExt, const std::string toExt)
    register an fileextension alias to mapExt toExt, the later should the the extension name of the readerwriter plugin library. @@ -107,100 +121,112 @@ addExtAlias("tif","tiff") which will enable .tif to be read by the libdb_tiff readerwriter plugin.

    - +

    ovoid addDotOsgWrapper(DotOsgWrapper* wrapper)

    - +

    ovoid removeDotOsgWrapper(DotOsgWrapper* wrapper)

    - +

    ovoid addReaderWriter(ReaderWriter* rw)

    - +

    ovoid removeReaderWriter(ReaderWriter* rw)

    - +

    ostd::string createLibraryNameForFile(const std::string& fileName)
    create the platform specific library name associated with file

    - +

    ostd::string createLibraryNameForExt(const std::string& ext)
    create the platform specific library name associated with file extension

    - +

    obool loadLibrary(const std::string& fileName)
    find the library in the SG_LIBRARY_PATH and load it

    - +

    obool closeLibrary(const std::string& fileName)
    close the attached library with specified name

    - +

    oosg::Object* readObjectOfType(const osg::Object& compObj, Input& fr)

    - +

    oosg::Object* readObject(Input& fr)

    - +

    oosg::Image* readImage(Input& fr)

    - +

    oosg::Drawable* readDrawable(Input& fr)

    - +

    oosg::StateAttribute* readStateAttribute(Input& fr)

    - +

    oosg::Node* readNode(Input& fr)

    - +

    obool writeObject(const osg::Object& obj, Output& fw)

    - -

    oosg::Object* readObject(const std::string& fileName) + +
    oReaderWriter::ReadResult readObject(const std::string& fileName)

    - -

    obool writeObject(const osg::Object& obj, const std::string& fileName) + +
    oReaderWriter::WriteResult writeObject(const osg::Object& obj, const std::string& fileName)

    - -

    oosg::Image* readImage(const std::string& fileName) + +
    oReaderWriter::ReadResult readImage(const std::string& fileName)

    - -

    obool writeImage(const osg::Image& obj, const std::string& fileName) + +
    oReaderWriter::WriteResult writeImage(const osg::Image& obj, const std::string& fileName)

    - -

    oosg::Node* readNode(const std::string& fileName) + +
    oReaderWriter::ReadResult readNode(const std::string& fileName)

    - -

    obool writeNode(const osg::Node& node, const std::string& fileName) + +
    oReaderWriter::WriteResult writeNode(const osg::Node& node, const std::string& fileName)

    - +

    ovoid setCreateNodeFromImage(bool flag)

    - +

    obool getCreateNodeFromImage() const +

    + + +

    ovoid setOptions(ReaderWriter::Options* opt) +

    + + +

    oReaderWriter::Options* getOptions() +

    + + +

    oconst ReaderWriter::Options* getOptions() const

    This class has no child classes.
    diff --git a/doc/doc++/osgDB/findFileInDirectory.html b/doc/doc++/osgDB/findFileInDirectory.html index 992cf5ef1..f4ded7e4a 100644 --- a/doc/doc++/osgDB/findFileInDirectory.html +++ b/doc/doc++/osgDB/findFileInDirectory.html @@ -14,7 +14,7 @@

    Documentation

    return the directory/filename of a file if its is contained within specified directory. return "" if directory does not contain file. If caseInsensitive is set to true then -a case insenstive comparision is used to compare fileName to directory contents. +a case insensitive comparison is used to compare fileName to directory contents. This is useful when unix programs attempt read case insentive windows filenames.

    Alphabetic index HTML hierarchy of classes or Java


    diff --git a/doc/doc++/osgDB/osgDB.html b/doc/doc++/osgDB/osgDB.html index d8f7a2b20..3f943ea4d 100644 --- a/doc/doc++/osgDB/osgDB.html +++ b/doc/doc++/osgDB/osgDB.html @@ -12,7 +12,7 @@

    class OSGDB_EXPORT DotOsgWrapper: public osg::Referenced -
    Wrapper class for specifing read and write functions for extending the osg file format. +
    Wrapper class for specifying read and write functions for extending the osg file format.
    class OSGDB_EXPORT DynamicLibrary: public osg::Referenced
    DynamicLibrary - encapsulates the loading and unloading of dynamic libraries, typically used for loading ReaderWriter plug-ins @@ -46,6 +46,9 @@ OSGDB_EXPORT extern void setFilePath( cons OSGDB_EXPORT extern const char* getFilePath()
    set the data file path
    +OSGDB_EXPORT extern char* findFileInPath( const char* _file, const char* filePath ) +
    find specified file if specified file path +
    OSGDB_EXPORT extern char* findFile( const char* file )
    find specified file on the set data file path
    @@ -64,10 +67,10 @@ OSGDB_EXPORT extern DirectoryContents < class OSGDB_EXPORT Input: public FieldReaderIterator
    Class for managing the reading of ASCII osg files
    -class OSGDB_EXPORT Output: public ofstream +class OSGDB_EXPORT Output: public std::ofstream
    ofstream wrapper class for adding support for indenting.
    -[more]template<class T> bool writeArrayBlock(Output& fw, T* start, T* finish) +[more]template<class T> bool writeArrayBlock(Output& fw, T* start, T* finish)
    class OSGDB_EXPORT ReaderWriter: public osg::Referenced
    pure virtual base class for reading and writing of non native formats. @@ -81,8 +84,14 @@ OSGDB_EXPORT extern osg::Image* readImageFilereadNodeFile(const std::string& filename)
    Read an osg::Node from file.
    +OSGDB_EXPORT extern osg::Node* readNodeFiles(std::vector<std::string>& commandLine) +
    Read an osg::Node subgraph from files, creating a osg::Group to contain the nodes if more than one subgraph has been loaded +
    class OSGDB_EXPORT Registry -
    Registry is a singleton factory which stores the Objects types available at runtime for loading, and any Object reader or writers which are linked in at runtime for reading non-native file formats. +
    Registry is a singleton factory which stores the reader/writers which are linked in at runtime for reading non-native file formats. +
    +inline void readCommandLine(std::vector<std::string>& commandLine) +
    read the command line string list into the osgDB::Registry(), removing any matched control sequences
    class RegisterDotOsgWrapperProxy
    Proxy class for automatic registration of DotOsgWrappers with the Registry @@ -135,7 +144,7 @@ OSGDB_EXPORT extern bool writeNodeFile(c
    oOSGDB_EXPORT extern bool equalCaseInsensitive(const std::string& lhs, const char* rhs)

    - +

    otemplate<class T> bool writeArrayBlock(Output& fw, T* start, T* finish)

    Alphabetic index HTML hierarchy of classes or Java

    diff --git a/doc/doc++/osgDB/osgDBGetVersion.html b/doc/doc++/osgDB/osgDBGetVersion.html index 1dc87438f..0ec277006 100644 --- a/doc/doc++/osgDB/osgDBGetVersion.html +++ b/doc/doc++/osgDB/osgDBGetVersion.html @@ -14,9 +14,9 @@

    Documentation

    osgDBGetVersion() returns the library version number. -Numbering conventon : osg_src-0.8.31 will return 0.8.31 from getVersion_osg. +Numbering convention : osg_src-0.8.31 will return 0.8.31 from getVersion_osg. -

    This C function can be also used to check for the existance of the OpenSceneGraph +

    This C function can be also used to check for the existence of the OpenSceneGraph library using autoconf and its m4 macro AC_CHECK_LIB.

    Here is the code to add to your configure.in: diff --git a/doc/doc++/osgDB/readImageFile.html b/doc/doc++/osgDB/readImageFile.html index 46fab13c5..76516e8d8 100644 --- a/doc/doc++/osgDB/readImageFile.html +++ b/doc/doc++/osgDB/readImageFile.html @@ -13,7 +13,7 @@

    Documentation

    Read an osg::Image from file. -Return valid osg::Image on sucess, +Return valid osg::Image on success, return NULL on failure. The osgDB::Registry is used to load the appropriate ReaderWriter plugin for the filename extension, and this plugin then handles the request diff --git a/doc/doc++/osgDB/readNodeFile.html b/doc/doc++/osgDB/readNodeFile.html index 60619cb26..0448e2d69 100644 --- a/doc/doc++/osgDB/readNodeFile.html +++ b/doc/doc++/osgDB/readNodeFile.html @@ -13,7 +13,7 @@

    Documentation

    Read an osg::Node from file. -Return valid osg::Node on sucess, +Return valid osg::Node on success, return NULL on failure. The osgDB::Registry is used to load the appropriate ReaderWriter plugin for the filename extension, and this plugin then handles the request diff --git a/doc/doc++/osgDB/readObjectFile.html b/doc/doc++/osgDB/readObjectFile.html index e4d6d165a..faed9b82e 100644 --- a/doc/doc++/osgDB/readObjectFile.html +++ b/doc/doc++/osgDB/readObjectFile.html @@ -13,7 +13,7 @@

    Documentation

    Read an osg::Object from file. -Return valid osg::Object on sucess, +Return valid osg::Object on success, return NULL on failure. The osgDB::Registry is used to load the appropriate ReaderWriter plugin for the filename extension, and this plugin then handles the request diff --git a/doc/doc++/osgDB/writeImageFile.html b/doc/doc++/osgDB/writeImageFile.html index e5e3308ea..3a896a523 100644 --- a/doc/doc++/osgDB/writeImageFile.html +++ b/doc/doc++/osgDB/writeImageFile.html @@ -13,7 +13,7 @@

    Documentation

    Write an osg::Image to file. -Return true on sucess, +Return true on success, return false on failure. The osgDB::Registry is used to load the appropriate ReaderWriter plugin for the filename extension, and this plugin then handles the request diff --git a/doc/doc++/osgDB/writeNodeFile.html b/doc/doc++/osgDB/writeNodeFile.html index ca20b6a19..d1126a123 100644 --- a/doc/doc++/osgDB/writeNodeFile.html +++ b/doc/doc++/osgDB/writeNodeFile.html @@ -13,7 +13,7 @@

    Documentation

    Write an osg::Node to file. -Return true on sucess, +Return true on success, return false on failure. The osgDB::Registry is used to load the appropriate ReaderWriter plugin for the filename extension, and this plugin then handles the request diff --git a/doc/doc++/osgDB/writeObjectFile.html b/doc/doc++/osgDB/writeObjectFile.html index bfa06b2d9..0d38b5230 100644 --- a/doc/doc++/osgDB/writeObjectFile.html +++ b/doc/doc++/osgDB/writeObjectFile.html @@ -13,7 +13,7 @@

    Documentation

    Write an osg::Object to file. -Return true on sucess, +Return true on success, return false on failure. The osgDB::Registry is used to load the appropriate ReaderWriter plugin for the filename extension, and this plugin then handles the request diff --git a/doc/doc++/osgGLUT/GLUTEventAdapter.html b/doc/doc++/osgGLUT/GLUTEventAdapter.html index 9e043caf7..3a05d4e63 100644 --- a/doc/doc++/osgGLUT/GLUTEventAdapter.html +++ b/doc/doc++/osgGLUT/GLUTEventAdapter.html @@ -23,107 +23,107 @@

    Public Methods

    -[more] GLUTEventAdapter() +[more] GLUTEventAdapter()
    -[more]virtual ~GLUTEventAdapter() +[more]virtual ~GLUTEventAdapter()
    -[more]virtual EventType getEventType() const +[more]virtual EventType getEventType() const
    Get the EventType of the GUI event
    -[more]virtual int getKey() const -
    key pressed, return -1 if inapropriate for this event. +[more]virtual int getKey() const +
    key pressed, return -1 if inappropriate for this event.
    -[more]virtual int getButton() const +[more]virtual int getButton() const
    button pressed/released, return -1 if inappropriate for this event
    -[more]virtual int getXmin() const +[more]virtual int getXmin() const
    window minimum x.
    -[more]virtual int getXmax() const +[more]virtual int getXmax() const
    window maximum x.
    -[more]virtual int getYmin() const +[more]virtual int getYmin() const
    window minimum y.
    -[more]virtual int getYmax() const +[more]virtual int getYmax() const
    window maximum y.
    -[more]virtual int getX() const +[more]virtual int getX() const
    current mouse x position
    -[more]virtual int getY() const +[more]virtual int getY() const
    current mouse y position
    -[more]virtual unsigned int getButtonMask() const +[more]virtual unsigned int getButtonMask() const
    current mouse button state
    -[more]virtual float time() const +[more]virtual float time() const
    time in seconds of event.
    -[more]static void setWindowSize(int Xmin, int Ymin, int Xmax, int Ymax) +[more]static void setWindowSize(int Xmin, int Ymin, int Xmax, int Ymax)
    static method for setting window dimensions
    -[more]static void setButtonMask(unsigned int buttonMask) +[more]static void setButtonMask(unsigned int buttonMask)
    static method for setting button state
    -[more]void adaptResize(float t, int Xmin, int Ymin, int Xmax, int Ymax) +[more]void adaptResize(float t, int Xmin, int Ymin, int Xmax, int Ymax)
    method for adapting resize events.
    -[more]void adaptMouseMotion(float t, int x, int y) +[more]void adaptMouseMotion(float t, int x, int y)
    method for adapting mouse motion events whilst mouse buttons are pressed
    -[more]void adaptMousePassiveMotion(float t, int x, int y) +[more]void adaptMousePassiveMotion(float t, int x, int y)
    method for adapting mouse motion events whilst no mouse button are pressed
    -[more]void adaptMouse(float t, int button, int state, int x, int y) +[more]void adaptMouse(float t, int button, int state, int x, int y)
    method for adapting mouse button pressed/released events
    -[more]void adaptKeyboard(float t, unsigned char key, int x, int y ) +[more]void adaptKeyboard(float t, unsigned char key, int x, int y )
    method for adapting keyboard events
    -[more]void adaptFrame(float t) +[more]void adaptFrame(float t)
    method for adapting frame events, ie.
    -[more]void copyStaticVariables() +[more]void copyStaticVariables()

    Protected Fields

    -[more]EventType _eventType +[more]EventType _eventType
    -[more]int _key +[more]int _key
    -[more]int _button +[more]int _button
    -[more]int _Xmin +[more]int _Xmin
    -[more]int _Xmax +[more]int _Xmax
    -[more]int _Ymin +[more]int _Ymin
    -[more]int _Ymax +[more]int _Ymax
    -[more]int _mx +[more]int _mx
    -[more]int _my +[more]int _my
    -[more]unsigned int _buttonMask +[more]unsigned int _buttonMask
    -[more]float _time +[more]float _time
    -[more]static unsigned int _s_accumulatedButtonMask +[more]static unsigned int _s_accumulatedButtonMask
    -[more]static int _s_Xmin +[more]static int _s_Xmin
    -[more]static int _s_Xmax +[more]static int _s_Xmax
    -[more]static int _s_Ymin +[more]static int _s_Ymin
    -[more]static int _s_Ymax +[more]static int _s_Ymax
    -[more]static int _s_mx +[more]static int _s_mx
    -[more]static int _s_my +[more]static int _s_my

    @@ -135,182 +135,182 @@
    - +
    o GLUTEventAdapter()

    - +

    ovirtual ~GLUTEventAdapter()

    - +

    ovirtual EventType getEventType() const
    Get the EventType of the GUI event

    - +

    ovirtual int getKey() const -
    key pressed, return -1 if inapropriate for this event. +
    key pressed, return -1 if inappropriate for this event.

    - +

    ovirtual int getButton() const
    button pressed/released, return -1 if inappropriate for this event

    - +

    ovirtual int getXmin() const
    window minimum x.

    - +

    ovirtual int getXmax() const
    window maximum x.

    - +

    ovirtual int getYmin() const
    window minimum y.

    - +

    ovirtual int getYmax() const
    window maximum y.

    - +

    ovirtual int getX() const
    current mouse x position

    - +

    ovirtual int getY() const
    current mouse y position

    - +

    ovirtual unsigned int getButtonMask() const
    current mouse button state

    - +

    ovirtual float time() const
    time in seconds of event.

    - +

    ostatic void setWindowSize(int Xmin, int Ymin, int Xmax, int Ymax)
    static method for setting window dimensions

    - +

    ostatic void setButtonMask(unsigned int buttonMask)
    static method for setting button state

    - +

    ovoid adaptResize(float t, int Xmin, int Ymin, int Xmax, int Ymax)
    method for adapting resize events.

    - +

    ovoid adaptMouseMotion(float t, int x, int y)
    method for adapting mouse motion events whilst mouse buttons are pressed

    - +

    ovoid adaptMousePassiveMotion(float t, int x, int y)
    method for adapting mouse motion events whilst no mouse button are pressed

    - +

    ovoid adaptMouse(float t, int button, int state, int x, int y)
    method for adapting mouse button pressed/released events

    - +

    ovoid adaptKeyboard(float t, unsigned char key, int x, int y )
    method for adapting keyboard events

    - +

    ovoid adaptFrame(float t) -
    method for adapting frame events, ie. iddle/display callback. +
    method for adapting frame events, ie. idle/display callback.

    - +

    ovoid copyStaticVariables()

    - +

    oEventType _eventType

    - +

    oint _key

    - +

    oint _button

    - +

    oint _Xmin

    - +

    oint _Xmax

    - +

    oint _Ymin

    - +

    oint _Ymax

    - +

    oint _mx

    - +

    oint _my

    - +

    ounsigned int _buttonMask

    - +

    ofloat _time

    - +

    ostatic unsigned int _s_accumulatedButtonMask

    - +

    ostatic int _s_Xmin

    - +

    ostatic int _s_Xmax

    - +

    ostatic int _s_Ymin

    - +

    ostatic int _s_Ymax

    - +

    ostatic int _s_mx

    - +

    ostatic int _s_my

    diff --git a/doc/doc++/osgGLUT/General.html b/doc/doc++/osgGLUT/General.html index 9eb92ecbc..76fab128d 100644 --- a/doc/doc++/osgGLUT/General.html +++ b/doc/doc++/osgGLUT/General.html @@ -22,6 +22,9 @@ o#define OSGGLUT_EXPORT
    +o#define +OSG_GL
    + o#define OSGGLUT_GLUTEVENTADAPTER
    @@ -29,7 +32,10 @@ OSGGLUT_VERSION
    o#define -OSGGLUT_VIEWER +OSGGLUT_VIEWER
    + +o#define +OSGGLUT_GLUTWINDOW

    Alphabetic index Hierarchy of classes


    This page was generated with the help of DOC++. diff --git a/doc/doc++/osgGLUT/HIER.html b/doc/doc++/osgGLUT/HIER.html index 2274d76ed..502df6a53 100644 --- a/doc/doc++/osgGLUT/HIER.html +++ b/doc/doc++/osgGLUT/HIER.html @@ -10,7 +10,10 @@

    Alphabetic index


    This page was generated with the help of DOC++. diff --git a/doc/doc++/osgGLUT/HIERjava.html b/doc/doc++/osgGLUT/HIERjava.html index e98c1bb73..0143e2a18 100644 --- a/doc/doc++/osgGLUT/HIERjava.html +++ b/doc/doc++/osgGLUT/HIERjava.html @@ -16,10 +16,10 @@
    - - - - + + + + diff --git a/doc/doc++/osgGLUT/Viewer.html b/doc/doc++/osgGLUT/Viewer.html index 23d945f88..f32501527 100644 --- a/doc/doc++/osgGLUT/Viewer.html +++ b/doc/doc++/osgGLUT/Viewer.html @@ -11,11 +11,11 @@

    Inheritance:

    - - - - - + + + + +
    @@ -23,183 +23,210 @@

    Public Methods

    -[more] Viewer() +[more] Viewer()
    -[more]virtual ~Viewer() +[more]virtual ~Viewer()
    -[more]void setWindowOrigin(int x, int y) -
    -[more]void setWindowSize(int width, int height) -
    -[more]void setWindowTitle(const std::string& title) -
    -[more]virtual void init(osg::Node* rootnode) +[more]virtual void init(osg::Node* rootnode)
    init is deprecated, you should use addViewport instead.
    -[more]virtual void addViewport(osgUtil::SceneView* sv, float x = 0.0, float y = 0.0, float width = 1.0, float height = 1.0) +[more]virtual void addViewport(osgUtil::SceneView* sv, float x = 0.0, float y = 0.0, float width = 1.0, float height = 1.0)
    -[more]virtual void addViewport(osg::Node*, float x = 0.0, float y = 0.0, float width = 1.0, float height = 1.0) +[more]virtual void addViewport(osg::Node*, float x = 0.0, float y = 0.0, float width = 1.0, float height = 1.0)
    -[more]const int getNumViewports() const +[more]const int getNumViewports() const
    -[more]osgUtil::SceneView* getViewportSceneView(unsigned int pos) +[more]osgUtil::SceneView* getViewportSceneView(unsigned int pos)
    -[more]virtual bool open() +[more]virtual bool open()
    -[more]virtual bool run() +[more]virtual bool run()
    -[more]virtual float app(unsigned int viewport) +[more]virtual float app(unsigned int viewport)
    -[more]virtual float cull(unsigned int viewport) +[more]virtual float cull(unsigned int viewport)
    -[more]virtual float draw(unsigned int viewport) +[more]virtual float draw(unsigned int viewport)
    -[more]long initClock() +[more]long initClock()
    -[more]double clockSeconds() +[more]double clockSeconds()
    -[more]osg::Timer_t updateFrameTick() +[more]osg::Timer_t updateFrameTick()
    -[more]double frameSeconds() +[more]double frameSeconds()
    -[more]double frameRate() +[more]double frameRate()
    -[more]void help(ostream& fout) +[more]void help(std::ostream& fout)
    -[more]unsigned int registerCameraManipulator(osgUtil::CameraManipulator* cm, unsigned int viewport = 0) +[more]unsigned int registerCameraManipulator(osgUtil::CameraManipulator* cm, unsigned int viewport = 0)
    -[more]void selectCameraManipulator(unsigned int pos, unsigned int viewport = 0) +[more]void selectCameraManipulator(unsigned int pos, unsigned int viewport = 0)
    -[more]virtual void requestRedraw() +[more]virtual void requestRedraw()
    -[more]virtual void requestContinuousUpdate(bool ) +[more]virtual void requestContinuousUpdate(bool )
    -[more]virtual void requestWarpPointer(int x, int y) +[more]virtual void requestWarpPointer(int x, int y) +
    +[more]void readCommandLine(std::vector<std::string>& commandLine) +
    read the command line string list, removing any matched control sequences

    Protected Fields

    -[more]static Viewer* s_theViewer +[more]static Viewer* s_theViewer
    -[more]unsigned int _focusedViewport +[more]unsigned int _focusedViewport
    -[more]std::string _saveFileName +[more]std::string _saveFileName
    -[more]std::string _title +[more]bool _viewFrustumCullingActive
    -[more]int wx +[more]bool _smallFeatureCullingActive
    -[more]int wy +[more]int mx
    -[more]int ww +[more]int my
    -[more]int wh +[more]int mbutton
    -[more]int _is_open +[more]int polymode
    -[more]unsigned int frame_rate +[more]int texture
    -[more]RTfs* fs +[more]int backface
    -[more]bool _viewFrustumCullingActive +[more]int lighting
    -[more]bool _smallFeatureCullingActive +[more]int flat_shade
    -[more]int mx +[more]int _two_sided_lighting
    -[more]int my +[more]bool fullscreen
    -[more]int mbutton +[more]int _saved_wx
    -[more]int polymode +[more]int _saved_wy
    -[more]int texture +[more]int _saved_ww
    -[more]int backface +[more]int _saved_wh
    -[more]int lighting +[more]float frRate
    -[more]int flat_shade +[more]int _printStats
    -[more]int _two_sided_lighting +[more]bool _useDisplayLists
    -[more]bool fullscreen +[more]osg::Timer _timer
    -[more]int _saved_wx +[more]osg::Timer_t _tickRatePerSecond
    -[more]int _saved_wy +[more]osg::Timer_t _initialTick
    -[more]int _saved_ww +[more]osg::Timer_t _lastFrameTick
    -[more]int _saved_wh +[more]osg::Timer_t _frameTick
    -[more]float frRate +[more]osg::ref_ptr<osg::FrameStamp> _frameStamp
    -[more]int _printStats -
    -[more]bool _useDisplayLists -
    -[more]osg::Timer _timer -
    -[more]osg::Timer_t _tickRatePerSecond -
    -[more]osg::Timer_t _initialTick -
    -[more]osg::Timer_t _lastFrameTick -
    -[more]osg::Timer_t _frameTick -
    -[more]osg::ref_ptr<osg::FrameStamp> _frameStamp +[more]osg::ref_ptr<osg::DisplaySettings> _displaySettings

    Protected Methods

    -[more]static void displayCB() +[more]virtual void display()
    -[more]static void reshapeCB(int w, int h) +[more]virtual void reshape(GLint w, GLint h)
    -[more]static void visibilityCB(int state) +[more]virtual void mouseMotion(int x, int y)
    -[more]static void mouseMotionCB(int x, int y) +[more]virtual void mousePassiveMotion(int x, int y)
    -[more]static void mousePassiveMotionCB(int x, int y) +[more]virtual void mouse(int button, int state, int x, int y)
    -[more]static void mouseCB(int button, int state, int x, int y) +[more]virtual void keyboard(unsigned char key, int x, int y)
    -[more]static void keyboardCB(unsigned char key, int x, int y ) +[more]void setFocusedViewport(unsigned int pos)
    -[more]virtual void display() +[more]int mapWindowXYToSceneView(int x, int y)
    -[more]virtual void reshape(GLint w, GLint h) +[more]void showStats(const unsigned int i)
    -[more]virtual void visibility(int state) +[more]osg::Timer_t clockTick()
    -[more]virtual void mouseMotion(int x, int y) -
    -[more]virtual void mousePassiveMotion(int x, int y) -
    -[more]virtual void mouse(int button, int state, int x, int y) -
    -[more]virtual void keyboard(unsigned char key, int x, int y) -
    -[more]void setFocusedViewport(unsigned int pos) -
    -[more]int mapWindowXYToSceneView(int x, int y) -
    -[more]void showStats(void) -
    -[more]osg::Timer_t clockTick() -
    -[more]osg::Timer_t frameTick() +[more]osg::Timer_t frameTick()

    Protected Members

    -[more]typedef std::vector<osg::ref_ptr<osgUtil::CameraManipulator> > CameraManipListstruct ViewportDef +[more]typedef std::vector<osg::ref_ptr<osgUtil::CameraManipulator> > CameraManipListstruct ViewportDef
    -[more]typedef std::vector<ViewportDef> ViewportList ViewportList _viewportList +[more]typedef std::vector<ViewportDef> ViewportList ViewportList _viewportList
    -[more]struct +[more]struct +

    + +
    +

    Inherited from Window:

    +
    +

    +

    Public Methods

    +ovoid setWindowOrigin(int x, int y) +
    +ovoid setWindowSize(int width, int height) +
    +ovoid setWindowTitle(const std::string& title) +
    +ovoid setDisplayMode(unsigned int displayMode) +

    + +

    +

    Protected Fields

    +ostatic Window* s_theWindow +
    +ostd::string _title +
    +oint _wx +
    +oint _wy +
    +oint _ww +
    +oint _wh +
    +ounsigned int _displayMode +
    +oint _is_open +
    +oint _mx +
    +oint _my +
    +oint _mbutton +
    +obool _fullscreen +

    + +

    +

    Protected Methods

    +ostatic void displayCB() +
    +ostatic void reshapeCB(int w, int h) +
    +ostatic void visibilityCB(int state) +
    +ostatic void mouseMotionCB(int x, int y) +
    +ostatic void mousePassiveMotionCB(int x, int y) +
    +ostatic void mouseCB(int button, int state, int x, int y) +
    +ostatic void keyboardCB(unsigned char key, int x, int y ) +
    +ovirtual void visibility(int state)

    @@ -209,388 +236,321 @@

    Documentation

    A basic viewer base class which provides a window, simple keyboard and mouse interaction. Please note, this viewer class has been developed via a rather haphazard -path and needs a total rewrite. It currently suffices for osg demo's +path and needs a total rewrite. It currently suffices for osg demos but shouldn't be viewed as the be all and end of osg viewer classes. Someone please rewrite it :-)
    - +
    o Viewer()

    - +

    ovirtual ~Viewer()

    - - -

    ovoid setWindowOrigin(int x, int y) -

    - - -

    ovoid setWindowSize(int width, int height) -

    - - -

    ovoid setWindowTitle(const std::string& title) -

    - +

    ovirtual void init(osg::Node* rootnode)
    init is deprecated, you should use addViewport instead. init is only available for backwards compatibility.

    - +

    ovirtual void addViewport(osgUtil::SceneView* sv, float x = 0.0, float y = 0.0, float width = 1.0, float height = 1.0)

    - +

    ovirtual void addViewport(osg::Node*, float x = 0.0, float y = 0.0, float width = 1.0, float height = 1.0)

    - +

    oconst int getNumViewports() const

    - +

    oosgUtil::SceneView* getViewportSceneView(unsigned int pos)

    - +

    ovirtual bool open()

    - +

    ovirtual bool run()

    - -

    ovirtual float app(unsigned int viewport) + +
    ovirtual float app(unsigned int viewport)

    - -

    ovirtual float cull(unsigned int viewport) + +
    ovirtual float cull(unsigned int viewport)

    - -

    ovirtual float draw(unsigned int viewport) + +
    ovirtual float draw(unsigned int viewport)

    - +

    olong initClock()

    - +

    odouble clockSeconds()

    - +

    oosg::Timer_t updateFrameTick()

    - +

    odouble frameSeconds()

    - +

    odouble frameRate()

    - -

    ovoid help(ostream& fout) + +
    ovoid help(std::ostream& fout)

    - -

    ounsigned int registerCameraManipulator(osgUtil::CameraManipulator* cm, unsigned int viewport = 0) + +
    ounsigned int registerCameraManipulator(osgUtil::CameraManipulator* cm, unsigned int viewport = 0)

    - -

    ovoid selectCameraManipulator(unsigned int pos, unsigned int viewport = 0) + +
    ovoid selectCameraManipulator(unsigned int pos, unsigned int viewport = 0)

    - +

    ovirtual void requestRedraw()

    - +

    ovirtual void requestContinuousUpdate(bool )

    - +

    ovirtual void requestWarpPointer(int x, int y)

    - - -

    ostatic void displayCB() -

    - - -

    ostatic void reshapeCB(int w, int h) -

    - - -

    ostatic void visibilityCB(int state) -

    - - -

    ostatic void mouseMotionCB(int x, int y) -

    - - -

    ostatic void mousePassiveMotionCB(int x, int y) -

    - - -

    ostatic void mouseCB(int button, int state, int x, int y) -

    - - -

    ostatic void keyboardCB(unsigned char key, int x, int y ) + + +
    ovoid readCommandLine(std::vector<std::string>& commandLine) +
    read the command line string list, removing any matched control sequences

    - +

    ovirtual void display()

    - +

    ovirtual void reshape(GLint w, GLint h)

    - - -

    ovirtual void visibility(int state) -

    - +

    ovirtual void mouseMotion(int x, int y)

    - +

    ovirtual void mousePassiveMotion(int x, int y)

    - +

    ovirtual void mouse(int button, int state, int x, int y)

    - +

    ovirtual void keyboard(unsigned char key, int x, int y)

    - +

    ovoid setFocusedViewport(unsigned int pos)

    - +

    oint mapWindowXYToSceneView(int x, int y)

    - -

    ovoid showStats(void) + +
    ovoid showStats(const unsigned int i)

    - +

    ostatic Viewer* s_theViewer

    - +

    otypedef std::vector<osg::ref_ptr<osgUtil::CameraManipulator> > CameraManipListstruct ViewportDef

    - +
    oosg::ref_ptr<osgUtil::SceneView> sceneView

    - +

    ofloat viewport[4]

    - +

    oosg::ref_ptr<osgUtil::CameraManipulator> _cameraManipulator

    - +

    oCameraManipList _cameraManipList

    - -
    otypedef std::vector<ViewportDef> ViewportList ViewportList _viewportList + +
    otypedef std::vector<ViewportDef> ViewportList ViewportList _viewportList

    - +

    ounsigned int _focusedViewport

    - +

    ostd::string _saveFileName

    - - -

    ostd::string _title -

    - - -

    oint wx -

    - - -

    oint wy -

    - - -

    oint ww -

    - - -

    oint wh -

    - - -

    oint _is_open -

    - - -

    ounsigned int frame_rate -

    - - -

    oRTfs* fs -

    - +

    obool _viewFrustumCullingActive

    - +

    obool _smallFeatureCullingActive

    - +

    oint mx

    - +

    oint my

    - +

    oint mbutton

    - +

    oint polymode

    - +

    oint texture

    - +

    oint backface

    - +

    oint lighting

    - +

    oint flat_shade

    - +

    oint _two_sided_lighting

    - +

    obool fullscreen

    - +

    oint _saved_wx

    - +

    oint _saved_wy

    - +

    oint _saved_ww

    - +

    oint _saved_wh

    - +

    ofloat frRate

    - +

    oint _printStats

    - +

    ostruct

    - +
    ofloat timeApp

    - +

    ofloat timeCull

    - +

    ofloat timeDraw

    - +

    ofloat timeFrame

    - +

    oosg::Timer_t frameend

    - +
    obool _useDisplayLists

    - +

    oosg::Timer _timer

    - +

    oosg::Timer_t _tickRatePerSecond

    - +

    oosg::Timer_t _initialTick

    - +

    oosg::Timer_t _lastFrameTick

    - +

    oosg::Timer_t _frameTick

    - +

    oosg::Timer_t clockTick()

    - +

    oosg::Timer_t frameTick()

    - +

    oosg::ref_ptr<osg::FrameStamp> _frameStamp +

    + + +

    oosg::ref_ptr<osg::DisplaySettings> _displaySettings

    This class has no child classes.
    diff --git a/doc/doc++/osgGLUT/index.html b/doc/doc++/osgGLUT/index.html index 922b4a30c..1343f6fd5 100644 --- a/doc/doc++/osgGLUT/index.html +++ b/doc/doc++/osgGLUT/index.html @@ -27,8 +27,10 @@
  • OSGGLUT_EXPORT_
  • OSGGLUT_GLUTEVENTADAPTER +
  • OSGGLUT_GLUTWINDOW
  • OSGGLUT_VERSION
  • OSGGLUT_VIEWER +
  • OSG_GL

    Hierarchy of classes


    diff --git a/doc/doc++/osgGLUT/osgGLUT.html b/doc/doc++/osgGLUT/osgGLUT.html index a5da4b900..67d55d265 100644 --- a/doc/doc++/osgGLUT/osgGLUT.html +++ b/doc/doc++/osgGLUT/osgGLUT.html @@ -14,8 +14,11 @@ class OSGGLUT_EXPORT GLUTEventAdapter: public osgUtil::GUIEventAdapter
    Class for adapting GLUT events so that they can be used as input to osgUtil::CameraManipulators
    -class OSGGLUT_EXPORT Viewer: public osgUtil::GUIActionAdapter +class OSGGLUT_EXPORT Viewer: public Window, osgUtil::GUIActionAdapter
    A basic viewer base class which provides a window, simple keyboard and mouse interaction. +
    +class OSGGLUT_EXPORT Window +
    A basic GLUTWindow base class which provides a just a basic window.

    diff --git a/doc/doc++/osgGLUT/osgGLUTGetVersion.html b/doc/doc++/osgGLUT/osgGLUTGetVersion.html index 38e876bcd..9e8f03ce5 100644 --- a/doc/doc++/osgGLUT/osgGLUTGetVersion.html +++ b/doc/doc++/osgGLUT/osgGLUTGetVersion.html @@ -14,9 +14,9 @@

    Documentation

    osgGLUTGetVersion() returns the library version number. -Numbering conventon : osg_src-0.8.31 will return 0.8.31. +Numbering convention : osg_src-0.8.31 will return 0.8.31. -

    This C function can be also used to check for the existance of the OpenSceneGraph +

    This C function can be also used to check for the existence of the OpenSceneGraph library using autoconf and its m4 macro AC_CHECK_LIB.

    Here is the code to add to your configure.in: diff --git a/doc/doc++/osgUtil/CullVisitor.html b/doc/doc++/osgUtil/CullVisitor.html index 1dd92d69c..929de17b1 100644 --- a/doc/doc++/osgUtil/CullVisitor.html +++ b/doc/doc++/osgUtil/CullVisitor.html @@ -45,178 +45,215 @@

    [more]virtual void apply(osg::LOD& node)
    -[more]virtual void apply(osg::Impostor& node) +[more]virtual void apply(osg::EarthSky& node)
    -[more]void setCamera(const osg::Camera& camera) +[more]virtual void apply(osg::Impostor& node)
    -[more]const osg::Camera* getCamera() const +[more]void setCamera(const osg::Camera& camera)
    -[more]void setLODBias(const float bias) +[more]const osg::Camera* getCamera() const
    -[more]const float getLODBias() const +[more]void setEarthSky(const osg::EarthSky* earthSky)
    -[more]void setImpostorsActive(const bool active) +[more]const osg::EarthSky* getEarthSky() const +
    +[more]void setLODBias(const float bias) +
    +[more]const float getLODBias() const +
    +[more]void setImpostorsActive(const bool active)
    Switch the creation of Impostors on or off.
    -[more]const bool getImpostorsActive() const +[more]const bool getImpostorsActive() const
    Get whether impostors are active or not.
    -[more]void setImpostorPixelErrorThreshold(const float numPixels) +[more]void setImpostorPixelErrorThreshold(const float numPixels)
    Set the impostor error threshold.
    -[more]const float getImpostorPixelErrorThreshold() const +[more]const float getImpostorPixelErrorThreshold() const
    Get the impostor error threshold
    -[more]void setDepthSortImpostorSprites(const bool doDepthSort) +[more]void setDepthSortImpostorSprites(const bool doDepthSort)
    Set whether ImpsotorSprite's should be placed in a depth sorted bin for rendering
    -[more]const bool setDepthSortImpostorSprites() const +[more]const bool setDepthSortImpostorSprites() const
    Get whether ImpsotorSprite's are depth sorted bin for rendering
    -[more]void setNumberOfFrameToKeepImpostorSprites(const int numFrames) +[more]void setNumberOfFrameToKeepImpostorSprites(const int numFrames)
    Set the number of frames that an ImpsotorSprite's is kept whilst not being beyond, before being recycled
    -[more]const int getNumberOfFrameToKeepImpostorSprites() const +[more]const int getNumberOfFrameToKeepImpostorSprites() const
    Get the number of frames that an ImpsotorSprite's is kept whilst not being beyond, before being recycled
    -[more]void setTransparencySortMode(TransparencySortMode tsm) +[more]void setTransparencySortMode(TransparencySortMode tsm)
    -[more]void setCullingMode(CullViewState::CullingMode mode) +[more]void setCullingMode(CullViewState::CullingMode mode)
    Sets the current CullingMode
    -[more]CullViewState::CullingMode getCullingMode() const +[more]CullViewState::CullingMode getCullingMode() const
    Returns the current CullingMode
    -[more]void setViewport(osg::Viewport* viewport) +[more]void setViewport(osg::Viewport* viewport)
    Set the viewport.
    -[more]const osg::Viewport* getViewport() const +[more]const osg::Viewport* getViewport() const
    Get the const viewport.
    -[more]osg::Viewport* getViewport() +[more]osg::Viewport* getViewport()
    Get the viewport.
    -[more]void pushCullViewState(const osg::Matrix* matrix=NULL) +[more]void pushCullViewState(const osg::Matrix* matrix=NULL)
    -[more]void popCullViewState() +[more]void popCullViewState()
    -[more]inline void pushStateSet(const osg::StateSet* ss) +[more]inline void pushStateSet(const osg::StateSet* ss)
    Push state set on the current state group.
    -[more]inline void popStateSet() +[more]inline void popStateSet()
    Pop the top state set and hence associated state group.
    -[more]void setRenderGraph(RenderGraph* rg) +[more]void setRenderGraph(RenderGraph* rg)
    -[more]RenderGraph* getRenderGraph() +[more]RenderGraph* getRenderGraph()
    -[more]void setRenderStage(RenderStage* rg) +[more]void setRenderStage(RenderStage* rg)
    -[more]RenderStage* getRenderStage() +[more]RenderStage* getRenderStage()
    -[more]const float getCalculatedNearPlane() const +[more]const float getCalculatedNearPlane() const
    -[more]const float getCalculatedFarPlane() const +[more]const float getCalculatedFarPlane() const +
    +[more]void setDetailedCulling(bool detailed) +
    sets the flag for detailed culling +
    +[more]const bool getDetailedCulling() const +
    gets the status of detailed culling +
    +[more]void calcClippingDirections() const +
    calculates unit directions of vectors that are intersections of cameras' clipping planes

    Public Members

    -[more]enum TransparencySortMode +[more]enum TransparencySortMode

    Protected Fields

    -[more]osg::ref_ptr<CullViewState> _tvs +[more]mutable osg::Vec3 _LeftUp +
    unit vector of direction along intersection of cameras left and top clipping planes in "global" coordinates
    -[more]osg::ref_ptr<CullViewState> _cvs +[more]mutable osg::Vec3 _RightUp +
    unit vector of direction along intersection of cameras right and top clipping planes in "global" coordinates
    -[more]osg::ref_ptr<RenderGraph> _rootRenderGraph +[more]mutable osg::Vec3 _LeftDown +
    unit vector of direction along intersection of cameras left and down clipping planes in "global" coordinates
    -[more]RenderGraph* _currentRenderGraph +[more]mutable osg::Vec3 _RightDown +
    unit vector of direction along intersection of cameras right and down clipping planes in "global" coordinates
    -[more]osg::ref_ptr<RenderStage> _rootRenderStage +[more]bool _detailedCulling
    -[more]RenderBin* _currentRenderBin +[more]osg::ref_ptr<CullViewState> _tvs
    -[more]std::vector<CullViewState::CullingMode> _cullingModeStack +[more]osg::ref_ptr<CullViewState> _cvs
    -[more]float _LODBias +[more]osg::ref_ptr<RenderGraph> _rootRenderGraph
    -[more]float _calculated_znear +[more]RenderGraph* _currentRenderGraph
    -[more]float _calculated_zfar +[more]osg::ref_ptr<RenderStage> _rootRenderStage
    -[more]osg::ref_ptr<const osg::Camera> _camera +[more]RenderBin* _currentRenderBin
    -[more]TransparencySortMode _tsm +[more]std::vector<CullViewState::CullingMode> _cullingModeStack
    -[more]osg::ref_ptr<osg::Viewport> _viewport +[more]float _LODBias
    -[more]bool _impostorActive +[more]float _calculated_znear
    -[more]bool _depthSortImpostorSprites +[more]float _calculated_zfar
    -[more]float _impostorPixelErrorThreshold +[more]osg::ref_ptr<const osg::Camera> _camera
    -[more]int _numFramesToKeepImpostorSprites +[more]osg::ref_ptr<const osg::EarthSky> _earthSky
    -[more]unsigned int _currentReuseMatrixIndex +[more]TransparencySortMode _tsm
    -[more]unsigned int _currentReuseRenderLeafIndex +[more]osg::ref_ptr<osg::Viewport> _viewport
    -[more]osg::ref_ptr<osg::ImpostorSpriteManager> _impostorSpriteManager +[more]bool _impostorActive +
    +[more]bool _depthSortImpostorSprites +
    +[more]float _impostorPixelErrorThreshold +
    +[more]int _numFramesToKeepImpostorSprites +
    +[more]unsigned int _currentReuseMatrixIndex +
    +[more]unsigned int _currentReuseRenderLeafIndex +
    +[more]osg::ref_ptr<osg::ImpostorSpriteManager> _impostorSpriteManager

    Protected Methods

    -[more] CullVisitor(const CullVisitor&) +[more] CullVisitor(const CullVisitor&)
    prevent unwanted copy construction
    -[more]CullVisitor& operator = (const CullVisitor&) +[more]CullVisitor& operator = (const CullVisitor&)
    prevent unwanted copy operator
    -[more]inline osg::Matrix* getCurrentMatrix() +[more]inline osg::Matrix* getCurrentMatrix()
    -[more]inline osg::Matrix* getInverseCurrentMatrix() +[more]inline osg::Matrix* getInverseCurrentMatrix()
    -[more]inline const osg::Vec3& getEyeLocal() const +[more]inline const osg::Vec3& getEyeLocal() const
    -[more]inline const osg::Vec3& getCenterLocal() const +[more]inline const osg::Vec3& getCenterLocal() const
    -[more]inline const osg::Vec3& getLookVectorLocal() const +[more]inline const osg::Vec3& getLookVectorLocal() const
    -[more]inline bool isCulled(const osg::BoundingSphere& sp, CullViewState::CullingMode& mode) const +[more]inline bool isCulled(const osg::BoundingSphere& sp, CullViewState::CullingMode& mode) const
    -[more]inline const bool isCulled(const osg::BoundingBox& bb, const CullViewState::CullingMode mode) const +[more]inline const bool isCulled(const osg::BoundingBox& bb, const CullViewState::CullingMode mode) const
    -[more]void updateCalculatedNearFar(const osg::BoundingBox& bb) +[more]void updateCalculatedNearFar(const osg::BoundingBox& bb)
    -[more]void updateCalculatedNearFar(const osg::Vec3& pos) +[more]void updateCalculatedNearFar(const osg::Vec3& pos)
    -[more]inline void addDrawable(osg::Drawable* drawable, osg::Matrix* matrix) +[more]void updateCalculatedNearFar(osg::Drawable* pDrawable) +
    updates near and far clipping values for case of detailed culling +
    +[more]double calculateZNear(const osg::Vec3& position, const osg::Vec3& eye, const osg::Vec3& look) +
    calculates near for "global" vertex in scene +
    +[more]inline void addDrawable(osg::Drawable* drawable, osg::Matrix* matrix)
    Add a drawable to current render graph
    -[more]inline void addDrawableAndDepth(osg::Drawable* drawable, osg::Matrix* matrix, const float depth) +[more]inline void addDrawableAndDepth(osg::Drawable* drawable, osg::Matrix* matrix, const float depth)
    Add a drawable and depth to current render graph
    -[more]inline void addLight(osg::Light* light, osg::Matrix* matrix) +[more]inline void addLight(osg::Light* light, osg::Matrix* matrix)
    Add a light to current render graph
    -[more]osg::ImpostorSprite* createImpostorSprite(osg::Impostor& node) +[more]osg::ImpostorSprite* createImpostorSprite(osg::Impostor& node)
    create an impostor sprite by setting up a pre-rendering stage to generate the impostor texture.
    -[more]inline osg::Matrix* createOrReuseMatrix() +[more]inline osg::Matrix* createOrReuseMatrix()
    -[more]inline RenderLeaf* createOrReuseRenderLeaf(osg::Drawable* drawable, osg::Matrix* matrix, float depth=0.0f) +[more]inline RenderLeaf* createOrReuseRenderLeaf(osg::Drawable* drawable, osg::Matrix* matrix, float depth=0.0f)

    Protected Members

    -[more]typedef std::vector< osg::ref_ptr<CullViewState> > CullViewStateStack CullViewStateStack _viewStateStack +[more]typedef std::vector< osg::ref_ptr<CullViewState> > CullViewStateStack CullViewStateStack _viewStateStack
    -[more]typedef std::vector< osg::ref_ptr<osg::Matrix> > MatrixList MatrixList _reuseMatrixList +[more]typedef std::vector< osg::ref_ptr<osg::Matrix> > MatrixList MatrixList _reuseMatrixList
    -[more]typedef std::vector< osg::ref_ptr<RenderLeaf> > RenderLeafList RenderLeafList _reuseRenderLeafList +[more]typedef std::vector< osg::ref_ptr<RenderLeaf> > RenderLeafList RenderLeafList _reuseRenderLeafList

    @@ -279,26 +316,38 @@ from the eye to the one nearest the eye.

    +

    ovirtual void apply(osg::EarthSky& node) +

    + +

    ovirtual void apply(osg::Impostor& node)

    - +

    ovoid setCamera(const osg::Camera& camera)

    - +

    oconst osg::Camera* getCamera() const

    + + +

    ovoid setEarthSky(const osg::EarthSky* earthSky) +

    + + +

    oconst osg::EarthSky* getEarthSky() const +

    - +

    ovoid setLODBias(const float bias)

    - +

    oconst float getLODBias() const

    - +

    ovoid setImpostorsActive(const bool active)
    Switch the creation of Impostors on or off. Setting active to false forces the CullVisitor to use the Impostor @@ -307,98 +356,98 @@ CullVisitor to create the appropriate pre-rendering stages which render to the ImpostorSprite's texture.

    - +

    oconst bool getImpostorsActive() const
    Get whether impostors are active or not.

    - +

    ovoid setImpostorPixelErrorThreshold(const float numPixels)
    Set the impostor error threshold. Used in calculation of whether impostors remain valid.

    - +

    oconst float getImpostorPixelErrorThreshold() const
    Get the impostor error threshold

    - +

    ovoid setDepthSortImpostorSprites(const bool doDepthSort)
    Set whether ImpsotorSprite's should be placed in a depth sorted bin for rendering

    - +

    oconst bool setDepthSortImpostorSprites() const
    Get whether ImpsotorSprite's are depth sorted bin for rendering

    - +

    ovoid setNumberOfFrameToKeepImpostorSprites(const int numFrames)
    Set the number of frames that an ImpsotorSprite's is kept whilst not being beyond, before being recycled

    - +

    oconst int getNumberOfFrameToKeepImpostorSprites() const
    Get the number of frames that an ImpsotorSprite's is kept whilst not being beyond, before being recycled

    - +

    oenum TransparencySortMode

    - +
    o LOOK_VECTOR_DISTANCE

    - +

    o OBJECT_EYE_POINT_DISTANCE

    - -
    ovoid setTransparencySortMode(TransparencySortMode tsm) + +
    ovoid setTransparencySortMode(TransparencySortMode tsm)

    - +

    ovoid setCullingMode(CullViewState::CullingMode mode)
    Sets the current CullingMode

    - +

    oCullViewState::CullingMode getCullingMode() const
    Returns the current CullingMode

    - +

    ovoid setViewport(osg::Viewport* viewport)
    Set the viewport. Used to enable the CullVisitor can make decision such as based on viewport dimensions.

    - +

    oconst osg::Viewport* getViewport() const
    Get the const viewport.

    - +

    oosg::Viewport* getViewport()
    Get the viewport.

    - +

    ovoid pushCullViewState(const osg::Matrix* matrix=NULL)

    - +

    ovoid popCullViewState()

    - +

    oinline void pushStateSet(const osg::StateSet* ss)
    Push state set on the current state group. If the state exists in a child state group of the current @@ -408,201 +457,254 @@ it to the current state group then move the current state group pointer to the new state group.

    - +

    oinline void popStateSet()
    Pop the top state set and hence associated state group. Move the current state group to the parent of the popped state group.

    - +

    ovoid setRenderGraph(RenderGraph* rg)

    - +

    oRenderGraph* getRenderGraph()

    - +

    ovoid setRenderStage(RenderStage* rg)

    - +

    oRenderStage* getRenderStage()

    - +

    oconst float getCalculatedNearPlane() const

    - +

    oconst float getCalculatedFarPlane() const

    + + +

    ovoid setDetailedCulling(bool detailed) +
    sets the flag for detailed culling +

    + + +

    oconst bool getDetailedCulling() const +
    gets the status of detailed culling +

    + + +

    ovoid calcClippingDirections() const +
    calculates unit directions of vectors that are intersections of cameras' clipping planes +

    - -

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

    - +

    oCullVisitor& operator = (const CullVisitor&)
    prevent unwanted copy operator

    - +

    oinline osg::Matrix* getCurrentMatrix()

    - +

    oinline osg::Matrix* getInverseCurrentMatrix()

    - +

    oinline const osg::Vec3& getEyeLocal() const

    - +

    oinline const osg::Vec3& getCenterLocal() const

    - +

    oinline const osg::Vec3& getLookVectorLocal() const

    - +

    oinline bool isCulled(const osg::BoundingSphere& sp, CullViewState::CullingMode& mode) const

    - +

    oinline const bool isCulled(const osg::BoundingBox& bb, const CullViewState::CullingMode mode) const

    - +

    ovoid updateCalculatedNearFar(const osg::BoundingBox& bb)

    - +

    ovoid updateCalculatedNearFar(const osg::Vec3& pos)

    + + +

    ovoid updateCalculatedNearFar(osg::Drawable* pDrawable) +
    updates near and far clipping values for case of detailed culling +

    + + +

    odouble calculateZNear(const osg::Vec3& position, const osg::Vec3& eye, const osg::Vec3& look) +
    calculates near for "global" vertex in scene +

    + + +

    omutable osg::Vec3 _LeftUp +
    unit vector of direction along intersection of cameras left and top clipping planes in "global" coordinates +

    + + +

    omutable osg::Vec3 _RightUp +
    unit vector of direction along intersection of cameras right and top clipping planes in "global" coordinates +

    + + +

    omutable osg::Vec3 _LeftDown +
    unit vector of direction along intersection of cameras left and down clipping planes in "global" coordinates +

    + + +

    omutable osg::Vec3 _RightDown +
    unit vector of direction along intersection of cameras right and down clipping planes in "global" coordinates +

    - +

    oinline void addDrawable(osg::Drawable* drawable, osg::Matrix* matrix)
    Add a drawable to current render graph

    - +

    oinline void addDrawableAndDepth(osg::Drawable* drawable, osg::Matrix* matrix, const float depth)
    Add a drawable and depth to current render graph

    - +

    oinline void addLight(osg::Light* light, osg::Matrix* matrix)
    Add a light to current render graph

    - +

    oosg::ImpostorSprite* createImpostorSprite(osg::Impostor& node)
    create an impostor sprite by setting up a pre-rendering stage to generate the impostor texture.

    + + +

    obool _detailedCulling +

    - +

    otypedef std::vector< osg::ref_ptr<CullViewState> > CullViewStateStack CullViewStateStack _viewStateStack

    - +

    oosg::ref_ptr<CullViewState> _tvs

    - +

    oosg::ref_ptr<CullViewState> _cvs

    - +

    oosg::ref_ptr<RenderGraph> _rootRenderGraph

    - +

    oRenderGraph* _currentRenderGraph

    - +

    oosg::ref_ptr<RenderStage> _rootRenderStage

    - +

    oRenderBin* _currentRenderBin

    - +

    ostd::vector<CullViewState::CullingMode> _cullingModeStack

    - +

    ofloat _LODBias

    - +

    ofloat _calculated_znear

    - +

    ofloat _calculated_zfar

    - +

    oosg::ref_ptr<const osg::Camera> _camera

    + + +

    oosg::ref_ptr<const osg::EarthSky> _earthSky +

    - -

    oTransparencySortMode _tsm + +
    oTransparencySortMode _tsm

    - +

    oosg::ref_ptr<osg::Viewport> _viewport

    - +

    obool _impostorActive

    - +

    obool _depthSortImpostorSprites

    - +

    ofloat _impostorPixelErrorThreshold

    - +

    oint _numFramesToKeepImpostorSprites

    - +

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

    - +

    ounsigned int _currentReuseMatrixIndex

    - +

    oinline osg::Matrix* createOrReuseMatrix()

    - +

    otypedef std::vector< osg::ref_ptr<RenderLeaf> > RenderLeafList RenderLeafList _reuseRenderLeafList

    - +

    ounsigned int _currentReuseRenderLeafIndex

    - +

    oinline RenderLeaf* createOrReuseRenderLeaf(osg::Drawable* drawable, osg::Matrix* matrix, float depth=0.0f)

    - +

    oosg::ref_ptr<osg::ImpostorSpriteManager> _impostorSpriteManager

    diff --git a/doc/doc++/osgUtil/DepthSortedBin.html b/doc/doc++/osgUtil/DepthSortedBin.html index 5afadc3f1..efb2aec3b 100644 --- a/doc/doc++/osgUtil/DepthSortedBin.html +++ b/doc/doc++/osgUtil/DepthSortedBin.html @@ -90,7 +90,11 @@

    ovirtual void draw(osg::State& state, RenderLeaf*& previous)
    -ovoid getPrims(Statistics* primStats) +obool getStats(osg::Statistics* primStats) +
    +ovoid getPrims(osg::Statistics* primStats) +
    +obool getPrims(osg::Statistics* primStats, const int nbin)

    diff --git a/doc/doc++/osgUtil/DisplayListVisitor.html b/doc/doc++/osgUtil/DisplayListVisitor.html index 92e12d2d1..baf05e814 100644 --- a/doc/doc++/osgUtil/DisplayListVisitor.html +++ b/doc/doc++/osgUtil/DisplayListVisitor.html @@ -7,7 +7,7 @@ -

    class OSGUTIL_EXPORT osgUtil::DisplayListVisitor

    Visitor for traversing scene graph and setting each osg::GeoSet's _useDisplayList flag, with option to immediately compile osg::GeoSet's OpenGL Display lists.
    +

    class OSGUTIL_EXPORT osgUtil::DisplayListVisitor

    Visitor for traversing scene graph and setting each osg::GeoSet's _useDisplayList flag, with option to immediately compile osg::Drawable OpenGL Display lists and osg::StateAttribute's

    Inheritance:

    @@ -23,13 +23,13 @@

    Public Methods

    -[more] DisplayListVisitor(DisplayListMode mode=SWITCH_ON_DISPLAY_LISTS) -
    Construct a CompileGeoSetsVisior to traverse all child, with set specfied display list mode. +[more] DisplayListVisitor(Mode mode=COMPILE_DISPLAY_LISTS|COMPILE_STATE_ATTRIBUTES) +
    Construct a CompileGeoSetsVisior to traverse all child, with set specified display list mode.
    -[more]void setDisplayListMode(DisplayListMode mode) +[more]void setMode(Mode mode)
    Set the operational mode of how the visitor should set up osg::GeoSet's
    -[more]DisplayListMode getDisplayListMode() const +[more]Mode getMode() const
    Get the operational mode
    [more]void setState(osg::State* state) @@ -46,22 +46,15 @@

    Public Members

    -[more]enum DisplayListMode -
    Operation modes of the DisplayListVisitor +[more]enum ModeValues +
    Operation modes of the

    Protected Fields

    -[more]DisplayListMode _displayListMode +[more]Mode _mode
    -[more]osg::ref_ptr<osg::State> _localState -
    local state is created in constructor and used as the default state during traversal -
    -[more]osg::ref_ptr<osg::State> _externalState -
    external state is used to override the default state -
    -[more]osg::ref_ptr<osg::State> _activeState -
    active state is equal to _externalState when it is valid, otherwise defaults to _localState +[more]osg::ref_ptr<osg::State> _state

    @@ -70,62 +63,48 @@

    Documentation

    Visitor for traversing scene graph and setting each osg::GeoSet's _useDisplayList flag, -with option to immediately compile osg::GeoSet's OpenGL Display lists. -The mode of operation -of the vistor is controlled by setting the DisplayListMode either on visitor -constructor or via the setDisplayListMode() method. DisplayListMode options are: -_displayListMode == SWITCH_ON_AND_COMPILE_DISPLAY_LISTS cals gset->compile() on -all Geode childern. Note, the visitor must only be used within a valid -OpenGL context as compile uses OpenGL calls. -_displayListMode == SWITCH_ON_DISPLAY_LISTS sets the Geode's children with -gset->setUseDisplayList(true), this method does not directly create display list, -or uses OpenGL calls so if safe to use before a valid OpenGL context has been set up. -On the next redraw of the scene, the gset's draw methods will be called -which then will respond to their _useDisplayList being set by creating display lists -automatically. -_displayListMode == SWITCH_OFF_DISPLAY_LISTS sets the Geode's children with -gset->setUseDisplayList(false), this method does not directly create display list, -or uses OpenGL calls so if safe to use before a valid OpenGL context has been set up.
    +with option to immediately compile osg::Drawable OpenGL Display lists and +osg::StateAttribute's
    - + -
    oenum DisplayListMode -
    Operation modes of the DisplayListVisitor +
    oenum ModeValues +
    Operation modes of the

    - - -
    o SWITCH_ON_AND_COMPILE_DISPLAY_LISTS -

    - - -

    o COMPILE_ON_DISPLAY_LISTS -

    - +

    o SWITCH_ON_DISPLAY_LISTS

    - +

    o SWITCH_OFF_DISPLAY_LISTS +

    + + +

    o COMPILE_DISPLAY_LISTS +

    + + +

    o COMPILE_STATE_ATTRIBUTES

    -
    o DisplayListVisitor(DisplayListMode mode=SWITCH_ON_DISPLAY_LISTS) +
    o DisplayListVisitor(Mode mode=COMPILE_DISPLAY_LISTS|COMPILE_STATE_ATTRIBUTES)
    Construct a CompileGeoSetsVisior to traverse all child, -with set specfied display list mode. Default mode is to +with set specified display list mode. Default mode is to gset->setUseDisplayList(true).

    - + -

    ovoid setDisplayListMode(DisplayListMode mode) +
    ovoid setMode(Mode mode)
    Set the operational mode of how the visitor should set up osg::GeoSet's

    - + -

    oDisplayListMode getDisplayListMode() const +
    oMode getMode() const
    Get the operational mode

    @@ -148,24 +127,13 @@ gset->setUseDisplayList(true).

    For each Geode visited set the display list usage according to the _displayListMode

    - + -

    oDisplayListMode _displayListMode +
    oMode _mode

    - + -

    oosg::ref_ptr<osg::State> _localState -
    local state is created in constructor and used as the default state during traversal -

    - - -

    oosg::ref_ptr<osg::State> _externalState -
    external state is used to override the default state -

    - - -

    oosg::ref_ptr<osg::State> _activeState -
    active state is equal to _externalState when it is valid, otherwise defaults to _localState +
    oosg::ref_ptr<osg::State> _state

    This class has no child classes.
    diff --git a/doc/doc++/osgUtil/DriveManipulator.html b/doc/doc++/osgUtil/DriveManipulator.html index 709fb8b27..bb88a7e19 100644 --- a/doc/doc++/osgUtil/DriveManipulator.html +++ b/doc/doc++/osgUtil/DriveManipulator.html @@ -22,23 +22,23 @@

    Public Methods

    -[more] DriveManipulator() +[more] DriveManipulator()
    -[more]virtual ~DriveManipulator() +[more]virtual ~DriveManipulator()
    -[more]virtual void setNode(osg::Node*) +[more]virtual void setNode(osg::Node*)
    Attach a node to the manipulator.
    -[more]virtual const osg::Node* getNode() const +[more]virtual const osg::Node* getNode() const
    Return node if attached
    -[more]virtual void home(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual void home(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Move the camera to the default position.
    -[more]virtual void init(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual void init(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Start/restart the manipulator
    -[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)
    handle events, return true if handled, false otherwise

    @@ -68,15 +68,15 @@
    - +
    o DriveManipulator()

    - +

    ovirtual ~DriveManipulator()

    - +

    ovirtual void setNode(osg::Node*)
    Attach a node to the manipulator. Automatically detaches previously attached node. @@ -84,33 +84,33 @@ setNode(NULL) detaches previously nodes. Is ignored by manipulators which do not require a reference model.

    - +

    ovirtual const osg::Node* getNode() const
    Return node if attached

    - +

    ovirtual void home(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Move the camera to the default position. May be ignored by manipulators if home functionality is not appropriate.

    - +

    ovirtual void init(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Start/restart the manipulator

    - +

    ovirtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)
    handle events, return true if handled, false otherwise

    - +
    o USE_MOUSE_Y_FOR_SPEED

    - +

    o USE_MOUSE_BUTTONS_FOR_SPEED

    diff --git a/doc/doc++/osgUtil/FlightManipulator.html b/doc/doc++/osgUtil/FlightManipulator.html index 1e2e27859..cb0313fd0 100644 --- a/doc/doc++/osgUtil/FlightManipulator.html +++ b/doc/doc++/osgUtil/FlightManipulator.html @@ -22,32 +22,32 @@

    Public Methods

    -[more] FlightManipulator() +[more] FlightManipulator()
    -[more]virtual ~FlightManipulator() +[more]virtual ~FlightManipulator()
    -[more]virtual void setNode(osg::Node*) +[more]virtual void setNode(osg::Node*)
    Attach a node to the manipulator.
    -[more]virtual const osg::Node* getNode() const +[more]virtual const osg::Node* getNode() const
    Return node if attached
    -[more]virtual void home(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual void home(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Move the camera to the default position.
    -[more]virtual void init(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual void init(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Start/restart the manipulator
    -[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)
    handle events, return true if handled, false otherwise
    -[more]void setYawControlMode(YawControlMode ycm) +[more]void setYawControlMode(YawControlMode ycm)
    Set the yaw control between no yaw and yawing when banked

    Public Members

    -[more]enum YawControlMode +[more]enum YawControlMode

    @@ -76,15 +76,15 @@
    - +
    o FlightManipulator()

    - +

    ovirtual ~FlightManipulator()

    - +

    ovirtual void setNode(osg::Node*)
    Attach a node to the manipulator. Automatically detaches previously attached node. @@ -92,43 +92,43 @@ setNode(NULL) detaches previously nodes. Is ignored by manipulators which do not require a reference model.

    - +

    ovirtual const osg::Node* getNode() const
    Return node if attached

    - +

    ovirtual void home(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Move the camera to the default position. May be ignored by manipulators if home functionality is not appropriate.

    - +

    ovirtual void init(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Start/restart the manipulator

    - +

    ovirtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)
    handle events, return true if handled, false otherwise

    - +

    oenum YawControlMode

    - +
    o YAW_AUTOMATICALLY_WHEN_BANKED

    - +

    o NO_AUTOMATIC_YAW

    - -
    ovoid setYawControlMode(YawControlMode ycm) + +
    ovoid setYawControlMode(YawControlMode ycm)
    Set the yaw control between no yaw and yawing when banked

    diff --git a/doc/doc++/osgUtil/GUIActionAdapter.html b/doc/doc++/osgUtil/GUIActionAdapter.html index cb0fff571..8581da7c9 100644 --- a/doc/doc++/osgUtil/GUIActionAdapter.html +++ b/doc/doc++/osgUtil/GUIActionAdapter.html @@ -13,11 +13,11 @@

    Public Methods

    -[more]virtual void requestRedraw() = 0 +[more]virtual void requestRedraw() = 0
    -[more]virtual void requestContinuousUpdate(bool needed=true) = 0 +[more]virtual void requestContinuousUpdate(bool needed=true) = 0
    -[more]virtual void requestWarpPointer(int x, int y) = 0 +[more]virtual void requestWarpPointer(int x, int y) = 0

    @@ -56,15 +56,15 @@ neutral mouse position is required, i.e when mimicking a aircrafts joystick. - +
    ovirtual void requestRedraw() = 0

    - +

    ovirtual void requestContinuousUpdate(bool needed=true) = 0

    - +

    ovirtual void requestWarpPointer(int x, int y) = 0

    diff --git a/doc/doc++/osgUtil/GUIEventAdapter.html b/doc/doc++/osgUtil/GUIEventAdapter.html index b1e4e517c..448c0c01e 100644 --- a/doc/doc++/osgUtil/GUIEventAdapter.html +++ b/doc/doc++/osgUtil/GUIEventAdapter.html @@ -23,52 +23,52 @@

    Public Methods

    -[more] GUIEventAdapter() +[more] GUIEventAdapter()
    -[more]virtual EventType getEventType() const = 0 +[more]virtual EventType getEventType() const = 0
    Get the EventType of the GUI event
    -[more]virtual int getKey() const = 0 +[more]virtual int getKey() const = 0
    key pressed, return -1 if inappropriate for this event.
    -[more]virtual int getButton() const = 0 +[more]virtual int getButton() const = 0
    button pressed/released, return -1 if inappropriate for this event
    -[more]virtual int getXmin() const = 0 +[more]virtual int getXmin() const = 0
    window minimum x.
    -[more]virtual int getXmax() const = 0 +[more]virtual int getXmax() const = 0
    window maximum x.
    -[more]virtual int getYmin() const = 0 +[more]virtual int getYmin() const = 0
    window minimum y.
    -[more]virtual int getYmax() const = 0 +[more]virtual int getYmax() const = 0
    window maximum y.
    -[more]virtual int getX() const = 0 +[more]virtual int getX() const = 0
    current mouse x position
    -[more]virtual int getY() const = 0 +[more]virtual int getY() const = 0
    current mouse y position
    -[more]virtual unsigned int getButtonMask() const = 0 +[more]virtual unsigned int getButtonMask() const = 0
    current mouse button state
    -[more]virtual float time() const = 0 +[more]virtual float time() const = 0
    time in seconds of event.

    Public Members

    -[more]enum MouseButtonMask +[more]enum MouseButtonMask
    -[more]enum EventType +[more]enum EventType

    Protected Methods

    -[more]virtual ~GUIEventAdapter() +[more]virtual ~GUIEventAdapter()
    Force users to create on heap, so that multiple referencing is safe

    @@ -86,122 +86,122 @@ Toolkit see osgGLUT::GLUTEventAdapter.
    - +
    o GUIEventAdapter()

    - +

    oenum MouseButtonMask

    - +
    o LEFT_BUTTON

    - +

    o MIDDLE_BUTTON

    - +

    o RIGHT_BUTTON

    - +
    oenum EventType

    - +
    o PUSH

    - +

    o RELEASE

    - +

    o DRAG

    - +

    o MOVE

    - +

    o KEYBOARD

    - +

    o FRAME

    - +

    o RESIZE

    - +

    o NONE

    - -
    ovirtual EventType getEventType() const = 0 + +
    ovirtual EventType getEventType() const = 0
    Get the EventType of the GUI event

    - +

    ovirtual int getKey() const = 0
    key pressed, return -1 if inappropriate for this event.

    - +

    ovirtual int getButton() const = 0
    button pressed/released, return -1 if inappropriate for this event

    - +

    ovirtual int getXmin() const = 0
    window minimum x.

    - +

    ovirtual int getXmax() const = 0
    window maximum x.

    - +

    ovirtual int getYmin() const = 0
    window minimum y.

    - +

    ovirtual int getYmax() const = 0
    window maximum y.

    - +

    ovirtual int getX() const = 0
    current mouse x position

    - +

    ovirtual int getY() const = 0
    current mouse y position

    - +

    ovirtual unsigned int getButtonMask() const = 0
    current mouse button state

    - +

    ovirtual float time() const = 0
    time in seconds of event.

    - +

    ovirtual ~GUIEventAdapter()
    Force users to create on heap, so that multiple referencing is safe

    diff --git a/doc/doc++/osgUtil/GUIEventHandler.html b/doc/doc++/osgUtil/GUIEventHandler.html index da0dd36f0..789df27b8 100644 --- a/doc/doc++/osgUtil/GUIEventHandler.html +++ b/doc/doc++/osgUtil/GUIEventHandler.html @@ -22,7 +22,7 @@

    Public Methods

    -[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) = 0 +[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) = 0
    Handle events, return true if handled, false otherwise

    @@ -34,7 +34,7 @@
    - +
    ovirtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) = 0
    Handle events, return true if handled, false otherwise

    diff --git a/doc/doc++/osgUtil/General.html b/doc/doc++/osgUtil/General.html index bf5c245e4..b9ecce221 100644 --- a/doc/doc++/osgUtil/General.html +++ b/doc/doc++/osgUtil/General.html @@ -28,6 +28,9 @@ o#define OSGUTIL_DISPLAYLISTVISITOR
    +o#define +OSGUTIL_DISPLAYREQUIREMENTSVISITOR
    + o#define OSGUTIL_DRIVEMANIPULATOR
    @@ -61,8 +64,8 @@ o#define OSGUTIL_INTERSECTVISITOR
    -o#define -OSGUTIL_OPTIMIZESTATEVISITOR
    +o#define +OSGUTIL_OPTIMIZER
    o#define OSGUTIL_RENDERBIN
    @@ -94,23 +97,20 @@ o#define OSGUTIL_GEOSTATE_MANIPULATOR
    -o#define -OSGUTIL_STATISTICS
    - o#define OSGUTIL_Tesselator
    o#define OSGUTIL_TRACKBALLMANIPULATOR
    +o#define +OSGUTIL_TRANSFORMCALLBACK
    + o#define OSGUTIL_TRISTRIPVISITOR
    o#define -OSGUTIL_VERSION
    - -o#define -OSGUTIL_VISUALSREQUIREMENTSVISITOR
    +OSGUTIL_VERSION

    Alphabetic index Hierarchy of classes


    This page was generated with the help of DOC++. diff --git a/doc/doc++/osgUtil/HIER.html b/doc/doc++/osgUtil/HIER.html index 6e9c0bbcd..341032ca0 100644 --- a/doc/doc++/osgUtil/HIER.html +++ b/doc/doc++/osgUtil/HIER.html @@ -10,9 +10,12 @@
    • + + + + + + + @@ -85,8 +92,36 @@ + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + @@ -141,13 +176,6 @@ - - - - - - - @@ -156,14 +184,14 @@ - + - + diff --git a/doc/doc++/osgUtil/Hit.html b/doc/doc++/osgUtil/Hit.html index f34bb072d..6c4163a25 100644 --- a/doc/doc++/osgUtil/Hit.html +++ b/doc/doc++/osgUtil/Hit.html @@ -22,40 +22,40 @@

    Public Fields

    -[more]float _ratio +[more]float _ratio
    -[more]osg::LineSegment* _originalLineSegment +[more]osg::LineSegment* _originalLineSegment
    -[more]osg::LineSegment* _localLineSegment +[more]osg::LineSegment* _localLineSegment
    -[more]osg::NodePath _nodePath +[more]osg::NodePath _nodePath
    -[more]osg::Geode* _geode +[more]osg::Geode* _geode
    -[more]osg::GeoSet* _geoset +[more]osg::GeoSet* _geoset
    -[more]osg::Matrix* _matrix +[more]osg::Matrix* _matrix
    -[more]VecIndexList _vecIndexList +[more]VecIndexList _vecIndexList
    -[more]int _primitiveIndex +[more]int _primitiveIndex
    -[more]osg::Vec3 _intersectPoint +[more]osg::Vec3 _intersectPoint
    -[more]osg::Vec3 _intersectNormal +[more]osg::Vec3 _intersectNormal

    Public Methods

    -[more] Hit() +[more] Hit()
    -[more] Hit(const Hit& hit) +[more] Hit(const Hit& hit)
    -[more] ~Hit() +[more] ~Hit()
    -[more]Hit& operator = (const Hit& hit) +[more]Hit& operator = (const Hit& hit)
    -[more]typedef std::vector<int> VecIndexList bool operator < (const Hit& hit) const +[more]typedef std::vector<int> VecIndexList bool operator < (const Hit& hit) const

    @@ -66,67 +66,67 @@
    - +
    o Hit()

    - -

    o Hit(const Hit& hit) + +
    o Hit(const Hit& hit)

    - +

    o ~Hit()

    - +

    oHit& operator = (const Hit& hit)

    - +

    otypedef std::vector<int> VecIndexList bool operator < (const Hit& hit) const

    - +

    ofloat _ratio

    - +

    oosg::LineSegment* _originalLineSegment

    - +

    oosg::LineSegment* _localLineSegment

    - +

    oosg::NodePath _nodePath

    - +

    oosg::Geode* _geode

    - +

    oosg::GeoSet* _geoset

    - +

    oosg::Matrix* _matrix

    - +

    oVecIndexList _vecIndexList

    - +

    oint _primitiveIndex

    - +

    oosg::Vec3 _intersectPoint

    - +

    oosg::Vec3 _intersectNormal

    diff --git a/doc/doc++/osgUtil/InsertImpostorsVisitor.html b/doc/doc++/osgUtil/InsertImpostorsVisitor.html index cc57c074b..ecf2ae51c 100644 --- a/doc/doc++/osgUtil/InsertImpostorsVisitor.html +++ b/doc/doc++/osgUtil/InsertImpostorsVisitor.html @@ -23,45 +23,45 @@

    Public Methods

    -[more] InsertImpostorsVisitor() +[more] InsertImpostorsVisitor()
    default to traversing all children
    -[more]void setImpostorThresholdRatio(const float ratio) +[more]void setImpostorThresholdRatio(const float ratio)
    -[more]const float getImpostorThresholdRatio() const +[more]const float getImpostorThresholdRatio() const
    -[more]void setMaximumNumberOfNestedImpostors(const unsigned int num) +[more]void setMaximumNumberOfNestedImpostors(const unsigned int num)
    -[more]const unsigned int getMaximumNumberOfNestedImpostors() const +[more]const unsigned int getMaximumNumberOfNestedImpostors() const
    -[more]void reset() +[more]void reset()
    empty visitor, make it ready for next traversal
    -[more]virtual void apply(osg::Node& node) +[more]virtual void apply(osg::Node& node)
    -[more]virtual void apply(osg::Group& node) +[more]virtual void apply(osg::Group& node)
    -[more]virtual void apply(osg::LOD& node) +[more]virtual void apply(osg::LOD& node)
    -[more]virtual void apply(osg::Impostor& node) +[more]virtual void apply(osg::Impostor& node)
    -[more]void insertImpostors() +[more]void insertImpostors()

    Protected Fields

    -[more]LODList _lodList +[more]LODList _lodList
    -[more]float _impostorThresholdRatio +[more]float _impostorThresholdRatio
    -[more]unsigned int _maximumNumNestedImpostors +[more]unsigned int _maximumNumNestedImpostors
    -[more]unsigned int _numNestedImpostors +[more]unsigned int _numNestedImpostors

    Protected Members

    -[more]typedef std::vector< osg::LOD* > LODList GroupList _groupList +[more]typedef std::vector< osg::LOD* > LODList GroupList _groupList

    @@ -74,69 +74,69 @@ For example of usage see src/Demos/osgimpostor.
    - +
    o InsertImpostorsVisitor()
    default to traversing all children

    - +

    ovoid setImpostorThresholdRatio(const float ratio)

    - +

    oconst float getImpostorThresholdRatio() const

    - +

    ovoid setMaximumNumberOfNestedImpostors(const unsigned int num)

    - +

    oconst unsigned int getMaximumNumberOfNestedImpostors() const

    - +

    ovoid reset()
    empty visitor, make it ready for next traversal

    - +

    ovirtual void apply(osg::Node& node)

    - +

    ovirtual void apply(osg::Group& node)

    - +

    ovirtual void apply(osg::LOD& node)

    - +

    ovirtual void apply(osg::Impostor& node)

    - +

    ovoid insertImpostors()

    - +

    otypedef std::vector< osg::LOD* > LODList GroupList _groupList

    - +

    oLODList _lodList

    - +

    ofloat _impostorThresholdRatio

    - +

    ounsigned int _maximumNumNestedImpostors

    - +

    ounsigned int _numNestedImpostors

    diff --git a/doc/doc++/osgUtil/IntersectState.html b/doc/doc++/osgUtil/IntersectState.html index d99c44b03..e1f26e8a6 100644 --- a/doc/doc++/osgUtil/IntersectState.html +++ b/doc/doc++/osgUtil/IntersectState.html @@ -22,30 +22,30 @@

    Public Fields

    -[more]osg::Matrix* _matrix +[more]osg::Matrix* _matrix
    -[more]osg::Matrix* _inverse +[more]osg::Matrix* _inverse

    Public Methods

    -[more] IntersectState() +[more] IntersectState()
    -[more]bool isCulled(const osg::BoundingSphere& bs, LineSegmentmentMask& segMaskOut) +[more]bool isCulled(const osg::BoundingSphere& bs, LineSegmentmentMask& segMaskOut)
    -[more]bool isCulled(const osg::BoundingBox& bb, LineSegmentmentMask& segMaskOut) +[more]bool isCulled(const osg::BoundingBox& bb, LineSegmentmentMask& segMaskOut)

    Public Members

    -[more]typedef std::vector< std::pair<osg::LineSegment*,osg::LineSegment*> > LineSegmentList LineSegmentList _segList +[more]typedef std::vector< std::pair<osg::LineSegment*,osg::LineSegment*> > LineSegmentList LineSegmentList _segList
    -[more]typedef std::vector<LineSegmentmentMask> LineSegmentmentMaskStack LineSegmentmentMaskStack _segmentMaskStack +[more]typedef std::vector<LineSegmentmentMask> LineSegmentmentMaskStack LineSegmentmentMaskStack _segmentMaskStack

    Protected Methods

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

    @@ -56,35 +56,35 @@
    - +
    o IntersectState()

    - +

    oosg::Matrix* _matrix

    - +

    oosg::Matrix* _inverse

    - +

    otypedef std::vector< std::pair<osg::LineSegment*,osg::LineSegment*> > LineSegmentList LineSegmentList _segList

    - +

    otypedef std::vector<LineSegmentmentMask> LineSegmentmentMaskStack LineSegmentmentMaskStack _segmentMaskStack

    - +

    obool isCulled(const osg::BoundingSphere& bs, LineSegmentmentMask& segMaskOut)

    - +

    obool isCulled(const osg::BoundingBox& bb, LineSegmentmentMask& segMaskOut)

    - +

    o ~IntersectState()

    diff --git a/doc/doc++/osgUtil/IntersectVisitor.html b/doc/doc++/osgUtil/IntersectVisitor.html index ec57cacb3..308018160 100644 --- a/doc/doc++/osgUtil/IntersectVisitor.html +++ b/doc/doc++/osgUtil/IntersectVisitor.html @@ -23,73 +23,73 @@

    Public Methods

    -[more] IntersectVisitor() +[more] IntersectVisitor()
    -[more]virtual ~IntersectVisitor() +[more]virtual ~IntersectVisitor()
    -[more]void reset() +[more]void reset()
    -[more]void addLineSegment(osg::LineSegment* seg) +[more]void addLineSegment(osg::LineSegment* seg)
    Add a line segment to use for intersection testing during scene traversal
    -[more]void setHitReportingMode(HitReportingMode hrm) +[more]void setHitReportingMode(HitReportingMode hrm)
    Set the mode of how hits should reported back from a traversal
    -[more]HitReportingMode getHitReportingMode() +[more]HitReportingMode getHitReportingMode()
    Get the mode of how hits should reported back from a traversal
    -[more]typedef std::map<osg::LineSegment*,HitList > LineSegmentHitListMap HitList& getHitList(osg::LineSegment* seg) +[more]typedef std::map<osg::LineSegment*,HitList > LineSegmentHitListMap HitList& getHitList(osg::LineSegment* seg)
    -[more]int getNumHits(osg::LineSegment* seg) +[more]int getNumHits(osg::LineSegment* seg)
    -[more]bool hits() +[more]bool hits()
    -[more]virtual void apply(osg::Node&) +[more]virtual void apply(osg::Node&)
    -[more]virtual void apply(osg::Geode& node) +[more]virtual void apply(osg::Geode& node)
    -[more]virtual void apply(osg::Billboard& node) +[more]virtual void apply(osg::Billboard& node)
    -[more]virtual void apply(osg::Group& node) +[more]virtual void apply(osg::Group& node)
    -[more]virtual void apply(osg::Transform& node) +[more]virtual void apply(osg::Transform& node)
    -[more]virtual void apply(osg::Switch& node) +[more]virtual void apply(osg::Switch& node)
    -[more]virtual void apply(osg::LOD& node) +[more]virtual void apply(osg::LOD& node)

    Public Members

    -[more]enum HitReportingMode +[more]enum HitReportingMode
    Modes to control how IntersectVisitor reports hits.

    Protected Fields

    -[more]osg::NodePath _nodePath +[more]osg::NodePath _nodePath
    -[more]HitReportingMode _hitReportingMode +[more]HitReportingMode _hitReportingMode
    -[more]LineSegmentHitListMap _segHitList +[more]LineSegmentHitListMap _segHitList

    Protected Methods

    -[more]bool intersect(osg::GeoSet& gset) +[more]bool intersect(osg::GeoSet& gset)
    -[more]void pushMatrix(const osg::Matrix& matrix) +[more]void pushMatrix(const osg::Matrix& matrix)
    -[more]void popMatrix() +[more]void popMatrix()
    -[more]bool enterNode(osg::Node& node) +[more]bool enterNode(osg::Node& node)
    -[more]void leaveNode() +[more]void leaveNode()

    Protected Members

    -[more]typedef std::vector<osg::ref_ptr<IntersectState> > IntersectStateStack IntersectStateStack _intersectStateStack +[more]typedef std::vector<osg::ref_ptr<IntersectState> > IntersectStateStack IntersectStateStack _intersectStateStack

    @@ -99,125 +99,125 @@

    Documentation

    Basic visitor for ray based collisions of a scene. Note, still in development, current version has not -pratical functionality!
    +practical functionality!
    - +
    o IntersectVisitor()

    - +

    ovirtual ~IntersectVisitor()

    - +

    ovoid reset()

    - +

    ovoid addLineSegment(osg::LineSegment* seg)
    Add a line segment to use for intersection testing during scene traversal

    - +

    oenum HitReportingMode
    Modes to control how IntersectVisitor reports hits.

    - +
    o ONLY_NEAREST_HIT

    - +

    o ALL_HITS

    - -
    ovoid setHitReportingMode(HitReportingMode hrm) + +
    ovoid setHitReportingMode(HitReportingMode hrm)
    Set the mode of how hits should reported back from a traversal

    - -

    oHitReportingMode getHitReportingMode() + +
    oHitReportingMode getHitReportingMode()
    Get the mode of how hits should reported back from a traversal

    - +

    otypedef std::map<osg::LineSegment*,HitList > LineSegmentHitListMap HitList& getHitList(osg::LineSegment* seg)

    - +

    oint getNumHits(osg::LineSegment* seg)

    - +

    obool hits()

    - +

    ovirtual void apply(osg::Node&)

    - +

    ovirtual void apply(osg::Geode& node)

    - +

    ovirtual void apply(osg::Billboard& node)

    - +

    ovirtual void apply(osg::Group& node)

    - +

    ovirtual void apply(osg::Transform& node)

    - +

    ovirtual void apply(osg::Switch& node)

    - +

    ovirtual void apply(osg::LOD& node)

    - +

    obool intersect(osg::GeoSet& gset)

    - +

    ovoid pushMatrix(const osg::Matrix& matrix)

    - +

    ovoid popMatrix()

    - +

    obool enterNode(osg::Node& node)

    - +

    ovoid leaveNode()

    - +

    otypedef std::vector<osg::ref_ptr<IntersectState> > IntersectStateStack IntersectStateStack _intersectStateStack

    - +

    oosg::NodePath _nodePath

    - -

    oHitReportingMode _hitReportingMode + +
    oHitReportingMode _hitReportingMode

    - +

    oLineSegmentHitListMap _segHitList

    diff --git a/doc/doc++/osgUtil/RegisterRenderBinProxy.html b/doc/doc++/osgUtil/RegisterRenderBinProxy.html index 84825739f..eb11c7852 100644 --- a/doc/doc++/osgUtil/RegisterRenderBinProxy.html +++ b/doc/doc++/osgUtil/RegisterRenderBinProxy.html @@ -13,14 +13,14 @@

    Public Methods

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

    Protected Fields

    -[more]osg::ref_ptr<T> _rb +[more]osg::ref_ptr<T> _rb

    @@ -32,15 +32,15 @@
    - +
    o RegisterRenderBinProxy()

    - +

    o ~RegisterRenderBinProxy()

    - +

    oosg::ref_ptr<T> _rb

    diff --git a/doc/doc++/osgUtil/RenderBin.html b/doc/doc++/osgUtil/RenderBin.html index 3386e1a1b..63145acd0 100644 --- a/doc/doc++/osgUtil/RenderBin.html +++ b/doc/doc++/osgUtil/RenderBin.html @@ -23,59 +23,63 @@

    Public Fields

    -[more]int _binNum +[more]int _binNum
    -[more]RenderBin* _parent +[more]RenderBin* _parent
    -[more]RenderStage* _stage +[more]RenderStage* _stage
    -[more]RenderBinList _bins +[more]RenderBinList _bins
    -[more]RenderGraphList _renderGraphList +[more]RenderGraphList _renderGraphList

    Public Methods

    -[more]typedef std::map< int, osg::ref_ptr<RenderBin> >static RenderBinList RenderBin* createRenderBin(const std::string& binName) +[more]typedef std::map< int, osg::ref_ptr<RenderBin> >static RenderBinList RenderBin* createRenderBin(const std::string& binName)
    -[more]static void addRenderBinPrototype(RenderBin* proto) +[more]static void addRenderBinPrototype(RenderBin* proto)
    -[more]static void removeRenderBinPrototype(RenderBin* proto) +[more]static void removeRenderBinPrototype(RenderBin* proto)
    -[more] RenderBin() +[more] RenderBin()
    -[more]virtual osg::Object* clone() const +[more]virtual osg::Object* clone() const
    -[more]virtual bool isSameKindAs(const osg::Object* obj) const +[more]virtual bool isSameKindAs(const osg::Object* obj) const
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    -[more]virtual void reset() +[more]virtual void reset()
    -[more]RenderBin* find_or_insert(int binNum, const std::string& binName) +[more]RenderBin* find_or_insert(int binNum, const std::string& binName)
    -[more]void addRenderGraph(RenderGraph* rg) +[more]void addRenderGraph(RenderGraph* rg)
    -[more]void sort() +[more]void sort()
    -[more]virtual void sort_local() +[more]virtual void sort_local()
    -[more]virtual void draw(osg::State& state, RenderLeaf*& previous) +[more]virtual void draw(osg::State& state, RenderLeaf*& previous)
    -[more]virtual void draw_local(osg::State& state, RenderLeaf*& previous) +[more]virtual void draw_local(osg::State& state, RenderLeaf*& previous)
    -[more]void getPrims(Statistics* primStats) +[more]bool getStats(osg::Statistics* primStats)
    extract stats for current draw list. +
    +[more]void getPrims(osg::Statistics* primStats) +
    +[more]bool getPrims(osg::Statistics* primStats, const int nbin)

    Public Members

    -[more]typedef std::map< std::string, osg::ref_ptr<RenderBin> >static RenderBinPrototypeList RenderBinPrototypeList s_renderBinPrototypeList +[more]typedef std::map< std::string, osg::ref_ptr<RenderBin> >static RenderBinPrototypeList RenderBinPrototypeList s_renderBinPrototypeList

    Protected Methods

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

    @@ -88,92 +92,100 @@ RenderBin base class
    - +
    otypedef std::map< int, osg::ref_ptr<RenderBin> >static RenderBinList RenderBin* createRenderBin(const std::string& binName)

    - +

    ostatic void addRenderBinPrototype(RenderBin* proto)

    - +

    ostatic void removeRenderBinPrototype(RenderBin* proto)

    - +

    o RenderBin()

    - +

    ovirtual osg::Object* clone() const

    - +

    ovirtual bool isSameKindAs(const osg::Object* obj) const

    - +

    ovirtual const char* className() const

    - +

    ovirtual void reset()

    - +

    oRenderBin* find_or_insert(int binNum, const std::string& binName)

    - +

    ovoid addRenderGraph(RenderGraph* rg)

    - +

    ovoid sort()

    - +

    ovirtual void sort_local()

    - +

    ovirtual void draw(osg::State& state, RenderLeaf*& previous)

    - +

    ovirtual void draw_local(osg::State& state, RenderLeaf*& previous)

    - - -

    ovoid getPrims(Statistics* primStats) + + +
    obool getStats(osg::Statistics* primStats)
    extract stats for current draw list.

    + + +

    ovoid getPrims(osg::Statistics* primStats) +

    + + +

    obool getPrims(osg::Statistics* primStats, const int nbin) +

    - +

    oint _binNum

    - +

    oRenderBin* _parent

    - +

    oRenderStage* _stage

    - +

    oRenderBinList _bins

    - +

    oRenderGraphList _renderGraphList

    - +

    otypedef std::map< std::string, osg::ref_ptr<RenderBin> >static RenderBinPrototypeList RenderBinPrototypeList s_renderBinPrototypeList

    - +

    ovirtual ~RenderBin()

    diff --git a/doc/doc++/osgUtil/RenderGraph.html b/doc/doc++/osgUtil/RenderGraph.html index 7712e70c8..51022de4c 100644 --- a/doc/doc++/osgUtil/RenderGraph.html +++ b/doc/doc++/osgUtil/RenderGraph.html @@ -22,50 +22,50 @@

    Public Fields

    -[more]osg::ref_ptr<const osg::StateSet> _stateset +[more]osg::ref_ptr<const osg::StateSet> _stateset
    -[more]int _depth +[more]int _depth
    -[more]ChildList _children +[more]ChildList _children
    -[more]LeafList _leaves +[more]LeafList _leaves

    Public Methods

    -[more] RenderGraph() +[more] RenderGraph()
    -[more] RenderGraph(RenderGraph* parent, const osg::StateSet* stateset) +[more] RenderGraph(RenderGraph* parent, const osg::StateSet* stateset)
    -[more] ~RenderGraph() +[more] ~RenderGraph()
    -[more]inline const bool empty() const -
    return true if all of drawables, lights and chilren are empty +[more]inline const bool empty() const +
    return true if all of drawables, lights and children are empty
    -[more]inline const bool leaves_empty() const +[more]inline const bool leaves_empty() const
    -[more]void reset() +[more]void reset()
    reset the internal contents of a RenderGraph, including deleting all children
    -[more]void clean() +[more]void clean()
    recursively clean the RenderGraph of all its drawables, lights and depths.
    -[more]void prune() +[more]void prune()
    recursively prune the RenderGraph of empty children
    -[more]inline RenderGraph* find_or_insert(const osg::StateSet* stateset) +[more]inline RenderGraph* find_or_insert(const osg::StateSet* stateset)
    -[more]inline void addLeaf(RenderLeaf* leaf) +[more]inline void addLeaf(RenderLeaf* leaf)
    add a render leaf
    -[more]static inline void moveRenderGraph(osg::State& state, RenderGraph* sg_curr, RenderGraph* sg_new) +[more]static inline void moveRenderGraph(osg::State& state, RenderGraph* sg_curr, RenderGraph* sg_new)
    -[more]inline static void moveToRootRenderGraph(osg::State& state, RenderGraph* sg_curr) +[more]inline static void moveToRootRenderGraph(osg::State& state, RenderGraph* sg_curr)

    Public Members

    -[more]typedef std::vector< osg::ref_ptr<RenderLeaf> > LeafList RenderGraph* _parent +[more]typedef std::vector< osg::ref_ptr<RenderLeaf> > LeafList RenderGraph* _parent

    @@ -76,77 +76,77 @@
    - +
    otypedef std::vector< osg::ref_ptr<RenderLeaf> > LeafList RenderGraph* _parent

    - +

    oosg::ref_ptr<const osg::StateSet> _stateset

    - +

    oint _depth

    - +

    oChildList _children

    - +

    oLeafList _leaves

    - +

    o RenderGraph()

    - -

    o RenderGraph(RenderGraph* parent, const osg::StateSet* stateset) + +
    o RenderGraph(RenderGraph* parent, const osg::StateSet* stateset)

    - +

    o ~RenderGraph()

    - +

    oinline const bool empty() const -
    return true if all of drawables, lights and chilren are empty +
    return true if all of drawables, lights and children are empty

    - +

    oinline const bool leaves_empty() const

    - +

    ovoid reset()
    reset the internal contents of a RenderGraph, including deleting all children

    - +

    ovoid clean()
    recursively clean the RenderGraph of all its drawables, lights and depths. Leaves children intact, and ready to be populated again.

    - +

    ovoid prune()
    recursively prune the RenderGraph of empty children

    - +

    oinline RenderGraph* find_or_insert(const osg::StateSet* stateset)

    - +

    oinline void addLeaf(RenderLeaf* leaf)
    add a render leaf

    - +

    ostatic inline void moveRenderGraph(osg::State& state, RenderGraph* sg_curr, RenderGraph* sg_new)

    - +

    oinline static void moveToRootRenderGraph(osg::State& state, RenderGraph* sg_curr)

    diff --git a/doc/doc++/osgUtil/RenderLeaf.html b/doc/doc++/osgUtil/RenderLeaf.html index 8110d2d3d..abf87f685 100644 --- a/doc/doc++/osgUtil/RenderLeaf.html +++ b/doc/doc++/osgUtil/RenderLeaf.html @@ -23,24 +23,24 @@

    Public Fields

    -[more]RenderGraph* _parent +[more]RenderGraph* _parent
    -[more]osg::Drawable* _drawable +[more]osg::Drawable* _drawable
    -[more]osg::ref_ptr<osg::Matrix> _matrix +[more]osg::ref_ptr<osg::Matrix> _matrix
    -[more]float _depth +[more]float _depth

    Public Methods

    -[more]inline RenderLeaf(osg::Drawable* drawable, osg::Matrix* matrix, float depth=0.0f) +[more]inline RenderLeaf(osg::Drawable* drawable, osg::Matrix* matrix, float depth=0.0f)
    -[more]inline void set(osg::Drawable* drawable, osg::Matrix* matrix, float depth=0.0f) +[more]inline void set(osg::Drawable* drawable, osg::Matrix* matrix, float depth=0.0f)
    -[more]inline void reset() +[more]inline void reset()
    -[more]virtual void render(osg::State& state, RenderLeaf* previous) +[more]virtual void render(osg::State& state, RenderLeaf* previous)

    @@ -52,35 +52,35 @@
    - +
    oinline RenderLeaf(osg::Drawable* drawable, osg::Matrix* matrix, float depth=0.0f)

    - +

    oinline void set(osg::Drawable* drawable, osg::Matrix* matrix, float depth=0.0f)

    - +

    oinline void reset()

    - +

    ovirtual void render(osg::State& state, RenderLeaf* previous)

    - +

    oRenderGraph* _parent

    - +

    oosg::Drawable* _drawable

    - +

    oosg::ref_ptr<osg::Matrix> _matrix

    - +

    ofloat _depth

    diff --git a/doc/doc++/osgUtil/RenderStage.html b/doc/doc++/osgUtil/RenderStage.html index 4e9639f81..9ba561c62 100644 --- a/doc/doc++/osgUtil/RenderStage.html +++ b/doc/doc++/osgUtil/RenderStage.html @@ -23,114 +23,122 @@

    Public Fields

    -[more]DependencyList _dependencyList +[more]DependencyList _dependencyList
    -[more]osg::ref_ptr<osg::Camera> _camera +[more]osg::ref_ptr<osg::Camera> _camera
    -[more]osg::ref_ptr<osg::Viewport> _viewport +[more]osg::ref_ptr<osg::Viewport> _viewport
    -[more]GLbitfield _clearMask +[more]GLbitfield _clearMask
    -[more]osg::Vec4 _clearColor +[more]osg::ref_ptr<osg::ColorMask> _colorMask
    -[more]osg::Vec4 _clearAccum +[more]osg::Vec4 _clearColor
    -[more]double _clearDepth +[more]osg::Vec4 _clearAccum
    -[more]int _clearStencil +[more]double _clearDepth
    -[more]mutable osg::ref_ptr<RenderStageLighting> _renderStageLighting +[more]int _clearStencil +
    +[more]mutable osg::ref_ptr<RenderStageLighting> _renderStageLighting

    Public Methods

    -[more] RenderStage() +[more] RenderStage()
    -[more]virtual osg::Object* clone() const +[more]virtual osg::Object* clone() const
    -[more]virtual bool isSameKindAs(const osg::Object* obj) const +[more]virtual bool isSameKindAs(const osg::Object* obj) const
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    -[more]virtual void reset() +[more]virtual void reset()
    -[more]void setViewport(osg::Viewport* viewport) +[more]void setViewport(osg::Viewport* viewport)
    Set the viewport
    -[more]const osg::Viewport* getViewport() const +[more]const osg::Viewport* getViewport() const
    Get the const viewport.
    -[more]osg::Viewport* getViewport() +[more]osg::Viewport* getViewport()
    Get the viewport.
    -[more]void setClearMask(const GLbitfield mask) +[more]void setClearMask(const GLbitfield mask)
    Set the clear mask used in glClear().
    -[more]const GLbitfield getClearMask() const +[more]const GLbitfield getClearMask() const
    Get the clear mask
    -[more]void setClearColor(const osg::Vec4& color) +[more]void setColorMask(osg::ColorMask* cm) +
    +[more]osg::ColorMask* getColorMask() +
    +[more]const osg::ColorMask* getColorMask() const +
    +[more]void setClearColor(const osg::Vec4& color)
    Set the clear color used in glClearColor().
    -[more]const osg::Vec4& getClearColor() const +[more]const osg::Vec4& getClearColor() const
    Get the clear color
    -[more]void setClearAccum(const osg::Vec4& color) +[more]void setClearAccum(const osg::Vec4& color)
    Set the clear accum used in glClearAccum().
    -[more]const osg::Vec4& getClearAccum() const +[more]const osg::Vec4& getClearAccum() const
    Get the clear accum
    -[more]void setClearDepth(const double depth) +[more]void setClearDepth(const double depth)
    Set the clear depth used in glClearDepth().
    -[more]const double getClearDepth() const +[more]const double getClearDepth() const
    Get the clear depth
    -[more]void setClearStencil(const int stencil) +[more]void setClearStencil(const int stencil)
    Set the clear stencil value used in glClearStencil().
    -[more]const int getClearStencil() const +[more]const int getClearStencil() const
    Get the clear color
    -[more]void setCamera(osg::Camera* camera) +[more]void setCamera(osg::Camera* camera)
    -[more]osg::Camera* getCamera() +[more]osg::Camera* getCamera()
    -[more]const osg::Camera* getCamera() const +[more]const osg::Camera* getCamera() const
    -[more]void setRenderStageLighting(RenderStageLighting* rsl) +[more]void setRenderStageLighting(RenderStageLighting* rsl)
    -[more]RenderStageLighting* getRenderStageLighting() const +[more]RenderStageLighting* getRenderStageLighting() const
    -[more]void setLightingMode(RenderStageLighting::Mode mode) +[more]void setLightingMode(RenderStageLighting::Mode mode)
    -[more]RenderStageLighting::Mode getLightingMode() const +[more]RenderStageLighting::Mode getLightingMode() const
    -[more]void setLight(osg::Light* light) +[more]void setLight(osg::Light* light)
    -[more]osg::Light* getLight() +[more]osg::Light* getLight()
    -[more]const osg::Light* getLight() const +[more]const osg::Light* getLight() const
    -[more]virtual void addLight(osg::Light* light, osg::Matrix* matrix) +[more]virtual void addLight(osg::Light* light, osg::Matrix* matrix)
    -[more]virtual void draw(osg::State& state, RenderLeaf*& previous) +[more]virtual void draw(osg::State& state, RenderLeaf*& previous)
    -[more]void addToDependencyList(RenderStage* rs) +[more]void addToDependencyList(RenderStage* rs)
    -[more]void getPrims(Statistics* primStats) +[more]bool getStats(osg::Statistics* primStats)
    extract stats for current draw list.

    Public Members

    -[more]typedef std::vector< osg::ref_ptr<RenderStage> > DependencyList bool _stageDrawnThisFrame +[more]typedef std::vector< osg::ref_ptr<RenderStage> > DependencyList bool _stageDrawnThisFrame

    Protected Methods

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

    @@ -166,6 +174,10 @@ ovirtual void sort_local()
    ovirtual void draw_local(osg::State& state, RenderLeaf*& previous) +
    +ovoid getPrims(osg::Statistics* primStats) +
    +obool getPrims(osg::Statistics* primStats, const int nbin)

    @@ -182,201 +194,217 @@ RenderState base class. Used for encapsulate a complete stage in rendering - setting up of viewport, the projection and model matrices and rendering the RenderBin's enclosed with this RenderStage. -RenderStage also has a dependancy list of other RenderStages, each +RenderStage also has a dependency list of other RenderStages, each of which must be called before the rendering of this stage. These 'pre' rendering stages are used for advanced rendering techniques like multistage pixel shading or impostors.
    - +
    o RenderStage()

    - +

    ovirtual osg::Object* clone() const

    - +

    ovirtual bool isSameKindAs(const osg::Object* obj) const

    - +

    ovirtual const char* className() const

    - +

    ovirtual void reset()

    - +

    ovoid setViewport(osg::Viewport* viewport)
    Set the viewport

    - +

    oconst osg::Viewport* getViewport() const
    Get the const viewport.

    - +

    oosg::Viewport* getViewport()
    Get the viewport.

    - +

    ovoid setClearMask(const GLbitfield mask)
    Set the clear mask used in glClear(). Defaults to GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT.

    - +

    oconst GLbitfield getClearMask() const
    Get the clear mask

    + + +

    ovoid setColorMask(osg::ColorMask* cm) +

    + + +

    oosg::ColorMask* getColorMask() +

    + + +

    oconst osg::ColorMask* getColorMask() const +

    - +

    ovoid setClearColor(const osg::Vec4& color)
    Set the clear color used in glClearColor(). glClearColor is only called if mask & GL_COLOR_BUFFER_BIT is true

    - +

    oconst osg::Vec4& getClearColor() const
    Get the clear color

    - +

    ovoid setClearAccum(const osg::Vec4& color)
    Set the clear accum used in glClearAccum(). glClearAcumm is only called if mask & GL_ACCUM_BUFFER_BIT is true

    - +

    oconst osg::Vec4& getClearAccum() const
    Get the clear accum

    - +

    ovoid setClearDepth(const double depth)
    Set the clear depth used in glClearDepth(). Defaults to 1.0 glClearDepth is only called if mask & GL_DEPTH_BUFFER_BIT is true

    - +

    oconst double getClearDepth() const
    Get the clear depth

    - +

    ovoid setClearStencil(const int stencil)
    Set the clear stencil value used in glClearStencil(). Defaults to 1.0 glClearStencil is only called if mask & GL_STENCIL_BUFFER_BIT is true

    - +

    oconst int getClearStencil() const
    Get the clear color

    - +

    ovoid setCamera(osg::Camera* camera)

    - +

    oosg::Camera* getCamera()

    - +

    oconst osg::Camera* getCamera() const

    - +

    ovoid setRenderStageLighting(RenderStageLighting* rsl)

    - +

    oRenderStageLighting* getRenderStageLighting() const

    - +

    ovoid setLightingMode(RenderStageLighting::Mode mode)

    - +

    oRenderStageLighting::Mode getLightingMode() const

    - +

    ovoid setLight(osg::Light* light)

    - +

    oosg::Light* getLight()

    - +

    oconst osg::Light* getLight() const

    - +

    ovirtual void addLight(osg::Light* light, osg::Matrix* matrix)

    - +

    ovirtual void draw(osg::State& state, RenderLeaf*& previous)

    - +

    ovoid addToDependencyList(RenderStage* rs)

    - - -

    ovoid getPrims(Statistics* primStats) + + +
    obool getStats(osg::Statistics* primStats)
    extract stats for current draw list.

    - +

    otypedef std::vector< osg::ref_ptr<RenderStage> > DependencyList bool _stageDrawnThisFrame

    - +

    oDependencyList _dependencyList

    - +

    oosg::ref_ptr<osg::Camera> _camera

    - +

    oosg::ref_ptr<osg::Viewport> _viewport

    - +

    oGLbitfield _clearMask

    + + +

    oosg::ref_ptr<osg::ColorMask> _colorMask +

    - +

    oosg::Vec4 _clearColor

    - +

    oosg::Vec4 _clearAccum

    - +

    odouble _clearDepth

    - +

    oint _clearStencil

    - +

    omutable osg::ref_ptr<RenderStageLighting> _renderStageLighting

    - +

    ovirtual ~RenderStage()

    diff --git a/doc/doc++/osgUtil/RenderStageLighting.html b/doc/doc++/osgUtil/RenderStageLighting.html index 8ec040993..fa26d8fa8 100644 --- a/doc/doc++/osgUtil/RenderStageLighting.html +++ b/doc/doc++/osgUtil/RenderStageLighting.html @@ -23,48 +23,48 @@

    Public Fields

    -[more]Mode _lightingMode +[more]Mode _lightingMode
    -[more]osg::ref_ptr<osg::Light> _light +[more]osg::ref_ptr<osg::Light> _light
    -[more]LightList _lightList +[more]LightList _lightList

    Public Methods

    -[more] RenderStageLighting() +[more] RenderStageLighting()
    -[more]virtual osg::Object* clone() const +[more]virtual osg::Object* clone() const
    -[more]virtual bool isSameKindAs(const osg::Object* obj) const +[more]virtual bool isSameKindAs(const osg::Object* obj) const
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    -[more]virtual void reset() +[more]virtual void reset()
    -[more]void setLightingMode(Mode mode) +[more]void setLightingMode(Mode mode)
    -[more]Mode getLightingMode() const +[more]Mode getLightingMode() const
    -[more]void setLight(osg::Light* light) +[more]void setLight(osg::Light* light)
    -[more]osg::Light* getLight() +[more]osg::Light* getLight()
    -[more]const osg::Light* getLight() const +[more]const osg::Light* getLight() const
    -[more]typedef std::vector< LightMatrixPair >virtual LightList void addLight(osg::Light* light, osg::Matrix* matrix) +[more]typedef std::vector< LightMatrixPair >virtual LightList void addLight(osg::Light* light, osg::Matrix* matrix)
    -[more]virtual void draw(osg::State& state, RenderLeaf*& previous) +[more]virtual void draw(osg::State& state, RenderLeaf*& previous)

    Public Members

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

    Protected Methods

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

    @@ -77,85 +77,85 @@ RenderBin base class
    - +
    o RenderStageLighting()

    - +

    ovirtual osg::Object* clone() const

    - +

    ovirtual bool isSameKindAs(const osg::Object* obj) const

    - +

    ovirtual const char* className() const

    - +

    ovirtual void reset()

    - +

    oenum Mode

    - +
    o HEADLIGHT

    - +

    o SKY_LIGHT

    - +

    o NO_SCENEVIEW_LIGHT

    - -
    ovoid setLightingMode(Mode mode) + +
    ovoid setLightingMode(Mode mode)

    - -

    oMode getLightingMode() const + +
    oMode getLightingMode() const

    - +

    ovoid setLight(osg::Light* light)

    - +

    oosg::Light* getLight()

    - +

    oconst osg::Light* getLight() const

    - +

    otypedef std::vector< LightMatrixPair >virtual LightList void addLight(osg::Light* light, osg::Matrix* matrix)

    - +

    ovirtual void draw(osg::State& state, RenderLeaf*& previous)

    - -

    oMode _lightingMode + +
    oMode _lightingMode

    - +

    oosg::ref_ptr<osg::Light> _light

    - +

    oLightList _lightList

    - +

    ovirtual ~RenderStageLighting()

    diff --git a/doc/doc++/osgUtil/RenderToTextureStage.html b/doc/doc++/osgUtil/RenderToTextureStage.html index 3e694d74f..5de38bb29 100644 --- a/doc/doc++/osgUtil/RenderToTextureStage.html +++ b/doc/doc++/osgUtil/RenderToTextureStage.html @@ -23,31 +23,31 @@

    Public Methods

    -[more] RenderToTextureStage() +[more] RenderToTextureStage()
    -[more]virtual osg::Object* clone() const +[more]virtual osg::Object* clone() const
    -[more]virtual bool isSameKindAs(const osg::Object* obj) const +[more]virtual bool isSameKindAs(const osg::Object* obj) const
    -[more]virtual const char* className() const +[more]virtual const char* className() const
    -[more]virtual void reset() +[more]virtual void reset()
    -[more]void setTexture(osg::Texture* texture) +[more]void setTexture(osg::Texture* texture)
    -[more]osg::Texture* getTexture() +[more]osg::Texture* getTexture()
    -[more]virtual void draw(osg::State& state, RenderLeaf*& previous) +[more]virtual void draw(osg::State& state, RenderLeaf*& previous)

    Protected Fields

    -[more]osg::ref_ptr<osg::Texture> _texture +[more]osg::ref_ptr<osg::Texture> _texture

    Protected Methods

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

    @@ -63,6 +63,8 @@
    oGLbitfield _clearMask
    +oosg::ref_ptr<osg::ColorMask> _colorMask +
    oosg::Vec4 _clearColor
    oosg::Vec4 _clearAccum @@ -86,6 +88,12 @@
    oconst GLbitfield getClearMask() const
    +ovoid setColorMask(osg::ColorMask* cm) +
    +oosg::ColorMask* getColorMask() +
    +oconst osg::ColorMask* getColorMask() const +
    ovoid setClearColor(const osg::Vec4& color)
    oconst osg::Vec4& getClearColor() const @@ -126,7 +134,7 @@
    ovoid addToDependencyList(RenderStage* rs)
    -ovoid getPrims(Statistics* primStats) +obool getStats(osg::Statistics* primStats)

    @@ -167,6 +175,10 @@ ovirtual void sort_local()
    ovirtual void draw_local(osg::State& state, RenderLeaf*& previous) +
    +ovoid getPrims(osg::Statistics* primStats) +
    +obool getPrims(osg::Statistics* primStats, const int nbin)

    @@ -184,43 +196,43 @@ RenderBin base class
    - +
    o RenderToTextureStage()

    - +

    ovirtual osg::Object* clone() const

    - +

    ovirtual bool isSameKindAs(const osg::Object* obj) const

    - +

    ovirtual const char* className() const

    - +

    ovirtual void reset()

    - +

    ovoid setTexture(osg::Texture* texture)

    - +

    oosg::Texture* getTexture()

    - +

    ovirtual void draw(osg::State& state, RenderLeaf*& previous)

    - +

    ovirtual ~RenderToTextureStage()

    - +

    oosg::ref_ptr<osg::Texture> _texture

    diff --git a/doc/doc++/osgUtil/SceneView.html b/doc/doc++/osgUtil/SceneView.html index 4ca843edf..ef93ce04e 100644 --- a/doc/doc++/osgUtil/SceneView.html +++ b/doc/doc++/osgUtil/SceneView.html @@ -7,7 +7,7 @@ -

    class OSGUTIL_EXPORT osgUtil::SceneView

    SceneView is literaly a view of a scene, encapsulating the camera, global state, lights and the scene itself.
    +

    class OSGUTIL_EXPORT osgUtil::SceneView

    SceneView is literally a view of a scene, encapsulating the camera, global state, lights and the scene itself.

    Inheritance:

    @@ -23,184 +23,205 @@

    Public Methods

    -[more] SceneView() -
    Constrcut a default scene view +[more] SceneView(osg::DisplaySettings* ds=NULL) +
    Construct a default scene view
    -[more]void setDefaults() +[more]void setDefaults()
    Set scene view to use default global state, light, camera and render visitor
    -[more]void setSceneData(osg::Node* node) +[more]void setSceneData(osg::Node* node)
    Set the data which to view.
    -[more]osg::Node* getSceneData() +[more]osg::Node* getSceneData()
    Get the scene data which to view.
    -[more]const osg::Node* getSceneData() const +[more]const osg::Node* getSceneData() const
    Get the const scene data which to view.
    -[more]void setViewport(osg::Viewport* viewport) +[more]void setViewport(osg::Viewport* viewport)
    Set the viewport of the scene view to use specfied osg::Viewport.
    -[more]void setViewport(int x, int y, int width, int height) +[more]void setViewport(int x, int y, int width, int height)
    Set the viewport of the scene view to specified dimensions.
    -[more]const osg::Viewport* getViewport() const +[more]const osg::Viewport* getViewport() const
    Get the const viewport.
    -[more]osg::Viewport* getViewport() +[more]osg::Viewport* getViewport()
    Get the viewport.
    -[more]void getViewport(int& x, int& y, int& width, int& height) +[more]void getViewport(int& x, int& y, int& width, int& height)
    Get the viewport of the scene view.
    -[more]void setBackgroundColor(const osg::Vec4& color) +[more]inline void setDisplaySettings(osg::DisplaySettings* vs) +
    Set the DisplaySettings. +
    +[more]inline const osg::DisplaySettings* getDisplaySettings() const +
    Get the DisplaySettings +
    +[more]void setBackgroundColor(const osg::Vec4& color)
    Set the background color used in glClearColor().
    -[more]const osg::Vec4& getBackgroundColor() const +[more]const osg::Vec4& getBackgroundColor() const
    Get the background color
    -[more]void setGlobalState(osg::StateSet* state) +[more]void setGlobalStateSet(osg::StateSet* state)
    -[more]osg::StateSet* getGlobalState() +[more]osg::StateSet* getGlobalStateSet()
    -[more]const osg::StateSet* getGlobalState() const +[more]const osg::StateSet* getGlobalStateSet() const
    -[more]void setLightingMode(LightingMode mode) +[more]void setLightingMode(LightingMode mode)
    -[more]LightingMode getLightingMode() const +[more]LightingMode getLightingMode() const
    -[more]void setLight(osg::Light* light) +[more]void setLight(osg::Light* light)
    -[more]osg::Light* getLight() +[more]osg::Light* getLight()
    -[more]const osg::Light* getLight() const +[more]const osg::Light* getLight() const
    -[more]void setCamera(osg::Camera* camera) +[more]void setState(osg::State* state)
    -[more]osg::Camera* getCamera() +[more]osg::State* getState()
    -[more]const osg::Camera* getCamera() const +[more]const osg::State* getState() const
    -[more]void setState(osg::State* state) +[more]void setCamera(osg::Camera* camera)
    -[more]osg::State* getState() +[more]osg::Camera* getCamera()
    -[more]const osg::State* getState() const +[more]const osg::Camera* getCamera() const
    -[more]void setAppVisitor(osg::NodeVisitor* av) +[more]void setInitVisitor(osg::NodeVisitor* av)
    -[more]osg::NodeVisitor* getAppVisitor() +[more]osg::NodeVisitor* getInitVisitor()
    -[more]const osg::NodeVisitor* getAppVisitor() const +[more]const osg::NodeVisitor* getInitVisitor() const
    -[more]void setCullVisitor(osgUtil::CullVisitor* cv) +[more]void setAppVisitor(osg::NodeVisitor* av)
    -[more]osgUtil::CullVisitor* getCullVisitor() +[more]osg::NodeVisitor* getAppVisitor()
    -[more]const osgUtil::CullVisitor* getCullVisitor() const +[more]const osg::NodeVisitor* getAppVisitor() const
    -[more]void setRenderGraph(osgUtil::RenderGraph* rg) +[more]void setCullVisitor(osgUtil::CullVisitor* cv)
    -[more]osgUtil::RenderGraph* getRenderGraph() +[more]osgUtil::CullVisitor* getCullVisitor()
    -[more]const osgUtil::RenderGraph* getRenderGraph() const +[more]const osgUtil::CullVisitor* getCullVisitor() const
    -[more]void setRenderStage(osgUtil::RenderStage* rs) +[more]void setRenderGraph(osgUtil::RenderGraph* rg)
    -[more]osgUtil::RenderStage* getRenderStage() +[more]osgUtil::RenderGraph* getRenderGraph()
    -[more]const osgUtil::RenderStage* getRenderStage() const +[more]const osgUtil::RenderGraph* getRenderGraph() const
    -[more]void setLODBias(float bias) +[more]void setRenderStage(osgUtil::RenderStage* rs)
    -[more]float getLODBias() const +[more]osgUtil::RenderStage* getRenderStage()
    -[more]void setCalcNearFar(bool calc) +[more]const osgUtil::RenderStage* getRenderStage() const +
    +[more]void setLODBias(float bias) +
    +[more]float getLODBias() const +
    +[more]void setCalcNearFar(bool calc)
    Set to true if you want SceneView to automatically calculate values for the near/far clipping planes, each frame, set false to use camera's internal near and far planes.
    -[more]bool getCalcNearFar() const -
    return true if SceneView automatically caclculates near and far clipping planes for each frame +[more]bool getCalcNearFar() const +
    return true if SceneView automatically calculates near and far clipping planes for each frame
    -[more]void setPrioritizeTextures(bool pt) +[more]void setPrioritizeTextures(bool pt)
    set whether the draw method should call renderer->prioritizeTexture
    -[more]bool getPrioritizeTextures() const +[more]bool getPrioritizeTextures() const
    get whether the draw method should call renderer->prioritizeTexture
    -[more]bool projectWindowIntoObject(const osg::Vec3& window, osg::Vec3& object) const +[more]bool projectWindowIntoObject(const osg::Vec3& window, osg::Vec3& object) const
    Calculate, via glUnProject, the object coordinates of a window point.
    -[more]bool projectWindowXYIntoObject(int x, int y, osg::Vec3& near_point, osg::Vec3& far_point) const +[more]bool projectWindowXYIntoObject(int x, int y, osg::Vec3& near_point, osg::Vec3& far_point) const
    Calculate, via glUnProject, the object coordinates of a window x,y when projected onto the near and far planes.
    -[more]bool projectObjectIntoWindow(const osg::Vec3& object, osg::Vec3& window) const +[more]bool projectObjectIntoWindow(const osg::Vec3& object, osg::Vec3& window) const
    Calculate, via glProject, the object coordinates of a window.
    -[more]inline void setFrameStamp(osg::FrameStamp* fs) +[more]inline void setFrameStamp(osg::FrameStamp* fs)
    Set the frame stamp for the current frame
    -[more]inline const osg::FrameStamp* getFrameStamp() const +[more]inline const osg::FrameStamp* getFrameStamp() const
    Set the frame stamp for the current frame
    -[more]virtual void app() -
    do app traversal of attached scene graph using App NodeVisitor +[more]virtual void init() +
    Do init traversal of attached scene graph using Init NodeVisitor.
    -[more]virtual void cull() -
    do cull traversal of attached scene graph using App CullVisitor +[more]virtual void app() +
    Do app traversal of attached scene graph using App NodeVisitor
    -[more]virtual void draw() -
    do draw traversal of draw bins generated by cull traversal +[more]virtual void cull() +
    Do cull traversal of attached scene graph using Cull NodeVisitor +
    +[more]virtual void draw() +
    Do draw traversal of draw bins generated by cull traversal

    Public Members

    -[more]enum LightingMode +[more]enum LightingMode

    Protected Fields

    -[more]osg::ref_ptr<osg::Node> _sceneData +[more]osg::ref_ptr<osg::Node> _sceneData
    -[more]osg::ref_ptr<osg::StateSet> _globalState +[more]osg::ref_ptr<osg::StateSet> _globalState
    -[more]osg::ref_ptr<osg::Light> _light +[more]osg::ref_ptr<osg::Light> _light
    -[more]osg::ref_ptr<osg::Camera> _camera +[more]osg::ref_ptr<osg::Camera> _camera
    -[more]osg::ref_ptr<osg::State> _state +[more]osg::ref_ptr<osg::DisplaySettings> _displaySettings
    -[more]osg::ref_ptr<osg::NodeVisitor> _appVisitor +[more]osg::ref_ptr<osg::State> _state
    -[more]osg::ref_ptr<osgUtil::CullVisitor> _cullVisitor +[more]bool _initCalled
    -[more]osg::ref_ptr<osgUtil::RenderGraph> _rendergraph +[more]osg::ref_ptr<osg::NodeVisitor> _initVisitor
    -[more]osg::ref_ptr<osgUtil::RenderStage> _renderStage +[more]osg::ref_ptr<osg::NodeVisitor> _appVisitor
    -[more]osg::ref_ptr<osg::FrameStamp> _frameStamp +[more]osg::ref_ptr<osgUtil::CullVisitor> _cullVisitor
    -[more]bool _need_compile +[more]osg::ref_ptr<osgUtil::RenderGraph> _rendergraph
    -[more]bool _calc_nearfar +[more]osg::ref_ptr<osgUtil::RenderStage> _renderStage
    -[more]osg::Vec4 _backgroundColor +[more]osg::ref_ptr<osg::FrameStamp> _frameStamp
    -[more]double _near_plane +[more]bool _need_compile
    -[more]double _far_plane +[more]bool _calc_nearfar
    -[more]float _lodBias +[more]osg::Vec4 _backgroundColor
    -[more]osg::ref_ptr<osg::Viewport> _viewport +[more]double _near_plane
    -[more]LightingMode _lightingMode +[more]double _far_plane
    -[more]bool _prioritizeTextures +[more]float _lodBias +
    +[more]osg::ref_ptr<osg::Viewport> _viewport +
    +[more]LightingMode _lightingMode +
    +[more]bool _prioritizeTextures

    Protected Methods

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

    @@ -209,231 +230,253 @@

    Documentation

    -SceneView is literaly a view of a scene, encapsulating the +SceneView is literally a view of a scene, encapsulating the camera, global state, lights and the scene itself. Provides methods for setting up the view and rendering it.
    - -
    o SceneView() -
    Constrcut a default scene view + +
    o SceneView(osg::DisplaySettings* ds=NULL) +
    Construct a default scene view

    - +

    ovoid setDefaults()
    Set scene view to use default global state, light, camera and render visitor

    - +

    ovoid setSceneData(osg::Node* node)
    Set the data which to view. The data will typically be an osg::Scene but can be any osg::Node type.

    - +

    oosg::Node* getSceneData()
    Get the scene data which to view. The data will typically be an osg::Scene but can be any osg::Node type.

    - +

    oconst osg::Node* getSceneData() const
    Get the const scene data which to view. The data will typically be an osg::Scene but can be any osg::Node type.

    - +

    ovoid setViewport(osg::Viewport* viewport)
    Set the viewport of the scene view to use specfied osg::Viewport.

    - +

    ovoid setViewport(int x, int y, int width, int height)
    Set the viewport of the scene view to specified dimensions.

    - +

    oconst osg::Viewport* getViewport() const
    Get the const viewport.

    - +

    oosg::Viewport* getViewport()
    Get the viewport.

    - +

    ovoid getViewport(int& x, int& y, int& width, int& height)
    Get the viewport of the scene view.

    + + +

    oinline void setDisplaySettings(osg::DisplaySettings* vs) +
    Set the DisplaySettings. +

    + + +

    oinline const osg::DisplaySettings* getDisplaySettings() const +
    Get the DisplaySettings +

    - +

    ovoid setBackgroundColor(const osg::Vec4& color)
    Set the background color used in glClearColor(). Defaults to an off blue color.

    - +

    oconst osg::Vec4& getBackgroundColor() const
    Get the background color

    - - -

    ovoid setGlobalState(osg::StateSet* state) + + +
    ovoid setGlobalStateSet(osg::StateSet* state)

    - - -

    oosg::StateSet* getGlobalState() + + +
    oosg::StateSet* getGlobalStateSet()

    - - -

    oconst osg::StateSet* getGlobalState() const + + +
    oconst osg::StateSet* getGlobalStateSet() const

    - +

    oenum LightingMode

    - +
    o HEADLIGHT

    - +

    o SKY_LIGHT

    - +

    o NO_SCENEVIEW_LIGHT

    - -
    ovoid setLightingMode(LightingMode mode) + +
    ovoid setLightingMode(LightingMode mode)

    - -

    oLightingMode getLightingMode() const + +
    oLightingMode getLightingMode() const

    - +

    ovoid setLight(osg::Light* light)

    - +

    oosg::Light* getLight()

    - +

    oconst osg::Light* getLight() const

    - - -

    ovoid setCamera(osg::Camera* camera) -

    - - -

    oosg::Camera* getCamera() -

    - - -

    oconst osg::Camera* getCamera() const -

    - +

    ovoid setState(osg::State* state)

    - +

    oosg::State* getState()

    - +

    oconst osg::State* getState() const

    + + +

    ovoid setCamera(osg::Camera* camera) +

    + + +

    oosg::Camera* getCamera() +

    + + +

    oconst osg::Camera* getCamera() const +

    + + +

    ovoid setInitVisitor(osg::NodeVisitor* av) +

    + + +

    oosg::NodeVisitor* getInitVisitor() +

    + + +

    oconst osg::NodeVisitor* getInitVisitor() const +

    - +

    ovoid setAppVisitor(osg::NodeVisitor* av)

    - +

    oosg::NodeVisitor* getAppVisitor()

    - +

    oconst osg::NodeVisitor* getAppVisitor() const

    - +

    ovoid setCullVisitor(osgUtil::CullVisitor* cv)

    - +

    oosgUtil::CullVisitor* getCullVisitor()

    - +

    oconst osgUtil::CullVisitor* getCullVisitor() const

    - +

    ovoid setRenderGraph(osgUtil::RenderGraph* rg)

    - +

    oosgUtil::RenderGraph* getRenderGraph()

    - +

    oconst osgUtil::RenderGraph* getRenderGraph() const

    - +

    ovoid setRenderStage(osgUtil::RenderStage* rs)

    - +

    oosgUtil::RenderStage* getRenderStage()

    - +

    oconst osgUtil::RenderStage* getRenderStage() const

    - +

    ovoid setLODBias(float bias)

    - +

    ofloat getLODBias() const

    - +

    ovoid setCalcNearFar(bool calc)
    Set to true if you want SceneView to automatically calculate values for the near/far clipping planes, each frame, set false to use camera's internal near and far planes. Default value is true.

    - +

    obool getCalcNearFar() const -
    return true if SceneView automatically caclculates near and +
    return true if SceneView automatically calculates near and far clipping planes for each frame

    - +

    ovoid setPrioritizeTextures(bool pt)
    set whether the draw method should call renderer->prioritizeTexture

    - +

    obool getPrioritizeTextures() const
    get whether the draw method should call renderer->prioritizeTexture

    - +

    obool projectWindowIntoObject(const osg::Vec3& window, osg::Vec3& object) const
    Calculate, via glUnProject, the object coordinates of a window point. Note, current implementation requires that SceneView::draw() has been previously called @@ -442,7 +485,7 @@ windows coordinates are calculated relative to the bottom left of the window. Returns true on successful projection.

    - +

    obool projectWindowXYIntoObject(int x, int y, osg::Vec3& near_point, osg::Vec3& far_point) const
    Calculate, via glUnProject, the object coordinates of a window x,y when projected onto the near and far planes. @@ -452,7 +495,7 @@ windows coordinates are calculated relative to the bottom left of the window. Returns true on successful projection.

    - +

    obool projectObjectIntoWindow(const osg::Vec3& object, osg::Vec3& window) const
    Calculate, via glProject, the object coordinates of a window. Note, current implementation requires that SceneView::draw() has been previously called @@ -463,108 +506,131 @@ so you may need to pass in (mouseX,window_height-mouseY,...). Returns true on successful projection.

    - +

    oinline void setFrameStamp(osg::FrameStamp* fs)
    Set the frame stamp for the current frame

    - +

    oinline const osg::FrameStamp* getFrameStamp() const
    Set the frame stamp for the current frame

    + + +

    ovirtual void init() +
    Do init traversal of attached scene graph using Init NodeVisitor. +The init traversal is called once for each SceneView, and should +be used to compile display list, texture objects intialize data +not otherwise intializaed during scene graph loading. Note, is +called automatically by app&cull if it hasn't already been called +elsewhere. Also init() should only ever be called within a valid +graphics context. +

    - +

    ovirtual void app() -
    do app traversal of attached scene graph using App NodeVisitor +
    Do app traversal of attached scene graph using App NodeVisitor

    - +

    ovirtual void cull() -
    do cull traversal of attached scene graph using App CullVisitor +
    Do cull traversal of attached scene graph using Cull NodeVisitor

    - +

    ovirtual void draw() -
    do draw traversal of draw bins generated by cull traversal +
    Do draw traversal of draw bins generated by cull traversal

    - +

    ovirtual ~SceneView()

    - +

    oosg::ref_ptr<osg::Node> _sceneData

    - +

    oosg::ref_ptr<osg::StateSet> _globalState

    - +

    oosg::ref_ptr<osg::Light> _light

    - +

    oosg::ref_ptr<osg::Camera> _camera

    + + +

    oosg::ref_ptr<osg::DisplaySettings> _displaySettings +

    - +

    oosg::ref_ptr<osg::State> _state

    + + +

    obool _initCalled +

    + + +

    oosg::ref_ptr<osg::NodeVisitor> _initVisitor +

    - +

    oosg::ref_ptr<osg::NodeVisitor> _appVisitor

    - +

    oosg::ref_ptr<osgUtil::CullVisitor> _cullVisitor

    - +

    oosg::ref_ptr<osgUtil::RenderGraph> _rendergraph

    - +

    oosg::ref_ptr<osgUtil::RenderStage> _renderStage

    - +

    oosg::ref_ptr<osg::FrameStamp> _frameStamp

    - +

    obool _need_compile

    - +

    obool _calc_nearfar

    - +

    oosg::Vec4 _backgroundColor

    - +

    odouble _near_plane

    - +

    odouble _far_plane

    - +

    ofloat _lodBias

    - +

    oosg::ref_ptr<osg::Viewport> _viewport

    - -

    oLightingMode _lightingMode + +
    oLightingMode _lightingMode

    - +

    obool _prioritizeTextures

    diff --git a/doc/doc++/osgUtil/SceneViewManipulator.html b/doc/doc++/osgUtil/SceneViewManipulator.html index c9a91e0c5..10a702ebe 100644 --- a/doc/doc++/osgUtil/SceneViewManipulator.html +++ b/doc/doc++/osgUtil/SceneViewManipulator.html @@ -22,48 +22,48 @@

    Public Methods

    -[more] SceneViewManipulator() +[more] SceneViewManipulator()
    -[more]virtual ~SceneViewManipulator() +[more]virtual ~SceneViewManipulator()
    -[more]virtual void setSceneView(SceneView*) +[more]virtual void setSceneView(SceneView*)
    attach a scene view to the manipulator.
    -[more]virtual SceneView* getSceneView() +[more]virtual SceneView* getSceneView()
    get the attached a scene view
    -[more]virtual const SceneView* getSceneView() const +[more]virtual const SceneView* getSceneView() const
    get the attached a const scene view
    -[more]virtual void setCameraManipulator(CameraManipulator* cm) +[more]virtual void setCameraManipulator(CameraManipulator* cm)
    Set the camera manipulator on the object
    -[more]virtual CameraManipulator* getCameraManipulator() +[more]virtual CameraManipulator* getCameraManipulator()
    Get the camera manipulator on the object
    -[more]virtual const CameraManipulator* getCameraManipulator() const +[more]virtual const CameraManipulator* getCameraManipulator() const
    Get the const camera manipulator on the object
    -[more]virtual void setStateSetManipulator(StateSetManipulator* cm) +[more]virtual void setStateSetManipulator(StateSetManipulator* cm)
    Set the geostate manipulator on the object
    -[more]virtual StateSetManipulator* getStateSetManipulator() +[more]virtual StateSetManipulator* getStateSetManipulator()
    Get the geostate manipulator on the object
    -[more]virtual const StateSetManipulator* getStateSetManipulator() const +[more]virtual const StateSetManipulator* getStateSetManipulator() const
    Get the geostate manipulator on the object
    -[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Handle events, return true if handled, false otherwise

    Protected Fields

    -[more]osg::ref_ptr<SceneView> _sv +[more]osg::ref_ptr<SceneView> _sv
    -[more]osg::ref_ptr<CameraManipulator> _cm +[more]osg::ref_ptr<CameraManipulator> _cm
    -[more]osg::ref_ptr<StateSetManipulator> _gm +[more]osg::ref_ptr<StateSetManipulator> _gm

    @@ -77,73 +77,73 @@
    - +
    o SceneViewManipulator()

    - +

    ovirtual ~SceneViewManipulator()

    - +

    ovirtual void setSceneView(SceneView*)
    attach a scene view to the manipulator.

    - +

    ovirtual SceneView* getSceneView()
    get the attached a scene view

    - +

    ovirtual const SceneView* getSceneView() const
    get the attached a const scene view

    - +

    ovirtual void setCameraManipulator(CameraManipulator* cm)
    Set the camera manipulator on the object

    - +

    ovirtual CameraManipulator* getCameraManipulator()
    Get the camera manipulator on the object

    - +

    ovirtual const CameraManipulator* getCameraManipulator() const
    Get the const camera manipulator on the object

    - +

    ovirtual void setStateSetManipulator(StateSetManipulator* cm)
    Set the geostate manipulator on the object

    - +

    ovirtual StateSetManipulator* getStateSetManipulator()
    Get the geostate manipulator on the object

    - +

    ovirtual const StateSetManipulator* getStateSetManipulator() const
    Get the geostate manipulator on the object

    - +

    ovirtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Handle events, return true if handled, false otherwise

    - +

    oosg::ref_ptr<SceneView> _sv

    - +

    oosg::ref_ptr<CameraManipulator> _cm

    - +

    oosg::ref_ptr<StateSetManipulator> _gm

    diff --git a/doc/doc++/osgUtil/SmoothingVisitor.html b/doc/doc++/osgUtil/SmoothingVisitor.html index f3580f8e0..d2a4345d3 100644 --- a/doc/doc++/osgUtil/SmoothingVisitor.html +++ b/doc/doc++/osgUtil/SmoothingVisitor.html @@ -23,13 +23,13 @@

    Public Methods

    -[more] SmoothingVisitor() +[more] SmoothingVisitor()
    default to traversing all children
    -[more]static void smooth(osg::GeoSet& geoset) +[more]static void smooth(osg::GeoSet& geoset)
    smooth geoset by creating per vertex normals
    -[more]virtual void apply(osg::Geode& geode) +[more]virtual void apply(osg::Geode& geode)
    apply smoothing method to all geode geosets

    @@ -43,17 +43,17 @@ osg::GeoSet's which contains surface primitives
    - +
    o SmoothingVisitor()
    default to traversing all children

    - +

    ostatic void smooth(osg::GeoSet& geoset)
    smooth geoset by creating per vertex normals

    - +

    ovirtual void apply(osg::Geode& geode)
    apply smoothing method to all geode geosets

    diff --git a/doc/doc++/osgUtil/StateSetManipulator.html b/doc/doc++/osgUtil/StateSetManipulator.html index c1c47bc21..ab096536d 100644 --- a/doc/doc++/osgUtil/StateSetManipulator.html +++ b/doc/doc++/osgUtil/StateSetManipulator.html @@ -22,32 +22,32 @@

    Public Methods

    -[more] StateSetManipulator() +[more] StateSetManipulator()
    -[more]virtual ~StateSetManipulator() +[more]virtual ~StateSetManipulator()
    -[more]virtual void setStateSet(osg::StateSet*) +[more]virtual void setStateSet(osg::StateSet*)
    attach a geostate to the manipulator to be used for specifying view
    -[more]virtual osg::StateSet* getStateSet() +[more]virtual osg::StateSet* getStateSet()
    get the attached a geostate
    -[more]virtual const osg::StateSet* getStateSet() const +[more]virtual const osg::StateSet* getStateSet() const
    get the attached a geostate
    -[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us) +[more]virtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Handle events, return true if handled, false otherwise

    Protected Fields

    -[more]osg::ref_ptr<osg::StateSet> _drawState +[more]osg::ref_ptr<osg::StateSet> _drawState
    -[more]bool _backface +[more]bool _backface
    -[more]bool _lighting +[more]bool _lighting
    -[more]bool _texture +[more]bool _texture

    @@ -61,47 +61,47 @@
    - +
    o StateSetManipulator()

    - +

    ovirtual ~StateSetManipulator()

    - +

    ovirtual void setStateSet(osg::StateSet*)
    attach a geostate to the manipulator to be used for specifying view

    - +

    ovirtual osg::StateSet* getStateSet()
    get the attached a geostate

    - +

    ovirtual const osg::StateSet* getStateSet() const
    get the attached a geostate

    - +

    ovirtual bool handle(const GUIEventAdapter& ea, GUIActionAdapter& us)
    Handle events, return true if handled, false otherwise

    - +

    oosg::ref_ptr<osg::StateSet> _drawState

    - +

    obool _backface

    - +

    obool _lighting

    - +

    obool _texture

    diff --git a/doc/doc++/osgUtil/Tesselator.html b/doc/doc++/osgUtil/Tesselator.html index 3ebcd8d78..220bc89b4 100644 --- a/doc/doc++/osgUtil/Tesselator.html +++ b/doc/doc++/osgUtil/Tesselator.html @@ -7,7 +7,7 @@ -

    class OSGUTIL_EXPORT osgUtil::Tesselator

    A simple class for tesselating a single polygon boundary.
    +

    class OSGUTIL_EXPORT osgUtil::Tesselator

    A simple class for tessellating a single polygon boundary.
    @@ -65,9 +65,9 @@

    Documentation

    -
    A simple class for tesselating a single polygon boundary. -Currently uses old style glu tesselation functions for portablity. -It be nice to use the modern glu tesselation functions or to find +
    A simple class for tessellating a single polygon boundary. +Currently uses old style glu tessellation functions for portability. +It be nice to use the modern glu tessellation functions or to find a small set of code for doing this job better.
    diff --git a/doc/doc++/osgUtil/TriStripVisitor.html b/doc/doc++/osgUtil/TriStripVisitor.html index 079144b4a..3f557f1cc 100644 --- a/doc/doc++/osgUtil/TriStripVisitor.html +++ b/doc/doc++/osgUtil/TriStripVisitor.html @@ -23,13 +23,13 @@

    Public Methods

    -[more] TriStripVisitor() +[more] TriStripVisitor()
    default to traversing all children
    -[more]static void stripify(osg::GeoSet& gset) +[more]static void stripify(osg::GeoSet& gset)
    convert mesh primitives in geoset into Tri Strips using NvTriStrip.
    -[more]virtual void apply(osg::Geode& geode) +[more]virtual void apply(osg::Geode& geode)
    apply stripify method to all geode geosets

    @@ -43,19 +43,19 @@ The current implemention is based up NVidia's NvTriStrip.
    - +
    o TriStripVisitor()
    default to traversing all children

    - +

    ostatic void stripify(osg::GeoSet& gset)
    convert mesh primitives in geoset into Tri Strips using -NvTriStrip. Converts all primtive types except points +NvTriStrip. Converts all primitive types except points and lines, linestrips which it leaves unchanged.

    - +

    ovirtual void apply(osg::Geode& geode)
    apply stripify method to all geode geosets

    diff --git a/doc/doc++/osgUtil/index.html b/doc/doc++/osgUtil/index.html index a81d82d15..4fa1acc2d 100644 --- a/doc/doc++/osgUtil/index.html +++ b/doc/doc++/osgUtil/index.html @@ -25,6 +25,7 @@
  • OSGUTIL_CULLVISITOR
  • OSGUTIL_DEPTHSORTEDBIN
  • OSGUTIL_DISPLAYLISTVISITOR +
  • OSGUTIL_DISPLAYREQUIREMENTSVISITOR
  • OSGUTIL_DRIVEMANIPULATOR
  • OSGUTIL_EXPORT:

    Hierarchy of classes


    diff --git a/doc/doc++/osgUtil/osgUtil.html b/doc/doc++/osgUtil/osgUtil.html index 2570816bb..ebcb26ff9 100644 --- a/doc/doc++/osgUtil/osgUtil.html +++ b/doc/doc++/osgUtil/osgUtil.html @@ -25,7 +25,10 @@ class OSGUTIL_EXPORT CullVisitor: public class OSGUTIL_EXPORT DepthSortedBin: public RenderBin
    class OSGUTIL_EXPORT DisplayListVisitor: public osg::NodeVisitor -
    Visitor for traversing scene graph and setting each osg::GeoSet's _useDisplayList flag, with option to immediately compile osg::GeoSet's OpenGL Display lists. +
    Visitor for traversing scene graph and setting each osg::GeoSet's _useDisplayList flag, with option to immediately compile osg::Drawable OpenGL Display lists and osg::StateAttribute's +
    +class OSGUTIL_EXPORT DisplayRequirementsVisitor: public osg::NodeVisitor +
    A visitor for traversing a scene graph establishing the OpenGL visuals are required to support rendering of that scene graph.
    class OSGUTIL_EXPORT DriveManipulator: public CameraManipulator
    @@ -49,7 +52,7 @@ class OSGUTIL_EXPORT Hit: public osg::Referenced class OSGUTIL_EXPORT IntersectVisitor: public osg::NodeVisitor
    Basic visitor for ray based collisions of a scene.
    -class OSGUTIL_EXPORT OptimizeStateVisitor: public osg::NodeVisitor +class OSGUTIL_EXPORT Optimizer
    Insert impostor nodes into scene graph.
    class OSGUTIL_EXPORT RenderBin: public osg::Object @@ -73,7 +76,7 @@ class OSGUTIL_EXPORT RenderToTextureStag
    RenderBin base class
    class OSGUTIL_EXPORT SceneView: public osg::Referenced -
    SceneView is literaly a view of a scene, encapsulating the camera, global state, lights and the scene itself. +
    SceneView is literally a view of a scene, encapsulating the camera, global state, lights and the scene itself.
    class OSGUTIL_EXPORT SceneViewManipulator: public GUIEventHandler
    @@ -82,19 +85,15 @@ class OSGUTIL_EXPORT SmoothingVisitor class OSGUTIL_EXPORT StateSetManipulator: public GUIEventHandler
    -class OSGUTIL_EXPORT Statistics: public osg::Object -
    Statistics base class. -
    class OSGUTIL_EXPORT Tesselator -
    A simple class for tesselating a single polygon boundary. +
    A simple class for tessellating a single polygon boundary.
    class OSGUTIL_EXPORT TrackballManipulator: public CameraManipulator
    +class OSGUTIL_EXPORT TransformCallback: public osg::NodeCallback +
    class OSGUTIL_EXPORT TriStripVisitor: public osg::NodeVisitor
    A tri stripping visitor for converting GeoSet primitives into tri strips. -
    -class OSGUTIL_EXPORT VisualsRequirementsVisitor: public osg::NodeVisitor -
    A visitor for traversing a scene graph establishing the OpenGL visuals are required to support rendering of that scene graph.

    • diff --git a/doc/doc++/osgUtil/osgUtilGetVersion.html b/doc/doc++/osgUtil/osgUtilGetVersion.html index 45b1d7c2b..2728c60b5 100644 --- a/doc/doc++/osgUtil/osgUtilGetVersion.html +++ b/doc/doc++/osgUtil/osgUtilGetVersion.html @@ -14,9 +14,9 @@

    Documentation

    getVersion_osgUtil() returns the library version number. -Numbering conventon : osg_src-0.8-31 will return 0.8.31 from getVersion_osgUtil. +Numbering convention : osg_src-0.8-31 will return 0.8.31 from getVersion_osgUtil. -

    This C function can be also used to check for the existance of the OpenSceneGraph +

    This C function can be also used to check for the existence of the OpenSceneGraph library using autoconf and its m4 macro AC_CHECK_LIB.

    Here is the code to add to your configure.in: