Changeset 1875 for OpenSceneGraph/trunk/examples/osgpick/osgpick.cpp

Timestamp:

04/14/03 17:44:30 (10 years ago)

Author:

robert

Message:

Updates to the osgpick code.

Updates to osgGA::CameraManipulors?.

Files:

• OpenSceneGraph/trunk/examples/osgpick/osgpick.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/examples/osgpick/osgpick.cpp

@@ -82 +82 @@
         float x=ea.getXnormalized();
         float y=ea.getYnormalized();
+
+        Producer::Camera *cmm=_cg->getCamera(0);
+        osg::Matrix vum(osg::Matrix(cmm->getViewMatrix()) *
+                        osg::Matrix(cmm->getProjectionMatrix())/* * 
+                        osg::Matrix::translate(1.0f,1.0f,1.0f) *
+                        osg::Matrix::scale(0.5f,0.5f,0.5f)*/);
+
         osgUtil::PickVisitor iv;
-        const float *matView;
-        const float *matProj;
-        Producer::Camera *cmm=_cg->getCamera(0);
-        matView=cmm->getViewMatrix(); 
-        matProj=cmm->getProjectionMatrix();
-        osg::Matrix vum;
-        vum.set(matView);
-        vum.postMult(osg::Matrix(matProj));
-        osg::Matrix windowmatrix=osg::Matrix::translate(1.0f,1.0f,1.0f)*
-            osg::Matrix::scale(0.5f,0.5f,0.5f);
-        vum.postMult(windowmatrix);
         osgUtil::IntersectVisitor::HitList& hlist=iv.getHits(scene, vum, x,y);
         std::string gdlist="";
@@ -106 +102 @@
                 osg::Geode* geode = hitr->_geode.get();
                 // the geodes are identified by name.
-                if (geode) {
-                    gdlist=gdlist+" "+geode->getName();
+                if (geode)
+                {
+                    if (!geode->getName().empty())
+                    {
+                        gdlist=gdlist+" "+geode->getName();
+                    }
+                    else
+                    {
+                        gdlist=gdlist+" geode";
+                    }
                 } 
             }