Changeset 11614 for code/branches/Asteroid_HS17/src

Timestamp:

Dec 1, 2017, 6:38:00 PM (6 years ago)

Author:

vyang

Message:

Asteroids werden random geladen→ collisionShape und Bewegung einstellen

Location:

code/branches/Asteroid_HS17/src/modules/asteroids2D

Files:

• Asteroids2DCube.cc (modified) (2 diffs)
• Asteroids2DCube.h (modified) (1 diff)
• Asteroids2DShip.h (modified) (1 diff)

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

@@ -34 +34 @@
 #include "Asteroids2D.h"
 #include "core/CoreIncludes.h"
+#include "util/Math.h"
 
 namespace orxonox
@@ -39 +40 @@
     RegisterClass(Asteroids2DCube);
 
-    Asteroids2DCube::Asteroids2DCube(Context* context) : MovableEntity(context)
+    Asteroids2DCube::Asteroids2DCube(Context* context) : Pawn(context)
     {
         RegisterObject(Asteroids2DCube);
+        this->size = 1;
+        this->width = 1043;
+        this->height = 646;
+        //this->setPosition();
+        //this->setVelocity(Vector3 )
+    }
+
+    void Asteroids2DCube::tick(float dt)
+    {
+        SUPER(Asteroids2DCube, tick, dt);
+        
+
     }
 

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DCube.h

@@ -38 +38 @@
 #include "asteroids2D/Asteroids2DPrereqs.h"
 
-#include "worldentities/MovableEntity.h"
+#include "worldentities/pawns/Pawn.h"
 
 
 namespace orxonox
 {
-    class _Asteroids2DExport Asteroids2DCube : public MovableEntity
+    class _Asteroids2DExport Asteroids2DCube : public Pawn
     {
        public:
             Asteroids2DCube(Context* context);
+            virtual void tick(float dt) override;
 
        private:
+                int size;                               // three sizes, 3-> two 2s, 2-> two 1s, 1-> die
+                float width, height;    //field
     };
 }

code/branches/Asteroid_HS17/src/modules/asteroids2D/Asteroids2DShip.h

@@ -65 +65 @@
 
             //no rotation in x and z direction!
-            virtual void rotateYaw(const Vector2& value) override{}; // Rotate in yaw direction.
+            //virtual void rotateYaw(const Vector2& value) override{}; // Rotate in yaw direction.
             virtual void rotatePitch(const Vector2& value) override{}; // Rotate in pitch direction.
             virtual void rotateRoll(const Vector2& value) override{}; // Rotate in roll direction.