Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9406 in orxonox.OLD for trunk/src/util/animation


Ignore:
Timestamp:
Jul 24, 2006, 11:09:47 AM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

Location:
trunk/src/util/animation
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/util/animation/animation3d.cc

    r5115 r9406  
    2525#include "p_node.h"
    2626
    27 using namespace std;
     27
    2828
    2929/**
  • trunk/src/util/animation/animation_player.cc

    r5777 r9406  
    2020#include "compiler.h"
    2121
    22 using namespace std;
     22
    2323
    2424
     
    100100  {
    101101      // iterate through all the animations and tick them.
    102     list<Animation*>::iterator anim;
     102    std::list<Animation*>::iterator anim;
    103103    for (anim = this->animationList.begin(); anim != this->animationList.end(); anim++)
    104104    {
     
    135135Animation* AnimationPlayer::getAnimationFromBaseObject(const BaseObject* baseObject) const
    136136{
    137   list<Animation*>::const_iterator anim;
     137  std::list<Animation*>::const_iterator anim;
    138138  for (anim = this->animationList.begin(); anim != this->animationList.end(); anim++)
    139139    if((*anim)->getBaseObject() == baseObject)
     
    156156  PRINT(0)("-Animation Information---------------+\n");
    157157  // Per ANIMATION DEBUG
    158   list<Animation*>::iterator anim;
     158  std::list<Animation*>::iterator anim;
    159159  for (anim = this->animationList.begin(); anim != this->animationList.end(); anim++)
    160160    {
Note: See TracChangeset for help on using the changeset viewer.