Changeset 1301

Timestamp:

08/30/06 17:40:51 (18 years ago)

Author:

szydlowski

Message:

 

Location:

GTP/trunk

Files:

• App/Demos/Vis/KdTreeDemo/OGRE/src/TestKdTreeAppListener.cpp (modified) (3 diffs)
• Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp (modified) (1 diff)

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

@@ -1758 +1758 @@
                                 logheader << (i+1) << fs;
                         }
-                        // minFPS, avgFPS, maxFPS, comment, record separator
+                        // minFPS, avgFPS, maxFPS, frames, time, render system, comment, record separator
                         logheader << "\"min FPS\"" << fs << "\"avg FPS\"" << fs << "\"max FPS\"" << fs 
-                                << "\"# Frames \"" << fs << "\"Total Time\"" << fs << "\"Comment\"" << rs;
+                                << "\"# Frames \"" << fs << "\"Total Time\"" << fs << "\"Render System\"" << fs
+                                << "\"Comment\"" << rs;
                         logheader.close();
                 }
@@ -1777 +1778 @@
         if (logwrite.is_open())
         {
+                // gather info about ogre settings
+                String rendersys = "\"" + Root::getSingleton().getRenderSystem()->getName();
+                ConfigOptionMap rsopts = Root::getSingleton().getRenderSystem()->getConfigOptions();
+                for (ConfigOptionMap::iterator it = rsopts.begin(); it != rsopts.end(); it ++)
+                {
+                        rendersys += " | " + it->first + " : " + it->second.currentValue;
+                }
+                rendersys += "\"";
+
                 // demo settings
                 logwrite << "\"" << SCENEMANAGER[mOptions.mSceneManager];
@@ -1818 +1828 @@
                 // minFPS, avgFPS, maxFPS, comment, record separator
                 logwrite << (int)minFPS << fs << (int)avgFPS << fs << (int)maxFPS << fs 
-                        << mDemoStats.mTotalNumFrames << fs << mDemoStats.mTotalEllapsedTime << fs 
-                        << "\"" << mOptions.mComment << "\"" << rs;
+                        << mDemoStats.mTotalNumFrames << fs << mDemoStats.mTotalEllapsedTime << fs
+                        << rendersys << fs << "\"" << mOptions.mComment << "\"" << rs;
                 logwrite.close();
         }

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

@@ -683 +683 @@
                         mVisibleNodes.clear();
                         if (mKdTree)
+                        {
+                                // determine visibility
                                 mKdTree->queueVisibleObjects(KDCAMPTR_CAST(cam), getRenderQueue(), onlyShadowCasters, mShowBoxes, mVisibleNodes);
+                                // apply view cell pvs
+                                updatePvs(cam);
+                        }
                 }
         }