Changeset 8152

Timestamp:

Mar 28, 2011, 4:43:18 PM (14 years ago)

Author:

simonmie

Message:

added nice particleEffect if shield is hit

Location:

code/branches/gameimmersion

Files:

• data/levels/test-immersion-shield-01.oxw (modified) (1 diff)
• src/modules/weapons/projectiles/Projectile.cc (modified) (3 diffs)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)

code/branches/gameimmersion/data/levels/test-immersion-shield-01.oxw

@@ -56 +56 @@
 <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
 
-<Model mesh="hs-w01.mesh" scale=10 position="0,0,-100" />
-<Model mesh="hs-w01s.mesh" scale=10 position="0,0,-100" />
 
     <?lua

code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.cc

@@ -103 +103 @@
             this->bDestroy_ = true;
 
+            Pawn* victim = orxonox_cast<Pawn*>(otherObject);
+
             if (this->owner_)
             {
+                if (victim && !victim->hasShield())
                 {
                     ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
@@ -113 +116 @@
                     effect->setLifetime(2.0f);
                 }
+                if (victim && !victim->hasShield())
                 {
                     ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
@@ -121 +125 @@
                     effect->setLifetime(3.0f);
                 }
+                if (victim && victim->hasShield())
+                {
+                    ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+                    effect->setPosition(this->getPosition());
+                    effect->setOrientation(this->getOrientation());
+                    effect->setDestroyAfterLife(true);
+                    effect->setSource("Orxonox/engineglow");
+                    effect->setLifetime(0.5f);
+                }
             }
 
-            Pawn* victim = orxonox_cast<Pawn*>(otherObject);
             if (victim)
                 victim->hit(this->owner_, contactPoint, this->damage_);

code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc

@@ -145 +145 @@
 ////////me
         this->addShieldHealth(this->getReloadRate() * dt);
+        // TODO max. shield hinzufuegen
 ////////end me
         if (GameMode::isMaster())

code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.h

@@ -61 +61 @@
             inline void addShieldHealth(float amount)
             { this->setShieldHealth(this->shieldHealth_ + amount); }
+
+            inline bool hasShield()
+            { return (this->getShieldHealth() > 0); }
 
 ///////////////////////////////// end me