Changeset 8894 in orxonox.OLD for trunk/src/world_entities/creatures

Timestamp:

Jun 29, 2006, 12:19:48 AM (18 years ago)

Author:

patrick

Message:

merged the branche single_player_map with the trunk

File:

• trunk/src/world_entities/creatures/fps_player.cc (modified) (3 diffs)

trunk/src/world_entities/creatures/fps_player.cc

@@ -26 +26 @@
 #include "weapons/turret.h"
 #include "weapons/cannon.h"
+#include "weapons/fps_sniper_rifle.h"
 
 #include "key_mapper.h"
@@ -35 +36 @@
 
 CREATE_FACTORY(FPSPlayer, CL_FPS_PLAYER);
+
+#include "script_class.h"
+CREATE_SCRIPTABLE_CLASS(FPSPlayer, CL_FPS_PLAYER,
+                        addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
+                            ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))
+                            ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
+                            ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
+                       );
 
 
@@ -101 +110 @@
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 
-  Weapon* wpRight = new TestGun(0);
+  Weapon* wpRight = new FPSSniperRifle(0);
   wpRight->setName("testGun Right");
-  Weapon* wpLeft = new TestGun(1);
+/*  Weapon* wpLeft = new TestGun(1);*/
 //   Weapon* wpLeft = new Turret();
-  wpLeft->setName("testGun Left");
-
-  this->addWeapon(wpLeft, 1, 0);
-  this->addWeapon(wpRight,1 ,1);
+//   wpLeft->setName("testGun Left");
+
+//   this->addWeapon(wpLeft, 1, 0);
+  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));