Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5110 in orxonox.OLD for trunk/src/lib/graphics


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/lib/graphics
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/graphics/importer/model.cc

    r4844 r5110  
    192192
    193193    tIterator<Material>* tmpIt = this->materialList->getIterator();
    194     Material* material = tmpIt->nextElement();
     194    Material* material = tmpIt->firstElement();
    195195  //! @todo do we really have to delete this material??
    196196    while(material)
    … …  
    413413{
    414414  tIterator<Material>* tmpIt = this->materialList->getIterator();
    415   Material* material = tmpIt->nextElement();
     415  Material* material = tmpIt->firstElement();
    416416  while(material)
    417417    {

  • trunk/src/lib/graphics/render2D/element_2d.cc

    r5108 r5110  
    5555
    5656  tIterator<Element2D>* iterator = this->children->getIterator();
    57   Element2D* pn = iterator->nextElement();
     57  Element2D* pn = iterator->firstElement();
    5858  while( pn != NULL)
    5959  {
    … …  
    479479{
    480480  tIterator<Element2D>* iterator = this->children->getIterator();
    481   Element2D* pn = iterator->nextElement();
     481  Element2D* pn = iterator->firstElement();
    482482
    483483  while( pn != NULL)
    … …  
    687687  {
    688688    tIterator<Element2D>* iterator = this->children->getIterator();
    689     Element2D* pn = iterator->nextElement();
     689    Element2D* pn = iterator->firstElement();
    690690    while( pn != NULL)
    691691    {
    … …  
    697697
    698698      pn->update2D(dt);
    699           //pn = this->children->nextElement();
    700699      pn = iterator->nextElement();
    701700    }
    … …  
    735734  {
    736735    tIterator<Element2D>* iterator = this->children->getIterator();
    737     Element2D* pn = iterator->nextElement();
     736    Element2D* pn = iterator->firstElement();
    738737    while( pn != NULL)
    739738    {

  • trunk/src/lib/graphics/render2D/render_2d.cc

    r5078 r5110  
    105105  {
    106106    tIterator<Element2D>* iterator = this->element2DList[i]->getIterator();
    107     Element2D* elem = iterator->nextElement();
     107    Element2D* elem = iterator->firstElement();
    108108    while (elem != NULL)
    109109    {
    … …  
    131131    {
    132132      tIterator<Element2D>* iterator = this->element2DList[i]->getIterator();
    133       Element2D* elem = iterator->nextElement();
     133      Element2D* elem = iterator->firstElement();
    134134      while (elem != NULL)
    135135      {

  • trunk/src/lib/graphics/spatial_separation/quadtree_node.cc

    r5075 r5110  
    253253  counter = 0;
    254254  iterator = listA->getIterator();
    255   tempTri = iterator->nextElement();
     255  tempTri = iterator->firstElement();
    256256  while( tempTri)
    257257  {
    … …  
    262262  counter = 0;
    263263  iterator = listB->getIterator();
    264   tempTri = iterator->nextElement();
     264  tempTri = iterator->firstElement();
    265265  while( tempTri)
    266266  {
    … …  
    271271  counter = 0;
    272272  iterator = listC->getIterator();
    273   tempTri = iterator->nextElement();
     273  tempTri = iterator->firstElement();
    274274  while( tempTri)
    275275  {
    … …  
    280280  counter = 0;
    281281  iterator = listD->getIterator();
    282   tempTri = iterator->nextElement();
     282  tempTri = iterator->firstElement();
    283283  while( tempTri)
    284284  {

  • trunk/src/lib/graphics/text_engine.cc

    r5106 r5110  
    845845
    846846  tIterator<BaseObject>* textIterator = ClassList::getList(CL_TEXT)->getIterator();
    847   Text* text = dynamic_cast<Text*>(textIterator->nextElement());
     847  Text* text = dynamic_cast<Text*>(textIterator->firstElement());
    848848  while( text != NULL)
    849849    {
Note: See TracChangeset for help on using the changeset viewer.