Changeset 2280 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp

Timestamp:

03/22/07 18:24:13 (17 years ago)

Author:

mattausch

Message:

removed dependency on ogre in gtpvisibility

File:

• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (11 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp

@@ -12 +12 @@
 #include <OgreIteratorWrappers.h>
 #include <OgreHeightmapTerrainPageSource.h>
-//#include "Containers.h"
 #include "ViewCellsManager.h"
 #include <OgreConfigFile.h>
 #include "OgreTypeConverter.h"
 #include "OgreMeshInstance.h"
-//#include "common.h"
 #include "OgreBoundingBoxConverter.h"
 #include <OgreManualObject.h>
@@ -1160 +1158 @@
         if (key == "HierarchyInterface")
         {
-                * static_cast<GtpVisibility::HierarchyInterface **>(val) = mHierarchyInterface;
+                * static_cast<PlatformHierarchyInterface **>(val) = mHierarchyInterface;
                 return true;
         }
@@ -1643 +1641 @@
                         LoadViewCells(filename, mObjects, false, &bconverter);
         
-        Ogre::LogManager::getSingleton().logMessage("******** view cells loaded *********");
+        LogManager::getSingleton().logMessage("******** view cells loaded *********");
 
         // objects are set to invisible initially
@@ -2027 +2025 @@
                 return;
         }
-
+Ogre::LogManager::getSingleton().logMessage("here99");
     Root::getSingleton()._setCurrentSceneManager(this);
         mActiveQueuedRenderableVisitor->targetSceneMgr = this;
@@ -2227 +2225 @@
         mVisibilityManager->SetQueryManager(queryManager);
 
-        GtpVisibility::NodeInfoContainer visibleNodes;
-        GtpVisibility::MeshInfoContainer visibleGeometry;
-        GtpVisibility::PatchInfoContainer visiblePatches;
+        NodeInfoContainer visibleNodes;
+        MeshInfoContainer visibleGeometry;
+        PatchInfoContainer visiblePatches;
 
         if (fromPoint)
@@ -2271 +2269 @@
         if (!nodeVisibility)
         {
-                GtpVisibility::MeshInfoContainer::iterator geomIt, geomIt_end = visibleGeometry.end();
+                MeshInfoContainer::iterator geomIt, geomIt_end = visibleGeometry.end();
 
                 for (geomIt = visibleGeometry.begin(); geomIt != geomIt_end; ++geomIt)
@@ -2294 +2292 @@
                 //-- apply queries on node level
 
-                GtpVisibility::NodeInfoContainer::iterator nodesIt, nodesIt_end = visibleNodes.end();
+                NodeInfoContainer::iterator nodesIt, nodesIt_end = visibleNodes.end();
 
                 for (nodesIt = visibleNodes.begin(); nodesIt != nodesIt_end; ++ nodesIt)
@@ -2433 +2431 @@
 //-----------------------------------------------------------------------
 void OcclusionCullingSceneManager::AddVisibleMeshGeometryToQueue(
-                                                const GtpVisibility::MeshInfoContainer &visibleGeometry,
+                                                const MeshInfoContainer &visibleGeometry,
                                                 Camera *cam)
 {
-        GtpVisibility::MeshInfoContainer::const_iterator geomIt, geomIt_end = visibleGeometry.end();
+        MeshInfoContainer::const_iterator geomIt, geomIt_end = visibleGeometry.end();
 
         for (geomIt = visibleGeometry.begin(); geomIt != geomIt_end; ++geomIt)
@@ -2456 +2454 @@
 //-----------------------------------------------------------------------
 void OcclusionCullingSceneManager::AddVisibleNodeGeometryToQueue(
-                                                const GtpVisibility::NodeInfoContainer &visibleNodes,
+                                                const NodeInfoContainer &visibleNodes,
                                                 Camera *cam)
 {
@@ -2462 +2460 @@
         //-- apply queries on node level
 
-        GtpVisibility::NodeInfoContainer::const_iterator nodesIt, nodesIt_end = visibleNodes.end();
+        NodeInfoContainer::const_iterator nodesIt, nodesIt_end = visibleNodes.end();
 
         for (nodesIt = visibleNodes.begin(); nodesIt != nodesIt_end; ++ nodesIt)
@@ -2529 +2527 @@
         mVisibilityManager->SetQueryManager(queryManager);
 
-        GtpVisibility::NodeInfoContainer visibleNodes;
-        GtpVisibility::MeshInfoContainer visibleGeometry;
-        GtpVisibility::PatchInfoContainer visiblePatches;
+        NodeInfoContainer visibleNodes;
+        MeshInfoContainer visibleGeometry;
+        PatchInfoContainer visiblePatches;
 
         if (mUseFromPointQueries)