Changeset 12019 for code/branches/PresentationFS18/src/modules

Timestamp:

May 30, 2018, 2:48:17 PM (6 years ago)

Author:

patricwi

Message:

Merged Hover

Location:

code/branches/PresentationFS18

Files:

• . (modified) (1 prop)
• src/modules/hover/CMakeLists.txt (modified) (1 diff)
• src/modules/hover/Hover.cc (modified) (2 diffs)
• src/modules/hover/HoverWall.cc (deleted)
• src/modules/hover/HoverWall.h (deleted)
• src/modules/hover/MazeGenerator.cc (deleted)
• src/modules/hover/MazeGenerator.h (deleted)

code/branches/PresentationFS18/src/modules/hover/CMakeLists.txt

@@ -2 +2 @@
   Hover.cc
   HoverShip.cc
-  HoverWall.cc
   HoverOrigin.cc
   HoverFlag.cc
   TimeHUD.cc
   FlagHUD.cc
-  MazeGenerator.cc
 )
 

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

@@ -35 +35 @@
 
 #include "HoverOrigin.h"
-#include "HoverWall.h"
 #include "HoverFlag.h"
-#include "MazeGenerator.h"
 #include "core/CoreIncludes.h"
 
@@ -59 +57 @@
         SUPER(Hover, tick, dt);
 
-        if(this->firstTick_ && this->origin_)
-        {
-            this->firstTick_ = false;
-
-            int numCells = this->origin_->getNumCells();
-            int cellSize = this->origin_->getCellSize();
-            int cellHeight = this->origin_->getCellHeight();
-
-            MazeGenerator generator(numCells);
-            generator.generateMaze();
-            generator.renderMaze();
-
-            int* levelcode = generator.getLevelcode();
-
-            //Outer Walls
-            for(int i = 0; i<numCells; i++){
-                (new HoverWall(origin_->getContext()))->init(0,        i+1,      cellSize, cellHeight, 1);
-                (new HoverWall(origin_->getContext()))->init(numCells, i+1,      cellSize, cellHeight, 1);
-                (new HoverWall(origin_->getContext()))->init(i+1,      0,        cellSize, cellHeight, 2);
-                (new HoverWall(origin_->getContext()))->init(i+1,      numCells, cellSize, cellHeight, 2);
-            }
-
-            //Generate inner Walls according to levelcode
-            for(int y=0; y<numCells; y++){
-                for(int x=0; x<numCells; x++){
-                    switch(levelcode[ y * numCells + x ]){
-                        case 1: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
-                                break;
-                        case 3: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
-                        case 2: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 0);
-                        default: break;
-                    }
-                }   
-            }
-
-            //Generate 5 flags randomly
-            for ( int i = 0; i < 5; i++ )
-            {
-                HoverFlag* flag = new HoverFlag(origin_->getContext());
-                flag->init(rand()%numCells, rand()%numCells, cellSize);
-                flags_.push_back(flag);
-            }
-
-        }//firsttick end
-
-        // Check if ship collided with one of the flags
-        for ( unsigned int i = 0; i < flags_.size(); i++ ){
-            if(flags_[i]->getCollided()){
-                flags_[i]->destroyLater();
-                flags_.erase (flags_.begin()+i);
-            }
-        }
-        numberOfFlags_ = flags_.size();
     }
 }