Changeset 10260 in orxonox.OLD

Timestamp:

Jan 17, 2007, 4:00:23 PM (17 years ago)

Author:

nicolasc

Message:

 

Location:

branches/playability/src/world_entities

Files:

• projectiles/spike.cc (modified) (1 diff)
• projectiles/spike_ball.cc (modified) (6 diffs)
• projectiles/spike_ball.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)
• weapons/heavy_blaster.cc (modified) (1 diff)
• weapons/spike_thrower.cc (modified) (1 diff)

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

@@ -140 +140 @@
 
   angle += rotationSpeed * dt;
+
+/*  printf( "spike tick\n" );*/
 }
 

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

@@ -68 +68 @@
 
   this->size = 4;
+
+  this->launcher = new Vector [this->getFragments()];
+
 //   this->fastFactory = tFastFactory<Spike>::getFastFactory(CL_SPIKE, "Spike");
 
@@ -120 +123 @@
     SpikeBall::explosionParticles->setColor(1.0, .8,.8,.7,.0);
   }
-
   this->setDamage(5);
   this->setHealth(0);
@@ -177 +179 @@
 {
   Spike* pj = NULL;
-
+/*  printf( "KA-" );*/
   for ( int i = 0; i < this->getFragments(); i++)
   {
     pj  = new Spike();
-    if (pj == NULL)
-      return;
-
+    assert( pj );
+/*    printf(" %i", i);*/
     pj->setParent(PNode::getNullParent());
 
@@ -192 +193 @@
     Quaternion q;
     pj->setAbsDir(q.lookAt(Vector(), this->launcher[i], VECTOR_RAND(1)));
+
+    pj->toList(this->getOMListNumber());
+
 /*
     pj->setAbsCoor(this->getAbsCoor() + VECTOR_RAND(3));
@@ -197 +201 @@
     pj->activate();
   }
+/*  printf( "BOOM\n" );*/
 }
 
@@ -250 +255 @@
 {
   //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
-  Vector v = this->velocity * dt;
+  Vector v = this->getVelocity() * dt;
   this->shiftCoor(v);
 
-  if(this->lifeCycle > .9){
-//     printf("called by spikeball  ");
-//     this->weaponMan->fire();
+//   if(this->lifeCycle > .9){
+// /*    printf("time to blow:  ");*/
+// //     this->weaponMan->fire();
+// /*    this->blow();*/
+//   }
+
+  if (this->tickLifeCycle(dt)){
     this->blow();
-  }
-
-  if (this->tickLifeCycle(dt))
-      this->deactivate();
+    this->deactivate();
+  }
 
   this->updateAngle( dt );

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

@@ -41 +41 @@
     virtual void draw () const;
 
+//     inline void setVelocity(Vector velocity) { this->velocity = velocity; }
+
 //     inline Vector getRotationVector() { return this->rotationVector; }
 //     inline float getAngle() { return this->angle; }

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -207 +207 @@
 
   this->weaponMan.changeWeaponConfig(3);
-  this->secWeaponMan.changeWeaponConfig(2);
+  this->secWeaponMan.changeWeaponConfig(1);
 
   curWeaponPrimary    = 3;
-  curWeaponSecondary  = 2;
+  curWeaponSecondary  = 1;
 
   Playable::weaponConfigChanged();

branches/playability/src/world_entities/weapons/heavy_blaster.cc

@@ -47 +47 @@
   }
 
-  this->deconstr();
+//   this->deconstr();
      // model will be deleted from WorldEntity-destructor
 }

branches/playability/src/world_entities/weapons/spike_thrower.cc

@@ -156 +156 @@
   pj->setParent(PNode::getNullParent());
 
-  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*150);
+//   pj->setVelocity(this->getParent()->getAbsDir().apply(Vector(1,0,0))*200 + this->getParent()->getParent()->getVelocity());
+  pj->setVelocity(this->getParent()->getVelocity() + this->getAbsDir().apply(Vector(1,0,0))*160);
+
   pj->setAbsCoor(this->getEmissionPoint());
-  pj->toList(this->getOMListNumber());
-
   pj->setAbsDir(this->getAbsDir());
   pj->activate();