Changeset 3631 in orxonox.OLD

Timestamp:

Mar 22, 2005, 12:10:09 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: gun can be fired, projectil do not move jet

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)
• world_entities/projectile.cc (modified) (1 diff)
• world_entities/test_gun.cc (modified) (3 diffs)
• world_entities/test_gun.h (modified) (2 diffs)
• world_entities/weapon.cc (modified) (1 diff)
• world_entities/weapon.h (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -166 +166 @@
   this->setClassName ("World");
 
-  this->worldName = "Just a test level";
+  this->worldName = name;
   this->debugWorldNr = worldID;
   this->entities = new tList<WorldEntity>();

orxonox/trunk/src/world_entities/player.cc

@@ -51 +51 @@
   acceleration = 10.0;
   //weapons:
-  Weapon* wp = new TestGun();
+  Weapon* wp = new TestGun(this, new Vector(), new Quaternion);
   this->weapons->add(wp);
   this->activeWeapon = wp;  

orxonox/trunk/src/world_entities/projectile.cc

@@ -83 +83 @@
   glMultMatrixf((float*)matrix);  
   //this->model->draw();
-  PRINTF(1)("draw draw draw draw draw draw \n");
   this->projectileModel->draw();
 

orxonox/trunk/src/world_entities/test_gun.cc

@@ -14 +14 @@
    main-programmer: Patrick Boenzli
    co-programmer: 
+
+
+   \todo: direction in which the projectile flights
+   \todo: a target to set/hit
 */
 
@@ -35 +39 @@
    creates a new weapon
 */
-TestGun::TestGun () : Weapon()
+TestGun::TestGun (PNode* parent, Vector* coordinate, Quaternion* direction) 
+  :  Weapon (parent, coordinate, direction) 
 {}
 
@@ -78 +83 @@
 {
   printf("TestGun::fire() - firing weapon now ---------------------------\n");
-  //WorldEntity* pj = new Projectile();
-  //this->worldEntities->add(pj);
+  WorldEntity* pj = new Projectile();
+  pj->setAbsCoor( &this->getAbsCoor());
+  pj->setAbsDir( &this->getAbsDir());
+  this->worldEntities->add(pj);
 }
 

orxonox/trunk/src/world_entities/test_gun.h

@@ -27 +27 @@
 
 class Projectile;
+class Vector;
+class Quaternion;
 
 
@@ -34 +36 @@
 
  public:
-  TestGun ();
+  TestGun (PNode* parent, Vector* coordinate, Quaternion* direction);
   virtual ~TestGun ();
 

orxonox/trunk/src/world_entities/weapon.cc

@@ -34 +34 @@
    creates a new weapon
 */
-Weapon::Weapon () : WorldEntity()
-{
+Weapon::Weapon (PNode* parent, Vector* coordinate, Quaternion* direction) 
+  : WorldEntity()
+{
+  parent->addChild(this, PNODE_ROTATE_AND_MOVE);
+  this->setRelCoor(coordinate);
+  this->setRelDir(direction);
   WorldInterface* wi = WorldInterface::getInstance();
   this->worldEntities = wi->getEntityList();

orxonox/trunk/src/world_entities/weapon.h

@@ -43 +43 @@
 
  public:
-  Weapon ();
+  Weapon (PNode* parent, Vector* coordinate, Quaternion* direction);
   virtual ~Weapon ();