Changeset 3993 in orxonox.OLD for orxonox

Timestamp:

Apr 27, 2005, 12:12:28 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: patch to use relative coordinates again, some smaller changes in the preLoading/loading mechanisms

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (4 diffs)
• util/animation/animation3d.cc (modified) (2 diffs)
• world_entities/test_gun.cc (modified) (6 diffs)
• world_entities/weapon.cc (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -201 +201 @@
   wi->init(this);
   this->garbageCollector = GarbageCollector::getInstance();
+  this->trackManager = TrackManager::getInstance();
+  this->lightMan = LightManager::getInstance();
+  this->nullParent = NullParent::getInstance ();
+  this->nullParent->setName ("NullParent");
+
 }
 
@@ -215 +220 @@
       this->glmis->step();
       // initializing the TrackManager
-      trackManager = TrackManager::getInstance();
+
       //trackManager->addPoint(Vector(0,0,0));
       trackManager->addPoint(Vector(150, -35, 5));
@@ -277 +282 @@
 
       // LIGHT initialisation
-      lightMan = LightManager::getInstance();
+
       lightMan->setAmbientColor(.1,.1,.1);
       lightMan->addLight();
@@ -298 +303 @@
           {
             lightMan->setPosition(-5.0, 10.0, -40.0);
-            this->nullParent = NullParent::getInstance ();
-            this->nullParent->setName ("NullParent");
 
             // !\todo old track-system has to be removed

orxonox/trunk/src/util/animation/animation3d.cc

@@ -178 +178 @@
     case ANIM_LINEAR:
       this->animFuncMov = &Animation3D::mLinear;
-      //this->object->setRelCoor(this->currentKeyFrame->position);
+      this->object->setRelCoor(this->currentKeyFrame->position);
       this->currentKeyFrame->lastPosition = Vector();
       break;
     case ANIM_SINE:
       this->animFuncMov = &Animation3D::mSine;
-      //this->object->setRelCoor(this->currentKeyFrame->position);
+      this->object->setRelCoor(this->currentKeyFrame->position);
       this->currentKeyFrame->lastPosition = Vector();
       break;
     case ANIM_COSINE:
       this->animFuncMov = &Animation3D::mCosine;
-      //this->object->setRelCoor(this->currentKeyFrame->position);
+      this->object->setRelCoor(this->currentKeyFrame->position);
       this->currentKeyFrame->lastPosition = Vector();
       break;
     case ANIM_EXP:
+      this->object->setRelCoor(this->currentKeyFrame->position);
       this->animFuncMov = &Animation3D::mExp;
       break;
     case ANIM_NEG_EXP:
       this->animFuncMov = &Animation3D::mNegExp;
+      this->object->setRelCoor(this->currentKeyFrame->position);
       this->expFactorMov = -1.0 / this->currentKeyFrame->duration * logf(DELTA_X_3D);
       this->currentKeyFrame->lastPosition = Vector();
       break;
     case ANIM_QUADRATIC:
+      this->object->setRelCoor(this->currentKeyFrame->position);
       this->animFuncMov = &Animation3D::mQuadratic;
       break;
     case ANIM_RANDOM:
+      this->object->setRelCoor(this->currentKeyFrame->position);
       this->animFuncMov = &Animation3D::mRandom;
       break;
@@ -353 +357 @@
     case ANIM_CONSTANT:
       this->animFuncRot = &Animation3D::rConstant;
-      printf("a;sdlfkja;lskdjf;alskjdf;lasjdf;lasjdf;lasjdf;lajsdf\n");
       break;
     case ANIM_LINEAR:

orxonox/trunk/src/world_entities/test_gun.cc

@@ -49 +49 @@
   this->objectComponent1 = new PNode();
   this->animation1 = new Animation3D(this->objectComponent1);
-  //this->animation2 = new Animation3D(this);
+  this->animation2 = new Animation3D(this);
+  this->animation3 = new Animation3D(this);
   //parent->addChild(this->objectComponent1, PNODE_ALL);
   this->addChild(this->objectComponent1, PNODE_ALL);
 
   this->animation1->setInfinity(ANIM_INF_CONSTANT);
-  //this->animation2->setInfinity(ANIM_INF_CONSTANT);
+  this->animation2->setInfinity(ANIM_INF_CONSTANT);
+  this->animation3->setInfinity(ANIM_INF_CONSTANT);
   if( this->leftRight == W_LEFT)
     {
@@ -67 +69 @@
       this->animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_CONSTANT);
 
-
-      //this->animation2->addKeyFrame(Vector(0, 0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_LINEAR); 
-      //this->animation2->addKeyFrame(Vector(0, 0, 2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_LINEAR);
-      //this->animation2->addKeyFrame(Vector(0, 0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_LINEAR);
+      this->animation2->addKeyFrame(Vector(-2.6, 0.1, 2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 
+      this->animation2->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
+
+      this->animation3->addKeyFrame(Vector(-2.6, 0.1, 3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
+      this->animation3->addKeyFrame(Vector(-2.6, 0.1, 2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 
     }
   else if( this->leftRight == W_RIGHT)
@@ -86 +89 @@
 
 
+      this->animation2->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 
+      this->animation2->addKeyFrame(Vector(-2.6, 0.1, -3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
+
+      this->animation3->addKeyFrame(Vector(-2.6, 0.1, -3.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
+      this->animation3->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 
       //this->animation2->addKeyFrame(Vector(0, 0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_LINEAR); 
       //this->animation2->addKeyFrame(Vector(0, 0, 2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_LINEAR);
@@ -112 +120 @@
 void TestGun::activate()
 {
-  printf("ACTIVATE \n");
-  //this->animation2->replay();
+  if( this->leftRight == W_RIGHT) printf("ACTIVATE right weapon\n");
+  else printf("ACTIVATE left weapon\n");
+  
+  this->animation2->replay();
 }
 
@@ -127 +137 @@
 {
   printf("DEACTIVATE\n");
+  this->animation3->replay();
 }
 
@@ -200 +211 @@
   //this->getRelCoor().debug();
   //this->getAbsCoor().debug();
-
-  this->objectComponent1->getRelCoor().debug();
+  //this->objectComponent1->getRelCoor().debug();
   //this->objectComponent1->getAbsCoor().debug();
 

orxonox/trunk/src/world_entities/weapon.cc

@@ -110 +110 @@
 void WeaponManager::nextWeaponConf() 
 {
-  PRINTF(4)("Changing weapon configuration: from %i\n", this->currConfID);
+  PRINTF(4)("Changing weapon configuration: from %i to next\n", this->currConfID);
 
   Weapon* w;