Changeset 143 for trunk/VUT/GtpVisibility

Timestamp:

06/21/05 18:14:30 (19 years ago)

Author:

mattausch

Message:

updated visibility queries

Location:

trunk/VUT/GtpVisibility

Files:

• include/DummyQueryManager.h (modified) (2 diffs)
• include/QueryManager.h (modified) (3 diffs)
• include/VisibilityInfo.h (modified) (4 diffs)
• src/DummyQueryManager.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibility/include/DummyQueryManager.h

@@ -25 +25 @@
                             InfoContainer<NodeInfo> *visibleNodes,
                             InfoContainer<MeshInfo> *visibleGeometry,
-                            bool relativeVisibility = false
+                            bool projectedPixels = false
                             );
     
@@ -35 +35 @@
                                InfoContainer<NodeInfo> *visibleNodes,
                                InfoContainer<MeshInfo> *visibleGeometry,
-                               bool relativeVisibility = false
+                               bool projectedPixels = false
                                );
     

trunk/VUT/GtpVisibility/include/QueryManager.h

@@ -41 +41 @@
         If NULL no visible meshes are not evaluated.
 
-        @param relativeVisibility If true the visibility member for
+        @param projectedPixels If true the visibility member for
         NodeInfo and MeshInfo represent relative visibility; i.e. the number of visible
         pixels divided by the the number of projected pixels.
@@ -51 +51 @@
                             InfoContainer<NodeInfo> *visibleNodes,
                             InfoContainer<MeshInfo> *visibleGeometry,
-                            bool relativeVisibility = false
+                            bool projectedPixels = false
                             ) = 0;
     
@@ -62 +62 @@
                                InfoContainer<NodeInfo> *visibleNodes,
                                InfoContainer<MeshInfo> *visibleGeometry,
-                               bool relativeVisibility = false
+                               bool projectedPixels = false
                                ) = 0;
     

trunk/VUT/GtpVisibility/include/VisibilityInfo.h

@@ -14 +14 @@
 {
 public:
-    NodeInfo(HierarchyNode *node,const float v): mNode(node), mVisibility(v) {}
+    NodeInfo(HierarchyNode *node, const int projectedPixels, const int visiblePixels): 
+        mNode(node)//, mProjectedPixels(projectedPixels), mVisiblePixels(visiblePixels) 
+        {}
 
-        float GetVisibility() const {return mVisibility;}
-        void SetVisibility(float vis) { mVisibility = vis;}
-        bool operator<(const NodeInfo& rhs) const {return mNode < rhs.mNode;}
-        //bool operator>(const NodeInfo& rhs) const {return mNode > rhs.mNode;}
-        //bool operator==(const NodeInfo& rhs) const {return mNode == rhs.mNode;}
+        int GetVisiblePixels() const {return mVisiblePixels;}
+        int GetProjectedPixels() const {return mProjectedPixels;}
+
+        void SetVisiblePixels(int vis) {mVisiblePixels = vis;}
+        void SetProjectedPixels(int vis) {mProjectedPixels = vis;}
+
+        void SetNode(HierarchyNode *node) {mNode = node;}
+        HierarchyNode *GetNode() const {return mNode;}
+
+        //bool operator<(const NodeInfo& rhs) const {return mNode < rhs.mNode;}
 
 protected:
@@ -26 +33 @@
     /** pointer to the scene node */
     HierarchyNode *mNode;
-    /** node visibility can either be a number of visible pixels or relative
-        number of visible pixels (if the hardware queries will provide the
-        total number of ratsterized pixels */
-    float mVisibility;
+    
+    int mVisiblePixels;
+        int mProjectedPixels;
 };
   
@@ -37 +43 @@
 {
 public:
-        MeshInfo(Mesh *mesh, const float v): mMesh(mesh), mVisibility(v) {}
+        MeshInfo(Mesh *mesh,  const int projectedPixels, const int visiblePixels): 
+        mMesh(mesh), mProjectedPixels(projectedPixels), mVisiblePixels(visiblePixels) 
+        {}
 
-        float GetVisibility() const {return mVisibility;}
-        void SetVisibility(float vis) { mVisibility = vis;}
+        int GetVisiblePixels() const {return mVisiblePixels;}
+        int GetProjectedPixels() const {return mProjectedPixels;}
+
+        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;}
@@ -51 +65 @@
         */
     Mesh *mMesh;
-    /** Node visibility can either be a number of visible pixels or relative
-        number of visible pixels (if the hardware queries will provide the
-        total number of ratsterized pixels.
-        */
-    float mVisibility;
+  
+    int mVisiblePixels;
+        int mProjectedPixels;
 };
   
 //TODO: this define shall be replaced by template typedef
-//#define InfoContainer std::vector
-#define InfoContainer std::set
+#define InfoContainer std::vector
+//#define InfoContainer std::set
 };
 

trunk/VUT/GtpVisibility/src/DummyQueryManager.cpp

@@ -11 +11 @@
                                              InfoContainer<NodeInfo> *visibleNodes,
                                              InfoContainer<MeshInfo> *visibleGeometry,
-                                             bool relativeVisibility
+                                             bool projectedPixels
                                              )
   {
-          visibleNodes->insert(NodeInfo(mHierarchyInterface->GetSceneRoot(), 1.0f));
+          visibleNodes->push_back(NodeInfo(mHierarchyInterface->GetSceneRoot(), 0, 0));
     
 //      HierarchyInterface::MeshIterator *mi =
@@ -30 +30 @@
                                                 InfoContainer<NodeInfo> *visibleNodes,
                                                 InfoContainer<MeshInfo> *visibleGeometry,
-                                                bool relativeVisibility
+                                                bool projectedPixels
                                                 )
   {
-          visibleNodes->insert(NodeInfo(mHierarchyInterface->GetSceneRoot(), 1.0f));
+          visibleNodes->push_back(NodeInfo(mHierarchyInterface->GetSceneRoot(), 0, 0));
     
 //      HierarchyInterface::MeshIterator *mi =