Changeset 2253 for GTP/trunk/Lib

Timestamp:

03/15/07 18:49:25 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src

Files:

• OgreOcclusionCullingSceneManager.cpp (modified) (15 diffs)
• Plugin_VisibilitySceneManager.vcproj (modified) (1 diff)

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

@@ -401 +401 @@
         LogManager::getSingleton().logMessage("****** Finished OcclusionCullingSceneManager Options ********");
 }
-
-
+//-----------------------------------------------------------------------
 void OcclusionCullingSceneManager::MailPvsObjects()
 {
@@ -451 +450 @@
         }*/
 }
-
-
+//-----------------------------------------------------------------------
 void OcclusionCullingSceneManager::RenderPvsEntry(GtpVisibilityPreprocessor::Intersectable *obj)
 {
@@ -608 +606 @@
         if (mNormalExecution)
         {
-                return SceneManager::_setPass(pass);
+                return TerrainSceneManager::_setPass(pass);
         }
 
@@ -717 +715 @@
                 mNormalExecution)
         {
-                OctreeSceneManager::_findVisibleObjects(cam, onlyShadowCasters);
+                TerrainSceneManager::_findVisibleObjects(cam, onlyShadowCasters);
         }
         else if (mUseDepthPass)
@@ -768 +766 @@
                 TerrainSceneManager::_renderVisibleObjects();
 
-                //LogManager::getSingleton().logMessage("x");
                 mIlluminationStage = savedStage;
         }
         else //-- the hierarchical culling algorithm
-        {//LogManager::getSingleton().logMessage("y");
+        {
                 // note matt: this is also called in TerrainSceneManager: really necessary?
                 mDestRenderSystem->setLightingEnabled(false);
@@ -862 +859 @@
         if (0) WriteLog(); // write out stats
 }
-
 //-----------------------------------------------------------------------
 void OcclusionCullingSceneManager::_updateSceneGraph(Camera* cam)
@@ -1040 +1036 @@
         if (key == "VisibilityManager")
         {
-                //Ogre::LogManager::getSingleton().logMessage("here77");
                 * static_cast<GtpVisibility::VisibilityManager **>(val) = mVisibilityManager;
                 return true;
@@ -1143 +1138 @@
                                                                                                                                 QueuedRenderableCollection::OrganisationMode om)
 {
+        if (mNormalExecution)
+        {
+                return TerrainSceneManager::renderBasicQueueGroupObjects(pGroup, om);
+        }
     // Basic render loop
     // Iterate through priorities
@@ -1166 +1165 @@
                                 QueuedRenderableCollection::OM_SORT_DESCENDING, true);
                 }
-
-
     } // for each priority
 }
@@ -1176 +1173 @@
         if (mNormalExecution)
         {
-                return SceneManager::validatePassForRendering(pass);
+                return TerrainSceneManager::validatePassForRendering(pass);
         }
 
@@ -1429 +1426 @@
 {
         // only render solid passes during hierarchical culling
-        if (mIsHierarchicalCulling)
+        if (mNormalExecution || mIsHierarchicalCulling)
         {
                 RenderQueueGroup::PriorityMapIterator groupIt = pGroup->getIterator();
@@ -1470 +1467 @@
         RenderQueueGroup* pGroup, QueuedRenderableCollection::OrganisationMode om)
 {
-   if (mIsHierarchicalCulling)
+   if (mNormalExecution || mIsHierarchicalCulling)
    {
            // Iterate through priorities
@@ -1487 +1484 @@
    else
    {
-           OctreeSceneManager::renderModulativeStencilShadowedQueueGroupObjects(pGroup, om);
+           TerrainSceneManager::renderModulativeStencilShadowedQueueGroupObjects(pGroup, om);
    }
 }
@@ -1910 +1907 @@
                                                                                                 bool includeOverlays)
 {
-        if (1 && mNormalExecution)
+        if (0 && mNormalExecution)
         {
                 TerrainSceneManager::_renderScene(camera, vp, includeOverlays);
@@ -2362 +2359 @@
                                                                                                            bool onlyShadowCasters)                                                                               
 {
-        if (1 || mNormalExecution)
+        if (mNormalExecution)
         {
                 TerrainSceneManager::_findVisibleObjects(cam, onlyShadowCasters);

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/Plugin_VisibilitySceneManager.vcproj

@@ -322 +322 @@
                                 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\Release";"$(OGRE_PATH)\OgreMain\lib\Release";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";..\..\GtpVisibility\lib\Release;..\..\lib\Release;..\lib\Release;"$(OGRE_PATH)\Dependencies\lib\Release";..\..\..\Preprocessing\lib\Release;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL;"$(CG_LIB_PATH)";..\..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\Lib\Vis\Preprocessing\MultiLevelRayTracing\RTWorld\Release;..\..\..\..\..\Lib\Vis\Preprocessing\MultiLevelRayTracing\RTScene\Release;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\Release;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\lib\Release"
                                 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def"
-                                GenerateDebugInformation="FALSE"
+                                GenerateDebugInformation="TRUE"
                                 SubSystem="2"
                                 OptimizeReferences="2"