Changeset 5764 in orxonox.OLD for branches

Timestamp:

Nov 24, 2005, 4:29:29 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: guided_missiles rock

Location:

branches/guidedmissile

Files:

• aclocal.m4 (modified) (2 diffs)
• src/world_entities/weapons/aiming_turret.cc (modified) (1 diff)
• src/world_entities/weapons/guided_missile.cc (modified) (4 diffs)
• src/world_entities/weapons/guided_missile.h (modified) (2 diffs)
• src/world_entities/weapons/projectile.cc (modified) (2 diffs)
• src/world_entities/weapons/projectile.h (modified) (2 diffs)
• src/world_entities/weapons/turret.cc (modified) (1 diff)

branches/guidedmissile/aclocal.m4

@@ -1 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -29 +29 @@
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-         [AM_AUTOMAKE_VERSION([1.9.6])])
+         [AM_AUTOMAKE_VERSION([1.9.5])])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-

branches/guidedmissile/src/world_entities/weapons/aiming_turret.cc

@@ -145 +145 @@
     pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*250.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
+    pj->setTarget(this->target->getParent());
+
 
   pj->setParent(NullParent::getInstance());

branches/guidedmissile/src/world_entities/weapons/guided_missile.cc

@@ -42 +42 @@
 
   float modelSize = .3;
-  this->loadModel("models/projectiles/orx-guided_missile.obj", .3);
+  this->loadModel("models/projectiles/orx-rocket.obj", .3);
 
   this->energyMin = 1;
@@ -48 +48 @@
   this->remove();
   this->lifeSpan = 5;
-  this->agility = 1;
+  this->agility = 5;
 
   this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
@@ -82 +82 @@
 ParticleSystem* GuidedMissile::explosionParticles = NULL;
 
-
-void GuidedMissile::setTarget(PNode* target)
-{
-
-  this->target.setParent(target);
-
-}
 
 
@@ -158 +151 @@
   //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
   float speed = velocity.len();
-  velocity += ((target.getAbsCoor() - this->getAbsCoor()).getNormalized())*agility;
-  velocity *= speed/velocity.len();
+  if (target != NULL)
+   {
+     velocity += ((target->getAbsCoor() - this->getAbsCoor()).getNormalized())*agility;
+     velocity *= speed/velocity.len();
+   }
   Vector v = this->velocity * (time);
   this->shiftCoor(v);

branches/guidedmissile/src/world_entities/weapons/guided_missile.h

@@ -22 +22 @@
     virtual ~GuidedMissile ();
 
-    void setTarget(PNode* target);
     virtual void activate();
     virtual void deactivate();
@@ -40 +39 @@
 
     ParticleEmitter*                  emitter;
-    PNode                             target;
     float                             agility;
 

branches/guidedmissile/src/world_entities/weapons/projectile.cc

@@ -38 +38 @@
   this->lifeCycle = 0.0;
   this->lifeSpan = 1.0f; /* sec */
+  this->target = NULL;
 
   this->remove();
@@ -98 +99 @@
 }
 
+
+
+void Projectile::setTarget(PNode* target)
+{
+
+  if (this->target == NULL)
+     this->target = new PNode();
+  this->target->setParent(target);
+}
+
+
 /**
  * signal tick, time dependent things will be handled here

branches/guidedmissile/src/world_entities/weapons/projectile.h

@@ -31 +31 @@
     inline bool isChageable() { return this->bChargeable; };
 
+    void setTarget(PNode* target);
 
     /** @brief This is called, when the Projectile is Emitted */
@@ -54 +55 @@
 
     Vector                velocity;                  //!< velocity of the projectile.
+
+    PNode*                target;                    //!< A target for guided Weapons.
 };
 

branches/guidedmissile/src/world_entities/weapons/turret.cc

@@ -138 +138 @@
     pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*100.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
+  
 
   pj->setParent(NullParent::getInstance());