Changeset 10224 in orxonox.OLD for branches/playability/src/world_entities/weapons

Timestamp:

Jan 10, 2007, 5:33:19 PM (18 years ago)

Author:

nicolasc

Message:

bump

Location:

branches/playability/src/world_entities/weapons

Files:

• spike_launcher.cc (modified) (4 diffs)
• spike_thrower.cc (modified) (1 diff)
• weapon_manager.cc (modified) (1 diff)

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

@@ -219 +219 @@
   float x, y, z;
   for (int i = 0; i < this->spikes;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;
@@ -229 +229 @@
     this->launcher[i] = Vector (x, y, z);
   }
+  printf("\n");
 
   for( int i = 0; i < 3 ; i++)
@@ -241 +242 @@
   updateFireDir(VECTOR_RAND(1), 20);
 
-  printf("fireing spikes\n");
+  printf("firing spikes\n");
   Projectile* pj = NULL;
   for (int i = 0; i < this->spikes; i++)
@@ -250 +251 @@
 
 //     pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*115.0 + VECTOR_RAND(10)));
-    pj->setVelocity(this->launcher[i] * 300.0);
+    pj->setVelocity(this->launcher[i].getNormalized() * 300.0);
 
     pj->setParent(PNode::getNullParent());
     pj->setAbsCoor(this->getAbsCoor() + this->launcher[i] * this->size);
-//     Quaternion q;
-//     pj->setRelDir(q.lookAt(Vector(), this->launcher[i], VECTOR_RAND(1)));
-    pj->setRelDir(90, this->launcher[i].x, this->launcher[i].y, this->launcher[i].z);
-
-    pj->toList(this->getOMListNumber());
+    Quaternion q;
+    pj->setRelDir(q.lookAt(Vector(), this->launcher[i], VECTOR_RAND(1)));
+//     pj->setRelDir(90, this->launcher[i].x, this->launcher[i].y, this->launcher[i].z);
+
+/*    pj->toList(this->getOMListNumber());*/
     pj->activate();
   }

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

@@ -157 +157 @@
   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*150);
   pj->setAbsCoor(this->getEmissionPoint());
+  pj->toList(this->getOMListNumber());
 
   pj->setAbsDir(this->getAbsDir());

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

@@ -431 +431 @@
 void WeaponManager::fire()
 {
+  printf("firing WM: ");
   Weapon* firingWeapon;
   for(int i = 0; i < this->slotCount; i++)
   {
+    printf("%i ", i);
           firingWeapon = this->currentSlotConfig[i].currentWeapon;
       if( firingWeapon != NULL && firingWeapon->getCurrentState() == WS_SHOOTING) continue;
           if( firingWeapon != NULL) firingWeapon->requestAction(WA_SHOOT);
   }
-
+  printf("\n");
   /*
         this->crosshair->setRotationSpeed(500);