Changeset 11660 for code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DStone.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/Asteroids2DStone.cc (modified) (7 diffs)

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

@@ -20 +20 @@
  *
  *   Author:
- *      Samuel Riedel
+ *      Viviane Yang
  *   Co-authors:
  *      ...
@@ -26 +26 @@
  */
 
+
+
 /**
     @file Asteroids2DStone.cc
+
     @brief Implementation of the Asteroids2DStone class.
-*/
+
+    TO DO:  
+    - instead of moving over the boarders of the playing field, modify the tick function so that the stones bounce back
+    - when to split? It does not work if you override kill() function...->damage() function?
+*/ 
 
 #include "Asteroids2DStone.h"
@@ -87 +94 @@
         Vector3 pos = this->getPosition();
 
+
         if(pos.x >= width/2){
             pos.x = -width/2;
@@ -103 +111 @@
     inline bool Asteroids2DStone::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
+        orxout() << "AsteroidStone getroffen" << endl;
         if(orxonox_cast<Asteroids2DShip*>(otherObject))
         {
-            this->split();
+            orxout() << "getroffen von Ship" << endl;
+            split();
         }
         return false;
@@ -112 +122 @@
     void Asteroids2DStone::split()
     {
+        orxout() << "split" << endl;
         if(size == 1)
         {
@@ -117 +128 @@
 
         }else if(size == 2){
+
+
+            //Templates can be found in data/levels/templates/asteroidsAsteroids2D.oxt
             Asteroids2DStone* newStone1 = new Asteroids2DStone(this->getContext(), 1, this->getPosition());
             newStone1->addTemplate("stone1");
             Asteroids2DStone* newStone2 = new Asteroids2DStone(this->getContext(), 1, this->getPosition());
             newStone2->addTemplate("stone1");
+            
         }else{
             Asteroids2DStone* newStone1 = new Asteroids2DStone(this->getContext(), 2, this->getPosition());
@@ -129 +144 @@
     }
 
-
-
-
-    //Overload kill function to generate 2 asteriods
-    /*void Asteroids2DStone::kill()
-    {
-        this->damage(this->health)
-        if(this->size < 1)
-        {
-            this->death();
-        }else{
-            size -= 1;
-
-        }
-
-
-    }*/
-
-
 }