Changeset 6863

Timestamp:

May 7, 2010, 4:14:18 PM (14 years ago)

Author:

gnadler

Message:

orxonox crashes while, respectively after destroying either the Rocket or the Controller.

Location:

code/branches/rocket

Files:

• data/levels/includes/weaponsettings3.oxi (modified) (1 diff)
• src/modules/weapons/RocketController.cc (modified) (3 diffs)
• src/modules/weapons/RocketController.h (modified) (2 diffs)
• src/modules/weapons/projectiles/SimpleRocket.cc (modified) (2 diffs)
• src/modules/weapons/projectiles/SimpleRocket.h (modified) (2 diffs)
• 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="10,10,10" />
+          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" />
         </Weapon>
       </WeaponPack>

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

@@ -48 +48 @@
                 this->rocket->setController(dynamic_cast<RocketController*>(this));
                 this->setControllableEntity(dynamic_cast<ControllableEntity*> (rocket));
+                this->haha=0;
     }
 
@@ -59 +60 @@
     void RocketController::tick(float dt)
     {
+                haha++;
 
         SimpleRocket *rocket = static_cast<SimpleRocket*>(this->getControllableEntity());
-                double rd = rand();
-                if (rd > 0.5) rocket->rotateRoll(5); 
+                rocket->setAcceleration(rocket->getAcceleration()*2);
+                if (haha < 100) rocket->rotateYaw(10);
+                else {
+                if (rand() > 0.5) rocket->rotateRoll(5); 
                 else rocket->rotatePitch(5);
+                }
 
     }
@@ -69 +74 @@
 
         RocketController::~RocketController() {
+                
                 COUT(0)<< "RocketController destroyed\n";
         }

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

@@ -52 +52 @@
             
             virtual void tick(float dt);
-                        SimpleRocket* getRocket(){return rocket;};
+                        SimpleRocket* getRocket(){return this->rocket;};
         protected:
 
@@ -58 +58 @@
         private:
                         SimpleRocket* rocket;
+                        WeakPtr<PlayerInfo> player_;
+                                                int haha;
+
 
     };

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

@@ -98 +98 @@
     {
                 if (this->isInitialized()) {
+                        this->getController()->destroy();
                 COUT(0)<< "simplerocket destroyed\n";
-                delete this->getController();
                 }
         }
@@ -158 +158 @@
             if (victim)
                 victim->hit(this->owner_, contactPoint, dmg);
-//             this->destroy();
+             this->destroy();
         }
         return false;

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

@@ -112 +112 @@
                 { return this->damage_; }
             virtual void fired(unsigned int firemode);
+                        
 
         private:
@@ -118 +119 @@
             float damage_;
             bool bDestroy_;
+
 
             WeakPtr<PlayerInfo> player_;

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

@@ -45 +45 @@
     {
         RegisterObject(SimpleRocketFire);
-                
 
-      /*  this->reloadTime_ = 0.20f;
+        this->reloadTime_ = 0.20f;
         this->bParallelReload_ = false;
         this->damage_ = 100;
-        this->speed_ = 500;
+        this->speed_ = 50;
 
-        this->setMunitionName("LaserMunition");*/
+        this->setMunitionName("LaserMunition");
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
     }
@@ -67 +66 @@
                 this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
                 rocket->setOrientation(this->getMuzzleOrientation());
-        rocket->setPosition(this->getMuzzlePosition());
-                rocket->setVelocity(this->getMuzzleDirection() * rocket->getVelocity());
+                Vector3 pos = this->getMuzzlePosition() + (this->getMuzzleOrientation()* Vector3(-2, -3, -2));
+        rocket->setPosition(pos);
+                rocket->setVelocity(this->getMuzzleDirection()*this->speed_);
+                //Ogre::Vector3 vec = this->getMuzzlePosition();
+                //vec.normalise();
+                //rocket->setAcceleration(100*vec);
                 rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
                 //con->getRocket()->setPosition(this->getMuzzlePosition());
-        //con->setControllableEntity(dynamic_cast<ControllableEntity*>(rocket));
+        //con->setControllableEntity(dynamic_cast<rocket*>(ControllableEntity));
         //con->getControllableEntity()->setPosition(this->getMuzzlePosition());