Changeset 10894

Timestamp:

Nov 30, 2015, 3:47:42 PM (9 years ago)

Author:

meierman

Message:

Flag generator implemented

Location:

code/branches/hoverHS15/src/modules/hover

Files:

• CMakeLists.txt (modified) (1 diff)
• Hover.cc (modified) (3 diffs)
• Hover.h (modified) (1 diff)
• HoverFlag.cc (added)
• HoverFlag.h (added)
• HoverPrereqs.h (modified) (1 diff)

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

@@ -4 +4 @@
 HoverWall.cc
 HoverOrigin.cc
+HoverFlag.cc
 )
 

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

@@ -36 +36 @@
 
 #include "HoverWall.h"
+#include "HoverFlag.h"  
 #include "core/CoreIncludes.h"
 
@@ -45 +46 @@
 #include <stdint.h>
 #include <fstream>
-
+#include <vector>
 
 namespace orxonox
@@ -140 +141 @@
 
 
+            for ( int i = 0; i < 5; i++ )
+                flagVector.push_back(new HoverFlag(origin_->getContext(), rand()%10, rand()%10));
             
-            //new HoverWall(origin_->getContext(), 1, 1, 1); //Rechts in Y Richtung
+            //new HoverFlag(origin_->getContext()); //Rechts in Y Richtung
             //new HoverWall(origin_->getContext(), 5, 6, 0); //Ueber in x richtung
             //new HoverWall(origin_->getContext(), 5, 5, 0); //Ueber in x richtung
-        }      
+        }
+        for ( int i = 0; i < flagVector.size(); i++ ){
+            if(flagVector[i]->getCollided()){
+                flagVector[i]->destroyLater();
+                flagVector.erase (flagVector.begin()+i);
+            }
+        }
+
 
 

code/branches/hoverHS15/src/modules/hover/Hover.h

@@ -103 +103 @@
             void MazeOut();
             void LevelOut();
+            std::vector<HoverFlag*> flagVector;
 
 

code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h

@@ -72 +72 @@
     class HoverWall;
     class HoverOrigin;
+    class HoverFlag;
 }