Changeset 2558

Timestamp:

10/22/07 18:19:15 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC

Files:

• OGRE/include/OgrePlatformHierarchyInterface.h (modified) (1 diff)
• OGRE/include/OgreVisibilityPredictor.h (modified) (1 diff)
• OGRE/src/OgrePlatformHierarchyInterface.cpp (modified) (1 diff)
• OGRE/src/OgreVisibilityPredictor.cpp (modified) (6 diffs)
• include/HierarchyInterface.h (modified) (1 diff)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgrePlatformHierarchyInterface.h

@@ -146 +146 @@
         virtual void TraverseNode2(GtpVisibility::HierarchyNode *node) {};
         
+        virtual GtpVisibility::OcclusionQuery *IssueMultiQuery(
+                                                                                        const GtpVisibility::HierarchyNodeContainer &nodes);
+
 protected:
 

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreVisibilityPredictor.h

@@ -15 +15 @@
 {
 public:
-    
+
+        VisibilityPredictor();
+
         void HandleProbablyVisibleObjects(GtpVisibilityPreprocessor::ViewCell *vc);
         void UpdateVisibility(GtpVisibilityPreprocessor::ViewCell *vc);
 
-        VisibilityPredictor();
+        void IssueMultiQuery(const vector<Entity *> &mEntities);
+
 
 protected:
 
-        GtpVisibility::HierarchyNodeContainer mNodeBuffer;
+        GtpVisibility::HierarchyNodeContainer mEntityBuffer;
 };
 

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

@@ -302 +302 @@
         return mTestGeometryBounds;
 }
+//-----------------------------------------------------------------------
+GtpVisibility::OcclusionQuery *PlatformHierarchyInterface::IssueMultiQuery(
+                                                                                        const GtpVisibility::HierarchyNodeContainer &nodes)
+{
+        // get next available test id
+        GtpVisibility::OcclusionQuery *query = GetNextOcclusionQuery();
+
+        //-- the actual query test
+        query->BeginQuery();    
+
+        GtpVisibility::HierarchyNodeContainer::const_iterator nit, nit_end = nodes.end();
+
+        mIsBoundingBoxQuery = true;
+
+        for (nit = nodes.begin(); nit != nodes.end(); ++ nit)
+        {
+                // this information is used e.g., by the scene graph, because the bounding box
+                // must be treated differently to the scene geometry during rendering
+                RenderBoundingBox(GetBoundingBox(*nit));
+        }       
+        
+        mIsBoundingBoxQuery = false;
+
+        query->EndQuery();
+
+        return query;
+}
 
 } // namespace Ogre

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

@@ -9 +9 @@
 namespace Ogre
 {
+        struct EntityQuery
+        {
+                GtpVisibility::OcclusionQuery *mQuery;
+                vector<Entity *> mEntities;
+        };
+
+        typedef std::queue<EntityQuery> EntityQueryQueue;
+
         VisibilityPredictor::VisibilityPredictor()
         {
@@ -15 +23 @@
         void VisibilityPredictor::HandleProbablyVisibleObjects(GtpVisibilityPreprocessor::ViewCell *vc)
         {
-                GtpVisibility::QueryQueue queryQueue;
-                GtpVisibility::HierarchyNodeContainer invisibleNodes;
+                EntityQueryQueue queryQueue;
+                vector<Entity *> invisibleEntities;
 
                 // use multiqueries for the objects that are probably invisible
@@ -37 +45 @@
                         {
                                 // collect entities for multiqueries
-                                //invisibleNodes.push_back(node);
+                                invisibleEntities.push_back(*eit);
 
-                                if ((int)invisibleNodes.size() >= maxInvisibleNodesSize)
+                                if ((int)invisibleEntities.size() >= maxInvisibleNodesSize)
                                 {
                                         // issue the batched queries
-                                        //IssueBatchedQuery(invisibleNodes);
+                                        IssueMultiQuery(invisibleEntities);
+                                        invisibleEntities.clear();
                                 }
                         }
@@ -52 +61 @@
 
                         // fetch multiquery result
-                        queryQueue.front().second->GetQueryResult(visiblePixels, false);
+                        queryQueue.front().mQuery->GetQueryResult(visiblePixels, false);
 
-                        // collect nodes assoziated with current multiquery
-                        GtpVisibility::HierarchyNode *node = queryQueue.front().first;
+                        size_t n = queryQueue.front().mEntities.size();
 
                         // tested visible
                         if (visiblePixels > 0)
                         {
-                                // render nodes
-                                
-                                // we have to store and test individual nodes later
-                                mNodeBuffer.push_back(node);
+                                // render nodes assoziated with current multiquery
+                                for (size_t i = 0; i < n; ++ i)
+                                {
+                                        Entity *ent = queryQueue.front().mEntities[i];
+                                        // render entity
+
+                                        // we have to store the entity and test it individually later
+                                        mEntityBuffer.push_back(ent);
+                                }
                         }
 
@@ -73 +86 @@
         void VisibilityPredictor::UpdateVisibility(GtpVisibilityPreprocessor::ViewCell *vc)
         {
-                GtpVisibility::HierarchyNodeContainer::const_iterator nit, nit_end = mNodeBuffer.end();
+                GtpVisibility::HierarchyNodeContainer::const_iterator nit, nit_end = mEntityBuffer.end();
 
                 // test individual nodes
-                for (nit = mNodeBuffer.begin(); nit != nit_end; ++ nit)
+                for (nit = mEntityBuffer.begin(); nit != nit_end; ++ nit)
                 {
 
@@ -82 +95 @@
 
                 // fetch query results, update PVS of view cell
-                for (nit = mNodeBuffer.begin(); nit != nit_end; ++ nit)
+                for (nit = mEntityBuffer.begin(); nit != nit_end; ++ nit)
                 {
 
                 }
 
-                mNodeBuffer.clear();
+                mEntityBuffer.clear();
+        }
+
+        
+        void VisibilityPredictor::IssueMultiQuery(const vector<Entity *> &mEntities)
+        {
         }
 }

GTP/trunk/Lib/Vis/OnlineCullingCHC/include/HierarchyInterface.h

@@ -21 +21 @@
 
 typedef std::vector<HierarchyNode *> HierarchyNodeContainer;
+
+
+class MultiQuery
+{
+        OcclusionQuery *mQuery;
+        HierarchyNodeContainer *mNodes;
+};
+