Changeset 144 for trunk/VUT/Ogre

Timestamp:

06/22/05 00:38:49 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/Ogre

Files:

• include/OgrePlatformQueryManager.h (modified) (3 diffs)
• src/OgrePlatformQueryManager.cpp (modified) (12 diffs)

trunk/VUT/Ogre/include/OgrePlatformQueryManager.h

@@ -41 +41 @@
                             InfoContainer<GtpVisibility::NodeInfo> *visibleNodes,
                             InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry,
-                            bool projectedPixels = false
+                            bool relativeVisibility = false
                             );
     
@@ -52 +52 @@
                                InfoContainer<GtpVisibility::NodeInfo> *visibleNodes,
                                InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry,
-                               bool projectedPixels = false
+                               bool relativeVisibility = false
                                );
     
@@ -73 +73 @@
              );  
 
-        /** Sets a viewport to render into.
+        /** Sets a viewport for rendering.
         */
         void SetViewport(Viewport *vp);

trunk/VUT/Ogre/src/OgrePlatformQueryManager.cpp

@@ -23 +23 @@
                             InfoContainer<GtpVisibility::NodeInfo> *visibleNodes,
                             InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry,
-                            bool projectedPixels)
+                            bool relativeVisibility)
 {
         // we need access to the scene manager and the rendersystem
@@ -68 +68 @@
         */
         // for relative visibility we need 2 rendering passes
-        int n = projectedPixels ? 2 : 1;
+        int n = relativeVisibility ? 2 : 1;
         
         for (int i=0; i<n; ++i)
@@ -104 +104 @@
 
         //---- collect results
-        unsigned int visiblePixels = 0;
+        
         std::pair<InfoContainer<GtpVisibility::NodeInfo>::iterator, bool> insertNode;
         std::pair<InfoContainer<GtpVisibility::MeshInfo>::iterator, bool> insertGeom;
@@ -116 +116 @@
         for (nodeIt = nodeList->begin(); nodeIt != nodeIt_end; ++nodeIt)
         {
+                unsigned int visiblePixels = 0;
                 (*visQueryIt)->GetQueryResult(visiblePixels, true);
         
-                int visiblePixels = visiblePixels;
-                int projectedPixels = 0;
-
-                if (projectedPixels)
-                {
-                        (*projQueryIt)->GetQueryResult(visiblePixels, true);
-        
-                        mProjectedPixels = visiblePixels;
+                unsigned int projectedPixels = 0;
+
+                if (relativeVisibility)
+                {
+                        (*projQueryIt)->GetQueryResult(projectedPixels, true);
                 
                         ++projQueryIt;
@@ -145 +143 @@
         for (geometryIt = geometryList.begin(); geometryIt != geometryIt_end; ++geometryIt)
         {
+                unsigned int visiblePixels = 0;
                 (*visQueryIt)->GetQueryResult(visiblePixels, true);
                 
-                int visiblePixels = visiblePixels;
-                int projectedPixels = 0;
-
-                if (projectedPixels)
-                {
-                        (*projQueryIt)->GetQueryResult(visiblePixels, true);
-
-                        mProjectedPixels = visiblePixels;
+                unsigned int projectedPixels = 0;
+
+                if (relativeVisibility)
+                {
+                        (*projQueryIt)->GetQueryResult(projectedPixels, true);
 
                         ++projQueryIt;
@@ -163 +159 @@
                 // approximate depth ordering during rendering => 
                 // geometry maybe occluded
-                if (isVisible)
+                if (visiblePixels > 0)
                 {                        
-                        visibleGeometry->push_back(GtpVisibility::MeshInfo(*geometryIt,visiblePixels, projectedPixels));
+                        visibleGeometry->push_back(GtpVisibility::MeshInfo(*geometryIt, 
+                                visiblePixels, projectedPixels));
                 }
         }
@@ -181 +178 @@
 }
 //-----------------------------------------------------------------------
+inline bool nodeinfo_lower(const GtpVisibility::NodeInfo &info1, const GtpVisibility::NodeInfo &info2) 
+{ 
+        return info1.GetNode() < info2.GetNode(); 
+}
+//-----------------------------------------------------------------------
+inline bool meshinfo_lower(const GtpVisibility::MeshInfo &info1, const GtpVisibility::MeshInfo &info2) 
+{ 
+        return info1.GetMesh() < info2.GetMesh(); 
+}
+//-----------------------------------------------------------------------
 void PlatformQueryManager::ComputeFromPointVisibility(const Vector3 &point,
                                InfoContainer<GtpVisibility::NodeInfo> *visibleNodes,
                                InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry,
-                               bool projectedPixels)
+                               bool relativeVisibility)
 {
         SceneManager *sm = dynamic_cast<PlatformHierarchyInterface *>(mHierarchyInterface)->GetSceneManager();
@@ -221 +228 @@
                 LogManager::getSingleton().logMessage(d.str());
 
-                ComputeCameraVisibility(*cam, visibleNodes, visibleGeometry, projectedPixels);
+                ComputeCameraVisibility(*cam, visibleNodes, visibleGeometry, relativeVisibility);
                 
                 //mViewport->getTarget()->update(); for(int j=0; j<10000000; j++)       printf("HAAHHAHAHAHAH");
@@ -240 +247 @@
 
         // --- visible nodes
-        sort(visibleNodes->begin(), visibleNodes->end());
+        sort(visibleNodes->begin(), visibleNodes->end(), nodeinfo_lower);
         InfoContainer<GtpVisibility::NodeInfo>::iterator visibleNodesIt,
                 visibleNodesIt_end = visibleNodes->end();
@@ -256 +263 @@
                 {
                         // add visibility
-                        nodeInfo->SetVisibility(nodeInfo->GetVisiblePixels() + 
+                        nodeInfo->SetVisiblePixels(nodeInfo->GetVisiblePixels() + 
                                 (*visibleNodesIt).GetVisiblePixels());
+                
+                        nodeInfo->SetProjectedPixels(nodeInfo->GetProjectedPixels() + 
+                                (*visibleNodesIt).GetProjectedPixels());
                 }
 
@@ -267 +277 @@
 
         // --- visible geometry
-        sort(visibleGeometry->begin(), visibleGeometry->end());
+        sort(visibleGeometry->begin(), visibleGeometry->end(), meshinfo_lower);
         InfoContainer<GtpVisibility::MeshInfo>::iterator visibleGeomIt,
                 visibleGeomIt_end = visibleGeometry->end();
@@ -283 +293 @@
                 {
                         // add visibility
-                        geomInfo->SetVisibility(geomInfo->GetVisiblePixels() + 
+                        geomInfo->SetVisiblePixels(geomInfo->GetVisiblePixels() + 
                                 (*visibleGeomIt).GetVisiblePixels());
+
+                        geomInfo->SetProjectedPixels(nodeInfo->GetProjectedPixels() + 
+                                (*visibleNodesIt).GetProjectedPixels());
                 }
         }
 
         // now delete duplicates
-        visibleGeometry->erase(std::unique(visibleGeometry->begin(), 
-                visibleGeometry->end(), meshinfo_eq), visibleGeometry->end());
+        visibleGeometry->erase(std::unique(visibleGeometry->begin(), visibleGeometry->end(), 
+                meshinfo_eq), visibleGeometry->end());
         
 }