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

Timestamp:

Oct 30, 2017, 4:04:29 PM (7 years ago)

Author:

vyang

Message:

Files hinzugefuegt, versucht Aehnlichkeiten mit anderen minigames (dodgerace, invader) zu finden. Testlevel noch zu bearbeiten. Gametype Asteroids crashed immer noch

File:

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

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

@@ -32 +32 @@
 */
 
-#include "InvaderEnemy.h"
-
+#include "AsteroidsStone.h"
 #include "core/CoreIncludes.h"
-#include "Invader.h"
-#include "InvaderShip.h"
+#include "Asteroids.h"
+#include "AsteroidsShip.h"
+#include <cmath>
+#include "util/Math.h"
 
 namespace orxonox
 {
-    RegisterClass(InvaderEnemy);
+    RegisterClass(AsteroidsStone);
 
-    InvaderEnemy::InvaderEnemy(Context* context) : Pawn(context)
+    AsteroidsStone::AsteroidsStone(Context* context) : MovableEntity(context)
     {
-        RegisterObject(InvaderEnemy);
-        enableCollisionCallback();
-        lifetime = 0;
+        RegisterObject(AsteroidsStone);
+
+        maxspeed = 50.0f;
+        //Random Spawn? pos= random?
+        this->setPosition(rnd(0, fieldWidth_), rnd(0, fieldHeigth_), 0);
+                if(r){
+                        this.r = r*0.5;
+                }else{
+                        this.r = rnd(15, 50);
+                }
+
+                //random Geschwindigkeit und Richtung
+                velocity.x = rnd(0, maxspeed);
+                velocity.y = rnd(0, maxspeed);
+    }
+//Bis hier geschrieben
+    void AsteroidsStone::tick(float dt)
+    {
+        Vector3 pos = this->getPosition();
+        pos.x += velocity.x*dt;
+        pos.y += velocity.y*dt;
+        setPosition(pos);
+        SUPER(AsteroidsStone, tick, dt);
     }
 
-    void InvaderEnemy::tick(float dt)
-    {
-        lifetime += dt;
-        // die after 5 seconds.
-        if (lifetime > 5000)
-            removeHealth(2000);
-
-        if (player != nullptr)
-        {
-            float newZ = 2/(pow(std::abs(getPosition().x - player->getPosition().x) * 0.01f, 2) + 1) * (player->getPosition().z - getPosition().z);
-            setVelocity(Vector3(1000.f - level * 100 , 0, newZ));
-        }
-        SUPER(InvaderEnemy, tick, dt);
-    }
-
-    inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
+    inline bool AsteroidsStone::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
         if(orxonox_cast<InvaderShip*>(otherObject))
@@ -71 +77 @@
     }
 
-    Invader* InvaderEnemy::getGame()
-    {
-        if (game == nullptr)
-        {
-            for (Invader* invader : ObjectList<Invader>())
-                game = invader;
-        }
-        return game;
-    }
 
-    void InvaderEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
-    {
-        Pawn::damage(damage, healthdamage, shielddamage, originator, cs);
-        if (getGame() && orxonox_cast<InvaderShip*>(originator) != nullptr && getHealth() <= 0)
-            getGame()->addPoints(42);
-    }
 }