Changeset 10645 in orxonox.OLD

Timestamp:

May 2, 2007, 11:48:16 PM (17 years ago)

Author:

nicolasc

Message:

minor cleanup

Location:

branches/vs-enhencements/src

Files:

• util/track/action_box.cc (modified) (4 diffs)
• world_entities/WorldEntities.am (modified) (2 diffs)
• world_entities/effects/billboard.cc (modified) (2 diffs)
• world_entities/effects/billboard.h (modified) (2 diffs)
• world_entities/projectiles/hbolt.cc (modified) (4 diffs)
• world_entities/projectiles/lbolt.cc (modified) (1 diff)
• world_entities/weapons/heavy_blaster.cc (modified) (1 diff)
• world_entities/weapons/light_blaster.cc (modified) (1 diff)
• world_entities/weapons/rf_cannon.cc (modified) (5 diffs)
• world_entities/weapons/weapon.cc (modified) (3 diffs)
• world_entities/weapons/weapon.h (modified) (1 diff)

branches/vs-enhencements/src/util/track/action_box.cc

@@ -127 +127 @@
 bool ActionBox::isPointInBox( const Vector & pos )
 {
-  bool result = true;
+  bool result = true; //TODO remove
   for ( int i = 0; i<6; i++ )
   {
     if ( planes[i].distancePoint( pos ) < 0 )
     {
-      result = false;
+      result = false; // TODO return false;
       printf("PLANE %i FAILED %f\n", i, planes[i].distancePoint( pos ) );
     }
   }
-  
-  return result;
+  return result;  //TODO return true;
 }
 
@@ -146 +145 @@
 {
   Vector p[7];
-  
+
   p[0] = Vector( 0.0, height_2, -width_2 );
   p[1] = Vector( 0.0, height_2, width_2 );
@@ -154 +153 @@
   p[5] = Vector( depth, -height_2, width_2 );
   p[6] = Vector( depth, -height_2, -width_2 );
-  
+
   for ( int i = 0; i<7; i++ )
   {
@@ -160 +159 @@
     p[i] += track->getTrackNode()->getAbsCoor();
   }
-  
+
   planes[0] = Plane( p[1], p[0], p[2] );
   planes[1] = Plane( p[3], p[4], p[5] );

branches/vs-enhencements/src/world_entities/WorldEntities.am

@@ -49 +49 @@
                 world_entities/projectiles/spike.cc \
                 world_entities/projectiles/acid_splash.cc \
+                world_entities/projectiles/plasma_pulse.cc \
                 \
                 world_entities/projectiles/projectile_weapon.cc \
@@ -202 +203 @@
                 projectiles/spike_ball.h \
                 projectiles/acid_splash.h \
-                \
+                projectiles/plasma_pulse.h \
+               \
                 projectiles/projectile_weapon.h \
                 projectiles/spike_ball.h \

branches/vs-enhencements/src/world_entities/effects/billboard.cc

@@ -125 +125 @@
   if (this->angle > M_2_PI)
     this->angle -= M_2_PI;
+//   curMagnitude = updatePulse(this->angle);
 }
 
@@ -159 +160 @@
   float tmp = 1;
   if (this->bPulse)
-    tmp += this->pulseMagnitude * updatePulse(this->angle);
+    tmp += this->pulseMagnitude * sinf(this->angle); //updatePulse(this->angle);
 
   v *= sizeX * tmp;

branches/vs-enhencements/src/world_entities/effects/billboard.h

@@ -26 +26 @@
     void colorTexture(const Color col);
 
+    //!< Pulsing Capability, changes size of the grid
     inline void togglePluse () {this->bPulse = !bPulse; };
     inline void setPulse () { this->bPulse = true; };
@@ -49 +50 @@
     bool bPulse;
     float pulseMagnitude;
+    float curMagnitude;
     float angle;
     float angularSpeed;

branches/vs-enhencements/src/world_entities/projectiles/hbolt.cc

@@ -59 +59 @@
   this->halo = new Billboard();
   this->halo->setSize(.65, .65);
