Changeset 11555 for code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsStone.cc

Timestamp:

Nov 13, 2017, 4:05:34 PM (8 years ago)

Author:

vyang

Message:

Level file: korrekte Kameraposition, Raumschiff bewegt sich nicht, schiesst aber → wird AsteroidsShip ueberhaupt geladen? AsteroidsShip: neue Steuerung (vgl Jump, Rotation muss noch angepasst werden)

File:

• code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsStone.cc (modified) (6 diffs)

code/branches/Asteroid_HS17/src/modules/asteroids/AsteroidsStone.cc

@@ -28 +28 @@
 
 /**
-    @file InvaderEnemy.h
-    @brief Declaration of the InvaderEnemy class.
+    @file AsteroidsEnemy.h
+    @brief Declaration of the AsteroidsEnemy class.
 */
 
@@ -36 +36 @@
 #include "Asteroids.h"
 #include "AsteroidsShip.h"
+#include <cstdlib>
 #include <cmath>
 #include "util/Math.h"
 
+const float delta = 3;
 
 namespace orxonox
@@ -48 +50 @@
         RegisterObject(AsteroidsStone);
 
+        direction = 0;
+        //Spielfeld x als Horizontale und z als Vertikale
+        fieldWidth_ = this->getGame()->center_->getFieldWidth;
+        fieldHeigth_ = this->getGame()->center_->getFieldHeight;
+
+
+        //Random size 1, 2, 3 ->muss noch realisiert werden. Templates erstellen
+        this.size = 1;
         maxspeed = 50.0f;
         //Random Spawn? pos= random? -> spawn durch timer in der Asteroids Klasse
-        this->setPosition(rnd(0, fieldWidth_), rnd(0, fieldHeigth_), 0);
+        this->setPosition(rnd(fieldWidth_), 0, rnd(fieldHeigth));
 
-                //random Geschwindigkeit und Richtung
-                velocity.x = rnd(0, maxspeed);
-                velocity.y = rnd(0, maxspeed);
-        this->context = context;
+        //random Geschwindigkeit und Richtung
+        velocity.x = rnd(maxspeed);
+        velocity.y = rnd(maxspeed);
+    }
+
+    inline bool AsteroidsStone::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
+    {
+        if(orxonox_cast<AsteroidsShip*>(otherObject))
+            removeHealth(2000);
+        return false;
     }
 
@@ -64 +80 @@
         }else if(this->size == 2){
             Pawn::death();
-
             //Wie mache ich das ? Eigentlich in der game Klasse? sonst zeigt der Pointer auf einen falschen Bereich
-
             for(int i = 0; i<2; i++)
             {
                 AsteroidsStone* newStone;
-                newStone = new AsteroidsStone(this->context);
+                newStone = new AsteroidsStone(this->getGame()->center_->getContext());
                 newStone->addTemplate("asteroidsstone");
-                newStone->setAsteroidsPlayer(player);
+                newStone->setAsteroidsPlayer(this->getGame()->player);
             }
 
         }
+    }
+    
+
+    Asteroids* AsteroidsStone::getGame()
+    {
+        if (game == nullptr)
+        {
+            for (Asteroids* Asteroids : ObjectList<Asteroids>())
+                game = asteroids;
+        }
+        return game;
     }
 
@@ -82 +107 @@
     void AsteroidsStone::tick(float dt)
     {
-        Vector3 pos = this->getPosition();
-        pos.x += velocity.x*dt;
-        pos.z += velocity.y*dt;
+        Vector3 pos = getPosition();
 
+
+
+
+        //bounce on the borders
+        if(pos.x-delta <= 0 || pos.x+delta >= fieldWidth_)
+            direction = -direction;
+
+
+
+        //zurück bringen
         if(pos.y != 0){
             pos.y=0;
         }
+
+        //spin
+
+        setOrientation()
         setPosition(pos);
+
         SUPER(AsteroidsStone, tick, dt);
     }
@@ -95 +133 @@
     inline bool AsteroidsStone::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
-        if(orxonox_cast<InvaderShip*>(otherObject))
+        if(orxonox_cast<AsteroidsShip*>(otherObject))
             removeHealth(2000);
         return false;