Changeset 601

Timestamp:

Dec 17, 2007, 10:31:38 PM (16 years ago)

Author:

dumenim

Message:

blub

Location:

code/branches/FICN/src

Files:

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

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

@@ -181 +181 @@
     ENetPacket *packet;
     // stop if the packet queue is empty
-    while(!client_connection.queueEmpty()){
+    while(!(client_connection.queueEmpty())){
       packet = client_connection.getPacket();
       elaborate(packet, 0); // ================= i guess we got to change this .... (client_ID is always same = server)

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

@@ -17 +17 @@
 #include "Server.h"
 #include "Client.h"
+//#include <iostream>
 // #include "orxonox/orxonox.cc"
 network::Server *server_g;
@@ -35 +36 @@
 private:
   bool frameStarted(const Ogre::FrameEvent &evt){
+    std::cout << "framelistener" << std::endl;
     client_g->tick(evt.timeSinceLastFrame);
     return FrameListener::frameStarted(evt);

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

@@ -86 +86 @@
   bool Server::sendMSG(const char *msg){
     ENetPacket *packet = packet_gen.chatMessage(msg);
-    //std::cout <<"adding packets" << std::endl;
+    std::cout <<"adding PPPPPackets" << std::endl;
     connection->addPacketAll(packet);
     //std::cout <<"added packets" << std::endl;
-    return connection->sendPackets();
+    if (connection->sendPackets()){
+        std::cout << "SSSSSucessfully" << std::endl;
+        return true;
+    }
+    return false;
   }
   

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

@@ -34 +34 @@
           std::getline( std::cin, str );
           client.sendChat( str );
-          std::cout << "send message" << std::endl;
+          std::cout << "sent message" << std::endl;
   }
 
@@ -42 +42 @@
 
 void listener(){
-
+        
   const int PORT = 55556;
   std::cout << "Enter address of the server xxx.xxx.xxx.xxx (enter for localhost)" << std::endl;

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

@@ -87 +87 @@
   {
     public:
-      OrxListener(OIS::Keyboard *keyboard, OIS::Mouse *mouse, audio::AudioManager*  auMan, SpaceshipSteering* steering)
+      OrxListener(OIS::Keyboard *keyboard, OIS::Mouse *mouse, audio::AudioManager*  auMan, SpaceshipSteering* steering, gameMode mode)
       : mKeyboard(keyboard), mMouse(mouse)
       {
 
 
-
+        mode_=mode;
         speed = 250;
         loop = 100;
@@ -162 +162 @@
         //if(mKeyboard->isKeyDown(OIS::KC_ESCAPE))
           //cout << "maximal MouseX: " << maxMouseX << "\tminMouseX: " << minMouseX << endl;
+        if(mode_==SERVER)
+          server_g->tick(evt.timeSinceLastFrame);
         usleep(10);
         return !mKeyboard->isKeyDown(OIS::KC_ESCAPE);
@@ -181 +183 @@
 
     private:
+      gameMode mode_;
       float speed;
       float rotate;
@@ -276 +279 @@
     switch(mode_){
     case PRESENTATION:
+      //ogre_->getRoot()->addFrameListener(new network::ServerFrameListener());
+      //std::cout << "could not add framelistener" << std::endl;
       server_g->open();
       break;
@@ -369 +374 @@
     if(!ogre_->load()) die(/* unable to load */);
     // add network framelistener
-    ogre_->getRoot()->addFrameListener(new network::ServerFrameListener());
   }
 
@@ -536 +540 @@
 
     //if(mode_!=CLIENT) // just a hack ------- remove this in future
-      frameListener_ = new OrxListener(keyboard_, mouse_, auMan_, steering_);
+      frameListener_ = new OrxListener(keyboard_, mouse_, auMan_, steering_, mode_);
     ogre_->getRoot()->addFrameListener(frameListener_);
   }