Changeset 6784 in orxonox.OLD for branches/network/src/lib/network/synchronizeable.h
- Timestamp:
- Jan 26, 2006, 8:03:40 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/network/src/lib/network/synchronizeable.h
r6753 r6784 20 20 #define STATE_OUTOFSYNC 2 21 21 #define STATE_REQUESTEDSYNC 4 22 23 enum { 24 NWT_SS_WE_STATE = 1000000, 25 NWT_SS_B, 26 NWT_SS_FLAGS, 27 NWT_SS_MOUSEDIRX, 28 NWT_SS_MOUSEDIRY, 29 NWT_SS_MOUSEDIRZ, 30 NWT_SS_MOUSEDIRW, 31 NWT_SS_PN_SYNC, 32 33 NWT_HS_HOST_ID, 34 NWT_HS_NGM_ID, 35 36 NWT_PN_BO_WRITESTATE, 37 NWT_PN_PARENTMODE, 38 NWT_PN_COORX, 39 NWT_PN_COORY, 40 NWT_PN_COORZ, 41 NWT_PN_ROTX, 42 NWT_PN_ROTY, 43 NWT_PN_ROTZ, 44 NWT_PN_ROTV, 45 46 NWT_PN_FLAGS, 47 NWT_PN_SCOORX, 48 NWT_PN_SCOORY, 49 NWT_PN_SCOORZ, 50 NWT_PN_SROTX, 51 NWT_PN_SROTY, 52 NWT_PN_SROTZ, 53 NWT_PN_SROTV, 54 55 NWT_BO_NAME, 56 57 NWT_WE_PN_WRITESTATE, 58 NWT_WE_PN_MODELFILENAME, 59 NWT_WE_PN_SCALING, 60 61 NWT_GT_WE_STATE, 62 63 NWT_SB_WE_STATE, 64 NWT_SB_SIZE, 65 NWT_SB_TEXTURENAME, 66 67 NWT_TER_WE_STATE, 68 69 NWT_PU_WE_STATE, 70 71 NWT_TPU_WE_STATE, 72 73 NWT_LPU_WE_STATE, 74 75 NWT_WPU_WE_STATE, 76 77 NWT_PPU_WE_STATE, 78 NWT_PPU_TYPE, 79 NWT_PPU_VALUE, 80 NWT_PPU_MINVALUE, 81 NWT_PPU_MAXVALUE, 82 83 NWT_WAT_STATE, 84 NWT_WAT_WE_STATE, 85 NWT_WAT_SIZEX, 86 NWT_WAT_SIZEY, 87 NWT_WAT_RESX, 88 NWT_WAT_RESY, 89 NWT_WAT_HEIGHT 90 }; 22 91 23 92 … … 58 127 * 59 128 */ 129 #define SYNCHELP_WRITE_DEBUG(n) {\ 130 __synchelp_write_n = Converter::intToByteArray( n, data+__synchelp_write_i, maxLength-__synchelp_write_i ); \ 131 assert( __synchelp_write_n == INTSIZE ); \ 132 __synchelp_write_i += __synchelp_write_n; \ 133 } 134 135 #define SYNCHELP_READ_DEBUG(n) { \ 136 int nn; \ 137 __synchelp_read_n = Converter::byteArrayToInt( data+__synchelp_read_i, &nn ); \ 138 assert( __synchelp_read_n == INTSIZE ); \ 139 if ( n != nn ) { \ 140 PRINTF(1)("Check your code! read/writes not in right order! read %d instead of %d\n", nn, n); \ 141 assert( false ); \ 142 } \ 143 __synchelp_read_i += __synchelp_read_n; \ 144 } 145 60 146 #define SYNCHELP_WRITE_BEGIN() int __synchelp_write_i = 0; \ 61 147 int __synchelp_write_n 62 #define SYNCHELP_WRITE_INT(i) { __synchelp_write_n = \ 148 #define SYNCHELP_WRITE_INT(i,n) { SYNCHELP_WRITE_DEBUG(n); \ 149 __synchelp_write_n = \ 63 150 Converter::intToByteArray( i, data+__synchelp_write_i, maxLength-__synchelp_write_i ); \ 64 151 assert( __synchelp_write_n == INTSIZE ); \ … … 70 157 __synchelp_write_i += __synchelp_write_n; \ 71 158 } 72 #define SYNCHELP_WRITE_FLOAT(f) { __synchelp_write_n = \ 159 #define SYNCHELP_WRITE_FLOAT(f,n) { SYNCHELP_WRITE_DEBUG(n); \ 160 __synchelp_write_n = \ 73 161 Converter::floatToByteArray( f, data+__synchelp_write_i, maxLength-__synchelp_write_i ); \ 74 162 assert( __synchelp_write_n == FLOATSIZE ); \ … … 80 168 __synchelp_write_i += __synchelp_write_n; \ 81 169 } 82 #define SYNCHELP_WRITE_BYTE(b) { \ 170 #define SYNCHELP_WRITE_BYTE(b,n) { SYNCHELP_WRITE_DEBUG(n); \ 171 \ 83 172 if (maxLength - __synchelp_write_i < 1) \ 84 173 { \ … … 89 178 __synchelp_write_i++; \ 90 179 } 91 #define SYNCHELP_WRITE_STRING(s) { if (s!=NULL) {\ 180 #define SYNCHELP_WRITE_STRING(s,n) { SYNCHELP_WRITE_DEBUG(n); \ 181 if (s!=NULL) {\ 92 182 __synchelp_write_n = \ 93 183 Converter::stringToByteArray( s, data+__synchelp_write_i, strlen(s), maxLength-__synchelp_write_i ); \ … … 105 195 } 106 196 #define SYNCHELP_WRITE_N __synchelp_write_i 107 #define SYNCHELP_WRITE_FKT(f ) { \197 #define SYNCHELP_WRITE_FKT(f,n) { \ 108 198 __synchelp_write_i += \ 109 199 f( data+__synchelp_write_i, maxLength-__synchelp_write_i ); \ … … 114 204 int __synchelp_read_n 115 205 116 #define SYNCHELP_READ_INT(i ) {\206 #define SYNCHELP_READ_INT(i,n) { SYNCHELP_READ_DEBUG(n); \ 117 207 if ( length-__synchelp_read_i < INTSIZE ) \ 118 208 { \ … … 124 214 __synchelp_read_i += __synchelp_read_n; \ 125 215 } 126 #define SYNCHELP_READ_FLOAT(f ) {\216 #define SYNCHELP_READ_FLOAT(f,n) { SYNCHELP_READ_DEBUG(n); \ 127 217 if ( length-__synchelp_read_i < FLOATSIZE ) \ 128 218 { \ … … 134 224 __synchelp_read_i += __synchelp_read_n; \ 135 225 } 136 #define SYNCHELP_READ_STRING(s,l ) {\226 #define SYNCHELP_READ_STRING(s,l,n) {SYNCHELP_READ_DEBUG(n); \ 137 227 __synchelp_read_n = Converter::byteArrayToString( data+__synchelp_read_i, s, l ); \ 138 228 assert( __synchelp_read_n == strlen(s)+INTSIZE ) ;\ … … 144 234 __synchelp_read_i += __synchelp_read_n; \ 145 235 } 146 #define SYNCHELP_READ_STRINGM(s ) {\236 #define SYNCHELP_READ_STRINGM(s,n) { SYNCHELP_READ_DEBUG(n); \ 147 237 __synchelp_read_n = Converter::byteArrayToStringM( data+__synchelp_read_i, s ); \ 148 238 assert( __synchelp_read_n == strlen(s)+INTSIZE ) ;\ … … 154 244 __synchelp_read_i += __synchelp_read_n; \ 155 245 } 156 #define SYNCHELP_READ_BYTE(b ) {\246 #define SYNCHELP_READ_BYTE(b,n) { SYNCHELP_READ_DEBUG(n); \ 157 247 if ( length-__synchelp_read_i < 1 ) \ 158 248 { \ … … 163 253 __synchelp_read_i ++; \ 164 254 } 165 #define SYNCHELP_READ_FKT(f ) {\255 #define SYNCHELP_READ_FKT(f,n) { SYNCHELP_READ_DEBUG(n); \ 166 256 __synchelp_read_i += \ 167 257 f( data+__synchelp_read_i, length-__synchelp_read_i, sender); \ 168 258 } 259 #define SYNCHELP_READ_REMAINING() ( length-__synchelp_read_i ) 260 #define SYNCHELP_READ_NEXTBYTE() ( data[__synchelp_read_i] ) 169 261 #define SYNCHELP_READ_N __synchelp_read_i 170 262
Note: See TracChangeset
for help on using the changeset viewer.