Changeset 173 for trunk/VUT/Ogre

Timestamp:

07/13/05 18:28:40 (19 years ago)

Author:

mattausch

Message:

did some code cleanup

Location:

trunk/VUT/Ogre

Files:

• include/OgreOcclusionQueriesQueryManager.h (modified) (1 diff)
• include/OgrePlatformQueryManager.h (modified) (1 diff)
• src/OgreOcclusionQueriesQueryManager.cpp (modified) (6 diffs)
• src/OgrePlatformQueryManager.cpp (modified) (5 diffs)

trunk/VUT/Ogre/include/OgreOcclusionQueriesQueryManager.h

@@ -68 +68 @@
         void RemoveDuplicateNodes(InfoContainer<GtpVisibility::NodeInfo> *visibleNodes);
         void RemoveDuplicateGeometry(InfoContainer<GtpVisibility::MeshInfo> *visibleMesh);
+        void RemoveDuplicatePatches(InfoContainer<GtpVisibility::PatchInfo> *visiblePatches);
 
         bool mUseItemBuffer;

trunk/VUT/Ogre/include/OgrePlatformQueryManager.h

@@ -45 +45 @@
 protected:
 
+        void CollectItemBufferResults(
+                                InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry,
+                                InfoContainer<GtpVisibility::PatchInfo> *visiblePatches);
+
         void InitItemBuffer(InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry,
                                                 InfoContainer<GtpVisibility::PatchInfo> *visiblePatches);

trunk/VUT/Ogre/src/OgreOcclusionQueriesQueryManager.cpp

@@ -22 +22 @@
 }
 //-----------------------------------------------------------------------
+inline bool patchinfo_eq(const GtpVisibility::PatchInfo &info1, const GtpVisibility::PatchInfo &info2) 
+{ 
+        return info1.GetPatch() == info2.GetPatch(); 
+}
+//-----------------------------------------------------------------------
 inline bool nodeinfo_lower(const GtpVisibility::NodeInfo &info1, const GtpVisibility::NodeInfo &info2) 
 { 
@@ -31 +36 @@
         return info1.GetMesh() < info2.GetMesh(); 
 }
-
+//-----------------------------------------------------------------------
+inline bool patchinfo_lower(const GtpVisibility::PatchInfo &info1, const GtpVisibility::PatchInfo &info2) 
+{ 
+        return info1.GetPatch() < info2.GetPatch(); 
+}
 
 
@@ -100 +109 @@
         GtpVisibility::GeometryList::iterator geometryIt, geometryIt_end = geometryList.end();
 
+        // vector for storing subentities of meshes
+        GtpVisibility::PatchList patchList;
+        GtpVisibility::PatchList::iterator patchIt, patchIt_end = patchList.end();
 
         // to obtain the correct number of projected pixels, depth write must be disabled
@@ -128 +140 @@
 
                 //-- queries for geometry: if item buffer, capture only projected visibility
+                for (geometryIt = geometryList.begin(); geometryIt != geometryIt_end; ++geometryIt)
+                {
+                        queryList[i].push_back(mHierarchyInterface->IssueOcclusionQuery(*geometryIt));
+                }
+                
+                //-- queries for patches: if item buffer, capture only projected visibility
                 if (!(mUseItemBuffer && (i == 0)))
                 {
-                        for (geometryIt = geometryList.begin(); geometryIt != geometryIt_end; ++geometryIt)
+                        for (patchIt = patchList.begin(); patchIt != patchIt_end; ++patchIt)
                         {
-                                queryList[i].push_back(mHierarchyInterface->IssueOcclusionQuery(*geometryIt));
+                                queryList[i].push_back(mHierarchyInterface->IssueOcclusionQuery(*patchIt));
                         }
                 }
