Changeset 12376 for code/branches/OrxoBlox_FS19/src/modules
- Timestamp:
- May 16, 2019, 2:20:38 PM (6 years ago)
- Location:
- code/branches/OrxoBlox_FS19/src/modules
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc
r12371 r12376 98 98 */ 99 99 void OrxoBlox::cleanup() 100 { 100 { 101 101 //if (this->ball_ != nullptr) // Destroy the ball, if present. 102 102 //{ … … 105 105 //} 106 106 107 if (this->futureWall_ != nullptr)107 /*if (this->futureWall_ != nullptr) 108 108 { 109 109 this->futureWall_->destroy(); 110 110 this->futureWall_ = nullptr; 111 111 } 112 112 */ 113 113 114 for (OrxoBloxWall* wall : this->activeWalls_) 114 115 if (wall != nullptr) 115 wall->destroy();116 wall->destroy(); 116 117 this->activeWalls_.clear(); 117 118 … … 132 133 133 134 { 135 orxout() << "Orxoblox started" << endl; 134 136 if (this->center_ != nullptr) // There needs to be a OrxoBloxCenterpoint, i.e. the area the game takes place. 135 137 { … … 222 224 void OrxoBlox::LevelUp(){ 223 225 level_++; 226 int z_; 227 228 orxout() << "level up called" << endl; 224 229 this->playerScored(this->player_);// add points 225 230 for(OrxoBloxStones* stone : this->stones_){ 226 231 int x_=(stone->getPosition()).x; 227 232 int y_=(stone->getPosition()).y; 228 intz_=(stone->getPosition()).z;233 z_=(stone->getPosition()).z; 229 234 //if(z_==90)this->end(); 230 235 231 236 stone->setPosition(x_,y_,z_+9.0f); 232 233 if( z_ >= 45){ 234 this->end(); 235 } 237 236 238 } 237 239 … … 266 268 //create balls 267 269 //insert new wall 270 if( z_ >= 45){ 271 orxout() << "calling end() function" << endl; 272 this->end(); 273 } 274 268 275 } 269 276 -
code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc
r12368 r12376 128 128 */ 129 129 void OrxoBloxBall::tick(float dt) 130 { 130 { 131 131 132 SUPER(OrxoBloxBall, tick, dt); 132 133 … … 148 149 149 150 orxoblox_->LevelUp(); 151 orxoblox_->LevelUp(); 152 orxout() << "LevelUp 2 finished, trying to call end() function"; 153 //this->end(); 154 150 155 151 156 … … 294 299 Vector3 positionStone = Stone->getPosition(); 295 300 Vector3 myPosition = this->getPosition(); 296 orxout() << "About to Bounce >D" << endl;301 //orxout() << "About to Bounce >D" << endl; 297 302 298 303 int distance_X = myPosition.x - positionStone.x; … … 306 311 distance_Z = -distance_Z; 307 312 308 orxout() << distance_X << endl;309 orxout() << distance_Z << endl;313 //orxout() << distance_X << endl; 314 //orxout() << distance_Z << endl; 310 315 311 316 if (distance_X < distance_Z) { 312 317 velocity.z = -velocity.z; 313 orxout() << "z" << endl;318 //orxout() << "z" << endl; 314 319 } 315 320 else if (distance_Z < distance_X) { 316 321 velocity.x = -velocity.x; 317 orxout() << "x" << endl;322 //orxout() << "x" << endl; 318 323 } 319 324 else { 320 325 velocity.x = -velocity.x; 321 326 velocity.z = -velocity.z; 322 orxout() << "both" << endl;327 //orxout() << "both" << endl; 323 328 } 324 329 -
code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc
r12371 r12376 104 104 Vector3 myPosition = otherObject->getPosition(); 105 105 btVector3 positionOtherObject = contactPoint.getPositionWorldOnA(); 106 orxout() << "About to Bounce >D" << endl;106 //orxout() << "About to Bounce >D" << endl; 107 107 //if (positionOtherObject.y < 0) { 108 108 //this.destroy() … … 120 120 distance_Z = -distance_Z; 121 121 122 orxout() << distance_X << endl;123 orxout() << distance_Z << endl;122 //orxout() << distance_X << endl; 123 //orxout() << distance_Z << endl; 124 124 125 125 if (distance_X < distance_Z) { 126 126 velocity.z = -velocity.z; 127 orxout() << "z" << endl;127 //orxout() << "z" << endl; 128 128 } 129 129 if (distance_Z < distance_X) { 130 130 velocity.x = -velocity.x; 131 orxout() << "x" << endl;131 //orxout() << "x" << endl; 132 132 } 133 133 else { 134 134 velocity.x = -velocity.x; 135 135 velocity.z = -velocity.z; 136 orxout() << "both" << endl;136 //orxout() << "both" << endl; 137 137 } 138 138 this->setVelocity(velocity); … … 144 144 { 145 145 146 orxout() << "wanna bounce..." << endl;146 //orxout() << "wanna bounce..." << endl; 147 147 bool result = BasicProjectile::processCollision(otherObject, contactPoint, cs); 148 148 if (result == true) { … … 151 151 } 152 152 } 153 orxout() << "BOUNCED!" << endl;153 //orxout() << "BOUNCED!" << endl; 154 154 155 155 return result; … … 198 198 //this->setSpeed(0); // doesn't work here, why??; 199 199 //Stopping ball 200 orxout() << "Ball stopped" << endl;200 //orxout() << "Ball stopped" << endl; 201 201 velocity.x = 0; 202 202 velocity.y = 0; -
code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BasicProjectile.cc
r12291 r12376 85 85 bool BasicProjectile::processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs) 86 86 { 87 orxout() << "OMG A COLLISION" << endl;87 //orxout() << "OMG A COLLISION" << endl; 88 88 if (!this->bDestroy_ && GameMode::isMaster()) 89 89 {
Note: See TracChangeset
for help on using the changeset viewer.