Changeset 93

Timestamp:

05/11/05 17:51:44 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT

Files:

• Ogre/include/OgreVisibilityOctreeSceneManager.h (modified) (1 diff)
• Ogre/include/OgreVisibilityTerrainSceneManager.h (modified) (1 diff)
• Ogre/src/OgreOctreeHierarchyInterface.cpp (modified) (1 diff)
• Ogre/src/OgrePlatformHierarchyInterface.cpp (modified) (1 diff)
• Ogre/src/OgreVisibilityOctreeSceneManager.cpp (modified) (1 diff)
• Ogre/src/OgreVisibilityTerrainSceneManager.cpp (modified) (2 diffs)
• work/TestCulling/TestCullingApplication.cpp (modified) (5 diffs)
• work/TestCulling/TestCullingApplication.h (modified) (2 diffs)
• work/TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (10 diffs)
• work/TestCullingTerrain/TestCullingTerrainApplication.h (modified) (5 diffs)

trunk/VUT/Ogre/include/OgreVisibilityOctreeSceneManager.h

@@ -50 +50 @@
         GtpVisibility::VisibilityManager *getVisibilityManager( void );
 
-        //writes out into the Ogre log file
+        //writes out statis into the Ogre log file
         void WriteLog();
 

trunk/VUT/Ogre/include/OgreVisibilityTerrainSceneManager.h

@@ -63 +63 @@
 };
 
-//}  // namespace GtpVisibility
 } // namespace Ogre
 

trunk/VUT/Ogre/src/OgreOctreeHierarchyInterface.cpp

@@ -145 +145 @@
 }
 
-//} // namespace GtpVisibility
 } // namespace Ogre

trunk/VUT/Ogre/src/OgrePlatformHierarchyInterface.cpp

@@ -78 +78 @@
         GtpVisibility::HierarchyInterface::InitFrame(root);
         mPreviousNode = NULL;
+
         SetCamera(cam);
 }

trunk/VUT/Ogre/src/OgreVisibilityOctreeSceneManager.cpp

@@ -145 +145 @@
         return mVisibilityManager;
 }
+//-----------------------------------------------------------------------
 void VisibilityOctreeSceneManager::WriteLog()
 {
         std::stringstream d;
 
-        d << "Algorithm type: " << mVisibilityManager->GetCullingManagerType() << ", "
+        d << "Algorithm: " << mVisibilityManager->GetCullingManagerType() << ", "
           << "Hierarchy nodes: " << mNumOctreeNodes << ", " << "Traversed nodes: " << mHierarchyInterface->GetNumTraversedNodes() << ", "
           << "Rendered nodes: " << mHierarchyInterface->GetNumRenderedNodes() << ", "

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -6 +6 @@
 #include <OgreRenderSystem.h>
 #include <OgreCamera.h>
+#include <OgreLogManager.h>
 
 #include <windows.h>
@@ -139 +140 @@
         return mVisibilityManager;
 }
+//-----------------------------------------------------------------------
+void VisibilityTerrainSceneManager::WriteLog()
+{
+        std::stringstream d;
+
+        d << "Algorithm type: " << mVisibilityManager->GetCullingManagerType() << ", "
+          << "Hierarchy nodes: " << mNumOctreeNodes << ", " << "Traversed nodes: " << mHierarchyInterface->GetNumTraversedNodes() << ", "
+          << "Rendered nodes: " << mHierarchyInterface->GetNumRenderedNodes() << ", "
+          << "Query culled nodes: " << mVisibilityManager->GetCullingManager()->GetNumQueryCulledNodes() << ", "
+          << "Frustum culled nodes: " << mVisibilityManager->GetCullingManager()->GetNumFrustumCulledNodes() << ", "
+      << "Queries issued: " << mVisibilityManager->GetCullingManager()->GetNumQueriesIssued() << "\n";
+
+        LogManager::getSingleton().logMessage(d.str());
+}
 } // namespace Ogre

trunk/VUT/work/TestCulling/TestCullingApplication.cpp

@@ -105 +105 @@
 mGUIRenderer(renderer), 
 mShutdownRequested(false), 
-mUseOptimization(false),
 mLMouseDown(false),
 mRMouseDown(false),
@@ -111 +110 @@
 mVisibilityThreshold(0),
 mCurrentAlgorithm(GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING),
