Changeset 130 for trunk/VUT/GtpVisibility/include

Timestamp:

06/14/05 02:50:05 (19 years ago)

Author:

mattausch

Message:

added visibility queries

Location:

trunk/VUT/GtpVisibility/include

Files:

• CoherentHierarchicalCullingManager.h (modified) (1 diff)
• HierarchyInterface.h (modified) (5 diffs)
• QueryManager.h (modified) (3 diffs)
• VisibilityInfo.h (modified) (2 diffs)
• VisibilityManager.h (modified) (1 diff)
• VisibilityMesh.h (modified) (1 diff)

trunk/VUT/GtpVisibility/include/CoherentHierarchicalCullingManager.h

@@ -8 +8 @@
 namespace GtpVisibility
 {
-
-typedef std::pair<HierarchyNode *, OcclusionQuery *> QueryPair;
-typedef std::queue<QueryPair> QueryQueue;
 
 /** Renders the scene with the coherent hierarchical culling algorithm. 

trunk/VUT/GtpVisibility/include/HierarchyInterface.h

@@ -3 +3 @@
 
 #include "DistanceQueue.h"
+#include "VisibilityMesh.h"
 
 namespace GtpVisibility {
 
 enum  CullingType {QUERY_CULLED, FRUSTUM_CULLED};
+
+typedef std::vector<HierarchyNode *> HierarchyNodeList;
+typedef std::vector<GtpVisibility::Mesh *> GeometryList;
+typedef std::pair<HierarchyNode *, OcclusionQuery *> QueryPair;
+typedef std::queue<QueryPair> QueryQueue;
 
 /**     Class which implements a hierarchy interface for a scene hierarchy.
@@ -26 +32 @@
         */
         virtual void TraverseNode(HierarchyNode *node) = 0;
-        /** Renders current scene node .
-                @param node current scene node to be rendered
+        /** Renders current hierarchy node.
+                @param node current hierarchy node to be rendered
         */
         virtual void RenderNode(HierarchyNode *node) = 0;
@@ -119 +125 @@
                 CullingType type) = NULL;
 
+        /** Returns vector of previously rendered hierarchy nodes.
+        */
+        std::vector<HierarchyNode *> *GetRenderedNodes();
+        /** Returns vector of previoulsy rendered geometry.
+        */
+        
+        /** 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 geometry of hierarchy node. 
+        */
+        virtual void GetGeometry(GtpVisibility::HierarchyNode *node,    
+                                                         GeometryList *geometryList, 
+                                                         bool includeChildren) = 0;
+
+
+        /** Renders geometry.
+        */
+        virtual void RenderGeometry(GtpVisibility::Mesh *geom) = 0;
+
 protected:
         
@@ -128 +157 @@
         //--- statistics
         unsigned int mNumTraversedNodes;
-        unsigned int mNumRenderedNodes;
 
         DistanceQueue *mDistanceQueue;
@@ -134 +162 @@
         HierarchyNode *mPreviousNode;
 
-        
+        std::vector<HierarchyNode *> mRenderedNodes;
 };
 } // namespace GtpVisibility

trunk/VUT/GtpVisibility/include/QueryManager.h

@@ -11 +11 @@
 namespace GtpVisibility {
   
+typedef std::vector<OcclusionQuery *> QueryList;
+
 /** This abstract class defines interface for a specific visibility query
     algorithm. The interface supports two from point visibility queries and
@@ -23 +25 @@
 public:
     /** Constructor taking a hierarchy interface as an argument. This allows to operate
-        onm different hierarchy types, while reusing the implementation of the query methods.
+        on different hierarchy types, while reusing the implementation of the query methods.
      */
     QueryManager(HierarchyInterface *hierarchyInterface);
@@ -81 +83 @@
              );
   
-        /** Sets the scene traverser.
-      @remark the scene traverser depends on the type of hierarchyInterface the scene consists of.
+        /** Sets the hierarchy interface.
+      @remark the traversal depends on the type of hierarchyInterface the scene consists of.
         */
-        void SetSceneTraverser(HierarchyInterface *hierarchyInterface);
+        void SetHierarchyInterface(HierarchyInterface *hierarchyInterface);
 
 protected:

trunk/VUT/GtpVisibility/include/VisibilityInfo.h

@@ -16 +16 @@
     NodeInfo(HierarchyNode *node,const float v): mNode(node), mVisibility(v) {}
 
+        float GetVisibiliy() const {return mVisibility;}
+
 protected:
     /** pointer to the scene node */
@@ -31 +33 @@
 public:
         MeshInfo(Mesh *mesh, const float v): mMesh(mesh), mVisibility(v) {}
+
+        float GetVisibiliy() const {return mVisibility;}
 
 protected:

trunk/VUT/GtpVisibility/include/VisibilityManager.h

@@ -55 +55 @@
         */
         void SetUseChcOptimization(bool useOptimization);
+        /** Sets pointer to a query manager. 
+        */
+        void SetQueryManager(QueryManager *queryManager);
+        /** see set 
+        */
+        QueryManager *GetQueryManager();
 
 protected:

trunk/VUT/GtpVisibility/include/VisibilityMesh.h

@@ -2 +2 @@
 #define _VisibilityMesh_H__
 
-#include "OgreMesh.h"
+//#include <OgreMesh.h>
+#include <OgreEntity.h>
 
 namespace GtpVisibility {
-  typedef Ogre::Mesh Mesh;
+  typedef Ogre::Entity Mesh;
 }