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

Added support for compute the near and far planes and then applying to

Browse Source 
the current projection matrix into CullVisitor itself.  Similar code to
support this has been moved out of SceneView completely.

Added Matrix:: infront of the definition of the static
osg::Matrix::inverse(Matrix) method which was missing.
This commit is contained in:
Robert Osfield
2002-04-22 14:54:39 +00:00
parent c5a93ab44d
commit 56dc083330
4 changed files with 97 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/Matrix
View File

@@ -299,7 +299,7 @@ inline Matrix Matrix::rotate(const Vec3& from, const Vec3& to )
return m;
}
inline Matrix inverse( const Matrix& matrix)
inline Matrix Matrix::inverse( const Matrix& matrix)
{
Matrix m;
m.invert(matrix);

25
include/osgUtil/CullVisitor
View File

@@ -171,9 +171,9 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor
return _rootRenderStage.get();
}
const float getCalculatedNearPlane() const { return _calculated_znear; }
const float getCalculatedNearPlane() const { return _computed_znear; }
const float getCalculatedFarPlane() const { return _calculated_zfar; }
const float getCalculatedFarPlane() const { return _computed_zfar; }
protected:
@@ -197,11 +197,6 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor
else acceptNode->accept(*this);
}
inline osg::Matrix* getCurrentMatrix()
{
return _modelviewStack.back().get();
}
inline const osg::Vec3& getEyeLocal() const
{
return _eyePointStack.back();
@@ -245,8 +240,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor
return !_modelviewClippingVolumeStack.back().contains(bb,mode);
}
void updateCalculatedNearFar(const osg::BoundingBox& bb);
void updateCalculatedNearFar(const osg::Matrix& matrix,const osg::Drawable& drawable);
void updateCalculatedNearFar(const osg::Vec3& pos);
/** Add a drawable to current render graph.*/
@@ -392,8 +386,17 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor
float _LODBias;
float _calculated_znear;
float _calculated_zfar;
enum ComputeNearFarMode
{
DO_NOT_COMPUTE_NEAR_FAR = 0,
COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES,
COMPUTE_NEAR_FAR_USING_PRIMITIVES
};
ComputeNearFarMode _computeNearFar;
float _computed_znear;
float _computed_zfar;
osg::ref_ptr<const osg::EarthSky> _earthSky;