[Orxonox-commit 2097] r6813 - in code/branches/rocket/src/modules/weapons: . projectiles weaponmodes

[gnadler at orxonox.net]

Author: gnadler
Date: 2010-05-01 12:37:53 +0200 (Sat, 01 May 2010)
New Revision: 6813

Modified:
   code/branches/rocket/src/modules/weapons/RocketController.cc
   code/branches/rocket/src/modules/weapons/RocketController.h
   code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc
   code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
Log:
RocketController now creates rocket. compiles.
but rocket doesn't spawn.

Modified: code/branches/rocket/src/modules/weapons/RocketController.cc
===================================================================
--- code/branches/rocket/src/modules/weapons/RocketController.cc	2010-04-30 14:42:58 UTC (rev 6812)
+++ code/branches/rocket/src/modules/weapons/RocketController.cc	2010-05-01 10:37:53 UTC (rev 6813)
@@ -42,6 +42,9 @@
     {
 
         RegisterObject(RocketController);
+		SimpleRocket* rocket = new SimpleRocket(this);
+		rocket->setController(this);
+		this->setControllableEntity(dynamic_cast<ControllableEntity*> (rocket));
 
     }
 
@@ -68,7 +71,4 @@
 	or some similar error.
 	*/
 
-	//void setRocket(SimpleRocket* rocket, RocketController* contr) {
-	//		contr->setControllableEntity(dynamic_cast<ControllableEntity*> rocket);
-	//}
 }

Modified: code/branches/rocket/src/modules/weapons/RocketController.h
===================================================================
--- code/branches/rocket/src/modules/weapons/RocketController.h	2010-04-30 14:42:58 UTC (rev 6812)
+++ code/branches/rocket/src/modules/weapons/RocketController.h	2010-05-01 10:37:53 UTC (rev 6813)
@@ -48,7 +48,6 @@
         public:
             RocketController(BaseObject* creator);
 			virtual ~RocketController(){};
-			void setRocket(SimpleRocket* rocket, RocketController* contr);
             
             virtual void tick(float dt);
         protected:

Modified: code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc
===================================================================
--- code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc	2010-04-30 14:42:58 UTC (rev 6812)
+++ code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc	2010-05-01 10:37:53 UTC (rev 6813)
@@ -58,8 +58,8 @@
         this->bDestroy_ = false;
         this->lifetime_ = 100;
 		//this->camera_ = null;
-		RocketController* myRController = new RocketController(this);
-		this->setController(myRController);
+		//RocketController* myRController = new RocketController(this);
+		//this->setController(creator);
 		//myRController->setRocket(this, myRController);
 		
 		//this->getController()->setControllableEntity(this);
@@ -67,8 +67,8 @@
 		//this->getController()->setControllableEntity(this);
         //this->controllableEntity_->setController(this->controller_);
 
-        if (GameMode::isMaster())
-        {
+        //if (GameMode::isMaster())
+        //{
          /*   this->setCollisionType(WorldEntity::Kinematic);
             this->setVelocity(0,0,-100);*/
 
@@ -91,7 +91,7 @@
             this->attachCollisionShape(collisionShape);*/
 
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&SimpleRocket::destroyObject, this)));
-        }
+       // }
 
     }
 

Modified: code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
===================================================================
--- code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc	2010-04-30 14:42:58 UTC (rev 6812)
+++ code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc	2010-05-01 10:37:53 UTC (rev 6813)
@@ -30,7 +30,7 @@
 
 #include "util/Math.h"
 #include "core/CoreIncludes.h"
-#include "weapons/projectiles/SimpleRocket.h"
+#include "weapons/RocketController.h"
 
 #include "weaponsystem/Weapon.h"
 #include "weaponsystem/WeaponPack.h"
@@ -60,8 +60,10 @@
 
     void SimpleRocketFire::fire()
     {
-        SimpleRocket* rocket = new SimpleRocket(this);
+        //SimpleRocket* rocket = new SimpleRocket(this);
+		RocketController* con = new RocketController(this);
 
+
       /*  this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         rocket->setOrientation(this->getMuzzleOrientation());
         rocket->setPosition(this->getMuzzlePosition());