Changeset 599 for code/branches/FICN

Timestamp:

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

Author:

scheusso

Message:

ip address with —ip=address

Location:

code/branches/FICN

Files:

• bin/run-script (modified) (1 diff)
• run (modified) (1 diff)
• src/network/GameStateManager.cc (modified) (1 diff)
• src/network/Synchronisable.cc (modified) (1 diff)
• src/orxonox/objects/SceneNode.cc (modified) (1 diff)
• src/orxonox/objects/SceneNode.h (modified) (1 diff)
• src/orxonox/orxonox.cc (modified) (8 diffs)
• src/orxonox/orxonox.h (modified) (1 diff)

code/branches/FICN/bin/run-script

@@ -22 +22 @@
         fi
 fi
-exec ./main $1
+exec ./main $1 $2 $3

code/branches/FICN/run

@@ -1 +1 @@
 #!/bin/bash
 cd bin
-./run-script $1
+./run-script $1 $2 $3
 cd ..

code/branches/FICN/src/network/GameStateManager.cc

@@ -93 +93 @@
   retval->id=id++;
   // reserve a little memory and increase it later on
-  COUT(2) << "mallocing" << std::endl;
+  //COUT(2) << "mallocing" << std::endl;
   retval->data = (unsigned char*)malloc(memsize);
-  COUT(2) << "malloced" << std::endl;
+  //COUT(2) << "malloced" << std::endl;
 
   // offset of memory functions

code/branches/FICN/src/network/Synchronisable.cc

@@ -115 +115 @@
   int n=0;
   for(i=syncList.begin(); n<datasize && i!=syncList.end(); ++i){
-    COUT(2) << "size of variable: " << i->size << std::endl;
-    COUT(2) << "size of variable: " << i->size << std::endl;
     //COUT(2) << "size of variable: " << i->size << std::endl;
     //(std::memcpy(retVal.data+n, (const void*)(&(i->size)), sizeof(int));

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

@@ -25 +25 @@
     void SceneNode::loadParams(TiXmlElement* xmlElem)
     {
-        Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
-
         if (xmlElem->Attribute("name") && xmlElem->Attribute("pos"))
         {
-                std::string name = xmlElem->Attribute("name");
+                name_ = xmlElem->Attribute("name");
 
                 std::vector<std::string> pos = tokenize(xmlElem->Attribute("pos"),",");
-                float x, y, z;
-                String2Number<float>(x, pos[0]);
-                String2Number<float>(y, pos[1]);
-                String2Number<float>(z, pos[2]);
+                //float x, y, z_;
+                String2Number<float>(x_, pos[0]);
+                String2Number<float>(y_, pos[1]);
+                String2Number<float>(z_, pos[2]);
 
-        float sx = 1, sy = 1, sz = 1;
+        sx_ = 1; sy_ = 1; sz_ = 1;
         if (xmlElem->Attribute("scale"))
         {
                   pos = tokenize(xmlElem->Attribute("scale"),",");
-                  String2Number<float>(sx, pos[0]);
-                  String2Number<float>(sy, pos[1]);
-                  String2Number<float>(sz, pos[2]);
+                  String2Number<float>(sx_, pos[0]);
+                  String2Number<float>(sy_, pos[1]);
+                  String2Number<float>(sz_, pos[2]);
+        }
+        yaw_ = 0.0;
+        if (xmlElem->Attribute("yaw"))
+        {
+          String2Number<float>(yaw_,xmlElem->Attribute("yaw"));
+        }
+        pitch_ = 0.0;
+        if (xmlElem->Attribute("pitch"))
+        {
+          String2Number<float>(pitch_,xmlElem->Attribute("pitch"));
+        }
+        roll_ = 0.0;
+        if (xmlElem->Attribute("roll"))
+        {
+          String2Number<float>(roll_,xmlElem->Attribute("roll"));
         }
 
-        float yaw = 0.0;
-        if (xmlElem->Attribute("yaw"))
-        {
-          String2Number<float>(yaw,xmlElem->Attribute("yaw"));
-        }
-        float pitch = 0.0;
-        if (xmlElem->Attribute("pitch"))
-        {
-          String2Number<float>(pitch,xmlElem->Attribute("pitch"));
-        }
-        float roll = 0.0;
-        if (xmlElem->Attribute("roll"))
-        {
-          String2Number<float>(roll,xmlElem->Attribute("roll"));
-        }
+        if(xmlElem->Attribute("node"))
+          nodeName_ = xmlElem->Attribute("node");
+        else
+          nodeName_ = "";
+        
+        create();
 
-        Ogre::SceneNode *parentNode;
-        if (xmlElem->Attribute("node"))
-          parentNode = mgr->getSceneNode(xmlElem->Attribute("node"));
-        else
-          parentNode = mgr->getRootSceneNode();
-
-        Ogre::SceneNode* node = parentNode->createChildSceneNode(name, Vector3(x,y,z));
-        node->scale(sx,sy,sz);
-        node->yaw(Ogre::Degree(yaw));
-        node->pitch(Ogre::Degree(pitch));
-        node->roll(Ogre::Degree(roll));
-
-                COUT(4) << "Loader: Created node "<< name <<" : "<<x<<" " << y << " " << z  << std::endl << std::endl;
+        COUT(4) << "Loader: loaded node "<< name_ <<" : "<< x_ <<" " << y_ << " " << z_ << std::endl << std::endl;
         }
    }
    
    void SceneNode::registerAllVariables(){
-     
+     registerVar(&x_, sizeof(float), network::DATA);
+     registerVar(&y_, sizeof(float), network::DATA);
+     registerVar(&z_, sizeof(float), network::DATA);
+     registerVar(&sx_, sizeof(float), network::DATA);
+     registerVar(&sy_, sizeof(float), network::DATA);
+     registerVar(&sz_, sizeof(float), network::DATA);
+     registerVar(&yaw_, sizeof(float), network::DATA);
+     registerVar(&pitch_, sizeof(float), network::DATA);
+     registerVar(&roll_, sizeof(float), network::DATA);
+     registerVar(&name_, sizeof(float), network::STRING);
+     registerVar(&nodeName_, sizeof(float), network::STRING);
    }
    
    bool SceneNode::create(){
+     Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
+
+     Ogre::SceneNode *parentNode;
+     if (nodeName_.compare("")!=0)
+       parentNode = mgr->getSceneNode(nodeName_);
+     else
+       parentNode = mgr->getRootSceneNode();
+
+     Ogre::SceneNode* node = parentNode->createChildSceneNode(name_, Vector3(x_,y_,z_));
+     node->scale(sx_,sy_,sz_);
+     node->yaw(Ogre::Degree(yaw_));
+     node->pitch(Ogre::Degree(pitch_));
+     node->roll(Ogre::Degree(roll_));
      return true;
    }

code/branches/FICN/src/orxonox/objects/SceneNode.h

@@ -23 +23 @@
           float sx_, sy_, sz_;
           float yaw_, pitch_, roll_;
-          std::string node_;
+          std::string name_;
+          std::string nodeName_;
 
     };

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();
   }

code/branches/FICN/src/orxonox/orxonox.h

@@ -79 +79 @@
       // this is used to identify the mode (server/client/...) we're in
       gameMode              mode_;
+      std::string           serverIp_;
   };
 }