Changeset 1202 for GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/src

Timestamp:

08/13/06 01:44:15 (18 years ago)

Author:

szydlowski

Message:

improvements on demo mode, added command line parsing for easy benchmark scripting scripting,
so far only load/store demo from/to file

Location:

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

Files:

• TestKdTree.cpp (modified) (5 diffs)
• TestKdTreeAppListener.cpp (modified) (15 diffs)

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

@@ -9 +9 @@
 extern "C" {
 #endif
+
+void splitStrCmdLine(const char *strCmdLine, std::vector<std::string>& argv);
+bool getopt(const std::string& option, const std::vector<std::string>& argv, const std::string& optstring, std::string& optarg);
 
 #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
@@ -16 +19 @@
 #endif
         {
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+                // parse windows-style command line
+                std::string optarg = "i:o:", infile, outfile;
+                std::vector<std::string> argv;
+
+                splitStrCmdLine(strCmdLine, argv);
+
+                getopt("i", argv, optarg, infile);
+                getopt("o", argv, optarg, outfile);
+
+                // Create application object
+                KdTreeApp app(infile, outfile);
+#else
+                // TODO: unix-style getopt
                 // Create application object
                 KdTreeApp app;
+#endif
 
                 SET_TERM_HANDLER;
@@ -42 +60 @@
 #endif
 
+// split a space-separated string argument in an array of strings
+// sensitive to "
+void splitStrCmdLine(const char *strCmdLine, std::vector<std::string>& argv)
+{
+        std::string cmdline(strCmdLine);
+        argv.clear();
+
+        std::string tmp;
+        unsigned int strpos = 0;
+        bool skipspace = false;
+
+        while (strpos < cmdline.length())
+        {
+                while (strpos < cmdline.length() && cmdline[strpos] == ' ')
+                        strpos++;
+                tmp.clear();
+                while (strpos < cmdline.length() && (cmdline[strpos] != ' ' || skipspace))
+                {
+                        if (cmdline[strpos] == '"')
+                        {
+                                ++ strpos;
+                                skipspace = !skipspace;
+                                if (!skipspace)
+                                        continue;
+                        }
+
+                        tmp += cmdline[strpos ++];
+                }
+                argv.push_back(tmp);
+        }
+
+        //std::ofstream testout("test.txt");
+
+        //testout << cmdline << "\n\n";
+
+        //std::vector<std::string>::iterator it = argv.begin();
+        //while (it != argv.end())
+        //{
+        //      testout << *it << "\n";
+        //      ++ it;
+        //}
+
+        //testout.close();
+}
+
+// simplified std::-based getopt (no long options)
+// does not provide options consecutively like POSIX getopt, it rather gives you the value of the option you ask for
+// or returns false if option not present or anything else went wrong
+bool getopt(const std::string& option, const std::vector<std::string>& argv, const std::string& optstring, std::string& optarg)
+{
+        static enum argtypes
+        {
+                no_argument,
+                required_argument,
+                optional_argument
+        };
+
+        // early terminate
+        if (option.empty() || argv.empty() || optstring.empty())
+                return false;
+
+        // verify presence of option
+        size_t iopt = optstring.find(option);
+        if (iopt == std::string::npos)
+                return false;
+
+        // check if mandatory or optional argument
+        int arg = no_argument;
+        if (++ iopt < optstring.size() && optstring[iopt] == ':')
+                arg = required_argument;
+        if (++ iopt < optstring.size() && optstring[iopt] == ':')
+                arg = optional_argument;
+
+
+        // find the arguments value
+        size_t item = 0;
+        std::string optstr = "-" + option;
+
+        while (item < argv.size())
+        {
+                if (argv[item] == optstr)
+                {
+                        switch (arg)
+                        {
+                        case no_argument:
+                                optarg.clear();
+                                return true;
+                                break;
+                        case required_argument:
+                                if (++ item < argv.size() && argv[item][0] != '-')
+                                {
+                                        optarg = argv[item];
+                                        return true;
+                                }
+                                else
+                                {
+                                        optarg.clear();
+                                        return false;
+                                }
+                                break;
+                        case optional_argument:
+                                if (++ item < argv.size() && argv[item][0] != '-')
+                                {
+                                        optarg = argv[item];
+                                        return true;
+                                }
+                                else
+                                {
+                                        optarg.clear();
+                                        return true;
+                                }
+                                break;
+                        default:
+                                return false;
+                        }
+                }
+                ++ item;
+        }
+
+        return false;
+}
+
 #define ENT_GRID        0x01
 #define ENT_RND         0x02
@@ -94 +234 @@
         tmp = cfDeath.getSetting("rotatespeed");
         mRotateSpeed = static_cast<Real>(strtod(tmp.c_str(), &errptr));
+
+        // command line has preference over config file
+        if (mDemoInfileName.empty())
+                mDemoInfileName = cfDeath.getSetting("demoinfile");
+
+        if (mDemoOutfileName.empty())
+                mDemoOutfileName = cfDeath.getSetting("demooutfile");
 
         ExampleApplication::setupResources();
@@ -275 +422 @@
 void KdTreeApp::createFrameListener(void)
 {
-        mFrameListener = new KdTreeAppListener(mWindow, mSceneMgr, mRotateSpeed, mMoveSpeed, mRotationPeriod);
+        mFrameListener = new KdTreeAppListener(mWindow, mSceneMgr, mRotateSpeed, mMoveSpeed, mRotationPeriod, mDemoInfileName, mDemoOutfileName);
         mFrameListener->showDebugOverlay( true );
         mRoot->addFrameListener(mFrameListener);

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

@@ -71 +71 @@
 // Constructor takes a RenderWindow because it uses that to determine input context
 KdTreeAppListener::KdTreeAppListener(RenderWindow* win, SceneManager* sm, Real rs, Real ms, Real rp,
-        bool useBufferedInputKeys, bool useBufferedInputMouse)
+                                                                         const String& infile, const String& outfile,
+                                                                         bool useBufferedInputKeys, bool useBufferedInputMouse)
 {
         mDebugOverlay = OverlayManager::getSingleton().getByName("Core/DebugOverlay");
@@ -102 +103 @@
         mVizCamTransVect = Vector3::ZERO;
         mSeqNum = 0;
+
+        mDemoInfileName = infile;
+        mDemoOutfileName = outfile;
 
         mAppState = AS_NORMAL;
@@ -140 +144 @@
         setDemoOverlay();
 
-        //loadFrames("demo-in.txt");
-        loadFramesBinary("demo-in.bin");
+        if (!mDemoInfileName.empty())
+                loadFrames(mDemoInfileName, mFrameList);
 }
 //-----------------------------------------------------------------------
@@ -153 +157 @@
         {
                 PlatformManager::getSingleton().destroyInputReader( mInputDevice );
-        }
-
-        // save demo
-        if (!mFrameList.empty())
-        {
-                //saveFrames("demo-out.txt");
-                saveFramesBinary("demo-out.bin");
         }
 }
@@ -346 +343 @@
         {
                 toggleRecord();
+                mTimeUntilNextToggle = 0.5;
+        }
+
+        if (mInputDevice->isKeyDown(KC_F6) && mTimeUntilNextToggle <= 0)
+        {
+                if (!mDemoOutfileName.empty() && !mFrameList.empty())
+                        saveFrames(mDemoOutfileName, mFrameList);
                 mTimeUntilNextToggle = 0.5;
         }
@@ -1146 +1150 @@
 }
 
