Changeset 6914 for code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h

Timestamp:

May 17, 2010, 3:41:40 PM (15 years ago)

Author:

sfluecki

Message:

changed pair in HUDNavigation activeObjectListMap to Struct

File:

• code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.h (modified) (1 diff)

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

@@ -108 +108 @@
     */
     Ogre::TextAreaOverlayElement* navText_;     //!< Text overlay to display the target distance
-    bool wasOutOfView_;                         //!< Performance booster variable: setMaterial is not cheap
+    
 
-    typedef std::map<RadarViewable*, std::pair<Ogre::PanelOverlayElement*, Ogre::TextAreaOverlayElement*> > activeObjectListType;
+    struct objectStruct{
+      
+      Ogre::PanelOverlayElement* panel_;
+      Ogre::TextAreaOverlayElement text_;
+      bool outOfView_;
+      bool wasOutOfView_;
+    
+    };
+    
+    typedef std::map<RadarViewable*, objectStruct > activeObjectListType;
     activeObjectListType activeObjectList_;
     activeObjectListType::iterator tempRadarViewable;