Changeset 1823 for GTP/trunk

Timestamp:

11/28/06 17:23:00 (18 years ago)

Author:

mattausch

Message:

changed occlusion culling scene manager
the configuration goes to the scene manager directly (only terrainculling.cfg)

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC

Files:

• OGRE/include/OgreOcclusionCullingSceneManager.h (modified) (1 diff)
• OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (15 diffs)
• scripts/terrain.cfg (deleted)
• scripts/terrainCulling.cfg (modified) (4 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreOcclusionCullingSceneManager.h

@@ -239 +239 @@
 
         bool mViewCellsGeometryLoaded;
+
+        string mViewCellsFilename;
+        string mFilename;
 
         bool mShowTerrain;

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp

@@ -57 +57 @@
 mShowViewCells(false),
 mViewCellsGeometryLoaded(false),
-mShowTerrain(false)
+mShowTerrain(false),
+mViewCellsFilename(""),
+mFilename("terrain")
 {
         Ogre::LogManager::getSingleton().
@@ -147 +149 @@
     loadConfig(stream);
 
+        // apply parameters for file loading
+
+        // loas the scene
+        LoadScene(mFilename);
+
+        // load view cells
+        mViewCellsLoaded = LoadViewCells(mViewCellsFilename);
+
         if (mShowTerrain)
-        {
+        {       
                 initLevelIndexes();
 
                 // Resize the octree, allow for 1 page for now
                 float max_x = mOptions.scale.x * mOptions.pageSize;
-                float max_y = mOptions.scale.y;
+                float max_y = mOptions.scale.y;// * mOptions.pageSize;
                 float max_z = mOptions.scale.z * mOptions.pageSize;
 
                 float maxAxis = std::max(max_x, max_y);
                 maxAxis = std::max(maxAxis, max_z);
-                resize( AxisAlignedBox( 0, 0, 0, maxAxis, maxAxis, maxAxis ) );
-    
+                //resize(AxisAlignedBox( 0, 0, 0, maxAxis, maxAxis, maxAxis));
+                resize( AxisAlignedBox( 0, 0, 0, max_x, max_y, max_z ) );
+
                 setupTerrainMaterial();
                 setupTerrainPages();
-        }
+        }       
  }
 #endif
@@ -168 +179 @@
 void OcclusionCullingSceneManager::loadConfig(DataStreamPtr& stream)
 {
-        /* Set up the options */
+        // Set up the options
         ConfigFile config;
         String val;
@@ -175 +186 @@
 
         std::stringstream d; 
-        //d << "reading the config file from: " << filename;
-        //LogManager::getSingleton().logMessage(d.str());
-
-        val = config.getSetting("Scene");
+                
+        val = config.getSetting("DepthPass");
 
     if (!val.empty())
         {
-                 string filename = val.c_str();
-                 LoadScene(filename);
-        }
-
-        val = config.getSetting("ViewCells");
-
+                mUseDepthPass = atoi(val.c_str());
+        }
+
+        val = config.getSetting("FlushQueue");
+        
         if (!val.empty())
         {
-                 string viewCellsFilename = val.c_str();
-                 std::stringstream d; d << "view cells file name: " << viewCellsFilename;
-                 LogManager::getSingleton().logMessage(d.str());
-
-                 mViewCellsLoaded = LoadViewCells(viewCellsFilename);
+                mDeleteQueueAfterRendering = atoi(val.c_str());
+        }
+
+        val = config.getSetting("Scene");
+
+    if (!val.empty())
+        {
+                mFilename = val.c_str();
+                
+                if (mFilename == "terrain")
+                {
+                        mShowTerrain = true;
+                        LogManager::getSingleton().logMessage("creating terrain");
+                }
+        }
+
+        if (!mShowTerrain)
+        {
+                val = config.getSetting("ViewCells");
+
+                if (!val.empty())
+                {
+                        mViewCellsFilename = val.c_str();
+                        d << "view cells file name: " << mViewCellsFilename;
+                        LogManager::getSingleton().logMessage(d.str());
+                }
         }
         
@@ -222 +251 @@
                          algorithm = 
                                  GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS;
+
+                         mNormalExecution = true;
                  }
 
                  mVisibilityManager->SetCullingManager(algorithm);
