Changeset 3752 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Apr 7, 2005, 10:13:42 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: weapon now works perfectly: it shoots and moves to it. now i will have to change the projectile model itself….

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (1 diff)
• test_gun.cc (modified) (5 diffs)
• test_gun.h (modified) (2 diffs)
• weapon.cc (modified) (1 diff)

orxonox/trunk/src/world_entities/player.cc

@@ -53 +53 @@
   acceleration = 10.0;
   //weapons:
-  Weapon* wp = new TestGun(this, new Vector(-1.1, 0.0, 2.6), new Quaternion());
+  Weapon* wp = new TestGun(this, new Vector(-2.6, 0.1, 3.0), new Quaternion());
   this->weapons->add(wp);
   this->activeWeapon = wp;  

orxonox/trunk/src/world_entities/test_gun.cc

@@ -30 +30 @@
 #include "vector.h"
 #include "list.h"
+#include "simple_animation.h"
 
 using namespace std;
@@ -42 +43 @@
   :  Weapon (parent, coordinate, direction) 
 {
-  //this->model = (Model*)ResourceManager::getInstance()->load("models/weapon_packet.obj", OBJ, RP_CAMPAIGN);
+  this->model = (Model*)ResourceManager::getInstance()->load("models/test_gun.obj", OBJ, RP_CAMPAIGN);
   this->idleTime = 0.2f;
+
+  this->animator = SimpleAnimation::getInstance();
+  this->dummy = new WorldEntity(); /* a world entity that is not drawed: use this for the weapon */
+  parent->addChild(this->dummy, PNODE_ALL);
+  //this->dummy->setRelCoor(new Vector(-2.6, 0.1, 3.0));
+  
+  this->animator->animatorBegin();
+  this->animator->selectObject(this->dummy);
+  this->animator->setAnimationMode(SINGLE);
+  this->animator->addKeyFrame(new Vector(-2.6, 0.1, 3.0), new Quaternion(), 0.0, NEG_EXP);
+  this->animator->addKeyFrame(new Vector(-3.0, 0.1, 3.0), new Quaternion(), 0.1, NEG_EXP);
+  this->animator->addKeyFrame(new Vector(-2.6, 0.1, 3.0), new Quaternion(), 0.5, NEG_EXP);
+  this->animator->animatorEnd();
+  
 }
 
@@ -100 +115 @@
   this->worldEntities->add(pj);
   this->localTime = 0;
+  
+  this->animator->animatorBegin();
+  this->animator->selectObject(this->dummy);
+  this->animator->start();
+  this->animator->animatorEnd();
 }
 
@@ -131 +151 @@
 {
   this->localTime += time;
-  //this->debug();
-  //printf("TEST_GUN: this speed is: %f\n", this->getSpeed());
 }
 
@@ -148 +166 @@
 void TestGun::draw () 
 {
+  
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
   float matrix[4][4];
   
-  /* translate */
+  
   glTranslatef (this->getAbsCoor ().x, 
                 this->getAbsCoor ().y, 
                 this->getAbsCoor ().z);
-  /* rotate */
+  
   this->getAbsDir ().matrix (matrix);
   glMultMatrixf((float*)matrix);
+  this->model->draw(1);
+  glPopMatrix();
   
-  //this->model->draw(2);
+
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+  
+  glTranslatef (this->dummy->getAbsCoor ().x, 
+                this->dummy->getAbsCoor ().y, 
+                this->dummy->getAbsCoor ().z);
+
+  this->dummy->getAbsDir ().matrix (matrix);
+  glMultMatrixf((float*)matrix);
+  this->model->draw(0);
   glPopMatrix();
+
 }
 

orxonox/trunk/src/world_entities/test_gun.h

@@ -29 +29 @@
 class Vector;
 class Quaternion;
+class SimpleAnimation;
 
 
@@ -50 +51 @@
   virtual void draw(void);
 
+ private:
+  SimpleAnimation* animator;
+  WorldEntity* dummy;
+
 };
 

orxonox/trunk/src/world_entities/weapon.cc

@@ -37 +37 @@
   : WorldEntity()
 {
-  parent->addChild(this, PNODE_ROTATE_AND_MOVE);
+  parent->addChild(this, PNODE_ALL);
   this->setRelCoor(coordinate);
   this->setRelDir(direction);