Changeset 5822 in orxonox.OLD for trunk/src/defs

Timestamp:

Nov 29, 2005, 2:22:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/network to the trunk
merged with command:
svn merge -r 5505:HEAD branches/network trunk

conflicts resolved in favor of the trunk (as always
also fixed a typo in the #include "SDL_tread.h"

Location:

trunk/src/defs

Files:

• class_id.h (modified) (4 diffs)
• debug.h (modified) (1 diff)
• include_paths.am (modified) (1 diff)

trunk/src/defs/class_id.h

@@ -57 +57 @@
   // superclasses
   CL_MASK_SUPER_CLASS           =    0xff000000,
-  CL_BASE_OBJECT                =    0x01000000,
-
-  CL_PARENT_NODE                =    0x02000000,
-  CL_WORLD_ENTITY               =    0x04000000,
-
-  CL_STORY_ENTITY               =    0x08000000,
-
-  CL_PHYSICS_INTERFACE          =    0x10000000,
-
-  CL_EVENT_LISTENER             =    0x20000000,
-
-  CL_ELEMENT_2D                 =    0x40000000,
+  CL_BASE_OBJECT                =    0xff000000,
+
+  CL_PARENT_NODE                =    0x01000000,
+
+  CL_STORY_ENTITY               =    0x02000000,
+
+  CL_PHYSICS_INTERFACE          =    0x04000000,
+
+  CL_EVENT_LISTENER             =    0x08000000,
+
+  CL_ELEMENT_2D                 =    0x10000000,
+
+  CL_SYNCHRONIZEABLE             =    0x20000000,
+
+  CL_WORLD_ENTITY               =    0x40000000,
+
 
   // subsuper-classes
@@ -113 +117 @@
   CL_GLGUI_HANDLER              =    0x00000f40,
   CL_GLGUI_MAIN_WIDGET          =    0x00000f41,
+  CL_NETWORK_MANAGER            =    0x00000f50,
+
 
   // StoryEntities (range from 0x00000100 to 0x000001ff)
@@ -202 +208 @@
 
 
-  // misc: (range from 0x00000b00 to 0x00000cff)
-  CL_ANIMATION                  =    0x00000b01,
+  // network stuff (range from 0x00000b00 to 0x00000bff)
+  CL_DATA_STREAM                =    0x00b01000,
+  CL_NETWORK_STREAM             =    0x00000b01,
+  CL_NETWORK_PROTOCOL           =    0x00000b02,
+  CL_NETWORK_SOCKET             =    0x00000b03,
+  CL_CONNECTION_MONITOR         =    0x00000b04,
+
+
+
+  // misc: (range from 0x00000d00 to 0x00000eff)
+  CL_ANIMATION                  =    0x00000d01,
   //  CL_ANIMATION3D                =    0x00000b02,
   CL_QUICK_ANIMATION            =    0x00000b02,
@@ -226 +241 @@
 
   // Spatial Data Separation
-  CL_SPATIAL_SEPARATION         =    0x00000b0d,
-  CL_QUADTREE                   =    0x00000b0e,
-  CL_QUADTREE_NODE              =    0x00000b0f
+  CL_SPATIAL_SEPARATION         =    0x00000d0d,
+  CL_QUADTREE                   =    0x00000d0e,
+  CL_QUADTREE_NODE              =    0x00000d0f
 };
 

trunk/src/defs/debug.h

@@ -106 +106 @@
 #define PRINTF(x)        PRINT(x)
 #endif
+#ifndef NO_SHELL
 #define PRINT_EXEC       ShellBuffer::addBufferLineStatic
+#else /* NO_SHELL */
+#define PRINT_EXEC       printf
+#endif
 
 #ifndef PRINTF

trunk/src/defs/include_paths.am

@@ -19 +19 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/network
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/tinyxml
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics