Changeset 10794 for code/branches/fabienHS15/src/modules/weapons

Timestamp:

Nov 10, 2015, 7:47:39 PM (9 years ago)

Author:

fvultier

Message:

bug in the WeaponHUD fixed.

Location:

code/branches/fabienHS15/src/modules/weapons

Files:

• projectiles/Rocket.cc (modified) (2 diffs)
• projectiles/SimpleRocket.cc (modified) (2 diffs)
• weaponmodes/RocketFire.cc (modified) (1 diff)
• weaponmodes/SimpleRocketFire.cc (modified) (1 diff)

code/branches/fabienHS15/src/modules/weapons/projectiles/Rocket.cc

@@ -76 +76 @@
             Model* model = new Model(this->getContext());
             model->setMeshSource("rocket.mesh");
-            model->scale(0.7f);
+            model->scale(1.0f);
             this->attach(model);
 
@@ -187 +187 @@
         SUPER(Rocket, tick, dt);
 
+        orxout() << "Rocket::tick" << getScale() << endl;
+
         if( this->hasLocalController() )
         {

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

@@ -76 +76 @@
             Model* model = new Model(this->getContext());
             model->setMeshSource("rocket.mesh");
-            model->scale(0.7f);
+            model->scale(1.0f);
             this->attach(model);
 
@@ -116 +116 @@
     {
         SUPER(SimpleRocket, tick, dt);
+
+        orxout() << "SimpleRocket::tick" << getScale() << endl;
 
         if (GameMode::isMaster())

code/branches/fabienHS15/src/modules/weapons/weaponmodes/RocketFire.cc

@@ -79 +79 @@
         rocket->setPosition(this->getMuzzlePosition());
         rocket->setVelocity(this->getMuzzleDirection() * this->speed_);
-        rocket->scale(2);
+        rocket->scale(1.0f);
 
         rocket->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());

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

@@ -85 +85 @@
         rocket->setVelocity(this->getMuzzleDirection()*this->speed_);
         rocket->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+        rocket->scale(1.0f);
 
         rocket->setDamage(this->damage_);