Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5110 in orxonox.OLD for trunk/src/util


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

orxonox/trunk: changed the behaviour of the iterator.
Now it is soon possible to walk through a List from front and back, and tell the Iterator from where to seek

@patrick: i had to disable your Collision-Detection algorithms, because they had a seekElement inside, that i did not entirely grasp the meaning of….
trying to fix this now

Location:
trunk/src/util
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/util/animation/animation3d.cc

    r5062 r5110  
    5858  // delete all the KeyFrames
    5959  tIterator<KeyFrame3D>* itKF = keyFrameList->getIterator();
    60   KeyFrame3D*  enumKF = itKF->nextElement();
     60  KeyFrame3D*  enumKF = itKF->firstElement();
    6161  while (enumKF)
    6262    {

  • trunk/src/util/animation/animation_player.cc

    r4836 r5110  
    8686  // deleting the Animation List AND all the elements of the List
    8787  tIterator<Animation>* animIt = this->animationList->getIterator();
    88   Animation* anim = animIt->nextElement();
     88  Animation* anim = animIt->firstElement();
    8989  while( anim != NULL)
    9090    {
    … …  
    109109      // iterate through all the animations and tick them.
    110110      tIterator<Animation>* animIt = this->animationList->getIterator();
    111       Animation* anim = animIt->nextElement();
     111      Animation* anim = animIt->firstElement();
    112112      while( anim != NULL)
    113113        {
    … …  
    147147{
    148148  tIterator<Animation>* animIt = this->animationList->getIterator();
    149   Animation* anim = animIt->nextElement();
     149  Animation* anim = animIt->firstElement();
    150150  while( anim != NULL)
    151151    {
    … …  
    176176  // Per ANIMATION DEBUG
    177177  tIterator<Animation>* animIt = this->animationList->getIterator();
    178   Animation* anim = animIt->nextElement();
     178  Animation* anim = animIt->firstElement();
    179179  while( anim != NULL)
    180180    {

  • trunk/src/util/animation/t_animation.h

    r5039 r5110  
    108108  // delete all the KeyFrames
    109109  tIterator<KeyFrameF>* itKF = keyFrameList->getIterator();
    110   KeyFrameF*  enumKF = itKF->nextElement();
     110  KeyFrameF*  enumKF = itKF->firstElement();
    111111  while (enumKF)
    112112    {

  • trunk/src/util/garbage_collector.cc

    r4979 r5110  
    156156//
    157157//   tIterator<WorldEntity>* iterator = list->getIterator();
    158 //   WorldEntity* entity = iterator->nextElement();
     158//   WorldEntity* entity = iterator->firstElement();
    159159//   while( entity != NULL)
    160160//     {

  • trunk/src/util/loading/load_param.cc

    r5102 r5110  
    295295
    296296  tIterator<LoadParamDescription>* iterator = this->paramList->getIterator();
    297   LoadParamDescription* enumParamDesc = iterator->nextElement();
     297  LoadParamDescription* enumParamDesc = iterator->firstElement();
    298298  while (enumParamDesc)
    299299    {
    … …  
    314314{
    315315  tIterator<LoadClassDescription>* iterator = LoadClassDescription::classList->getIterator();
    316   LoadClassDescription* enumClassDesc = iterator->nextElement();
     316  LoadClassDescription* enumClassDesc = iterator->firstElement();
    317317  while (enumClassDesc)
    318318    {
    … …  
    336336{
    337337  tIterator<LoadParamDescription>* iterator = this->paramList->getIterator();
    338   LoadParamDescription* enumParamDesc = iterator->nextElement();
     338  LoadParamDescription* enumParamDesc = iterator->firstElement();
    339339  while (enumParamDesc)
    340340    {
    … …  
    362362  PRINT(3)(" Listing all the Loadable Options (loaded since Game started).\n\n");
    363363  tIterator<LoadClassDescription>* classIT = LoadClassDescription::classList->getIterator();
    364   LoadClassDescription* enumClassDesc = classIT->nextElement();
     364  LoadClassDescription* enumClassDesc = classIT->firstElement();
    365365  while (enumClassDesc)
    366366    {
    367367      PRINT(3)("<%s>\n", enumClassDesc->className);
    368368      tIterator<LoadParamDescription>* paramIT = enumClassDesc->paramList->getIterator();
    369       LoadParamDescription* enumParamDesc = paramIT->nextElement();
     369      LoadParamDescription* enumParamDesc = paramIT->firstElement();
    370370      while (enumParamDesc)
    371371        {
    … …  
    394394
    395395  tIterator<LoadClassDescription>* iterator = LoadClassDescription::classList->getIterator();
    396   LoadClassDescription* enumClassDesc = iterator->nextElement();
     396  LoadClassDescription* enumClassDesc = iterator->firstElement();
    397397  while (enumClassDesc)
    398398  {
    … …  
    412412// {
    413413//   tIterator<LoadClassDescription>* iterator = LoadClassDescription::classList->getIterator();
    414 //   LoadClassDescription* enumClassDesc = iterator->nextElement();
     414//   LoadClassDescription* enumClassDesc = iterator->firstElement();
    415415//   while (enumClassDesc)
    416416//   {

  • trunk/src/util/resource_manager.cc

    r5101 r5110  
    7474  // deleting the Directorie Lists
    7575  tIterator<char>* tmpIt = imageDirs->getIterator();
    76   char* tmpDir = tmpIt->nextElement();
     76  char* tmpDir = tmpIt->firstElement();
    7777  while(tmpDir)
    7878    {
    … …  
    144144      // check if the Directory has been added before
    145145      tIterator<char>* tmpImageDirs = imageDirs->getIterator();
    146       char* tmpDir = tmpImageDirs->nextElement();
     146      char* tmpDir = tmpImageDirs->firstElement();
    147147      while(tmpDir)
    148148        {
    … …  
    363363            {
    364364              tIterator<char>* iterator = imageDirs->getIterator();
    365               tmpDir = iterator->nextElement();
    366               //tmpDir = imageDirs->enumerate();
     365              tmpDir = iterator->firstElement();
    367366              while(tmpDir)
    368367                {
    … …  
    492491{
    493492  tIterator<Resource>* iterator = resourceList->getIterator();
    494   Resource* enumRes = iterator->nextElement();
     493  Resource* enumRes = iterator->firstElement();
    495494  while (enumRes)
    496495    {
    … …  
    521520  //  Resource* enumRes = resourceList->enumerate();
    522521  tIterator<Resource>* iterator = resourceList->getIterator();
    523   Resource* enumRes = iterator->nextElement();
     522  Resource* enumRes = iterator->firstElement();
    524523  while (enumRes)
    525524    {
    … …  
    603602  //  Resource* enumRes = resourceList->enumerate();
    604603  tIterator<Resource>* iterator = resourceList->getIterator();
    605   Resource* enumRes = iterator->nextElement();
     604  Resource* enumRes = iterator->firstElement();
    606605  while (enumRes)
    607606    {
    … …  
    799798  PRINT(0)(" List of Image-Directories: ");
    800799  tIterator<char>* tmpIt = imageDirs->getIterator();
    801   char* tmpDir = tmpIt->nextElement();
     800  char* tmpDir = tmpIt->firstElement();
    802801  while(tmpDir)
    803802    {
    … …  
    810809  PRINT(0)("List of all stored Resources:\n");
    811810  tIterator<Resource>* iterator = resourceList->getIterator();
    812   Resource* enumRes = iterator->nextElement();
     811  Resource* enumRes = iterator->firstElement();
    813812  while (enumRes)
    814813    {

  • trunk/src/util/shell.cc

    r5108 r5110  
    9191  // delete all the Chars in the Buffers
    9292  tIterator<char>* charIterator = this->buffer->getIterator();
    93   char* charElem = charIterator->nextElement();
     93  char* charElem = charIterator->firstElement();
    9494  while (charElem != NULL)
    9595  {
    … …  
    191191  // delete all the Chars in the Buffers
    192192  tIterator<char>* charIterator = this->buffer->getIterator();
    193   char* charElem = charIterator->nextElement();
     193  char* charElem = charIterator->firstElement();
    194194
    195195  while (charElem != NULL)
    … …  
    289289{
    290290  tIterator<char>* charIterator = this->buffer->getIterator();
    291   char* charElem = charIterator->nextElement();
     291  char* charElem = charIterator->firstElement();
    292292
    293293  int i = 1;
    … …  
    606606    addLength = strlen(addString);
    607607  tIterator<const char>* charIterator = stringList->getIterator();
    608   const char* charElem = charIterator->nextElement();
     608  const char* charElem = charIterator->firstElement();
    609609  while (charElem != NULL)
    610610  {
    … …  
    655655
    656656  tIterator<const char>* iterator = inputList->getIterator();
    657   const char* enumString = iterator->nextElement();
     657  const char* enumString = iterator->firstElement();
    658658  while (enumString != NULL)
    659659  {
    … …  
    687687
    688688  tIterator<BaseObject>* iterator = inputList->getIterator();
    689   BaseObject* enumBO = iterator->nextElement();
     689  BaseObject* enumBO = iterator->firstElement();
    690690  while (enumBO != NULL)
    691691  {

  • trunk/src/util/track/track_manager.cc

    r5079 r5110  
    7979    {
    8080      tIterator<TrackElement>* iterator = this->children->getIterator();
    81       TrackElement* enumElem = iterator->nextElement();
     81      TrackElement* enumElem = iterator->firstElement();
    8282      while (enumElem)
    8383        {
    … …  
    104104    {
    105105      tIterator<TrackElement>* iterator = this->children->getIterator();
    106       TrackElement* enumElem = iterator->nextElement();
     106      TrackElement* enumElem = iterator->firstElement();
    107107      TrackElement* tmpElem;
    108108      while (enumElem)
    … …  
    133133    {
    134134      tIterator<TrackElement>* iterator = this->children->getIterator();
    135       TrackElement* enumElem = iterator->nextElement();
     135      TrackElement* enumElem = iterator->firstElement();
    136136      TrackElement* tmpElem;
    137137      while (enumElem)
    … …  
    179179    {
    180180      tIterator<TrackElement>* iterator = this->children->getIterator();
    181       TrackElement* enumElem = iterator->nextElement();
     181      TrackElement* enumElem = iterator->firstElement();
    182182      while (enumElem)
    183183        {
    … …  
    206206
    207207  tIterator<TrackElement>* iterator = this->children->getIterator();
    208   TrackElement* enumElem = iterator->nextElement();
     208  TrackElement* enumElem = iterator->firstElement();
    209209  for (int i = 0; i < childCount; i++)
    210210    enumElem = iterator->nextElement();
    … …  
    234234      //TrackElement* enumElem = this->children->enumerate();
    235235      tIterator<TrackElement>* iterator = this->children->getIterator();
    236       TrackElement* enumElem = iterator->nextElement();
     236      TrackElement* enumElem = iterator->firstElement();
    237237      while (enumElem)
    238238        {
    … …  
    331331  //TrackElement* enumElem = this->children->enumerate();
    332332  tIterator<TrackElement>* iterator = this->children->getIterator();
    333   TrackElement* enumElem = iterator->nextElement();
     333  TrackElement* enumElem = iterator->firstElement();
    334334  while (enumElem)
    335335    {
    … …  
    975975      //TrackElement* enumElem = firstJoint->children->enumerate();
    976976      tIterator<TrackElement>* iterator = firstJoint->children->getIterator();
    977       TrackElement* enumElem = iterator->nextElement();
     977      TrackElement* enumElem = iterator->firstElement();
    978978      while (enumElem)
    979979        {
    … …  
    10011001        {
    10021002          tIterator<TrackElement>* iterator = tmpElem->children->getIterator();
    1003           TrackElement* enumElem = iterator->nextElement();
     1003          TrackElement* enumElem = iterator->firstElement();
    10041004          //TrackElement* enumElem = tmpElem->children->enumerate();
    10051005          while (enumElem)
Note: See TracChangeset for help on using the changeset viewer.