Changeset 151 for trunk

Timestamp:

07/04/05 01:33:11 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/work

Files:

• TestCullingTerrain/TerrainFrameListener.cpp (modified) (10 diffs)
• TestCullingTerrain/TerrainFrameListener.h (modified) (2 diffs)
• ogre_changes/Plugins/OctreeSceneManager/include/OgreOctreeNode.h (added)

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

@@ -9 +9 @@
 #include "OgreVisibilityTerrainSceneManager.h"
 #include "VisibilityInfo.h"
-
+#include "OgreItemBufferQueryManager.h";
 // output file for frame info
 const char* frames_out_filename = "frame.out";
@@ -82 +82 @@
 mSunLight(sunLight),
 mShiftPressed(false),
-mShowQueryStats(false)
+mShowQueryStats(false),
+mQueryManager(NULL),
+mVisibilityManager(NULL)
 {
         //mInputDevice = PlatformManager::getSingleton().createInputReader();
@@ -164 +166 @@
         mSceneMgr->setOption("PrepareVisualization", &mShowVisualization);
 
-        // TODO: change this (does not work with other scene manager plugins)
-        mVisibilityManager = dynamic_cast<VisibilityTerrainSceneManager *>(mSceneMgr)->
-                GetVisibilityManager();
-
-        dynamic_cast<PlatformQueryManager *>(mVisibilityManager->GetQueryManager())->
-                SetViewport(mWindow->getViewport(0));
-
         // reset statistics
         resetStats();
@@ -179 +174 @@
         delete mRayQueryExecutor;
         delete mEventProcessor;
+
+        if (mQueryManager)
+        {
+                delete mQueryManager;
+                mQueryManager = NULL;
+        }
 }
 //-----------------------------------------------------------------------
@@ -361 +362 @@
 void TerrainFrameListener::ApplyVisibilityQuery(bool fromPoint, bool relativeVisibility)
 {
+        // TODO: change this (does not work with other scene manager plugins)
+        VisibilityTerrainSceneManager *sm = dynamic_cast<VisibilityTerrainSceneManager *>(mSceneMgr);
+
+        //mQueryManager = new ItemBufferQueryManager(sm->GetHierarchyInterface(), mWindow->getViewport(0));
+        mQueryManager = new PlatformQueryManager(sm->GetHierarchyInterface(), mWindow->getViewport(0));
+
+        sm->GetVisibilityManager()->SetQueryManager(mQueryManager);
+
         InfoContainer<GtpVisibility::NodeInfo> visibleNodes;
         InfoContainer<GtpVisibility::MeshInfo> visibleGeometry;
@@ -366 +375 @@
         if (fromPoint)
         {
-                mVisibilityManager->GetQueryManager()->
+                mQueryManager->
                         ComputeFromPointVisibility(mCamNode->getPosition(), &visibleNodes, 
                                                                            &visibleGeometry, relativeVisibility);
@@ -372 +381 @@
         else
         {
-                mVisibilityManager->GetQueryManager()->ComputeCameraVisibility(*mCamera,
+                mQueryManager->ComputeCameraVisibility(*mCamera,
                             &visibleNodes, &visibleGeometry, relativeVisibility);
         }
@@ -378 +387 @@
         float averageNodeVis = 0;
         float averageGeometryVis = 0;
+        int geomSize = 0;
+        int nodesSize = 0;
 
         InfoContainer<GtpVisibility::MeshInfo>::iterator geomIt, geomIt_end = visibleGeometry.end();
@@ -383 +394 @@
         for (geomIt = visibleGeometry.begin(); geomIt != geomIt_end; ++geomIt)
         {
-                float vis = relativeVisibility ? 
-                        (*geomIt).ComputeRelativeVisibility() : (float)(*geomIt).GetVisiblePixels();
+                // add if not 0
+                if ((*geomIt).GetVisiblePixels())
+                {
+                        float vis = relativeVisibility ? 
+                                (*geomIt).ComputeRelativeVisibility() : (float)(*geomIt).GetVisiblePixels();
+        
+                        averageGeometryVis += vis;
+                        ++geomSize;
+                        
+                        std::stringstream d; d << "Geometry visibility: " << vis;
+                        LogManager::getSingleton().logMessage(d.str());
+                }
+        }
+
+        InfoContainer<GtpVisibility::NodeInfo>::iterator nodesIt, nodesIt_end = visibleNodes.end();
+
+        for (nodesIt = visibleNodes.begin(); nodesIt != nodesIt_end; ++nodesIt)
+        {
+                // add if not 0
+                if ((*nodesIt).GetVisiblePixels())
+                {
+                        float vis = relativeVisibility ? 
+                                (*nodesIt).ComputeRelativeVisibility() : (float)(*nodesIt).GetVisiblePixels();
                 
-                averageGeometryVis += vis;
-
-                std::stringstream d; d << "Geometry visibility: " << vis;
-                LogManager::getSingleton().logMessage(d.str());
-        }
-
-        InfoContainer<GtpVisibility::NodeInfo>::iterator nodesIt, nodesIt_end = visibleNodes.end();
-
-        for (nodesIt = visibleNodes.begin(); nodesIt != nodesIt_end; ++nodesIt)
-        {
-                float vis = relativeVisibility ? 
-                        (*nodesIt).ComputeRelativeVisibility() : (float)(*nodesIt).GetVisiblePixels();
-                
-                averageNodeVis += vis;
-                
-                std::stringstream d; d << "Node visibility: " << vis;
-                LogManager::getSingleton().logMessage(d.str());
-        }
-
-        if (visibleNodes.size())
-                averageNodeVis /= (float)visibleNodes.size();
-        if (visibleGeometry.size())
-                averageGeometryVis /= (float)visibleGeometry.size();
+                        averageNodeVis += vis;
+                        ++nodesSize;
+
+                        std::stringstream d; d << "Node visibility: " << vis;
+                        LogManager::getSingleton().logMessage(d.str());
+                }       
+        }
+
+        if (nodesSize)
+                averageNodeVis /= (float)nodesSize;
+        if (geomSize)
+                averageGeometryVis /= (float)geomSize;
 
         char str[100];
@@ -445 +466 @@
                 mShowQueryStats = true;
         }
+
+        delete mQueryManager;
 }
 //-----------------------------------------------------------------------

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.h

@@ -11 +11 @@
 #include "VisibilityManager.h"
 #include "OgreTerrainContentGenerator.h"
+#include "OgrePlatformQueryManager.h"
 
 using namespace Ogre;
@@ -233 +234 @@
         unsigned long mFrameCount;
         //bool mUseBufferedInputKeys, mUseBufferedInputMouse, mInputTypeSwitchingOn;
+        PlatformQueryManager *mQueryManager;
 };