Changeset 937

Timestamp:

05/10/06 08:00:38 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis

Files:

• HillyTerrain/OGRE/TerrainFrameListener.cpp (modified) (5 diffs)
• HillyTerrain/OGRE/TerrainFrameListener.h (modified) (1 diff)
• HillyTerrain/OGRE/TestCullingTerrain.vcproj (modified) (1 diff)
• HillyTerrain/OGRE/TestCullingTerrainApplication.cpp (modified) (9 diffs)
• HillyTerrain/OGRE/TestCullingTerrainApplication.h (modified) (3 diffs)
• Teapots/RenderTraverser.cpp (modified) (3 diffs)

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

@@ -7 +7 @@
 #include "TerrainFrameListener.h"
 #include "OgrePlatformQueryManager.h"
-#include "OgreVisibilityTerrainSceneManager.h"
 #include "VisibilityInfo.h"
 #include "OgreOcclusionQueriesQueryManager.h"
@@ -68 +67 @@
         "robot",
         "athene",
-        //"natFX_Tree1_LOD2",
+        "natFX_Tree1_LOD2",
         //"tree2",
         //"HongKong_Tower",
@@ -161 +160 @@
 mVizScale(25),
 mUseViewCells(false),
+mViewCellsLoaded(false),
 mUseVisibilityFilter(false)
 {
@@ -1164 +1164 @@
 void TerrainFrameListener::toggleUseViewCells()
 {
+        // HACK: no view cells for hilly terrain
+        if (mApplication->msShowHillyTerrain)
+                return;
+
         mUseViewCells = !mUseViewCells;
+
+        // load on demand
+        if (mUseViewCells && !mViewCellsLoaded)
+        {
+                mViewCellsLoaded = mApplication->LoadViewCells(mApplication->mViewCellsFilename);
+        }
+
         mSceneMgr->setOption("UseViewCells", &mUseViewCells);
 }
@@ -1372 +1383 @@
                 break;
         case KC_8:
-                changeAssumedVisibility(-1);
+        //      changeAssumedVisibility(-5);
+                changeAssumedVisibility(-500);
                 break;
         case KC_9:
-                changeAssumedVisibility(1);
+                changeAssumedVisibility(500);
+                //changeAssumedVisibility(5);
                 break;
         case KC_LSHIFT:

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

@@ -430 +430 @@
         
         bool mUseViewCells;
-
+        bool mViewCellsLoaded;
         bool mUseVisibilityFilter;
 };

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

@@ -85 +85 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="OGREMain.LIB CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib Plugin_VisibilitySceneManager.lib IVReader.lib"
+                                AdditionalDependencies="OGREMain.LIB CEGUIBase.lib OgreGUIRenderer.lib Plugin_OctreeSceneManager.lib Plugin_VisibilitySceneManager.lib IVReader.lib zdll.lib zziplib.lib"
                                 OutputFile="$(OGRE_PATH)/Samples/Common/bin/Release/TestCullingTerrain.exe"
                                 LinkIncremental="1"

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

@@ -7 +7 @@
 #include <OgreIteratorWrappers.h>
 #include <Ogre.h>
-#include <direct.h> // for getcwd
-//#include "OgreReferenceAppLayer.h"
-//#include "OgreRefAppWorld.h"
 #include "TestCullingTerrainApplication.h"
 #include "TerrainFrameListener.h"
-//#include "OgreOcclusionCullingSceneManager.h"
 
 #include "IVReader.h"
@@ -161 +157 @@
 mTerrainContentGenerator(NULL), 
 mRayQueryExecutor(NULL),
-mIVReader(NULL)
+mIVReader(NULL),
+mFilename("terrain"),
+mEnvironmentFilename("simple.env")
 {
 }
@@ -174 +172 @@
         config.load(filename);
 
-        std::stringstream d; d << "reading config from: " << filename;
+        std::stringstream d; d << "reading the config file from: " << filename;
         LogManager::getSingleton().logMessage(d.str());
 
@@ -182 +180 @@
         {
                  mFilename = val.c_str();
-
-                 std::stringstream d; d << "filename: " << mFilename;
+                 d << "\nloading scene from file: " << mFilename;
                  LogManager::getSingleton().logMessage(d.str());
         }
 
-/*      val = config.getSetting("ViewCells");
+        
+#if 0
+        val = config.getSetting("ViewCells");
 
         if (!val.empty())
         {
                  mViewCellsFilename = val.c_str();
-        }*/
+        }
+#endif
+
+        val = config.getSetting("VisibilityEnvironment");
+
+        if (!val.empty())
+        {
+                 mEnvironmentFilename = val.c_str();
+                 std::stringstream d; d << "loading environment from from file: " << mEnvironmentFilename;
+                 LogManager::getSingleton().logMessage(d.str());
+        }
 
         Vector3 v = Vector3::UNIT_SCALE;
@@ -211 +220 @@
                 v.z = atof( val.c_str());
 