-mShowOctree(true),
-mUseCulling(false)
+mShowOctree(false),
+mUseCulling(true),
+mUseOptimization(false),
+mUseCullCamera(false)
 {
     // Reduce move speed
@@ -150 +151 @@
 
         setAlgorithm(mCurrentAlgorithm);
-        toggleUseOptimization();
+        
+        mSceneMgr->setOption("UseOptimization", &mUseOptimization);
+        mSceneMgr->setOption("UseCulling", &mUseCulling);
+        mSceneMgr->setOption("CullCamera", &mUseCullCamera);
+        mSceneMgr->setOption("ShowOctree", &mShowOctree);
 
     pOver->show();
@@ -231 +236 @@
         KEY_PRESSED(KC_O, 0.3, toggleUseOptimization());
         KEY_PRESSED(KC_C, 0.3, toggleUseCulling());
-              
+        KEY_PRESSED(KC_V, 0.3, toggleCullCamera());
+
         updateStats();
 
@@ -280 +286 @@
 
         mSceneMgr->setOption("UseCulling", &mUseCulling);
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::toggleCullCamera()
+{
+        mUseCullCamera = !mUseCullCamera;
+
+        mSceneMgr->setOption("CullCamera", &mUseCullCamera);
 }
 //-----------------------------------------------------------------------

trunk/VUT/work/TestCulling/TestCullingApplication.h

@@ -67 +67 @@
         void toggleShowOctree();
         void toggleUseCulling();
+        void toggleCullCamera();
 
 protected:
@@ -94 +95 @@
         bool mShowOctree;
         bool mUseCulling;
+        bool mUseCullCamera;
+
+        Camera *mCullCamera;
 };
 

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -25 +25 @@
 TestCullingTerrainApplication::~TestCullingTerrainApplication()
 {
-        delete mTerrainContentGenerator;
-}
-//-----------------------------------------------------------------------
-void TestCullingTerrainApplication::createCamera( void )
+        if(mTerrainContentGenerator)
+                delete mTerrainContentGenerator;
+        //if(mCullCamera) delete mCullCamera;
+}
+//-----------------------------------------------------------------------
+void TestCullingTerrainApplication::createCamera()
 {
         // Create the camera
         mCamera = mSceneMgr->createCamera("PlayerCam");
-
-        // Position it at 500 in Z direction
-        mCamera->setPosition(Vector3(128,25,128));
-
-        // Look back along -Z
-    mCamera->lookAt(Vector3(0,0,-300));
-    mCamera->setNearClipDistance(1);
-    mCamera->setFarClipDistance(1000);
+        
+        // Set a nice viewpoint
+        mCamera->setPosition(707, 2500, 528);
+        mCamera->setOrientation(Quaternion(-0.3486, 0.0122, 0.9365, 0.0329));
+        
+        //--create cull camera
+        mCullCamera = mSceneMgr->createCamera("CullCamera");
+        mCullCamera->setPosition(707, 2500, 528);
+        mCullCamera->setOrientation(Quaternion(-0.3486, 0.0122, 0.9365, 0.0329));
+
+        mCullCamera->setNearClipDistance(1);
+        mCamera->setNearClipDistance(1);
+
+        // Infinite far plane?
+        if (mRoot->getRenderSystem()->getCapabilities()->hasCapability(RSC_INFINITE_FAR_PLANE))
+        {
+                mCullCamera->setFarClipDistance(0);
+                mCamera->setFarClipDistance(0);
+        }
+        else
+        {
+                 mCullCamera->setFarClipDistance(1000);
+                 mCamera->setFarClipDistance(1000);
+        }
+        
 }
 //-----------------------------------------------------------------------
@@ -60 +79 @@
         mWindow->getViewport(0)->setBackgroundColour(fadeColour);
         //mSceneMgr->setFog( FOG_LINEAR, fadeColour, .001, 500, 1000);
+        mWindow->addViewport(mCullCamera, 10, 0.5, 0.5, 1, 1);
 
         // Create a skybox
-    //mSceneMgr->setSkyBox(true, "Examples/SpaceSkyBox", 500, false);
+    mSceneMgr->setSkyBox(true, "Examples/SpaceSkyBox", 5000, false);
         //mSceneMgr->setSkyDome( true, "Examples/CloudySky", 5, 8, 500, false );
 
@@ -79 +99 @@
 #endif
         mSceneMgr->setWorldGeometry(terrain_cfg);
-        // Infinite far plane?
-        if (mRoot->getRenderSystem()->getCapabilities()->hasCapability(RSC_INFINITE_FAR_PLANE))
-        {
-                mCamera->setFarClipDistance(0);
-        }
-
-        // Set a nice viewpoint
-        mCamera->setPosition(707, 2500, 528);
-        mCamera->setOrientation(Quaternion(-0.3486, 0.0122, 0.9365, 0.0329));
         
         // CEGUI setup
