Changeset 141 for trunk

Timestamp:

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

Author:

mattausch

Message:

fixed visibility queries using occlusion queries
fixed visualization

Location:

trunk/VUT

Files:

• GtpVisibility/include/VisibilityInfo.h (modified) (3 diffs)
• GtpVisibility/src/DummyQueryManager.cpp (modified) (2 diffs)
• Ogre/src/OgrePlatformQueryManager.cpp (modified) (7 diffs)
• Ogre/src/OgreVisibilityTerrainSceneManager.cpp (modified) (3 diffs)
• work/TestCullingTerrain/TerrainFrameListener.cpp (modified) (2 diffs)
• work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeNode.cpp (added)

trunk/VUT/GtpVisibility/include/VisibilityInfo.h

@@ -17 +17 @@
 
         float GetVisibility() const {return mVisibility;}
+        void SetVisibility(float vis) { mVisibility = vis;}
+        bool operator<(const NodeInfo& rhs) const {return mNode < rhs.mNode;}
+        //bool operator>(const NodeInfo& rhs) const {return mNode > rhs.mNode;}
+        //bool operator==(const NodeInfo& rhs) const {return mNode == rhs.mNode;}
 
 protected:
+
     /** pointer to the scene node */
     HierarchyNode *mNode;
@@ -35 +40 @@
 
         float GetVisibility() const {return mVisibility;}
+        void SetVisibility(float vis) { mVisibility = vis;}
 
+        bool operator<(const MeshInfo& rhs) const {return mMesh < rhs.mMesh;}
+        //bool operator>(const MeshInfo& rhs) const {return mMesh > rhs.mMesh;}
+        //bool operator==(const MeshInfo& rhs) const {return mMesh == rhs.mMesh;}
+        
 protected:
+
     /** Pointer to the mesh.
         */
@@ -48 +59 @@
   
 //TODO: this define shall be replaced by template typedef
-#define InfoContainer std::vector
+//#define InfoContainer std::vector
+#define InfoContainer std::set
 };
 

trunk/VUT/GtpVisibility/src/DummyQueryManager.cpp

@@ -14 +14 @@
                                              )
   {
-    visibleNodes->push_back(NodeInfo(mHierarchyInterface->GetSceneRoot(), 1.0f));
+          visibleNodes->insert(NodeInfo(mHierarchyInterface->GetSceneRoot(), 1.0f));
     
 //      HierarchyInterface::MeshIterator *mi =
@@ -33 +33 @@
                                                 )
   {
-    visibleNodes->push_back(NodeInfo(mHierarchyInterface->GetSceneRoot(), 1.0f));
+          visibleNodes->insert(NodeInfo(mHierarchyInterface->GetSceneRoot(), 1.0f));
     
 //      HierarchyInterface::MeshIterator *mi =

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)

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

@@ -373 +373 @@
         float averageGeometryVis = 0;
 
-        for (int i=0; i < visibleGeometry.size(); ++i)
-        {
-                averageGeometryVis += visibleGeometry[i].GetVisibility();
-
-                std::stringstream d; d << "Geometry visibility: " << visibleGeometry[i].GetVisibility();
+        InfoContainer<GtpVisibility::MeshInfo>::iterator geomIt, geomIt_end = visibleGeometry.end();
+
+        for (geomIt = visibleGeometry.begin(); geomIt != geomIt_end; ++geomIt)
+        {
+                averageGeometryVis += (*geomIt).GetVisibility();
+
+                std::stringstream d; d << "Geometry visibility: " << (*geomIt).GetVisibility();
                 LogManager::getSingleton().logMessage(d.str());
         }
-        for (int i=0; i < visibleNodes.size(); ++i)
-        {
-                averageNodeVis += visibleNodes[i].GetVisibility();
-
-                std::stringstream d; d << "Node visibility: " << visibleNodes[i].GetVisibility();
+
+        InfoContainer<GtpVisibility::NodeInfo>::iterator nodesIt, nodesIt_end = visibleNodes.end();
+
+        for (nodesIt = visibleNodes.begin(); nodesIt != nodesIt_end; ++nodesIt)
+        {
+                averageNodeVis += (*nodesIt).GetVisibility();
+
+                std::stringstream d; d << "Node visibility: " << (*nodesIt).GetVisibility();
                 LogManager::getSingleton().logMessage(d.str());
         }
 
-        averageNodeVis /= (float)visibleNodes.size();
-        averageGeometryVis /= (float)visibleGeometry.size();
+        if ((int)visibleNodes.size())
+                averageNodeVis /= (float)visibleNodes.size();
+        if ((int)visibleGeometry.size())
+                averageGeometryVis /= (float)visibleGeometry.size();
 
         char str[100];
@@ -437 +444 @@
                         Vector3(camPos.x, 5000.0f, camPos.z), Vector3::NEGATIVE_UNIT_Y))
         {
-                const int overTerrain = 200;
-                mCamNode->setPosition(camPos.x, queryResult.y + overTerrain, camPos.z);
+                const int terrainOffs = 10;
+                mCamNode->setPosition(camPos.x, queryResult.y + terrainOffs, camPos.z);
         }
 }