Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4017 in orxonox.OLD for orxonox/trunk/src/track_manager.cc


Ignore:
Timestamp:
May 2, 2005, 10:49:05 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged particleSystem back into the Trunk
merged with command:
svn merge particleEngine/ ../trunk/ -r 3966:HEAD
U ../trunk/src/lib/graphics/particles/particle_emitter.cc
U ../trunk/src/lib/graphics/particles/particle_system.cc
U ../trunk/src/lib/graphics/particles/particle_system.h

as you can see, no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/track_manager.cc

    r3966 r4017  
    2929
    3030using namespace std;
     31
     32CREATE_FACTORY(TrackManager);
    3133
    3234/**
     
    396398  this->textAnimation->setInfinity(ANIM_INF_CONSTANT);
    397399}
     400
     401
     402/**
     403   \brief loads a trackElement from a TiXmlElement
     404   \param root the TiXmlElement to load the Data from
     405
     406*/
     407TrackManager::TrackManager( TiXmlElement* root)
     408{
     409
     410}
     411
     412
    398413
    399414/**
Note: See TracChangeset for help on using the changeset viewer.