Changeset 4986 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Aug 12, 2005, 2:23:40 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moved the camera around, so now you have the sight from within the cockpit on '2'

Location:

orxonox/trunk/src/world_entities

Files:

• camera.cc (modified) (1 diff)
• camera.h (modified) (1 diff)
• npc.cc (modified) (1 diff)
• player.cc (modified) (1 diff)

orxonox/trunk/src/world_entities/camera.cc

@@ -120 +120 @@
     case VIEW_BEHIND:
       this->toFovy = 120.0;
-      this->toRelCoor = Vector(-7, 0, 0);
+      this->toRelCoor = Vector(3.5, 0, 0);
+      this->target->setRelCoor(4,0,0);
+/*      this->setParent("main-Turret");
+      this->setParentMode(PNODE_ALL);
+      this->target->setParent("Crosshair");*/
       break;
     case VIEW_FRONT:

orxonox/trunk/src/world_entities/camera.h

@@ -57 +57 @@
   float             farClip;         //!< The far clipping plane.
 
-  Vector toRelCoor;                  //!< The relativeCoordinate to move the camera to.
-  float toFovy;                      //!< The fovy-mode to iterate to.
+  Vector            toRelCoor;       //!< The relativeCoordinate to move the camera to.
+  float             toFovy;          //!< The fovy-mode to iterate to.
 };
 

orxonox/trunk/src/world_entities/npc.cc

@@ -47 +47 @@
 void NPC::tick(float dt)
 {
-  this->shiftCoor((State::getCameraTarget()->getAbsCoor() - this->getAbsCoor()) *dt *10);
+  Vector direction = (State::getCameraTarget()->getAbsCoor() - this->getAbsCoor());
+
+  //if (directin.len() < 100)
+  this->shiftCoor(direction *dt * 5 * exp(-direction.len()/30.0));
 
 }

orxonox/trunk/src/world_entities/player.cc

@@ -92 +92 @@
 
   Weapon* turret = new Turret(this->weaponMan);
+  turret->setName("main-Turret");
   Weapon* turret2 = new Turret(this->weaponMan);
   this->weaponMan->addWeapon(wpLeft, 1, 0);