Changeset 2048 for code

Timestamp:

Oct 29, 2008, 2:16:15 PM (16 years ago)

Author:

scheusso

Message:

network tick limit works now

Location:

code/branches/objecthierarchy/src

Files:

• network/Server.cc (modified) (2 diffs)
• orxonox/objects/worldentities/ControllableEntity.cc (modified) (2 diffs)

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

@@ -62 +62 @@
 namespace network
 {
-  const int MAX_FAILURES = 20;
-  const int NETWORK_FREQUENCY = 30;
+  const unsigned int MAX_FAILURES = 20;
+  const unsigned int NETWORK_FREQUENCY = 25;
+  const float NETWORK_PERIOD = (float)1/NETWORK_FREQUENCY;
 
   /**
@@ -153 +154 @@
     //this steers our network frequency
     timeSinceLastUpdate_+=time;
-    if(timeSinceLastUpdate_>=(1./NETWORK_FREQUENCY)){
-      timeSinceLastUpdate_=(float)((int)(timeSinceLastUpdate_*NETWORK_FREQUENCY))/timeSinceLastUpdate_;
+    if(timeSinceLastUpdate_>=NETWORK_PERIOD){
+      timeSinceLastUpdate_ -= static_cast<unsigned int>( timeSinceLastUpdate_ / NETWORK_PERIOD ) * NETWORK_PERIOD;
       gamestates_->processGamestates();
       updateGamestate();

code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -238 +238 @@
             else if (this->bControlled_)
             {
+                COUT(2) << "setting client position" << endl;
                 this->client_velocity_ = this->velocity_;
                 this->client_position_ = this->node_->getPosition();
@@ -297 +298 @@
         if (this->server_overwrite_ == this->client_overwrite_)
         {
+            COUT(2) << "callback: setting client position" << endl;
             this->node_->setPosition(this->client_position_);
             this->server_position_ = this->client_position_;