Changeset 6065 for code/branches/particles2

Timestamp:

Nov 15, 2009, 1:15:42 PM (15 years ago)

Author:

scheusso

Message:

cleaned up Rocket mess a bit
there is yet a bug if RocketFire is in weaponslot3

Location:

code/branches/particles2

Files:

• data/levels/empty_level.oxw (modified) (2 diffs)
• data/levels/includes/weaponsettings3.oxi (modified) (3 diffs)
• data/particle/Ogre.log (deleted)
• src/modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.cc (moved) (moved from code/branches/particles2/src/orxonox/worldentities/Rocket.cc) (8 diffs)
• src/modules/weapons/projectiles/Rocket.h (moved) (moved from code/branches/particles2/src/orxonox/worldentities/Rocket.h) (3 diffs)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/weaponmodes/RocketFire.cc (copied) (copied from code/branches/particles2/src/modules/weapons/weaponmodes/FusionFire.cc) (2 diffs)
• src/modules/weapons/weaponmodes/RocketFire.h (copied) (copied from code/branches/particles2/src/modules/weapons/weaponmodes/FusionFire.h) (3 diffs)
• src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
• src/orxonox/controllers/RocketController.cc (deleted)
• src/orxonox/controllers/RocketController.h (deleted)
• src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)

code/branches/particles2/data/levels/empty_level.oxw

@@ -18 +18 @@
   >
 
-<Rocket position="-10, 3.5,800" velocity="0,0,-100"> 
+<!--Rocket position="-10, 3.5,800" velocity="0,0,-100"> 
       <attached>
         <Model pitch=180 position="0,0,0" scale=1.5 mesh="rocket_test.mesh" >
@@ -29 +29 @@
           </Model>
         </attached>
-    </Rocket>
+    </Rocket-->
     
     

code/branches/particles2/data/levels/includes/weaponsettings3.oxi

@@ -2 +2 @@
       <WeaponSlot position="-15.0,-1.5,0" />
       <WeaponSlot position=" 15.0,-1.5,0" />
-      <WeaponSlot position="  0.0, 0.0,0" />
+      <WeaponSlot position="    0,   0,0" />
     </weaponslots>
     <weaponsets>
       <WeaponSet firemode=0 />
       <WeaponSet firemode=1 />
+      <WeaponSet firemode=2 />
     </weaponsets>
     <weapons>
@@ -13 +14 @@
           <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
           <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+          <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
         </links>
         <Weapon>
@@ -36 +38 @@
           <LightningGun mode=1 muzzleoffset="0,0,0" />
         </Weapon>
+        <Weapon>
+          <RocketFire mode=2 muzzleoffset="0,0,0" />
+        </Weapon>
       </WeaponPack>
       <WeaponPack>

code/branches/particles2/src/modules/weapons/projectiles/CMakeLists.txt

@@ -4 +4 @@
   Projectile.cc
   LightningGunProjectile.cc
+  Rocket.cc
 )

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

@@ -31 +31 @@
 #include "core/XMLPort.h"
 #include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "worldentities/pawns/Pawn.h"
+#include "graphics/ParticleSpawner.h"
+#include "graphics/Model.h"
+#include "objects/collisionshapes/ConeCollisionShape.h"
 
 namespace orxonox