@@ -150 +168 @@
                 if (relativeVisibility)
                 {
-                        CollectRelativeGeometryVisibilityForItemBuffer(projQueryIt, &geometryList, visibleGeometry);
+                        CollectRelativePatchVisibilityForItemBuffer(projQueryIt, &patchList, visiblePatches);
                 }
     }
         else
         {
-                CollectGeometryVisibility(visQueryIt, projQueryIt, &geometryList, 
-                        visibleGeometry, relativeVisibility);
-            //CollectPatchVisibility(patchList, visiblePatches);
-        }
-
-
+                CollectPatchVisibility(visQueryIt, projQueryIt, &patchList, visiblePatches, relativeVisibility);
+        }       
+        
+        CollectGeometryVisibility(visQueryIt, projQueryIt, &geometryList, visibleGeometry, relativeVisibility);
+                
         //-- reset options
         enableDepthWrite = true;
@@ -397 +414 @@
                 meshinfo_eq), visibleGeometry->end());
 }
-
+//-----------------------------------------------------------------------
+void  OcclusionQueriesQueryManager::RemoveDuplicatePatches(
+                                InfoContainer<GtpVisibility::PatchInfo> *visiblePatches)
+{
+        sort(visiblePatches->begin(), visiblePatches->end(), patchinfo_lower);
+        
+        InfoContainer<GtpVisibility::PatchInfo>::iterator visiblePatchIt,
+                        visiblePatchIt_end = visiblePatches->end();
+
+        GtpVisibility::PatchInfo *patchInfo = NULL;
+
+        for (visiblePatchIt = visiblePatches->begin(); visiblePatchIt != visiblePatchIt_end; 
+                ++visiblePatchIt)
+        {
+                if (!patchInfo || (patchInfo->GetPatch() != (*visiblePatchIt).GetPatch()))
+                {
+                        patchInfo = &(*visiblePatchIt);
+                }
+                else // info points to same mesh, just add visibility
+                {
+                        patchInfo->AddVisibility(*visiblePatchIt);
+                }
+        }
+
+        // physically delete duplicates
+        visiblePatches->erase(std::unique(visiblePatches->begin(), visiblePatches->end(), 
+                patchinfo_eq), visiblePatches->end());
+}
 } // namespace Ogre

trunk/VUT/Ogre/src/OgrePlatformQueryManager.cpp

@@ -16 +16 @@
 mViewport(vp), 
 mWasInitialised(false),
-mRenderPatches(false)
+mRenderPatches(renderPatches)
 {
 }
@@ -125 +125 @@
 
         //-- collect results
-
+        CollectItemBufferResults(visibleGeometry, visiblePatches);
+
+        //-- reset options
+
+        useItemBuffer = false; // don't need item buffer anymore
+        sm->setOption("UseItemBuffer", &useItemBuffer);
+
+        mWasInitialised = false; // reset initialised - flag
+        mViewport->setOverlaysEnabled(overlayEnabled); // reset old overlay status
+        mViewport->setBackgroundColour(bg); // reset background color
+}
+//-----------------------------------------------------------------------
+void PlatformQueryManager::CollectItemBufferResults(
+                                InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry,
+                                InfoContainer<GtpVisibility::PatchInfo> *visiblePatches)
+{
         int dimx = 0;
         int dimy = 0;
@@ -151 +166 @@
                 {
                         if (mRenderPatches)
-                        {
+                        {       
                                 ((*visiblePatches)[id]).AddVisibility(1, 0);
                         }
@@ -161 +176 @@
         }
 
-
-        //-- reset options
-
-        useItemBuffer = false; // don't need item buffer anymore
-        sm->setOption("UseItemBuffer", &useItemBuffer);
-
-        mWasInitialised = false; // reset initialised - flag
-        mViewport->setOverlaysEnabled(overlayEnabled); // reset old overlay status
-        mViewport->setBackgroundColour(bg); // reset background color
-
-        delete [] buf;  // delete copy of the frame buffer
-}
+        delete [] buf;
+}
+
 //-----------------------------------------------------------------------
 void PlatformQueryManager::InitItemBuffer(
@@ -215 +221 @@
                         subEnt->setId(id);
                         //subEnt->setId((41 << 16) + (4 << 8) + 60);
-                        //subEnt->setId((2 << 16) + (4 << 8) + 60);
                 }