Changeset 6796

Timestamp:

Apr 27, 2010, 5:01:43 PM (14 years ago)

Author:

sfluecki

Message:

Neues update

Location:

code/branches/hudelements/src/modules/overlays/hud

Files:

• HUDNavigation.cc (modified) (4 diffs)
• HUDNavigation.h (modified) (4 diffs)

code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc

@@ -30 +30 @@
 
 #include <string>
+#include <vector>
+#include <map>
 #include <OgreCamera.h>
 #include <OgreOverlayManager.h>
@@ -83 +85 @@
         // hide at first
         this->setVisible(false);
+        
+        
     }
 
@@ -135 +139 @@
     void HUDNavigation::tick(float dt)
     {
+
+        
         SUPER(HUDNavigation, tick, dt);
 
@@ -284 +290 @@
             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.
+//     }        
+    
+
+
 }

code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h

@@ -36 +36 @@
 #include "overlays/OrxonoxOverlay.h"
 
+#include <pair>
+#include <vector>
+
 namespace orxonox
 {
+class WorldEntity;
     class _OverlaysExport HUDNavigation : public OrxonoxOverlay, public Tickable
     {
@@ -46 +50 @@
         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
@@ -70 +80 @@
         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
@@ -79 +93 @@
         Ogre::TextAreaOverlayElement* navText_;     //!< Text overlay to display the target distance
         bool wasOutOfView_;                         //!< Performance booster variable: setMaterial is not cheap
+        
+        
     };
 }