Changeset 2171 for GTP/trunk/App/Demos/Vis

Timestamp:

02/27/07 10:25:01 (18 years ago)

Author:

mattausch

Message:

implemented function for exact visibility queries

Location:

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE

Files:

• TerrainFrameListener.cpp (modified) (9 diffs)
• TestCullingTerrain.vcproj (modified) (1 diff)

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.cpp

@@ -570 +570 @@
                                                                                                 bool relativeVisibility, 
                                                                                                 bool useItemBuffer)
-{Ogre::LogManager::getSingleton().logMessage("here225");
+{
         int itemBufferMode = useItemBuffer ? mItemBufferMode : 0;
         
@@ -579 +579 @@
 
         // no visibility manager available => no visibility scene manager, return
-        GtpVisibility::VisibilityManager *visManager = NULL;
-        
+        GtpVisibility::VisibilityManager *visManager = NULL;    
         if (!mSceneMgr->getOption("VisibilityManager", &visManager))
         {
@@ -586 +585 @@
                 return;
         }
+
         GtpVisibility::HierarchyInterface *hierarchyInterface = NULL;
         if (!mSceneMgr->getOption("HierarchyInterface", &hierarchyInterface))
@@ -592 +592 @@
                 return;
         }
-Ogre::LogManager::getSingleton().logMessage("here663");
+
         mQueryManager = new OcclusionQueriesQueryManager(hierarchyInterface,
-                        mWindow->getViewport(0), queryModes, itemBufferMode);
-Ogre::LogManager::getSingleton().logMessage("here6699");
+                                                                                                         mWindow->getViewport(0), 
+                                                                                                         queryModes, 
+                                                                                                         itemBufferMode);
+
         //mQueryManager = new PlatformQueryManager(sm->GetHierarchyInterface(), mWindow->getViewport(0), false);
-
 
         visManager->SetQueryManager(mQueryManager);
@@ -604 +605 @@
         GtpVisibility::MeshInfoContainer visibleGeometry;
         GtpVisibility::PatchInfoContainer visiblePatches;
-Ogre::LogManager::getSingleton().logMessage("here999");
 
         if (fromPoint)
-        {Ogre::LogManager::getSingleton().logMessage("her11e5");
-                mQueryManager->
-                        ComputeFromPointVisibility(mCamNode->getPosition(), &visibleNodes, 
-                                                                           &visibleGeometry, &visiblePatches, relativeVisibility);
+        {
+                mQueryManager->ComputeFromPointVisibility(mCamNode->getPosition(), 
+                                                                                                  &visibleNodes, 
+                                                                                                  &visibleGeometry, 
+                                                                                                  &visiblePatches, 
+                                                                                                  relativeVisibility);
         }
         else
         {
-                Ogre::LogManager::getSingleton().logMessage("here995");
                 mQueryManager->ComputeCameraVisibility(*mCamera,
-                            &visibleNodes, &visibleGeometry, &visiblePatches, relativeVisibility);
+                                                                                           &visibleNodes, 
+                                                                                           &visibleGeometry, 
+                                                                                           &visiblePatches, 
+                                                                                           relativeVisibility);
         }
                 
@@ -630 +634 @@
         int geomSize = 0, nodesSize = 0, patchSize = 0;
 
-        ///////////////////////////////////////////////////////////////////////////
+        /////////////////
         //-- apply queries on geometry level
 
@@ -654 +658 @@
 
 
-
-        ///////////////////////////////////////////////////////////////////////////
+        ////////////////
         //-- apply queries on node level
-
 
         GtpVisibility::NodeInfoContainer::iterator nodesIt, nodesIt_end = visibleNodes.end();
@@ -678 +680 @@
 
 
-        ///////////////////////////////////////////////////////////////////////////
+        ////////////////
         //-- apply queries on patch level
 
@@ -1249 +1251 @@
 void TerrainFrameListener::toggleShowViewCells()
 {
-        mShowViewCells = !mShowViewCells;
-        mSceneMgr->setOption("ShowViewCells", &mShowViewCells);
+        if (0) // tmp matt
+        {
+                mShowViewCells = !mShowViewCells;
+                mSceneMgr->setOption("ShowViewCells", &mShowViewCells);
+        }
+        else 
+        {
+                unsigned int numObjects;
+                mSceneMgr->getOption("VisibleObjects", &numObjects);
+        }
 }
 //-----------------------------------------------------------------------

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrain.vcproj

@@ -98 +98 @@
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories=""$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\Lib\$(ConfigurationName)";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;"..\..\..\..\..\Lib\Vis\Preprocessing\lib\$(ConfigurationName)""
-                                GenerateDebugInformation="TRUE"
+                                GenerateDebugInformation="FALSE"
                                 SubSystem="2"
                                 OptimizeReferences="2"