Changeset 1304

Timestamp:

08/31/06 16:45:51 (18 years ago)

Author:

szydlowski

Message:

final touches

Files:

• GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/include/TestKdTreeAppListener.h (modified) (2 diffs)
• GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/src/TestKdTree.cpp (modified) (4 diffs)
• GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/src/TestKdTreeAppListener.cpp (modified) (10 diffs)
• GTP/trunk/App/Demos/Vis/KdTreeDemo/README.txt (modified) (2 diffs)
• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeHierarchyInterface.cpp (modified) (1 diff)
• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp (modified) (2 diffs)
• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (1 diff)
• OGRE/trunk/resources/overlays/TestKdTree.overlay (modified) (12 diffs)

GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/include/TestKdTreeAppListener.h

@@ -132 +132 @@
                 mKT(2.0f),
                 mKI(1.0f),
-                mMaxDepth(12),
+                mMaxDepth(10),
                 mSceneManager(SM_KDT),
                 mRenderMethod(KdTree::KDRM_GTP_CHC),
-                mBuildMethod(KdTree::KDBM_PRIORITYQUEUE),
+                mBuildMethod(KdTree::KDBM_RECURSIVE),
                 mSceneType(ST_SIMPLE),
                 mViewCells(VCM_OFF),
+                mDelRenderQueue(true),
                 mFastStart(false),
                 mBurnIn(false),
@@ -164 +165 @@
                 int mSceneType;
                 int mViewCells;
+                bool mDelRenderQueue;
                 bool mFastStart;
                 bool mBurnIn;

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

@@ -42 +42 @@
                                 .addOpt("f","faststart", ARGUMENT_NONE)
                                 .addOpt("b","burnin", ARGUMENT_NONE)
-                                .addOpt("v","viewcells", ARGUMENT_OPTIONAL);
+                                .addOpt("v","viewcells", ARGUMENT_OPTIONAL)
+                                .addOpt("","nodelrq", ARGUMENT_NONE);
 
 
@@ -49 +50 @@
                         cmdparser.getOpt("l", options.mDemoLogfileName);
                         cmdparser.getOpt("comment", options.mComment);
+                        options.mDelRenderQueue = !cmdparser.getOpt("nodelrq");
                         options.mFastStart = cmdparser.getOpt("f");
                         options.mBurnIn = cmdparser.getOpt("b");
@@ -621 +623 @@
                 mSceneMgr->setOption("RenderMethod", &mOptions.mRenderMethod);
                 mSceneMgr->setOption("EnhancedVisibility", &mOptions.mEnhancedVisibility);
+                mSceneMgr->setOption("DeleteRenderQueue", &mOptions.mDelRenderQueue);
                 // fix
                 bool depthpass = false;
@@ -630 +633 @@
                 int alg = CONV_KDT_TO_OCM_ALG(mOptions.mRenderMethod);
                 mSceneMgr->setOption("Algorithm", &alg);
+                mSceneMgr->setOption("DeleteRenderQueue", &mOptions.mDelRenderQueue);
         }
 

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

@@ -122 +122 @@
 // rendering/texture options
 mSceneDetailIndex(PM_SOLID),
-mFiltering(TFO_ANISOTROPIC),
-mAniso(8),
+//mFiltering(TFO_ANISOTROPIC),
+//mAniso(8),
+mFiltering(TFO_BILINEAR),
+mAniso(1),
 // chc stats
 mDelayedQueriesIssued(0.0f),
@@ -139 +141 @@
 mTimeUntilNextToggle(0.0f),
 // stuff for walkthrough recording/playback
-mTimeUntilNextLogWrite(options.mDemoInterval),
+mTimeUntilNextLogWrite(0.0f),
 mTimeRemaining(0.0f),
 mWaitBeforeDemoStart(0.0f),
@@ -208 +210 @@
                 // force X second wait when in demo mode - avoids initial low framerate due to loading delays
                 mWaitBeforeDemoStart = DEMO_WAIT;
+                // wait one interval before first write
+                mTimeUntilNextLogWrite = mOptions.mDemoInterval;
                 // set playback icon
                 togglePlayback();
