Changeset 6810 for code/branches/rocket/src/modules
- Timestamp:
- Apr 30, 2010, 2:34:37 PM (15 years ago)
- Location:
- code/branches/rocket/src/modules/weapons
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/rocket/src/modules/weapons/RocketController.cc
r6803 r6810 30 30 #include "projectiles/SimpleRocket.h" 31 31 #include "util/Math.h" 32 #include "weapons/projectiles/SimpleRocket.h" 32 33 33 34 … … 66 67 67 68 rocket->rotateYaw(0.2); 68 rocket->moveFrontBack(2);69 //rocket->moveFrontBack(2); 69 70 70 71 } … … 72 73 73 74 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 //} 77 78 } -
code/branches/rocket/src/modules/weapons/RocketController.h
r6803 r6810 30 30 #define _RocketController_H__ 31 31 32 #include " OrxonoxPrereqs.h"32 #include "weapons/WeaponsPrereqs.h" 33 33 34 34 #include "controllers/Controller.h" … … 44 44 Oli Scheuss 45 45 */ 46 class _ OrxonoxExport RocketController : public Controller, public Tickable46 class _WeaponsExport RocketController : public Controller, public Tickable 47 47 { 48 48 public: -
code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc
r6803 r6810 61 61 RocketController* myRController = new RocketController(this); 62 62 this->setController(myRController); 63 myRController->setRocket(this, myRController);63 //myRController->setRocket(this, myRController); 64 64 65 65 //this->getController()->setControllableEntity(this); … … 70 70 if (GameMode::isMaster()) 71 71 { 72 this->setCollisionType(WorldEntity::Kinematic);73 this->setVelocity(0,0,-100); 72 /* this->setCollisionType(WorldEntity::Kinematic); 73 this->setVelocity(0,0,-100);*/ 74 74 75 75 Model* model = new Model(this); 76 76 model->setMeshSource("Rocket.mesh"); 77 model->scale(0.7f);77 //model->scale(0.7f); 78 78 this->attach(model); 79 ParticleEmitter* fire = new ParticleEmitter(this);79 /* ParticleEmitter* fire = new ParticleEmitter(this); 80 80 this->attach(fire); 81 81 fire->setOrientation(this->getOrientation()); … … 89 89 collisionShape->setRadius(3); 90 90 collisionShape->setHeight(500); 91 this->attachCollisionShape(collisionShape); 91 this->attachCollisionShape(collisionShape);*/ 92 92 93 93 this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&SimpleRocket::destroyObject, this))); … … 96 96 } 97 97 98 /** 98 /**s 99 99 @brief 100 100 Destructor. Destroys controller, if present and kills sounds, if playing. -
code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
r6778 r6810 46 46 RegisterObject(SimpleRocketFire); 47 47 48 this->reloadTime_ = 0.20f;48 /* this->reloadTime_ = 0.20f; 49 49 this->bParallelReload_ = false; 50 50 this->damage_ = 100; 51 51 this->speed_ = 500; 52 52 53 this->setMunitionName("LaserMunition"); 53 this->setMunitionName("LaserMunition");*/ 54 54 // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning) 55 55 } … … 63 63 SimpleRocket* rocket = new SimpleRocket(this); 64 64 65 this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());65 /* this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition()); 66 66 rocket->setOrientation(this->getMuzzleOrientation()); 67 67 rocket->setPosition(this->getMuzzlePosition()); … … 70 70 71 71 rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()); 72 rocket->setDamage(this->getDamage()); 72 rocket->setDamage(this->getDamage());*/ 73 73 } 74 74 }
Note: See TracChangeset
for help on using the changeset viewer.