@@ -122 +133 @@
 {
         mFrameListener= new MouseQueryListener(mWindow, mCamera, mSceneMgr, 
-                mGUIRenderer, mTerrainContentGenerator);
+                mGUIRenderer, mTerrainContentGenerator, mCullCamera);
         mFrameListener->showDebugOverlay(true);
         mRoot->addFrameListener(mFrameListener);
@@ -138 +149 @@
                                                                            SceneManager *sceneManager, 
                                                                            CEGUI::Renderer *renderer,
-                                                                           TerrainContentGenerator *sceneGenerator): 
+                                                                           TerrainContentGenerator *sceneGenerator,
+                                                                           Camera *cullCamera): 
 ExampleFrameListener(win, cam, false, true), 
 mGUIRenderer(renderer), 
 mShutdownRequested(false), 
-mUseOptimization(false),
 mLMouseDown(false),
 mRMouseDown(false),
@@ -150 +161 @@
 mVisibilityThreshold(0),
 mCurrentAlgorithm(GtpVisibility::VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING),
-mShowOctree(true),
-mUseCulling(false)
+mShowOctree(false),
+mUseCulling(true),
+mUseOptimization(false),
+mUseCullCamera(false),
+mCullCamera(cullCamera)
 {
         // Reduce move speed
@@ -191 +205 @@
 
         setAlgorithm(mCurrentAlgorithm);
-        toggleUseOptimization();
-        toggleShowOctree();
-        toggleUseCulling();
+
+        mSceneMgr->setOption("UseOptimization", &mUseOptimization);
+        mSceneMgr->setOption("UseCulling", &mUseCulling);
+        mSceneMgr->setOption("CullCamera", &mUseCullCamera);
+        mSceneMgr->setOption("ShowOctree", &mShowOctree);
 
     pOver->show();
@@ -287 +303 @@
                         mCamera->getPosition().z);
         }
-        
+
+        camPos = mCullCamera->getPosition();
+
+        if(mRayQueryExecutor->executeRayQuery(&queryResult, 
+                Vector3(camPos.x, 5000.0f, camPos.z), Vector3::NEGATIVE_UNIT_Y))
+        {
+                mCullCamera->setPosition(mCullCamera->getPosition().x, queryResult.y + 10, 
+                        mCullCamera->getPosition().z);
+        }
+
         return ExampleFrameListener::frameStarted(evt);
 }
@@ -306 +331 @@
         KEY_PRESSED(KC_S, 0.3, toggleShowOctree());
         KEY_PRESSED(KC_C, 0.3, toggleUseCulling());
-              
+        KEY_PRESSED(KC_V, 0.3, toggleCullCamera());
+        KEY_PRESSED(KC_X, 0.3, fixCullCamera());
+
         updateStats();
 
@@ -389 +416 @@
         mSceneMgr->setOption("UseCulling", &mUseCulling);
 }
+//-----------------------------------------------------------------------
+void MouseQueryListener::toggleCullCamera()
+{
+        mUseCullCamera = !mUseCullCamera;
+        mSceneMgr->setOption("CullCamera", &mUseCullCamera);
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::fixCullCamera()
+{
+        mCullCamera->setPosition(mCamera->getPosition());
+        mCullCamera->setOrientation(mCamera->getOrientation());
+}
+
 //-----------------------------------------------------------------------
 void MouseQueryListener::keyPressed(KeyEvent* e)

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -30 +30 @@
 
     MouseQueryListener(RenderWindow* win, Camera* cam, SceneManager *sceneManager, 
-                CEGUI::Renderer *renderer, TerrainContentGenerator *contentGenerator);
+                CEGUI::Renderer *renderer, TerrainContentGenerator *contentGenerator, Camera *cullCamera);
 
     ~MouseQueryListener();
@@ -66 +66 @@
         void toggleShowOctree();
         void toggleUseCulling();
+        void toggleCullCamera();
+        void fixCullCamera();
 
 protected:
@@ -97 +99 @@
         bool mShowOctree;
         bool mUseCulling;
+        bool mUseCullCamera;
+
+        Camera *mCullCamera;
 };
 
@@ -113 +118 @@
         CEGUI::OgreCEGUIRenderer *mGUIRenderer;
         CEGUI::System *mGUISystem;
-//      RayQueryExecutor *mRayQueryExecutor;
 
         Vector3 mMinTranslation;
@@ -123 +127 @@
         TerrainContentGenerator *mTerrainContentGenerator;
 
+        Camera *mCullCamera;
+        
 private:
         void chooseSceneManager(void);