Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 30, 2010, 2:34:37 PM (15 years ago)
Author:
gnadler
Message:
 
Location:
code/branches/rocket/src/modules/weapons
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/rocket/src/modules/weapons/RocketController.cc

    r6803 r6810  
    3030#include "projectiles/SimpleRocket.h"
    3131#include "util/Math.h"
     32#include "weapons/projectiles/SimpleRocket.h"
    3233
    3334
     
    6667
    6768                rocket->rotateYaw(0.2);
    68                         rocket->moveFrontBack(2);
     69                        //rocket->moveFrontBack(2);
    6970
    7071    }
     
    7273
    7374
    74         void setRocket(SimpleRocket* rocket, RocketController* contr) {
    75                         contr->setControllableEntity(dynamic_cast<ControllableEntity*> rocket);
    76         }
     75        //void setRocket(SimpleRocket* rocket, RocketController* contr) {
     76        //              contr->setControllableEntity(dynamic_cast<ControllableEntity*> rocket);
     77        //}
    7778}
  • code/branches/rocket/src/modules/weapons/RocketController.h

    r6803 r6810  
    3030#define _RocketController_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "weapons/WeaponsPrereqs.h"
    3333
    3434#include "controllers/Controller.h"
     
    4444        Oli Scheuss
    4545    */
    46     class _OrxonoxExport RocketController : public Controller, public Tickable
     46    class _WeaponsExport RocketController : public Controller, public Tickable
    4747    {
    4848        public:
  • code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc

    r6803 r6810  
    6161                RocketController* myRController = new RocketController(this);
    6262                this->setController(myRController);
    63                 myRController->setRocket(this, myRController);
     63                //myRController->setRocket(this, myRController);
    6464               
    6565                //this->getController()->setControllableEntity(this);
     
    7070        if (GameMode::isMaster())
    7171        {
    72             this->setCollisionType(WorldEntity::Kinematic);
    73             this->setVelocity(0,0,-100);
     72         /*   this->setCollisionType(WorldEntity::Kinematic);
     73            this->setVelocity(0,0,-100);*/
    7474
    7575            Model* model = new Model(this);
    7676            model->setMeshSource("Rocket.mesh");
    77             model->scale(0.7f);
     77            //model->scale(0.7f);
    7878            this->attach(model);
    79             ParticleEmitter* fire = new ParticleEmitter(this);
     79           /* ParticleEmitter* fire = new ParticleEmitter(this);
    8080            this->attach(fire);
    8181            fire->setOrientation(this->getOrientation());
     
    8989            collisionShape->setRadius(3);
    9090            collisionShape->setHeight(500);
    91             this->attachCollisionShape(collisionShape);
     91            this->attachCollisionShape(collisionShape);*/
    9292
    9393            this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&SimpleRocket::destroyObject, this)));
     
    9696    }
    9797
    98     /**
     98    /**s
    9999    @brief
    100100        Destructor. Destroys controller, if present and kills sounds, if playing.
  • code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

    r6778 r6810  
    4646        RegisterObject(SimpleRocketFire);
    4747
    48         this->reloadTime_ = 0.20f;
     48      /*  this->reloadTime_ = 0.20f;
    4949        this->bParallelReload_ = false;
    5050        this->damage_ = 100;
    5151        this->speed_ = 500;
    5252
    53         this->setMunitionName("LaserMunition");
     53        this->setMunitionName("LaserMunition");*/
    5454        // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
    5555    }
     
    6363        SimpleRocket* rocket = new SimpleRocket(this);
    6464
    65         this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
     65      /*  this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
    6666        rocket->setOrientation(this->getMuzzleOrientation());
    6767        rocket->setPosition(this->getMuzzlePosition());
     
    7070
    7171        rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
    72         rocket->setDamage(this->getDamage());
     72        rocket->setDamage(this->getDamage());*/
    7373    }
    7474}
Note: See TracChangeset for help on using the changeset viewer.