Changeset 6951 for code/branches/presentation3/src/modules/weapons

Timestamp:

May 21, 2010, 10:25:27 AM (14 years ago)

Author:

scheusso

Message:

merged rocket branch into presentation3 and cleaned up some things (mostly debug output and intendation)

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/modules/weapons/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/RocketController.cc (copied) (copied from code/branches/rocket/src/modules/weapons/RocketController.cc) (2 diffs)
• src/modules/weapons/RocketController.h (copied) (copied from code/branches/rocket/src/modules/weapons/RocketController.h)
• src/modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/projectiles/SimpleRocket.cc (copied) (copied from code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc) (6 diffs)
• src/modules/weapons/projectiles/SimpleRocket.h (copied) (copied from code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.h)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/weaponmodes/DroneFire.cc (copied) (copied from code/branches/rocket/src/modules/weapons/weaponmodes/DroneFire.cc)
• src/modules/weapons/weaponmodes/DroneFire.h (copied) (copied from code/branches/rocket/src/modules/weapons/weaponmodes/DroneFire.h)
• src/modules/weapons/weaponmodes/SimpleRocketFire.cc (copied) (copied from code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc) (1 diff)
• src/modules/weapons/weaponmodes/SimpleRocketFire.h (copied) (copied from code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.h)

code/branches/presentation3/src/modules/weapons/CMakeLists.txt

@@ -1 +1 @@
 SET_SOURCE_FILES(WEAPONS_SRC_FILES
   MuzzleFlash.cc
+  RocketController.cc
 )
 

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

@@ -43 +43 @@
     RocketController::RocketController(BaseObject* creator) : Controller(creator)
     {
-                RegisterObject(RocketController);
-                COUT(0)<< "RocketController constructed\n";
+        RegisterObject(RocketController);
+        COUT(5)<< "RocketController constructed\n";
 
         
-                this->rocket = new SimpleRocket(this);
-                this->rocket->setController(this);
-                this->setControllableEntity(dynamic_cast<ControllableEntity*> (rocket));
-                this->haha=0;
+        this->rocket = new SimpleRocket(this);
+        this->rocket->setController(this);
+        this->setControllableEntity(dynamic_cast<ControllableEntity*> (rocket));
+        this->haha=0;
     }
 
@@ -62 +62 @@
     void RocketController::tick(float dt)
     {
-                haha++;
+        haha++;
 
-                //if (haha<30)this->rocket->setVelocity(rocket->getVelocity()*1.03);
-                if (this->target_) {
-                        this->setTargetPosition();
-                        this->moveToTargetPosition();
-                }
-                if (haha>500) rocket->setDestroy();;
-        
-        }
+        //if (haha<30)this->rocket->setVelocity(rocket->getVelocity()*1.03);
+        if (this->target_) {
+            this->setTargetPosition();
+            this->moveToTargetPosition();
+        }
+        if (haha>500) rocket->setDestroy();;
+
+    }
 
 
-        RocketController::~RocketController() {
+    RocketController::~RocketController()
+    {
+        COUT(5)<< "RocketController destroyed\n";
+    }
 
-                
-                COUT(0)<< "RocketController destroyed\n";
-        }
-
-        void RocketController::setTargetPosition() {
-                //this->targetPosition_=this->target_->getWorldPosition();
-                this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getWorldPosition(),this->getControllableEntity()->getVelocity().length() , this->target_->getWorldPosition(), this->target_->getVelocity());
-        }
-        void RocketController::moveToTargetPosition() {
-                this->moveToPosition(this->targetPosition_);
-        }
+    void RocketController::setTargetPosition()
+    {
+        //this->targetPosition_=this->target_->getWorldPosition();
+        this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getWorldPosition(),this->getControllableEntity()->getVelocity().length() , this->target_->getWorldPosition(), this->target_->getVelocity());
+    }
+    void RocketController::moveToTargetPosition()
+    {
+        this->moveToPosition(this->targetPosition_);
+    }
 
 
 
-        void RocketController::setTarget(WorldEntity* target) {
-                this->target_ = target;
-                COUT(0)<<"got target\n";
-        }
+    void RocketController::setTarget(WorldEntity* target)
+    {
+        this->target_ = target;
+        COUT(0)<<"got target\n";
+    }
 
