Changeset 8776 in orxonox.OLD

Timestamp:

Jun 25, 2006, 11:47:54 PM (18 years ago)

Author:

patrick

Message:

trunk: added weapons to the fps character

Location:

trunk/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (1 diff)
• world_entities/creatures/fps_player.cc (modified) (4 diffs)

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -676 +676 @@
 
   /* draw world axes */
-  if( 1 /*drawMode & DRAW_BV_AXIS*/)
-  {
-    glBegin(GL_LINES);
-    glColor3f(1.0, 0.0, 0.0);
-    glVertex3f(0.0, 0.0, 0.0);
-    glVertex3f(3.0, 0.0, 0.0);
-
-    glColor3f(0.0, 1.0, 0.0);
-    glVertex3f(0.0, 0.0, 0.0);
-    glVertex3f(0.0, 3.0, 0.0);
-
-    glColor3f(0.0, 0.0, 1.0);
-    glVertex3f(0.0, 0.0, 0.0);
-    glVertex3f(0.0, 0.0, 3.0);
-    glEnd();
-  }
+//   if( 1 /*drawMode & DRAW_BV_AXIS*/)
+//   {
+//     glBegin(GL_LINES);
+//     glColor3f(1.0, 0.0, 0.0);
+//     glVertex3f(0.0, 0.0, 0.0);
+//     glVertex3f(3.0, 0.0, 0.0);
+//
+//     glColor3f(0.0, 1.0, 0.0);
+//     glVertex3f(0.0, 0.0, 0.0);
+//     glVertex3f(0.0, 3.0, 0.0);
+//
+//     glColor3f(0.0, 0.0, 1.0);
+//     glVertex3f(0.0, 0.0, 0.0);
+//     glVertex3f(0.0, 0.0, 3.0);
+//     glEnd();
+//   }
 
 

trunk/src/world_entities/creatures/fps_player.cc

@@ -22 +22 @@
 #include "src/lib/util/loading/factory.h"
 
+#include "weapons/weapon_manager.h"
+#include "weapons/test_gun.h"
+#include "weapons/turret.h"
+#include "weapons/cannon.h"
+
 #include "key_mapper.h"
 
@@ -63 +68 @@
   this->setClassID(CL_FPS_PLAYER, "FPSPlayer");
 
-  this->getWeaponManager().changeWeaponConfig(1);
 
   this->bLeft = false;
@@ -92 +96 @@
   registerEvent(EV_MOUSE_MOTION);
 
-  this->getWeaponManager().setSlotCount(0);
-
-
+
+
+  // weapon manager for the fps
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
+
+  Weapon* wpRight = new TestGun(0);
+  wpRight->setName("testGun Right");
+  Weapon* wpLeft = new TestGun(1);
+//   Weapon* wpLeft = new Turret();
+  wpLeft->setName("testGun Left");
+
+  this->addWeapon(wpLeft, 1, 0);
+  this->addWeapon(wpRight,1 ,1);
+  this->getWeaponManager().changeWeaponConfig(1);
+
+  this->getWeaponManager().setSlotCount(2);
+  this->getWeaponManager().setSlotPosition(0, Vector(-0.5, .2, -1.9));
+  this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->getWeaponManager().setSlotPosition(1, Vector(-0.5, .2, 1.9));
+  this->getWeaponManager().setSlotDirection(1, Quaternion(M_PI_4*.5, Vector(1,0,0)));
+
+  this->getWeaponManager().getFixedTarget()->setParent(&this->cameraNode);
+  this->getWeaponManager().getFixedTarget()->setRelCoor(1000,0,0);
+
 
   // network registration
@@ -103 +127 @@
   registerVar( new SynchronizeableBool( &bBackward, &bBackward, "bBackward", PERMISSION_OWNER ) );
 //  registerVar( new SynchronizeableQuaternion( &mouseDir, &mouseDir, "mouseDir", PERMISSION_OWNER ) );
+
 
   // collision reaction registration