Changeset 542 for code/branches

Timestamp:

Dec 16, 2007, 5:54:06 PM (17 years ago)

Author:

bknecht

Message:

added an argument reader

Location:

code/branches/FICN

Files:

• bin/resources.cfg (modified) (1 diff)
• src/orxonox/core/CMakeLists.txt (modified) (1 diff)
• src/orxonox/orxonox.cc (modified) (5 diffs)

code/branches/FICN/bin/resources.cfg

@@ -15 +15 @@
 FileSystem=../Media/particle
 FileSystem=../Media/gui
+#FileSystem=../Media/levels
+#FileSystem=../Media/audio
 Zip=../Media/packs/cubemap.zip
 #Zip=../Media/packs/cubemapsJS.zip

code/branches/FICN/src/orxonox/core/CMakeLists.txt

@@ -10 +10 @@
   Error.cc
   SignalHandler.cc
+  ArgReader.cc
 )
 

code/branches/FICN/src/orxonox/orxonox.cc

@@ -54 +54 @@
 #include "objects/Tickable.h"
 #include "objects/Timer.h"
+#include "core/ArgReader.h"
 #include "core/Factory.h"
 
@@ -150 +151 @@
 
 //      scenemanager->spacehip->tick(evt.timesincelastframe);
-        if(mKeyboard->isKeyDown(OIS::KC_ESCAPE))
-          cout << "maximal MouseX: " << maxMouseX << "\tminMouseX: " << minMouseX << endl;
+        //if(mKeyboard->isKeyDown(OIS::KC_ESCAPE))
+          //cout << "maximal MouseX: " << maxMouseX << "\tminMouseX: " << minMouseX << endl;
         return !mKeyboard->isKeyDown(OIS::KC_ESCAPE);
       }
@@ -161 +162 @@
         if(mouseX>maxMouseX) maxMouseX = mouseX;
         if(mouseX<minMouseX) minMouseX = mouseX;
-        cout << "mouseX: " << mouseX << "\tmouseY: " << mouseY << endl;
+        //cout << "mouseX: " << mouseX << "\tmouseY: " << mouseY << endl;
         moved = true;
         return true;
@@ -210 +211 @@
   void Orxonox::init(int argc, char **argv, std::string path)
   {
-    //TODO: initialization with command line parameters
     //TODO: find config file (assuming executable directory)
     //TODO: read config file
     //TODO: give config file to Ogre
-
-    if(argc >=2 && strcmp(argv[1], "server")==0)
+    std::string mode = "";
+    ArgReader ar = ArgReader(argc, argv);
+    ar.checkArgument("mode", mode, false);
+    ar.checkArgument("data-path", path, true);
+    if(ar.errorHandling()) die();
+
+    if(mode == std::string("server"))
     {
       serverInit(path);
     }
-    else if(argc >=2 && strcmp(argv[1], "client")==0)
+    else if(mode == std::string("client"))
     {
       clientInit(path);
     }
-    else if(argc >=2 && strcmp(argv[1], "presentation")==0)
+    else if(mode == std::string("presentation"))
     {
       playableServer(path);
@@ -263 +268 @@
   {
     //TODO: destroy and destruct everything and print nice error msg
+    delete this;
   }