Changeset 1264 for GTP/trunk/Lib/Vis/OnlineCullingCHC

Timestamp:

08/23/06 19:19:26 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC

Files:

• OGRE/src/OgreKdTreeSceneManager.cpp (modified) (3 diffs)
• OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (6 diffs)
• OGRE/src/OgreSceneContentGenerator.cpp (modified) (1 diff)
• OGRE/src/OgreVisibilitySceneManagerDll.cpp (modified) (5 diffs)
• scripts/terrainCulling.cfg (modified) (1 diff)

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

@@ -685 +685 @@
                 else //-- the hierarchical culling algorithm
                 {
-                        // this is also called in TerrainSceneManager: really
-                        // necessary?
+                        // this is also called in TerrainSceneManager: really necessary?
                         //mDestRenderSystem -> setLightingEnabled(false);
 
@@ -697 +696 @@
 
                         //-- hierarchical culling
+
                         // the objects of different layers (e.g., background, scene, 
                         // overlay) must be identified and rendered one after another
@@ -781 +781 @@
 }
 
-//void KdTreeSceneManager::_renderNodes(const KdRenderableList& nodelist, Camera * cam, 
-//      bool onlyShadowCasters, int leavePassesInQueue)
+
 void KdTreeSceneManager::_renderNode(KdTree::NodePtr node, Camera * cam, 
                                                                          bool onlyShadowCasters, int leavePassesInQueue)

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

@@ -40 +40 @@
 mIsDepthPassPhase(false),
 mUseItemBuffer(false),
-//mUseItemBuffer(true),
 mIsItemBufferPhase(false),
 mCurrentEntityId(1),
@@ -46 +45 @@
 mSkipTransparents(false),
 mRenderTransparentsForItemBuffer(true),
-//mExecuteVertexProgramForAllPasses(true),
 mExecuteVertexProgramForAllPasses(false),
 mIsHierarchicalCulling(false),
@@ -56 +54 @@
 mDeleteQueueAfterRendering(true)
 {
+        Ogre::LogManager::getSingleton().logMessage("creating occlusion culling scene manager");
+
         mHierarchyInterface = new OctreeHierarchyInterface(this, mDestRenderSystem);
         
@@ -321 +321 @@
         
         
-        // -- delete lists stored for visualization
+        // lists only used for visualization
         mVisible.clear();
         mBoxes.clear();
@@ -331 +331 @@
         {
                 OctreeSceneManager::_renderVisibleObjects();
-
                 return;
         }
@@ -457 +456 @@
                 OGRE_DELETE(mRenderQueue); // HACK: should rather only be cleared ...
 
-        if (0) WriteLog(); // write out stats
+        if (1) WriteLog(); // write out stats
 }
 

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

@@ -65 +65 @@
                 createChildSceneNode(String(name) + "Node", position);
 
-        //std::stringstream d; d << "new node: " << name << "Node";
-        //Ogre::LogManager::getSingleton().logMessage(d.str());
-
         //ent->setCastShadows(false);
         node->attachObject(ent);

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

@@ -24 +24 @@
 */
 
-//#include <OgreVisibilityTerrainSceneManager.h>
 #include <OgreOcclusionCullingSceneManager.h>
 #include <OgreKdTreeSceneManager.h>
-
-//#include <OgreHeightmapTerrainPageSource.h>
 #include <OgreRoot.h>
 #include <OgreLogManager.h>
@@ -40 +37 @@
 namespace Ogre {
 
-//VisibilityTerrainSceneManagerFactory *visibilityTerrainPlugin;
+
 OcclusionCullingSceneManagerFactory *occlusionCullingPlugin;
 KdTreeSceneManagerFactory *kdTreeFactory;
@@ -52 +49 @@
 
         // Create new scene manager
-        //visibilityTerrainPlugin = new VisibilityTerrainSceneManagerFactory(visManager);
         occlusionCullingPlugin = new OcclusionCullingSceneManagerFactory(visManager);
         kdTreeFactory = new KdTreeSceneManagerFactory(visManager);
+
         // Construct listener manager singleton
         new TerrainPageSourceListenerManager();
 
         // Register
-        //Root::getSingleton().addSceneManagerFactory(visibilityTerrainPlugin);
         Root::getSingleton().addSceneManagerFactory(occlusionCullingPlugin);
         Root::getSingleton().addSceneManagerFactory(kdTreeFactory);
@@ -66 +62 @@
 extern "C" void __declspec(dllexport) dllShutdownPlugin()
 {
-        //Root::getSingleton().removeSceneManagerFactory(visibilityTerrainPlugin);
         Root::getSingleton().removeSceneManagerFactory(occlusionCullingPlugin);
         Root::getSingleton().removeSceneManagerFactory(kdTreeFactory);
+
         // destroy listener manager
         delete TerrainPageSourceListenerManager::getSingletonPtr();
@@ -77 +73 @@
         //delete heightmapTerrainPageSource;
         // BUG: crashes on delete!!!! FIX this 
-
-        //delete visibilityTerrainPlugin;
         delete occlusionCullingPlugin;
         delete kdTreeFactory;

GTP/trunk/Lib/Vis/OnlineCullingCHC/scripts/terrainCulling.cfg

@@ +1 @@
+######################################################################
+
+#
+#  Settings for vienna scene
+#
+
+#
+# The scene geometry
+#
+
+
 #Scene=../../../../../resources/media/house_test1.iv
-#Scene=../../../../../resources/media/city1500_flat_1.iv;../../../../../resources/media/roofs_1500.iv;../../../../../resources/media/CityRoads60.iv
-Scene=terrain
+Scene=../../../../../resources/media/city1500_flat_1.iv;../../../../../resources/media/roofs_1500.iv;../../../../../resources/media/CityRoads60.iv
+#Scene=../../../../../resources/media/city1.iv;../../../../../resources/media/roofs_1500.iv;../../../../../resources/media/CityRoads60.iv
 
 # current view point
-#ViewX=830
-#ViewY=300
-#ViewZ=-540
+ViewX=830
+ViewY=300
+ViewZ=-540
 
-ViewX=707
-ViewY=5000
-ViewZ=528
+#
+# The visibility environment: load the view cells from there
+#
 
-#VisibilityEnvironment=D:/svn/gametools/GTP/trunk/Lib/Vis/Preprocessing/scripts/generate_viewcells.env
+VisibilityEnvironment=D:/svn/gametools/GTP/trunk/Lib/Vis/Preprocessing/scripts/generate_viewcells.env
 #VisibilityEnvironment=../../../../../../../GTP/trunk/Lib/Vis/Preprocessing/scripts/generate_viewcells.env
+
+
+
+######################################################################
+
+#
+#  Settings for terrain scene
+#
+
+#Scene=terrain
+
+#
+# current view point
+#
+
+#ViewX=707
+#ViewY=5000
+#ViewZ=528