Changeset 10737 in orxonox.OLD for branches/presentation/src/world_entities

Timestamp:

Jun 20, 2007, 6:17:06 PM (18 years ago)

Author:

nicolasc

Message:

collision fix

Location:

branches/presentation/src/world_entities

Files:

• projectiles/hbolt.cc (modified) (3 diffs)
• projectiles/hbolt.h (modified) (1 diff)
• projectiles/nadion_blast.cc (modified) (4 diffs)
• projectiles/plasma_pulse.cc (modified) (2 diffs)
• projectiles/test_bullet.cc (modified) (1 diff)
• weapons/nadion_laser.cc (modified) (1 diff)
• world_entity.h (modified) (4 diffs)

branches/presentation/src/world_entities/projectiles/hbolt.cc

@@ -20 +20 @@
 #include "state.h"
 #include "model.h"
+
+#include "world_entities/npcs/actionbox_enemy.h"
 #include "world_entities/npcs/npc.h"
 
@@ -125 +127 @@
 {
   printf("Collision with HBolt\n");
-  if (this->hitEntity != entity && entity->isA(NPC::staticClassID()) || entity == this->target)
+  if (this->hitEntity != entity/* && entity->isA(NPC::staticClassID())*/ && entity->isA(ActionboxEnemy::staticClassID()) || entity == this->target)
     this->destroy( entity );
   this->hitEntity = entity;
@@ -148 +150 @@
   this->angle += HBolt::rotationSpeed * dt;
 
-  for( ObjectList<NPC>::const_iterator eIterator = NPC::objectList().begin(); eIterator !=NPC::objectList().end(); eIterator++)
+  for( ObjectList<ActionboxEnemy>::const_iterator eIterator = ActionboxEnemy::objectList().begin(); eIterator !=ActionboxEnemy::objectList().end(); eIterator++)
   {
     if( ((*eIterator)->getOMListNumber() != (this->origList -1))  && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)

branches/presentation/src/world_entities/projectiles/hbolt.h

@@ -9 +9 @@
 #include "projectile.h"
 #include "effects/billboard.h"
+
 
 class Vector;

branches/presentation/src/world_entities/projectiles/nadion_blast.cc

@@ -23 +23 @@
 #include "model.h"
 
+#include "world_entities/npcs/actionbox_enemy.h"
 #include "world_entities/npcs/npc.h"
 
@@ -149 +150 @@
 }
 
-/*
-void NadionBlast::hit (float damage, WorldEntity* entity )
-{
-
-  if (this->hitEntity != entity)
-    this->destroy( entity );
-  this->hitEntity = entity;
- // dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),this->getElecDamage());
-  //this->destroy(this);
-  this->deactivate();
-
-  return;
-
-}*/
+
+// void NadionBlast::hit (float damage, WorldEntity* entity )
+// {
+// 
+//   if (this->hitEntity != entity)
+//     this->destroy( entity );
+//   this->hitEntity = entity;
+//  // dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),this->getElecDamage());
+//   //this->destroy(this);
+//   this->deactivate();
+// 
+//   return;
+// 
+// }
 
 /**
@@ -180 +181 @@
 //   this->trail->tick(dt);
 
-  for( ObjectList<NPC>::const_iterator eIterator = NPC::objectList().begin(); eIterator !=NPC::objectList().end(); eIterator++)
+  for( ObjectList<ActionboxEnemy>::const_iterator eIterator = ActionboxEnemy::objectList().begin(); eIterator !=ActionboxEnemy::objectList().end(); eIterator++)
   {
     if( ((*eIterator)->getOMListNumber() != (this->origList -1))  && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)
@@ -215 +216 @@
 //   glRotatef(this->angle, 1.0f, 0.0f, 0.0f); //spinning missile 
 // HACK, need to be removed, once the AbsDir is correct, replace with the one above
-  glRotatef(this->angle, this->flightDirection.x, this->flightDirection.y, this->flightDirection.z); 
+//   glRotatef(this->angle, this->flightDirection.x, this->flightDirection.y, this->flightDirection.z); 
   this->getAbsDir().matrix (matrix);
   glMultMatrixf((float*)matrix);

branches/presentation/src/world_entities/projectiles/plasma_pulse.cc

@@ -21 +21 @@
 
 #include "state.h"
+#include "world_entities/npcs/actionbox_enemy.h"
 
 #include <cassert>
@@ -112 +113 @@
   this->grid->tick(dt);
 
-  for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
+  for( ObjectList<ActionboxEnemy>::const_iterator eIterator = ActionboxEnemy::objectList().begin(); eIterator !=ActionboxEnemy::objectList().end(); eIterator++)
   {
     if( ((*eIterator)->getOMListNumber() != (this->origList -1))  && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 3)

branches/presentation/src/world_entities/projectiles/test_bullet.cc

@@ -136 +136 @@
   this->lifeCycle += time/this->lifeSpan;
   if( this->lifeCycle >= 1.0)
-    {
-      PRINTF(5)("FINALIZE==========================\n");
-      PRINTF(5)("current life cycle is: %f\n", this->lifeCycle);
-      PRINTF(5)("FINALIZE===========================\n");
+  {
+    PRINTF(5)("FINALIZE==========================\n");
+    PRINTF(5)("current life cycle is: %f\n", this->lifeCycle);
+    PRINTF(5)("FINALIZE===========================\n");
 
-      this->deactivate();
-    }
+    this->deactivate();
+  }
 }
 

branches/presentation/src/world_entities/weapons/nadion_laser.cc

@@ -155 +155 @@
 //   pj->setAbsDir(Quaternion(this->getDefaultTarget()->getAbsCoor() - this->getAbsCoor(), Vector(0,0,0)));
 //   pj->setAbsDir(Quaternion(tmp.getNormalized(), this->getParent()->getAbsDir().apply(Vector(0,1,0))));
-  pj->setAbsDir(Quaternion(dir, up.getNormalized()));
-  
+//   pj->setAbsDir(Quaternion(dir, up.getNormalized()));
+  pj->setAbsDir(Quaternion(dir, Vector(1,0,0)));
+
   pj->setAbsDir(this->getAbsDir());
   pj->activate();

branches/presentation/src/world_entities/world_entity.h

@@ -226 +226 @@
   void setHealthRegen(float regen) { this->healthRegen = regen; };
   void createImplantWidget();
-    //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
 
   void setShield(float shield) { this->shield = shield; };
@@ -238 +237 @@
   void setElectronicTH(float th) { this->electronicTH = th; };
   void setElectronicRegen(float regen) { this->electronicRegen = regen; };
-  
+
   void setDamageable( bool damageable ){ this->damageable = damageable; }
   bool getDamageable(){ return this->damageable; }
@@ -270 +269 @@
   bool                    forwardDamageToParent;  //!< if true, damage taken will be forwardet to parent
   float                   healthMax;              //!< The Maximal energy this entity can take. 
-  float                                         implantEnergy;          //!< energy of implants
-  float                   healthRegen;        //!< Regeneration Rate of Health, mesured in units per second
+  float                   implantEnergy;          //!< energy of implants
+  float                   healthRegen;            //!< Regeneration Rate of Health, mesured in units per second
   OrxGui::GLGuiEnergyWidgetVertical* healthWidget;    //!< The Slider (if wanted).
-  OrxGui::GLGuiEnergyWidgetVertical* implantWidget; 
+  OrxGui::GLGuiEnergyWidgetVertical* implantWidget;
 
   float       shield;             //!< current shield
@@ -324 +323 @@
   float                   healthMax_write;
   int                     healthMax_handle;
-  
+