Changeset 10900 for code/branches

Timestamp:

Nov 30, 2015, 4:38:28 PM (9 years ago)

Author:

meierman

Message:

Judihui it works

Location:

code/branches/hoverHS15

Files:

• data/overlays/HoverHUD.oxo (modified) (2 diffs)
• src/modules/hover/FlagHUD.cc (modified) (2 diffs)
• src/modules/hover/FlagHUD.h (modified) (2 diffs)
• src/modules/hover/Hover.cc (modified) (3 diffs)
• src/modules/hover/Hover.h (modified) (2 diffs)
• src/modules/hover/TimeHUD.cc (modified) (2 diffs)

code/branches/hoverHS15/data/overlays/HoverHUD.oxo

@@ -8 +8 @@
   <OverlayGroup name = "spaceshiphoverhud" scale = "1, 1">
     <TimeHUD
-     name       = "Timer"
+     name       = "TimerHUD"
      position  = "0.95, 0.02"
      pickpoint = "0.0, 0.0"
@@ -18 +18 @@
 
     <FlagHUD
+     name      = "FlagHUD"
      position  = "0.05, 0.02"
      size      = "0.18, 0.05"

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

@@ -52 +52 @@
 
     void FlagHUD::setFlagCount(int flagCount) {
+        if(flagCount == 0){
+            this->panel_->hide();
+            return;
+        }
         this->panel_->setDimensions(
             this->panel_->_getRelativeWidth() / ((float) flagCount_) * ((float) flagCount),
@@ -61 +65 @@
     }
 
-    /*void FlagHUD::tick(float dt)
+    void FlagHUD::tick(float dt)
     {
         SUPER(FlagHUD, tick, dt);
 
-        if (this->hoverGame)
-        {
-            setFlagCount(2);
-        }
-    }*/
+            setFlagCount(this->hoverGame->getFlags());
+        
+    }
 
     void FlagHUD::changedOwner()

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

@@ -38 +38 @@
 namespace orxonox
 {
-    class _OverlaysExport FlagHUD : public OrxonoxOverlay //, public Tickable
+    class _OverlaysExport FlagHUD : public OrxonoxOverlay , public Tickable
     {
     public:
@@ -44 +44 @@
         virtual ~FlagHUD();
 
-        //virtual void tick(float dt);
+        virtual void tick(float dt);
         virtual void changedOwner();
 

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

@@ -116 +116 @@
         if(firstTick)
         {
+
             std::fill( g_Maze, g_Maze + NumCells * NumCells, 0 );
             g_PtX=0;
@@ -143 +144 @@
             for ( int i = 0; i < 5; i++ )
                 flagVector.push_back(new HoverFlag(origin_->getContext(), rand()%10, rand()%10));
+
+            Flags_ = flagVector.size();
             
             //new HoverFlag(origin_->getContext()); //Rechts in Y Richtung
@@ -154 +157 @@
             }
         }
-
-
-
-    }
-
-    
+        Flags_ = flagVector.size();
+
+
+
+    }
+
+     int Hover::getFlags()
+    {
+
+        // Call start for the parent class.
+        return Flags_;
+    }   
 
     void Hover::start()

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

@@ -88 +88 @@
                        { this->origin_ = origin; }
 
-
+            int getFlags();
             WeakPtr<HoverOrigin> origin_;
 
@@ -95 +95 @@
             int RandomInt();
             int RandomInt4();
-
+            int Flags_;
 
             bool IsDirValid( eDirection Dir );

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

@@ -43 +43 @@
         this->_running = false;
         this->hoverGame = 0;
+        setRunning(true);
     }
 
@@ -82 +83 @@
             this->setCaption(getTimeString(this->_time));
         }
+        if(this->hoverGame->getFlags() == 0)
+            setRunning(false);
         
     }