FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed osg::Transform::ComputeTransformCallback from osg::Transform.

Browse Source 
Updated various dependant files to reimplemt callbacks as Transform subclasses.
This commit is contained in:
Robert Osfield
2003-12-09 14:07:44 +00:00
parent d76cef6f8e
commit 9780a7cbd6
10 changed files with 23 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/osg/Billboard
View File

@@ -93,14 +93,7 @@ class SG_EXPORT Billboard : public Geode
virtual bool removeDrawable( Drawable *gset );
inline bool getMatrix(Matrix& modelview, const Vec3& eye_local, const Vec3& pos_local) const
{
return computeMatrix(modelview,eye_local,pos_local);
}
virtual bool computeMatrix(Matrix& modelview, const Vec3& eye_local, const Vec3& pos_local) const;
bool computeMatrix(Matrix& modelview, const Vec3& eye_local, const Vec3& pos_local) const;
protected:

52
include/osg/Transform
View File

@@ -105,55 +105,6 @@ class SG_EXPORT Transform : public Group
ReferenceFrame getReferenceFrame() const { return _referenceFrame; }
/** Callback attached to an Transform to specify how to compute the
* modelview transformation for the transform below the Transform
* node. */
struct ComputeTransformCallback : public virtual osg::Referenced
{
/** Get the transformation matrix which moves from local coords
* to world coords.*/
virtual bool computeLocalToWorldMatrix(Matrix& matrix,const Transform* transform, NodeVisitor* nv) const = 0;
/** Get the transformation matrix which moves from world coords
* to local coords.*/
virtual bool computeWorldToLocalMatrix(Matrix& matrix,const Transform* transform, NodeVisitor* nv) const = 0;
};
/** Set the ComputerTransfromCallback which allows users to attach
* custom computation of the local transformation as seen by cull
* traversers and the like. */
void setComputeTransformCallback(ComputeTransformCallback* ctc) { _computeTransformCallback=ctc; dirtyBound(); }
/** Get the non const ComputerTransfromCallback.*/
ComputeTransformCallback* getComputeTransformCallback() { return _computeTransformCallback.get(); }
/** Get the const ComputerTransfromCallback.*/
const ComputeTransformCallback* getComputeTransformCallback() const { return _computeTransformCallback.get(); }
/** Get the transformation matrix which moves from local coords to
* world coords.
* Returns true if the Matrix passed in has been updated. */
inline bool getLocalToWorldMatrix(Matrix& matrix,NodeVisitor* nv) const
{
if (_computeTransformCallback.valid())
return _computeTransformCallback->computeLocalToWorldMatrix(matrix,this,nv);
else
return computeLocalToWorldMatrix(matrix,nv);
}
/** Get the transformation matrix which moves from world coords to
* local coords.
* Return true if the Matrix passed in has been updated. */
inline bool getWorldToLocalMatrix(Matrix& matrix,NodeVisitor* nv) const
{
if (_computeTransformCallback.valid())
return _computeTransformCallback->computeWorldToLocalMatrix(matrix,this,nv);
else
return computeWorldToLocalMatrix(matrix,nv);
}
virtual bool computeLocalToWorldMatrix(Matrix& matrix,NodeVisitor*) const
{
if (_referenceFrame==RELATIVE_TO_PARENTS)
@@ -190,9 +141,6 @@ class SG_EXPORT Transform : public Group
* computeMatrix if required.) */
virtual bool computeBound() const;
ref_ptr<ComputeTransformCallback> _computeTransformCallback;
ReferenceFrame _referenceFrame;
};