Changeset 7284 for code/trunk/src/libraries/network/synchronisable

Timestamp:

Aug 31, 2010, 3:37:40 AM (14 years ago)

Author:

landauf

Message:

merged consolecommands3 branch back to trunk.

note: the console command interface has changed completely, but the documentation is not yet up to date. just copy an existing command and change it to your needs, it's pretty self-explanatory. also the include files related to console commands are now located in core/command/. in the game it should work exactly like before, except for some changes in the auto-completion.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/network/synchronisable/Serialise.h (modified) (12 diffs)

code/trunk/src/libraries/network/synchronisable/Serialise.h

@@ -42 +42 @@
 #include "core/CorePrereqs.h"
 #include "core/CoreIncludes.h"
-#include "core/SmartPtr.h"
+#include "core/BaseObject.h" // remove this if circular dependencies in BaseObject/SmartPtr are fixed
+//#include "core/SmartPtr.h"
 
 namespace orxonox{
-    
+
     // These functions implement loading / saving / etc. for pointer types
-    
+
     /** @brief returns the size of the objectID needed to synchronise the pointer */
     template <class T> inline uint32_t returnSize( T*& variable )
@@ -53 +54 @@
       return sizeof(uint32_t);
     }
-    
+
     /** @brief reads the objectID of a pointer out of the bytestream and increases the mem pointer */
     template <class T> inline void loadAndIncrease( T*& variable, uint8_t*& mem )
@@ -60 +61 @@
         mem += returnSize( variable );
     }
-    
+
     /** @brief saves the objectID of a pointer into the bytestream and increases the mem pointer */
     template <class T> inline void saveAndIncrease( T*& variable, uint8_t*& mem )
@@ -70 +71 @@
         mem += returnSize( variable );
     }
-    
+
     /** @brief checks whether the objectID of the variable is the same as in the bytestream */
     template <class T> inline  bool checkEquality( T*& variable, uint8_t* mem )
@@ -79 +80 @@
             return variable == variable->getSynchronisable(*(uint32_t*)(mem));
     }
-    
+
     // These functions implement loading / saving / etc. for SmartPtr<T>
-    
+
     /** @brief returns the size of the objectID needed to synchronise the pointer */
     template <class T> inline uint32_t returnSize( const SmartPtr<T>& variable )
@@ -87 +88 @@
         return sizeof(uint32_t);
     }
-    
+
     /** @brief reads the objectID of a pointer out of the bytestream and increases the mem pointer */
     template <class T> inline void loadAndIncrease( const SmartPtr<T>& variable, uint8_t*& mem )
@@ -95 +96 @@
         mem += returnSize( variable );
     }
-    
+
     /** @brief saves the objectID of a pointer into the bytestream and increases the mem pointer */
     template <class T> inline void saveAndIncrease( const SmartPtr<T>& variable, uint8_t*& mem )
@@ -105 +106 @@
         mem += returnSize( variable );
     }
-    
+
     /** @brief checks whether the objectID of the variable is the same as in the bytestream */
     template <class T> inline  bool checkEquality( const SmartPtr<T>& variable, uint8_t* mem )
@@ -114 +115 @@
             return *(uint32_t*)(mem) == OBJECTID_UNKNOWN;
     }
-    
+
     // These functions implement loading / saving / etc. for WeakPtr<T>
-    
+
     /** @brief returns the size of the objectID needed to synchronise the pointer */
     template <class T> inline uint32_t returnSize( const WeakPtr<T>& variable )
@@ -122 +123 @@
         return sizeof(uint32_t);
     }
-    
+
     /** @brief reads the objectID of a pointer out of the bytestream and increases the mem pointer */
     template <class T> inline void loadAndIncrease( const WeakPtr<T>& variable, uint8_t*& mem )
@@ -130 +131 @@
         mem += returnSize( variable );
     }
-    
+
     /** @brief saves the objectID of a pointer into the bytestream and increases the mem pointer */
     template <class T> inline void saveAndIncrease( const WeakPtr<T>& variable, uint8_t*& mem )
@@ -140 +141 @@
         mem += returnSize( variable );
     }
-    
+
     /** @brief checks whether the objectID of the variable is the same as in the bytestream */
     template <class T> inline  bool checkEquality( const WeakPtr<T>& variable, uint8_t* mem )