Changeset 9207 in orxonox.OLD

Timestamp:

Jul 5, 2006, 10:53:55 AM (18 years ago)

Author:

patrick

Message:

world entity

File:

• branches/presentation/src/world_entities/creatures/fps_player.cc (modified) (8 diffs)

branches/presentation/src/world_entities/creatures/fps_player.cc

@@ -135 +135 @@
 
   this->getWeaponManager().setSlotCount(2);
-//   this->getWeaponManager().setSlotDirection(0, Quaternion(M_PI_2, Vector(0,1,0)));
+  this->getWeaponManager().setSlotDirection(0, Quaternion(M_PI_4*-0.55f, Vector(0,0,1)));
   this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
   this->getWeaponManager().setSlotDirection(1, Quaternion(M_PI_4*.5, Vector(1,0,0)));
@@ -141 +141 @@
   this->getWeaponManager().setSlotPosition(1, Vector(5.0, 0.0, 0.0));
 
+//   this->getWeaponManager().getFixedTarget()->setRelDir(Quaternion(M_PI_4*-0.6f, Vector(0,0,1)));
+
 
   this->getWeaponManager().setParentNode(&this->cameraNode);
@@ -149 +151 @@
 
   this->aimingSystem = new AimingSystem(this);
-  this->addChild(this->aimingSystem);
-
+  //this->addChild(this->aimingSystem);
+  wpRight->addChild(this->aimingSystem);
+//   this->getWeaponManager().sl
 
 
@@ -233 +236 @@
     this->initWeapon = true;
 
-    State::getCameraNode()->setParentMode(PNODE_ROTATE_AND_MOVE);
+    this->cameraNode.setParentMode(PNODE_ROTATE_AND_MOVE);
 
     this->getWeaponManager().getParentNode()->setParentMode(PNODE_ROTATE_AND_MOVE);
@@ -242 +245 @@
     this->aimingSystem->toList(OM_GROUP_01);
     this->aimingSystem->setParent(&this->cameraNode);
-    this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
+//     this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
+    this->aimingSystem->setRelDir(Quaternion(M_PI_4*-0.55f, Vector(0,0,1)));
+    this->aimingSystem->setRelCoor(0, -1, -1);
 
 
@@ -248 +253 @@
     if( box != NULL)
     {
-      float f = 1.3f;
-      State::getCameraNode()->setRelCoor(0, box->halfLength[1] * f, 0);
-      State::getCameraTargetNode()->setRelCoor(10, box->halfLength[1] * f, 0);
-
-      this->getWeaponManager().setSlotPosition(0, Vector(1.5, box->halfLength[1] * f - 0.7, 1.1));
+      float f = 0.2f;
+      this->cameraNode.setRelCoor(0, box->halfLength[1] * f, 0);
+      this->cameraNode.setRelCoor(10, box->halfLength[1] * f, 0);
+
+      this->getWeaponManager().setSlotPosition(0, Vector(-8.0, box->halfLength[1] * f - 1.5, 1.1));
       this->getWeaponManager().setSlotPosition(1, Vector(5.0, box->halfLength[1] * f, 0.0));
     }
@@ -266 +271 @@
   if( this->bFire)
   {
-    //this->getWeaponManager().fire();
+    this->getWeaponManager().fire();
 
     WorldEntity* target = this->aimingSystem->getNearestTarget();
@@ -291 +296 @@
 
 
-    if ( attitude > 0.32 )
-      attitude = 0.32;
-
-    else if ( attitude < -2.1 )
-      attitude = -2.1;
+    if ( attitude > 1.95 )
+      attitude = 1.95;
+    else if ( attitude < -1.07 )
+      attitude = -1.07;
 
     xMouse = yMouse = 0;