Changeset 10241 for code/branches

Timestamp:

Feb 1, 2015, 8:57:37 PM (10 years ago)

Author:

landauf

Message:

cleanup

Location:

code/branches/hudHS14

Files:

• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• src/modules/overlays/hud/HUDEnemyHealthBar.cc (modified) (3 diffs)
• src/modules/overlays/hud/HUDHealthBar.cc (modified) (1 diff)

code/branches/hudHS14/data/overlays/HUDTemplates3.oxo

@@ -36 +36 @@
      size              = "0.35, 0.0875"
      position          = "0.0 , 0.9 "
-     pickpoint         = "0, 1"       
+     pickpoint         = "0, 1"
      bartexture        = "healthbar_bar.png"
      textfont          = "VeraMono"

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
@@ -58 +57 @@
         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);
     }
@@ -115 +71 @@
                 target = target->getParent();
             pawn = orxonox_cast<Pawn*>(target);
-
-
             // 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_)
         {