Changeset 10122

Timestamp:

Nov 12, 2014, 4:08:14 PM (9 years ago)

Author:

aejonas

Message:

health bar is now under the spaceship while moving

Location:

code/branches/hudHS14/src/modules/overlays/hud

Files:

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

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

@@ -82 +82 @@
         this->setNavMarkerSize(0.03f);
         this->setAimMarkerSize(0.02f);
+        this->setHealthMarkerSize(0.08f);
 
         this->setDetectionLimit(10000.0f);
@@ -116 +117 @@
         XMLPortParam(HUDNavigation, "detectionLimit", setDetectionLimit, getDetectionLimit, xmlelement, mode);
         XMLPortParam(HUDNavigation, "aimMarkerSize", setAimMarkerSize, getAimMarkerSize, xmlelement, mode);
+        XMLPortParam(HUDNavigation, "healthMarkerSize", setHealthMarkerSize, getHealthMarkerSize, xmlelement, mode);
+
     }
 
@@ -206 +209 @@
         for (std::list<std::pair<RadarViewable*, unsigned int> >::iterator listIt = this->sortedObjectList_.begin(); listIt != this->sortedObjectList_.end(); ++markerCount, ++listIt)
         {
+
             std::map<RadarViewable*, ObjectInfo>::iterator it = this->activeObjectList_.find(listIt->first);
             closeEnough = listIt->second < this->detectionLimit_;
@@ -273 +277 @@
                     }
                 }
+
+
 
 
@@ -358 +364 @@
                     // Object is in view
 
-                    // Change material only if outOfView changed
+
+
+
+
+
+                        // Change material only if outOfView changed
                     if (it->second.wasOutOfView_)
                     {
@@ -367 +378 @@
 
                         //manipulation bzw versuch !!! Jonas
-                        it->second.health_->setMaterialName(TextureGenerator::getMaterialName("bar2b.png", it->first->getRadarObjectColour()));
+                        it->second.health_->setMaterialName(TextureGenerator::getMaterialName("bar2.png", it->first->getRadarObjectColour()));
+                        it->second.health_->setDimensions(this->healthMarkerSize_ * this->getActualSize().x, this->healthMarkerSize_ * this->getActualSize().y);
 
                         it->second.wasOutOfView_ = false;
                     }
 
+
+                    //i need to find the place where the amount of health is saved!!!
+                    //this->selectedTarget_->getWorldEntity()->
+
+
                     // Position health (versuch !!!!)
+                    it->second.health_->setUV(0.0f, 0.0f, 1.0f, 1.0f);
                     it->second.health_->setLeft((pos.x + 1.0f - it->second.panel_->getWidth()) * 0.5f);
                     it->second.health_->setTop((-pos.y + 1.0f - it->second.panel_->getHeight()) * 0.5f);
@@ -431 +449 @@
 
             {
-                it->second.health_->hide()
+                it->second.health_->hide();
                 it->second.panel_->hide();
                 it->second.text_->hide();
@@ -487 +505 @@
                         .createOverlayElement("Panel", "HUDNavigation_healthMarker_" + getUniqueNumberString()));
                 //panel->setMaterialName("Orxonox/NavTDC");
-                health->setMaterialName(TextureGenerator::getMaterialName("bar2b.png", object->getRadarObjectColour()));
+                health->setMaterialName(TextureGenerator::getMaterialName("bar2.png", object->getRadarObjectColour()));
                 health->setDimensions(this->healthMarkerSize_ * xScale, this->healthMarkerSize_ * yScale);
                 //panel->setColour(object->getRadarObjectColour());
@@ -519 +537 @@
 
         ObjectInfo tempStruct =
-        {   health, panel, target, text, false, false, false, false};
+        {   health, panel, target, text, false, false, false};
         this->activeObjectList_[object] = tempStruct;
 

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

@@ -78 +78 @@
             {
 
-                //manipulation bzw versuch !!! Jonas
+                //manipulation bzw versuch !!! health additional
                 Ogre::PanelOverlayElement* health_;
-
                 Ogre::PanelOverlayElement* panel_;
                 Ogre::PanelOverlayElement* target_;
@@ -92 +91 @@
 
             // XMLPort accessors
+            inline void setHealthMarkerSize(float size)
+                        {
+                            this->healthMarkerSize_ = size;
+                            this->sizeChanged();
+                        }
+            inline float getHealthMarkerSize() const
+                                { return healthMarkerSize_; }
+
             inline void setNavMarkerSize(float size)
             {
@@ -104 +111 @@
                 this->sizeChanged();
             }
+
             inline float getAimMarkerSize() const
                 { return aimMarkerSize_; }
@@ -125 +133 @@
             std::list<std::pair<RadarViewable*, unsigned int> > sortedObjectList_;
 
+            float healthMarkerSize_;
             float navMarkerSize_;
             float aimMarkerSize_;