Changeset 1346

Timestamp:

May 21, 2008, 8:20:58 PM (17 years ago)

Author:

FelixSchulthess

Message:

splitted two classes in two files

Location:

code/branches/hud3/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• hud/RadarObject.cc (added)
• hud/RadarObject.h (added)
• hud/RadarOverlayElement.cc (modified) (4 diffs)
• hud/RadarOverlayElement.h (modified) (1 diff)

code/branches/hud3/src/orxonox/CMakeLists.txt

@@ -8 +8 @@
   hud/BarOverlayElement.cc
   hud/RadarOverlayElement.cc
+  hud/RadarObject.cc
   particle/ParticleInterface.cc
   tolua/tolua_bind.cc

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

@@ -26 +26 @@
 */
 
-/*      local coordinate system of space ship at the beginning:
-
-                        y
-                        +   z
-                        |  +
-                        | /
-                        |/
-   x +------O
-*/
-
-#include <OgreOverlayManager.h>
-#include <OgreOverlayElement.h>
-#include <OgrePanelOverlayElement.h>
-#include <OgreStringConverter.h>
 #include "RadarOverlayElement.h"
-#include "GraphicsEngine.h"
 
 namespace orxonox
@@ -98 +83 @@
         // iterate through all RadarObjects
                 while(ro != NULL){
+                    // calc position on radar...
             ro->radius_ = calcRadius(ro);
             ro->phi_ = calcPhi(ro);
             ro->right_ = calcRight(ro);
+
+            // set size to fit distance...
+            float d = (ro->pos_-shipPos_).length();
+            if(d<4000) ro->panel_->setDimensions(4,4);
+            else if(d<8000) ro->panel_->setDimensions(3,3);
+            else if(d<12000) ro->panel_->setDimensions(2,2);
+            else ro->panel_->setDimensions(1,1);
+
             if (ro->right_){
                 ro->panel_->setPosition(sin(ro->phi_)*ro->radius_/
@@ -115 +109 @@
     void RadarOverlayElement::addObject(Vector3 pos){
         if(firstRadarObject_ == NULL){
-            firstRadarObject_ = new RadarObject(container_);
-            firstRadarObject_->pos_ = pos;
+            firstRadarObject_ = new RadarObject(container_, pos);
             lastRadarObject_ = firstRadarObject_;
         }
         else{
-            lastRadarObject_->next = new RadarObject(container_);
-            lastRadarObject_->next->pos_ = pos;
+            lastRadarObject_->next = new RadarObject(container_, pos);
             lastRadarObject_ = lastRadarObject_->next;
         }
@@ -155 +147 @@
         else return false;
         }
-
-//////// RadarObject ////////
-
-        int RadarObject::count = 0;             // initialize static variable
-
-        RadarObject::RadarObject(Ogre::OverlayContainer* container){
-                container_ = container;
-                pos_ = Vector3(0.0, 0.0, 0.0);
-                init();
-        }
-
-        RadarObject::RadarObject(Ogre::OverlayContainer* container, Vector3 pos){
-                container_ = container;
-                pos_ = pos;
-                init();
-        }
-
-        RadarObject::~RadarObject(){}
-
-        void RadarObject::init(){
-            next = NULL;
-                om = &Ogre::OverlayManager::getSingleton();
-                panel_ = static_cast<PanelOverlayElement*>(om->createOverlayElement("Panel",
-                        "Object"+Ogre::StringConverter::toString(count++)));
-                panel_->setMaterialName("Orxonox/RedDot");
-                panel_->setDimensions(5,5);
-        panel_->setMetricsMode(Ogre::GMM_PIXELS);
-        panel_->show();
-        container_->addChild(panel_);
-        }
 }
 

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

@@ -30 +30 @@
 
 #include <string.h>
+#include <OgreOverlayManager.h>
+#include <OgreStringConverter.h>
 #include <OgreOverlayElement.h>
 #include <OgrePanelOverlayElement.h>
+#include <OgrePrerequisites.h>
+
 #include <util/Math.h>
 #include <string.h>
 #include "core/Tickable.h"
-#include <OgrePrerequisites.h>
 #include "objects/SpaceShip.h"
 #include "../OrxonoxPrereqs.h"
+#include "RadarObject.h"
+#include "GraphicsEngine.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport RadarObject
-    {
-        private:
-                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
-                        Ogre::OverlayContainer* container_;
-                        Ogre::PanelOverlayElement* panel_;              // the panel used to show the dot
-                        RadarObject* next;                      // next pointer of linked list
-
-                static int count;
-        };
-
     class _OrxonoxExport RadarOverlayElement : public Ogre::PanelOverlayElement
     {