Changeset 74 for trunk/VUT/work/TestCulling

Timestamp:

05/01/05 23:29:27 (19 years ago)

Author:

mattausch

Message:

added support for release mode

Location:

trunk/VUT/work/TestCulling

Files:

• TestCulling.vcproj (modified) (4 diffs)
• TestCullingApplication.cpp (modified) (8 diffs)
• TestCullingApplication.h (modified) (3 diffs)

trunk/VUT/work/TestCulling/TestCulling.vcproj

@@ -21 +21 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories=""$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";../include"
-                                PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_DEBUG;WIN32;_STLP_DEBUG;PLUGIN_TERRAIN_IMPORTS"
+                                AdditionalIncludeDirectories=""$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";../include;../../GtpVisibility/include"
+                                PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_DEBUG;WIN32;_STLP_DEBUG;PLUGIN_TERRAIN_IMPORTS;GTP_VISIBILITY_MODIFIED_OGRE"
                                 MinimalRebuild="TRUE"
                                 BasicRuntimeChecks="3"
@@ -37 +37 @@
                                 OutputFile="$(OGRE_PATH)/Samples/Common/bin/Debug/TestCulling.exe"
                                 LinkIncremental="2"
-                                AdditionalLibraryDirectories=""$(OGRE_PATH)\Dependencies\Lib\Debug";"$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\bin\debug";"$(OGRE_PATH)\OgreMain\Lib\Debug";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\debug";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib""
+                                AdditionalLibraryDirectories=""$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)";"$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\Lib\$(ConfigurationName)";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib""
                                 GenerateDebugInformation="TRUE"
                                 ProgramDatabaseFile="$(OutDir)/TestCulling.pdb"
@@ -66 +66 @@
                 <Configuration
                         Name="Release|Win32"
-                        OutputDirectory="Release"
-                        IntermediateDirectory="Release"
+                        OutputDirectory=".\bin\$(ConfigurationName)"
+                        IntermediateDirectory=".\obj\$(ConfigurationName)"
                         ConfigurationType="1"
                         CharacterSet="2">
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..\..\..\Samples\Common\Include, ..\..\..\OgreMain\include"
-                                PreprocessorDefinitions="_WINDOWS,_STLP_USE_DYNAMIC_LIB,OGRE_LIBRARY_IMPORTS,_RELEASE,WIN32,_STLP_RELEASE"
+                                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_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include&quot;;../include;../../GtpVisibility/include"
+                                PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_RELEASE;WIN32;_STLP_RELEASE;GTP_VISIBILITY_MODIFIED_OGRE"
                                 RuntimeLibrary="2"
                                 UsePrecompiledHeader="0"
@@ -83 +83 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="OGREMain.LIB"
-                                OutputFile="..\..\..\Samples\Common\Bin\Release\TestCulling.exe"
+                                AdditionalDependencies="OGREMain.LIB Plugin_OctreeSceneManager.lib CEGUIBase.lib OgreGUIRenderer.lib"
+                                OutputFile="$(OGRE_PATH)/Samples/Common/bin/Release/TestCulling.exe"
                                 LinkIncremental="1"
-                                AdditionalLibraryDirectories="..\..\..\OgreMain\Lib\Release"
+                                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;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="2"

trunk/VUT/work/TestCulling/TestCullingApplication.cpp

@@ -3 +3 @@
         TestCullingApplication.cpp
     \brief
-        Tests the occlusion culling algorithm
+        Tests the visibility culling algorithm
 */
 
@@ -15 +15 @@
 #include "Ogre.h"
 #include "TestCullingApplication.h"
-//#include "OgreVisibilitySceneTraverser.h"
 
 #define WIN32_LEAN_AND_MEAN
