Changeset 599 for code/branches/FICN/src/orxonox/orxonox.cc

Timestamp:

Dec 17, 2007, 9:56:47 PM (16 years ago)

Author:

scheusso

Message:

ip address with —ip=address

File:

• code/branches/FICN/src/orxonox/orxonox.cc (modified) (8 diffs)

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

@@ -226 +226 @@
     //TODO: give config file to Ogre
     std::string mode;
-    if(argc>=2)
-      mode = std::string(argv[1]);
-    else
-      mode = "";
+//     if(argc>=2)
+//       mode = std::string(argv[1]);
+//     else
+//       mode = "";
     ArgReader ar = ArgReader(argc, argv);
     ar.checkArgument("mode", mode, false);
     ar.checkArgument("data", this->dataPath_, false);
+    ar.checkArgument("ip", serverIp_, false);
     if(ar.errorHandling()) die();
 
@@ -238 +239 @@
     {
       serverInit(path);
-      mode = SERVER;
+      mode_ = SERVER;
     }
     else if(mode == std::string("client"))
     {
       clientInit(path);
-      mode = CLIENT;
+      mode_ = CLIENT;
     }
     else if(mode == std::string("presentation"))
     {
       serverInit(path);
-      mode = PRESENTATION;
+      mode_ = PRESENTATION;
     }
     else{
       standaloneInit(path);
-      mode = STANDALONE;
+      mode_ = STANDALONE;
     }
   }
@@ -267 +268 @@
     setupScene();
     setupInputSystem();
+    if(mode_!=CLIENT){ // remove this in future ---- presentation hack
+    }
+    else
+      std::cout << "client here" << std::endl;
     createFrameListener();
     Factory::createClassHierarchy();
@@ -273 +278 @@
       server_g->open();
       break;
+    case CLIENT:
+      client_g->establishConnection();
+      break;
     case SERVER:
-    case CLIENT:
     case STANDALONE:
     default:
@@ -356 +363 @@
   void Orxonox::serverInit(std::string path)
   {
+    COUT(2) << "initialising server" << std::endl;
     ogre_->setConfigPath(path);
     ogre_->setup();
@@ -366 +374 @@
   void Orxonox::clientInit(std::string path)
   {
+    COUT(2) << "initialising client" << std::endl;
     ogre_->setConfigPath(path);
     ogre_->setup();
-    client_g = new network::Client(); // address here
+    if(serverIp_.compare("")==0)
+      client_g = new network::Client();
+    else
+      client_g = new network::Client(serverIp_, 55556);
     if(!ogre_->load()) die(/* unable to load */);
     ogre_->getRoot()->addFrameListener(new network::ClientFrameListener());
@@ -523 +535 @@
     ogre_->getRoot()->addFrameListener(TimerFL);
 
-    frameListener_ = new OrxListener(keyboard_, mouse_, auMan_, steering_);
+    //if(mode_!=CLIENT) // just a hack ------- remove this in future
+      frameListener_ = new OrxListener(keyboard_, mouse_, auMan_, steering_);
     ogre_->getRoot()->addFrameListener(frameListener_);
   }
@@ -536 +549 @@
     ogre_->getRoot()->getAutoCreatedWindow()->getMetrics(width, height, depth, left, top);
 
-    const OIS::MouseState &ms = mouse_->getMouseState();
-    ms.width = width;
-    ms.height = height;
-
+    if(mode_!=CLIENT){
+      const OIS::MouseState &ms = mouse_->getMouseState();
+      ms.width = width;
+      ms.height = height;
+    }
     ogre_->getRoot()->startRendering();
   }