Changeset 10528 in orxonox.OLD for trunk

Timestamp:

Jan 31, 2007, 12:13:14 AM (18 years ago)

Author:

patrick

Message:

iterative mp part sys fix

Location:

trunk/src/world_entities

Files:

• mount_point.cc (modified) (1 diff)
• particles/particle_system.cc (modified) (2 diffs)
• particles/particle_system.h (modified) (1 diff)
• weapons/light_blaster.cc (modified) (1 diff)
• weapons/weapon.cc (modified) (1 diff)
• weapons/weapon_manager.cc (modified) (2 diffs)

trunk/src/world_entities/mount_point.cc

@@ -146 +146 @@
     {
       PRINTF(0)("got particle system. attaching it to mp\n");
-      dynamic_cast<ParticleSystem*>(this->_mount)->attachEmmittersTo(this, Vector(0,0,0));
+      dynamic_cast<ParticleSystem*>(this->_mount)->attachEmmittersTo(this, Vector(0,0,0), this->getRelDir());
     }
   }

trunk/src/world_entities/particles/particle_system.cc

@@ -286 +286 @@
  * @param node
  */
-void ParticleSystem::attachEmmittersTo(PNode* node, const Vector& offset)
+void ParticleSystem::attachEmmittersTo(PNode* node, const Vector& offset, const Quaternion& dir)
 {
   std::list<ParticleEmitter*>::iterator it = this->emitters.begin();
@@ -294 +294 @@
     (*it)->setParent(node);
     (*it)->setRelCoor(offset);
+    (*it)->setRelDir(dir);
   }
 }

trunk/src/world_entities/particles/particle_system.h

@@ -96 +96 @@
   void removeEmitter(ParticleEmitter* emitter);
 
-  void attachEmmittersTo(PNode* node, const Vector& offset);
+  void attachEmmittersTo(PNode* node, const Vector& offset, const Quaternion& dir);
 
   virtual void applyField(const Field* field);

trunk/src/world_entities/weapons/light_blaster.cc

@@ -127 +127 @@
 void LightBlaster::fire()
 {
+  PRINTF(0)("=>>fir\n");
   Projectile* pj =  this->getProjectile();
   if (pj == NULL)

trunk/src/world_entities/weapons/weapon.cc

@@ -440 +440 @@
     if (this->requestedAction != WA_NONE)
       return;
-    PRINTF(5)("next action will be %s in %f seconds\n", actionToChar(action), this->stateDuration);
+    PRINTF(0)("next action will be %s in %f seconds\n", actionToChar(action), this->stateDuration);
     this->requestedAction = action;
   }

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -441 +441 @@
     if( firingWeapon != NULL)
     {
-      PRINTF(0)("!=NULL\n");
       if( firingWeapon->getCurrentState() == WS_SHOOTING) continue;
-      PRINTF(0)("FIRE\n");
 
       firingWeapon->requestAction(WA_SHOOT);
@@ -464 +462 @@
   {
     firingWeapon = this->currentSlotConfig[i]->getCurrentWeapon();
-    if( firingWeapon != NULL) firingWeapon->requestAction(WA_NONE);
+    if( firingWeapon != NULL)
+      firingWeapon->requestAction(WA_NONE);
   }