Changeset 2255 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionQueriesQueryManager.cpp

Timestamp:

03/16/07 17:20:26 (17 years ago)

Author:

mattausch

Message:

improved scenemanager config

File:

• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionQueriesQueryManager.cpp (modified) (9 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionQueriesQueryManager.cpp

@@ -28 +28 @@
                                                                                         GtpVisibility::MeshInfoContainer *visibleGeometry,
                                                                                         GtpVisibility::PatchInfoContainer *visiblePatches,
-                                                                                        bool relativeVisibility)
+                                                                                        const bool relativeVisibility,
+                                                                                        const bool approximateVisibility)
 {
         // we need access to the scene manager and the rendersystem
@@ -37 +38 @@
         bool overlayEnabled = mViewport->getOverlaysEnabled();
 
-        ///////////
-        //-- render scene with item buffer (i.e., objects with their id as color codes)
-
         //mItemBufferMode = 0;
-        if (0 && 
-                (mItemBufferMode && mQueryModes) != 0)
-        {
+        if (0 && (mItemBufferMode && mQueryModes) != 0)
+        {
+                ///////////
+                //-- render scene with item buffer (ids are used as color codes)
+
                 int savedQueryModes = mQueryModes;
                 mQueryModes = mItemBufferMode;
@@ -51 +51 @@
                                                                                                           visibleGeometry, 
                                                                                                           visiblePatches, 
-                                                                                                          relativeVisibility);
+                                                                                                          relativeVisibility,
+                                                                                                          approximateVisibility);
                 
                 // overlays cause false visibility
@@ -175 +176 @@
                         pfHierarchyInterface->CheckFrustumVisible(*nodeIt, intersects);
 
-                        // always push back if intersects
-                        if (1 && intersects)
+                        // always push back if only checking approximate visibility or intersects
+                        if (approximateVisibility || intersects)
                         {
                                 // no more information available
@@ -185 +186 @@
                                 queryList[i].push_back(NULL);
                         }
-                        else
+                        else // issue occlusion query
                         {
                                 queryList[i].push_back(mHierarchyInterface->IssueNodeOcclusionQuery(*nodeIt, false));
@@ -200 +201 @@
                         for (geometryIt = geometryList.begin(); geometryIt != geometryIt_end; ++ geometryIt)
                         {
-                                queryList[i].push_back(pfHierarchyInterface->IssueMeshOcclusionQuery(*geometryIt));
+                                if (approximateVisibility)
+                                {
+                                        // no more information available
+                                        const int visPixels = 1;
+                                        const int projPixels = 1;
+
+                                        visibleGeometry->push_back(GtpVisibility::MeshInfo(*geometryIt, visPixels, projPixels));
+                                }
+                                else
+                                {
+                                        queryList[i].push_back(pfHierarchyInterface->IssueMeshOcclusionQuery(*geometryIt));
+                                }
                         }
                 }
@@ -211 +223 @@
                         for (patchIt = patchList.begin(); patchIt != patchIt_end; ++patchIt)
                         {
-                                queryList[i].push_back(pfHierarchyInterface->IssuePatchOcclusionQuery(*patchIt));
+                                if (approximateVisibility)
+                                {
+                                        // no more information available
+                                        const int visPixels = 1;
+                                        const int projPixels = 1;
+
+                                        visiblePatches->push_back(GtpVisibility::PatchInfo(*patchIt, visPixels, projPixels));
+                                }
+                                else
+                                {
+                                        queryList[i].push_back(pfHierarchyInterface->IssuePatchOcclusionQuery(*patchIt));
+                                }
                         }
                 }
@@ -284 +307 @@
                                                                 GtpVisibility::MeshInfoContainer *visibleGeometry,
                                                                 GtpVisibility::PatchInfoContainer *visiblePatches,
-                                                                bool relativeVisibility)
+                                                                const bool relativeVisibility,
+                                                                const bool approximateVisibility)
 {
         PlatformQueryManager::ComputeFromPointVisibility(point, 
@@ -290 +314 @@
                                                                                                          visibleGeometry, 
                                                                                                          visiblePatches, 
-                                                                                                         relativeVisibility);
+                                                                                                         relativeVisibility,
+                                                                                                         approximateVisibility);
 
         // adds up their visibility and removes duplicates