Changeset 10733 in orxonox.OLD for branches/presentation

Timestamp:

Jun 20, 2007, 2:41:51 PM (17 years ago)

Author:

nicolasc

Message:

AbsDir fix, quite a hack

Location:

branches/presentation/src/world_entities/weapons

Files:

• disruptor.cc (modified) (1 diff)
• nadion_laser.cc (modified) (1 diff)

branches/presentation/src/world_entities/weapons/disruptor.cc

@@ -125 +125 @@
 
 
-  this->shootAnim[0][0]->addKeyFrame(Vector(0.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.0333, ANIM_LINEAR, ANIM_NULL);
+  this->shootAnim[0][0]->addKeyFrame(Vector(0.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
   this->shootAnim[0][0]->addKeyFrame(Vector(-0.5, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
-  this->shootAnim[0][0]->addKeyFrame(Vector(0.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
+//   this->shootAnim[0][0]->addKeyFrame(Vector(0.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
 
   Animation3D* animation2 = this->getAnimation(WS_ACTIVATING, this);

branches/presentation/src/world_entities/weapons/nadion_laser.cc

@@ -142 +142 @@
   pj->setParent(PNode::getNullParent());
 
-  Vector tmp = this->getDefaultTarget()->getAbsCoor() - this->getAbsCoor();
+  Vector dir = (this->getDefaultTarget()->getAbsCoor() - this->getAbsCoor()).getNormalized();
+  // HACK direction AbsDir calulation 
+  Vector up = dir.cross(VECTOR_RAND(1));
 
-  pj->setVelocity(this->getParent()->getVelocity() + (tmp.getNormalized())*160);
+  //force a resoable up vector
+  while (up.len() < .0001)
+    up = dir.cross(VECTOR_RAND(1));
+
+  pj->setVelocity(this->getParent()->getVelocity() + (dir)*160);
 
   pj->setAbsCoor(this->getEmissionPoint());
 //   pj->setAbsDir(Quaternion(this->getDefaultTarget()->getAbsCoor() - this->getAbsCoor(), Vector(0,0,0)));
 //   pj->setAbsDir(Quaternion(tmp.getNormalized(), this->getParent()->getAbsDir().apply(Vector(0,1,0))));
-
+  pj->setAbsDir(Quaternion(dir, up.getNormalized()));
+  
   pj->setAbsDir(this->getAbsDir());
   pj->activate();