Changeset 10710 in orxonox.OLD for branches

Timestamp:

Jun 17, 2007, 2:25:20 PM (18 years ago)

Author:

rennerc

Message:

player cannot shoot throu walls
per default worldentities cannot be killed
weapon correct again

Location:

branches/presentation/src/world_entities

Files:

• npcs/npc.cc (modified) (1 diff)
• npcs/npc.h (modified) (1 diff)
• weapons/bsp_weapon.cc (modified) (1 diff)
• weapons/fps_sniper_rifle.cc (modified) (2 diffs)
• world_entity.cc (modified) (3 diffs)
• world_entity.h (modified) (2 diffs)

branches/presentation/src/world_entities/npcs/npc.cc

@@ -440 +440 @@
 
 // HACK just to make sure they explode as nice as possible :)
-void NPC::hit( float damage, WorldEntity* killer)
+/*void NPC::hit( float damage, WorldEntity* killer)
 {
   this->destroy( killer);
   this->setDamage(killer->getDamage());
-}
+}*/

branches/presentation/src/world_entities/npcs/npc.h

@@ -37 +37 @@
   void destroy( WorldEntity* killer );
 
-  void hit( float damage, WorldEntity* killer);
+  //void hit( float damage, WorldEntity* killer);
 
   inline void destroyThis() { this->destroy(NULL);};

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

@@ -133 +133 @@
         //gunFirExpl.explode(gunFire2,Vector(2,2,2));
 
-  for ( std::list<MuzzleFlash*>::iterator it = gunFire.begin(); it!=gunFire.end(); it++)
-        {
-    (*it)->explode( 0.2 );
-        }
-
-        std::list<WorldEntity*>::iterator entityIterator;
-        // for all bsp managers check all entities
-        Vector pos = this->getAbsCoor();
-        Vector dir = pos + this->getAbsDir().apply( Vector( 1, 0, 0 ) )*range;
-        
-        
-        float shortestDist = range;
-        for( ObjectList<BspEntity>::const_iterator bspIterator = BspEntity::objectList().begin();
-                bspIterator != BspEntity::objectList().end();
-                bspIterator++) {
-                float res = (dynamic_cast<BspEntity*>(*bspIterator)->getBspManager())->checkCollisionRay( pos, dir, dir.len() + 1 );
-        
-                if ( res < shortestDist )
-                        shortestDist = res;
-        }
-
-        WorldEntity* target = aimingSystem->getNearestTarget();
-        aimingSystem->flushList();
-        
-        if ( target != NULL )
-        {
-                if (!alwaysHits){
-                        float r = rand();
-                        r = r/RAND_MAX;
-                        float res = (target->getAbsCoor() - this->getAbsCoor()).len();
-                        float p = 1 - res*res/range/range;
-                        if (r < p ){
-                                printf( "HIT %s\n", target->getClassName().c_str() );
-                                target->hit( this->damage, this );
-                        }
-                        else
-                                printf( "MISHIT %s\n", target->getClassName().c_str() );
-                        
-                }
-                else 
-                {
-                        printf( "HIT %s\n", target->getClassName().c_str() );
-                        target->hit( this->damage, this );
-                }
-        }
-
-        
-        
+for ( std::list<MuzzleFlash*>::iterator it = gunFire.begin(); it!=gunFire.end(); it++)
+{
+  (*it)->explode( 0.2 );
+}
+
+std::list<WorldEntity*>::iterator entityIterator;
+// for all bsp managers check all entities
+Vector pos = this->getAbsCoor();
+Vector dir = pos + this->getAbsDir().apply( Vector( 1, 0, 0 ) )*range;
+
+
+float shortestDist = range;
+for( ObjectList<BspEntity>::const_iterator bspIterator = BspEntity::objectList().begin();
+     bspIterator != BspEntity::objectList().end();
+     bspIterator++)
+{
+  float res = (dynamic_cast<BspEntity*>(*bspIterator)->getBspManager())->checkCollisionRay( pos, dir, dir.len() + 1 );
+
+  if ( res < shortestDist )
+    shortestDist = res;
+}
+
+WorldEntity* target = aimingSystem->getNearestTarget();
+aimingSystem->flushList();
+
+if ( target != NULL )
+{
+  if ( shortestDist < (pos - target->getAbsCoor()).len() )
+  {
+    printf("HIT WALL\n");
+    return;
+  }
+  if (!alwaysHits)
+  {
+    float r = rand();
+    r = r/RAND_MAX;
+    float res = (target->getAbsCoor() - this->getAbsCoor()).len();
+    float p = 1 - res*res/range/range;
+    if (r < p )
+    {
+      printf( "HIT %s\n", target->getClassName().c_str() );
+      target->hit( this->damage, this );
+    }
+    else
+      printf( "MISHIT %s\n", target->getClassName().c_str() );
+
+  }
+  else
+  {
+    printf( "HIT %s\n", target->getClassName().c_str() );
+    target->hit( this->damage, this );
+  }
+}
+
+
+
         
 }

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

@@ -81 +81 @@
   this->registerObject(this, FPSSniperRifle::_objectList);
 
-  this->loadModel("models/guns/fps_sniper_rifle.obj", 0.2);
+  this->setAbsDir( this->getAbsDir() * Quaternion( -PI/2, Vector(1, 0, 0) ) );
+  this->loadModel("models/guns/fps_sniper_rifle.obj", 1.5);
   this->material = new Material();
   this->material->setIllum(3);
   this->material->setAmbient(1.0, 1.0, 1.0);
-  this->material->setDiffuseMap("textures/rifle01tex.jpg");
+  this->material->setDiffuseMap("textures/fps_sniper_rifle.jpg");
 
   this->setStateDuration(WS_SHOOTING, .1);
@@ -169 +170 @@
   glPushMatrix();
 
-  Vector pos = this->getAbsCoor() + this->getAbsDir().apply( Vector( 2, 0, 0 ) );
+  Vector pos = this->getAbsCoor() + this->getAbsDir().apply( Vector( 1, 0, 0 ) );
   glTranslatef (pos.x,
                 pos.y,

branches/presentation/src/world_entities/world_entity.cc

@@ -99 +99 @@
   
   this->forwardDamageToParent = false;
+  this->damageable = false;
 
   // registering default reactions:
@@ -183 +184 @@
   
   LoadParam(root, "forwardDamageToParent", this, WorldEntity, setForwardDamageToParent);
+  
+  LoadParam(root, "damageable", this, WorldEntity, setDamageable);
 
   // Track
@@ -994 +997 @@
   bool dead = this->getHealth()<=0;
   
+  if ( !damageable )
+    return;
+  
   this->decreaseHealth(damage);
 

branches/presentation/src/world_entities/world_entity.h

@@ -239 +239 @@
   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; }
 
   inline void drawDebugTrack(int flag) { this->bDrawTrack = (bool)flag; }
@@ -263 +266 @@
 
 
+  bool                    damageable;             //!< weather this we can be damaged/killed
   float                   damage;                 //!< the damage dealt to other objects by colliding.
   float                   health;                 //!< The Energy of this Entity, if the Entity has any energy at all.