Changeset 5567 in orxonox.OLD for branches

Timestamp:

Nov 15, 2005, 2:32:27 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/world_entities: smoother aiming, and also displaying Distance (this is not too nice, but quite good to explain a few Things …

Location:

branches/world_entities/src/world_entities

Files:

• player.cc (modified) (1 diff)
• weapons/aim.cc (modified) (7 diffs)
• weapons/aim.h (modified) (3 diffs)
• weapons/aiming_turret.cc (modified) (1 diff)
• weapons/blue_laset.h (copied) (copied from branches/world_entities/src/world_entities/weapons/laser.h)
• weapons/crosshair.cc (modified) (1 diff)
• weapons/laser.cc (modified) (1 diff)
• weapons/laser.h (modified) (1 diff)
• weapons/weapon_manager.cc (modified) (1 diff)
• weapons/weapon_manager.h (modified) (1 diff)

branches/world_entities/src/world_entities/player.cc

@@ -341 +341 @@
 void Player::ADDWEAPON()
 {
-  Weapon* turret;
+  Weapon* turret = NULL;
   if ((float)rand()/RAND_MAX < .1)
   {
-    turret = new Turret(this->weaponMan);
-    this->weaponMan->addWeapon(turret, 2);
-    this->weaponMan->changeWeaponConfig(2);
+    //if (this->weaponMan->hasFreeSlot(2, WTYPE_TURRET))
+    {
+      turret = new Turret(this->weaponMan);
+      this->weaponMan->addWeapon(turret, 2);
+      this->weaponMan->changeWeaponConfig(2);
+    }
   }
   else
   {
-    turret = new AimingTurret(this->weaponMan);
-    this->weaponMan->addWeapon(turret, 3);
-
-    this->weaponMan->changeWeaponConfig(3);
+    //if (this->weaponMan->hasFreeSlot(3))
+    {
+      turret = new AimingTurret(this->weaponMan);
+      this->weaponMan->addWeapon(turret, 3);
+
+      this->weaponMan->changeWeaponConfig(3);
+    }
   }
 
-  turret->setName("Turret");
-  turret->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
-}
+  if(turret != NULL)
+  {
+    turret->setName("Turret");
+    turret->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
+  }
+}

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

@@ -24 +24 @@
 #include "material.h"
 #include "t_animation.h"
+#include "text.h"
 
 #include "world_entity.h"
@@ -33 +34 @@
  * standart constructor
  */
-Aim::Aim (const TiXmlElement* root)
+Aim::Aim (PNode* source, const TiXmlElement* root)
 {
   this->init();
+
+  this->source = source;
 
   if (root)
@@ -50 +53 @@
   if (this->material)
     delete this->material;
+
+  if (this->text != NULL)
+    delete this->text;
 }
 
@@ -66 +72 @@
   this->setBindNode(this);
   this->material = new Material;
+  this->source = NULL;
 
   this->anim = new tAnimation<Aim>(this, &Aim::setSize);
@@ -73 +80 @@
   this->anim->addKeyFrame(50, .01, ANIM_LINEAR);
 
-}
-
+  this->text = new Text();
+  this->text->setParent2D(this);
+  this->text->setRelCoor2D(10, -50);
+  this->text->setParentMode2D(E2D_PARENT_MOVEMENT);
+  this->text->setText("Testing");
+}
 
 void Aim::loadParams(const TiXmlElement* root)
@@ -101 +112 @@
       {
         this->anim->replay();
-        this->setParent(entity);
+        this->setParentSoft(entity, 3);
       }
       delete iterator;
@@ -141 +152 @@
   this->shiftDir2D(dt * rotationSpeed);
 
+  char outputText[100];
+  sprintf(outputText, "distance: %f\n", (this->source->getAbsCoor() - this->getAbsCoor()).len());
+  this->text->setText(outputText);
 
 //   float z = 0.0f;

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

@@ -12 +12 @@
 // FORWARD DECLARATION
 class Model;
+class Text;
 class Material;
 class TiXmlElement;
@@ -17 +18 @@
 
 //! An Aim for zooming in on Targets.
+/**
+ * An Aim is a PNode, that is connected, to the Target, it has aquired
+ * The target becomes, if selected its Parent.
+ *
+ * Also the Aim is a Element2D, as it draws a cross onto the Target.
+ */
 class Aim : public PNode, public Element2D {
 
  public:
-  Aim(const TiXmlElement* root = NULL);
+  Aim(PNode* source, const TiXmlElement* root = NULL);
   virtual ~Aim();
 
   void init();
   void loadParams(const TiXmlElement* root);
+
+  inline void setSource(PNode* source) { this->source = source; };
 
   inline void selectTarget(PNode* target) { this->setParent(target); };
@@ -43 +52 @@
    float            rotationSpeed;        //!< Speed of the Rotation.
    tAnimation<Aim>* anim;
+
+   PNode*           source;               //!< Where this Shot has come from.
+
+   Text*            text;                 //!< A Text to display onto this Node. (distance to Target)
 };
 

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

@@ -101 +101 @@
   //this->getProjectileFactory()->prepare(100);
 
-  this->target = new Aim();
+  this->target = new Aim(this);
   this->target->setVisibility(false);
 }

branches/world_entities/src/world_entities/weapons/crosshair.cc

@@ -76 +76 @@
   GraphicsEngine::showMouse(false);
   GraphicsEngine::stealWMEvents(true);
+  SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);
 }
 

branches/world_entities/src/world_entities/weapons/laser.cc

@@ -85 +85 @@
     Laser::explosionParticles->setName("LaserExplosionParticles");
     Laser::explosionParticles->setLifeSpan(.5, .3);
-    Laser::explosionParticles->setRadius(0.0, 3.0);
+    Laser::explosionParticles->setRadius(0.0, 10.0);
     Laser::explosionParticles->setRadius(.5, 6.0);
     Laser::explosionParticles->setRadius(1.0, 3.0);

branches/world_entities/src/world_entities/weapons/laser.h

@@ -42 +42 @@
 
     WorldEntity* hitEntity; // FIXME TEMPORARY
-
 };
 

branches/world_entities/src/world_entities/weapons/weapon_manager.cc

@@ -474 +474 @@
       return i;
   }
+  printf("SHIT\n");
   return -1;
 }

branches/world_entities/src/world_entities/weapons/weapon_manager.h

@@ -71 +71 @@
     void removeWeapon(Weapon* weapon, int configID = -1);
 
-
+    // FIXME ::
+//    bool hasFreeSlot(int configID, long capability = WTYPE_ALL) { return ( getNextFreeSlot(configID, capability ) != -1)? true : false; };
 
     void nextWeaponConfig();