Changeset 345 for trunk/VUT/work

Timestamp:

10/21/05 19:53:30 (19 years ago)

Author:

mattausch

Message:

fixed bug in chc when traversing node two times because of priority queue. left debug info in there

Location:

trunk/VUT/work

Files:

• TestCullingTerrain/TerrainFrameListener.cpp (modified) (2 diffs)
• TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (3 diffs)
• iv/IVFrameListener.cpp (modified) (1 diff)

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

@@ -49 +49 @@
 Real TerrainFrameListener::msObjectScales[] = 
 {
-        0.1,
+        0.07,
         0.03,
         //0.1,
@@ -191 +191 @@
         
         // arb or nv queries
-        mSceneMgr->setOption("UseArbQueries", &mUseArbQueries);
+        //mSceneMgr->setOption("UseArbQueries", &mUseArbQueries);
         
         // reset statistics

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -302 +302 @@
         
         // if no objects in file, we generate new objects
-        if (!mTerrainContentGenerator->LoadObjects("objects.out"))
-        {
+        //if (!mTerrainContentGenerator->LoadObjects("objects.out"))
+        //{
                 // the objects are generated randomly distributed over the terrain
                 generateScene(900, 0); // create soldiers, trees, ninjas
                 generateScene(500, 1);
                 generateScene(100, 2);
-        }
+        //}
 
         // no limitations on height => it is possible for the user to put single 
@@ -317 +317 @@
 void  TestCullingTerrainApplication::generateScene(int num, int objectType)
 {
-        Vector3 scale(TerrainFrameListener::msObjectScales[objectType], 
-                                  TerrainFrameListener::msObjectScales[objectType],
-                                  TerrainFrameListener::msObjectScales[objectType]);
+        float val = TerrainFrameListener::msObjectScales[objectType];
+        Vector3 scale(val, val, val); 
 
         // to provide much occlusion,
@@ -325 +324 @@
         mTerrainContentGenerator->SetMinPos(Vector3(mTerrainMinPos));
         mTerrainContentGenerator->SetMaxPos(Vector3(mTerrainMaxPos.x, 75.0f, mTerrainMaxPos.z));
-        
+        std::stringstream d; d << "objscale: " << scale[0];
+        Ogre::LogManager::getSingleton().logMessage(d.str());
         mTerrainContentGenerator->SetScale(scale);
         mTerrainContentGenerator->SetOffset(TerrainFrameListener::msObjectTerrainOffsets[objectType]);

trunk/VUT/work/iv/IVFrameListener.cpp

@@ -126 +126 @@
         mSceneMgr->setOption("DelayRenderTransparents", &delayRenderTransparents);
         mSceneMgr->setOption("UseDepthPass", &mUseDepthPass);
-        mSceneMgr->setOption("UseArbQueries", &mUseArbQueries);
+        //mSceneMgr->setOption("UseArbQueries", &mUseArbQueries);
 
         mSceneMgr->setOption("ShowOctree", &mShowOctree);