@@ -93 +92 @@
 //-----------------------------------------------------------------------
 void TestCullingApplication::generateSceneObject(const Vector3 &translationRatio, 
-                                                                                                 const Vector3 &rotationRatio, const int idx, const String& entName)
+                                                                                                 const Vector3 &rotationRatio, 
+                                                                                                 const int idx, 
+                                                                                                 const String& entName)
 {
         Vector3 rotation = mMinAngle + rotationRatio * (mMaxAngle - mMinAngle);
-        Vector3 translation = mMinTranslation + translationRatio * (mMaxTranslation - mMinTranslation);
+        Vector3 translation = mMinTranslation + 
+                translationRatio * (mMaxTranslation - mMinTranslation);
 
         char name[16];
     sprintf( name, "object%d", idx );
 
-    Entity *ent = mSceneMgr->createEntity( name, entName );
-        SceneNode *node = mSceneMgr->getRootSceneNode()->createChildSceneNode( String(name) + "Node", translation);
+    Entity *ent = mSceneMgr->createEntity(name, entName);
+        SceneNode *node = mSceneMgr->getRootSceneNode()->
+                createChildSceneNode(String(name) + "Node", translation);
         node->attachObject(ent);
         node->scale(0.1,0.1,0.1);
@@ -150 +153 @@
         mRotateSpeed *= 2;
 
-        mCurrentAlgorithm = 0;//VisibilitySceneTraverser::RENDER_COHERENT;
+        mCurrentAlgorithm = GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING;
         mThreshold = 0;
     
@@ -161 +164 @@
         Overlay* pOver = OverlayManager::getSingleton().getByName("Example/VisibilityDemoOverlay"); 
 
-        mAlgorithmInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/AlgorithmInfo");
-        mThresholdInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/ThresholdInfo");
-        mFrustumCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/FrustumCulledNodesInfo");
-        mQueryCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/QueryCulledNodesInfo");
-    mTraversedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/TraversedNodesInfo");
-        mSceneNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/SceneNodesInfo");
-        mHierarchyNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/HierarchyNodesInfo");
-        mRenderedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Occlusion/RenderedNodesInfo");
+        mAlgorithmInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/AlgorithmInfo");
+        mThresholdInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/ThresholdInfo");
+        mFrustumCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/FrustumCulledNodesInfo");
+        mQueryCulledNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/QueryCulledNodesInfo");
+    mTraversedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/TraversedNodesInfo");
+        mHierarchyNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/HierarchyNodesInfo");
+        mRenderedNodesInfo = OverlayManager::getSingleton().getOverlayElement("Example/Visibility/RenderedNodesInfo");
 
         mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
@@ -175 +177 @@
         mQueryCulledNodesInfo->setCaption(": 0");
         mTraversedNodesInfo->setCaption(": 0");
-        mSceneNodesInfo->setCaption(": 0");
         mHierarchyNodesInfo->setCaption(": 0");
         mRenderedNodesInfo->setCaption(": 0");
@@ -275 +276 @@
 void MouseQueryListener::changeAlgorithm()
 {
-    //mCurrentAlgorithm = ++mCurrentAlgorithm % VisibilitySceneTraverser::NUM_RENDERMODES;
+    mCurrentAlgorithm = ++mCurrentAlgorithm % GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS,
 
         mAlgorithmInfo->setCaption(": " + mCurrentAlgorithmCaptions[mCurrentAlgorithm]);
@@ -295 +296 @@
         mTraversedNodesInfo->setCaption(str);
 
-        mSceneMgr->getOption("NumSceneNodes", &opt); sprintf(str,": %d", opt); 
-        mSceneNodesInfo->setCaption(str);
-
-        mSceneMgr->getOption("NumOctreeNodes", &opt); sprintf(str,": %d", opt); 
+        mSceneMgr->getOption("NumHierarchyNodes", &opt); sprintf(str,": %d", opt); 
         mHierarchyNodesInfo->setCaption(str);
 

trunk/VUT/work/TestCulling/TestCullingApplication.h

@@ -5 +5 @@
 #include "CEGUIForwardRefs.h"
 #include "ExampleApplication.h"
-//#include "OgreVisibilitySceneTraverser.h"
+#include "VisibilityEnvironment.h"
 
 
@@ -18 +18 @@
 }
 
-String mCurrentAlgorithmCaptions[3] = 
+String mCurrentAlgorithmCaptions[GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS] = 
 {
-    "Cull Frustum", 
-        "Stop and Wait", 
-        "Coherent Occlusion Culling"
+    "View Frustum Culling", 
+        "Stop and Wait Culling", 
+        "Coherent Hierarchical Culling"
 };
 
@@ -80 +80 @@
     OverlayElement *mTraversedNodesInfo;
         OverlayElement *mHierarchyNodesInfo;
-        OverlayElement *mSceneNodesInfo;
         OverlayElement *mRenderedNodesInfo;
 };