- Timestamp:
- Nov 29, 2005, 2:22:37 PM (19 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 9 edited
- 27 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/config.h.in
r5463 r5822 65 65 #undef HAVE_SDL_IMAGE_H 66 66 67 /* Define to 1 if you have the <SDL_net.h> header file. */ 68 #undef HAVE_SDL_NET_H 69 67 70 /* Define to 1 if you have the <SDL/SDL.h> header file. */ 68 71 #undef HAVE_SDL_SDL_H … … 70 73 /* Define to 1 if you have the <SDL/SDL_image.h> header file. */ 71 74 #undef HAVE_SDL_SDL_IMAGE_H 75 76 /* Define to 1 if you have the <SDL/SDL_net.h> header file. */ 77 #undef HAVE_SDL_SDL_NET_H 72 78 73 79 /* Define to 1 if you have the <SDL/SDL_ttf.h> header file. */ -
trunk/configure.ac
r5750 r5822 585 585 echo "------------------" 586 586 echo "SDL_image library not found." 587 echo "please install the SDL_image library, which can be found at http://www.l 587 echo "please install the SDL_image library, which can be found at http://www.libsdl.org/projects/SDL_image/" 588 588 echo "------------------" 589 589 exit -1 590 590 fi 591 592 #---------# 593 # SDL_Net # 594 #---------# 595 # checking for SDL_net-headers 596 AC_CHECK_HEADERS([SDL_net.h] ,, 597 [AC_CHECK_HEADERS([SDL/SDL_net.h],, AC_MSG_ERROR([SDL_net header not found.]))]) 598 # checking for SDL_net-lib 599 AC_CHECK_LIB([SDL_net], [main], [FOUND_SDL_net=yes; LIBS="$LIBS -lSDL_net"]) 600 if test x$FOUND_SDL_net != xyes ; then 601 echo "------------------" 602 echo "SDL_net library not found." 603 echo "please install the SDL_net library, which can be found at http://www.libsdl.org/projects/SDL_net/" 604 echo "------------------" 605 exit -1 606 fi 607 591 608 592 609 #-----# … … 722 739 src/lib/particles/Makefile 723 740 src/lib/collision_detection/Makefile 741 src/lib/network/Makefile 724 742 src/lib/shell/Makefile 725 743 src/lib/gui/Makefile … … 733 751 src/subprojects/particles/Makefile 734 752 src/subprojects/collision_detection/Makefile 753 src/subprojects/network/Makefile 735 754 ]) 736 755 -
trunk/src/defs/class_id.h
r5819 r5822 57 57 // superclasses 58 58 CL_MASK_SUPER_CLASS = 0xff000000, 59 CL_BASE_OBJECT = 0x01000000, 60 61 CL_PARENT_NODE = 0x02000000, 62 CL_WORLD_ENTITY = 0x04000000, 63 64 CL_STORY_ENTITY = 0x08000000, 65 66 CL_PHYSICS_INTERFACE = 0x10000000, 67 68 CL_EVENT_LISTENER = 0x20000000, 69 70 CL_ELEMENT_2D = 0x40000000, 59 CL_BASE_OBJECT = 0xff000000, 60 61 CL_PARENT_NODE = 0x01000000, 62 63 CL_STORY_ENTITY = 0x02000000, 64 65 CL_PHYSICS_INTERFACE = 0x04000000, 66 67 CL_EVENT_LISTENER = 0x08000000, 68 69 CL_ELEMENT_2D = 0x10000000, 70 71 CL_SYNCHRONIZEABLE = 0x20000000, 72 73 CL_WORLD_ENTITY = 0x40000000, 74 71 75 72 76 // subsuper-classes … … 113 117 CL_GLGUI_HANDLER = 0x00000f40, 114 118 CL_GLGUI_MAIN_WIDGET = 0x00000f41, 119 CL_NETWORK_MANAGER = 0x00000f50, 120 115 121 116 122 // StoryEntities (range from 0x00000100 to 0x000001ff) … … 202 208 203 209 204 // misc: (range from 0x00000b00 to 0x00000cff) 205 CL_ANIMATION = 0x00000b01, 210 // network stuff (range from 0x00000b00 to 0x00000bff) 211 CL_DATA_STREAM = 0x00b01000, 212 CL_NETWORK_STREAM = 0x00000b01, 213 CL_NETWORK_PROTOCOL = 0x00000b02, 214 CL_NETWORK_SOCKET = 0x00000b03, 215 CL_CONNECTION_MONITOR = 0x00000b04, 216 217 218 219 // misc: (range from 0x00000d00 to 0x00000eff) 220 CL_ANIMATION = 0x00000d01, 206 221 // CL_ANIMATION3D = 0x00000b02, 207 222 CL_QUICK_ANIMATION = 0x00000b02, … … 226 241 227 242 // Spatial Data Separation 228 CL_SPATIAL_SEPARATION = 0x00000 b0d,229 CL_QUADTREE = 0x00000 b0e,230 CL_QUADTREE_NODE = 0x00000 b0f243 CL_SPATIAL_SEPARATION = 0x00000d0d, 244 CL_QUADTREE = 0x00000d0e, 245 CL_QUADTREE_NODE = 0x00000d0f 231 246 }; 232 247 -
trunk/src/defs/debug.h
r5476 r5822 106 106 #define PRINTF(x) PRINT(x) 107 107 #endif 108 #ifndef NO_SHELL 108 109 #define PRINT_EXEC ShellBuffer::addBufferLineStatic 110 #else /* NO_SHELL */ 111 #define PRINT_EXEC printf 112 #endif 109 113 110 114 #ifndef PRINTF -
trunk/src/defs/include_paths.am
r5556 r5822 19 19 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util 20 20 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math 21 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/network 21 22 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/tinyxml 22 23 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics -
trunk/src/lib/Makefile.am
r5691 r5822 13 13 particles/libORXparticles.a \ 14 14 collision_detection/libORXcd.a \ 15 network/libORXnet.a \ 15 16 graphics/spatial_separation/libORXquadtree.a \ 16 17 tinyxml/libtinyxml.a \ … … 26 27 particles/libORXparticles.a \ 27 28 collision_detection/libORXcd.a \ 29 network/libORXnet.a \ 28 30 graphics/spatial_separation/libORXquadtree.a \ 29 31 tinyxml/libtinyxml.a \ … … 72 74 particles \ 73 75 collision_detection \ 76 network \ 74 77 tinyxml \ 75 78 shell \ -
trunk/src/lib/lang/class_list.cc
r5793 r5822 28 28 using namespace std; 29 29 30 #ifndef NO_SHELL_COMMAND 30 31 SHELL_COMMAND_STATIC(debug, ClassList, ClassList::debugS) 31 32 ->describe("Shows all registered classes, if param1: is a valid ClassName only values of this class are shown. param2: how much output") 32 33 ->defaultValues(2, NULL, 1); 34 #endif 33 35 34 36 /** -
trunk/src/lib/network/Makefile.in
r5821 r5822 1 # Makefile.in generated by automake 1.9. 5from Makefile.am.1 # Makefile.in generated by automake 1.9.6 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 15 15 @SET_MAKE@ 16 16 17 18 SOURCES = $(libORXnet_a_SOURCES)19 17 20 18 srcdir = @srcdir@ -
trunk/src/lib/network/network_manager.cc
r5821 r5822 22 22 23 23 #include "network_stream.h" 24 #include "list.h"25 24 #include "class_list.h" 26 25 … … 162 161 if (this->netStreamList != NULL || (this->netStreamList = ClassList::getList(CL_NETWORK_STREAM)) != NULL) 163 162 { 164 tIterator<BaseObject>* iterator = this->netStreamList->getIterator(); 165 NetworkStream* stream = (NetworkStream*)(iterator->firstElement()); 166 while( stream) 167 { 168 stream->processData(); 169 stream = (NetworkStream*)(iterator->nextElement()); 170 } 171 delete iterator; 163 std::list<BaseObject*>::iterator stream; 164 for (stream = this->netStreamList->begin(); stream != this->netStreamList->end(); ++stream) 165 static_cast<NetworkStream*>(*stream)->processData(); 172 166 } 173 167 174 168 } 175 176 -
trunk/src/lib/network/network_manager.h
r5821 r5822 41 41 42 42 private: 43 tList<BaseObject>* netStreamList; // list with refs to all network streams44 tList<BaseObject>*syncList; // list of synchronizeables43 std::list<BaseObject*>* netStreamList; // list with refs to all network streams 44 std::list<BaseObject*>* syncList; // list of synchronizeables 45 45 46 46 }; -
trunk/src/lib/network/network_socket.h
r5821 r5822 23 23 24 24 #ifdef HAVE_SDL_H 25 #include <SDL_Thread.h>25 #include <SDL_thread.h> 26 26 #else 27 #include <SDL/SDL_thread.h>27 #include <SDL/SDL_thread.h> 28 28 #endif 29 29 /* include this file, it contains some default definitions */ -
trunk/src/orxonox.cc
r5819 r5822 379 379 { 380 380 if(! strcmp( "--help", argv[i]) || !strcmp("-h", argv[i])) return startHelp(argc, argv); 381 else if(!strcmp( "--benchmark", argv[i]) || !strcmp("-b", argv[i])) return startBenchmarks();381 // else if(!strcmp( "--benchmark", argv[i]) || !strcmp("-b", argv[i])) return startBenchmarks(); 382 382 else if(!strcmp( "--gui", argv[i]) || !strcmp("-g", argv[i])) showGui = true; 383 383 // else PRINTF(2)("Orxonox does not understand the arguments %s\n", argv[i]); -
trunk/src/subprojects/Makefile.am
r4909 r5822 2 2 particles \ 3 3 collision_detection \ 4 network \ 4 5 testmain 5 6 -
trunk/src/subprojects/network/Makefile.in
r5821 r5822 1 # Makefile.in generated by automake 1.9. 5from Makefile.am.1 # Makefile.in generated by automake 1.9.6 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 15 15 @SET_MAKE@ 16 16 17 18 SOURCES = $(network_SOURCES)19 17 20 18 srcdir = @srcdir@ … … 43 41 bin_PROGRAMS = network$(EXEEXT) 44 42 subdir = src/subprojects/network 45 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \43 DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ 46 44 $(srcdir)/Makefile.in 47 45 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Note: See TracChangeset
for help on using the changeset viewer.