Changeset 9969 in orxonox.OLD

Timestamp:

Nov 29, 2006, 3:27:00 PM (17 years ago)

Author:

nicolasc

Message:

bump

Location:

branches/playability/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• projectiles/projectile.cc (modified) (1 diff)
• projectiles/projectile.h (modified) (1 diff)
• test_entity2.cc (added)
• test_entity2.h (added)

branches/playability/src/world_entities/WorldEntities.am

@@ -22 +22 @@
                 world_entities/character_attributes.cc \
                 world_entities/test_entity.cc \
+                world_entities/test_entity2.cc \
                 world_entities/planet.cc \
                 world_entities/bsp_entity.cc \
@@ -125 +126 @@
                 character_attributes.h \
                 test_entity.h \
+                test_entity2.h \
                 planet.h \
                 bsp_entity.h \

branches/playability/src/world_entities/projectiles/projectile.cc

@@ -192 +192 @@
 void Projectile::tick (float dt)
 {
-  Vector estTargetDir = this->targetPosition + this->targetVelocity * this->eta;
-  //Vector estTargetDir = (this->target.getRelCoor() + this->target.getVelocity()) / this->velocity.len() ;
+  float tti;  //!< time to impact
+  Vector estTargetDir = (this->target->getRelCoor() + this->target->getVelocity());
   this->velocity = this->newDirection(this->velocity, estTargetDir, this->turningSpeed * dt ) * this->velocity.len();
   Vector v = this->velocity * (dt);

branches/playability/src/world_entities/projectiles/projectile.h

@@ -79 +79 @@
 
     PNode*                  target;                   //!< A target for guided Weapons.
-    Vector                  targetPosition;           //!< current target position relative to projectile
-    Vector                  targetVelocity;           //!< current target speed and direction
-    float                   eta;                      //!< estimated time of arrival == time to kaboom!
+    //Vector                  targetPosition;           //!< current target position relative to projectile
+    //Vector                  targetVelocity;           //!< current target speed and direction
+    //float                   eta;                      //!< estimated time of arrival == time to kaboom!
 
     OrxSound::SoundSource  soundSource;