Changeset 6834 for code/branches

Timestamp:

May 3, 2010, 1:40:16 PM (15 years ago)

Author:

gnadler

Message:

Success:
Now rocket spawns somewhere around the ship and the orientation is more or less correct. The controller does nothing but change some pitch/roll (to be sure it does something).
I modified the rocketfire particle to produce rocketfire2.particle which is slightly smaller and matches the smaller rocket.

Location:

code/branches/rocket

Files:

• data/levels/includes/weaponsettings3.oxi (modified) (1 diff)
• data/particle/rocketfire2.particle (added)
• src/modules/weapons/RocketController.cc (modified) (3 diffs)
• src/modules/weapons/RocketController.h (modified) (2 diffs)
• src/modules/weapons/projectiles/SimpleRocket.cc (modified) (3 diffs)
• src/modules/weapons/projectiles/SimpleRocket.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) (2 diffs)

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

@@ -39 +39 @@
         </Weapon>
         <Weapon>
-          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" />
+          <SimpleRocketFire mode=2 muzzleoffset="10,10,10" />
         </Weapon>
       </WeaponPack>

code/branches/rocket/src/modules/weapons/RocketController.cc

@@ -32 +32 @@
 #include "weapons/projectiles/SimpleRocket.h"
 #include "util/Debug.h"
-
+#include "weapons/weaponmodes/SimpleRocketFire.h"
 
 namespace orxonox
@@ -45 +45 @@
 
         RegisterObject(RocketController);
-                SimpleRocket* rocket = new SimpleRocket(this);
-                rocket->setController(this);
+                this->rocket = new SimpleRocket(this);
+                this->rocket->setController(dynamic_cast<RocketController*>(this));
                 this->setControllableEntity(dynamic_cast<ControllableEntity*> (rocket));
-
     }
 
@@ -62 +61 @@
 
         SimpleRocket *rocket = static_cast<SimpleRocket*>(this->getControllableEntity());
-
-
-                rocket->rotateYaw(0.2);
-                        //rocket->moveFrontBack(2);
+                double rd = rand();
+                if (rd > 0.5) rocket->rotateRoll(5); 
+                else rocket->rotatePitch(5);
 
     }

code/branches/rocket/src/modules/weapons/RocketController.h

@@ -35 +35 @@
 #include "tools/interfaces/Tickable.h"
 #include "weapons/projectiles/SimpleRocket.h"
+#include "weapons/weaponmodes/SimpleRocketFire.h"
 
 namespace orxonox
@@ -51 +52 @@
             
             virtual void tick(float dt);
+                        SimpleRocket* getRocket(){return rocket;};
         protected:
 
 
         private:
+                        SimpleRocket* rocket;
 
     };

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

@@ -60 +60 @@
         this->lifetime_ = 100;
                 COUT(0)<< "simplerocket constructed\n";
-                //this->camera_ = null;
-                //RocketController* myRController = new RocketController(this);
-                //this->setController(creator);
-                //myRController->setRocket(this, myRController);
-                
-                //this->getController()->setControllableEntity(this);
-                //myController->setControllableEntity(this);
-                //this->getController()->setControllableEntity(this);
-        //this->controllableEntity_->setController(this->controller_);
+
 
         //if (GameMode::isMaster())
         //{
-         /*   this->setCollisionType(WorldEntity::Kinematic);
-            this->setVelocity(0,0,-100);*/
+           this->setCollisionType(WorldEntity::Kinematic);
+            this->setVelocity(0,0,100);
 
             Model* model = new Model(this);
             model->setMeshSource("rocket.mesh");
-            //model->scale(0.7f);
+            model->scale(0.7f);
             this->attach(model);
-           /* ParticleEmitter* fire = new ParticleEmitter(this);
+
+            ParticleEmitter* fire = new ParticleEmitter(this);
             this->attach(fire);
             fire->setOrientation(this->getOrientation());
-            fire->setSource("Orxonox/Rocketfire");
+            fire->setSource("Orxonox/rocketfire2");
 
             this->enableCollisionCallback();
@@ -91 +84 @@
             collisionShape->setRadius(3);
             collisionShape->setHeight(500);
-            this->attachCollisionShape(collisionShape);*/
+            this->attachCollisionShape(collisionShape);
 
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&SimpleRocket::destroyObject, this)));
@@ -127 +120 @@
     }
 
-    /**
-    @brief
-        Defines which actions the SimpleRocket has to take in each tick.
-    @param dt
-        The length of the tick.
-    */
-    void SimpleRocket::tick(float dt)
-    {
-        SUPER(SimpleRocket, tick, dt);
-
-        if( this->hasLocalController() )
-        {
-            this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
-            this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
-            this->localAngularVelocity_ = 0;
-
-            if( this->bDestroy_ )
-                this->destroy();
-        }
-    }
 
     bool SimpleRocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)

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

@@ -53 +53 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a SimpleRocket through XML.
-            virtual void tick(float dt); //!< Defines which actions the SimpleRocket has to take in each tick.
 
             virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);

code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

@@ -45 +45 @@
     {
         RegisterObject(SimpleRocketFire);
+                
 
       /*  this->reloadTime_ = 0.20f;
@@ -61 +62 @@
     void SimpleRocketFire::fire()
     {
-        SimpleRocket* rocket = new SimpleRocket(this);
-        RocketController* con = new RocketController(this);
+        //SimpleRocket* rocket = new SimpleRocket(this);
+                RocketController* con = new RocketController(this);
+                SimpleRocket* rocket = con->getRocket();
+                this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
+                rocket->setOrientation(this->getMuzzleOrientation());
+        rocket->setPosition(this->getMuzzlePosition());
+                rocket->setVelocity(this->getMuzzleDirection() * rocket->getVelocity());
+                rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+                //con->getRocket()->setPosition(this->getMuzzlePosition());
+        //con->setControllableEntity(dynamic_cast<ControllableEntity*>(rocket));
+        //con->getControllableEntity()->setPosition(this->getMuzzlePosition());
 
-
-        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
+        /* this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         rocket->setOrientation(this->getMuzzleOrientation());
         rocket->setPosition(this->getMuzzlePosition());
-        rocket->scale(10);
+                rocket->scale(10);
         rocket->setVelocity(this->getMuzzleDirection() * this->speed_);
         rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
-        rocket->setDamage(this->getDamage());
-        //rocket->scale(2);
-
+        rocket->setDamage(this->getDamage()); 
+        rocket->scale(2);
+                */
     }
 }