Changeset 12281 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallProjectile.cc

Timestamp:

Apr 4, 2019, 4:37:19 PM (6 years ago)

Author:

pomselj

Message:

weapon stuff

File:

• code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallProjectile.cc (modified) (6 diffs)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallProjectile.cc

@@ -38 +38 @@
 #include "tools/ParticleInterface.h"
 #include "Scene.h"
+#include "core/command/Executor.h"
+#include "util/Convert.h"
 
 namespace orxonox
@@ -43 +45 @@
     RegisterClass(BallProjectile);
 
-    BallProjectile::BallProjectile(Context* context) : Projectile(context)
+    BallProjectile::BallProjectile(Context* context) : BillboardProjectile(context)
     {
         RegisterObject(BallProjectile);
-
-        this->particles_ = nullptr;
+        orxout() << "It's a bird, it's a plane' it's a BallParticle..." << endl;
+        this->textureIndex_ = 1;
+        this->setMass(0.1f);
+        this->maxTextureIndex_ = 8;
         this->setDestroyAfterCollision(false); //I want the ball to bounce, not to be destroyed
 
@@ -53 +57 @@
     }
 
-    BallProjectile::~BallProjectile()
+    void BallProjectile::registerVariables()
     {
-        if (this->isInitialized() && this->particles_)
-        {
-            this->detachOgreObject(this->particles_->getParticleSystem());
-            delete this->particles_;
-        }
+        registerVariable(this->materialBase_);
+    }
+
+    /**
+    @brief
+        Set the material.
+    @param material
+        The name of the material. Material names with 1 to 8 appended must exist.
+    */
+    void BallProjectile::setMaterial(const std::string& material)
+    {
+        this->materialBase_ = material;
+
+        BillboardProjectile::setMaterial(material + multi_cast<std::string>(this->textureIndex_));
+    }
+
+    /**
+    @brief
+        Change the texture.
+    */
+    void BallProjectile::changeTexture()
+    {
+        this->textureIndex_++;
+        if (this->textureIndex_ > this->maxTextureIndex_)
+            this->textureIndex_ = 1;
+
+        this->setMaterial(this->materialBase_);
     }
 
@@ -68 +94 @@
         Vector3 contactPosition = this->getPosition();
 
-        if (positionOtherObject.y < 0) {
-            this->destroy();
-        }
-        else {
+        //if (positionOtherObject.y < 0) {
+            //this.destroy()
+        //}
+        //else {
+        
             int distance_X = positionOtherObject.x - contactPosition.x;
+            int distance_Y = positionOtherObject.y - contactPosition.y;
 
             if (distance_X < 0)
-                distance_X = -distance_X;
-
-            int distance_Y = positionOtherObject.y - contactPosition.y;    
+                distance_Y = -distance_Y;
+    
 
             if (distance_Y < 0)
-                distance_Y = -distance_Y;
+                distance_X = -distance_X;
 
             if (distance_X < distance_Y)
@@ -90 +117 @@
                 velocity.y = -velocity.y;
             }
-        }
+        //}
     }
-
 
 /**
@@ -110 +136 @@
     */
 
+    /*
+    bool BallProjectile::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
+    {
+        orxout() << "I collided against something" << endl;
+        return this->processCollision(otherObject, contactPoint, cs);
+    }
+    */
+    
+    bool BallProjectile::processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape*)
+    {
 
-    bool BallProjectile::processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs)
-    {
-        if (GameMode::isMaster())
-        {
+        orxout() << "wanna bounce..." << endl;
+        bool result = BasicProjectile::processCollision(otherObject, contactPoint, cs);
+        Bounce(otherObject, contactPoint, cs);
+        orxout() << "BOUNCED!" << endl;
 
-            Pawn* victim = orxonox_cast<Pawn*>(otherObject); // If otherObject isn't a Pawn, then victim is nullptr
-
-            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->hit(this->getShooter(), contactPoint, cs, this->getDamage(), this->getHealthDamage(), this->getShieldDamage());
-                victim->startShieldRechargeCountdown();
-            }
-
-            // 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);
-                }
-            }
-
-            Bounce(otherObject, contactPoint, cs);
-
-            return true;
-        }
-        return false;
+        return result;
     }
 }