Changeset 2415 for code/branches/presentation/src/orxonox

Timestamp:

Dec 12, 2008, 10:10:31 AM (16 years ago)

Author:

scheusso

Message:

• adjusted some priorities of objects (movableentity, controllableentity, positionableentity, model)
• dedicated server mode doesn't consume 100%cpu load anymore now

Location:

code/branches/presentation/src/orxonox

Files:

• gamestates/GSDedicated.cc (modified) (3 diffs)
• gamestates/GSDedicated.h (modified) (1 diff)
• objects/worldentities/ControllableEntity.cc (modified) (1 diff)
• objects/worldentities/Model.cc (modified) (1 diff)
• objects/worldentities/MovableEntity.cc (modified) (1 diff)
• objects/worldentities/PositionableEntity.cc (modified) (1 diff)

code/branches/presentation/src/orxonox/gamestates/GSDedicated.cc

@@ -35 +35 @@
 #include "network/Server.h"
 #include "objects/Tickable.h"
+#include "util/Sleep.h"
 
 namespace orxonox
@@ -41 +42 @@
         : GameState<GSRoot>("dedicated")
         , server_(0)
+        , timeSinceLastUpdate_(0)
     {
     }
@@ -72 +74 @@
     void GSDedicated::ticked(const Clock& time)
     {
-        GSLevel::ticked(time);
-        server_->tick(time.getDeltaTime());
-        this->tickChild(time);
+//         static float startTime = time.getSecondsPrecise();
+//         static int nrOfTicks = 0;
+        timeSinceLastUpdate_+=time.getDeltaTime();
+        if(timeSinceLastUpdate_>=NETWORK_PERIOD){
+//             ++nrOfTicks;
+//             COUT(0) << "estimated ticks/sec: " << nrOfTicks/(time.getSecondsPrecise()-startTime) << endl;
+            timeSinceLastUpdate_ -= static_cast<unsigned int>( timeSinceLastUpdate_ / NETWORK_PERIOD ) * NETWORK_PERIOD;
+            GSLevel::ticked(time);
+            server_->tick(time.getDeltaTime());
+            this->tickChild(time);
+        }
+        else
+        {
+            usleep( (int)( (NETWORK_PERIOD - timeSinceLastUpdate_)*1000*1000 ) );
+//             COUT(0) << "sleeping for " << (int)( (NETWORK_PERIOD - timeSinceLastUpdate_)*1000*1000 ) << " usec" << endl;
+        }
     }
 }

code/branches/presentation/src/orxonox/gamestates/GSDedicated.h

@@ -49 +49 @@
 
         Server*      server_;
+        float        timeSinceLastUpdate_;
     };
 }

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

@@ -66 +66 @@
         this->server_orientation_ = Quaternion::IDENTITY;
         this->client_orientation_ = Quaternion::IDENTITY;
+        
+        this->setPriority( priority::very_high );
 
         this->registerVariables();

code/branches/presentation/src/orxonox/objects/worldentities/Model.cc

@@ -40 +40 @@
     Model::Model(BaseObject* creator) : PositionableEntity(creator)
     {
-        static unsigned int i=10;
         RegisterObject(Model);
 
         this->registerVariables();
-        this->setObjectPriority(i++);
     }
 

code/branches/presentation/src/orxonox/objects/worldentities/MovableEntity.cc

@@ -53 +53 @@
         this->overwrite_position_ = Vector3::ZERO;
         this->overwrite_orientation_ = Quaternion::IDENTITY;
+        
+        this->setPriority( priority::low );
 
         this->registerVariables();

code/branches/presentation/src/orxonox/objects/worldentities/PositionableEntity.cc

@@ -38 +38 @@
     {
         RegisterObject(PositionableEntity);
+        
+        this->setPriority( priority::very_low );
 
         this->registerVariables();