@@ -43 +47 @@
     Rocket::Rocket(BaseObject* creator) : ControllableEntity(creator)
     {
-        this->myController_ = 0;
-        // put your code in here:
         RegisterObject(Rocket);// - register the Rocket class to the core
         
-        this->localLinearAcceleration_.setValue(0, 0, 0);
-        this->localAngularAcceleration_.setValue(0, 0, 0);
-        this->primaryThrust_  = 100;
-        this->auxilaryThrust_ = 100;
-        this->rotationThrust_ = 10;
+        this->setCollisionType(WorldEntity::Kinematic);
+        this->setVelocity(0,0,-100);
+        this->model_ = new Model(this);
+        this->model_->setMeshSource("can.mesh");
+        this->attach(this->model_);
+        this->lifetime_ = 100;
         
-        this->setCollisionType(WorldEntity::Kinematic);
-        
-        this->myController_ = new RocketController(static_cast<BaseObject*>(this)); //!< Creates a new controller and passes our this pointer to it as creator.
+        if (GameMode::isMaster())
+        {
+            this->enableCollisionCallback();
+            this->setCollisionResponse(false);
+            this->setCollisionType(Kinematic);
+
+            this->collisionShape_ = new ConeCollisionShape(this);
+            this->collisionShape_->setRadius(3);
+            this->collisionShape_->setHeight(500);
+            this->attachCollisionShape(this->collisionShape_);
+
+            this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&Rocket::destroyObject, this)));
+        }
     }
 
@@ -64 +77 @@
     Rocket::~Rocket()
     {
-        if( this->myController_ != NULL )
-            this->myController_->destroy();
+        if(this->isInitialized())
+        {
+            this->collisionShape_->destroy();
+            this->model_->destroy();
+        }
     }
 
@@ -76 +92 @@
         // this calls the XMLPort function of the parent class
         SUPER(Rocket, XMLPort, xmlelement, mode);
-
-        // put your code in here:
-                XMLPortParam(Rocket, "primaryThrust", setPrimaryThrust, getPrimaryThrust, xmlelement, mode);
-                //XMLPortParam(Rocket, "auxilaryThrust", setAuxilaryThrust, getAuxilaryThrust, xmlelement, mode);
-                //XMLPortParam(Rocket, "rotationThrust", setRotationThrust, getRotationThrust, xmlelement, mode);
-        // make sure you add the variables primaryThrust_, auxilaryThrust_ and rotationThrust_ to xmlport 
-        // make sure that the set- and get-functions exist.
-        // variables can be added by the following command 
-        // XMLPortParam(Classname, "xml-attribute-name (i.e. variablename)", setFunction, getFunction, xmlelement, mode)
- 
+    }
+    
+    void Rocket::setOwner(Pawn* owner)
+    {
+        this->owner_ = owner;
     }
 
@@ -98 +109 @@
         SUPER(Rocket, tick, dt);
         
-        //if (this->hasLocalController())
-        //{
-            this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() * getMass() * this->auxilaryThrust_);
-            this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() * getMass() * this->auxilaryThrust_);
-            if (this->localLinearAcceleration_.z() > 0)
-              this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->auxilaryThrust_);
-            else
-              this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->primaryThrust_);
-            this->physicalBody_->applyCentralForce(physicalBody_->getWorldTransform().getBasis() * this->localLinearAcceleration_);
-            this->localLinearAcceleration_.setValue(0, 0, 0);
-        
-            this->localAngularAcceleration_ *= this->getLocalInertia() * this->rotationThrust_;
-            this->physicalBody_->applyTorque(physicalBody_->getWorldTransform().getBasis() * this->localAngularAcceleration_);
-            this->localAngularAcceleration_.setValue(0, 0, 0);
-        //}
+        this->setAngularVelocity(this->localAngularVelocity_);
     }
     
-    /**
-    @brief
-        Moves the Rocket in the negative z-direction (Front/Back) by an amount specified by the first component of the input 2-dim vector.
-    @param value
-        The vector determining the amount of the movement.
-    */
-    void Rocket::moveFrontBack(const Vector2& value)
+    bool Rocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() - value.x);
+        if (!this->bDestroy_ && GameMode::isMaster())
+        {
+            if (otherObject == this->owner_)
+                return false;
+
+            this->bDestroy_ = true;
+
+            if (this->owner_)
+            {
+                {
+                    ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+                    effect->setPosition(this->getPosition());
+                    effect->setOrientation(this->getOrientation());
+                    effect->setDestroyAfterLife(true);
+                    effect->setSource("Orxonox/explosion3");
+                    effect->setLifetime(2.0f);
+                }
+                {
+                    ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+                    effect->setPosition(this->getPosition());
+                    effect->setOrientation(this->getOrientation());
+                    effect->setDestroyAfterLife(true);
+                    effect->setSource("Orxonox/smoke4");
+                    effect->setLifetime(3.0f);
+                }
+            }
+
+            float dmg = this->damage_;
+            if (this->owner_)
+                dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
+
+            Pawn* victim = orxonox_cast<Pawn*>(otherObject);
+            if (victim)
+                victim->damage(dmg, this->owner_);
+        }
+        return false;
     }