+
 //-----------------------------------------------------------------------------
-//void KdTreeAppListener::resetPlayback()
-//{
-//      if (!mFrameList.empty())
-//      {
-//              mCurrFrame = mFrameList.begin();
-//              mTimeRemaining = mCurrFrame->mElapsedTime;
-//      }
-//}
+void KdTreeAppListener::saveFrames(const String& filename, FrameList& framelist)
+{
+        size_t dot = filename.find_last_of(".");
+        String ext = filename.substr(dot + 1, filename.length());
+        if (ext == "txt")
+                saveFramesAscii(filename, framelist);
+        else if (ext == "bin")
+                saveFramesBinary(filename, framelist);
+        else
+                OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, "Invalid extension for demo file: " + ext, "KdTreeApp::loadFrames");
+}
 
 //-----------------------------------------------------------------------------
-void KdTreeAppListener::saveFrameInfo(Real elapsedTime)
-{
-        mFrameList.push_back(FrameInfo(mCamNode->getPosition(), mCamNode->getOrientation(), elapsedTime));
-}
-
-//-----------------------------------------------------------------------------
-void KdTreeAppListener::saveFrames(const String& filename)
+void KdTreeAppListener::saveFramesAscii(const String& filename, FrameList& framelist)
 {
         // open file
@@ -1173 +1175 @@
         }
 
