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

Updates to the osgpick code.

Browse Source 
Updates to osgGA::CameraManipulors.
This commit is contained in:
Robert Osfield
2003-04-14 15:44:30 +00:00
parent b66f464a1b
commit 5df7118d6d
10 changed files with 134 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osg/NodeVisitor.cpp
View File

@@ -68,15 +68,11 @@ class TransformVisitor : public NodeVisitor
{
if (_coordMode==LOCAL_TO_WORLD)
{
osg::Matrix localToWorldMat;
transform.getLocalToWorldMatrix(localToWorldMat,_nodeVisitor);
_matrix.preMult(localToWorldMat);
transform.getLocalToWorldMatrix(_matrix,_nodeVisitor);
}
else // worldToLocal
{
osg::Matrix worldToLocalMat;
transform.getWorldToLocalMatrix(worldToLocalMat,_nodeVisitor);
_matrix.postMult(worldToLocalMat);
transform.getWorldToLocalMatrix(_matrix,_nodeVisitor);
}
}

8
src/osgGA/TrackballManipulator.cpp
View File

@@ -295,11 +295,11 @@ bool TrackballManipulator::calcMovement()
// pan model.
float scale = 0.5f*focalLength;
float scale = -0.5f*focalLength;
osg::Vec3 uv = _camera->getUpVector();
osg::Vec3 sv = _camera->getSideVector();
osg::Vec3 dv = uv*(dy*scale)-sv*(dx*scale);
osg::Vec3 dv = uv*(dy*scale)+sv*(dx*scale);
_center += dv;
@@ -314,7 +314,7 @@ bool TrackballManipulator::calcMovement()
// zoom model.
float fd = focalLength;
float scale = 1.0f-dy;
float scale = 1.0f+dy;
if (fd*scale>_modelScale*_minimumZoomScale)
{
@@ -328,7 +328,7 @@ bool TrackballManipulator::calcMovement()
// notify(DEBUG_INFO) << "Pushing forward"<<std::endl;
// push the camera forward.
float scale = fd;
float scale = -fd;
osg::Vec3 dv = _camera->getLookVector()*(dy*scale);
_center += dv;

1
src/osgProducer/Viewer.cpp
View File

@@ -308,6 +308,7 @@ void Viewer::requestWarpPointer(float x,float y)
{
if (_kbmcb)
{
cout << "x="<<x<<" y="<<y<<endl;
EventAdapter::_s_mx = x;
EventAdapter::_s_my = y;
_kbmcb->getKeyboardMouse()->positionPointer(x,y);

127
src/osgUtil/PickVisitor.cpp
View File

@@ -21,96 +21,107 @@ using namespace osgUtil;
osgUtil::IntersectVisitor::HitList & PickIntersectVisitor::getHits(osgUtil::SceneView *scv, int x, int y)
{ // High level get intersection with sceneview using a ray from x,y on the screen
int x0,y0,width,height;
scv->getViewport(x0, y0, width, height);
// setxy(-1+2*(float)(x-x0)/(float)width, 1-2*(float)(y-y0)/(float)height);
// sets xp,yp as pixels scaled to a mapping of (-1,1, -1,1); needed for Projection from x,y pixels
int x0,y0,width,height;
scv->getViewport(x0, y0, width, height);
// setxy(-1+2*(float)(x-x0)/(float)width, 1-2*(float)(y-y0)/(float)height);
// sets xp,yp as pixels scaled to a mapping of (-1,1, -1,1); needed for Projection from x,y pixels
osg::Vec3 near_point,far_point;
// get ends of line segment perpendicular to screen:
// get ends of line segment perpendicular to screen:
if (!scv->projectWindowXYIntoObject(x,height-y,near_point,far_point))
{
osg::notify(osg::NOTICE) << "PickIntersect failed to calculate intersection ray."<< std::endl;
return getHitList(NULL); // empty;
}
return getIntersections(scv->getSceneData(),near_point,far_point);
return getIntersections(scv->getSceneData(),near_point,far_point);
}
osgUtil::IntersectVisitor::HitList & PickIntersectVisitor::getIntersections(osg::Node *scene,
osg::Vec3 near_point,osg::Vec3 far_point)
{ // option for non-sceneView users: you need to get the screen perp line and call getIntersections
// if you are using Projection nodes you should also call setxy to define the xp,yp positions for use with
// the ray transformed by Projection
_lineSegment = new osg::LineSegment;
_lineSegment->set(near_point,far_point); // make a line segment
osg::Vec3 near_point,osg::Vec3 far_point)
{
// option for non-sceneView users: you need to get the screen perp line and call getIntersections
// if you are using Projection nodes you should also call setxy to define the xp,yp positions for use with
// the ray transformed by Projection
_lineSegment = new osg::LineSegment;
_lineSegment->set(near_point,far_point); // make a line segment
addLineSegment(_lineSegment.get());
scene->accept(*this);
return getHitList(_lineSegment.get());
scene->accept(*this);
return getHitList(_lineSegment.get());
}
// pickvisitor - top level; test main scenegraph than traverse to lower Projections
osgUtil::IntersectVisitor::HitList & PickVisitor::getHits(osg::Node *nd, const osg::Vec3 near_point, const osg::Vec3 far_point)
{ // High level get intersection with sceneview using a ray from x,y on the screen
// sets xp,yp as pixels scaled to a mapping of (-1,1, -1,1); needed for Projection from x,y pixels
{
// High level get intersection with sceneview using a ray from x,y on the screen
// sets xp,yp as pixels scaled to a mapping of (-1,1, -1,1); needed for Projection from x,y pixels
// first get the standard hits in un-projected nodes
_PIVsegHitList=_piv.getIntersections(nd,near_point,far_point); // fill hitlist
// first get the standard hits in un-projected nodes
_PIVsegHitList=_piv.getIntersections(nd,near_point,far_point); // fill hitlist
// then get hits in projection nodes
traverse(*(nd)); // check for projection nodes
return _PIVsegHitList;
// then get hits in projection nodes
traverse(*(nd)); // check for projection nodes
return _PIVsegHitList;
}
osgUtil::IntersectVisitor::HitList & PickVisitor::getHits(osgUtil::SceneView *scv, const double x, const double y)
{ // High level get intersection with sceneview using a ray from x,y on the screen
int x0,y0,width,height;
scv->getViewport(x0, y0, width, height);
setxy(-1+2*(float)(x-x0)/(float)width, 1-2*(float)(y-y0)/(float)height);
// sets xp,yp as pixels scaled to a mapping of (-1,1, -1,1); needed for Projection from x,y pixels
{
// High level get intersection with sceneview using a ray from x,y on the screen
int x0,y0,width,height;
scv->getViewport(x0, y0, width, height);
setxy(-1+2*(float)(x-x0)/(float)width, 1-2*(float)(y-y0)/(float)height);
// sets xp,yp as pixels scaled to a mapping of (-1,1, -1,1); needed for Projection from x,y pixels
osg::Vec3 near_point,far_point;
// get ends of line segment perpendicular to screen:
// get ends of line segment perpendicular to screen:
if (!scv->projectWindowXYIntoObject(x,height-y,near_point,far_point))
{
osg::notify(osg::NOTICE) << "PickIntersect failed to calculate intersection ray."<< std::endl;
return _piv.getHitList(NULL); // empty;
}
osg::Node *nd=scv->getSceneData();
getHits(nd, near_point,far_point);
return _PIVsegHitList;
osg::Node *nd=scv->getSceneData();
getHits(nd, near_point,far_point);
return _PIVsegHitList;
}
osgUtil::IntersectVisitor::HitList & PickVisitor::getHits(void)
{ // High level return current intersections
return _PIVsegHitList;
{
// High level return current intersections
return _PIVsegHitList;
}
osgUtil::IntersectVisitor::HitList& PickVisitor::getHits(osg::Node *scene,
const osg::Matrix &projm, const float x, const float y)
{ // utility for non=sceneview viewers
// x,y are values returned by
osg::Matrix inverseMVPW;
inverseMVPW.invert(projm);
double ix=0.5+0.5*x, iy=0.5-0.5*y; // for this purpose, range from 0-1
osg::Vec3 near_point = osg::Vec3(ix,iy,0.0f)*inverseMVPW;
osg::Vec3 far_point = osg::Vec3(ix,iy,1.0f)*inverseMVPW;
setxy(x,-y);
getHits(scene,near_point,far_point);
return _PIVsegHitList;
const osg::Matrix &projm, const float x, const float y)
{
// utility for non=sceneview viewers
// x,y are values returned by
osg::Matrix inverseMVPW;
inverseMVPW.invert(projm);
// float ix=0.5f+0.5f*x, iy=0.5f+0.5f*y; // for this purpose, range from 0-1
osg::Vec3 near_point = osg::Vec3(x,y,1.0f)*inverseMVPW;
osg::Vec3 far_point = osg::Vec3(x,y,-1.0f)*inverseMVPW;
setxy(x,y);
getHits(scene,near_point,far_point);
return _PIVsegHitList;
}
void PickVisitor::apply(osg::Projection& pr)
{ // stack the intersect rays, transform to new projection, traverse
// Assumes that the Projection is an absolute projection
osg::Matrix mt=osg::Matrix::inverse(pr.getMatrix());
osg::Vec3 npt=osg::Vec3(xp,yp,1) * mt, farpt=osg::Vec3(xp,yp,-1) * mt;
// Assumes that the Projection is an absolute projection
osg::Matrix mt=osg::Matrix::inverse(pr.getMatrix());
osg::Vec3 npt=osg::Vec3(xp,yp,1.0f) * mt, farpt=osg::Vec3(xp,yp,-1.0f) * mt;
// traversing the nodes children, using the projection direction
for (unsigned int i=0; i<pr.getNumChildren(); i++) {
osg::Node *nodech=pr.getChild(i);
osgUtil::IntersectVisitor::HitList &hli=_piv.getIntersections(nodech,npt, farpt);
for(osgUtil::IntersectVisitor::HitList::iterator hitr=hli.begin();
hitr!=hli.end();
++hitr) { // add the projection hits to the scene hits.
// This is why _lineSegment is retained as a member of PickIntersectVisitor
_PIVsegHitList.push_back(*hitr);
}
traverse(*nodech);
// traversing the nodes children, using the projection direction
for (unsigned int i=0; i<pr.getNumChildren(); i++)
{
osg::Node *nodech=pr.getChild(i);
osgUtil::IntersectVisitor::HitList &hli=_piv.getIntersections(nodech,npt, farpt);
for(osgUtil::IntersectVisitor::HitList::iterator hitr=hli.begin();
hitr!=hli.end();
++hitr)
{ // add the projection hits to the scene hits.
// This is why _lineSegment is retained as a member of PickIntersectVisitor
_PIVsegHitList.push_back(*hitr);
}
traverse(*nodech);
}
}