Changeset 5560 in orxonox.OLD

Timestamp:

Nov 13, 2005, 4:50:55 PM (18 years ago)

Author:

bensch

Message:

orxonox/branches/world_entities: AimingTurrets zoom in to the selected Entities… looks quite good, if i may say so, but it is quite buggy

Location:

branches/world_entities/src/world_entities/weapons

Files:

• aim.cc (modified) (4 diffs)
• aim.h (modified) (2 diffs)
• aiming_turret.cc (modified) (2 diffs)

branches/world_entities/src/world_entities/weapons/aim.cc

@@ -23 +23 @@
 #include "list.h"
 #include "material.h"
+#include "t_animation.h"
 
 #include "world_entity.h"
@@ -65 +66 @@
   this->setBindNode(this);
   this->material = new Material;
+
+  this->anim = new tAnimation<Aim>(this, &Aim::setSize);
+  this->anim->setInfinity(ANIM_INF_CONSTANT);
+  this->anim->addKeyFrame(500, .3, ANIM_LINEAR);
+  this->anim->addKeyFrame(100, .2, ANIM_LINEAR);
+  this->anim->addKeyFrame(50, .01, ANIM_LINEAR);
+
 }
 
@@ -88 +96 @@
   while (likely(entity != NULL))
   {
-    if (entity->isA(CL_NPC) && (source->getAbsCoor() - entity->getAbsCoor()).len() < 100)
+    if (entity->isA(CL_NPC) &&(source->getAbsCoor() - entity->getAbsCoor()).len() < 100)
     {
-      this->setParent(entity);
+      if (this->getParent() != entity)
+      {
+        this->anim->replay();
+        this->setParent(entity);
+      }
       delete iterator;
       return;
@@ -159 +171 @@
 void Aim::draw() const
 {
+
   glPushMatrix();
   glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0);

branches/world_entities/src/world_entities/weapons/aim.h

@@ -14 +14 @@
 class Material;
 class TiXmlElement;
+template<class T> class tAnimation;
 
 //! An Aim for zooming in on Targets.
@@ -41 +42 @@
    Material*        material;             //!< a material for the Aim.
    float            rotationSpeed;        //!< Speed of the Rotation.
+   tAnimation<Aim>* anim;
 };
 

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

@@ -102 +102 @@
 
   this->target = new Aim();
+  this->target->setVisibility(false);
 }
 
@@ -112 +113 @@
 void AimingTurret::activate()
 {
+  this->target->setVisibility(true);
 }
 
 void AimingTurret::deactivate()
 {
+  this->target->setVisibility(false);
 }