[Orxonox-commit 2080] r6796 - code/branches/hudelements/src/modules/overlays/hud

[sfluecki at orxonox.net]

Author: sfluecki
Date: 2010-04-27 17:01:43 +0200 (Tue, 27 Apr 2010)
New Revision: 6796

Modified:
   code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc
   code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h
Log:
Neues update

Modified: code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc	2010-04-26 15:02:49 UTC (rev 6795)
+++ code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc	2010-04-27 15:01:43 UTC (rev 6796)
@@ -29,6 +29,8 @@
 #include "HUDNavigation.h"
 
 #include <string>
+#include <vector>
+#include <map>
 #include <OgreCamera.h>
 #include <OgreOverlayManager.h>
 #include <OgreTextAreaOverlayElement.h>
@@ -82,6 +84,8 @@
 
         // hide at first
         this->setVisible(false);
+	
+	
     }
 
     HUDNavigation::~HUDNavigation()
@@ -134,6 +138,8 @@
 
     void HUDNavigation::tick(float dt)
     {
+
+	
         SUPER(HUDNavigation, tick, dt);
 
         // Get radar
@@ -283,4 +289,18 @@
         if (this->navText_)
             navText_->setCharHeight(navText_->getCharHeight() * yScale);
     }
+    
+//     map <WorldEntity*, pair <Ogre::PanelOverlayElement*, Ogre::TextAreaOverlayElement*> > ActiveObjectList;
+    
+//     void updateActiveObjectMap(){
+//       --> iteration durch die betsehende map über alle keys (Worldentity*)
+// 	     --> check: 'existiert noch' 'sizeChanged' 'angleChanged' 'positionChanged'
+// 		 --> update des aktuellen Objects (Panel & Text) 
+// 		 --> lücke schliessen in der map (aufrücken nach links)
+// 	 --> neue objekte suchen
+// 		 -- map.add neue objekte hinzufügen (pair <panel, text> einfügen.
+//     }	
+    
+
+
 }

Modified: code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h
===================================================================
--- code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h	2010-04-26 15:02:49 UTC (rev 6795)
+++ code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h	2010-04-27 15:01:43 UTC (rev 6796)
@@ -35,8 +35,12 @@
 #include "tools/interfaces/Tickable.h"
 #include "overlays/OrxonoxOverlay.h"
 
+#include <pair>
+#include <vector>
+
 namespace orxonox
 {
+class WorldEntity;
     class _OverlaysExport HUDNavigation : public OrxonoxOverlay, public Tickable
     {
     public:
@@ -45,11 +49,17 @@
 
         virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
         virtual void tick(float dt);
+	
+	virtual map <WorldEntity*, pair <Ogre::PanelOverlayElement*, Ogre::TextAreaOverlayElement*> > ActiveObjectList;
+	
 
     private:
-        void sizeChanged();
+
+	void sizeChanged();
         void angleChanged() { }
         void positionChanged() { }
+	
+	
 
         // XMLPort accessors
         void setNavMarkerSize(float size) { this->navMarkerSize_ = size; this->sizeChanged(); }
@@ -69,7 +79,11 @@
         void updateMarker();
         void updateFocus();
         float getDist2Focus() const;
-
+	void getSingleton();
+	void getSingleton();
+    
+	void updateActiveObjectMap();
+	
         Ogre::PanelOverlayElement* navMarker_;      //!< the panel used to show the arrow and the target marker
         float navMarkerSize_;                       //!< One paramter size of the navigation marker
 /*
@@ -78,6 +92,8 @@
 */
         Ogre::TextAreaOverlayElement* navText_;     //!< Text overlay to display the target distance
         bool wasOutOfView_;                         //!< Performance booster variable: setMaterial is not cheap
+	
+	
     };
 }