Changeset 4986 in orxonox.OLD for orxonox/trunk

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

Files:

• lib/sound/sound_engine.cc (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• world_entities/camera.cc (modified) (1 diff)
• world_entities/camera.h (modified) (1 diff)
• world_entities/npc.cc (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)

orxonox/trunk/src/lib/sound/sound_engine.cc

@@ -348 +348 @@
     while (enumSource)
     {
-      if (likely(enumSource->getNode()!=NULL))
+      if (likely(enumSource->getNode() != NULL))
       {
         alSource3f(enumSource->getID(), AL_POSITION,

orxonox/trunk/src/story_entities/world.cc

@@ -440 +440 @@
   {
     WorldEntity* tmp = new NPC();
-    tmp->setAbsCoor(((float)rand()/RAND_MAX) * 2000, 40+ (float)rand()/RAND_MAX*30, ((float)rand()/RAND_MAX -.5) *500);
+    tmp->setAbsCoor(((float)rand()/RAND_MAX) * 5000, 50/*+ (float)rand()/RAND_MAX*20*/, ((float)rand()/RAND_MAX -.5) *100);
     this->spawn(tmp);
 

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);