Changeset 11196 for code/branches/tgidronFS16/src/modules/hover/Hover.cc

Timestamp:

May 26, 2016, 2:49:44 PM (8 years ago)

Author:

tgidron

Message:

Final Project

File:

• code/branches/tgidronFS16/src/modules/hover/Hover.cc (modified) (8 diffs)

code/branches/tgidronFS16/src/modules/hover/Hover.cc

@@ -24 +24 @@
  *   Co-authors:
  *      Cyrill Burgener
+ *      Tomer Gidron
  *
  */
@@ -64 +65 @@
         cellHeight = 0;
 
-        bShowLevel = false;
+        bLevelUpgradeHUD = false;
 
         totFlags = 0;
@@ -83 +84 @@
             cellHeight = this->origin_->getCellHeight();
 
-            /*
-            bool occupiedCells[numCells][numCells];
-
-            for(int i = 0; i < numCells; i++)
-            {
-                for(int j = 0; j < numCells; j++)
-                {
-                    occupiedCells[i][j] = false;
-                }
-            }
-            occupiedCells[0][0] = true;
-            */
+            //TODO
+            //create boolean array/vector to assert that no two objects are placed in the same way
+            
 
             MazeGenerator generator(numCells);
@@ -205 +197 @@
                 GSLevel::startMainMenu();
             }
-            // Debug
-            orxout() << this->origin_->getPickupTemplate() << endl;
-            orxout() << this->origin_->getPickupRepresentationTemplate() << endl;
-
-
-            orxout() << this->origin_->getPickupTemplateSpeed() << endl;
-            orxout() << this->origin_->getPickupRepresentationTemplateSpeed() << endl;
-
-            orxout() << this->origin_->getObstacleTemplate() << endl;
-            //orxout() << crate->getPosition() << endl;
-        }
-    }
-
-
-    // Start new level
+            
+        }
+    }
+
+
+    // generate new Flags
     void Hover::createFlags()
     {
-        //Generate 5 flags randomly (test only 1 flag)
-
-          /*  do
-            {
-                int i = 0;
-
-                HoverFlag* flag = new HoverFlag(origin_->getContext());
-                int x = rand()%numCells;
-                int y = rand()%numCells;
-                flag->init(x, y, cellSize);
-                flags_.push_back(flag);
-
-                occupiedCells[x][y] = true;
-
-                i++;
-
-            }while( i<5 || occupiedCells[x][y] == true);
-            */
-
-            for ( int i = 0; i < 5; i++ )
-            {
-                HoverFlag* flag = new HoverFlag(origin_->getContext());
-                flag->init(rand()%numCells, rand()%numCells, cellSize);
-                flags_.push_back(flag);
-
-            
-
-                if(flags_[i]->getPosition() == get3dCoordinates(0,0,-60))
-                {
-                    flags_[i]->destroyLater();
-                    flags_.erase(flags_.begin()+i);
-                }
-            }
+        //TODO
+        //Generate flags randomly using bool array
+
+        //Generate 5 flags randomly on field
+        for ( int i = 0; i < 5; i++ )
+        {
+            HoverFlag* flag = new HoverFlag(origin_->getContext());
+            flag->init(rand()%numCells, rand()%numCells, cellSize);
+            flags_.push_back(flag);
+
+            
+
+            if(flags_[i]->getPosition() == get3dCoordinates(0,0,-60))
+            {
+                flags_[i]->destroyLater();
+                flags_.erase(flags_.begin()+i);
+            }
+        }
             
     }
@@ -275 +243 @@
                     
                     levelUp();
-                    //GSLevel::startMainMenu();
                 }
             }
@@ -287 +254 @@
     }
 
+    //start new level - call to create new flags
     void Hover::levelUp()
     {
@@ -297 +265 @@
         createFlags();
         toggleShowLevel();
-        showLevelTimer.setTimer(1.0f, false, createExecutor(createFunctor(&Hover::toggleShowLevel, this)));
+        showLevelTimer.setTimer(2.0f, false, createExecutor(createFunctor(&Hover::toggleShowLevel, this)));
+
+        //spawn one additional crate randomly
+        Pawn* crate = new Pawn(origin_->getContext());
+        crate->addTemplate(origin_->getObstacleTemplate());  
+        crate->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 43.0f));
 
     }
@@ -306 +279 @@
     }
 
+    //if killed, subtract number of lives. If lives == 0, end game
     void Hover::costLife()
     {