- Timestamp:
- Jan 10, 2016, 1:54:11 PM (8 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/src/modules/designtools/SkyboxGenerator.cc
r10624 r11054 82 82 this->faceCounter_ = 0; 83 83 84 this->names_. push_back("fr");85 this->names_. push_back("lf");86 this->names_. push_back("bk");87 this->names_. push_back("rt");88 this->names_. push_back("up");89 this->names_. push_back("dn");90 91 this->rotations_. push_back(std::pair<int, int>(90, 0));92 this->rotations_. push_back(std::pair<int, int>(90, 0));93 this->rotations_. push_back(std::pair<int, int>(90, 0));94 this->rotations_. push_back(std::pair<int, int>(90, 90));95 this->rotations_. push_back(std::pair<int, int>(0, 180));96 this->rotations_. push_back(std::pair<int, int>(0, 90));84 this->names_.emplace_back("fr"); 85 this->names_.emplace_back("lf"); 86 this->names_.emplace_back("bk"); 87 this->names_.emplace_back("rt"); 88 this->names_.emplace_back("up"); 89 this->names_.emplace_back("dn"); 90 91 this->rotations_.emplace_back(90, 0); 92 this->rotations_.emplace_back(90, 0); 93 this->rotations_.emplace_back(90, 0); 94 this->rotations_.emplace_back(90, 90); 95 this->rotations_.emplace_back(0, 180); 96 this->rotations_.emplace_back(0, 90); 97 97 } 98 98 … … 146 146 } 147 147 148 ControllableEntity* entity = NULL;149 if(HumanController::getLocalControllerSingleton() != NULL && HumanController::getLocalControllerSingleton()->getControllableEntity() != NULL)148 ControllableEntity* entity = nullptr; 149 if(HumanController::getLocalControllerSingleton() != nullptr && HumanController::getLocalControllerSingleton()->getControllableEntity() != nullptr) 150 150 entity = HumanController::getLocalControllerSingleton()->getControllableEntity(); 151 151 else
Note: See TracChangeset
for help on using the changeset viewer.