Changeset 1258 for GTP/trunk/App/Demos

Timestamp:

08/22/06 14:27:13 (18 years ago)

Author:

szydlowski

Message:

pre-big-changes-backup (TM)
working state before attempt to include terrain rendering

Location:

GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE

Files:

• include/TestKdTreeAppListener.h (modified) (2 diffs)
• src/TestKdTree.cpp (modified) (2 diffs)
• src/TestKdTreeAppListener.cpp (modified) (7 diffs)

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

@@ -41 +41 @@
 #include <OgreStringConverter.h>
 #include <OgreException.h>
+#include <OgreTextAreaOverlayElement.h>
 
 #include <OgreKdTree.h>
@@ -239 +240 @@
 
         OverlayElement *mDemoStatus;
+        TextAreaOverlayElement *mDemoTime;
 
 

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

@@ -37 +37 @@
                                 .addOpt("s","scenemgr", ARGUMENT_REQUIRED)
                                 .addOpt("","comment", ARGUMENT_REQUIRED)
-                                .addOpt("e","enhancevis", ARGUMENT_NONE)
-                                .addOpt("","logint",ARGUMENT_REQUIRED);
+                                .addOpt("e","enhancevis", ARGUMENT_NONE);
 
 
@@ -88 +87 @@
                                 s << tmp;
                                 s >> options.mKI;
-                                s.clear();
-                        }
-
-                        if (cmdparser.getOpt("logint", tmp))
-                        {
-                                s << tmp;
-                                s >> options.mDemoInterval;
                                 s.clear();
                         }

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

@@ -164 +164 @@
         mDemoOverlay = 0;
         mDemoStatus = 0;
+        mDemoTime = 0;
 
         initKdTreeOverlay();
@@ -1069 +1070 @@
                 mDemoStats.mTotalEllapsedTime += evt.timeSinceLastFrame;
 
+                // set time display
+                int m = (int)mDemoStats.mTotalEllapsedTime / 60;
+                int s = (int)mDemoStats.mTotalEllapsedTime % 60;
+
+                mDemoTime->setCaption(
+                        StringConverter::toString(m, 2, '0') + ":" + 
+                        StringConverter::toString(s, 2, '0'));
+
                 // store fps when in demo mode
                 if (mOptions.mDemoMode)
@@ -1154 +1163 @@
         if (mAppState == AS_RECORD)
         {
+                // update stats
+                ++ mDemoStats.mTotalNumFrames;
+                mDemoStats.mTotalEllapsedTime += evt.timeSinceLastFrame;
+
+                // set time display
+                int m = (int)mDemoStats.mTotalEllapsedTime / 60;
+                int s = (int)mDemoStats.mTotalEllapsedTime % 60;
+
+                mDemoTime->setCaption(
+                        StringConverter::toString(m, 2, '0') + ":" + 
+                        StringConverter::toString(s, 2, '0'));
+
                 mFrameList.push_back(FrameInfo(mCamNode->getPosition(), mCamNode->getOrientation(), evt.timeSinceLastFrame));
         }
@@ -1234 +1255 @@
                 // clear old recording
                 mFrameList.clear();
+
+                // reset stats
+                mDemoStats.mNumFrames = 0;
+                mDemoStats.mTotalNumFrames = 0;
+                mDemoStats.mEllapsedTime = 0.0f;
+                mDemoStats.mTotalEllapsedTime = 0.0f;
         }
         // stop recording
@@ -1572 +1599 @@
 {
         // init overlay if not present
-        if (!mDemoOverlay || !mDemoStatus)
+        if (!mDemoOverlay || !mDemoStatus || !mDemoTime)
         {
                 OGRE_DELETE(mDemoOverlay);
                 OGRE_DELETE(mDemoStatus);
+                OGRE_DELETE(mDemoTime);
 
                 mDemoStatus = OverlayManager::getSingleton().createOverlayElement("Panel", "KdTree/DemoStatus");
@@ -1585 +1613 @@
                 mDemoStatus->setDimensions(32, 32);
 
+                //mDemoTime = static_cast<TextAreaOverlayElement *>
+                //      (OverlayManager::getSingleton().createOverlayElementFromTemplate(
+                //      "KdTree/Templates/BasicText", "TextArea", "KdTree/DemoTime"));
+                mDemoTime = static_cast<TextAreaOverlayElement *>
+                        (OverlayManager::getSingleton().createOverlayElement("TextArea", "KdTree/DemoTime"));
+                mDemoTime->setMetricsMode(GMM_PIXELS);
+                mDemoTime->setTop(6);
+                mDemoTime->setLeft(8);
+                mDemoTime->setFontName("TrebuchetMSBold");
+                mDemoTime->setCharHeight(24.0);
+                mDemoTime->setCaption("00:00");
+
+                PanelOverlayElement *timeCont = static_cast<PanelOverlayElement *>
+                        (OverlayManager::getSingleton().createOverlayElement("Panel", "KdTree/DemoTimePanel"));
+                timeCont->setMetricsMode(GMM_PIXELS);
+                timeCont->setHorizontalAlignment(GHA_CENTER);
+                timeCont->setVerticalAlignment(GVA_TOP);
+                timeCont->setTop(5);
+                timeCont->setLeft(16);
+                timeCont->setDimensions(64, 32);
+                timeCont->addChild(mDemoTime);
+
                 mDemoOverlay = OverlayManager::getSingleton().create("KdTree/DemoOverlay");
                 mDemoOverlay->setZOrder(500);
                 mDemoOverlay->add2D(static_cast<PanelOverlayElement *>(mDemoStatus));
+                mDemoOverlay->add2D(timeCont);
         }
 
@@ -1597 +1648 @@
         case AS_PLAYBACK:
                 mDemoStatus->setMaterialName("KdTree/DemoPlayButton");
+                mDemoTime->setColourTop(ColourValue(0.5, 0.7, 0.5));
+                mDemoTime->setColourBottom(ColourValue(0.3, 0.5, 0.3));
                 mDemoOverlay->show();
                 break;
         case AS_RECORD:
                 mDemoStatus->setMaterialName("KdTree/DemoRecordButton");
+                mDemoTime->setColourTop(ColourValue(0.7, 0.5, 0.5));
+                mDemoTime->setColourBottom(ColourValue(0.5, 0.3, 0.3));
                 mDemoOverlay->show();
                 break;