Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4975 in orxonox.OLD


Ignore:
Timestamp:
Aug 9, 2005, 12:23:07 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: player should be able to load its preferences from an external file
removed the obsolete ObjectManager that has been redesigned as FastFactory.

Location:
orxonox/trunk
Files:
2 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/orxonox.kdevelop

    r4972 r4975  
    1010    <projectdirectory>.</projectdirectory>
    1111    <absoluteprojectpath>false</absoluteprojectpath>
    12     <description></description>
     12    <description/>
    1313    <secondaryLanguages>
    1414      <language>C</language>
    1515    </secondaryLanguages>
    16     <versioncontrol></versioncontrol>
     16    <versioncontrol/>
    1717  </general>
    1818  <kdevcustomproject>
    … …  
    2121      <directoryradio>build</directoryradio>
    2222      <customdirectory>/</customdirectory>
    23       <programargs></programargs>
     23      <programargs/>
    2424      <terminal>false</terminal>
    2525      <autocompile>true</autocompile>
    … …  
    2828    <build>
    2929      <buildtool>make</buildtool>
    30       <builddir></builddir>
     30      <builddir/>
    3131    </build>
    3232    <make>
    … …  
    3535      <prio>0</prio>
    3636      <dontact>false</dontact>
    37       <makebin></makebin>
    38       <makeoptions></makeoptions>
     37      <makebin/>
     38      <makeoptions/>
    3939      <selectedenvironment>default</selectedenvironment>
    4040      <environments>
    4141        <default/>
    4242      </environments>
    43       <defaulttarget></defaulttarget>
     43      <defaulttarget/>
    4444    </make>
    4545  </kdevcustomproject>
    4646  <kdevdebugger>
    4747    <general>
    48       <dbgshell></dbgshell>
    49       <programargs></programargs>
    50       <gdbpath></gdbpath>
    51       <configGdbScript></configGdbScript>
    52       <runShellScript></runShellScript>
    53       <runGdbScript></runGdbScript>
     48      <dbgshell/>
     49      <programargs/>
     50      <gdbpath/>
     51      <configGdbScript/>
     52      <runShellScript/>
     53      <runGdbScript/>
    5454      <breakonloadinglibs>true</breakonloadinglibs>
    5555      <separatetty>false</separatetty>
    … …  
    131131    </codecompletion>
    132132    <creategettersetter>
    133       <prefixGet></prefixGet>
     133      <prefixGet/>
    134134      <prefixSet>set</prefixSet>
    135135      <prefixVariable>m_,_</prefixVariable>
    … …  
    157157  <kdevdocumentation>
    158158    <projectdoc>
    159       <docsystem></docsystem>
    160       <docurl></docurl>
    161       <usermanualurl></usermanualurl>
     159      <docsystem/>
     160      <docurl/>
     161      <usermanualurl/>
    162162    </projectdoc>
    163163  </kdevdocumentation>
    164164  <ctagspart>
    165     <customArguments></customArguments>
    166     <customTagfilePath></customTagfilePath>
     165    <customArguments/>
     166    <customTagfilePath/>
    167167  </ctagspart>
    168168</kdevelop>

  • orxonox/trunk/src/Makefile.am

    r4963 r4975  
    4040                  util/animation/animation3d.cc \
    4141                  util/animation/animation_player.cc \
    42                   util/object_manager.cc \
    4342                  util/fast_factory.cc \
    4443                  util/garbage_collector.cc \
    … …  
    9493                 util/animation/animation3d.h \
    9594                 util/animation/animation_player.h \
    96                  util/object_manager.h \
    9795                 util/fast_factory.h \
    9896                 util/garbage_collector.h \

  • orxonox/trunk/src/Makefile.in

    r4963 r4975  
    5858        orxonox-animation.$(OBJEXT) orxonox-animation3d.$(OBJEXT) \
    5959        orxonox-animation_player.$(OBJEXT) \
    60         orxonox-object_manager.$(OBJEXT) \
    6160        orxonox-fast_factory.$(OBJEXT) \
    6261        orxonox-garbage_collector.$(OBJEXT) \
    … …  
    110109@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-load_param.Po \
    111110@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-null_parent.Po \
    112 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-object_manager.Po \
    113111@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-orxonox.Po \
    114112@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-p_node.Po \
    … …  
    294292                  util/animation/animation3d.cc \
    295293                  util/animation/animation_player.cc \
    296                   util/object_manager.cc \
    297294                  util/fast_factory.cc \
    298295                  util/garbage_collector.cc \
    … …  
    348345                 util/animation/animation3d.h \
    349346                 util/animation/animation_player.h \
    350                  util/object_manager.h \
    351347                 util/fast_factory.h \
    352348                 util/garbage_collector.h \
    … …  
    507503@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-load_param.Po@am__quote@
    508504@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-null_parent.Po@am__quote@
    509 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-object_manager.Po@am__quote@
    510505@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-orxonox.Po@am__quote@
    511506@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-p_node.Po@am__quote@
    … …  
    678673@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    679674@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-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`
    680 
    681 orxonox-object_manager.o: util/object_manager.cc
    682 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-object_manager.o -MD -MP -MF "$(DEPDIR)/orxonox-object_manager.Tpo" -c -o orxonox-object_manager.o `test -f 'util/object_manager.cc' || echo '$(srcdir)/'`util/object_manager.cc; \
    683 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-object_manager.Tpo" "$(DEPDIR)/orxonox-object_manager.Po"; else rm -f "$(DEPDIR)/orxonox-object_manager.Tpo"; exit 1; fi
    684 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/object_manager.cc' object='orxonox-object_manager.o' libtool=no @AMDEPBACKSLASH@
    685 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-object_manager.Po' tmpdepfile='$(DEPDIR)/orxonox-object_manager.TPo' @AMDEPBACKSLASH@
    686 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    687 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-object_manager.o `test -f 'util/object_manager.cc' || echo '$(srcdir)/'`util/object_manager.cc
    688 
    689 orxonox-object_manager.obj: util/object_manager.cc
    690 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-object_manager.obj -MD -MP -MF "$(DEPDIR)/orxonox-object_manager.Tpo" -c -o orxonox-object_manager.obj `if test -f 'util/object_manager.cc'; then $(CYGPATH_W) 'util/object_manager.cc'; else $(CYGPATH_W) '$(srcdir)/util/object_manager.cc'; fi`; \
    691 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-object_manager.Tpo" "$(DEPDIR)/orxonox-object_manager.Po"; else rm -f "$(DEPDIR)/orxonox-object_manager.Tpo"; exit 1; fi
    692 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/object_manager.cc' object='orxonox-object_manager.obj' libtool=no @AMDEPBACKSLASH@
    693 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-object_manager.Po' tmpdepfile='$(DEPDIR)/orxonox-object_manager.TPo' @AMDEPBACKSLASH@
    694 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    695 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-object_manager.obj `if test -f 'util/object_manager.cc'; then $(CYGPATH_W) 'util/object_manager.cc'; else $(CYGPATH_W) '$(srcdir)/util/object_manager.cc'; fi`
    696675
    697676orxonox-fast_factory.o: util/fast_factory.cc

  • orxonox/trunk/src/orxonox.cc

    r4946 r4975  
    3737#include "sound_engine.h"
    3838#include "resource_manager.h"
    39 #include "object_manager.h"
    4039#include "cd_engine.h"
    4140#include "text_engine.h"
    … …  
    8584  delete SoundEngine::getInstance();
    8685  delete ResourceManager::getInstance(); // deletes the Resource Manager
    87   delete ObjectManager::getInstance();
    8886  delete TextEngine::getInstance();
    8987  delete Factory::getFirst();
    … …  
    258256  TextEngine::getInstance();
    259257
    260   PRINT(3)("initializing ObjectManager\n");
    261   ObjectManager::getInstance();
    262258  CDEngine::getInstance();
    263259

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

    r4942 r4975  
    2323
    2424#include "list.h"
    25 #include "object_manager.h"
    2625
    2726using namespace std;

  • orxonox/trunk/src/world_entities/player.cc

    r4969 r4975  
    5656}
    5757
    58 
    59 /**
    60  *  destructs the player, deletes alocated memory
    61 */
    62 Player::~Player ()
    63 {
    64   /* do not delete the weapons, they are contained in the pnode tree
    65      and will be deleted there.
    66      this only frees the memory allocated to save the list.
    67   */
    68   delete this->weaponMan;
     58/**
     59 * loads a Players information from a specified file.
     60 * @param fileName the name of the File to load the player from (absolute path)
     61 */
     62Player::Player(const char* fileName)
     63{
     64  this->init();
     65  TiXmlDocument doc(fileName);
     66
     67  if(!doc.LoadFile())
     68  {
     69    PRINTF(2)("Loading file %s failed for player.\n", fileName);
     70    return;
     71  }
     72
     73  this->loadParams(doc.RootElement());
    6974}
    7075
    … …  
    96101
    97102  this->weaponMan->changeWeaponConfig(0);
     103}
     104
     105/**
     106 *  destructs the player, deletes alocated memory
     107 */
     108Player::~Player ()
     109{
     110  /* do not delete the weapons, they are contained in the pnode tree
     111  and will be deleted there.
     112  this only frees the memory allocated to save the list.
     113  */
     114  delete this->weaponMan;
    98115}
    99116

  • orxonox/trunk/src/world_entities/player.h

    r4954 r4975  
    2929  public:
    3030    Player();
     31    Player(const char* fileName);
    3132    Player(const TiXmlElement* root);
    3233    virtual ~Player();

  • orxonox/trunk/src/world_entities/weapons/projectile.h

    r4972 r4975  
    2323#include "world_entity.h"
    2424#include "vector.h"
    25 
    26 class ParticleEmitter;
    2725
    2826class Projectile : public WorldEntity
    … …  
    5351
    5452  protected:
    55 
    5653    // energy
    5754    float                 energyMin;
    … …  
    6562
    6663    Vector                velocity;                  //!< velocity of the projectile.
    67 
    68     ParticleEmitter*      emitter;                   //!< For special effects each Projectile has an emitter.
    6964};
    7065

  • orxonox/trunk/src/world_entities/weapons/weapon.h

    r4972 r4975  
    7171/**
    7272 * This is used as a container for all the different kinds of weapons that may exist
     73 *
     74 * Weapons have certain states, and actions, that can inflict them.
     75 * ex. Action WA_SHOOT leeds to State WS_SHOOTING.
     76 * each action has a sound connected to it,
     77 * each state a time and an animation.
    7378 */
    7479class Weapon : public WorldEntity
Note: See TracChangeset for help on using the changeset viewer.