Changeset 459 for code/branches/FICN/src/network

Timestamp:

Dec 12, 2007, 12:35:52 AM (17 years ago)

Author:

scheusso

Message:

preparing clone mode for game (one server steers, all clients view )

Location:

code/branches/FICN/src/network

Files:

• Client.cc (modified) (1 diff)
• Client.h (modified) (3 diffs)
• Server.cc (modified) (1 diff)
• Server.h (modified) (3 diffs)
• Synchronisable.h (modified) (2 diffs)
• dummyclient3.cc (modified) (2 diffs)

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

@@ -151 +151 @@
    * Performs a GameState update
    */
-  void Client::update(){
+  void Client::tick(float time){
     ENetPacket *packet;
     // stop if the packet queue is empty

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

@@ -20 +20 @@
 #include "GameStateClient.h"
 #include "orxonox/core/IdentifierIncludes.h"
+//#include "NetworkFrameListener.h"
 
 
 namespace network{
 
+
+  
 /**
+  network::Client *client;
  * The network/Client class
  * This class implements all necessary function for the network communication
@@ -48 +52 @@
   bool sendPackets();
   
-  void update();
+  void tick(float time);
 
   private:
@@ -62 +66 @@
 };
 
+
 }
 

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

@@ -95 +95 @@
    * Run this function once every tick
    * calls processQueue and updateGamestate
+   * @param time time since last tick
    */
-  void Server::tick(){
+  void Server::tick(float time){
     processQueue();
     updateGamestate();

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

@@ -21 +21 @@
 #include "enet/enet.h"
 #include "ClientInformation.h"
+//#include "NetworkFrameListener.h"
+
 
 namespace network{
 
+  
   /**
    * This class is the root class of the network module for a server.
@@ -37 +40 @@
     bool sendMSG(std::string msg);
     bool sendMSG(const char *msg);
-    void tick();
+    void tick(float time);
     protected:
     void processQueue();
@@ -49 +52 @@
     ClientInformation *clients;
   };
-
-
+ 
 
 

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

@@ -17 +17 @@
 
 #include "orxonox/core/IdentifierIncludes.h"
+#include "orxonox/core/OrxonoxClass.h"
 
 namespace network {
@@ -39 +40 @@
  * @author Oliver Scheuss
 */
-class Synchronisable{
+class Synchronisable : public orxonox::OrxonoxClass{
 public:
   Synchronisable();

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

@@ -23 +23 @@
 
   while (true) {
-          client.update();
+          client.tick(0);
           std::cout << "your message: ";
           std::getline( std::cin, str );
@@ -50 +50 @@
 
   while (true) {
-          client.update();
+          client.tick(0);
           usleep(100);
   }