Changeset 10821 for code/branches/cpp11_v2/src/modules/tetris

Timestamp:

Nov 21, 2015, 7:05:53 PM (9 years ago)

Author:

muemart

Message:

Run clang-modernize -loop-convert

• Again, not all possible loops were converted
• It can do pretty cool transformations, but I had to fix a few compile errors, so there might be some runtime errors lurking around too

Location:

code/branches/cpp11_v2/src/modules/tetris

Files:

• Tetris.cc (modified) (3 diffs)
• TetrisBrick.cc (modified) (1 diff)

code/branches/cpp11_v2/src/modules/tetris/Tetris.cc

@@ -104 +104 @@
         }
 
-        for (std::list<StrongPtr<TetrisStone>>::iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
-            (*it)->destroy();
+        for (auto & elem : this->stones_)
+            (elem)->destroy();
         this->stones_.clear();
     }
@@ -341 +341 @@
     {
         // Spawn a human player.
-        for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
-            if (it->first->isHumanPlayer() && (it->first->isReadyToSpawn() || this->bForceSpawn_))
-                this->spawnPlayer(it->first);
+        for (auto & elem : this->players_)
+            if (elem.first->isHumanPlayer() && (elem.first->isReadyToSpawn() || this->bForceSpawn_))
+                this->spawnPlayer(elem.first);
     }
     
@@ -502 +502 @@
         }
       // adjust height of stones above the deleted row //TODO: check if this could be a source of a bug.
-        for(std::list<StrongPtr<TetrisStone>>::iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
-        {
-            if(static_cast<unsigned int>(((*it)->getPosition().y - 5)/this->center_->getStoneSize()) > row)
-                (*it)->setPosition((*it)->getPosition()-Vector3(0,10,0));
+        for(auto & elem : this->stones_)
+        {
+            if(static_cast<unsigned int>(((elem)->getPosition().y - 5)/this->center_->getStoneSize()) > row)
+                (elem)->setPosition((elem)->getPosition()-Vector3(0,10,0));
         }
 

code/branches/cpp11_v2/src/modules/tetris/TetrisBrick.cc

@@ -239 +239 @@
     {
         assert(this->tetris_);
-        for(unsigned int i = 0; i < this->brickStones_.size(); i++)
-        {
-            this->brickStones_[i]->detachFromParent();
-            this->brickStones_[i]->attachToParent(center);
-            this->brickStones_[i]->setPosition(this->getPosition()+this->tetris_->rotateVector(this->brickStones_[i]->getPosition(),this->rotationCount_ ));
+        for(auto & elem : this->brickStones_)
+        {
+            elem->detachFromParent();
+            elem->attachToParent(center);
+            elem->setPosition(this->getPosition()+this->tetris_->rotateVector(elem->getPosition(),this->rotationCount_ ));
         }
         this->brickStones_.clear();