Changeset 10533 in orxonox.OLD

Timestamp:

Jan 31, 2007, 2:27:59 AM (17 years ago)

Author:

patrick

Message:

rotor flimmer fix

Location:

trunk/src/world_entities

Files:

• environments/rotor.cc (modified) (3 diffs)
• environments/rotor.h (modified) (1 diff)
• weapons/light_blaster.cc (modified) (1 diff)
• weapons/swarm_launcher.cc (modified) (1 diff)

trunk/src/world_entities/environments/rotor.cc

@@ -34 +34 @@
   //PRINTF(0)("loading Rotor");
 
+  this->totalTime = 0.0;
+
   if (root != NULL)
     this->loadParams(root);
@@ -55 +57 @@
 {
      this->rotation = Vector(x,y,z);
+/*     this->rotation = this->rotation.getNormalized();*/
 }
 
@@ -62 +65 @@
 void Rotor::tick(float dt)
 {
-     this->shiftDir(Quaternion(rotation.x*dt, Vector(1,0,0)) * Quaternion(rotation.y*dt, Vector(0,1,0)) * Quaternion(rotation.z*dt, Vector(0,0,1)));
+
+  this->totalTime += dt;
+
+
+
+     this->setAbsDir(Quaternion(rotation.x*this->totalTime, Vector(1,0,0)) *
+                    Quaternion(rotation.y*this->totalTime, Vector(0,1,0)) *
+                    Quaternion(rotation.z*this->totalTime, Vector(0,0,1)));
 
 }

trunk/src/world_entities/environments/rotor.h

@@ -20 +20 @@
 
     virtual ~Rotor();
-  
+
     virtual void loadParams(const TiXmlElement* root);
-  
+
     void initRotation(float x, float y, float z);
-    
+
     virtual void tick(float time);
-  
+
   private:
     Vector              rotation;         //!< the rotation axis
-
+    double              totalTime;        //!< total time
 };
 

trunk/src/world_entities/weapons/light_blaster.cc

@@ -127 +127 @@
 void LightBlaster::fire()
 {
-  PRINTF(0)("=>>fir\n");
   Projectile* pj =  this->getProjectile();
   if (pj == NULL)

trunk/src/world_entities/weapons/swarm_launcher.cc

@@ -155 +155 @@
   bool fired  = false;
 
+  PRINTF(0)("fire\n");
   Projectile* pj = NULL;
   for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)