Changeset 187 for trunk/VUT/work/TestCullingTerrain

Timestamp:

07/31/05 11:16:09 (19 years ago)

Author:

mattausch

Message:

added animationbug fix (deleting while animation)fixed visibilityQueriesadditive shadow volumes fixed for octree
hack to fully empty queue after traversal
added demo for vienna model

Location:

trunk/VUT/work/TestCullingTerrain

Files:

• TerrainFrameListener.cpp (modified) (4 diffs)
• TerrainFrameListener.h (modified) (1 diff)
• TestCullingTerrain.vcproj (modified) (2 diffs)
• TestCullingTerrainApplication.cpp (modified) (1 diff)

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

@@ -169 +169 @@
 
         // set scene manager options
-        mSceneMgr->setOption("TestGeometryForVisibleLeaves", &mTestGeometryForVisibleLeaves);
-
-        // apply delayed rendering (i.e., transparents after hierarchical culling pass)
-        // only if optimization is not used 
-        bool delayRenderTransparents = !mTestGeometryForVisibleLeaves;
-
-        mSceneMgr->setOption("DelayRenderTransparents", &delayRenderTransparents);
+        setTestGeometryForVisibleLeaves(mTestGeometryForVisibleLeaves);
+
         mSceneMgr->setOption("UseDepthPass", &mUseDepthPass);
         
@@ -190 +185 @@
 TerrainFrameListener::~TerrainFrameListener()
 {
-        delete mRayQueryExecutor;
-        delete mEventProcessor;
-
-        if (mQueryManager)
-        {
-                delete mQueryManager;
-                mQueryManager = NULL;
-        }
+        OGRE_DELETE(mRayQueryExecutor);
+        OGRE_DELETE(mEventProcessor);
+        OGRE_DELETE(mQueryManager);
 }
 //-----------------------------------------------------------------------
@@ -858 +848 @@
 }
 //-----------------------------------------------------------------------
-void TerrainFrameListener::toggleTestGeometryForVisibleLeaves()
-{
-        mTestGeometryForVisibleLeaves = !mTestGeometryForVisibleLeaves;
+void TerrainFrameListener::setTestGeometryForVisibleLeaves(bool testGeometryForVisibleLeaves)
+{
         mSceneMgr->setOption("TestGeometryForVisibleLeaves", &mTestGeometryForVisibleLeaves);
         
@@ -1005 +994 @@
                 break;
         case KC_G:
-                toggleTestGeometryForVisibleLeaves();
+                mTestGeometryForVisibleLeaves = !mTestGeometryForVisibleLeaves;
+                setTestGeometryForVisibleLeaves(mTestGeometryForVisibleLeaves);
                 break;
         case KC_T:

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.h

@@ -119 +119 @@
     void changeThreshold(int incr);
         void changeAssumedVisibility(int incr);
-        void toggleTestGeometryForVisibleLeaves();
+        void setTestGeometryForVisibleLeaves(bool testGeometryForVisibleLeaves);
         void toggleShowOctree();
         void toggleUseDepthPass();

trunk/VUT/work/TestCullingTerrain/TestCullingTerrain.vcproj

@@ -73 +73 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                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)\ReferenceApplication\ReferenceAppLayer\include&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\include&quot;;&quot;$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include&quot;;..\..\Ogre\include;..\..\GtpVisibility\include;..\include;..\TestCulling"
+                                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;..\..\GtpVisibility\include;..\include"
                                 PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_RELEASE;WIN32;_STLP_RELEASE;GTP_VISIBILITY_MODIFIED_OGRE"
                                 RuntimeLibrary="2"
@@ -88 +88 @@
                                 OutputFile="$(OGRE_PATH)/Samples/Common/bin/Release/TestCullingTerrain.exe"
                                 LinkIncremental="1"
-                                AdditionalLibraryDirectories="&quot;$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\bin\$(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;$(GAMETOOLS_PATH)\trunk\VUT\Ogre\lib\$(ConfigurationName)&quot;"
+                                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;$(GAMETOOLS_PATH)\trunk\VUT\Ogre\lib\$(ConfigurationName)&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="2"

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -227 +227 @@
 void TestCullingTerrainApplication::createScene()
 {
+        Real scale = 3;
+        mSceneMgr->setOption("NodeVizScale", &scale);
+
         // Set ambient light
         mAmbientLight = ColourValue(0.5 , 0.5, 0.5);