Changeset 6695 in orxonox.OLD for trunk/src/lib/network/network_game_manager.h

Timestamp:

Jan 25, 2006, 2:39:53 PM (18 years ago)

Author:

patrick

Message:

merged the network branche to the trunk

File:

• trunk/src/lib/network/network_game_manager.h (modified) (5 diffs)

trunk/src/lib/network/network_game_manager.h

@@ -15 +15 @@
 
 class TiXmlElement;
+class PNode;
 
 /**
  * protocol definition
  *
- *  CREATE_ENTITY:       CLASS_ID, UNIQUE_ID, OWNER
- *  REMOVE_ENTITY:       UNIQUE_ID
+ *  CREATE_ENTITY:       >> CLASS_ID, UNIQUE_ID, OWNER
+ *  REMOVE_ENTITY:       >> UNIQUE_ID
  *
- *  CREATE_ENTITY_LIST:  NUMBER, [CLASS_ID, UNIQUE_ID, OWNER][0..NUMBER]
- *  REMOVE_ENTITY_LIST:  NUMBER, [UNIQUE_ID][0..NUMBER]
+ *  CREATE_ENTITY_LIST:  >> NUMBER, [CLASS_ID, UNIQUE_ID, OWNER][0..NUMBER]
+ *  REMOVE_ENTITY_LIST:  >> NUMBER, [UNIQUE_ID][0..NUMBER]
  *
- *  REQUEST_CREATE:      CLASS_ID
- *  REQUEST_REMOVE:      UNIQUE_ID
+ *  REQUEST_CREATE:      >> CLASS_ID
+ *                       << [Sync Info]
+ *  REQUEST_REMOVE:      >> UNIQUE_ID
+ *                       << [Sync Info]
  *
  *  //REQUEST_CREATE_LIST: NUMBER, [CLASS_ID][0..NUMBER]
@@ -32 +35 @@
  *
  *  REQUEST_ENTITY_LIST: //request the whole world :D
- *  REQUEST_SYNC:        UNIQUE_ID
+ *  REQUEST_SYNC:        >> UNIQUE_ID
+ *                       << [Sync Info]
  *  //REQUEST_SYNC_LIST:   NUMBER, [UNIQUE_ID][0..NUMBER]
  *
- *  YOU_ARE_ENTITY:      UNIQUE_ID
+ *  YOU_ARE_ENTITY:      >> UNIQUE_ID
  *
+ *  REQUEST_PNODE_PATH   >> UNIQUE_ID_START   UNIQUE_ID_STOP
+ *                       << UNIQUE_ID_1   UNIQUE_ID_2   UNIQUE_ID_3 ...   UNIQUE_ID_N
+ *
+ *  SEND_PNODE_PATH      >> UNIQUE_ID_START   UNIQUE_ID_STOP NUMBER [UNIQUE_ID][0..NUMBER]
  */
 
-typedef enum NetworkGameManagerProtocol{
-  CREATE_ENTITY = 0,
-  REMOVE_ENTITY,
-  CREATE_ENTITY_LIST,
-  REMOVE_ENTITY_LIST,
-  REQUEST_CREATE,
-  REQUEST_REMOVE,
-  REQUEST_SYNC,
-  YOU_ARE_ENTITY,
-  REQUEST_ENTITY_LIST
+typedef enum NetworkGameManagerProtocol {
+  NET_CREATE_ENTITY = 0,
+  NET_REMOVE_ENTITY,
+  NET_CREATE_ENTITY_LIST,
+  NET_REMOVE_ENTITY_LIST,
+  NET_REQUEST_CREATE,
+  NET_REQUEST_REMOVE,
+  NET_REQUEST_SYNC,
+  NET_YOU_ARE_ENTITY,
+  NET_REQUEST_ENTITY_LIST,
+  NET_REQUEST_PNODE_PATH,
+  NET_SEND_PNODE_PATH,
+
+  NET_NUMBER
 };
 
@@ -83 +95 @@
     void sendEntityList(int userID);
 
+
   private:
     NetworkGameManager();
 
+
+    /* some network signal handlers */
+    bool handleRequestCreate( int& i, const byte* data, int length, int sender );
+    bool handleRequestRemove( int& i, const byte* data, int length, int sender );
+    bool handleCreateEntity( int& i, const byte* data, int length, int sender );
+    bool handleRemoveEntity( int& i, const byte* data, int length, int sender );
+    bool handleCreateEntityList( int& i, const byte* data, int length, int sender );
+    bool handleRemoveEntityList( int& i, const byte* data, int length, int sender );
+    bool handleYouAreEntity( int& i, const byte* data, int length, int sender );
+    bool handleRequestSync( int& i, const byte* data, int length, int sender );
+    bool handleRequestPNodePath(int& i, const byte* data, int length, int sender);
+    bool handleSendPNodePath(int& i, const byte* data, int length, int sender);
+
+
+    /* some network handlers helper functions */
     void requestCreateEntity(ClassID classID);
     int executeCreateEntity(ClassID classID, int uniqueID = 0, int owner = 0);
+    BaseObject* doCreateEntity(ClassID classID, int uniqueID, int owner);
 
     void requestRemoveEntity(int uniqueID);
     void executeRemoveEntity(int uniqueID);
+    void doRemoveEntity(int uniqueID);
 
     void executeRequestSync( int uniqueID, int user );
+    void doRequestSync(int uniqueID, int userID);
 
-    BaseObject* doCreateEntity(ClassID classID, int uniqueID, int owner);
-    void doRemoveEntity(int uniqueID);
-    void doRequestSync(int uniqueID, int userID);
     void doYouAre( int uniqueID );
+
+    void requestPNodePath(const PNode* node1, const PNode* node2);
+    void executeRequestPNodePath(const PNode* node2, const PNode* node2);
+    void doRequestPNodePath(const PNode* node1, const PNode* node2);
 
     bool canCreateEntity(ClassID classID);
@@ -105 +137 @@
     void resizeBufferVector(int n);
 
-    inline bool writeToClientBuffer( clientBuffer &cb, byte*data, int length );
-    inline bool writeToClientBuffer( clientBuffer &cb, byte b );
-    inline bool writeToClientBuffer( clientBuffer &cb, int i );
-    inline bool readFromClientBuffer( clientBuffer &cb, byte*data, int length );
+    bool writeToClientBuffer( clientBuffer &cb, byte*data, int length );
+    bool writeToClientBuffer( clientBuffer &cb, byte b );
+    bool writeToClientBuffer( clientBuffer &cb, int i );
+    bool readFromClientBuffer( clientBuffer &cb, byte*data, int length );
 
-    //helper functions for writeBytes
-    inline bool handleRequestCreate( int& i, const byte* data, int length, int sender );
-    inline bool handleRequestRemove( int& i, const byte* data, int length, int sender );
-    inline bool handleCreateEntity( int& i, const byte* data, int length, int sender );
-    inline bool handleRemoveEntity( int& i, const byte* data, int length, int sender );
-    inline bool handleCreateEntityList( int& i, const byte* data, int length, int sender );
-    inline bool handleRemoveEntityList( int& i, const byte* data, int length, int sender );
-    inline bool handleYouAreEntity( int& i, const byte* data, int length, int sender );
-    inline bool handleRequestSync( int& i, const byte* data, int length, int sender );
 
   private:
@@ -124 +147 @@
     //clientBuffer                  allOutBuffer;
     static NetworkGameManager*    singletonRef;
-
-    int                           newUniqueID;
     bool                          hasRequestedWorld;
 };