Changeset 11071 for code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc
r11052 r11071 70 70 RegisterObject(OrxonoxOverlay); 71 71 72 this->owner_ = 0;73 this->group_ = 0;72 this->owner_ = nullptr; 73 this->group_ = nullptr; 74 74 75 75 if (!GameMode::showsGraphics()) … … 94 94 this->angle_ = Degree(0.0); 95 95 this->bCorrectAspect_ = false; 96 this->rotState_ = Horizontal;96 this->rotState_ = RotationState::Horizontal; 97 97 this->angleChanged(); // updates all other values as well 98 98 … … 259 259 { 260 260 tempAspect = 1.0f / this->windowAspectRatio_; 261 rotState_ = Vertical;261 rotState_ = RotationState::Vertical; 262 262 } 263 263 else if (angle > 179 || angle < 1) 264 264 { 265 265 tempAspect = this->windowAspectRatio_; 266 rotState_ = Horizontal;266 rotState_ = RotationState::Horizontal; 267 267 } 268 268 else 269 269 { 270 270 tempAspect = 1.0f; 271 rotState_ = Inbetween;271 rotState_ = RotationState::Inbetween; 272 272 } 273 273
Note: See TracChangeset
for help on using the changeset viewer.