Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5558 in orxonox.OLD for branches/world_entities/src/lib


Ignore:
Timestamp:
Nov 13, 2005, 3:10:49 PM (19 years ago)
Author:
bensch
Message:

orxonox/branches/world_entities: merged the Trunk to the world_entities branche
merged with command
svn merge -r5516:HEAD ../trunk/ world_entities/
no conflicts

Location:
branches/world_entities/src/lib
Files:
19 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/world_entities/src/lib/Makefile.am

    r5463 r5558  
    3939                        util/color.cc \
    4040                        util/helper_functions.cc \
     41                        util/multi_type.cc \
    4142                        math/vector.cc \
    4243                        math/curve.cc
    … …  
    5556                        util/color.h \
    5657                        util/helper_functions.h \
     58                        util/multi_type.h \
    5759                        math/vector.h \
    5860                        math/curve.h

  • branches/world_entities/src/lib/Makefile.in

    r5527 r5558  
    5757        base_object.$(OBJEXT) class_list.$(OBJEXT) \
    5858        ini_parser.$(OBJEXT) substring.$(OBJEXT) color.$(OBJEXT) \
    59         helper_functions.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT)
     59        helper_functions.$(OBJEXT) multi_type.$(OBJEXT) \
     60        vector.$(OBJEXT) curve.$(OBJEXT)
    6061libORXlibs_a_OBJECTS = $(am_libORXlibs_a_OBJECTS)
    6162DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    … …  
    227228                        util/color.cc \
    228229                        util/helper_functions.cc \
     230                        util/multi_type.cc \
    229231                        math/vector.cc \
    230232                        math/curve.cc
    … …  
    243245                        util/color.h \
    244246                        util/helper_functions.h \
     247                        util/multi_type.h \
    245248                        math/vector.h \
    246249                        math/curve.h
    … …  
    270273          esac; \
    271274        done; \
    272         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
     275        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
    273276        cd $(top_srcdir) && \
    274           $(AUTOMAKE) --gnu  src/lib/Makefile
     277          $(AUTOMAKE) --foreign  src/lib/Makefile
    275278.PRECIOUS: Makefile
    276279Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    310313@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper_functions.Po@am__quote@
    311314@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@
     315@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multi_type.Po@am__quote@
    312316@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null_parent.Po@am__quote@
    313317@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/p_node.Po@am__quote@
    … …  
    440444@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    441445@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o helper_functions.obj `if test -f 'util/helper_functions.cc'; then $(CYGPATH_W) 'util/helper_functions.cc'; else $(CYGPATH_W) '$(srcdir)/util/helper_functions.cc'; fi`
     446
     447multi_type.o: util/multi_type.cc
     448@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT multi_type.o -MD -MP -MF "$(DEPDIR)/multi_type.Tpo" -c -o multi_type.o `test -f 'util/multi_type.cc' || echo '$(srcdir)/'`util/multi_type.cc; \
     449@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/multi_type.Tpo" "$(DEPDIR)/multi_type.Po"; else rm -f "$(DEPDIR)/multi_type.Tpo"; exit 1; fi
     450@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/multi_type.cc' object='multi_type.o' libtool=no @AMDEPBACKSLASH@
     451@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     452@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o multi_type.o `test -f 'util/multi_type.cc' || echo '$(srcdir)/'`util/multi_type.cc
     453
     454multi_type.obj: util/multi_type.cc
     455@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT multi_type.obj -MD -MP -MF "$(DEPDIR)/multi_type.Tpo" -c -o multi_type.obj `if test -f 'util/multi_type.cc'; then $(CYGPATH_W) 'util/multi_type.cc'; else $(CYGPATH_W) '$(srcdir)/util/multi_type.cc'; fi`; \
     456@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/multi_type.Tpo" "$(DEPDIR)/multi_type.Po"; else rm -f "$(DEPDIR)/multi_type.Tpo"; exit 1; fi
     457@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/multi_type.cc' object='multi_type.obj' libtool=no @AMDEPBACKSLASH@
     458@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     459@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o multi_type.obj `if test -f 'util/multi_type.cc'; then $(CYGPATH_W) 'util/multi_type.cc'; else $(CYGPATH_W) '$(srcdir)/util/multi_type.cc'; fi`
    442460
    443461vector.o: math/vector.cc

  • branches/world_entities/src/lib/collision_detection/Makefile.in

    r5527 r5558  
    220220          esac; \
    221221        done; \
    222         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/collision_detection/Makefile'; \
     222        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile'; \
    223223        cd $(top_srcdir) && \
    224           $(AUTOMAKE) --gnu  src/lib/collision_detection/Makefile
     224          $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile
    225225.PRECIOUS: Makefile
    226226Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • branches/world_entities/src/lib/event/Makefile.in

    r5527 r5558  
    210210          esac; \
    211211        done; \
    212         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/event/Makefile'; \
     212        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/event/Makefile'; \
    213213        cd $(top_srcdir) && \
    214           $(AUTOMAKE) --gnu  src/lib/event/Makefile
     214          $(AUTOMAKE) --foreign  src/lib/event/Makefile
    215215.PRECIOUS: Makefile
    216216Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • branches/world_entities/src/lib/event/event_def.h

    r5477 r5558  
    3131  EV_VIDEO_RESIZE,
    3232
     33  EV_MAIN_QUIT,
     34
    3335  EV_UNKNOWN,
    3436

  • branches/world_entities/src/lib/event/event_handler.cc

    r5477 r5558  
    308308          ev.resize = event.resize;
    309309          ev.type = EV_VIDEO_RESIZE;
     310          break;
     311        case SDL_QUIT:
     312          ev.type = EV_MAIN_QUIT;
    310313          break;
    311314        default:

  • branches/world_entities/src/lib/graphics/Makefile.in

    r5527 r5558  
    227227          esac; \
    228228        done; \
    229         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
     229        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
    230230        cd $(top_srcdir) && \
    231           $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
     231          $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
    232232.PRECIOUS: Makefile
    233233Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • branches/world_entities/src/lib/graphics/importer/Makefile.in

    r5527 r5558  
    214214          esac; \
    215215        done; \
    216         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
     216        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
    217217        cd $(top_srcdir) && \
    218           $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
     218          $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
    219219.PRECIOUS: Makefile
    220220Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • branches/world_entities/src/lib/graphics/spatial_separation/Makefile.in

    r5527 r5558  
    204204          esac; \
    205205        done; \
    206         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/spatial_separation/Makefile'; \
     206        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/spatial_separation/Makefile'; \
    207207        cd $(top_srcdir) && \
    208           $(AUTOMAKE) --gnu  src/lib/graphics/spatial_separation/Makefile
     208          $(AUTOMAKE) --foreign  src/lib/graphics/spatial_separation/Makefile
    209209.PRECIOUS: Makefile
    210210Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • branches/world_entities/src/lib/gui/Makefile.in

    r5527 r5558  
    183183          esac; \
    184184        done; \
    185         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
     185        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
    186186        cd $(top_srcdir) && \
    187           $(AUTOMAKE) --gnu  src/lib/gui/Makefile
     187          $(AUTOMAKE) --foreign  src/lib/gui/Makefile
    188188.PRECIOUS: Makefile
    189189Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • branches/world_entities/src/lib/gui/gl_gui/Makefile.in

    r5527 r5558  
    230230          esac; \
    231231        done; \
    232         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gl_gui/Makefile'; \
     232        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gl_gui/Makefile'; \
    233233        cd $(top_srcdir) && \
    234           $(AUTOMAKE) --gnu  src/lib/gui/gl_gui/Makefile
     234          $(AUTOMAKE) --foreign  src/lib/gui/gl_gui/Makefile
    235235.PRECIOUS: Makefile
    236236Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • branches/world_entities/src/lib/gui/gtk_gui/Makefile.in

    r5527 r5558  
    232232          esac; \
    233233        done; \
    234         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gtk_gui/Makefile'; \
     234        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gtk_gui/Makefile'; \
    235235        cd $(top_srcdir) && \
    236           $(AUTOMAKE) --gnu  src/lib/gui/gtk_gui/Makefile
     236          $(AUTOMAKE) --foreign  src/lib/gui/gtk_gui/Makefile
    237237.PRECIOUS: Makefile
    238238Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • branches/world_entities/src/lib/particles/Makefile.in

    r5527 r5558  
    207207          esac; \
    208208        done; \
    209         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/particles/Makefile'; \
     209        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/particles/Makefile'; \
    210210        cd $(top_srcdir) && \
    211           $(AUTOMAKE) --gnu  src/lib/particles/Makefile
     211          $(AUTOMAKE) --foreign  src/lib/particles/Makefile
    212212.PRECIOUS: Makefile
    213213Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • branches/world_entities/src/lib/physics/Makefile.in

    r5527 r5558  
    215215          esac; \
    216216        done; \
    217         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/physics/Makefile'; \
     217        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/physics/Makefile'; \
    218218        cd $(top_srcdir) && \
    219           $(AUTOMAKE) --gnu  src/lib/physics/Makefile
     219          $(AUTOMAKE) --foreign  src/lib/physics/Makefile
    220220.PRECIOUS: Makefile
    221221Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • branches/world_entities/src/lib/shell/Makefile.in

    r5527 r5558  
    209209          esac; \
    210210        done; \
    211         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/shell/Makefile'; \
     211        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/shell/Makefile'; \
    212212        cd $(top_srcdir) && \
    213           $(AUTOMAKE) --gnu  src/lib/shell/Makefile
     213          $(AUTOMAKE) --foreign  src/lib/shell/Makefile
    214214.PRECIOUS: Makefile
    215215Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • branches/world_entities/src/lib/shell/shell_command.cc

    r5374 r5558  
    259259tList<ShellCommandAlias>* ShellCommandClass::aliasList = NULL;
    260260
     261
     262
     263
     264
     265
     266
     267
     268
     269
     270////////////////////////
     271// SHELL COMMAND BASE //
     272////////////////////////
    261273/**
    262274 * constructs and registers a new Command
    … …  
    264276 * @param className the name of the class to apply this command to
    265277 * @param paramCount the count of parameters this command takes
    266  * @return self
    267278 */
    268279ShellCommandBase::ShellCommandBase(const char* commandName, const char* className, unsigned int paramCount, ...)
    … …  
    282293  this->paramCount = paramCount;
    283294  this->parameters = new unsigned int[paramCount];
     295  this->defaultValue = new MultiType[paramCount];
    284296
    285297  va_list parameterList;
    286298  va_start(parameterList, paramCount);
    287299
     300  // What Parameters we have got
    288301  for (unsigned int i = 0; i < paramCount; i++)
    289   {
    290302    this->parameters[i] = va_arg(parameterList, int);
    291 
    292     switch (this->parameters[i])
    293     {
    294       case ParameterBool:
    295         this->defaultBools[i] = va_arg(parameterList, int);
    296         break;
    297       case ParameterChar:
    298         this->defaultStrings[i] = new char[2];
    299         sprintf(this->defaultStrings[0], "%c",  va_arg(parameterList, int));
    300         break;
    301       case ParameterString:
    302         this->defaultStrings[i] = va_arg(parameterList, char*);
    303         break;
    304       case ParameterInt:
    305         this->defaultInts[i] = va_arg(parameterList, int);
    306         break;
    307       case ParameterUInt:
    308         this->defaultInts[i] = va_arg(parameterList, unsigned int);
    309         break;
    310       case ParameterFloat:
    311         this->defaultFloats[i] = va_arg(parameterList, double);
    312         break;
    313       case ParameterLong:
    314         this->defaultInts[i] = va_arg(parameterList, long);
    315         break;
    316       default:
    317         break;
    318     }
    319   }
    320303}
    321304
    322305/**
    323306 * deconstructs a ShellCommand
    324  * @return
    325307 */
    326308ShellCommandBase::~ShellCommandBase()
    327309{
    328310  delete[] this->parameters;
     311  delete[] this->defaultValue;
    329312  if (this->alias != NULL && ShellCommandClass::aliasList != NULL)
    330313  {
    … …  
    417400 * @return true on success, false otherwise.
    418401 */
    419 #include  "stdlibincl.h"
    420402bool ShellCommandBase::execute(const char* executionString)
    421403{
    … …  
    598580  for (unsigned int i = 0; i < count; i++)
    599581  {
     582
     583
    600584    switch (this->parameters[i])
    601585    {
    602586      case ParameterBool:
    603         this->defaultBools[i] = va_arg(defaultList, int);
     587        this->defaultValue[i].setInt(va_arg(defaultList, int));
    604588        break;
    605589      case ParameterChar:
    606         this->defaultStrings[i] = new char[2];
    607         sprintf(this->defaultStrings[0], "%c",  va_arg(defaultList, int));
     590        this->defaultValue[i].setChar((char)va_arg(defaultList, int));
    608591        break;
    609592      case ParameterString:
    610         this->defaultStrings[i] = va_arg(defaultList, char*);
     593        this->defaultValue[i].setString(va_arg(defaultList, char*));
    611594        break;
    612595      case ParameterInt:
    613         this->defaultInts[i] = va_arg(defaultList, int);
     596        this->defaultValue[i].setInt(va_arg(defaultList, int));
    614597        break;
    615598      case ParameterUInt:
    616         this->defaultInts[i] = va_arg(defaultList, unsigned int);
     599        this->defaultValue[i].setInt((int)va_arg(defaultList, unsigned int));
    617600        break;
    618601      case ParameterFloat:
    619         this->defaultFloats[i] = va_arg(defaultList, double);
     602        this->defaultValue[i].setFloat(va_arg(defaultList, double));
    620603        break;
    621604      case ParameterLong:
    622         this->defaultInts[i] = va_arg(defaultList, long);
     605        this->defaultValue[i].setInt((int) va_arg(defaultList, long));
    623606        break;
    624607      default:
    … …  
    626609    }
    627610  }
    628 
    629611  return this;
    630612}

  • branches/world_entities/src/lib/shell/shell_command.h

    r5391 r5558  
    1010
    1111#include "helper_functions.h"
     12#include "multi_type.h"
    1213#include "substring.h"
    1314#include "functor_list.h"
    … …  
    133134    unsigned int                     paramCount;                           //!< the count of parameters.
    134135    unsigned int*                    parameters;                           //!< Parameters the function of this Command takes.
    135     char*                            defaultStrings[FUNCTOR_MAX_ARGUMENTS];//!< A list of default Strings stored.
    136     int                              defaultInts[FUNCTOR_MAX_ARGUMENTS];   //!< A list of default Ints stored.
    137     float                            defaultFloats[FUNCTOR_MAX_ARGUMENTS]; //!< A list of default Floats stored.
    138     bool                             defaultBools[FUNCTOR_MAX_ARGUMENTS];  //!< A list of default Bools stored.
    139 
     136    MultiType*                       defaultValue;                         //!< Default Values.
    140137
    141138  private:
    … …  
    153150/////////////////////////////////
    154151//! where to chek for default BOOL values
    155 #define   l_BOOL_DEFGRAB(i)         this->defaultBools[i]
     152#define   l_BOOL_DEFGRAB(i)         this->defaultValue[i].getBool()
    156153//! where to chek for default INT values
    157 #define   l_INT_DEFGRAB(i)          this->defaultInts[i]
     154#define   l_INT_DEFGRAB(i)          this->defaultValue[i].getInt()
    158155//! where to chek for default UINT values
    159 #define   l_UINT_DEFGRAB(i)         (unsigned int)this->defaultInts[i]
     156#define   l_UINT_DEFGRAB(i)         (unsigned int)this->defaultValue[i].getInt()
    160157//! where to chek for default LONG values
    161 #define   l_LONG_DEFGRAB(i)         (long)this->defaultInts[i]
     158#define   l_LONG_DEFGRAB(i)         (long)this->defaultValue[i].getInt()
    162159//! where to chek for default FLOAT values
    163 #define   l_FLOAT_DEFGRAB(i)        this->defaultFloats[i]
     160#define   l_FLOAT_DEFGRAB(i)        this->defaultValue[i].getFloat()
    164161//! where to chek for default STRING values
    165 #define   l_STRING_DEFGRAB(i)       this->defaultStrings[i]
     162#define   l_STRING_DEFGRAB(i)       this->defaultValue[i].getString()
    166163
    167164//////////////////////////
    … …  
    183180//! registers a command with 1 parameter
    184181#define ShellCommandRegister1(t1) \
    185   static SHELLCOMMAND<T>* registerCommand(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE), t1##_TYPE d1 = t1##_DEFAULT) \
     182  static SHELLCOMMAND<T>* registerCommand(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE)) \
    186183  { \
    187184    if (isRegistered(commandName, className, 1, t1##_PARAM)== true) \
    188185      return NULL; \
    189     return new SHELLCOMMAND<T>(commandName, className, function, d1); \
     186    return new SHELLCOMMAND<T>(commandName, className, function); \
    190187  }
    191188
    192189//! registers a command with 2 parameters
    193190#define ShellCommandRegister2(t1,t2) \
    194   static SHELLCOMMAND<T>* registerCommand(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE, t2##_TYPE), t1##_TYPE d1 = t1##_DEFAULT, t2##_TYPE d2 = t2##_DEFAULT) \
     191  static SHELLCOMMAND<T>* registerCommand(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE, t2##_TYPE)) \
    195192  { \
    196193    if (isRegistered(commandName, className, 2, t1##_PARAM, t2##_PARAM)== true) \
    197194      return NULL; \
    198     return new SHELLCOMMAND<T>(commandName, className, function, d1, d2); \
     195    return new SHELLCOMMAND<T>(commandName, className, function); \
    199196  }
    200197
    201198//! registers a command with 3 parameters
    202199#define ShellCommandRegister3(t1,t2,t3) \
    203   static SHELLCOMMAND<T>* registerCommand(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE), t1##_TYPE d1 = t1##_DEFAULT, t2##_TYPE d2 = t2##_DEFAULT, t3##_TYPE d3 = t3##_DEFAULT) \
     200  static SHELLCOMMAND<T>* registerCommand(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE)) \
    204201  { \
    205202    if (isRegistered(commandName, className, 3, t1##_PARAM, t2##_PARAM, t3##_PARAM)== true) \
    206203      return NULL; \
    207     return new SHELLCOMMAND<T>(commandName, className, function, d1, d2, d3); \
     204    return new SHELLCOMMAND<T>(commandName, className, function); \
    208205  }
    209206
    210207//! registers a command with 4 parameters
    211208#define ShellCommandRegister4(t1,t2,t3,t4) \
    212   static SHELLCOMMAND<T>* registerCommand(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE), t1##_TYPE d1 = t1##_DEFAULT, t2##_TYPE d2 = t2##_DEFAULT, t3##_TYPE d3 = t3##_DEFAULT, t4##_TYPE d4 = t4##_DEFAULT) \
     209  static SHELLCOMMAND<T>* registerCommand(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE)) \
    213210  { \
    214211    if (isRegistered(commandName, className, 4, t1##_PARAM, t2##_PARAM, t3##_PARAM, t4##_PARAM)== true) \
    215212      return NULL; \
    216     return new SHELLCOMMAND<T>(commandName, className, function, d1, d2, d3, d4); \
     213    return new SHELLCOMMAND<T>(commandName, className, function); \
    217214  }
    218215
    219216//! registers a command with 5 parameters
    220217#define ShellCommandRegister5(t1,t2,t3,t4,t5) \
    221   static SHELLCOMMAND<T>* registerCommand(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE, t5##_TYPE), t1##_TYPE d1 = t1##_DEFAULT, t2##_TYPE d2 = t2##_DEFAULT, t3##_TYPE d3 = t3##_DEFAULT, t4##_TYPE d4 = t4##_DEFAULT, t5##_TYPE d5 = t5##_DEFAULT) \
     218  static SHELLCOMMAND<T>* registerCommand(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE, t5##_TYPE)) \
    222219  { \
    223220    if (isRegistered(commandName, className, 5, t1##_PARAM, t2##_PARAM, t3##_PARAM, t4##_PARAM, t5##_PARAM)== true) \
    224221      return NULL; \
    225     return new ShellCommand<T>(commandName, className, function, d1, d2, d3, d4, d5); \
    226   }
     222    return new ShellCommand<T>(commandName, className, function); \
     223  }
     224
     225///////////////////////
     226// FUNCTION POINTERS //
     227///////////////////////
     228#define ShellCommandFunctionPoiter0() \
     229  void SHELLCOMMANDINCLASS(*functionPointer_0)();
     230
     231#define ShellCommandFunctionPoiter1(t1) \
     232  void SHELLCOMMANDINCLASS(*functionPointer_1_##t1)(t1##_TYPE);
     233
     234#define ShellCommandFunctionPoiter2(t1, t2) \
     235  void SHELLCOMMANDINCLASS(*functionPointer_2_##t1##_##t2)(t1##_TYPE, t2##_TYPE);
     236
     237
     238#define ShellCommandFunctionPoiter3(t1, t2, t3) \
     239  void SHELLCOMMANDINCLASS(*functionPointer_3_##t1##_##t2##_##t3)(t1##_TYPE, t2##_TYPE, t3##_TYPE);
     240
     241#define ShellCommandFunctionPoiter4(t1, t2, t3, t4) \
     242  void SHELLCOMMANDINCLASS(*functionPointer_4_##t1##_##t2##_##t3##_##t4)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE);
     243
     244
     245#define ShellCommandFunctionPoiter5(t1, t2, t3, t4, t5) \
     246  void SHELLCOMMANDINCLASS(*functionPointer_5_##t1##_##t2##_##t3##_##t4##_##t5)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE, t5##_TYPE); \
     247
    227248
    228249//////////////////
    … …  
    231252//! creates a command that takes no parameters
    232253#define ShellCommandConstructor0() \
    233   void SHELLCOMMANDINCLASS(*functionPointer_0)(); \
    234254  SHELLCOMMAND(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)()) \
    235255  : ShellCommandBase(commandName, className, 0) \
    236256  { \
    237257    this->functorType = SHELLCOMMANDTYPE; \
    238     this->functionPointer_0 = function; \
     258    this->fp.functionPointer_0 = function; \
    239259  }
    240260
    241261//! creates a command that takes one parameter
    242262#define ShellCommandConstructor1(t1) \
    243   void SHELLCOMMANDINCLASS(*functionPointer_1_##t1)(t1##_TYPE); \
    244   SHELLCOMMAND(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE), t1##_TYPE d1) \
    245   : ShellCommandBase(commandName, className, 1, t1##_PARAM, d1) \
    246   { \
    247     this->functorType = SHELLCOMMANDTYPE; \
    248     this->functionPointer_1_##t1 = function; \
     263  SHELLCOMMAND(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE)) \
     264  : ShellCommandBase(commandName, className, 1, t1##_PARAM) \
     265  { \
     266    this->functorType = SHELLCOMMANDTYPE; \
     267    this->fp.functionPointer_1_##t1 = function; \
    249268  }
    250269
    251270//! creates a command that takes two parameters
    252271#define ShellCommandConstructor2(t1,t2) \
    253   void SHELLCOMMANDINCLASS(*functionPointer_2_##t1##_##t2)(t1##_TYPE, t2##_TYPE); \
    254   SHELLCOMMAND(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE, t2##_TYPE), t1##_TYPE d1, t2##_TYPE d2) \
    255   : ShellCommandBase(commandName, className, 2, t1##_PARAM, d1, t2##_PARAM, d2) \
    256   { \
    257     this->functorType = SHELLCOMMANDTYPE; \
    258     this->functionPointer_2_##t1##_##t2 = function; \
     272  SHELLCOMMAND(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE, t2##_TYPE)) \
     273  : ShellCommandBase(commandName, className, 2, t1##_PARAM, t2##_PARAM) \
     274  { \
     275    this->functorType = SHELLCOMMANDTYPE; \
     276    this->fp.functionPointer_2_##t1##_##t2 = function; \
    259277  }
    260278
    261279//! creates a command that takes three parameter
    262280#define ShellCommandConstructor3(t1,t2,t3) \
    263   void SHELLCOMMANDINCLASS(*functionPointer_3_##t1##_##t2##_##t3)(t1##_TYPE, t2##_TYPE, t3##_TYPE); \
    264   SHELLCOMMAND(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE), t1##_TYPE d1, t2##_TYPE d2, t3##_TYPE d3) \
    265   : ShellCommandBase(commandName, className, 3, t1##_PARAM, d1, t2##_PARAM, d2, t3##_PARAM, d3) \
    266   { \
    267     this->functorType = SHELLCOMMANDTYPE; \
    268     this->functionPointer_3_##t1##_##t2##_##t3 = function; \
     281  SHELLCOMMAND(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE)) \
     282  : ShellCommandBase(commandName, className, 3, t1##_PARAM, t2##_PARAM, t3##_PARAM) \
     283  { \
     284    this->functorType = SHELLCOMMANDTYPE; \
     285    this->fp.functionPointer_3_##t1##_##t2##_##t3 = function; \
    269286  }
    270287
    271288//! creates a command that takes four parameter
    272289#define ShellCommandConstructor4(t1,t2,t3,t4) \
    273   void SHELLCOMMANDINCLASS(*functionPointer_4_##t1##_##t2##_##t3##_##t4)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE); \
    274   SHELLCOMMAND(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE), t1##_TYPE d1, t2##_TYPE d2, t3##_TYPE d3, t4##_TYPE d4) \
    275   : ShellCommandBase(commandName, className, 4, t1##_PARAM, d1, t2##_PARAM, d2, t3##_PARAM, d3, t4##_PARAM, d4) \
    276   { \
    277     this->functorType = SHELLCOMMANDTYPE; \
    278     this->functionPointer_4_##t1##_##t2##_##t3##_##t4 = function; \
     290  SHELLCOMMAND(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE)) \
     291  : ShellCommandBase(commandName, className, 4, t1##_PARAM, t2##_PARAM, t3##_PARAM, t4##_PARAM) \
     292  { \
     293    this->functorType = SHELLCOMMANDTYPE; \
     294    this->fp.functionPointer_4_##t1##_##t2##_##t3##_##t4 = function; \
    279295  }
    280296
    281297//! creates a command that takes five parameter
    282298#define ShellCommandConstructor5(t1,t2,t3,t4,t5) \
    283   void SHELLCOMMANDINCLASS(*functionPointer_5_##t1##_##t2##_##t3##_##t4##_##t5)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE, t5##_TYPE); \
    284   SHELLCOMMAND(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE, t5##_TYPE), t1##_TYPE d1, t2##_TYPE d2, t3##_TYPE d3, t4##_TYPE d4, t5##_TYPE d5) \
    285   : ShellCommandBase(commandName, className, 5, t1##_PARAM, d1, t2##_PARAM, d2, t3##_PARAM, d3, t4##_PARAM, d4, t5##_PARAM, d5) \
    286   { \
    287     this->functorType = SHELLCOMMANDTYPE; \
    288     this->functionPointer_5_##t1##_##t2##_##t3##_##t4##_##t5 = function; \
     299  SHELLCOMMAND(const char* commandName, const char* className, void SHELLCOMMANDINCLASS(*function)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE, t5##_TYPE)) \
     300  : ShellCommandBase(commandName, className, 5, t1##_PARAM, t2##_PARAM, t3##_PARAM, t4##_PARAM, t5##_PARAM) \
     301  { \
     302    this->functorType = SHELLCOMMANDTYPE; \
     303    this->fp.functionPointer_5_##t1##_##t2##_##t3##_##t4##_##t5 = function; \
    289304  }
    290305
    … …  
    337352#undef SHELLCOMMANDEXECUTER
    338353#endif
    339 #define SHELLCOMMANDEXECUTER(nameExt)      (dynamic_cast<T*>(object)->*functionPointer##nameExt)
     354#define SHELLCOMMANDEXECUTER(nameExt)      (dynamic_cast<T*>(object)->*(fp.functionPointer##nameExt))
    340355#ifdef SHELLCOMMANDINCLASS
    341356#undef SHELLCOMMANDINCLASS
    … …  
    353368
    354369  private:
     370//! FUNCTOR_LIST is the List of FunctionPointers
     371    union FunctionPointers {
     372#define FUNCTOR_LIST(x) ShellCommandFunctionPoiter ## x
     373#include "functor_list.h"
     374#undef FUNCTOR_LIST
     375    } fp;
     376
    355377//! FUNCTOR_LIST is the List of CommandConstructors
    356378#define FUNCTOR_LIST(x) ShellCommandConstructor ## x
    … …  
    382404#undef SHELLCOMMANDEXECUTER
    383405#endif
    384 #define SHELLCOMMANDEXECUTER(nameExt)     functionPointer##nameExt
     406#define SHELLCOMMANDEXECUTER(nameExt)     fp.functionPointer##nameExt
    385407#ifdef SHELLCOMMANDINCLASS
    386408#undef SHELLCOMMANDINCLASS
    … …  
    398420
    399421  private:
     422//! FUNCTOR_LIST is the List of FunctionPointers
     423    union FunctionPointers {
     424#define FUNCTOR_LIST(x) ShellCommandFunctionPoiter ## x
     425#include "functor_list.h"
     426#undef FUNCTOR_LIST
     427    } fp;
     428
    400429//! FUNCTOR_LIST is the List of CommandConstructors
    401430#define FUNCTOR_LIST(x) ShellCommandConstructor ## x

  • branches/world_entities/src/lib/sound/Makefile.in

    r5527 r5558  
    207207          esac; \
    208208        done; \
    209         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/sound/Makefile'; \
     209        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/sound/Makefile'; \
    210210        cd $(top_srcdir) && \
    211           $(AUTOMAKE) --gnu  src/lib/sound/Makefile
     211          $(AUTOMAKE) --foreign  src/lib/sound/Makefile
    212212.PRECIOUS: Makefile
    213213Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • branches/world_entities/src/lib/tinyxml/Makefile.in

    r5527 r5558  
    203203          esac; \
    204204        done; \
    205         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/tinyxml/Makefile'; \
     205        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/tinyxml/Makefile'; \
    206206        cd $(top_srcdir) && \
    207           $(AUTOMAKE) --gnu  src/lib/tinyxml/Makefile
     207          $(AUTOMAKE) --foreign  src/lib/tinyxml/Makefile
    208208.PRECIOUS: Makefile
    209209Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note: See TracChangeset for help on using the changeset viewer.