@@ -1336 +1340 @@
                                 saveLog();
                                 if (mOptions.mBurnIn)
+                                {
+                                        mTimeUntilNextLogWrite = mOptions.mDemoInterval;
                                         togglePlayback();
+                                }
                                 else
+                                {
                                         return false;
+                                }
                         }
                 }
@@ -1736 +1745 @@
                 logread >> line;
                 storedname = line.substr(0,line.find_first_of(','));
+                logread.close();
                 if (storedname != demoname)
                 {
@@ -1741 +1751 @@
                                 "##Error##: Saved demo stats do not match the current demo: " +
                                 storedname + " != " + demoname);
-                        logread.close();
                         return;
                 }
@@ -1760 +1769 @@
                         // 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 << "\"Render System\"" << fs
-                                << "\"Comment\"" << rs;
+                                << "\"# Frames \"" << fs << "\"Total Time\"" << fs << "\"Comment\"" << fs
+                                << "\"Render System\"" << rs;
                         logheader.close();
                 }
@@ -1786 +1795 @@
                 }
                 rendersys += "\"";
+
+                // view cells used?
+                String viewcells;
+                if (mOptions.mViewCells == VCM_ON)
+                        viewcells = ds + "VC";
+                else if (mOptions.mViewCells == VCM_FILTER)
+                        viewcells = ds + "VC+VF";
 
                 // demo settings
@@ -1803 +1819 @@
                         logwrite << ds << RENDERMETHOD[mOptions.mRenderMethod] << ds << senhvis << 
                                 mOptions.mMaxDepth << ds << mOptions.mKT << ds << mOptions.mKI << ds << 
-                                BUILDMETHOD[mOptions.mBuildMethod];
+                                BUILDMETHOD[mOptions.mBuildMethod] << viewcells;
                 }
                 else if (mOptions.mSceneManager == SM_OCM && mOptions.mRenderMethod != KdTree::KDRM_INTERNAL)
                 {
-                        logwrite << ds << RENDERMETHOD[CONV_OCM_TO_KDT_ALG(mOptions.mRenderMethod)];
+                        logwrite << ds << RENDERMETHOD[CONV_OCM_TO_KDT_ALG(mOptions.mRenderMethod)] << viewcells;
                 }
                 logwrite << "\"" << fs;
@@ -1829 +1845 @@
                 logwrite << (int)minFPS << fs << (int)avgFPS << fs << (int)maxFPS << fs 
                         << mDemoStats.mTotalNumFrames << fs << mDemoStats.mTotalEllapsedTime << fs
-                        << rendersys << fs << "\"" << mOptions.mComment << "\"" << rs;
+                        << "\"" << mOptions.mComment << "\"" << fs << rendersys << rs;
                 logwrite.close();
         }

GTP/trunk/App/Demos/Vis/KdTreeDemo/README.txt

@@ -62 +62 @@
       2 ... use view cells and visibility filter
     These setting can also be changeg ingame (see INGAME COMMANDS).
+    
+  --nodelrq
+    Do not delete render queue after each frame (which actually is normal
+    Ogre behavior). Deleting the render queue significantly improves framerates
+    when using occlusion culling.
 
   --comment
@@ -87 +92 @@
   --buildmode <bm_id>
     Select the mode of building the KdTree.
-      Priority Queue    bm_id=PQ (DEFAULT)
-      Recursive         bm_id=RE
+      Priority Queue    bm_id=PQ
+      Recursive         bm_id=RE (DEFAULT)
     This setting can also be changed ingame (see INGAME COMMANDS).
 

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

