Changeset 175 for trunk/VUT/GtpVisibility

Timestamp:

07/14/05 20:54:07 (19 years ago)

Author:

mattausch

Message:

added trees

Location:

trunk/VUT/GtpVisibility

Files:

• include/HierarchyInterface.h (modified) (5 diffs)
• include/VisibilityEnvironment.h (modified) (1 diff)
• src/CoherentHierarchicalCullingManager.cpp (modified) (2 diffs)
• src/FrustumCullingManager.cpp (modified) (1 diff)
• src/StopAndWaitCullingManager.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibility/include/HierarchyInterface.h

@@ -47 +47 @@
                 @returns occlusion query for this node
         */
-        virtual OcclusionQuery *IssueOcclusionQuery(HierarchyNode *node, 
+        virtual OcclusionQuery *IssueNodeOcclusionQuery(HierarchyNode *node, 
                 const bool wasVisible = false) = 0;
         /** Sets the root of the scene hierarchy.
@@ -124 +124 @@
                 CullingType type) = NULL;
 
-        /** Returns vector of previously rendered hierarchy nodes.
+        /** Returns vector of visible hierarchy nodes from previous render.
         */
         std::vector<HierarchyNode *> *GetVisibleNodes();
@@ -130 +130 @@
         */
         
-        /** Issue a occlusion query for this mesh.
-                @param node the current mesh
-                @returns occlusion query for this node
-        */
-        virtual GtpVisibility::OcclusionQuery *IssueOcclusionQuery(GtpVisibility::Mesh *mesh) = 0;
-
         /** Returns the geometry of a given hierarchy node. 
                 @param node the hierarchy node containing the geometry
@@ -144 +138 @@
                                                          GeometryList *geometryList, 
                                                          bool includeChildren) = 0;
-
-
-        /** Renders the given geometry.
-        */
-        virtual void RenderGeometry(GtpVisibility::Mesh *geom) = 0;
 
         
@@ -159 +148 @@
         */
         void TestGeometryForVisibleLeaves(bool testGeometry);
-
 
 

trunk/VUT/GtpVisibility/include/VisibilityEnvironment.h

@@ -13 +13 @@
         /** Different types of occlusion culling algorithms 
         */
-        enum CullingManagerType {FRUSTUM_CULLING, 
+        enum CullingManagerType {
+                                                         COHERENT_HIERARCHICAL_CULLING, 
+                                                         FRUSTUM_CULLING, 
                                                          STOP_AND_WAIT_CULLING, 
-                                                         COHERENT_HIERARCHICAL_CULLING, 
                                                          NUM_CULLING_MANAGERS};
 

trunk/VUT/GtpVisibility/src/CoherentHierarchicalCullingManager.cpp

@@ -25 +25 @@
         unsigned int visiblePixels = 0;
         bool isAvailable = false;
-        
+        //Ogre::LogManager::getSingleton().logMessage("Coherent Hierarchical Culling");
+
         //-- PART 1: process finished occlusion queries
         while (!mHierarchyInterface->GetQueue()->empty() || !queryQueue.empty())
@@ -105 +106 @@
                                         
                                         queryQueue.push(QueryPair(node, mHierarchyInterface->
-                                                IssueOcclusionQuery(node, wasVisible)));
+                                                IssueNodeOcclusionQuery(node, wasVisible)));
                                 }
                                 

trunk/VUT/GtpVisibility/src/FrustumCullingManager.cpp

@@ -7 +7 @@
 void FrustumCullingManager::RenderScene()
 {
+        //Ogre::LogManager::getSingleton().logMessage("Frustum Culling");
         while (!mHierarchyInterface->GetQueue()->empty())
         {

trunk/VUT/GtpVisibility/src/StopAndWaitCullingManager.cpp

@@ -7 +7 @@
 void StopAndWaitCullingManager::RenderScene()
 {
+        //Ogre::LogManager::getSingleton().logMessage("Stop and Wait Culling");
         while (!mHierarchyInterface->GetQueue()->empty())
         {
@@ -40 +41 @@
                         unsigned int visiblePixels = 0;
 
-                        mHierarchyInterface->IssueOcclusionQuery(node)->GetQueryResult(visiblePixels, true);
+                        mHierarchyInterface->IssueNodeOcclusionQuery(node)->GetQueryResult(visiblePixels, true);
                         
                         // node visible