Changeset 11529 for code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h

Timestamp:

Nov 6, 2017, 12:52:38 PM (7 years ago)

Author:

pascscha

Message:

Asteroid Clusters

File:

• code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h (modified) (4 diffs)

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h

@@ -41 +41 @@
 #include "tools/Timer.h"
 
+
 namespace orxonox
 {
+
+    struct Circle{
+        int r;
+        int x;
+        int y;
+        Circle(int new_r, int new_x, int new_y){
+            r=new_r;
+            x=new_x;
+            y=new_y;
+        }
+        Circle(){
+            r=0;
+            x=0;
+            y=0;
+        }
+    };
 
     class _FlappyOrxExport FlappyOrx : public Deathmatch
@@ -53 +70 @@
             virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
 
-            void spawnEnemy();
-
+            void updatePlayerPos(int x);
+            void createAsteroid(Circle &c);
+            void asteroidField(int x, int y, float slope);
+            void spawnTube();
+            
             void setCenterpoint(FlappyOrxCenterPoint* center);
 
@@ -71 +91 @@
             bool bEndGame;
             bool bShowLevel;
+            std::queue<int> tubes;
+            int spawnDistance;
+            int tubeOffsetX;
         private:
             void toggleShowLevel(){bShowLevel = !bShowLevel;}
+
+            const static int nAst = 7;
+            Circle Asteroids[nAst];
+
+            void ClearAsteroids(){
+                for(int i = 0; i<this->nAst; i++){
+                    Asteroids[i].r=0;
+                }
+            }
+
+            
+            bool Collision(Circle &c1, Circle &c2){
+                if(c1.r==0 || c2.r==0)
+                    return false;
+                int x = c1.x - c2.x;
+                int y = c1.y - c2.y;
+                int r = c1.r + c2.r;
+
+                return x*x+y*y<r*r*1.5;
+            }
+
+            int addIfPossible(Circle c){
+                int i;
+                for(i=0; i<this->nAst && this->Asteroids[i].r!=0;i++){
+                    if(Collision(c,this->Asteroids[i])){
+                        return 0;
+                    }
+                }
+                if(i==nAst)
+                    return 2;
+                this->Asteroids[i].x=c.x;
+                this->Asteroids[i].y=c.y;
+                this->Asteroids[i].r=c.r;
+                createAsteroid(c);
+                return 1;
+            }
+            
+            
+
             FlappyOrxShip* getPlayer();
             WeakPtr<FlappyOrxCenterPoint> center_;
@@ -84 +146 @@
             int point;
             bool b_combo;
+            std::string Asteroid5[6] = {"Asteroid3_1","Asteroid3_2","Asteroid3_3","Asteroid3_4","Asteroid3_5","Asteroid3_6"};
+            std::string Asteroid10[6] = {"Asteroid6_1","Asteroid6_2","Asteroid6_3","Asteroid6_4","Asteroid6_5","Asteroid6_6"};
+            std::string Asteroid15[6] = {"Asteroid9_1","Asteroid9_2","Asteroid9_3","Asteroid9_4","Asteroid9_5","Asteroid9_6"};
+            std::string Asteroid20[6] = {"Asteroid12_1","Asteroid12_2","Asteroid12_3","Asteroid12_4","Asteroid12_5","Asteroid12_6"};
+
+
+
     };
 }