-        void RocketController::moveToPosition(const Vector3& target)
+    void RocketController::moveToPosition(const Vector3& target)
     {
-       if (!this->getControllableEntity())
+        if (!this->getControllableEntity())
             return;
-           float dx = target.x-this->getControllableEntity()->getPosition().x;
-           float dy = target.y-this->getControllableEntity()->getPosition().y;
-           COUT(0)<<"\n diff: ";
-           COUT(0)<<target-this->getControllableEntity()->getPosition() << endl;
-           //COUT(0)<<"\n 2D view: ";
-          /* COUT(0)<<this->getControllableEntity()->getPosition().x;
-           COUT(0)<<" ";
-           COUT(0)<<this->getControllableEntity()->getPosition().y;
-           COUT(0)<<" ";
-           COUT(0)<<this->getControllableEntity()->getPosition().z;
-           COUT(0)<<"\n";*/
+        float dx = target.x-this->getControllableEntity()->getPosition().x;
+        float dy = target.y-this->getControllableEntity()->getPosition().y;
+        COUT(4)<<"\n diff: ";
+        COUT(4)<<target-this->getControllableEntity()->getPosition() << endl;
+        //COUT(0)<<"\n 2D view: ";
+        /* COUT(0)<<this->getControllableEntity()->getPosition().x;
+        COUT(0)<<" ";
+        COUT(0)<<this->getControllableEntity()->getPosition().y;
+        COUT(0)<<" ";
+        COUT(0)<<this->getControllableEntity()->getPosition().z;
+        COUT(0)<<"\n";*/
         Vector2 coord = get2DViewdirection(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
         float distance = (target - this->getControllableEntity()->getPosition()).length();
-                //Vector3D diff =target-this->rocket->getPosition();
-                COUT(0) << "viewdirection: "<< coord << endl;
-                //COUT(0)<<"  ";
-                //COUT(0)<<coord.y;
+        //Vector3D diff =target-this->rocket->getPosition();
+        COUT(4) << "viewdirection: "<< coord << endl;
+        //COUT(0)<<"  ";
+        //COUT(0)<<coord.y;
         this->getControllableEntity()->rotateYaw(-0.8f*sgn(coord.x)*coord.x*coord.x);
         this->getControllableEntity()->rotatePitch(0.8f*sgn(coord.y)*coord.y*coord.y);
 //         this->getControllableEntity()->rotateYaw(10);
 //         this->getControllableEntity()->rotatePitch(0);
-                //this->getControllableEntity()->rotatePitch(rotation.getPitch().valueRadians());
-                //this->getControllableEntity()->rotateYaw(rotation.getYaw().valueRadians());
-                //this->getControllableEntity()->moveUpDown(coord.y);
-                //this->getControllableEntity()->moveRightLeft(coord.x);
-                //this->getControllableEntity()->rotatePitch(coord);
+        //this->getControllableEntity()->rotatePitch(rotation.getPitch().valueRadians());
+        //this->getControllableEntity()->rotateYaw(rotation.getYaw().valueRadians());
+        //this->getControllableEntity()->moveUpDown(coord.y);
+        //this->getControllableEntity()->moveRightLeft(coord.x);
+        //this->getControllableEntity()->rotatePitch(coord);
    //     if (this->target_ || distance > 10)
    //     {
    //         // Multiply with 0.8 to make them a bit slower
-                        //this->getControllableEntity()->rotateYaw(coord.x );
+            //this->getControllableEntity()->rotateYaw(coord.x );
    //         this->getControllableEntity()->rotatePitch(coord.y);
-                        //
    //     }
     }

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

@@ -5 +5 @@
   LightningGunProjectile.cc
   Rocket.cc
+  SimpleRocket.cc
 )

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

@@ -59 +59 @@
         this->bDestroy_ = false;
         this->lifetime_ = 100;
-                COUT(0)<< "simplerocket constructed\n";
+        COUT(4) << "simplerocket constructed\n";
 
 
@@ -91 +91 @@
 
     }
-        void SimpleRocket::tick(float dt)
+    
+    void SimpleRocket::tick(float dt)
     {
         SUPER(SimpleRocket, tick, dt);
@@ -102 +103 @@
                 this->destroy();
         
-        }
+    }
 
     /**s
@@ -110 +111 @@
     SimpleRocket::~SimpleRocket()
     {
-                if (this->isInitialized()) {
-                        this->getController()->destroy();
-                COUT(0)<< "simplerocket destroyed\n";
-                }
-        }
+        if (this->isInitialized()) 
+        {
+            this->getController()->destroy();
+            COUT(4)<< "simplerocket destroyed\n";
+        }
+    }
 
     /**
@@ -165 +167 @@
 
             float dmg = this->damage_;
-            if (this->owner_)
-                dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
+//             if (this->owner_)
+//                 dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
 
             Pawn* victim = orxonox_cast<Pawn*>(otherObject);
@@ -182 +184 @@
         }
     }
-        void SimpleRocket::setDestroy() {
-                this->bDestroy_=true;
-                COUT(0)<<"trying to destroy";
-        }
+    
+    void SimpleRocket::setDestroy()
+    {
+        this->bDestroy_=true;
+        CCOUT(4)<<"trying to destroy";
+    }
 
     void SimpleRocket::fired(unsigned int firemode)

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

@@ -6 +6 @@
   LightningGun.cc
   RocketFire.cc
+  SimpleRocketFire.cc
 )

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

@@ -61 +61 @@
     void SimpleRocketFire::fire()
     {
-                RocketController* con = new RocketController(this);
-                SimpleRocket* rocket = con->getRocket();
-                this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
-//              rocket->setOrientation(this->getMuzzleOrientation());
+        RocketController* con = new RocketController(this);
+        SimpleRocket* rocket = con->getRocket();
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
+//      rocket->setOrientation(this->getMuzzleOrientation());
         rocket->setOrientation(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getWorldOrientation());
-                Vector3 pos = this->getMuzzlePosition();
+        Vector3 pos = this->getMuzzlePosition();
         rocket->setPosition(pos);
-//              rocket->setAcceleration(20*rocket->getOrientation() * WorldEntity::FRONT);
-                rocket->setVelocity(this->getMuzzleDirection()*this->speed_);
-                rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
-                rocket->setDamage(this->damage_);
-                WorldEntity* pawnn=this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getTarget();
-                if (pawnn) {
-                con->setTarget(pawnn);
-                }
+//      rocket->setAcceleration(20*rocket->getOrientation() * WorldEntity::FRONT);
+        rocket->setVelocity(this->getMuzzleDirection()*this->speed_);
+        rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+        rocket->setDamage(this->damage_);
+        WorldEntity* pawnn=static_cast<ControllableEntity*>(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn())->getTarget();
+        if (pawnn)
+        {
+            con->setTarget(pawnn);
+        }
     }
 }