Changeset 1184 for code/branches/network3

Timestamp:

Apr 24, 2008, 11:00:30 PM (17 years ago)

Author:

scheusso

Message:

first success: client clones the servers universe and displays it with quite good performance

Location:

code/branches/network3

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• src/network/Client.cc (modified) (2 diffs)
• src/network/Client.h (modified) (2 diffs)
• src/network/Server.cc (modified) (1 diff)
• src/orxonox/Orxonox.cc (modified) (3 diffs)
• src/orxonox/objects/SpaceShip.cc (modified) (5 diffs)
• src/orxonox/objects/SpaceShip.h (modified) (1 diff)
• src/orxonox/objects/WorldEntity.cc (modified) (1 diff)

code/branches/network3/bin/levels/sample.oxw

@@ -41 +41 @@
 for i = 1, 226, 1 
 do ?>
-  <!--Model position="<?lua print(math.random(-19597, 18732))?>, <?lua print(math.random(-19597, 18732)) ?>, <?lua print(math.random(-19597, 18732)) ?>" scale="<?lua print(math.random( 20, 119)) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random(16, 44)) ?>" /-->
+  <Model position="<?lua print(math.random(-19597, 18732))?>, <?lua print(math.random(-19597, 18732)) ?>, <?lua print(math.random(-19597, 18732)) ?>" scale="<?lua print(math.random( 20, 119)) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random(16, 44)) ?>" />
 <?lua 
 end

code/branches/network3/src/network/Client.cc

@@ -44 +44 @@
 namespace network
 {
+  Client* Client::_sClient = 0;
+  
+  Client* Client::createSingleton(){
+    if(!_sClient)
+      _sClient = new Client();
+    return _sClient;
+  }
+  
+  Client* Client::createSingleton(std::string address, int port){
+    if(!_sClient)
+      _sClient = new Client(address, port);
+    return _sClient;
+  }
+  
+  Client* Client::createSingleton(const char *address, int port){
+    if(!_sClient)
+      _sClient = new Client(address, port);
+    return _sClient;
+  }
+  
+  void Client::destroySingleton(){
+    if(_sClient){
+      delete _sClient;
+      _sClient = 0;
+    }
+  }
+  
+  Client* Client::getSingleton(){
+    return _sClient; 
+  }
+  
   /**
   * Constructor for the Client class
@@ -71 +102 @@
   }
 
+  Client::~Client(){
+    if(isConnected)
+      closeConnection();
+  }
+  
   /**
   * Establish the Connection to the Server

code/branches/network3/src/network/Client.h

@@ -65 +65 @@
   class _NetworkExport Client : PacketDecoder, public orxonox::Tickable{
   public:
-    Client();
-    Client(std::string address, int port);
-    Client(const char *address, int port);
-
+    
+    static Client* createSingleton();
+    static Client* createSingleton(std::string address, int port);
+    static Client* createSingleton(const char *address, int port);
+    static void destroySingleton();
+    static Client *getSingleton();
+    
     bool establishConnection();
     bool closeConnection();
@@ -84 +87 @@
 
   private:
+    Client();
+    Client(std::string address, int port);
+    Client(const char *address, int port);
+    ~Client();
+    
+    static Client* _sClient;
+    
     ClientConnection client_connection;
     PacketGenerator pck_gen;

code/branches/network3/src/network/Server.cc

@@ -143 +143 @@
     updateGamestate();
 
-    sleep(1); // TODO remove
+    //sleep(1); // TODO remove
     return;
   }

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

@@ -184 +184 @@
     GraphicsEngine::getSingleton().destroy();
 
-    if (client_g)
-      delete client_g;
+    if (network::Client::getSingleton())
+      network::Client::destroySingleton();
     if (server_g)
       delete server_g;
@@ -281 +281 @@
     ogre_->setup();
     if(serverIp_.compare("")==0)
-      client_g = new network::Client();
+      client_g = network::Client::createSingleton();
     else
-      client_g = new network::Client(serverIp_, NETWORK_PORT);
+      client_g = network::Client::createSingleton(serverIp_, NETWORK_PORT);
     if(!ogre_->load(this->dataPath_)) abortImmediateForce(/* unable to load */);
   }
@@ -422 +422 @@
     ib->registerListener(console, &Testconsole::execute, '\n', false);
     ib->registerListener(console, &Testconsole::hintandcomplete, '\t', true);
-    ib->registerListener(console, &Testconsole::clear, '§', true);
+    ib->registerListener(console, &Testconsole::clear, '�', true);
     ib->registerListener(console, &Testconsole::removeLast, '\b', true);
     ib->registerListener(console, &Testconsole::exit, (char)0x1B, true);

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

@@ -50 +50 @@
 #include "core/XMLPort.h"
 #include "core/ConsoleCommand.h"
+#include "network/Client.h"
 
 namespace orxonox
