Changeset 1276 for GTP/trunk

Timestamp:

08/24/06 18:01:42 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• include/OgreOcclusionCullingSceneManager.h (modified) (1 diff)
• src/OgreOcclusionCullingSceneManager.cpp (modified) (10 diffs)
• src/Plugin_VisibilitySceneManager.vcproj (modified) (2 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreOcclusionCullingSceneManager.h

@@ -207 +207 @@
 
         bool mDeleteQueueAfterRendering;
+
+        // normal terrain rendering
+        bool mNormalExecution;
 };
 

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

@@ -21 +21 @@
 #include "OgreBoundingBoxConverter.h"
 
-// normal terrain rendering
-const static NORMAL_RENDER_HACK = false;
 
 namespace Ogre {
@@ -52 +50 @@
 mCurrentViewCell(NULL),
 mElementaryViewCell(NULL),
-mDeleteQueueAfterRendering(true)
+mDeleteQueueAfterRendering(true),
+mNormalExecution(false)
 {
         Ogre::LogManager::getSingleton().logMessage("creating occlusion culling scene manager");
@@ -210 +209 @@
 const Pass *OcclusionCullingSceneManager::_setPass(const Pass* pass, bool evenIfSuppressed)
 {
-        if (NORMAL_RENDER_HACK)
+        if (mNormalExecution)
         {
                 return SceneManager::_setPass(pass);
@@ -287 +286 @@
                                                                                                                 bool onlyShadowCasters)
 {
-        if (NORMAL_RENDER_HACK)
+        if (mNormalExecution)
         {
                 OctreeSceneManager::_findVisibleObjects(cam, onlyShadowCasters);
@@ -328 +327 @@
 void OcclusionCullingSceneManager::_renderVisibleObjects()
 {
-        if (NORMAL_RENDER_HACK)
+        if (mNormalExecution)
         {
                 OctreeSceneManager::_renderVisibleObjects();
@@ -462 +461 @@
 void OcclusionCullingSceneManager::_updateSceneGraph(Camera* cam)
 {
-        if (NORMAL_RENDER_HACK)
+        if (mNormalExecution)
         {
                 OctreeSceneManager::_updateSceneGraph(cam);
@@ -574 +573 @@
                 }
 
+                return true;
+        }
+        if (key == "NormalExecution")
+        { 
+                mNormalExecution = *static_cast<const bool *>(val);
                 return true;
         }
@@ -675 +679 @@
 
         // Do transparents (always descending)
-                if (NORMAL_RENDER_HACK || !mSkipTransparents)
+                if (mNormalExecution || !mSkipTransparents)
                 {
                         renderObjects(pPriorityGrp->getTransparents(), 
@@ -688 +692 @@
 bool OcclusionCullingSceneManager::validatePassForRendering(Pass* pass)
 {
-        if (NORMAL_RENDER_HACK)
+        if (mNormalExecution)
         {
                 return SceneManager::validatePassForRendering(pass);
@@ -710 +714 @@
                                                                                                                         QueuedRenderableCollection::OrganisationMode om)
 {
-        if (NORMAL_RENDER_HACK || !mIsItemBufferPhase)
+        if (mNormalExecution || !mIsItemBufferPhase)
         {
                 TerrainSceneManager::_renderQueueGroupObjects(pGroup, om);

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

@@ -87 +87 @@
                                 OmitFramePointers="TRUE"
                                 EnableFiberSafeOptimizations="TRUE"
-                                OptimizeForProcessor="2"
+                                OptimizeForProcessor="3"
+                                OptimizeForWindowsApplication="TRUE"
                                 AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\..\OnlineCullingCHC\include;..\..\..\Preprocessing\src"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_KD_TERRAIN_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE"
@@ -111 +112 @@
                                 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL;..\..\..\..\..\..\..\NonGTP\Zlib\lib;"..\..\lib\$(ConfigurationName)""
                                 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def"
-                                GenerateDebugInformation="TRUE"
+                                GenerateDebugInformation="FALSE"
                                 SubSystem="2"
                                 OptimizeReferences="2"