Changeset 8891 in orxonox.OLD for branches

Timestamp:

Jun 29, 2006, 12:01:11 AM (18 years ago)

Author:

patrick

Message:

fps weapon work

Location:

branches/single_player_map/src/world_entities

Files:

• creatures/fps_player.cc (modified) (1 diff)
• weapons/fps_sniper_rifle.cc (modified) (1 diff)

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

@@ -117 +117 @@
 
 //   this->addWeapon(wpLeft, 1, 0);
-  this->addWeapon(wpRight,1 ,1);
+  this->addWeapon(wpRight,1, 0);
   this->getWeaponManager().changeWeaponConfig(1);
 
   this->getWeaponManager().setSlotCount(2);
-  this->getWeaponManager().setSlotPosition(0, Vector(-0.5, .2, -1.9));
+  this->getWeaponManager().setSlotPosition(0, Vector(0.0, 5.0, 0.0));
+  this->getWeaponManager().setSlotDirection(1, Quaternion(M_PI_4*.5, Vector(0,1,0)));
   this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
   this->getWeaponManager().setSlotPosition(1, Vector(-0.5, .2, 1.9));

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

@@ -74 +74 @@
   this->setClassID(CL_FPS_SNIPER_RIFLE, "FPSSniperRifle");
 
-//  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
-
-  this->loadModel("models/guns/fps_sniper_rifle.obj");
+  this->loadModel("models/guns/fps_sniper_rifle.obj", 0.1);
 
   this->setStateDuration(WS_SHOOTING, .1);