Changeset 145 for trunk

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

Files:

• GtpVisibility/include/VisibilityInfo.h (modified) (2 diffs)
• GtpVisibility/src/VisibilityInfo.cpp (added)
• Ogre/src/OgrePlatformQueryManager.cpp (modified) (8 diffs)
• work/TestCullingTerrain/TerrainFrameListener.cpp (modified) (2 diffs)
• work/TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (2 diffs)
• work/TestCullingTerrain/TestCullingTerrainApplication.h (modified) (1 diff)

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;
 };
   

trunk/VUT/Ogre/src/OgrePlatformQueryManager.cpp

@@ -130 +130 @@
                 ++visQueryIt;
                 
-                // nodes with visibilty 0 in queue: 
-                // happens if node is intersected by near plane
+                // node with visibilty 0 in queue (e.g., if node is intersected by near plane)
                 if (visiblePixels > 0)
                 {
@@ -161 +160 @@
                 if (visiblePixels > 0)
                 {                        
-                        visibleGeometry->push_back(GtpVisibility::MeshInfo(*geometryIt, 
-                                visiblePixels, projectedPixels));
+                        visibleGeometry->push_back(GtpVisibility::MeshInfo(*geometryIt, visiblePixels, 
+                                projectedPixels));
                 }
         }
@@ -209 +208 @@
         cam->setAspectRatio(1.0);
         cam->setFOVy(Radian(Math::HALF_PI));
-
-        std::stringstream d;
-        d << "old camera: " + StringConverter::toString(savedCam->getDerivedPosition()) + 
-                " " + "O: " + StringConverter::toString(savedCam->getDerivedOrientation());
-        LogManager::getSingleton().logMessage(d.str());
 
         int sign = -1;
@@ -230 +224 @@
                 ComputeCameraVisibility(*cam, visibleNodes, visibleGeometry, relativeVisibility);
                 
-                //mViewport->getTarget()->update(); for(int j=0; j<10000000; j++)       printf("HAAHHAHAHAHAH");
+                //mViewport->getTarget()->update(); for(int j=0; j<10000000; j++)       printf("wait");
 
                 // permute directions
@@ -254 +248 @@
 
         for (visibleNodesIt = visibleNodes->begin(); visibleNodesIt != visibleNodesIt_end; 
-                ++visibleNodesIt);
+                ++visibleNodesIt)
         {
                 if (!nodeInfo || (nodeInfo->GetNode() != (*visibleNodesIt).GetNode()))
@@ -260 +254 @@
                         nodeInfo = &(*visibleNodesIt);
                 }
-                else
-                {
-                        // add visibility
-                        nodeInfo->SetVisiblePixels(nodeInfo->GetVisiblePixels() + 
-                                (*visibleNodesIt).GetVisiblePixels());
-                
-                        nodeInfo->SetProjectedPixels(nodeInfo->GetProjectedPixels() + 
-                                (*visibleNodesIt).GetProjectedPixels());
+                else // add visibility
+                {                       
+                        nodeInfo->AddVisibility(*visibleNodesIt);
                 }
 
@@ -283 +272 @@
         GtpVisibility::MeshInfo *geomInfo = NULL;
 
+        int i=0;
         for (visibleGeomIt = visibleGeometry->begin(); visibleGeomIt != visibleGeomIt_end; 
-                ++visibleGeomIt);
+                ++visibleGeomIt)
         {
                 if (!geomInfo || (geomInfo->GetMesh() != (*visibleGeomIt).GetMesh()))
@@ -290 +280 @@
                         geomInfo = &(*visibleGeomIt);
                 }
-                else // info points to equal mesh
-                {
-                        // add visibility
-                        geomInfo->SetVisiblePixels(geomInfo->GetVisiblePixels() + 
-                                (*visibleGeomIt).GetVisiblePixels());
-
-                        geomInfo->SetProjectedPixels(nodeInfo->GetProjectedPixels() + 
-                                (*visibleNodesIt).GetProjectedPixels());
+                else // info points to same mesh, just add visibility
+                {
+                        geomInfo->AddVisibility(*visibleGeomIt);
                 }
         }

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

@@ -377 +377 @@
         for (geomIt = visibleGeometry.begin(); geomIt != geomIt_end; ++geomIt)
         {
-                averageGeometryVis += (*geomIt).GetVisiblePixels();
-
-                std::stringstream d; d << "Geometry visibility: " << (*geomIt).GetVisiblePixels();
+                float vis = relativeVisibility ? 
+                        (*geomIt).ComputeRelativeVisibility() : (float)(*geomIt).GetVisiblePixels();
+                
+                averageGeometryVis += vis;
+
+                std::stringstream d; d << "Geometry visibility: " << vis;
                 LogManager::getSingleton().logMessage(d.str());
         }
@@ -387 +390 @@
         for (nodesIt = visibleNodes.begin(); nodesIt != nodesIt_end; ++nodesIt)
         {
-                averageNodeVis += (*nodesIt).GetVisiblePixels();
-
-                std::stringstream d; d << "Node visibility: " << (*nodesIt).GetVisiblePixels();
+                float vis = relativeVisibility ? 
+                        (*nodesIt).ComputeRelativeVisibility() : (float)(*nodesIt).GetVisiblePixels();
+                
+                averageNodeVis += vis;
+                
+                std::stringstream d; d << "Node visibility: " << vis;
                 LogManager::getSingleton().logMessage(d.str());
         }
 
-        if ((int)visibleNodes.size())
+        if (visibleNodes.size())
                 averageNodeVis /= (float)visibleNodes.size();
-        if ((int)visibleGeometry.size())
+        if (visibleGeometry.size())
                 averageGeometryVis /= (float)visibleGeometry.size();
 

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -18 +18 @@
 /*     TestCullingTerrainApplication implementation    */
 /*******************************************************/
-
+TestCullingTerrainApplication::TestCullingTerrainApplication():
+mTerrainContentGenerator(NULL)
+{
+}
 //-----------------------------------------------------------------------
 TestCullingTerrainApplication::~TestCullingTerrainApplication()
@@ -69 +72 @@
 bool TestCullingTerrainApplication::setup()
 {
-        bool result = ExampleApplication::setup();
-
-        if (mWindow)
+        bool carryOn = ExampleApplication::setup();
+
+        if (carryOn)
                 createRenderTargetListener();
 
-        return result;
+        return carryOn;
 }
 //-----------------------------------------------------------------------

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -28 +28 @@
 {
 public:
+        TestCullingTerrainApplication();
         ~TestCullingTerrainApplication();