Changeset 10011 for code/branches/modularships/src/modules

Timestamp:

Apr 2, 2014, 8:38:07 PM (11 years ago)

Author:

noep

Message:

Cleaned up the process passing the collisionshape which was hit to the Pawn. Started implementation of ModularSpaceShip and ShipPart.

Location:

code/branches/modularships/src/modules/weapons/projectiles

Files:

• BasicProjectile.cc (modified) (3 diffs)
• BasicProjectile.h (modified) (1 diff)
• Projectile.cc (modified) (1 diff)
• Projectile.h (modified) (1 diff)
• Rocket.cc (modified) (1 diff)
• Rocket.h (modified) (1 diff)
• SimpleRocket.cc (modified) (1 diff)
• SimpleRocket.h (modified) (1 diff)

code/branches/modularships/src/modules/weapons/projectiles/BasicProjectile.cc

@@ -78 +78 @@
     @see Pawn.h
     */
-    bool BasicProjectile::processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    bool BasicProjectile::processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs)
     {
         if (!this->bDestroy_ && GameMode::isMaster())
@@ -96 +96 @@
             if (victim)
             {
-                victim->hit(this->getShooter(), contactPoint, this->getDamage(), this->getHealthDamage(), this->getShieldDamage());
+                victim->hit(this->getShooter(), contactPoint, cs, this->getDamage(), this->getHealthDamage(), this->getShieldDamage());
                 victim->startReloadCountdown();
             }
@@ -141 +141 @@
     }
 
-    bool BasicProjectile::customProcessCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs)
-        {
-            if (!this->bDestroy_ && GameMode::isMaster())
-            {
-                if (otherObject == this->getShooter()) // Prevents you from shooting yourself
-                    return false;
-
-                this->bDestroy_ = true; // If something is hit, the object is destroyed and can't hit something else.
-                                        // The projectile is destroyed by its tick()-function (in the following tick).
-
-                Pawn* victim = orxonox_cast<Pawn*>(otherObject); // If otherObject isn't a Pawn, then victim is NULL
-
-                WorldEntity* entity = orxonox_cast<WorldEntity*>(this);
-                assert(entity); // The projectile must not be a WorldEntity.
-
-                // If visual effects after destruction cause problems, put this block below the effects code block
-                if (victim)
-                {
-                    victim->customHit(this->getShooter(), contactPoint, cs, this->getDamage(), this->getHealthDamage(), this->getShieldDamage());
-                    victim->startReloadCountdown();
-                }
-
-                // Visual effects for being hit, depending on whether the shield is hit or not
-                if (this->getShooter()) // If the owner does not exist (anymore?), no effects are displayed.
-                {
-                    // Damping and explosion effect is only played if the victim is no Pawn (see cast above)
-                    // or if the victim is a Pawn, has no shield left, is still alive and any damage goes to the health
-                    if (!victim || (victim && !victim->hasShield() && victim->getHealth() > 0.0f && (this->getDamage() > 0.0f || this->getHealthDamage() > 0.0f)))
-                    {
-                        {
-                            ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getContext());
-                            effect->setPosition(entity->getPosition());
-                            effect->setOrientation(entity->getOrientation());
-                            effect->setDestroyAfterLife(true);
-                            effect->setSource("Orxonox/explosion3");
-                            effect->setLifetime(2.0f);
-                        }
-                        // Second effect with same condition
-                        {
-                            ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getContext());
-                            effect->setPosition(entity->getPosition());
-                            effect->setOrientation(entity->getOrientation());
-                            effect->setDestroyAfterLife(true);
-                            effect->setSource("Orxonox/smoke4");
-                            effect->setLifetime(3.0f);
-                        }
-                    }
-
-                    // victim->isAlive() is not false until the next tick, so getHealth() > 0 is used instead
-                    if (victim && victim->hasShield() && (this->getDamage() > 0.0f || this->getShieldDamage() > 0.0f) && victim->getHealth() > 0.0f)
-                    {
-                        ParticleSpawner* effect = new ParticleSpawner(this->getShooter()->getContext());
-                        effect->setDestroyAfterLife(true);
-                        effect->setSource("Orxonox/Shield");
-                        effect->setLifetime(0.5f);
-                        victim->attach(effect);
-                    }
-                }
-                return true;
-            }
-            return false;
-        }
 
     /**

code/branches/modularships/src/modules/weapons/projectiles/BasicProjectile.h

@@ -119 +119 @@
 
         protected:
-            bool processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint);
-            bool customProcessCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs);
+            bool processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs);
             void destroyCheck(void);
 

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

@@ -88 +88 @@
     }
 
-    bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    bool Projectile::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
     {
-        return this->processCollision(otherObject, contactPoint);
-    }
-
-    bool Projectile::customCollidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
-    {
-        return this->customProcessCollision(otherObject, contactPoint, cs);
+        return this->processCollision(otherObject, contactPoint, cs);
     }
 

code/branches/modularships/src/modules/weapons/projectiles/Projectile.h

@@ -64 +64 @@
 
             virtual void tick(float dt);
-            virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
-            virtual bool customCollidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
 
         private:

code/branches/modularships/src/modules/weapons/projectiles/Rocket.cc

@@ -191 +191 @@
     }
 
-    bool Rocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
-    {
-        return this->processCollision(otherObject, contactPoint);
-    }
-
-    bool Rocket::customCollidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
-    {
-        return this->customProcessCollision(otherObject, contactPoint, cs);
+    bool Rocket::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
+    {
+        return this->processCollision(otherObject, contactPoint, cs);
     }
 

code/branches/modularships/src/modules/weapons/projectiles/Rocket.h

@@ -64 +64 @@
             virtual void tick(float dt); //!< Defines which actions the Rocket has to take in each tick.
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
-            virtual bool customCollidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
             virtual void destroyObject(void);
             void destructionEffect();

code/branches/modularships/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -172 +172 @@
     }
 
-    bool SimpleRocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
-    {
-        return this->processCollision(otherObject, contactPoint);
-    }
-
-    bool SimpleRocket::customCollidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
-    {
-        return this->customProcessCollision(otherObject, contactPoint, cs);
+    bool SimpleRocket::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
+    {
+        return this->processCollision(otherObject, contactPoint, cs);
     }
 

code/branches/modularships/src/modules/weapons/projectiles/SimpleRocket.h

@@ -64 +64 @@
             virtual void tick(float dt);
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
-            virtual bool customCollidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
 
             void disableFire(); //!< Method to disable the fire and stop all acceleration