Changeset 145 for trunk/VUT/GtpVisibility

Timestamp:

06/22/05 10:05:06 (20 years ago)

Author:

mattausch

Message:

fixed bug when canceling login
fixed visibility queries using occlusion queries

Location:

trunk/VUT/GtpVisibility

Files:

• include/VisibilityInfo.h (modified) (2 diffs)
• src/VisibilityInfo.cpp (added)

trunk/VUT/GtpVisibility/include/VisibilityInfo.h

@@ -9 +9 @@
 namespace GtpVisibility {
   
-/** Class storing the visibility information of a scene node. 
+/** Class storing visibility information.
 */
-class NodeInfo 
+class VisibilityInfo
 {
 public:
-    NodeInfo(HierarchyNode *node, const int projectedPixels, const int visiblePixels): 
-        mNode(node)//, mProjectedPixels(projectedPixels), mVisiblePixels(visiblePixels) 
-        {}
+        VisibilityInfo(const int visiblePixels, const int projectedPixels);
 
-        int GetVisiblePixels() const {return mVisiblePixels;}
-        int GetProjectedPixels() const {return mProjectedPixels;}
+        int GetVisiblePixels() const;
+        int GetProjectedPixels() const;
 
-        void SetVisiblePixels(int vis) {mVisiblePixels = vis;}
-        void SetProjectedPixels(int vis) {mProjectedPixels = vis;}
+        void SetVisiblePixels(int vis);
+        void SetProjectedPixels(int vis);
+        
+        /** Computes ratio of visible to projected pixels. */
+        float ComputeRelativeVisibility();
 
-        void SetNode(HierarchyNode *node) {mNode = node;}
-        HierarchyNode *GetNode() const {return mNode;}
+        /** Adds visibility to current visibility information.
+        */
+        void AddVisibility(const VisibilityInfo &info);
 
-        float ComputeRelativeVisibility() { float result = mVisiblePixels; if (mProjectedPixels) result /= (float)mProjectedPixels; return result;}
+
+protected:
+        /** number of visible pixels. */
+    int mVisiblePixels;
+        /** number of projected pixels */
+        int mProjectedPixels;
+};
+/** Class storing the visibility information of a hierarchy node. 
+*/
+class NodeInfo: public VisibilityInfo
+{
+public:
+    NodeInfo(HierarchyNode *node, const int visiblePixels, const int projectedPixels);
+
+        void SetNode(HierarchyNode *node);
+        HierarchyNode *GetNode() const;
         //bool operator<(const NodeInfo& rhs) const {return mNode < rhs.mNode;}
 
 protected:
 
-    /** pointer to the scene node */
+    /** Pointer to the hierarchy nnode.
+        */
     HierarchyNode *mNode;
-    
-    int mVisiblePixels;
-        int mProjectedPixels;
 };
   
 /** Class storing the visibility information of a mesh.
 */
-class MeshInfo 
+class MeshInfo: public VisibilityInfo
 {
 public:
-        MeshInfo(Mesh *mesh,  const int projectedPixels, const int visiblePixels): 
-        mMesh(mesh), mProjectedPixels(projectedPixels), mVisiblePixels(visiblePixels) 
-        {}
+        MeshInfo(Mesh *mesh, const int visiblePixels, const int projectedPixels);
 
-        int GetVisiblePixels() const {return mVisiblePixels;}
-        int GetProjectedPixels() const {return mProjectedPixels;}
+        Mesh *GetMesh() const;
+        void SetMesh(Mesh *mesh);
 
-        void SetVisiblePixels(float vis) { mVisiblePixels = vis;}
-        void SetProjectedPixels(float vis) { mProjectedPixels = vis;}
-
-        Mesh *GetMesh() const {return mMesh;}
-        void SetMesh(Mesh *mesh) {mMesh = mesh;}
-
-        bool operator<(const MeshInfo& rhs) const {return mMesh < rhs.mMesh;}
-        //bool operator>(const MeshInfo& rhs) const {return mMesh > rhs.mMesh;}
+        //bool operator<(const MeshInfo& rhs) const {return mMesh < rhs.mMesh;}
         //bool operator==(const MeshInfo& rhs) const {return mMesh == rhs.mMesh;}
         
@@ -66 +72 @@
         */
     Mesh *mMesh;
-  
-    int mVisiblePixels;
-        int mProjectedPixels;
 };