Changeset 350 for trunk/VUT/work

Timestamp:

10/27/05 03:25:09 (19 years ago)

Author:

mattausch

Message:

ray merge started

Location:

trunk/VUT/work

Files:

• TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (1 diff)
• ogre_changes/Plugins/OctreeSceneManager/src/OgreOctree.cpp (modified) (1 diff)
• ogre_changes/RenderSystems/GL/src/OgreGLRenderSystem.cpp (modified) (1 diff)

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -306 +306 @@
                 // the objects are generated randomly distributed over the terrain
                 generateScene(1000, 0); // create soldiers, trees, ninjas
-                generateScene(1000, 1);
-                generateScene(200, 2);
+                generateScene(500, 1);
+                generateScene(100, 2);
         }
 }

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

@@ -105 +105 @@
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
         // update bounds because we want tight octree
-        if (1) _updateBounds(); 
+        _updateBounds();
         
 #endif //GTP_VISIBILITY_MODIFIED_OGRE

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