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

Fixed problem with orhographic projections due to a bug in CullVisitor

Browse Source 
where it automatically resets the near and far to the values calculated
during cull traversal.  The maths for converting the computed far and near
into clip coordinates was wrong, fixed this and the problem goes away.
This commit is contained in:
Robert Osfield
2002-05-15 19:58:04 +00:00
parent 806efcd0d4
commit e66372a137
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgUtil/CullVisitor.cpp
View File

@@ -218,16 +218,16 @@ void CullVisitor::popProjectionMatrix()
// so it doesn't cull them out.
osg::Matrix& projection = *_projectionStack.back();
double desired_znear = _computed_znear*0.95;
double desired_zfar = _computed_zfar*1.05;
double desired_znear = _computed_znear;
double desired_zfar = _computed_zfar;
double min_near_plane = _computed_zfar*0.0005f;
if (desired_znear<min_near_plane) desired_znear=min_near_plane;
double trans_near_plane = (-desired_znear*projection(0,2)-desired_znear*projection(1,2)-desired_znear*projection(2,2)+projection(3,2))/(-desired_znear*projection(2,3));
double trans_far_plane = (-desired_zfar*projection(0,2)-desired_zfar*projection(1,2)-desired_zfar*projection(2,2)+projection(3,2))/(-desired_zfar*projection(2,3));
double trans_near_plane = (-desired_znear*projection(2,2)+projection(3,2))/(-desired_znear*projection(2,3)+projection(3,3));
double trans_far_plane = (-desired_zfar*projection(2,2)+projection(3,2))/(-desired_zfar*projection(2,3)+projection(3,3));
double ratio = fabs(2.0f/(trans_near_plane-trans_far_plane));
double ratio = fabs(2.0f/(trans_near_plane-trans_far_plane))*0.95;
double center = -(trans_near_plane+trans_far_plane)/2.0f;
projection.postMult(osg::Matrix(1.0f,0.0f,0.0f,0.0f,

7
src/osgUtil/TrackballManipulator.cpp
View File

@@ -143,6 +143,13 @@ bool TrackballManipulator::handle(const GUIEventAdapter& ea,GUIActionAdapter& us
_camera->setFusionDistanceRatio(_camera->getFusionDistanceRatio()/1.25f);
return true;
}
// this is quick hack to test out othographic projection.
// else if (ea.getKey()=='O')
// {
// float dist = _camera->getLookDistance();
// _camera->setOrtho(-dist,dist,-dist,dist,-dist,dist);
// return true;
// }
return false;
case(GUIEventAdapter::FRAME):
_camera->setFusionDistanceMode(osg::Camera::PROPORTIONAL_TO_LOOK_DISTANCE);