Changeset 1275

Timestamp:

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

Author:

mattausch

Message:

 

Location:

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

Files:

• TerrainFrameListener.cpp (modified) (6 diffs)
• TestCullingTerrain.vcproj (modified) (2 diffs)

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

@@ -17 +17 @@
         "Coherent Hierarchical Culling",
         "View Frustum Culling", 
-        "Stop and Wait Culling"
+        "Stop and Wait Culling",
+        "Standard Rendering"
 };
 
@@ -25 +26 @@
         "CHC",
         "VFC", 
-        "SWC"
+        "SWC",
+        "DEF"
 };
 
@@ -972 +974 @@
 void TerrainFrameListener::nextAlgorithm()
 {
+        // possible algorithms: 3 culling algorithms + standard rendering
         mCurrentAlgorithm = (mCurrentAlgorithm + 1) % 
-                GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS;
+                (GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS + 1);
         applyCurrentAlgorithm();
 }
@@ -992 +995 @@
 void TerrainFrameListener::applyCurrentAlgorithm()
 {
+        bool isNormalExecution;
+        
+        if (mCurrentAlgorithm < GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS)
+        {
+                isNormalExecution = false;
+                mSceneMgr->setOption("Algorithm", &mCurrentAlgorithm);
+        }
+        else
+        {       // standard rendering without changed render queue flow
+                isNormalExecution = true;
+        }
+        
+        mSceneMgr->setOption("NormalExecution", &isNormalExecution);
         mAlgorithmInfo->setCaption(": " + msAlgorithmCaptions[mCurrentAlgorithm]);
-        mSceneMgr->setOption("Algorithm", &mCurrentAlgorithm);
 
         if (1)
@@ -1179 +1194 @@
         if (mApplication->msShowHillyTerrain)
                 return;
-LogManager::getSingleton().logMessage("here533");
+
         mUseViewCells = !mUseViewCells;
 
@@ -1196 +1211 @@
                         std::stringstream d;
                         d << "loading view cells failed";
-                        LogManager::getSingleton().logMessage("here7");
                         LogManager::getSingleton().logMessage(d.str());
                 }

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

@@ -73 +73 @@
                         <Tool
                                 Name="VCCLCompilerTool"
+                                Optimization="3"
+                                GlobalOptimizations="TRUE"
+                                InlineFunctionExpansion="2"
+                                FavorSizeOrSpeed="1"
+                                OptimizeForProcessor="3"
+                                OptimizeForWindowsApplication="TRUE"
                                 AdditionalIncludeDirectories="&quot;$(OGRE_PATH)\Dependencies\include&quot;;&quot;$(OGRE_PATH)\OgreMain\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\include&quot;;&quot;$(OGRE_PATH)\Dependencies\include\CEGUI&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include&quot;;..\..\Ogre\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include;..\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include"
                                 PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_RELEASE;WIN32;_STLP_RELEASE;GTP_VISIBILITY_MODIFIED_OGRE"
@@ -89 +95 @@
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories="&quot;$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\OgreMain\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib&quot;;&quot;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\lib\$(ConfigurationName)&quot;;&quot;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\lib\$(ConfigurationName)&quot;;&quot;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)&quot;;..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;&quot;..\..\..\..\..\Lib\Vis\Preprocessing\lib\$(ConfigurationName)&quot;"
-                                GenerateDebugInformation="TRUE"
+                                GenerateDebugInformation="FALSE"
                                 SubSystem="2"
                                 OptimizeReferences="2"