-        }
-
-        if (mShowTerrain)
-        {
-                TerrainSceneManager::loadConfig(stream);
-        }
+
+                 d << "setting algorithm to: " << algorithm;
+                 LogManager::getSingleton().logMessage(d.str());
+        }
+
+        /////////////////////////////////////////
+        // terrain options
+
+        if (!mShowTerrain)
+                return;
+
+        val = config.getSetting( "DetailTile" );
+        if ( !val.empty() )
+                setDetailTextureRepeat(atoi(val.c_str()));
+
+        val = config.getSetting( "MaxMipMapLevel" );
+        if ( !val.empty() )
+                setMaxGeoMipMapLevel(atoi( val.c_str() ));
+
+
+        val = config.getSetting( "PageSize" );
+        if ( !val.empty() )
+                setPageSize(atoi( val.c_str() ));
+        else
+                OGRE_EXCEPT(Exception::ERR_ITEM_NOT_FOUND, "Missing option 'PageSize'",
+                "TerrainSceneManager::loadConfig");
+
+
+        val = config.getSetting( "TileSize" );
+        if ( !val.empty() )
+                setTileSize(atoi( val.c_str() ));
+        else
+                OGRE_EXCEPT(Exception::ERR_ITEM_NOT_FOUND, "Missing option 'TileSize'",
+                "TerrainSceneManager::loadConfig");
+
+        Vector3 v = Vector3::UNIT_SCALE;
+
+        val = config.getSetting( "PageWorldX" );
+        if ( !val.empty() )
+                v.x = atof( val.c_str() );
+
+        val = config.getSetting( "MaxHeight" );
+        if ( !val.empty() )
+                v.y = atof( val.c_str() );
+
+        val = config.getSetting( "PageWorldZ" );
+        if ( !val.empty() )
+                v.z = atof( val.c_str() );
+
+        // Scale x/z relative to pagesize
+        v.x /= mOptions.pageSize;
+        v.z /= mOptions.pageSize;
+        setScale(v);
+
+        val = config.getSetting( "MaxPixelError" );
+        if ( !val.empty() )
+                setMaxPixelError(atoi( val.c_str() ));
+
+        mDetailTextureName = config.getSetting( "DetailTexture" );
+
+        mWorldTextureName = config.getSetting( "WorldTexture" );
+
+        if ( config.getSetting( "VertexColours" ) == "yes" )
+                mOptions.coloured = true;
+
+        if ( config.getSetting( "VertexNormals" ) == "yes" )
+                mOptions.lit = true;
+
+        if ( config.getSetting( "UseTriStrips" ) == "yes" )
+                setUseTriStrips(true);
+
+        if ( config.getSetting( "VertexProgramMorph" ) == "yes" )
+                setUseLODMorph(true);
+
+        val = config.getSetting( "LODMorphStart");
+        if ( !val.empty() )
+                setLODMorphStart(atof(val.c_str()));
+
+        val = config.getSetting( "CustomMaterialName" );
+        if ( !val.empty() )
+                setCustomMaterial(val);
+
+        val = config.getSetting( "MorphLODFactorParamName" );
+        if ( !val.empty() )
+                setCustomMaterialMorphFactorParam(val);
+
+        val = config.getSetting( "MorphLODFactorParamIndex" );
+        if ( !val.empty() )
+                setCustomMaterialMorphFactorParam(atoi(val.c_str()));
+
+        // Now scan through the remaining settings, looking for any PageSource
+        // prefixed items
+        String pageSourceName = config.getSetting("PageSource");
+        if (pageSourceName == "")
+        {
+                OGRE_EXCEPT(Exception::ERR_ITEM_NOT_FOUND, "Missing option 'PageSource'",
+                        "TerrainSceneManager::loadConfig");
+        }
+        TerrainPageSourceOptionList optlist;
+        ConfigFile::SettingsIterator setIt = config.getSettingsIterator();
+        while (setIt.hasMoreElements())
+        {
+                String name = setIt.peekNextKey();
+                String value = setIt.getNext();
+                if (StringUtil::startsWith(name, pageSourceName, false))
+                {
+                        optlist.push_back(TerrainPageSourceOption(name, value));
+                }
+        }
+        // set the page source
+        selectPageSource(pageSourceName, optlist);
 }
 //-----------------------------------------------------------------------
@@ -530 +666 @@
         //-- (e.g., the visualization mode, the shadow pass)
 
