Changeset 605

Timestamp:

Dec 17, 2007, 10:56:01 PM (17 years ago)

Author:

scheusso

Message:

added gamestatesending

Location:

code/branches/FICN/src

Files:

• network/ClientConnection.cc (modified) (2 diffs)
• network/ClientConnection.h (modified) (1 diff)
• network/NetworkFrameListener.h (modified) (1 diff)
• network/Server.cc (modified) (1 diff)
• orxonox/orxonox.cc (modified) (1 diff)

code/branches/FICN/src/network/ClientConnection.cc

@@ -147 +147 @@
     //main loop
     while(!quit){
+      //std::cout << "connection loop" << std::endl;
       if(enet_host_service(client, &event, NETWORK_WAIT_TIMEOUT)<0){
         // we should never reach this point
@@ -212 +213 @@
 
   bool ClientConnection::processData(ENetEvent *event){
+    std::cout << "got packet, pushing to queue" << std::endl;
     // just add packet to the buffer
     // this can be extended with some preprocessing

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

@@ -28 +28 @@
 #define NETWORK_PORT 55556
 #define NETWORK_CLIENT_MAX_CONNECTIONS 5
-#define NETWORK_WAIT_TIMEOUT 5000
+#define NETWORK_WAIT_TIMEOUT 5
 #define NETWORK_SEND_WAIT 5
 #define NETWORK_CLIENT_CHANNELS 2

code/branches/FICN/src/network/NetworkFrameListener.h

@@ -36 +36 @@
 private:
   bool frameStarted(const Ogre::FrameEvent &evt){
-    std::cout << "framelistener" << std::endl;
+    //std::cout << "framelistener" << std::endl;
     client_g->tick(evt.timeSinceLastFrame);
     return FrameListener::frameStarted(evt);

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

@@ -134 +134 @@
    */
   bool Server::sendGameState(){
+    for(ClientInformation *temp = clients; temp!=0; temp=temp->next()){
+      connection->addPacket(packet_gen.gstate(&(gamestates->popGameState(temp->getID()))),temp->getID());
+    }
     return true;
   }

code/branches/FICN/src/orxonox/orxonox.cc

@@ -162 +162 @@
         //if(mKeyboard->isKeyDown(OIS::KC_ESCAPE))
           //cout << "maximal MouseX: " << maxMouseX << "\tminMouseX: " << minMouseX << endl;
-        if(mode_==PRESENTATION){
+        if(mode_==PRESENTATION)
           server_g->tick(evt.timeSinceLastFrame);
-          std::cout << "tick server" << std::endl;
-        }
+        else if(mode_==CLIENT)
+          client_g->tick(evt.timeSinceLastFrame);
         usleep(10);
         return !mKeyboard->isKeyDown(OIS::KC_ESCAPE);