Changeset 10601 in orxonox.OLD for branches/cleanup/src/world_entities

Timestamp:

Mar 23, 2007, 12:21:42 AM (18 years ago)

Author:

rennerc

Message:

i hope i fixed some bugs

Location:

branches/cleanup/src/world_entities

Files:

• effects/wobblegrid.cc (modified) (1 diff)
• projectiles/swarm_projectile.cc (modified) (2 diffs)
• spectator.cc (modified) (1 diff)
• weapons/light_blaster.cc (modified) (1 diff)

branches/cleanup/src/world_entities/effects/wobblegrid.cc

@@ -93 +93 @@
   this->angularSpeed = M_PI; //180;
   this->setModel(this->grid);
+  
+  this->angle = 0;
 
   this->setUpdateFunction((*sinf));

branches/cleanup/src/world_entities/projectiles/swarm_projectile.cc

@@ -60 +60 @@
   //this->trail->setParent( this);
   this->trail->setTexture( "textures/laser.png");
+  
+  this->maxVelocity = 300;
+
+  this->rotationSpeed = 360;
+  this->angle = 0;
 
 
@@ -216 +221 @@
 
   this->angle += this->rotationSpeed * time;
+
   while (this->angle > 360)
+  {
     this->angle -= 360;
+  }
 
   this->lastDir = this->curDir;

branches/cleanup/src/world_entities/spectator.cc

@@ -242 +242 @@
     this->yMouse += event.yRel;
   }
-  else if( event.type == KeyMapper::PEV_JUMP)
-  {
+  else if( event.type == KeyMapper::PEV_FIRE1 )
+  {
+    PRINTF(0)( "CURRENT POS: (%f, %f, %f) ROT (%f, (%f, %f, %f))\n", this->getAbsCoorX(), this->getAbsCoorY(), this->getAbsCoorZ(), this->getAbsDir().w, this->getAbsDir().v.x, this->getAbsDir().v.y, this->getAbsDir().v.z );
 //     FPSPlayer * fps = new FPSPlayer();
 //     //GenericNPC* fps = new GenericNPC();

branches/cleanup/src/world_entities/weapons/light_blaster.cc

@@ -55 +55 @@
   for (int i = 0; i < this->getBarrels(); i++)
   {
-   delete [] this->shootAnim[i];
+   //delete [] this->shootAnim[i];
    delete [] this->objComp[i];
   }
   delete [] this->emissionPoint;
-   delete [] this->shootAnim;
+   //delete [] this->shootAnim;
    delete [] this->objComp;