- Timestamp:
- May 16, 2019, 11:11:39 AM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc
r12367 r12368 106 106 } 107 107 108 if (this->futureWall_ )108 if (this->futureWall_ != nullptr) 109 109 { 110 110 this->futureWall_->destroy(); … … 113 113 114 114 for (OrxoBloxWall* wall : this->activeWalls_) 115 if (wall != nullptr) 115 116 wall->destroy(); 116 117 this->activeWalls_.clear(); … … 118 119 119 120 for (OrxoBloxStones* stone : this->stones_) 121 if(stone != nullptr) 120 122 stone->destroy(); 121 123 this->stones_.clear(); … … 285 287 this->ball_->setSpeed(this->center_->getBallSpeed()); 286 288 } 287 289 288 290 OrxoBloxStones* OrxoBlox::CheckForCollision(OrxoBloxBall* Ball) { 289 291 … … 314 316 } 315 317 318 /* 319 bool OrxoBlox::Intersect(int XpositionBall, int XPositionBlock, int YPositionBall, int YPositionBlock, int radiusBall, int sizeBlock) { 320 distanceX = XpositionBall - XPositionBlock; 321 distanceY = YPositionBall - YPositionBlock; 322 if (distanceX < 0) { 323 distanceX = -distanceX; 324 } 325 if (distanceY < 0) { 326 distanceY = -distanceY; 327 } 328 if((distanceX <= radiusBall + sizeBlock) || (distanceY <= radiusBall + sizeBlock)) { 329 return true; 330 } 331 else { 332 top = YPositionBall + radiusBall; 333 right = XpositionBall + radiusBall; 334 bottom = YPositionBall - radiusBall; 335 left = XpositionBall - radiusBall; 336 337 if((top >= YPositionBlock - size) && (top <= YPositionBlock + size) && (left <= XPositionBlock + size) && (left >= XPositionBlock - size)) 338 } 339 } 340 */ 316 341 }
Note: See TracChangeset
for help on using the changeset viewer.