-
-    /**
-    @brief
-        Moves the Rocket in the x-direction (Right/Left) by an amount specified by the first component of the input 2-dim vector.
-    @param value
-        The vector determining the amount of the movement.
-    */
-    void Rocket::moveRightLeft(const Vector2& value)
+    
+    void Rocket::destroyObject()
     {
-        this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() + value.x);
-    }
-
-    /**
-    @brief
-        Moves the Rocket in the y-direction (Up/Down) by an amount specified by the first component of the input 2-dim vector.
-    @param value
-        The vector determining the amount of the movement.
-    */
-    void Rocket::moveUpDown(const Vector2& value)
-    {
-        this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() + value.x);
+        if (GameMode::isMaster())
+            this->destroy();
     }
 
@@ -156 +166 @@
     void Rocket::rotateYaw(const Vector2& value)
     {
-        this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() - value.x);
+        this->localAngularVelocity_.y = value.x;
     }
 
@@ -167 +177 @@
     void Rocket::rotatePitch(const Vector2& value)
     {
-        this->localAngularAcceleration_.setX(this->localAngularAcceleration_.x() + value.x);
+        this->localAngularVelocity_.x = value.x;
     }
 
@@ -178 +188 @@
     void Rocket::rotateRoll(const Vector2& value)
     {
-        this->localAngularAcceleration_.setZ(this->localAngularAcceleration_.z() + value.x);
+        this->localAngularVelocity_.z = value.x;
     }
     

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "worldentities/ControllableEntity.h"
-#include "controllers/RocketController.h"
 
 namespace orxonox
 {
+    class ConeCollisionShape;
 
     /**
@@ -52 +52 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Rocket through XML.
             virtual void tick(float dt); //!< Defines which actions the Rocket has to take in each tick.
-
             
-            virtual void moveFrontBack(const Vector2& value);
-            virtual void moveRightLeft(const Vector2& value);
-            virtual void moveUpDown(const Vector2& value);
+            virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+            void destroyObject();
+            
+            virtual void moveFrontBack(const Vector2& value){}
+            virtual void moveRightLeft(const Vector2& value){}
+            virtual void moveUpDown(const Vector2& value){}
 
             virtual void rotateYaw(const Vector2& value);
@@ -100 +102 @@
             { this->rotateRoll(Vector2(value, 0)); }
             
-            /**
-            @brief Sets the primary thrust to the input amount.
-            @param thrust The amount of thrust.
-            */
-            inline void setPrimaryThrust( float thrust )
-                { this->primaryThrust_=thrust; }      
-            // place your set-functions here.
-            // - hint: auxiliary thrust, rotation thrust.
-            
-            /**
-            @brief Gets the primary thrust to the input amount.
-            @preturn The amount of thrust.
-            */
-            inline float getPrimaryThrust()
-                { return this->primaryThrust_; }
-            // place your get-functions here.
+            void setOwner(Pawn* owner);
+            inline Pawn* getOwner() const
+                { return this->owner_; }
+                
+            inline void setDamage(float damage)
+                { this->damage_ = damage; }
+            inline float getDamage() const
+                { return this->damage_; }
             
         private:
-            RocketController *myController_; //!< The controller of the Rocket.
+            WeakPtr<Pawn> owner_;
+            Vector3 localAngularVelocity_;
+            float damage_;
+            bool bDestroy_;
             
-            btVector3 localLinearAcceleration_; //!< The linear acceleration that is used to move the Rocket the next tick.
-            btVector3 localAngularAcceleration_; //!< The linear angular acceleration that is used to move the Rocket the next tick.
-            float primaryThrust_; //!< The amount of primary thrust. This is just used, when moving forward. 
-            float auxilaryThrust_; //!< The amount of auxilary thrust. Used for all other movements (except for rotations).
-            float rotationThrust_; //!< The amount of rotation thrust. Used for rotations only.
+            Model* model_;
+            ConeCollisionShape* collisionShape_;
+            Timer destroyTimer_;
+            float lifetime_;
     };
 