-        if (
-                mShowVisualization ||
-           (mShadowTechnique == SHADOWTYPE_TEXTURE_MODULATIVE && 
-            mIlluminationStage == IRS_RENDER_TO_TEXTURE))
+        if (mShowVisualization ||
+            (mShadowTechnique == SHADOWTYPE_TEXTURE_MODULATIVE && 
+             mIlluminationStage == IRS_RENDER_TO_TEXTURE))
         {       
                 IlluminationRenderStage savedStage = mIlluminationStage; 
@@ -619 +754 @@
                 mLeavePassesInQueue = 0;
                 
-                if (mUseDepthPass) // the shaded geometry is rendered in a second pass
+                 // the shaded geometry is rendered in a second pass
+                if (mUseDepthPass)
                 {
                         // add visible nodes found by the visibility culling algorithm
@@ -650 +786 @@
         getRenderQueue()->clear(mDeleteQueueAfterRendering);
 
-        if (0)
-        {
-                if (!mDeleteQueueAfterRendering)
-                        getRenderQueue()->clear(true); // finally clear render queue
-                else
-                        OGRE_DELETE(mRenderQueue); // HACK: should rather only be cleared ...
-        }
-
         if (0) WriteLog(); // write out stats
 }
@@ -752 +880 @@
                 OctreeNode::setVizScale(*static_cast<const float *>(val));
                 return true;
-        }
-        if (key == "LoadViewCells")
-        { 
-                return mViewCellsLoaded;
         }
         if (key == "UseViewCells")
@@ -809 +933 @@
         {
                 mUseVisibilityFilter = *static_cast<const bool *>(val);
-                // set null =>recomputation of the pvs
+
+                // set null => recomputation of the pvs
         mElementaryViewCell = NULL;
                 return true;
+        }
+        if (key == "ViewCellsLoaded")
+        { 
+                return mViewCellsLoaded;
         }
 
@@ -840 +969 @@
         {
                 * static_cast<bool *>(val) = (bool *)mShowTerrain;
+                return true;
+        }
+        if (key == "UseDepthPass")
+        {
+                * static_cast<bool *>(val) = (bool *)mUseDepthPass;
+                return true;
+        }
+        if (key == "AlgorithmType")
+        {
+                GtpVisibility::VisibilityEnvironment::CullingManagerType algorithm =
+                        mVisibilityManager->GetCullingManagerType();
+
+                * static_cast<unsigned int *>(val) = 
+                        (unsigned int)algorithm;
                 return true;
         }
