Changeset 1485

Timestamp:

May 29, 2008, 7:29:36 PM (16 years ago)

Author:

scheusso

Message:

a spaceship removes its hud point now when it's being destructed …

Location:

code/branches/network/src

Files:

• network/Server.cc (modified) (6 diffs)
• network/Server.h (modified) (1 diff)
• orxonox/hud/HUD.cc (modified) (1 diff)
• orxonox/objects/SpaceShip.cc (modified) (1 diff)

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

@@ -58 +58 @@
   
 #define MAX_FAILURES 20;
-  
+#define NETWORK_FREQUENCY 30
   
   /**
@@ -65 +65 @@
   */
   Server::Server() {
+    timeSinceLastUpdate_=0;
     packet_gen = PacketGenerator();
     clients = new ClientInformation(true);
@@ -72 +73 @@
   
   Server::Server(int port){
+    timeSinceLastUpdate_=0;
     packet_gen = PacketGenerator();
     clients = new ClientInformation(true);
@@ -84 +86 @@
   */
   Server::Server(int port, std::string bindAddress) {
+    timeSinceLastUpdate_=0;
     packet_gen = PacketGenerator();
     clients = new ClientInformation();
@@ -96 +99 @@
   */
   Server::Server(int port, const char *bindAddress) {
+    timeSinceLastUpdate_=0;
     packet_gen = PacketGenerator();
     clients = new ClientInformation();
@@ -157 +161 @@
   void Server::tick(float time) {
     processQueue();
-    gamestates->processGameStates();
-    updateGamestate();
-     usleep(5000); // TODO remove
+    //this steers our network frequency
+    timeSinceLastUpdate_+=time;
+    if(timeSinceLastUpdate_>=(1./NETWORK_FREQUENCY)){
+      timeSinceLastUpdate_-=(1./NETWORK_FREQUENCY);
+      gamestates->processGameStates();
+      updateGamestate();
+    }
+//     usleep(5000); // TODO remove
     return;
   }

code/branches/network/src/network/Server.h

@@ -87 +87 @@
 
     ClientInformation *clients;
+    float timeSinceLastUpdate_;
   };
 

code/branches/network/src/orxonox/hud/HUD.cc

@@ -192 +192 @@
     }
 
-    void HUD::removeRadarObject(SceneNode* node){
+    void HUD::removeRadarObject(Ogre::SceneNode* node){
+      COUT(3) << "blabla" << std::endl;
         for(std::set<RadarObject*>::iterator it=roSet.begin(); it!=roSet.end(); it++){
             if((*it)->getNode() == node) {

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

@@ -143 +143 @@
         if (this->cam_)
           delete this->cam_;
+        if (!Identifier::isCreatingHierarchy() && !myShip_ && &HUD::getSingleton()!=NULL)
+          //remove the radar object
+          HUD::getSingleton().removeRadarObject(this->getNode());
     }