Changeset 10711 in orxonox.OLD

Timestamp:

Jun 18, 2007, 12:34:45 AM (17 years ago)

Author:

rennerc

Message:

weapon position

Location:

branches/presentation/src/world_entities

Files:

• creatures/fps_player.cc (modified) (4 diffs)
• weapons/bsp_weapon.cc (modified) (2 diffs)
• weapons/fps_sniper_rifle.cc (modified) (1 diff)

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

@@ -136 +136 @@
 #if 1
   this->getWeaponManager().changeWeaponConfig(1);
-  this->getWeaponManager().setSlotCount(2);
-  this->getWeaponManager().setSlotDirection(0, Quaternion(M_PI_4*-0.55f, Vector(0,0,1)));
+  this->getWeaponManager().setSlotCount(1);
+  //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)));
+  /*this->getWeaponManager().setSlotDirection(1, Quaternion(M_PI_4*.5, Vector(1,0,0)));
   this->getWeaponManager().setSlotPosition(0, Vector(1.5, -0.7, 1.1));
-  this->getWeaponManager().setSlotPosition(1, Vector(5.0, 0.0, 0.0));
+  this->getWeaponManager().setSlotPosition(1, Vector(5.0, 0.0, 0.0));*/
 
   this->getWeaponManager().setParentNode(this->cameraNode);
@@ -152 +152 @@
   if( true /*State::isOnline()*/ )
   {
-    FPSSniperRifle* wpRight = new FPSSniperRifle(0);
-    wpRight->setName("testGun Right");
-    this->addWeapon(wpRight,1, 0);
-    wpRight->toList( this->getOMListNumber() );
-    wpRight->setParent( this->cameraNode );
-    wpRight->setForwardDamageToParent( true );
+    weapon = new FPSSniperRifle(0);
+    weapon->setName("testGun Right");
+    this->addWeapon(weapon,1, 0);
+    weapon->toList( this->getOMListNumber() );
+    weapon->setParent( this->cameraNode );
+    weapon->setForwardDamageToParent( true );
     //wpRight->requestAction( WA_ACTIVATE );
     //wpRight->addChild(this->aimingSystem);
@@ -173 +173 @@
   this->weaponMan.setSlotCount(2);
   this->weaponMan.createWeaponSlot(0, 0, 0, 0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->weaponMan.createWeaponSlot(1, 0, 0, 0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  //this->weaponMan.createWeaponSlot(1, 0, 0, 0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
   this->weaponMan.addWeapon(wpRight, 0, 0);
   this->weaponMan.changeWeaponConfig(0);
@@ -307 +307 @@
      //this->getWeaponManager().setSlotPosition(0, Vector(-8.0, box->halfLength[1] * v, 1.1));
      //this->getWeaponManager().setSlotPosition(1, Vector(5.0, box->halfLength[1] * v, 0.0));
-     this->getWeaponManager().setSlotDirection( 0, Quaternion( 0.04, Vector( 0, 0, 1 ) ) );
+     //this->getWeaponManager().setSlotDirection( 0, Quaternion( 0.04, Vector( 0, 0, 1 ) ) );
   }
   

branches/presentation/src/world_entities/weapons/bsp_weapon.cc

@@ -200 +200 @@
     (*it)->draw();
   }
-#if 1
+#if 0
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
@@ -214 +214 @@
   Vector mp = this->getAbsCoor();
   Vector op = this->getAbsDir().apply( Vector(1, 0, 0) );
-  op *= 100;
+  op *= 1000;
   op += mp;
 

branches/presentation/src/world_entities/weapons/fps_sniper_rifle.cc

@@ -170 +170 @@
   glPushMatrix();
 
-  Vector pos = this->getAbsCoor() + this->getAbsDir().apply( Vector( 1, 0, 0 ) );
+  Vector pos = this->getAbsCoor() + this->getAbsDir().apply( Vector(3, -1.6622, -0.967) );
   glTranslatef (pos.x,
                 pos.y,