code/branches/particles2/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -5 +5 @@
   HsW01.cc
   LightningGun.cc
+  RocketFire.cc
 )

code/branches/particles2/src/modules/weapons/weaponmodes/RocketFire.cc

@@ -27 +27 @@
  */
 
-#include "FusionFire.h"
+#include "RocketFire.h"
 
 #include "util/Math.h"
 #include "core/CoreIncludes.h"
-#include "weapons/projectiles/BillboardProjectile.h"
+#include "weapons/projectiles/Rocket.h"
 
 #include "weaponsystem/Weapon.h"
@@ -39 +39 @@
 namespace orxonox
 {
-    CreateFactory(FusionFire);
+    CreateFactory(RocketFire);
 
-    FusionFire::FusionFire(BaseObject* creator) : WeaponMode(creator)
+    RocketFire::RocketFire(BaseObject* creator) : WeaponMode(creator)
     {
-        RegisterObject(FusionFire);
+        RegisterObject(RocketFire);
 
-        this->reloadTime_ = 1.0;
+        this->reloadTime_ = 0.20;
         this->bParallelReload_ = false;
-        this->damage_ = 40;
-        this->speed_ = 1250;
+        this->damage_ = 100;
+        this->speed_ = 500;
 
-        this->setMunitionName("FusionMunition");
+        this->setMunitionName("RocketMunition");
     }
 
-    void FusionFire::fire()
+    void RocketFire::fire()
     {
-        BillboardProjectile* projectile = new BillboardProjectile(this);
+        Rocket* rocket = new Rocket(this);
 
-        projectile->setOrientation(this->getMuzzleOrientation());
-        projectile->setPosition(this->getMuzzlePosition());
-        projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
-        projectile->scale(5);
+        rocket->setOrientation(this->getMuzzleOrientation());
+        rocket->setPosition(this->getMuzzlePosition());
+        rocket->setVelocity(this->getMuzzleDirection() * this->speed_);
+        rocket->scale(2);
 
-        projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
-        projectile->setDamage(this->getDamage());
-        projectile->setColour(ColourValue(1.0f, 0.7f, 0.3f, 1.0f));
+        rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+        rocket->setDamage(this->getDamage());
     }
 }

code/branches/particles2/src/modules/weapons/weaponmodes/RocketFire.h

@@ -27 +27 @@
  */
 
-#ifndef _FusionFire_H__
-#define _FusionFire_H__
+#ifndef _RocketFire_H__
+#define _RocketFire_H__
 
 #include "weapons/WeaponsPrereqs.h"
@@ -35 +35 @@
 namespace orxonox
 {
-    class _WeaponsExport FusionFire : public WeaponMode
+    class _WeaponsExport RocketFire : public WeaponMode
     {
         public:
-            FusionFire(BaseObject* creator);
-            virtual ~FusionFire() {}
+            RocketFire(BaseObject* creator);
+            virtual ~RocketFire() {}
 
             virtual void fire();
@@ -48 +48 @@
 }
 
-#endif /* _FusionFire_H__ */
+#endif /* _RocketFire_H__ */

code/branches/particles2/src/orxonox/controllers/CMakeLists.txt

@@ -7 +7 @@
   WaypointController.cc
   WaypointPatrolController.cc
-  RocketController.cc
 )

code/branches/particles2/src/orxonox/worldentities/CMakeLists.txt

@@ -5 +5 @@
   MobileEntity.cc
   ControllableEntity.cc
-  Rocket.cc
 
   BigExplosion.cc