Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10581 in orxonox.OLD for branches/cleanup/src/world_entities


Ignore:
Timestamp:
Feb 8, 2007, 12:20:20 AM (17 years ago)
Author:
bensch
Message:

changed the animation3D and t_animation to match the new list structure… but i think it breaks workability… they are strange anyways

also removed the track, as it seems quite hacked in.
Here i uncommented everything for later reinjection

Location:
branches/cleanup/src/world_entities
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r10495 r10581  
    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

    r10552 r10581  
    153153  if( this->entityTrack)
    154154  {
    155       this->setParent(this->entityTrack->getTrackNode());
     155/*      this->setParent(this->entityTrack->getTrackNode());*/
    156156      this->setRelCoor(0,0,0);
    157157  }
    … …  
    427427  this->bFire = false;
    428428
    429  if(this->entityTrack)
    430     this->entityTrack->tick(dt);
     429// if(this->entityTrack)
     430//     this->entityTrack->tick(dt);
    431431
    432432}
    … …  
    434434void NPC::draw() const
    435435{
    436  if( this->entityTrack != NULL && this->isDrawTrack())
    437   this->entityTrack->drawGraph();
     436// if( this->entityTrack != NULL && this->isDrawTrack())
     437//   this->entityTrack->drawGraph();
    438438
    439439 WorldEntity::draw();

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

    r10579 r10581  
    494494void SpaceShip::draw () const
    495495{
    496   if( this->entityTrack != NULL && this->isDrawTrack())
    497     this->entityTrack->drawGraph();
     496//   if( this->entityTrack != NULL && this->isDrawTrack())
     497//     this->entityTrack->drawGraph();
    498498
    499499  WorldEntity::draw();
    … …  
    551551
    552552  // Tracktick
    553   if(this->entityTrack)
    554     this->entityTrack->tick(time);
     553//   if(this->entityTrack)
     554//     this->entityTrack->tick(time);
    555555
    556556
    … …  
    868868        this->isTravelDistanceInit = false;
    869869
    870         if(this->entityTrack)
    871            this->travelNode->setParent(this->entityTrack->getTrackNode());
     870//         if(this->entityTrack)
     871//            this->travelNode->setParent(this->entityTrack->getTrackNode());
    872872
    873873        this->setParent(this->travelNode);

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

    r10439 r10581  
    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();
     140// if( 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

    r10546 r10581  
    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.