Changeset 10110 for code/branches/hudHS14/src/modules

Timestamp:

Nov 5, 2014, 4:04:51 PM (10 years ago)

Author:

aejonas

Message:

new way to display the healthbar on the screen (in a similar way like the existing ship marker)

Location:

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

Files:

• HUDEnemyHealthBar.cc (modified) (3 diffs)
• HUDHealthBar.cc (modified) (1 diff)
• HUDNavigation.cc (modified) (9 diffs)
• HUDNavigation.h (modified) (1 diff)

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

@@ -31 +31 @@
 #include "core/config/ConfigValueIncludes.h"
 #include "worldentities/pawns/Pawn.h"
+#include "graphics/Camera.h"
 
 namespace orxonox
@@ -57 +58 @@
         this->updateTarget();
 
+
+
+
+/*
+        //--------------------------------------------------------------------------
+        //first try to place a healthbar under the enemy ship
+        //getting all the parameters (direction, position, angle) to place the health bar on the screen
+
+        Camera* camera = this->owner_->getCamera();
+
+        //position and orientation relative to the root space
+        Vector3 cameraPosition = camera->getWorldPosition();
+        Quaternion cameraOrientation = camera->getWorldOrientation();
+
+        Vector3 cameraDirection = camera->FRONT;
+        Vector3 cameraOrthonormal = camera->UP;
+
+        //get target
+        //if there is one get it's position (relative to the root space(
+        WorldEntity* target = this->owner_->getTarget();
+
+        if(target != NULL){
+        Vector3 targetPosition = target->getWorldPosition();
+
+
+        //try 1
+        Vector2 screenCoordinates = get2DViewcoordinates(cameraPosition, cameraOrientation * WorldEntity::FRONT, cameraOrientation * WorldEntity::UP, targetPosition);
+
+        orxout() << screenCoordinates.x << endl;
+
+        //shift coordinates because the screen has it's root in the upper left corner (0,0) but get2Dviewcoordiantes return values between -0.5 and 0.5
+        screenCoordinates.x += 0.5;
+        screenCoordinates.y += 0.5;
+        orxout() << screenCoordinates.x << endl;
+
+        this->setPosition(screenCoordinates);
+
+        this->setTextOffset(screenCoordinates);
+
+
+
+
+
+        }
+
+        //--------------------------------------------------------------------------
+*/
+
+
         SUPER(HUDEnemyHealthBar, tick, dt);
     }
@@ -71 +121 @@
                 target = target->getParent();
             pawn = orxonox_cast<Pawn*>(target);
+
+
+
+            /*Vector3 tempPosition = target->getWorldPosition();
+            Vector2 tempPos2D = Vector2(tempPosition.x, tempPosition.y);
+                     this->pickPoint_(tempPos2D);
+                     this->position_(tempPos2D);*/
+
+
             // Don't show the HealthBar if the pawn is invisible
             if (pawn && !pawn->isVisible())
                 pawn = NULL;
         }
+
         // Set the pawn as owner of the HealthBar
         this->setHealthBarOwner(pawn);

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

@@ -83 +83 @@
         SUPER(HUDHealthBar, tick, dt);
 
+
+
+
+
         if (this->owner_)
         {

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

@@ -298 +298 @@
                     if (!it->second.wasOutOfView_)
                     {
-                        it->second.panel_->setMaterialName(TextureGenerator::getMaterialName("arrows.png", it->first->getRadarObjectColour()));
+                        it->second.health_->hide();
+                        it->second.panel_->setMaterialName(TextureGenerator::getMaterialName("arrows.png", it->first->getRadarObjectColour()));
                         it->second.wasOutOfView_ = true;
                         it->second.target_->hide();
@@ -364 +365 @@
                         it->second.panel_->setDimensions(this->navMarkerSize_ * this->getActualSize().x, this->navMarkerSize_ * this->getActualSize().y);
                         it->second.target_->setDimensions(this->aimMarkerSize_ * this->getActualSize().x, this->aimMarkerSize_ * this->getActualSize().y);
+
+                        //manipulation bzw versuch !!! Jonas
+                        it->second.health_->setMaterialName(TextureGenerator::getMaterialName("bar2b.png", it->first->getRadarObjectColour()));
+
                         it->second.wasOutOfView_ = false;
                     }
+
+                    // Position health (versuch !!!!)
+                    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);
+
 
                     // Position marker
@@ -377 +387 @@
 
                     // Make sure the overlays are shown
+
+                    it->second.health_->show();
                     it->second.panel_->show();
                     it->second.text_->show();
@@ -419 +431 @@
 
             {
+                it->second.health_->hide()
                 it->second.panel_->hide();
                 it->second.text_->hide();
@@ -442 +455 @@
         for (std::map<RadarViewable*, ObjectInfo>::iterator it = this->activeObjectList_.begin(); it != this->activeObjectList_.end(); ++it)
         {
+                if (it->second.health_ != NULL)
+                    it->second.health_->setDimensions(this->healthMarkerSize_ * xScale, this->healthMarkerSize_ * yScale);
             if (it->second.panel_ != NULL)
                 it->second.panel_->setDimensions(this->navMarkerSize_ * xScale, this->navMarkerSize_ * yScale);
@@ -468 +483 @@
 
         // Create everything needed to display the object on the radar and add it to the map
+        // Create health
+                Ogre::PanelOverlayElement* health = static_cast<Ogre::PanelOverlayElement*>( Ogre::OverlayManager::getSingleton()
+                        .createOverlayElement("Panel", "HUDNavigation_healthMarker_" + getUniqueNumberString()));
+                //panel->setMaterialName("Orxonox/NavTDC");
+                health->setMaterialName(TextureGenerator::getMaterialName("bar2b.png", object->getRadarObjectColour()));
+                health->setDimensions(this->healthMarkerSize_ * xScale, this->healthMarkerSize_ * yScale);
+                //panel->setColour(object->getRadarObjectColour());
+
 
         // Create arrow/marker
@@ -490 +513 @@
         text->setColour(object->getRadarObjectColour());
 
+        health->hide();
         panel->hide();
         target->hide();
@@ -495 +519 @@
 
         ObjectInfo tempStruct =
-        {   panel, target, text, false, false, false};
+        {   health, panel, target, text, false, false, false, false};
         this->activeObjectList_[object] = tempStruct;
 
+        this->background_->addChild(health);
         this->background_->addChild(panel);
         this->background_->addChild(target);
@@ -512 +537 @@
         {
             // Detach overlays
+                this->background_->removeChild(it->second.health_->getName());
             this->background_->removeChild(it->second.panel_->getName());
             this->background_->removeChild(it->second.target_->getName());
             this->background_->removeChild(it->second.text_->getName());
             // Properly destroy the overlay elements (do not use delete!)
+            Ogre::OverlayManager::getSingleton().destroyOverlayElement(it->second.health_);
             Ogre::OverlayManager::getSingleton().destroyOverlayElement(it->second.panel_);
             Ogre::OverlayManager::getSingleton().destroyOverlayElement(it->second.target_);

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

@@ -77 +77 @@
             struct ObjectInfo
             {
-                Ogre::PanelOverlayElement* panel_;
+
+                //manipulation bzw versuch !!! Jonas
+                Ogre::PanelOverlayElement* health_;
+
+                Ogre::PanelOverlayElement* panel_;
                 Ogre::PanelOverlayElement* target_;
                 Ogre::TextAreaOverlayElement* text_;