Changeset 6810

Timestamp:

Apr 30, 2010, 2:34:37 PM (14 years ago)

Author:

gnadler

Message:

 

Location:

code/branches/rocket/src/modules/weapons

Files:

• RocketController.cc (modified) (3 diffs)
• RocketController.h (modified) (2 diffs)
• projectiles/SimpleRocket.cc (modified) (4 diffs)
• weaponmodes/SimpleRocketFire.cc (modified) (3 diffs)

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

@@ -30 +30 @@
 #include "projectiles/SimpleRocket.h" 
 #include "util/Math.h"
+#include "weapons/projectiles/SimpleRocket.h"
 
 
@@ -66 +67 @@
 
                 rocket->rotateYaw(0.2);
-                        rocket->moveFrontBack(2);
+                        //rocket->moveFrontBack(2);
 
     }
@@ -72 +73 @@
 
 
-        void setRocket(SimpleRocket* rocket, RocketController* contr) {
-                        contr->setControllableEntity(dynamic_cast<ControllableEntity*> rocket);
-        }
+        //void setRocket(SimpleRocket* rocket, RocketController* contr) {
+        //              contr->setControllableEntity(dynamic_cast<ControllableEntity*> rocket);
+        //}
 }

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

@@ -30 +30 @@
 #define _RocketController_H__
 
-#include "OrxonoxPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
 
 #include "controllers/Controller.h"
@@ -44 +44 @@
         Oli Scheuss
     */
-    class _OrxonoxExport RocketController : public Controller, public Tickable
+    class _WeaponsExport RocketController : public Controller, public Tickable
     {
         public:

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

@@ -61 +61 @@
                 RocketController* myRController = new RocketController(this);
                 this->setController(myRController);
-                myRController->setRocket(this, myRController);
+                //myRController->setRocket(this, myRController);
                 
                 //this->getController()->setControllableEntity(this);
@@ -70 +70 @@
         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());
@@ -89 +89 @@
             collisionShape->setRadius(3);
             collisionShape->setHeight(500);
-            this->attachCollisionShape(collisionShape);
+            this->attachCollisionShape(collisionShape);*/
 
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&SimpleRocket::destroyObject, this)));
@@ -96 +96 @@
     }
 
-    /**
+    /**s
     @brief
         Destructor. Destroys controller, if present and kills sounds, if playing.

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

@@ -46 +46 @@
         RegisterObject(SimpleRocketFire);
 
-        this->reloadTime_ = 0.20f;
+      /*  this->reloadTime_ = 0.20f;
         this->bParallelReload_ = false;
         this->damage_ = 100;
         this->speed_ = 500;
 
-        this->setMunitionName("LaserMunition");
+        this->setMunitionName("LaserMunition");*/
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
     }
@@ -63 +63 @@
         SimpleRocket* rocket = new SimpleRocket(this);
 
-        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
+      /*  this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         rocket->setOrientation(this->getMuzzleOrientation());
         rocket->setPosition(this->getMuzzlePosition());
@@ -70 +70 @@
 
         rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
-        rocket->setDamage(this->getDamage());
+        rocket->setDamage(this->getDamage());*/
     }
 }