Changeset 143 for trunk/VUT/Ogre/src

Timestamp:

06/21/05 18:14:30 (19 years ago)

Author:

mattausch

Message:

updated visibility queries

File:

• trunk/VUT/Ogre/src/OgrePlatformQueryManager.cpp (modified) (9 diffs)

trunk/VUT/Ogre/src/OgrePlatformQueryManager.cpp

@@ -23 +23 @@
                             InfoContainer<GtpVisibility::NodeInfo> *visibleNodes,
                             InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry,
-                            bool relativeVisibility)
+                            bool projectedPixels)
 {
         // we need access to the scene manager and the rendersystem
@@ -68 +68 @@
         */
         // for relative visibility we need 2 rendering passes
-        int n = relativeVisibility ? 2 : 1;
+        int n = projectedPixels ? 2 : 1;
         
         for (int i=0; i<n; ++i)
@@ -118 +118 @@
                 (*visQueryIt)->GetQueryResult(visiblePixels, true);
         
-                float vis = (float)visiblePixels;
-                bool isVisible = visiblePixels > 0;
-
-                if (relativeVisibility)
+                int visiblePixels = visiblePixels;
+                int projectedPixels = 0;
+
+                if (projectedPixels)
                 {
                         (*projQueryIt)->GetQueryResult(visiblePixels, true);
         
-                        if (visiblePixels > 0)
-                        {                               
-                                vis /= (float) visiblePixels;
-                        }
+                        mProjectedPixels = visiblePixels;
+                
                         ++projQueryIt;
                 }
@@ -136 +134 @@
                 // nodes with visibilty 0 in queue: 
                 // happens if node is intersected by near plane
-                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);
-                                }
-                        }
+                if (visiblePixels > 0)
+                {
+                        visibleNodes->push_back(GtpVisibility::NodeInfo(*nodeIt, visiblePixels, projectedPixels));
                 }
         }
@@ -160 +147 @@
                 (*visQueryIt)->GetQueryResult(visiblePixels, true);
                 
-
-                float vis = (float)visiblePixels;
-                bool isVisible = visiblePixels > 0;
-                
-                if (relativeVisibility)
+                int visiblePixels = visiblePixels;
+                int projectedPixels = 0;
+
+                if (projectedPixels)
                 {
                         (*projQueryIt)->GetQueryResult(visiblePixels, true);
 
-                        if (visiblePixels)
-                        {
-                                vis /= (float) visiblePixels;
-                        }
+                        mProjectedPixels = visiblePixels;
+
                         ++projQueryIt;
                 }
@@ -181 +165 @@
                 if (isVisible)
                 {                        
-                        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);
-                                }
-                        }
-                }
-        }
-
+                        visibleGeometry->push_back(GtpVisibility::MeshInfo(*geometryIt,visiblePixels, projectedPixels));
+                }
+        }
+
+}
+//-----------------------------------------------------------------------
+inline bool nodeinfo_eq(const GtpVisibility::NodeInfo &info1, const GtpVisibility::NodeInfo &info2) 
+{ 
+        return info1.GetNode() == info2.GetNode(); 
+}
+//-----------------------------------------------------------------------
+inline bool meshinfo_eq(const GtpVisibility::MeshInfo &info1, const GtpVisibility::MeshInfo &info2) 
+{ 
+        return info1.GetMesh() == info2.GetMesh(); 
 }
 //-----------------------------------------------------------------------
@@ -200 +184 @@
                                InfoContainer<GtpVisibility::NodeInfo> *visibleNodes,
                                InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry,
-                               bool relativeVisibility)
+                               bool projectedPixels)
 {
         SceneManager *sm = dynamic_cast<PlatformHierarchyInterface *>(mHierarchyInterface)->GetSceneManager();
@@ -237 +221 @@
                 LogManager::getSingleton().logMessage(d.str());
 
-                ComputeCameraVisibility(*cam, visibleNodes, visibleGeometry, relativeVisibility);
-                           
+                ComputeCameraVisibility(*cam, visibleNodes, visibleGeometry, projectedPixels);
+                
                 //mViewport->getTarget()->update(); for(int j=0; j<10000000; j++)       printf("HAAHHAHAHAHAH");
 
@@ -248 +232 @@
         }
         
-
         // reset camera
         mViewport->setCamera(savedCam);
+
+        // --- single out duplicates
+
+        // before duplicates can be deleted we have to add up visibility
+
+        // --- visible nodes
+        sort(visibleNodes->begin(), visibleNodes->end());
+        InfoContainer<GtpVisibility::NodeInfo>::iterator visibleNodesIt,
+                visibleNodesIt_end = visibleNodes->end();
+        
+        GtpVisibility::NodeInfo *nodeInfo = NULL;
+
+        for (visibleNodesIt = visibleNodes->begin(); visibleNodesIt != visibleNodesIt_end; 
+                ++visibleNodesIt);
+        {
+                if (!nodeInfo || (nodeInfo->GetNode() != (*visibleNodesIt).GetNode()))
+                {
+                        nodeInfo = &(*visibleNodesIt);
+                }
+                else
+                {
+                        // add visibility
+                        nodeInfo->SetVisibility(nodeInfo->GetVisiblePixels() + 
+                                (*visibleNodesIt).GetVisiblePixels());
+                }
+
+        }
+        
+        // now delete duplicates
+        visibleNodes->erase( std::unique(visibleNodes->begin(), 
+                visibleNodes->end(), nodeinfo_eq), visibleNodes->end());
+
+        // --- visible geometry
+        sort(visibleGeometry->begin(), visibleGeometry->end());
+        InfoContainer<GtpVisibility::MeshInfo>::iterator visibleGeomIt,
+                visibleGeomIt_end = visibleGeometry->end();
+
+        GtpVisibility::MeshInfo *geomInfo = NULL;
+
+        for (visibleGeomIt = visibleGeometry->begin(); visibleGeomIt != visibleGeomIt_end; 
+                ++visibleGeomIt);
+        {
+                if (!geomInfo || (geomInfo->GetMesh() != (*visibleGeomIt).GetMesh()))
+                {
+                        geomInfo = &(*visibleGeomIt);
+                }
+                else // info points to equal mesh
+                {
+                        // add visibility
+                        geomInfo->SetVisibility(geomInfo->GetVisiblePixels() + 
+                                (*visibleGeomIt).GetVisiblePixels());
+                }
+        }
+
+        // now delete duplicates
+        visibleGeometry->erase(std::unique(visibleGeometry->begin(), 
+                visibleGeometry->end(), meshinfo_eq), visibleGeometry->end());
+        
 }
 //-----------------------------------------------------------------------