Changeset 10286 in orxonox.OLD for branches/playability/src/world_entities/projectiles/spike_ball.cc

Timestamp:

Jan 17, 2007, 9:23:49 PM (18 years ago)

Author:

nicolasc

Message:

code cleanup, rebuilt spikeball

File:

• branches/playability/src/world_entities/projectiles/spike_ball.cc (modified) (12 diffs)

branches/playability/src/world_entities/projectiles/spike_ball.cc

@@ -55 +55 @@
   this->emitter->setEmissionVelocity(50.0);
 
-//   this->speed = 150;
-/*
-  this->angle = 0;
-  this->rotationSpeed = 130;*/
   this->setRotationSpeed(130);
 
@@ -70 +66 @@
 
   this->launcher = new Vector [this->getFragments()];
-
-//   this->fastFactory = tFastFactory<Spike>::getFastFactory(CL_SPIKE, "Spike");
-
-/*
-  this->weaponMan = new WeaponManager(dynamic_cast<WorldEntity*>(this));
-  this->weaponMan->setParentEntity(this);
-  this->weaponMan->setSlotCount(1);
-  this->weaponMan->setSlotPosition(0, Vector(0, 0, 0));
-  this->weaponMan->setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  Weapon* cannon = new SpikeLauncher();
-  cannon->setName( "SpikeLauncher");
-  this->weaponMan->addWeapon(cannon, 0, 0);
-  this->weaponMan->changeWeaponConfig(0);
-
-  this->weaponMan->getWeapon(0)->increaseEnergy(50);*/
 }
 
@@ -172 +152 @@
   this->hitEntity = entity;
   dynamic_cast<SpaceShip*>(entity)->damage(this->getDamage(),0);
-//   this->deactivate();
 }
 
@@ -178 +157 @@
 void SpikeBall::blow()
 {
+  updateFireDir();
+
   Spike* pj = NULL;
-/*  printf( "KA-" );*/
   for ( int i = 0; i < this->getFragments(); i++)
   {
     pj  = new Spike();
     assert( pj );
-/*    printf(" %i", i);*/
     pj->setParent(PNode::getNullParent());
 
@@ -191 +170 @@
     pj->setParent(PNode::getNullParent());
     pj->setAbsCoor(this->getAbsCoor() + this->launcher[i] * this->size);
-    Quaternion q;
-    pj->setAbsDir(q.lookAt(Vector(), this->launcher[i], VECTOR_RAND(1)));
+//     Quaternion q;
+    pj->setAbsDir(Quaternion(this->launcher[i], 0));
 
     pj->toList(this->getOMListNumber());
 
-/*
-    pj->setAbsCoor(this->getAbsCoor() + VECTOR_RAND(3));
-    pj->setAbsDir(this->getAbsDir());*/
     pj->activate();
   }
-/*  printf( "BOOM\n" );*/
 }
 
@@ -219 +194 @@
   ca = cos (this->getAngle());
   sa = sin (this->getAngle());
-// final version below... easier to to cheat with the one above.
 
   m[0][0] = nx * nx * (1 - ca) + ca;
@@ -233 +207 @@
   float x, y, z;
   for (int i = 0; i < this->getFragments(); i++){
-//     printf("%i ", i);
     x = m[0][0] * this->launcher[i].x + m[0][1] * this->launcher[i].y + m[0][2] * this->launcher[i].z;
     y = m[1][0] * this->launcher[i].x + m[1][1] * this->launcher[i].y + m[1][2] * this->launcher[i].z;
@@ -240 +213 @@
     this->launcher[i] = Vector (x, y, z);
   }
-//   printf("\n");
 
   for( int i = 0; i < 3 ; i++)
@@ -254 +226 @@
 void SpikeBall::tick (float dt)
 {
-  //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
-  Vector v = this->getVelocity() * dt;
+  Vector v = this->velocity * dt;
   this->shiftCoor(v);
-
-//   if(this->lifeCycle > .9){
-// /*    printf("time to blow:  ");*/
-// //     this->weaponMan->fire();
-// /*    this->blow();*/
-//   }
 
   if (this->tickLifeCycle(dt)){
@@ -270 +235 @@
 
   this->updateAngle( dt );
-//   angle += rotationSpeed * dt;
 }
 
@@ -289 +253 @@
 {
   glPushAttrib(GL_ENABLE_BIT);
-  //glDisable(GL_LIGHTING);
-
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
@@ -305 +267 @@
 
   glPopMatrix();
-
   glPopAttrib();
 }