Changeset 1443 for code/branches

Timestamp:

May 27, 2008, 10:44:39 PM (16 years ago)

Author:

scheusso

Message:

the client stops now when conenction establishment fails —- testing with spaceship

Location:

code/branches/network/src

Files:

• network/ClientConnection.h (modified) (1 diff)
• orxonox/Orxonox.cc (modified) (1 diff)
• orxonox/objects/SpaceShip.cc (modified) (1 diff)
• orxonox/objects/WorldEntity.cc (modified) (3 diffs)

code/branches/network/src/network/ClientConnection.h

@@ -54 +54 @@
 #define NETWORK_PORT 55556
 #define NETWORK_CLIENT_MAX_CONNECTIONS 5
-#define NETWORK_CLIENT_TIMEOUT 10000
+#define NETWORK_CLIENT_TIMEOUT 1000
 #define NETWORK_SEND_WAIT 500
 #define NETWORK_CLIENT_CHANNELS 2

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

@@ -404 +404 @@
       client_g = network::Client::createSingleton(serverIp_, serverPort_);
 
-    client_g->establishConnection();
+    if(!client_g->establishConnection())
+      return false;
     client_g->tick(0);
 

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

@@ -484 +484 @@
         SpaceShip* this_ = getLocalShip();
         this_->momentum_ = Radian(-this_->rotationAccelerationRadian_ * val);
+        COUT(3) << "rotating val: " << val << " acceleration: " << this_->rotationAccelerationRadian_.valueDegrees() << std::endl;
     }
 

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

@@ -85 +85 @@
             this->rotationRate_ += (dt * this->momentum_);
             this->rotate(this->rotationAxis_, dt * this->rotationRate_);
+            COUT(3) << "rotationrate: " << this->rotationRate_.valueDegrees() << " momentum: " << this->momentum_.valueDegrees() << std::endl;
         }
     }
@@ -138 +139 @@
       registerVar( (void*) &(this->getOrientation().z), sizeof(this->getOrientation().z), network::DATA, 0x3);
       // register velocity_
-      registerVar( (void*) &(this->getVelocity().x), sizeof(this->getVelocity().x), network::DATA, 0x3);
+      /*registerVar( (void*) &(this->getVelocity().x), sizeof(this->getVelocity().x), network::DATA, 0x3);
       registerVar( (void*) &(this->getVelocity().y), sizeof(this->getVelocity().y), network::DATA, 0x3);
       registerVar( (void*) &(this->getVelocity().z), sizeof(this->getVelocity().z), network::DATA, 0x3);
@@ -145 +146 @@
       registerVar( (void*) &(this->getRotationAxis().x), sizeof(this->getRotationAxis().x), network::DATA, 0x3);
       registerVar( (void*) &(this->getRotationAxis().y), sizeof(this->getRotationAxis().y), network::DATA, 0x3);
-      registerVar( (void*) &(this->getRotationAxis().z), sizeof(this->getRotationAxis().z), network::DATA, 0x3);
+      registerVar( (void*) &(this->getRotationAxis().z), sizeof(this->getRotationAxis().z), network::DATA, 0x3);*/
       // register scale of node
       registerVar( (void*) &(this->getScale().x), sizeof(this->getScale().x), network::DATA, 0x3);