@@ -165 +166 @@
     void SpaceShip::init()
     {
+        createCamera();
         // START CREATING THRUSTER
         this->tt_ = new ParticleInterface(GraphicsEngine::getSingleton().getSceneManager(),"twinthruster" + this->getName(),"Orxonox/engineglow");
@@ -281 +283 @@
     void SpaceShip::setCamera(const std::string& camera)
     {
-        Ogre::Camera *cam = GraphicsEngine::getSingleton().getSceneManager()->createCamera("ShipCam");
-        this->camNode_ = this->getNode()->createChildSceneNode("CamNode");
+      // change camera attributes here, if you want to ;)
+    }
+    
+    void SpaceShip::createCamera(){
+      Ogre::Camera *cam = GraphicsEngine::getSingleton().getSceneManager()->createCamera("ShipCam");
+      this->camNode_ = this->getNode()->createChildSceneNode("CamNode");
 /*
 //        node->setInheritOrientation(false);
-        cam->setPosition(Vector3(0,50,-150));
-        cam->lookAt(Vector3(0,20,0));
-        cam->roll(Degree(0));
-*/
-
-        cam->setPosition(Vector3(-200,0,35));
+      cam->setPosition(Vector3(0,50,-150));
+      cam->lookAt(Vector3(0,20,0));
+      cam->roll(Degree(0));
+*/
+
+      cam->setPosition(Vector3(-200,0,35));
 //        cam->setPosition(Vector3(0,-350,0));
-        cam->lookAt(Vector3(0,0,35));
-        cam->roll(Degree(-90));
-
-        this->camNode_->attachObject(cam);
-        GraphicsEngine::getSingleton().getRenderWindow()->addViewport(cam);
+      cam->lookAt(Vector3(0,0,35));
+      cam->roll(Degree(-90));
+
+      this->camNode_->attachObject(cam);
+      GraphicsEngine::getSingleton().getRenderWindow()->addViewport(cam);
+      
     }
 
@@ -427 +434 @@
     void SpaceShip::tick(float dt)
     {
-      if (InputManager::getSingleton().getMouse()->getEventCallback() != this)
+        // only do this if not client TODO: remove this hack
+      if (!network::Client::getSingleton() && InputManager::getSingleton().getMouse()->getEventCallback() != this)
         {
             if (InputManager::getSingleton().getMouse())
@@ -526 +534 @@
         }
 
-        if (mKeyboard->isKeyDown(OIS::KC_UP) || mKeyboard->isKeyDown(OIS::KC_W))
-            this->acceleration_.x = this->translationAcceleration_;
-        else if(mKeyboard->isKeyDown(OIS::KC_DOWN) || mKeyboard->isKeyDown(OIS::KC_S))
-            this->acceleration_.x = -this->translationAcceleration_;
-        else
-            this->acceleration_.x = 0;
-
-        if (mKeyboard->isKeyDown(OIS::KC_RIGHT) || mKeyboard->isKeyDown(OIS::KC_D))
-            this->acceleration_.y = -this->translationAcceleration_;
-        else if (mKeyboard->isKeyDown(OIS::KC_LEFT) || mKeyboard->isKeyDown(OIS::KC_A))
-            this->acceleration_.y = this->translationAcceleration_;
-        else
-            this->acceleration_.y = 0;
-
-        if (mKeyboard->isKeyDown(OIS::KC_DELETE) || mKeyboard->isKeyDown(OIS::KC_Q))
-            this->momentum_ = Radian(-this->rotationAccelerationRadian_);
-        else if (mKeyboard->isKeyDown(OIS::KC_PGDOWN) || mKeyboard->isKeyDown(OIS::KC_E))
-            this->momentum_ = Radian(this->rotationAccelerationRadian_);
-        else
-            this->momentum_ = 0;
+        if(!network::Client::getSingleton()){
+          if (mKeyboard->isKeyDown(OIS::KC_UP) || mKeyboard->isKeyDown(OIS::KC_W))
+              this->acceleration_.x = this->translationAcceleration_;
+          else if(mKeyboard->isKeyDown(OIS::KC_DOWN) || mKeyboard->isKeyDown(OIS::KC_S))
+              this->acceleration_.x = -this->translationAcceleration_;
+          else
+              this->acceleration_.x = 0;
+  
+          if (mKeyboard->isKeyDown(OIS::KC_RIGHT) || mKeyboard->isKeyDown(OIS::KC_D))
+              this->acceleration_.y = -this->translationAcceleration_;
+          else if (mKeyboard->isKeyDown(OIS::KC_LEFT) || mKeyboard->isKeyDown(OIS::KC_A))
+              this->acceleration_.y = this->translationAcceleration_;
+          else
+              this->acceleration_.y = 0;
+  
+          if (mKeyboard->isKeyDown(OIS::KC_DELETE) || mKeyboard->isKeyDown(OIS::KC_Q))
+              this->momentum_ = Radian(-this->rotationAccelerationRadian_);
+          else if (mKeyboard->isKeyDown(OIS::KC_PGDOWN) || mKeyboard->isKeyDown(OIS::KC_E))
+              this->momentum_ = Radian(this->rotationAccelerationRadian_);
+          else
+              this->momentum_ = 0;
+        }
 
         WorldEntity::tick(dt);

code/branches/network3/src/orxonox/objects/SpaceShip.h

@@ -71 +71 @@
 
         private:
+            void createCamera();
             static SpaceShip* instance_s;
 

code/branches/network3/src/orxonox/objects/WorldEntity.cc

@@ -216 +216 @@
       registerVar( (void*) &(this->getRotationAxis().y), sizeof(this->getRotationAxis().y), network::DATA);
       registerVar( (void*) &(this->getRotationAxis().z), sizeof(this->getRotationAxis().z), network::DATA);
+      
+      registerVar( (void*) &(this->getScale().x), sizeof(this->getScale().x), network::DATA);
+      registerVar( (void*) &(this->getScale().y), sizeof(this->getScale().y), network::DATA);
+      registerVar( (void*) &(this->getScale().z), sizeof(this->getScale().z), network::DATA);
     }