Changeset 9235 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Jul 5, 2006, 4:39:02 PM (18 years ago)

Author:

bensch

Message:

merged the presentation back

Location:

trunk/src/world_entities/weapons

Files:

• aiming_system.cc (copied) (copied from branches/presentation/src/world_entities/weapons/aiming_system.cc)
• aiming_system.h (copied) (copied from branches/presentation/src/world_entities/weapons/aiming_system.h)
• boomerang_gun.cc (copied) (copied from branches/presentation/src/world_entities/weapons/boomerang_gun.cc)
• boomerang_gun.h (copied) (copied from branches/presentation/src/world_entities/weapons/boomerang_gun.h)
• fps_sniper_rifle.cc (modified) (2 diffs)
• laser_cannon.cc (copied) (copied from branches/presentation/src/world_entities/weapons/laser_cannon.cc)
• laser_cannon.h (copied) (copied from branches/presentation/src/world_entities/weapons/laser_cannon.h)

trunk/src/world_entities/weapons/fps_sniper_rifle.cc

@@ -33 +33 @@
 #include "fps_sniper_rifle.h"
 
+
+#include "effects/explosion.h"
 
 using namespace std;
@@ -145 +147 @@
     return;
 
-  pj->setParent(PNode::getNullParent());
+//   Explosion::explode(this, Vector(0.1,0.1,0.1));
 
-  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));
+  pj->setParent(this);
+  pj->setParentMode(PNODE_ROTATE_AND_MOVE);
 
-  pj->setAbsCoor(this->getEmissionPoint());
+  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*550 + VECTOR_RAND(5) );
+
+  pj->setAbsCoor(this->getEmissionPoint() + this->getAbsDirX() * 25.0f);
   pj->setAbsDir(this->getAbsDir());
   pj->activate();