Changeset 11660 for code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DWeapon.cc

Timestamp:

Dec 11, 2017, 4:06:44 PM (6 years ago)

Author:

vyang

Message:

Projektile fliegen in 2D Ebene, jedoch in eine falsche Richtung. Kommentare hinzugefuegt

File:

• code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DWeapon.cc (modified) (5 diffs)

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DWeapon.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Florian Zinggeler
+ *      Viviane Yang
  *   Co-authors:
  *      --
@@ -48 +48 @@
 #include "weapons/MuzzleFlash.h"
 
+#include "Asteroids2D.h"
+
 namespace orxonox
 {
@@ -55 +57 @@
     {
         RegisterObject(Asteroids2DWeapon);
+
+
     }
 
@@ -61 +65 @@
 
     }
+
+    Asteroids2D* Asteroids2DWeapon::getGame()
+    {
+        if (game == nullptr)
+        {
+            for (Asteroids2D* race : ObjectList<Asteroids2D>())
+            {
+                game = race;
+            }
+        }
+        return game;
+    }
+
 
     void Asteroids2DWeapon::shot()
@@ -75 +92 @@
 
         this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
-        projectile->setOrientation(this->getMuzzleOrientation());
+
+        //projectile->setOrientation(this->getGame()->getPlayer()->getOrientation());
         projectile->setPosition(this->getMuzzlePosition());
 
+
+        //auf 2D Ebene druecken
         Vector3 muzzle2D = this->getMuzzleDirection();
         muzzle2D.y = 0;