Changeset 2361

Timestamp:

05/09/07 17:03:19 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk

Files:

• App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.cpp (modified) (4 diffs)
• App/Demos/Vis/KdTreeDemo/OGRE/scripts/TestKdTree.vcproj (modified) (1 diff)
• App/Demos/Vis/KdTreeDemo/OGRE/src/TestKdTree.cpp (modified) (1 diff)
• Lib/Vis/OnlineCullingCHC/OGRE/src/OgreBiHierarchy.cpp (modified) (1 diff)

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

@@ -419 +419 @@
         mSunLight->setSpecularColour(1, 1, 1);
 
-        // it's VERY important to set fog before calling setWorldGeometry 
+        //-- Fog
+
+        // NB it's VERY important to set this before calling setWorldGeometry 
         // because the vertex program picked will be different
         ColourValue fadeColour(0.93, 0.86, 0.76);
@@ -472 +474 @@
         {
                 // the objects are generated randomly distributed over the terrain
-                if (1) generateScene(1000, 0); // create robots
-                if (0) generateScene(100, 1); // create ninjas
-                if (1) generateScene(500, 2); // create trees
+                if (1) generateScene(500, 0); // create robots
+                if (0) generateScene(300, 1); // create ninjas
+                if (0) generateScene(1000, 2); // create trees
         }
         int MaxDepth=30;
@@ -590 +592 @@
 #else
 
-        //mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
-        mSceneMgr = mRoot->createSceneManager("BiHierarchySceneManager");
+        mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
+        
+        //mSceneMgr = mRoot->createSceneManager("TerrainSceneManager"); 
+        //mSceneMgr = mRoot->createSceneManager("OctreeSceneManager");
+        //mSceneMgr = mRoot->createSceneManager("BiHierarchySceneManager");
         //mSceneMgr = mRoot->createSceneManager("BiTreeTerrainSceneManager");
         
@@ -647 +652 @@
         // place on the ground object
         if (success)
-        {
-                mCamNode->setPosition(mCamNode->getPosition().x,
-                                                          minVal + dist, 
-                                                          mCamNode->getPosition().z);
-        }
+                        mCamNode->setPosition(
+                                mCamNode->getPosition().x,
+                                minVal + dist, 
+                                mCamNode->getPosition().z);
 
         OGRE_DELETE(raySceneQuery);
-
         return success;
 }

GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/scripts/TestKdTree.vcproj

@@ -86 +86 @@
                                 OptimizeForWindowsApplication="TRUE"
                                 AdditionalIncludeDirectories="..\include;"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\OgreMain\include";..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include;..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\OGRE\include;..\..\..\..\..\..\Lib\Vis\OnlineCullingCHC\include"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE;USE_VERBOSE_PVS"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE"
                                 StringPooling="TRUE"
                                 MinimalRebuild="TRUE"

GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/src/TestKdTree.cpp

@@ -414 +414 @@
         }
 
+        // added by matt
+        //mSceneMgr->setOption("RebuildBiHierarchy", NULL);
+
         if (mSelectEntities & ENT_SPC)
         {

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

@@ -1150 +1150 @@
         AxisAlignedBox minLefts[dim];
         AxisAlignedBox minRights[dim];
-
-        bool LeftMod[dim];
-        bool RightMod[dim];
 
         AxisAlignedBox minLeft;