Changeset 3752 in orxonox.OLD

Timestamp:

Apr 7, 2005, 10:13:42 PM (19 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

Files:

• defs/debug.h (modified) (2 diffs)
• simple_animation.cc (modified) (6 diffs)
• simple_animation.h (modified) (3 diffs)
• story_entities/world.cc (modified) (4 diffs)
• world_entities/player.cc (modified) (1 diff)
• world_entities/test_gun.cc (modified) (5 diffs)
• world_entities/test_gun.h (modified) (2 diffs)
• world_entities/weapon.cc (modified) (1 diff)

orxonox/trunk/src/defs/debug.h

@@ -59 +59 @@
 #define DEBUG_MODULE_ORXONOX            0
 #define DEBUG_MODULE_WORLD              0
-#define DEBUG_MODULE_PNODE              3
+#define DEBUG_MODULE_PNODE              1
 #define DEBUG_MODULE_WORLD_ENTITY       0
 #define DEBUG_MODULE_COMMAND_NODE       0
@@ -65 +65 @@
 #define DEBUG_MODULE_LOAD               0
 
-#define DEBUG_MODULE_IMPORTER           2
+#define DEBUG_MODULE_IMPORTER           1
 #define DEBUG_MODULE_TRACK_MANAGER      0
 #define DEBUG_MODULE_GARBAGE_COLLECTOR  0
 #define DEBUG_MODULE_LIGHT              0
-#define DEBUG_MODULE_PLAYER             3
+#define DEBUG_MODULE_PLAYER             1
 #define DEBUG_MODULE_MATH               0
 

orxonox/trunk/src/simple_animation.cc

@@ -73 +73 @@
   delete iterator;
   delete this->frames;
+  singletonRef = NULL;
 }
 
@@ -118 +119 @@
 void SimpleAnimation::selectObject(WorldEntity* entity)
 {
-  printf("SimpleAnimation::selectObject() - selecing active object\n");
   Animation* anim = getAnimationFromWorldEntity(entity);
   if( anim == NULL)
     {
-      printf("SimpleAnimation::selectObject() - object not found, creating one\n");
       anim = new Animation;
       anim->object = entity;
@@ -128 +127 @@
       anim->tmpVect = new Vector();
       anim->frames = new tList<KeyFrame>();
+      anim->animMode = LOOP;
       bRunning = false;
       deltaT = 0.0;
       this->animators->add(anim);
     }
-  else 
-    printf("SimpleAnimation::selectObject() - animation already existent, using it\n");
   this->workingAnimator = anim;
-  printf("SimpleAnimation::selectObject() - selection completed\n");
 }
 
@@ -203 +200 @@
 }
 
+
+void SimpleAnimation::setAnimationMode(animationMode mode)
+{
+  if( !this->bDescriptive || this->workingAnimator == NULL)
+    {
+      PRINTF(1)("SimpleAnimation: executing animation code outside a AnimationBegin()/AnimationEnd() - ignoring\n");
+      return;
+    }
+  this->workingAnimator->animMode = mode;
+}
 
 /**
@@ -323 +330 @@
               anim->lastFrame = anim->currentFrame;
               anim->currentFrame = anim->frames->nextElement(anim->currentFrame);
+              if( anim->currentFrame == anim->frames->firstElement() && anim->animMode == SINGLE)
+                {
+                  anim->bRunning = false;
+                  return;
+                }
               anim->movMode = anim->currentFrame->mode;
               if( anim->movMode == NEG_EXP)
@@ -335 +347 @@
             {
             case LINEAR:
-              
               *anim->tmpVect = *anim->currentFrame->position - *anim->lastFrame->position;
               *anim->tmpVect = *anim->tmpVect * anim->localTime / anim->currentFrame->time;

orxonox/trunk/src/simple_animation.h

@@ -67 +67 @@
  public:
   static SimpleAnimation* getInstance();
+  virtual ~SimpleAnimation();
 
   void animatorBegin();
@@ -74 +75 @@
   void addKeyFrame(Vector* point, Quaternion* direction, float time, movementMode mode);
   void addKeyFrame(KeyFrame* frame);
+  void setAnimationMode(animationMode mode);
   void reset();
 
@@ -87 +89 @@
  private:
   SimpleAnimation();
-  virtual ~SimpleAnimation();
 
   static SimpleAnimation* singletonRef;

orxonox/trunk/src/story_entities/world.cc

@@ -158 +158 @@
   delete this->trackManager;
 
+  delete this->simpleAnimation;
   //delete garbagecollecor
   //delete animator
@@ -448 +449 @@
             this->spawn(baseNode);
 
-            WorldEntity* secondNode = new Satellite(Vector(0,0,1), 1.0);
+            WorldEntity* secondNode = new Satellite(Vector(0,0,1), 2.0);
             baseNode->addChild(secondNode);
-            secondNode->setRelCoor(new Vector(0.0, 3.0, 0.0));
+            secondNode->setRelCoor(new Vector(0.0, 0.0, 3.0));
             this->spawn(secondNode);
 
 
-            WorldEntity* thirdNode = new Satellite(Vector(0,0,1), 2.0);
+            WorldEntity* thirdNode = new Satellite(Vector(0,0,1), 1.0);
             secondNode->addChild(thirdNode);
             thirdNode->setRelCoor(new Vector(2.0, 0.0, 0.0));
@@ -460 +461 @@
 
 
+            
+            
 
             WorldEntity* b = new Environment();
@@ -499 +502 @@
 
 
+
             this->simpleAnimation->animatorBegin();
             this->simpleAnimation->selectObject(b);
+            this->simpleAnimation->setAnimationMode(SINGLE);
             this->simpleAnimation->addKeyFrame(f1);
             this->simpleAnimation->addKeyFrame(f2);

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);