Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5822 in orxonox.OLD for trunk/src


Ignore:
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
Files:
2 deleted
7 edited
26 copied

Legend:

Unmodified
Added
Removed

  • trunk/src/defs/class_id.h

    r5819 r5822  
    5757  // superclasses
    5858  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
    7175
    7276  // subsuper-classes
    … …  
    113117  CL_GLGUI_HANDLER              =    0x00000f40,
    114118  CL_GLGUI_MAIN_WIDGET          =    0x00000f41,
     119  CL_NETWORK_MANAGER            =    0x00000f50,
     120
    115121
    116122  // StoryEntities (range from 0x00000100 to 0x000001ff)
    … …  
    202208
    203209
    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,
    206221  //  CL_ANIMATION3D                =    0x00000b02,
    207222  CL_QUICK_ANIMATION            =    0x00000b02,
    … …  
    226241
    227242  // Spatial Data Separation
    228   CL_SPATIAL_SEPARATION         =    0x00000b0d,
    229   CL_QUADTREE                   =    0x00000b0e,
    230   CL_QUADTREE_NODE              =    0x00000b0f
     243  CL_SPATIAL_SEPARATION         =    0x00000d0d,
     244  CL_QUADTREE                   =    0x00000d0e,
     245  CL_QUADTREE_NODE              =    0x00000d0f
    231246};
    232247

  • trunk/src/defs/debug.h

    r5476 r5822  
    106106#define PRINTF(x)        PRINT(x)
    107107#endif
     108#ifndef NO_SHELL
    108109#define PRINT_EXEC       ShellBuffer::addBufferLineStatic
     110#else /* NO_SHELL */
     111#define PRINT_EXEC       printf
     112#endif
    109113
    110114#ifndef PRINTF

  • trunk/src/defs/include_paths.am

    r5556 r5822  
    1919AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
    2020AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
     21AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/network
    2122AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/tinyxml
    2223AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics

  • trunk/src/lib/Makefile.am

    r5691 r5822  
    1313                            particles/libORXparticles.a \
    1414                            collision_detection/libORXcd.a \
     15                            network/libORXnet.a \
    1516                            graphics/spatial_separation/libORXquadtree.a \
    1617                            tinyxml/libtinyxml.a \
    … …  
    2627                            particles/libORXparticles.a \
    2728                            collision_detection/libORXcd.a \
     29                            network/libORXnet.a \
    2830                            graphics/spatial_separation/libORXquadtree.a \
    2931                            tinyxml/libtinyxml.a \
    … …  
    7274          particles \
    7375          collision_detection \
     76          network \
    7477          tinyxml \
    7578          shell \

  • trunk/src/lib/lang/class_list.cc

    r5793 r5822  
    2828using namespace std;
    2929
     30#ifndef NO_SHELL_COMMAND
    3031SHELL_COMMAND_STATIC(debug, ClassList, ClassList::debugS)
    3132    ->describe("Shows all registered classes, if param1: is a valid ClassName only values of this class are shown. param2: how much output")
    3233    ->defaultValues(2, NULL, 1);
     34#endif
    3335
    3436/**

  • trunk/src/lib/network/Makefile.in

    r5821 r5822  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXnet_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/network/network_manager.cc

    r5821 r5822  
    2222
    2323#include "network_stream.h"
    24 #include "list.h"
    2524#include "class_list.h"
    2625
    … …  
    162161  if (this->netStreamList != NULL || (this->netStreamList = ClassList::getList(CL_NETWORK_STREAM)) != NULL)
    163162  {
    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();
    172166  }
    173167
    174168}
    175 
    176 

  • trunk/src/lib/network/network_manager.h

    r5821 r5822  
    4141
    4242private:
    43   tList<BaseObject>*    netStreamList;            // list with refs to all network streams
    44   tList<BaseObject>*  syncList;                 // list of synchronizeables
     43  std::list<BaseObject*>*    netStreamList;            // list with refs to all network streams
     44  std::list<BaseObject*>*    syncList;                 // list of synchronizeables
    4545
    4646};

  • trunk/src/lib/network/network_socket.h

    r5821 r5822  
    2323
    2424#ifdef HAVE_SDL_H
    25 #include <SDL_Thread.h>
     25 #include <SDL_thread.h>
    2626#else
    27 #include <SDL/SDL_thread.h>
     27 #include <SDL/SDL_thread.h>
    2828#endif
    2929/* include this file, it contains some default definitions */

  • trunk/src/orxonox.cc

    r5819 r5822  
    379379    {
    380380      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();
    382382      else if(!strcmp( "--gui", argv[i]) || !strcmp("-g", argv[i])) showGui = true;
    383383      //      else PRINTF(2)("Orxonox does not understand the arguments %s\n", argv[i]);

  • trunk/src/subprojects/Makefile.am

    r4909 r5822  
    22          particles \
    33          collision_detection \
     4          network \
    45          testmain
    56

  • trunk/src/subprojects/network/Makefile.in

    r5821 r5822  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(network_SOURCES)
    1917
    2018srcdir = @srcdir@
    … …  
    4341bin_PROGRAMS = network$(EXEEXT)
    4442subdir = src/subprojects/network
    45 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
     43DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
    4644        $(srcdir)/Makefile.in
    4745ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Note: See TracChangeset for help on using the changeset viewer.