Changeset 1339 for code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h

Timestamp:

May 20, 2008, 11:51:33 PM (17 years ago)

Author:

FelixSchulthess

Message:

added full functionality for RadarObjects and two space tomatoes

File:

• code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h (modified) (3 diffs)

code/branches/hud3/src/orxonox/hud/RadarOverlayElement.h

@@ -46 +46 @@
                 Ogre::OverlayManager* om;                               // our one and only overlay manager
                 void init();
-                
+
         public:
                 RadarObject(Ogre::OverlayContainer* container);
                 RadarObject(Ogre::OverlayContainer* container, Vector3 pos);
                 ~RadarObject();
-                
+
+            bool right_;
                 Vector3 pos_;                                                   // position in space
                         Ogre::Real radius_, phi_;                               // position on radar
-                        bool right_;
                         Ogre::OverlayContainer* container_;
                         Ogre::PanelOverlayElement* panel_;              // the panel used to show the dot
-                        
+                        RadarObject* next;                      // next pointer of linked list
+
                 static int count;
         };
@@ -67 +68 @@
             Ogre::OverlayContainer* container_;
             Vector3 initialDir_;                        // direction of nose
-            Vector3 currentDir_;                                        
+            Vector3 currentDir_;
             Vector3 initialOrth_;                   // direction of normal
             Vector3 currentOrth_;
             Vector3 shipPos_;                       // position of ship
-            
-                        RadarObject* tomato_;            
-            
+
+                        RadarObject* firstRadarObject_;         // start of linked list
+                        RadarObject* lastRadarObject_;          // end of linked list
+
             Ogre::Real leftRel_, topRel_, dimRel_;  // relative position/dimension
             int left_, top_, dim_;                  // absolute position/dimension
@@ -82 +84 @@
             ~RadarOverlayElement();
             void init(Real leftRel, Real topRel, Real dimRel, Ogre::OverlayContainer* container);
-                        void resize();            
+                        void resize();
             void update();
             void addObject(Vector3 pos);
+            void listObjects();
+            float calcRadius(RadarObject* obj);
+            float calcPhi(RadarObject* obj);
+            bool calcRight(RadarObject* obj);
         };
 }