Changeset 1669 for code/branches/network

Timestamp:

Aug 26, 2008, 1:19:21 AM (16 years ago)

Author:

scheusso

Message:

forgot something

Location:

code/branches/network/src

Files:

• orxonox/Orxonox.cc (modified) (4 diffs)
• orxonox/objects/SpaceShip.cc (modified) (6 diffs)
• util/Bytestream.cc (added)
• util/Bytestream.h (added)
• util/CMakeLists.txt (modified) (1 diff)
• util/UtilPrereqs.h (modified) (2 diffs)

code/branches/network/src/orxonox/Orxonox.cc

@@ -126 +126 @@
     GraphicsEngine::getSingleton().destroy();
 
-    if (network::Client::getSingleton())
-      network::Client::destroySingleton();
+    if (client_g)
+      delete client_g;
     if (server_g)
-      delete network::Server::getSingleton();
+      delete server_g;
   }
 
@@ -346 +346 @@
     COUT(0) << "Loading level in server mode" << std::endl;
 
-    //server_g = new network::Server(serverPort_);
-    server_g = network::Server::createSingleton(serverPort_);
-
+    server_g = new network::Server(serverPort_);
+    COUT(0) << "Loading scene in server mode" << std::endl;
     if (!loadScene())
       return false;
@@ -365 +364 @@
 
     if (serverIp_.compare("") == 0)
-      client_g = network::Client::createSingleton();
+      client_g = new network::Client();
     else
 
-      client_g = network::Client::createSingleton(serverIp_, serverPort_);
+      client_g = new network::Client(serverIp_, serverPort_);
 
     if(!client_g->establishConnection())
@@ -509 +508 @@
 
     if (mode_ == CLIENT)
-      network::Client::getSingleton()->closeConnection();
+      client_g->closeConnection();
     else if (mode_ == SERVER)
       server_g->close();

code/branches/network/src/orxonox/objects/SpaceShip.cc

@@ -48 +48 @@
 #include "core/XMLPort.h"
 #include "core/ConsoleCommand.h"
-#include "network/Client.h"
+#include "network/Host.h"
 #include "hud/HUD.h"
 
@@ -158 +158 @@
     bool SpaceShip::create(){
       if(!myShip_){
-        if(network::Client::getSingleton() && objectID == network::Client::getSingleton()->getShipID())
+        if(network::Host::running() && objectID == network::Host::getShipID())
           myShip_=true;
         else
@@ -282 +282 @@
     void SpaceShip::setCamera(const std::string& camera)
     {
-      myShip_=true; // TODO: this is only a hack
       camName_=camera;
       // change camera attributes here, if you want to ;)
@@ -289 +288 @@
     void SpaceShip::getFocus(){
       COUT(4) << "requesting focus" << std::endl;
-      if(network::Client::getSingleton()==0 || network::Client::getSingleton()->getShipID()==objectID)
+      //if(!network::Host::running() || network::Host::getShipID()==objectID)
+      if(myShip_)
         CameraHandler::getInstance()->requestFocus(cam_);
 
@@ -311 +311 @@
       cam_->setTargetNode(this->getNode());
 //        cam->setPosition(Vector3(0,-350,0));
+//      Quaternion q1 = Quaternion(Radian(Degree(90)),Vector3(0,0,1));
+//      Quaternion q2 = Quaternion(Radian(Degree(90)),Vector3(0,1,0));
       Quaternion q1 = Quaternion(Radian(Degree(90)),Vector3(0,-1,0));
       Quaternion q2 = Quaternion(Radian(Degree(90)),Vector3(1,0,0));
-      this->camNode_->setOrientation(q2*q1);
-      if(network::Client::getSingleton()!=0 && network::Client::getSingleton()->getShipID()==objectID){
+
+       this->camNode_->setOrientation(q2*q1);
+      //if(!network::Host::running() || network::Host::getShipID()==objectID){ //TODO: check this
+      if(myShip_){
+        COUT(3) << "requesting focus for camera" << std::endl;
         this->setBacksync(true);
-        CameraHandler::getInstance()->requestFocus(cam_);
+        //CameraHandler::getInstance()->requestFocus(cam_);
+        if(this->isExactlyA(Class(SpaceShip)))
+          getFocus();
       }
 
@@ -355 +362 @@
         XMLPortParamLoadOnly(SpaceShip, "rotDamp", setRotDamp, xmlelement, mode);
 
+        myShip_=true; //TODO: this is a hack
         SpaceShip::create();
-        if (this->isExactlyA(Class(SpaceShip)))
-            getFocus();
+        /*if (this->isExactlyA(Class(SpaceShip)))
+            getFocus();*/
     }
 

code/branches/network/src/util/CMakeLists.txt

@@ -1 +1 @@
 SET(UTIL_SRC_FILES
   ArgReader.cc
+  Bytestream.cc
   Clipboard.cc
   ExprParser.cc

code/branches/network/src/util/UtilPrereqs.h

@@ -61 +61 @@
 //-----------------------------------------------------------------------
 class ArgReader;
+class Bytestream;
 class Convert;
 class MultiTypePrimitive;
@@ -68 +69 @@
 class String2Number;
 class SubString;
-
 #endif /* _UtilPrereqs_H__ */