@@ -1283 +1426 @@
 bool OcclusionCullingSceneManager::LoadViewCells(const String &filename)
 {
+        if (filename == "")
+                return false;
+
         if (mViewCellsLoaded) 
                 return true;
@@ -1291 +1437 @@
         // load the view cells assigning the found objects to the pvss
         const bool finalizeViewCells = true;
-        mViewCellsManager = 
-                GtpVisibilityPreprocessor::ViewCellsManager::LoadViewCells(filename, &mObjects, true, &bconverter);
-
-        //Ogre::LogManager().getSingleton().logMessage("view cells loaded");
-        //Ogre::LogManager().getSingleton().flush();
+
+        mViewCellsManager = GtpVisibilityPreprocessor::
+                ViewCellsManager::LoadViewCells(filename, 
+                                                                                &mObjects, 
+                                                                                true, 
+                                                                                &bconverter);
+
         // objects are set to invisible initially
         SetObjectsVisible(false);
@@ -1507 +1655 @@
 #endif
 // splits strings containing multiple file names
-static int SplitFilenames(const std::string str, std::vector<std::string> &filenames)
+static int SplitFilenames(const std::string str, 
+                                                  std::vector<std::string> &filenames)
 {
         int pos = 0;
@@ -1542 +1691 @@
         if (filename == "terrain")
         {
+                LogManager::getSingleton().logMessage("loading terrain");
+
                 // terrain hack
-                mShowTerrain = true;
-                LogManager::getSingleton().logMessage("creating terrain");
-                return true;
+                return false;
         }
 

GTP/trunk/Lib/Vis/OnlineCullingCHC/scripts/terrainCulling.cfg

@@ -3 +3 @@
 #
 
-#OnlineCullingAlgorithm=CHC
-OnlineCullingAlgorithm=SWC
+OnlineCullingAlgorithm=CHC
+#OnlineCullingAlgorithm=SWC
 #OnlineCullingAlgorithm=VFC
+#OnlineCullingAlgorithm=DEFAULT
 
+#
+# Should depth first pass be used?
+#
+
+DepthPass=1
 
 ######################################################################
 
 #
-#  Settings for vienna scene
+#  Settings for iv scene (vienna)
 #
 
@@ -20 +26 @@
 
 #Scene=../../../../../resources/media/house_test1.iv
-Scene=../../../../../resources/media/city1500_flat_1.iv;../../../../../resources/media/roofs_1500.iv;../../../../../resources/media/CityRoads60.iv
+#Scene=../../../../../resources/media/city1500_flat_1.iv;../../../../../resources/media/roofs_1500.iv;../../../../../resources/media/CityRoads60.iv
+#Scene=../../../../../resources/media/city1500_flat_1.iv;../../../../../resources/media/roofs_1500.iv;../../../../../resources/media/CityRoads60.iv;../../../../../resources/media/CityPlane60.iv
 #Scene=../../../../../resources/media/city1.iv;../../../../../resources/media/roofs_1500.iv;../../../../../resources/media/CityRoads60.iv
-
-# current view point
-ViewX=830
-ViewY=300
-ViewZ=-540
 
 #
@@ -32 +34 @@
 #
 
-ViewCells=../../../../../../../GTP/trunk/Lib/Vis/Preprocessing/scripts/vienna-visibility.xml.zip
+#ViewCells=../../../../../../../GTP/trunk/Lib/Vis/Preprocessing/scripts/vienna-visibility.xml.zip
+
+
+#
+# should render queue be flushed after each frame?
+#
+
+FlushQueue=1
 
 
@@ -45 +54 @@
 
 #
-# current view point
+# should render queue be flushed after each frame?
 #
 
-#ViewX=707
-#ViewY=5000
-#ViewZ=528
+FlushQueue=false
+
+UseDepthPass=false
+
+###########################################
+#
+# Terrain scene manager settings
+#
+#########################################
+
+# The main world texture (if you wish the terrain manager to create a material for you)
+WorldTexture=terrain_texture.jpg
+
+# The detail texture (if you wish the terrain manager to create a material for you)
+DetailTexture=terrain_detail.jpg
+
+#number of times the detail texture will tile in a terrain tile
+DetailTile=3
+
+# Heightmap source
+PageSource=Heightmap
+
+# Heightmap-source specific settings
+Heightmap.image=terrain.png
+
+# If you use RAW, fill in the below too
+# RAW-specific setting - size (horizontal/vertical)
+#Heightmap.raw.size=513
+# RAW-specific setting - bytes per pixel (1 = 8bit, 2=16bit)
+#Heightmap.raw.bpp=2
+# Use this if you want to flip the terrain (eg Terragen exports raw upside down)
+#Heightmap.flip=true
+
+# How large is a page of tiles (in vertices)? Must be (2^n)+1
+PageSize=513
+
+# How large is each tile? Must be (2^n)+1 and be smaller than PageSize
+TileSize=65
+
+# The maximum error allowed when determining which LOD to use
+MaxPixelError=3
+
+# The size of a terrain page, in world units
+PageWorldX=5000
+PageWorldZ=5000
+
+# Maximum height of the terrain 
+MaxHeight=400
+
+# Upper LOD limit
+MaxMipMapLevel=1
+
+#VertexNormals=yes
+#VertexColors=yes
+#UseTriStrips=yes
+
+# Use vertex program to morph LODs, if available
+VertexProgramMorph=no
+
+# The proportional distance range at which the LOD morph starts to take effect
+# This is as a proportion of the distance between the current LODs effective range,
+# and the effective range of the next lower LOD
+LODMorphStart=0.2
+
+# This following section is for if you want to provide your own terrain shading routine
+# Note that since you define your textures within the material this makes the 
+# WorldTexture and DetailTexture settings redundant
+
+# The name of the vertex program parameter you wish to bind the morph LOD factor to
+# this is 0 when there is no adjustment (highest) to 1 when the morph takes it completely
+# to the same position as the next lower LOD
+# USE THIS IF YOU USE HIGH-LEVEL VERTEX PROGRAMS WITH LOD MORPHING
+#MorphLODFactorParamName=morphFactor
+
+# The index of the vertex program parameter you wish to bind the morph LOD factor to
+# this is 0 when there is no adjustment (highest) to 1 when the morph takes it completely
+# to the same position as the next lower LOD
+# USE THIS IF YOU USE ASSEMBLER VERTEX PROGRAMS WITH LOD MORPHING
+#MorphLODFactorParamIndex=4
+
+# The name of the material you will define to shade the terrain
+#CustomMaterialName=TestTerrainMaterial