+
+        /////////////////////////
+        // setup scene
+
+        //-- load the scene from specified file
+        if (!LoadScene(mFilename))
+                LogManager::getSingleton().logMessage("error loading scene");
+
+
+        GtpVisibility::VisibilityManager *mVisManager = NULL;
+
+        //-- load the environment from file
+        if (mSceneMgr->getOption("VisibilityManager", &mVisManager))
+        {
+                GtpVisibility::VisibilityEnvironment *visEnv = mVisManager->GetVisibilityEnvironment();
+                
+                if (!visEnv->LoadEnvironment(mEnvironmentFilename))
+                {
+                        std::stringstream d; d << "failed loading environment from " << mEnvironmentFilename;
+                        LogManager::getSingleton().logMessage(d.str());
+                }
+                else //-- load environment options
+                {
+                        //-- get view cells name. load only on demand
+                        mViewCellsFilename = visEnv->getViewCellsFileName();
+
+                        std::stringstream d; d << "view cells file name: " << mViewCellsFilename;
+                        LogManager::getSingleton().logMessage(d.str());
+                }
+        }
+        else
+        {
+                LogManager::getSingleton().logMessage("error! no visibility scenemanager available");
+        }
         // set camera position accordingly
         mCamNode->setPosition(v);
@@ -358 +401 @@
 {
         //-- load scene
-
-        //GtpVisibility::VisibilityManager *mVisManager;
-        //if (!mSceneMgr->getOption("VisibilityManager", mVisManager))  return;
-        //const std::string filename = visEnv->getSceneFilename();
-        loadConfig("test.cfg");
-        LoadScene(mFilename);
-
-
-
+        loadConfig("terrainCulling.cfg");
+        
         /////////////////////////////////////
 
@@ -455 +491 @@
         {
                 // the objects are generated randomly distributed over the terrain
-                if (1) generateScene(500, 0); // create robots
+                if (1) generateScene(1500, 0); // create robots
                 if (0) generateScene(100, 1); // create trees
                 if (0) generateScene(100, 2); // create ninjas
         }
-
-
-
-        //-- HACK: load the view cells from the disc
-        
-        //std::string filename = "vienna_simple-21-04-avs2-viewCells.xml";
-        //std::string filename = "vienna_simple-21-04-kdcasm-viewCells.xml";
-        std::string filename = "vienna_simple-21-04-avs-viewCells.xml";
-
-        //-- the actual loading happens here
-        if (0) mSceneMgr->setOption("LoadViewCells", filename.c_str());
 }
 //-----------------------------------------------------------------------
@@ -658 +683 @@
 
 //-----------------------------------------------------------------------
-bool TestCullingTerrainApplication::LoadScene(const std::string filename)
+bool TestCullingTerrainApplication::LoadScene(const String &filename)
 {
         using namespace std;
@@ -716 +741 @@
 }
 //-----------------------------------------------------------------------
-bool TestCullingTerrainApplication::LoadViewCells(const std::string filename)
-{
-
-        return true;
+bool TestCullingTerrainApplication::LoadViewCells(const String &filename)
+{
+        LogManager::getSingleton().logMessage("loading view cells");
+
+        //-- the actual loading happens here
+        if (mSceneMgr->setOption("LoadViewCells", filename.c_str()))
+        return true;
+
+        LogManager::getSingleton().logMessage("error loading view cells!!");
+
+        return false;
 }
 

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.h

@@ -128 +128 @@
         bool LoadSceneIV(const String &filename, SceneNode *root, const int index);
 
-        bool LoadScene(const std::string filename);
+        bool LoadScene(const String &filename);
 
-        bool LoadViewCells(const std::string filename);
+        bool LoadViewCells(const String &filename);
 
         /** Loads configuration from disc.
@@ -138 +138 @@
         /// if hilly terrain should be loaded
         static bool msShowHillyTerrain;
+
+
+        String mFilename;
+        String mViewCellsFilename;
+        // name of the visibility environment file
+        String mEnvironmentFilename;
 
 protected:
@@ -185 +191 @@
         StaticGeometry *mStaticGeometry;
 
-        String mFilename;
-        //String mViewCellsFilename;
+        
 
 private:

GTP/trunk/App/Demos/Vis/Teapots/RenderTraverser.cpp

@@ -141 +141 @@
 
         //-- PART 1: process finished occlusion queries
-        while(!mDistanceQueue.empty() || !queryQueue.empty())
-        {
-                while(!queryQueue.empty() && 
-                          (ResultAvailable(queryQueue.front()) || mDistanceQueue.empty()))
+        while (!mDistanceQueue.empty() || !queryQueue.empty())
+        {
+                while (!queryQueue.empty() && 
+                           (ResultAvailable(queryQueue.front()) || mDistanceQueue.empty()))
                 {
                         HierarchyNode *node = queryQueue.front();
@@ -164 +164 @@
 
                 //-- PART 2: hierarchical traversal
-                if(! mDistanceQueue.empty())
+                if (!mDistanceQueue.empty())
                 {
                         HierarchyNode *node = mDistanceQueue.top();
@@ -174 +174 @@
                         bool intersects;
                         
-                        if(InsideViewFrustum(node, intersects))
+                        if (InsideViewFrustum(node, intersects))
                         {
                                 // for near plane intersecting bounding box possible