Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4346 in orxonox.OLD


Ignore:
Timestamp:
May 27, 2005, 11:53:50 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: some first function and class definition of the new event handling system

Location:
orxonox/trunk/src
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.am

    r4338 r4346  
    2525AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
    2626AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
     27AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/event
    2728AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/loading
    2829AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/track
    … …  
    5556                 util/animation/animation3d.cc \
    5657                 util/animation/animation_player.cc \
     58                 util/event/event.cc \
     59                 util/event/event_handler.cc \
     60                 util/event/event_listener.cc \
    5761                 util/object_manager.cc \
    5862                 util/garbage_collector.cc \
    … …  
    117121                 util/animation/animation3d.h \
    118122                 util/animation/animation_player.h \
     123                 util/event/event.h \
     124                 util/event/event_listener.h \
     125                 util/event/event_handler.h \
    119126                 util/object_manager.h \
    120127                 util/garbage_collector.h \

  • orxonox/trunk/src/Makefile.in

    r4338 r4346  
    5757        track_manager.$(OBJEXT) track_node.$(OBJEXT) \
    5858        animation.$(OBJEXT) animation3d.$(OBJEXT) \
    59         animation_player.$(OBJEXT) object_manager.$(OBJEXT) \
    60         garbage_collector.$(OBJEXT) list.$(OBJEXT) \
    61         resource_manager.$(OBJEXT) factory.$(OBJEXT) \
     59        animation_player.$(OBJEXT) event.$(OBJEXT) \
     60        event_handler.$(OBJEXT) event_listener.$(OBJEXT) \
     61        object_manager.$(OBJEXT) garbage_collector.$(OBJEXT) \
     62        list.$(OBJEXT) resource_manager.$(OBJEXT) factory.$(OBJEXT) \
    6263        load_param.$(OBJEXT) state.$(OBJEXT) story_entity.$(OBJEXT) \
    6364        campaign.$(OBJEXT) world.$(OBJEXT) world_entity.$(OBJEXT) \
    … …  
    8990@AMDEP_TRUE@    ./$(DEPDIR)/character_attributes.Po \
    9091@AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po ./$(DEPDIR)/curve.Po \
    91 @AMDEP_TRUE@    ./$(DEPDIR)/environment.Po ./$(DEPDIR)/factory.Po \
    92 @AMDEP_TRUE@    ./$(DEPDIR)/game_loader.Po \
     92@AMDEP_TRUE@    ./$(DEPDIR)/environment.Po ./$(DEPDIR)/event.Po \
     93@AMDEP_TRUE@    ./$(DEPDIR)/event_handler.Po \
     94@AMDEP_TRUE@    ./$(DEPDIR)/event_listener.Po \
     95@AMDEP_TRUE@    ./$(DEPDIR)/factory.Po ./$(DEPDIR)/game_loader.Po \
    9396@AMDEP_TRUE@    ./$(DEPDIR)/garbage_collector.Po \
    9497@AMDEP_TRUE@    ./$(DEPDIR)/glmenu_imagescreen.Po \
    … …  
    247250target_vendor = @target_vendor@
    248251MAINSRCDIR = .
    249 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/lib/tinyxml -I$(MAINSRCDIR)/lib/physics -I$(MAINSRCDIR)/lib/physics/fields -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/loading -I$(MAINSRCDIR)/util/track -I$(MAINSRCDIR)/subprojects
     252AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/lib/tinyxml -I$(MAINSRCDIR)/lib/physics -I$(MAINSRCDIR)/lib/physics/fields -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/event -I$(MAINSRCDIR)/util/loading -I$(MAINSRCDIR)/util/track -I$(MAINSRCDIR)/subprojects
    250253orxonox_DEPENDENCIES = lib/gui/gui/libORXgui.a \
    251254                       lib/physics/libORXphysics.a \
    … …  
    266269                 util/animation/animation3d.cc \
    267270                 util/animation/animation_player.cc \
     271                 util/event/event.cc \
     272                 util/event/event_handler.cc \
     273                 util/event/event_listener.cc \
    268274                 util/object_manager.cc \
    269275                 util/garbage_collector.cc \
    … …  
    328334                 util/animation/animation3d.h \
    329335                 util/animation/animation_player.h \
     336                 util/event/event.h \
     337                 util/event/event_listener.h \
     338                 util/event/event_handler.h \
    330339                 util/object_manager.h \
    331340                 util/garbage_collector.h \
    … …  
    483492@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve.Po@am__quote@
    484493@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Po@am__quote@
     494@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Po@am__quote@
     495@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_handler.Po@am__quote@
     496@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_listener.Po@am__quote@
    485497@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/factory.Po@am__quote@
    486498@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game_loader.Po@am__quote@
    … …  
    657669@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation_player.obj `if test -f 'util/animation/animation_player.cc'; then $(CYGPATH_W) 'util/animation/animation_player.cc'; else $(CYGPATH_W) '$(srcdir)/util/animation/animation_player.cc'; fi`
    658670
     671event.o: util/event/event.cc
     672@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event.o -MD -MP -MF "$(DEPDIR)/event.Tpo" -c -o event.o `test -f 'util/event/event.cc' || echo '$(srcdir)/'`util/event/event.cc; \
     673@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/event.Tpo" "$(DEPDIR)/event.Po"; else rm -f "$(DEPDIR)/event.Tpo"; exit 1; fi
     674@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/event/event.cc' object='event.o' libtool=no @AMDEPBACKSLASH@
     675@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/event.Po' tmpdepfile='$(DEPDIR)/event.TPo' @AMDEPBACKSLASH@
     676@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     677@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event.o `test -f 'util/event/event.cc' || echo '$(srcdir)/'`util/event/event.cc
     678
     679event.obj: util/event/event.cc
     680@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event.obj -MD -MP -MF "$(DEPDIR)/event.Tpo" -c -o event.obj `if test -f 'util/event/event.cc'; then $(CYGPATH_W) 'util/event/event.cc'; else $(CYGPATH_W) '$(srcdir)/util/event/event.cc'; fi`; \
     681@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/event.Tpo" "$(DEPDIR)/event.Po"; else rm -f "$(DEPDIR)/event.Tpo"; exit 1; fi
     682@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/event/event.cc' object='event.obj' libtool=no @AMDEPBACKSLASH@
     683@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/event.Po' tmpdepfile='$(DEPDIR)/event.TPo' @AMDEPBACKSLASH@
     684@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     685@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event.obj `if test -f 'util/event/event.cc'; then $(CYGPATH_W) 'util/event/event.cc'; else $(CYGPATH_W) '$(srcdir)/util/event/event.cc'; fi`
     686
     687event_handler.o: util/event/event_handler.cc
     688@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event_handler.o -MD -MP -MF "$(DEPDIR)/event_handler.Tpo" -c -o event_handler.o `test -f 'util/event/event_handler.cc' || echo '$(srcdir)/'`util/event/event_handler.cc; \
     689@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/event_handler.Tpo" "$(DEPDIR)/event_handler.Po"; else rm -f "$(DEPDIR)/event_handler.Tpo"; exit 1; fi
     690@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/event/event_handler.cc' object='event_handler.o' libtool=no @AMDEPBACKSLASH@
     691@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/event_handler.Po' tmpdepfile='$(DEPDIR)/event_handler.TPo' @AMDEPBACKSLASH@
     692@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     693@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event_handler.o `test -f 'util/event/event_handler.cc' || echo '$(srcdir)/'`util/event/event_handler.cc
     694
     695event_handler.obj: util/event/event_handler.cc
     696@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event_handler.obj -MD -MP -MF "$(DEPDIR)/event_handler.Tpo" -c -o event_handler.obj `if test -f 'util/event/event_handler.cc'; then $(CYGPATH_W) 'util/event/event_handler.cc'; else $(CYGPATH_W) '$(srcdir)/util/event/event_handler.cc'; fi`; \
     697@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/event_handler.Tpo" "$(DEPDIR)/event_handler.Po"; else rm -f "$(DEPDIR)/event_handler.Tpo"; exit 1; fi
     698@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/event/event_handler.cc' object='event_handler.obj' libtool=no @AMDEPBACKSLASH@
     699@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/event_handler.Po' tmpdepfile='$(DEPDIR)/event_handler.TPo' @AMDEPBACKSLASH@
     700@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     701@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event_handler.obj `if test -f 'util/event/event_handler.cc'; then $(CYGPATH_W) 'util/event/event_handler.cc'; else $(CYGPATH_W) '$(srcdir)/util/event/event_handler.cc'; fi`
     702
     703event_listener.o: util/event/event_listener.cc
     704@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event_listener.o -MD -MP -MF "$(DEPDIR)/event_listener.Tpo" -c -o event_listener.o `test -f 'util/event/event_listener.cc' || echo '$(srcdir)/'`util/event/event_listener.cc; \
     705@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/event_listener.Tpo" "$(DEPDIR)/event_listener.Po"; else rm -f "$(DEPDIR)/event_listener.Tpo"; exit 1; fi
     706@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/event/event_listener.cc' object='event_listener.o' libtool=no @AMDEPBACKSLASH@
     707@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/event_listener.Po' tmpdepfile='$(DEPDIR)/event_listener.TPo' @AMDEPBACKSLASH@
     708@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     709@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event_listener.o `test -f 'util/event/event_listener.cc' || echo '$(srcdir)/'`util/event/event_listener.cc
     710
     711event_listener.obj: util/event/event_listener.cc
     712@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event_listener.obj -MD -MP -MF "$(DEPDIR)/event_listener.Tpo" -c -o event_listener.obj `if test -f 'util/event/event_listener.cc'; then $(CYGPATH_W) 'util/event/event_listener.cc'; else $(CYGPATH_W) '$(srcdir)/util/event/event_listener.cc'; fi`; \
     713@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/event_listener.Tpo" "$(DEPDIR)/event_listener.Po"; else rm -f "$(DEPDIR)/event_listener.Tpo"; exit 1; fi
     714@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/event/event_listener.cc' object='event_listener.obj' libtool=no @AMDEPBACKSLASH@
     715@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/event_listener.Po' tmpdepfile='$(DEPDIR)/event_listener.TPo' @AMDEPBACKSLASH@
     716@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     717@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event_listener.obj `if test -f 'util/event/event_listener.cc'; then $(CYGPATH_W) 'util/event/event_listener.cc'; else $(CYGPATH_W) '$(srcdir)/util/event/event_listener.cc'; fi`
     718
    659719object_manager.o: util/object_manager.cc
    660720@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object_manager.o -MD -MP -MF "$(DEPDIR)/object_manager.Tpo" -c -o object_manager.o `test -f 'util/object_manager.cc' || echo '$(srcdir)/'`util/object_manager.cc; \
    … …  
    15471607
    15481608distdir: $(DISTFILES)
    1549         $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/graphics/particles $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities
     1609        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/graphics/particles $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/util/event $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities
    15501610        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    15511611        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

  • orxonox/trunk/src/class_list.h

    r4326 r4346  
    6262  CL_COMMAND_NODE,
    6363
     64  CL_EVENT,
     65  CL_EVENT_HANDLER,
     66  CL_EVENT_LISTENER,
     67
    6468  CL_GRAPHICS_ENGINE, 
    6569  CL_TEXT_ENGINE,

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

    r4343 r4346  
    186186          esac; \
    187187        done; \
    188         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/Makefile'; \
     188        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/Makefile'; \
    189189        cd $(top_srcdir) && \
    190           $(AUTOMAKE) --gnu  src/subprojects/Makefile
     190          $(AUTOMAKE) --foreign  src/subprojects/Makefile
    191191.PRECIOUS: Makefile
    192192Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/subprojects/gui/Makefile.in

    r4343 r4346  
    229229          esac; \
    230230        done; \
    231         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/gui/Makefile'; \
     231        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/gui/Makefile'; \
    232232        cd $(top_srcdir) && \
    233           $(AUTOMAKE) --gnu  src/subprojects/gui/Makefile
     233          $(AUTOMAKE) --foreign  src/subprojects/gui/Makefile
    234234.PRECIOUS: Makefile
    235235Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/subprojects/importer/Makefile.in

    r4343 r4346  
    228228          esac; \
    229229        done; \
    230         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/importer/Makefile'; \
     230        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/importer/Makefile'; \
    231231        cd $(top_srcdir) && \
    232           $(AUTOMAKE) --gnu  src/subprojects/importer/Makefile
     232          $(AUTOMAKE) --foreign  src/subprojects/importer/Makefile
    233233.PRECIOUS: Makefile
    234234Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/subprojects/particles/Makefile.in

    r4343 r4346  
    257257          esac; \
    258258        done; \
    259         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile'; \
     259        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile'; \
    260260        cd $(top_srcdir) && \
    261           $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile
     261          $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile
    262262.PRECIOUS: Makefile
    263263Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/subprojects/testmain/Makefile.in

    r4343 r4346  
    197197          esac; \
    198198        done; \
    199         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile'; \
     199        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile'; \
    200200        cd $(top_srcdir) && \
    201           $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile
     201          $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile
    202202.PRECIOUS: Makefile
    203203Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/util/event/event.cc

    r4329 r4346  
    1010
    1111   ### File Specific:
    12    main-programmer: ...
     12   main-programmer: Patrick Boenzli
    1313   co-programmer: ...
    1414*/
    1515
    16 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
     16#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_EVENT
    1717
    18 #include "proto_class.h"
     18#include "event.h"
    1919
    2020using namespace std;
    … …  
    2525   \todo this constructor is not jet implemented - do it
    2626*/
    27 ProtoClass::ProtoClass ()
     27Event::Event ()
    2828{
    29    this->setClassID(CL_PROTO_ID, "ProtoClass");
     29   this->setClassID(CL_EVENT, "Event");
    3030
    31    /* If you make a new class, what is most probably the case when you write this file
    32       don't forget to:
    33        1. Add the new file new_class.cc to the ./src/Makefile.am
    34        2. Add the class identifier to ./src/class_list.h eg. CL_NEW_CLASS
    35 
    36       Advanced Topics:
    37       - if you want to let your object be managed via the ObjectManager make sure to read
    38         the object_manager.h header comments. You will use this most certanly only if you
    39         make many objects of your class, like a weapon bullet.
    40    */
    4131}
    4232
    … …  
    4636
    4737*/
    48 ProtoClass::~ProtoClass ()
     38Event::~Event ()
    4939{
    5040  // delete what has to be deleted here

  • orxonox/trunk/src/util/event/event.h

    r4329 r4346  
    11/*!
    2     \file proto_class.h
    3     \brief Definition of ...
     2    \file event.h
     3    \brief an abstract event
    44
    55*/
    66
    7 #ifndef _PROTO_CLASS_H
    8 #define _PROTO_CLASS_H
     7#ifndef _EVENT_H
     8#define _EVENT_H
    99
    1010#include "base_object.h"
    1111
    12 // FORWARD DEFINITION
    1312
    14 
    15 
    16 //! A class for ...
    17 class ProtoClass : public BaseObject {
     13//! An abstract event class
     14class Event : public BaseObject {
    1815
    1916 public:
    20   ProtoClass();
    21   virtual ~ProtoClass();
    22 
    23 
    24  private:
     17  Event();
     18  virtual ~Event();
    2519
    2620};
    2721
    28 #endif /* _PROTO_CLASS_H */
     22#endif /* _EVENT_H */

  • orxonox/trunk/src/util/event/event_handler.cc

    r4329 r4346  
    1010
    1111   ### File Specific:
    12    main-programmer: ...
    13    co-programmer: ...
     12   main-programmer: Patrick Boenzli
     13   co-programmer:
    1414*/
    1515
    16 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
     16#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_EVENT
    1717
    18 #include "proto_singleton.h"
     18#include "event_handler.h"
    1919
    2020using namespace std;
    … …  
    2424   \brief standard constructor
    2525*/
    26 ProtoSingleton::ProtoSingleton ()
     26EventHandler::EventHandler ()
    2727{
    28    this->setClassName("ProtoSingleton");
    29    this->setClassID(CL_PROTO_ID, "ProtoSingleton");
    30 
    31    /* If you make a new class, what is most probably the case when you write this file
    32       don't forget to:
    33        1. Add the new file new_class.cc to the ./src/Makefile.am
    34        2. Add the class identifier to ./src/class_list.h eg. CL_NEW_CLASS
    35 
    36       Advanced Topics:
    37       - if you want to let your object be managed via the ObjectManager make sure to read
    38         the object_manager.h header comments. You will use this most certanly only if you
    39         make many objects of your class, like a weapon bullet.
    40    */
     28   this->setClassID(CL_EVENT_HANDLER, "EventHandler");
    4129}
    4230
    … …  
    4432   \brief the singleton reference to this class
    4533*/
    46 ProtoSingleton* ProtoSingleton::singletonRef = NULL;
     34EventHandler* EventHandler::singletonRef = NULL;
    4735
    4836/**
    4937   \returns a Pointer to this Class
    5038*/
    51 ProtoSingleton* ProtoSingleton::getInstance(void)
     39EventHandler* EventHandler::getInstance(void)
    5240{
    53   if (!ProtoSingleton::singletonRef)
    54     ProtoSingleton::singletonRef = new ProtoSingleton();
    55   return ProtoSingleton::singletonRef;
     41  if (!EventHandler::singletonRef)
     42    EventHandler::singletonRef = new EventHandler();
     43  return EventHandler::singletonRef;
    5644}
    5745
    … …  
    6048
    6149*/
    62 ProtoSingleton::~ProtoSingleton ()
     50EventHandler::~EventHandler ()
    6351{
    64   ProtoSingleton::singletonRef = NULL;
     52  EventHandler::singletonRef = NULL;
    6553
    6654}

  • orxonox/trunk/src/util/event/event_handler.h

    r4329 r4346  
    11/*!
    2     \file proto_singleton.h
    3     \brief Definition of the ... singleton Class
     2    \file event_handler.h
     3    \brief Definition of the EventHandler
    44   
    55*/
    66
    7 #ifndef _PROTO_SINGLETON_H
    8 #define _PROTO_SINGLETON_H
     7#ifndef _EVENT_HANDLER_H
     8#define _EVENT_HANDLER_H
    99
    1010#include "base_object.h"
    1111
    12 // FORWARD DEFINITION
     12class EventListener;
     13template<class T> class tList;
    1314
    14 //! A default singleton class.
    15 class ProtoSingleton : public BaseObject {
     15typedef enum elState
     16  {
     17    ES_GAME,
     18    ES_GAME_MENU,
     19    ES_MENU,
     20
     21    ES_NUMBER,
     22  };
     23
     24
     25//! The one Event Handler from Orxonox
     26class EventHandler : public BaseObject {
    1627
    1728 public:
    18   static ProtoSingleton* getInstance(void);
    19   virtual ~ProtoSingleton(void);
     29  static EventHandler* getInstance(void);
     30  virtual ~EventHandler(void);
     31
     32  void subscribeListener(EventListener* el, elState state);
     33  void unsubscribeListener(EventListener* el, elState state);
     34  void flush();
     35 
     36  void loadKeyBindings(const char* fileName);
     37
     38  void tick(float t);
    2039
    2140 private:
    22   ProtoSingleton(void);
    23   static ProtoSingleton* singletonRef;
     41  EventHandler(void);
     42  static EventHandler* singletonRef;
     43
     44  EventListener** listeners;                         //!< a list of registered listeners
     45 
    2446};
    2547
    26 #endif /* _PROTO_SINGLETON_H */
     48#endif /* _EVENT_HANDLER_H */

  • orxonox/trunk/src/util/event/event_listener.cc

    r4329 r4346  
    1010
    1111   ### File Specific:
    12    main-programmer: ...
     12   main-programmer: Patrick Boenzli
    1313   co-programmer: ...
    1414*/
    1515
    16 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
     16#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_EVENT
    1717
    18 #include "proto_class.h"
     18#include "event_listener.h"
    1919
    2020using namespace std;
    … …  
    2525   \todo this constructor is not jet implemented - do it
    2626*/
    27 ProtoClass::ProtoClass ()
     27EventListener::EventListener ()
    2828{
    29    this->setClassID(CL_PROTO_ID, "ProtoClass");
    30 
    31    /* If you make a new class, what is most probably the case when you write this file
    32       don't forget to:
    33        1. Add the new file new_class.cc to the ./src/Makefile.am
    34        2. Add the class identifier to ./src/class_list.h eg. CL_NEW_CLASS
    35 
    36       Advanced Topics:
    37       - if you want to let your object be managed via the ObjectManager make sure to read
    38         the object_manager.h header comments. You will use this most certanly only if you
    39         make many objects of your class, like a weapon bullet.
    40    */
     29   this->setClassID(CL_EVENT_LISTENER, "EventListener");
    4130}
    4231
    … …  
    4635
    4736*/
    48 ProtoClass::~ProtoClass ()
     37EventListener::~EventListener ()
    4938{
    5039  // delete what has to be deleted here

  • orxonox/trunk/src/util/event/event_listener.h

    r4329 r4346  
    11/*!
    2     \file proto_class.h
    3     \brief Definition of ...
     2    \file event_listener.h
     3    \brief Definition of an event listener base class
    44
    55*/
    66
    7 #ifndef _PROTO_CLASS_H
    8 #define _PROTO_CLASS_H
     7#ifndef _EVENT_LISTENER_H
     8#define _EVENT_LISTENER_H
    99
    1010#include "base_object.h"
    1111
    12 // FORWARD DEFINITION
    1312
    14 
    15 
    16 //! A class for ...
    17 class ProtoClass : public BaseObject {
     13//! A class for event listener
     14class EventListener : public BaseObject {
    1815
    1916 public:
    20   ProtoClass();
    21   virtual ~ProtoClass();
     17  EventListener();
     18  virtual ~EventListener();
    2219
    23 
    24  private:
    2520
    2621};
    2722
    28 #endif /* _PROTO_CLASS_H */
     23#endif /* _EVENT_LISTENER_H */
Note: See TracChangeset for help on using the changeset viewer.