-        FrameList::iterator it = mFrameList.begin();
-        FrameList::iterator end = mFrameList.end();
+        FrameList::iterator it = framelist.begin();
+        FrameList::iterator end = framelist.end();
 
         // dump values
@@ -1190 +1192 @@
 
 //-----------------------------------------------------------------------------
-void KdTreeAppListener::saveFramesBinary(const String& filename)
+void KdTreeAppListener::saveFramesBinary(const String& filename, FrameList& framelist)
 {
         std::ofstream dest(filename.c_str(), std::ios_base::out | std::ios_base::binary);
@@ -1200 +1202 @@
         }
 
-        FrameList::iterator it = mFrameList.begin();
-        FrameList::iterator end = mFrameList.end();
-
-        size_t size = sizeof(Real);
+        FrameList::iterator it = framelist.begin();
+        FrameList::iterator end = framelist.end();
+
+        int size = sizeof(Real);
 
         // dump values
@@ -1223 +1225 @@
 
 //-----------------------------------------------------------------------------
-void KdTreeAppListener::loadFrames(const String& filename)
+void KdTreeAppListener::loadFrames(const String& filename, FrameList& framelist)
+{
+        size_t dot = filename.find_last_of(".");
+        String ext = filename.substr(dot + 1, filename.length());
+        if (ext == "txt")
+                loadFramesAscii(filename, framelist);
+        else if (ext == "bin")
+                loadFramesBinary(filename, framelist);
+        else
+                OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, "Invalid extension for demo file: " + ext, "KdTreeApp::loadFrames");
+}
+
+//-----------------------------------------------------------------------------
+void KdTreeAppListener::loadFramesAscii(const String& filename, FrameList& framelist)
 {
         // open file
@@ -1234 +1249 @@
 
         // clear the list
-        mFrameList.clear();
+        framelist.clear();
 
         Vector3 pos;
@@ -1253 +1268 @@
                 src >> time;
 
-                mFrameList.push_back(FrameInfo(pos, or, time));
+                framelist.push_back(FrameInfo(pos, or, time));
         }
 
         // HACK pop last frame, was doubled while reading
-        mFrameList.pop_back();
+        framelist.pop_back();
 
         src.close();
@@ -1263 +1278 @@
 
 //-----------------------------------------------------------------------------
-void KdTreeAppListener::loadFramesBinary(const String& filename)
+void KdTreeAppListener::loadFramesBinary(const String& filename, FrameList& framelist)
 {
         // open file
@@ -1274 +1289 @@
 
         // clear the list
-        mFrameList.clear();
-
-        size_t size = sizeof(Real);
+        framelist.clear();
+
+        int size = sizeof(Real);
 
         Vector3 pos;
@@ -1293 +1308 @@
                 src.read((char *)&time, size);
 
-                mFrameList.push_back(FrameInfo(pos, or, time));
+                framelist.push_back(FrameInfo(pos, or, time));
         }
 
         // HACK pop last frame, was doubled while reading
-        mFrameList.pop_back();
+        framelist.pop_back();
 
         src.close();
 }
+
+//-----------------------------------------------------------------------------
+void KdTreeAppListener::saveFrameInfo(Real elapsedTime)
+{
+        mFrameList.push_back(FrameInfo(mCamNode->getPosition(), mCamNode->getOrientation(), elapsedTime));
+}
+
 //-----------------------------------------------------------------------------
 void KdTreeAppListener::setDemoOverlay()