Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10588 in orxonox.OLD


Ignore:
Timestamp:
Feb 13, 2007, 3:36:20 PM (17 years ago)
Author:
bensch
Message:

removed track manager and reinjected the Track

Location:
branches/cleanup/src
Files:
4 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • branches/cleanup/src/lib/math/curve.h

    r10581 r10588  
    7272
    7373  std::list<PathNode>   nodeList;        //!< A list of all the Nodes of a Curve.
    74   std::list<PathNode>::iterator   nodeIterator;    //!< An iterator that should point to the current Node
    7574  PathNode*             firstNode;       //!< First node of the curve.
    7675  PathNode*             currentNode;     //!< The node we are working with (the Last node).

  • branches/cleanup/src/util/Makefile.am

    r10581 r10588  
    2424                        animation/animation3d.cc \
    2525                        animation/animation.cc \
    26                         animation/animation_player.cc
     26                        animation/animation_player.cc \
     27                        \
     28                        track/track.cc
    2729
    2830noinst_HEADERS =        \
    … …  
    4547                        animation/animation.h \
    4648                        animation/animation_player.h \
    47                         animation/t_animation.h
     49                        animation/t_animation.h \
     50                        \
     51                        track/track.h

  • branches/cleanup/src/world_entities/camera.cc

    r10581 r10588  
    102102
    103103  //add to track
    104 /*  if(this->entityTrack)
     104  if(this->entityTrack)
    105105   {
    106106    this->setParent(this->entityTrack->getTrackNode());
    107107    //this->setRelCoor(0,0,0);
    108    }*/
     108   }
    109109}
    110110
    … …  
    227227  {
    228228    //PRINTF(0)("tickytackytucky\n");
    229 /*    this->entityTrack->tick(dt);*/
     229    this->entityTrack->tick(dt);
    230230    //this->setAbsCoor(this->entityTrack->getTrackNode()->getAbsCoor());
    231231  }
    … …  
    240240void Camera::draw() const
    241241{
    242 /*  if( this->entityTrack != NULL && this->isDrawTrack())
    243     this->entityTrack->drawGraph();*/
     242  if( this->entityTrack != NULL && this->isDrawTrack())
     243    this->entityTrack->drawGraph();
    244244}
    245245

  • branches/cleanup/src/world_entities/npcs/npc.cc

    r10583 r10588  
    152152  if( this->entityTrack)
    153153  {
    154 /*      this->setParent(this->entityTrack->getTrackNode());*/
     154      this->setParent(this->entityTrack->getTrackNode());
    155155      this->setRelCoor(0,0,0);
    156156  }
    … …  
    426426  this->bFire = false;
    427427
    428 // if(this->entityTrack)
    429 //     this->entityTrack->tick(dt);
     428 if(this->entityTrack)
     429    this->entityTrack->tick(dt);
    430430
    431431}
    … …  
    433433void NPC::draw() const
    434434{
    435 // if( this->entityTrack != NULL && this->isDrawTrack())
    436 //   this->entityTrack->drawGraph();
     435 if( this->entityTrack != NULL && this->isDrawTrack())
     436  this->entityTrack->drawGraph();
    437437
    438438 WorldEntity::draw();

  • branches/cleanup/src/world_entities/space_ships/space_ship.cc

    r10583 r10588  
    493493void SpaceShip::draw () const
    494494{
    495 //   if( this->entityTrack != NULL && this->isDrawTrack())
    496 //     this->entityTrack->drawGraph();
     495  if( this->entityTrack != NULL && this->isDrawTrack())
     496    this->entityTrack->drawGraph();
    497497
    498498  WorldEntity::draw();
    … …  
    550550
    551551  // Tracktick
    552 //   if(this->entityTrack)
    553 //     this->entityTrack->tick(time);
     552  if(this->entityTrack)
     553    this->entityTrack->tick(time);
    554554
    555555
    … …  
    867867        this->isTravelDistanceInit = false;
    868868
    869 //         if(this->entityTrack)
    870 //            this->travelNode->setParent(this->entityTrack->getTrackNode());
     869        if(this->entityTrack)
     870           this->travelNode->setParent(this->entityTrack->getTrackNode());
    871871
    872872        this->setParent(this->travelNode);

  • branches/cleanup/src/world_entities/test_entity.cc

    r10581 r10588  
    8686
    8787 //add to track
    88 //   if(this->entityTrack)
    89 //     this->setParent(this->entityTrack->getTrackNode());
     88  if(this->entityTrack)
     89    this->setParent(this->entityTrack->getTrackNode());
    9090
    9191}
    … …  
    138138
    139139
    140 // if( this->entityTrack != NULL)
    141 //     this->entityTrack->drawGraph();
     140if( this->entityTrack != NULL)
     141    this->entityTrack->drawGraph();
    142142
    143143}
    … …  
    148148void TestEntity::tick (float time)
    149149{
    150 // if(this->entityTrack)
    151 //     this->entityTrack->tick(time);
     150 if(this->entityTrack)
     151    this->entityTrack->tick(time);
    152152
    153153

  • branches/cleanup/src/world_entities/world_entity.cc

    r10581 r10588  
    185185{
    186186  // The problem we have is most likely here. The track should be constructed WITH the XML-Code
    187 /*  this->entityTrack = new Track(root);
     187  this->entityTrack = new Track(root);
    188188  this->setParent(this->entityTrack->getTrackNode());
    189   this->entityTrack->getTrackNode()->setParentMode(PNODE_ALL);*/
     189  this->entityTrack->getTrackNode()->setParentMode(PNODE_ALL);
    190190  /*LOAD_PARAM_START_CYCLE(root, element);
    191191  {
    … …  
    200200void WorldEntity::pauseTrack(bool stop)
    201201{
    202 /*     if(this->entityTrack)
    203        this->entityTrack->pauseTrack(stop);*/
     202     if(this->entityTrack)
     203       this->entityTrack->pauseTrack(stop);
    204204}
    205205
Note: See TracChangeset for help on using the changeset viewer.