Changeset 141 for trunk/VUT/Ogre/src

Timestamp:

06/21/05 11:18:09 (19 years ago)

Author:

mattausch

Message:

fixed visibility queries using occlusion queries
fixed visualization

Location:

trunk/VUT/Ogre/src

Files:

• OgrePlatformQueryManager.cpp (modified) (7 diffs)
• OgreVisibilityTerrainSceneManager.cpp (modified) (3 diffs)

trunk/VUT/Ogre/src/OgrePlatformQueryManager.cpp

@@ -105 +105 @@
         //---- collect results
         unsigned int visiblePixels = 0;
+        std::pair<InfoContainer<GtpVisibility::NodeInfo>::iterator, bool> insertNode;
+        std::pair<InfoContainer<GtpVisibility::MeshInfo>::iterator, bool> insertGeom;
 
         GtpVisibility::QueryList::iterator visQueryIt, projQueryIt;
@@ -116 +118 @@
                 (*visQueryIt)->GetQueryResult(visiblePixels, true);
         
-                
                 float vis = (float)visiblePixels;
+                bool isVisible = visiblePixels > 0;
 
                 if (relativeVisibility)
@@ -132 +134 @@
                 ++visQueryIt;
                 
-                // leave nodes with visibilty 0 in queue: 
+                // nodes with visibilty 0 in queue: 
                 // happens if node is intersected by near plane
-                visibleNodes->push_back(GtpVisibility::NodeInfo(*nodeIt, vis));
+                if (isVisible)
+                {
+                        insertNode = visibleNodes->insert(GtpVisibility::NodeInfo(*nodeIt, vis));
+
+                        if (!insertNode.second) // element already in list
+                        {
+                                //LogManager::getSingleton().logMessage("element already in list");
+                (*insertNode.first).SetVisibility((*insertNode.first).GetVisibility() + vis);
+
+                                if (relativeVisibility) // relative visibility between zero and one
+                                {
+                                        (*insertNode.first).SetVisibility((*insertNode.first).GetVisibility() * 0.5);
+                                }
+                        }
+                }
         }
 
@@ -164 +180 @@
                 // geometry maybe occluded
                 if (isVisible)
-                {
-                        visibleGeometry->push_back(GtpVisibility::MeshInfo(*geometryIt, vis));
+                {                        
+                        insertGeom = visibleGeometry->insert(GtpVisibility::MeshInfo(*geometryIt, vis));
+                        if (!insertGeom.second) // element already in list
+                        {
+                                //LogManager::getSingleton().logMessage("element already in list");
+                (*insertGeom.first).SetVisibility((*insertGeom.first).GetVisibility() + vis);
+
+                                if (relativeVisibility) // relative visibility between zero and one
+                                {
+                                        (*insertGeom.first).SetVisibility((*insertGeom.first).GetVisibility() * 0.5);
+                                }
+                        }
                 }
         }
@@ -179 +205 @@
         Camera *cam = sm->createCamera("PointQueryCam");        
 
-        Camera *oldCam = mViewport->getCamera();
+        //save old camera
+        Camera *savedCam = mViewport->getCamera();
+        
+        // --- initialise new camera
         mViewport->setCamera(cam);
-
         cam->setPosition(point);
 
+        cam->setNearClipDistance(savedCam->getNearClipDistance());
+        cam->setFarClipDistance(savedCam->getFarClipDistance());
+
         // set frustum to 45 degrees so all the scene can be captured with 6 shots
-        //cam->setAspectRatio(1.0);
-        //cam->setFOVy(Radian(Math::HALF_PI));
-        
+        cam->setAspectRatio(1.0);
+        cam->setFOVy(Radian(Math::HALF_PI));
+
         std::stringstream d;
-        d << "old camera: " + StringConverter::toString(oldCam->getDerivedPosition()) + 
-                " " + "O: " + StringConverter::toString(oldCam->getDerivedOrientation());
+        d << "old camera: " + StringConverter::toString(savedCam->getDerivedPosition()) + 
+                " " + "O: " + StringConverter::toString(savedCam->getDerivedOrientation());
         LogManager::getSingleton().logMessage(d.str());
 
@@ -201 +232 @@
                 
                 // Print camera details
-        //mViewport->getTarget()->setDebugText("P: " + StringConverter::toString(cam->getDerivedPosition()) + 
-                //      " " + "O: " + StringConverter::toString(cam->getDerivedOrientation()));
-                
-                std::stringstream d;
+        std::stringstream d;
                 d << "Point query camera: " + StringConverter::toString(cam->getDerivedPosition()) + 
                         " " + "O: " + StringConverter::toString(cam->getDerivedOrientation());
@@ -211 +239 @@
                 ComputeCameraVisibility(*cam, visibleNodes, visibleGeometry, relativeVisibility);
                            
-                mViewport->getTarget()->update();
-                
+                //mViewport->getTarget()->update(); for(int j=0; j<10000000; j++)       printf("HAAHHAHAHAHAH");
+
+                // permute directions
                 Vector3 dir(0,0,0);
                 dir[i/2] = sign;
 
                 cam->setDirection(dir);
-
-                for(int j=0; j<10000000; j++)   printf("HAAHHAHAHAHAH");
-                                
-                // four shots around y axis, two around x axis
-                //Vector3 axis = i < 4 ? Vector3::UNIT_Y : Vector3::UNIT_X;             
-                //Radian angle = i < 5 ? 
-                //cam->rotate(axis, Radian(Math::HALF_PI));             
         }
         
 
         // reset camera
-        mViewport->setCamera(oldCam);
+        mViewport->setCamera(savedCam);
 }
 //-----------------------------------------------------------------------

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -609 +609 @@
         mLeavePassesInQueue = 0;
         
-/*      if (mShadowTechnique == SHADOWTYPE_STENCIL_ADDITIVE)
+        if (mShadowTechnique == SHADOWTYPE_STENCIL_ADDITIVE)
         {
                 mShadowTechnique = SHADOWTYPE_NONE;
@@ -615 +615 @@
                 if (!mUseDepthPass)
                 {
-                        // TODO: remove this
+                        // TODO: remove this because should be processed in first pass
                         mLeavePassesInQueue |= RenderPriorityGroup::SOLID_PASSES_NOSHADOW;
 
@@ -633 +633 @@
                 }
         }
-        */
+        
         if (mDelayRenderTransparents && (!mUseDepthPass))
         {
                 mLeavePassesInQueue |= RenderPriorityGroup::TRANSPARENT_PASSES;
         }
-        std::stringstream d; d << "leave passes in queue: " << mLeavePassesInQueue;
-        LogManager::getSingleton().logMessage(d.str());
+        //std::stringstream d; d << "leave passes in queue: " << mLeavePassesInQueue;LogManager::getSingleton().logMessage(d.str());
 
         // possible two cameras (one for culling, one for rendering)