Changeset 347 for trunk/VUT

Timestamp:

10/24/05 16:37:50 (19 years ago)

Author:

mattausch

Message:

fixed color bug
fixed terrain tile ch culling
made better terrain

Location:

trunk/VUT

Files:

• Ogre/include/OgreVisibilityTerrainSceneManager.h (modified) (1 diff)
• Ogre/resources/terrain.cfg (modified) (2 diffs)
• Ogre/src/OgreVisibilityTerrainSceneManager.cpp (modified) (1 diff)
• scripts/GtpVisibility.suo (modified) (previous)
• work/TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (3 diffs)
• work/ogre_changes/Plugins/OctreeSceneManager/include/OgreOctree.h (modified) (2 diffs)
• work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctree.cpp (modified) (2 diffs)
• work/ogre_changes/RenderSystems/GL/src/OgreGLRenderSystem.cpp (modified) (1 diff)

trunk/VUT/Ogre/include/OgreVisibilityTerrainSceneManager.h

@@ -92 +92 @@
         void renderModulativeStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup);
 
+        /** Override standard function so octree boxes are always of equal side length.
+                This has advantages for CHC, because terrain tiles are in different octree nodes
+                and can be culled.
+        */
+        void setWorldGeometry( const String& filename );
+
 protected:
         

trunk/VUT/Ogre/resources/terrain.cfg

@@ -26 +26 @@
 
 # How large is each tile? Must be (2^n)+1 and be smaller than PageSize
-TileSize=129
+TileSize=65
 
 # The maximum error allowed when determining which LOD to use
@@ -34 +34 @@
 PageWorldX=5000
 PageWorldZ=5000
+
 # Maximum height of the terrain 
-MaxHeight=500
+MaxHeight=400
 
 # Upper LOD limit

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -94 +94 @@
         //mItemBufferPass->setAmbient(1, 1, 0);
 }
+//-------------------------------------------------------------------------
+void VisibilityTerrainSceneManager::setWorldGeometry( const String& filename )
+{
+    // Clear out any existing world resources (if not default)
+    if (ResourceGroupManager::getSingleton().getWorldResourceGroupName() != 
+        ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME)
+    {
+        ResourceGroupManager::getSingleton().clearResourceGroup(
+            ResourceGroupManager::getSingleton().getWorldResourceGroupName());
+    }
+    mTerrainPages.clear();
+    // Load the configuration
+    loadConfig(filename);
+
+    // 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_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 ) );
+    
+    setupTerrainMaterial();
+
+    setupTerrainPages();
+
+ }
+
 //-----------------------------------------------------------------------
 void VisibilityTerrainSceneManager::PrepareVisualization(Camera *cam)

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -309 +309 @@
                 generateScene(200, 2);
         }
-
-        // no limitations on height => it is possible for the user to put single 
-        // objects on peaks of the terrain (only few, not relevant for occlusion)
-        mTerrainContentGenerator->SetMaxPos(mTerrainMaxPos);
 }
 //-----------------------------------------------------------------------
@@ -319 +315 @@
         float val = TerrainFrameListener::msObjectScales[objectType];
         Vector3 scale(val, val, val); 
-        const float maxHeight = 100;
+        const float maxHeight = 75;
         // to provide much occlusion,
-        // height is restricted to 50 => no objects are created on peaks
+        // height is restricted to maxHeight => no objects are created on peaks
         mTerrainContentGenerator->SetMinPos(Vector3(mTerrainMinPos));
         mTerrainContentGenerator->SetMaxPos(Vector3(mTerrainMaxPos.x, maxHeight, mTerrainMaxPos.z));
@@ -342 +338 @@
         }
 
-        // no limitations anymore => it is possible for the user to put single 
-        // objects on peaks of the terrain (only few, not relevant for occlusion)
+        // release limitations on height => it is possible for the user to put single 
+        // objects on peaks of the terrain (will be only few, not relevant for occlusion)
         mTerrainContentGenerator->SetMaxPos(mTerrainMaxPos);
 }

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreOctree.h

@@ -188 +188 @@
         */
         void setLastRendered(int frameid);
-        /** Returns current depth of octree 
-        @return current depth
-        */
-        int getDepth();
-        /** Returns real extent of the octree, i.e., the merged extent of the bounding boxes. */
+        
+        /** Returns real extent of the octree, i.e., the merged extent of the bounding boxes. 
+        */
         AxisAlignedBox _getWorldAABB(void) const;
 
-        /** Updates bounds of real aabb of octree. */
+        /** Updates bounds of real aabb of octree. 
+        */
         void _updateBounds();
 
@@ -206 +205 @@
         int mLastVisited;
         bool mVisible;
-        int mDepth;
         
 #endif // GTP_VISIBILITY_MODIFIED_OGRE

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctree.cpp

@@ -104 +104 @@
     mParent = parent;
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        if (mParent) 
-                mDepth = parent->getDepth() + 1;
-        else
-                mDepth = 0;
         // update bounds because we want tight octree
-        _updateBounds();
+        if (1) _updateBounds(); 
         
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
@@ -219 +215 @@
 {
         return mParent;
-}
-//-----------------------------------------------------------------------       
-int Octree::getDepth()
-{
-        return mDepth;
 }
 //-----------------------------------------------------------------------       

trunk/VUT/work/ogre_changes/RenderSystems/GL/src/OgreGLRenderSystem.cpp

@@ -2344 +2344 @@
             glDisableVertexAttribArrayARB_ptr(1); // disable weights
         }
-
+                glColor4f(1,1,1,1);
         glSecondaryColor3fEXT_ptr(0.0f, 0.0f, 0.0f);