-  this->halo->setTexture("hbolt_halo2.png");
+  this->halo->setTexture("hbolt_halo2.jpg");
   this->halo->setVisibility(false);
 
@@ -177 +177 @@
   glPushAttrib(GL_ENABLE_BIT);
   glDisable(GL_LIGHTING);
-//   glDisable(GL_FOG);
+  glDisable(GL_FOG);
 
   glMatrixMode(GL_MODELVIEW);
@@ -184 +184 @@
 //     float matrix[4][4];
     glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+    this->halo->draw();
+
     Vector tmpRot = this->getAbsDir().getSpacialAxis();
     glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
@@ -189 +191 @@
 //     glMultMatrixf((float*)matrix);
     this->getModel()->draw();
-    this->halo->draw();
 
   glPopMatrix();

branches/vs-enhencements/src/world_entities/projectiles/lbolt.cc

@@ -62 +62 @@
   this->halo = new Billboard();
   this->halo->setSize(.35, .35);
-  this->halo->setTexture("hbolt_halo.png");
+  this->halo->setTexture("hbolt_halo.jpg");
   this->halo->setVisibility(false);
 

branches/vs-enhencements/src/world_entities/weapons/heavy_blaster.cc

@@ -98 +98 @@
 //  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
 
-  this->loadModel("models/guns/frag_cannon.obj", .4);
+  this->loadModel("models/guns/frag_cannon2.obj", .4);
 
 

branches/vs-enhencements/src/world_entities/weapons/light_blaster.cc

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

branches/vs-enhencements/src/world_entities/weapons/rf_cannon.cc

@@ -52 +52 @@
 RFCannon::~RFCannon()
 {
-//   for (int i = 0; i < this->getBarrels(); i++)
-//     delete [] this->objComp[i];
+  for (int i = 0; i < this->getBarrels(); i++)
+    delete [] this->objComp[i];
 
-//   delete [] this->emissionPoint;
-//   delete [] this->objComp;
+  delete [] this->emissionPoint;
+  delete [] this->objComp;
 }
 
@@ -67 +67 @@
 {
 
-  this->loadModel("models/guns/rf_cannon.obj", 0.3);
+  this->loadModel("models/guns/rf_cannon.obj", 0.2);
 
 
@@ -82 +82 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
-  this->setProjectileTypeC("LBolt");
+  this->setProjectileTypeC("PlasmaPulse");
   this->prepareProjectiles(100);
 
@@ -122 +122 @@
 void RFCannon::fire()
 {
-  for (int i = 0; i < this->getBarrels(); i++){
+//   for (int i = 0; i < this->getBarrels(); i++){
     Projectile* pj =  this->getProjectile();
     if (pj == NULL)
@@ -139 +139 @@
 
     this->activeBarrel = (this->activeBarrel + 1) % this->getBarrels();
-  }
+//   }
 }
 

branches/vs-enhencements/src/world_entities/weapons/weapon.cc

@@ -163 +163 @@
  * needed, if there are more than one barrel or segments
  */
+/*
 void Weapon::init2()
 {
@@ -182 +183 @@
     this->shootAnim[i] = new Animation3D* [this->segs];
   }
-}
+}*/
 
 /**
  * deconstructor for init2
  */
+/*
 void Weapon::deconstr()
 {
@@ -198 +200 @@
   delete this->emissionPoint;
   delete this->shootAnim;
-}
+}*/
 
 /**

branches/vs-enhencements/src/world_entities/weapons/weapon.h

@@ -181 +181 @@
     inline void setSegs(int segs) { this->segs = segs; };
 
-    inline Animation3D* getShootAnim(int barrel, int seg) { return this->shootAnim[barrel][seg]; };
-    inline void setShootAnim(int barrel, int seg, PNode* component) { this->shootAnim[barrel][seg] = this->getAnimation(barrel, seg, component); };
-
-    void init2();
+//     inline Animation3D* getShootAnim(int barrel, int seg) { return this->shootAnim[barrel][seg]; };
+//     inline void setShootAnim(int barrel, int seg, PNode* component) { this->shootAnim[barrel][seg] = this->getAnimation(barrel, seg, component); };
+
+//     void init2();
     void deconstr();