@@ -42 +42 @@
         else
         {
-                //KdTree::Branch * kdbranch = KDBRANCHPTR_CAST(node);
-                //if (kdbranch->mLeft)
-                //      mDistanceQueue->push(kdbranch->mLeft);
-                //if (kdbranch->mRight)
-                //      mDistanceQueue->push(kdbranch->mRight);
                 if (kdnode->getLeftChild())
                         mDistanceQueue->push(kdnode->getLeftChild());

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

@@ -36 +36 @@
 mShowAllBoxes(false),
 mEnhancedVisiblity(true),
-mBuildMethod(KdTree::KDBM_PRIORITYQUEUE),
+mBuildMethod(KdTree::KDBM_RECURSIVE),
 mRenderMethod(KdTree::KDRM_INTERNAL),
 mShowVisualization(false),
@@ -846 +846 @@
                 setAmbientLight(savedAmbient);
 
-                if (!mDeleteQueueAfterRendering)
-                        getRenderQueue()->clear(); // finally clear render queue
-                else
-                        OGRE_DELETE(mRenderQueue); // HACK: should rather only be cleared ...
+
+                // almost same effect as below
+                getRenderQueue()->clear(mDeleteQueueAfterRendering);
+
+                //if (!mDeleteQueueAfterRendering)
+                //      getRenderQueue()->clear(true); // finally clear render queue
+                //else
+                //      OGRE_DELETE(mRenderQueue); // HACK: should rather only be cleared ...
 
                 if (0) WriteLog(); // write out stats

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

@@ -450 +450 @@
         setAmbientLight(savedAmbient);
 
-        if (!mDeleteQueueAfterRendering)
-                getRenderQueue()->clear(); // finally clear render queue
-        else
-                OGRE_DELETE(mRenderQueue); // HACK: should rather only be cleared ...
+        // almost same effect as below
+        getRenderQueue()->clear(mDeleteQueueAfterRendering);
+
+        //if (!mDeleteQueueAfterRendering)
+        //      getRenderQueue()->clear(true); // finally clear render queue
+        //else
+        //      OGRE_DELETE(mRenderQueue); // HACK: should rather only be cleared ...
 
         if (0) WriteLog(); // write out stats

OGRE/trunk/resources/overlays/TestKdTree.overlay

@@ -23 +23 @@
                 left 5 
                 top 5
-                width 430
+                width 350
                 height 120
                 material Core/StatsBlockCenter
@@ -46 +46 @@
                 element TextArea(KdTree/RenderMethodInfo): KdTree/Templates/BasicText
                 {
-                        left 160
+                        left 125
                         width 180
                         height 30
@@ -60 +60 @@
                 element TextArea(KdTree/EnhancedVisInfo): KdTree/Templates/BasicText
                 {
-                        left 160
+                        left 125
                         width 180
                         height 30
@@ -74 +74 @@
                 element TextArea(KdTree/BuildMethodInfo): KdTree/Templates/BasicText
                 {
-                        left 160
+                        left 125
                         width 180
                         height 30
@@ -84 +84 @@
                         width 120
                         height 30
-                        caption [1][2] Max Tree Depth
+                        caption [1][2] Max Depth
                 }
                 element TextArea(KdTree/KdTreeMaxDepthInfo): KdTree/Templates/BasicText
                 {
-                        left 160
+                        left 125
                         width 180
                         height 30
@@ -102 +102 @@
                 element TextArea(KdTree/HighlightLevelInfo): KdTree/Templates/BasicText
                 {
-                        left 160
+                        left 125
                         width 180
                         height 30
@@ -116 +116 @@
                 element TextArea(KdTree/KTInfo): KdTree/Templates/BasicText
                 {
-                        left 160
+                        left 125
                         width 180
                         height 30
@@ -130 +130 @@
                 element TextArea(KdTree/KIInfo): KdTree/Templates/BasicText
                 {
-                        left 160
+                        left 125
                         width 180
                         height 30
@@ -144 +144 @@
                 element TextArea(KdTree/MovementInfo): KdTree/Templates/BasicText
                 {
-                        left 160
+                        left 125
                         width 180
                         height 30
@@ -158 +158 @@
                 element TextArea(KdTree/TopCamInfo): KdTree/Templates/BasicText
                 {
-                        left 160
+                        left 125
                         width 180
                         height 30
@@ -172 +172 @@
                 element TextArea(KdTree/ViewCellsInfo): KdTree/Templates/BasicText
                 {
-                        left 160
+                        left 125
                         width 180
                         height 30
@@ -186 +186 @@
                 element TextArea(KdTree/ViewFilterInfo): KdTree/Templates/BasicText
                 {
-                        left 160
+                        left 125
                         width 180
                         height 30