Changeset 347 for trunk/VUT/work

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/work

Files:

• TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (3 diffs)
• ogre_changes/Plugins/OctreeSceneManager/include/OgreOctree.h (modified) (2 diffs)
• ogre_changes/Plugins/OctreeSceneManager/src/OgreOctree.cpp (modified) (2 diffs)
• ogre_changes/RenderSystems/GL/src/OgreGLRenderSystem.cpp (modified) (1 diff)

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