Changeset 74 for trunk/VUT/work/TestCulling/TestCullingApplication.cpp

Timestamp:

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

Author:

mattausch

Message:

added support for release mode

File:

• trunk/VUT/work/TestCulling/TestCullingApplication.cpp (modified) (8 diffs)

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);