[Orxonox-commit 5579] r10242 - in code/branches/presentationHS14merge: . data/overlays src/modules/overlays/hud
landauf at orxonox.net
landauf at orxonox.net
Sun Feb 1 20:58:38 CET 2015
Author: landauf
Date: 2015-02-01 20:58:38 +0100 (Sun, 01 Feb 2015)
New Revision: 10242
Modified:
code/branches/presentationHS14merge/
code/branches/presentationHS14merge/data/overlays/HUDTemplates3.oxo
code/branches/presentationHS14merge/src/modules/overlays/hud/HUDNavigation.cc
code/branches/presentationHS14merge/src/modules/overlays/hud/HUDNavigation.h
Log:
merged hudHS14
Property changes on: code/branches/presentationHS14merge
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/Racingbot:9388-9513
/code/branches/ScriptableController:9999-10075
/code/branches/ai:6592-7033
/code/branches/ai2:8721-8880
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/core6:9552-9666
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/environment3:8887-8975
/code/branches/formation:8885-8991
/code/branches/formationupdate:9580-9624
/code/branches/fps:6591-7072
/code/branches/gamecontent:8893-8968
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hud:8883-8986
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/invaders:9694-9896
/code/branches/ipv6:7293-7458
/code/branches/keckslevelHS14:10082-10222
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/largeShip1:9384-9515
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/levelElias:9697-9921
/code/branches/levelKaan:9695-9921
/code/branches/levelMichael:9696-9921
/code/branches/leveljoemeHS14:10087-10223
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/libs:9668-9674
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/masterserverfix:8933-8936
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/menue:8884-8976
/code/branches/minigame4DHS14:10081-10230
/code/branches/miniprojects:2754-2824
/code/branches/modularships:9994-10071
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/newlevel2012:9033-9244
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/output:8739-8857
/code/branches/overlay:2117-2385
/code/branches/pCuts:9023-9284
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup2012:9029-9189
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation2011:8974-9015
/code/branches/presentation2012:9189-9268
/code/branches/presentation2012merge:9266-9347
/code/branches/presentation3:6913-7162
/code/branches/presentationFS14:10069-10215
/code/branches/presentationHS12:9481-9525
/code/branches/presentationHS13:9891-9938
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/radarDreiD:9690-9901
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/sfxThilo:9691-9917
/code/branches/shipSelection:9038-9206
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound2012:9205-9214
/code/branches/sound3:5941-6102
/code/branches/spaceNavigation:9381-9497
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacerace:8182-8630
/code/branches/spaceraceTwo:8881-8996
/code/branches/spacestationentry:9699-9905
/code/branches/steering:5949-6091,8140-8595
/code/branches/surfaceRace:9028-9199
/code/branches/surfaceraceHS14:10080-10236
/code/branches/testing:9015-9549
/code/branches/tetris:8100-8563
/code/branches/turret:9380-9501
/code/branches/turretFS14:9998-10070
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/unity_build:8440-8716
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
/code/branches/weaponupdateHS14:10084-10237
+ /code/branches/Racingbot:9388-9513
/code/branches/ScriptableController:9999-10075
/code/branches/ai:6592-7033
/code/branches/ai2:8721-8880
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/core6:9552-9666
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/environment3:8887-8975
/code/branches/formation:8885-8991
/code/branches/formationupdate:9580-9624
/code/branches/fps:6591-7072
/code/branches/gamecontent:8893-8968
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hud:8883-8986
/code/branches/hudHS14:10083-10241
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/invaders:9694-9896
/code/branches/ipv6:7293-7458
/code/branches/keckslevelHS14:10082-10222
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/largeShip1:9384-9515
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/levelElias:9697-9921
/code/branches/levelKaan:9695-9921
/code/branches/levelMichael:9696-9921
/code/branches/leveljoemeHS14:10087-10223
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/libs:9668-9674
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/masterserverfix:8933-8936
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/menue:8884-8976
/code/branches/minigame4DHS14:10081-10230
/code/branches/miniprojects:2754-2824
/code/branches/modularships:9994-10071
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/newlevel2012:9033-9244
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/output:8739-8857
/code/branches/overlay:2117-2385
/code/branches/pCuts:9023-9284
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup2012:9029-9189
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation2011:8974-9015
/code/branches/presentation2012:9189-9268
/code/branches/presentation2012merge:9266-9347
/code/branches/presentation3:6913-7162
/code/branches/presentationFS14:10069-10215
/code/branches/presentationHS12:9481-9525
/code/branches/presentationHS13:9891-9938
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/radarDreiD:9690-9901
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/sfxThilo:9691-9917
/code/branches/shipSelection:9038-9206
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound2012:9205-9214
/code/branches/sound3:5941-6102
/code/branches/spaceNavigation:9381-9497
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacerace:8182-8630
/code/branches/spaceraceTwo:8881-8996
/code/branches/spacestationentry:9699-9905
/code/branches/steering:5949-6091,8140-8595
/code/branches/surfaceRace:9028-9199
/code/branches/surfaceraceHS14:10080-10236
/code/branches/testing:9015-9549
/code/branches/tetris:8100-8563
/code/branches/turret:9380-9501
/code/branches/turretFS14:9998-10070
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/unity_build:8440-8716
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
/code/branches/weaponupdateHS14:10084-10237
Modified: code/branches/presentationHS14merge/data/overlays/HUDTemplates3.oxo
===================================================================
--- code/branches/presentationHS14merge/data/overlays/HUDTemplates3.oxo 2015-02-01 19:57:37 UTC (rev 10241)
+++ code/branches/presentationHS14merge/data/overlays/HUDTemplates3.oxo 2015-02-01 19:58:38 UTC (rev 10242)
@@ -81,7 +81,7 @@
name = "EnemyHealthBar"
background = "Orxonox/HealthBarBackground"
size = "0.35, 0.0875"
- position = "1.0 , 0.1 "
+ position = "1 ,0.1"
pickpoint = "1, 1"
bartexture = "healthbar_bar.png"
textfont = "VeraMono"
Modified: code/branches/presentationHS14merge/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/presentationHS14merge/src/modules/overlays/hud/HUDNavigation.cc 2015-02-01 19:57:37 UTC (rev 10241)
+++ code/branches/presentationHS14merge/src/modules/overlays/hud/HUDNavigation.cc 2015-02-01 19:58:38 UTC (rev 10242)
@@ -81,6 +81,8 @@
this->setTextSize(0.05f);
this->setNavMarkerSize(0.03f);
this->setAimMarkerSize(0.02f);
+ this->setHealthMarkerSize(0.06f);
+ this->setHealthLevelMarkerSize(0.06f);
this->setDetectionLimit(10000.0f);
this->currentMunitionSpeed_ = 2500.0f;
@@ -115,6 +117,9 @@
XMLPortParam(HUDNavigation, "navMarkerSize", setNavMarkerSize, getNavMarkerSize, xmlelement, mode);
XMLPortParam(HUDNavigation, "detectionLimit", setDetectionLimit, getDetectionLimit, xmlelement, mode);
XMLPortParam(HUDNavigation, "aimMarkerSize", setAimMarkerSize, getAimMarkerSize, xmlelement, mode);
+ XMLPortParam(HUDNavigation, "healthMarkerSize", setHealthMarkerSize, getHealthMarkerSize, xmlelement, mode);
+ XMLPortParam(HUDNavigation, "healthLevelMarkerSize", setHealthLevelMarkerSize, getHealthLevelMarkerSize, xmlelement, mode);
+
}
void HUDNavigation::setFont(const std::string& font)
@@ -205,6 +210,7 @@
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_;
// display radarviewables on HUD if the marker limit and max-distance is not exceeded
@@ -274,6 +280,8 @@
}
+
+
// Transform to screen coordinates
Vector3 pos = camTransform * it->first->getRVWorldPosition();
@@ -297,6 +305,8 @@
// Change material only if outOfView changed
if (!it->second.wasOutOfView_)
{
+ it->second.health_->hide();
+ it->second.healthLevel_->hide();
it->second.panel_->setMaterialName(TextureGenerator::getMaterialName("arrows.png", it->first->getRadarObjectColour()));
it->second.wasOutOfView_ = true;
it->second.target_->hide();
@@ -356,6 +366,35 @@
{
// Object is in view
+
+
+
+ //calculate the health of the actual selected radarViewable (relativHealthScale: while (0) is no health left, (1) is the initial health)
+ Pawn* pawnPtr = (Pawn*) (it->first->getWorldEntity());
+ float health = pawnPtr->getHealth();
+ float initHealth = pawnPtr->getMaxHealth();
+ float relativHealthScale = health/initHealth;
+
+ //integer values from 0 to 10 (0 is no health and 10 is full health)
+ int discreteHealthScale = (int)(10*relativHealthScale);
+
+ //calculate the HealthLevel (= OponentLevel or Strength) there are 5 Levels
+ //Level 1, Level 2,... , Level 5
+ int HealthLevel = 1;
+
+ if(initHealth < 200)
+ HealthLevel = 1;
+ if(200 <= initHealth && initHealth < 500)
+ HealthLevel = 2;
+ if(500 <= initHealth && initHealth < 1000)
+ HealthLevel = 3;
+ if(1000 <= initHealth && initHealth < 2500)
+ HealthLevel = 4;
+ if(2500 <= initHealth)
+ HealthLevel = 5;
+
+
+
// Change material only if outOfView changed
if (it->second.wasOutOfView_)
{
@@ -363,9 +402,56 @@
it->second.panel_->setMaterialName(TextureGenerator::getMaterialName("tdc.png", it->first->getRadarObjectColour()));
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);
+
+
+ //it->second.health_->setMaterialName(TextureGenerator::getMaterialName("bar2_1.png", it->first->getRadarObjectColour()));
+ it->second.health_->setMaterialName(TextureGenerator::getMaterialName("barSquare.png", it->first->getRadarObjectColour()));
+ it->second.health_->setDimensions(this->healthMarkerSize_ * this->getActualSize().x , 0.75f*this->healthMarkerSize_ * this->getActualSize().y);
it->second.wasOutOfView_ = false;
+
+ // because as soon as relative health drops below 10% (0.1) the descrete value is 0 but as long as the
+ // spaceship is still intact there should be at least one part of the bar left.
+ if(1<=discreteHealthScale){
+ it->second.health_->setTiling((float)discreteHealthScale , 1 ,0);
+ it->second.health_->setDimensions(this->healthMarkerSize_ * this->getActualSize().x *0.1f*discreteHealthScale, 0.75f*this->healthMarkerSize_ * this->getActualSize().y);
+ }
+
+
+
+ //healthLevel
+ it->second.healthLevel_->setMaterialName(TextureGenerator::getMaterialName("barSquare.png", it->first->getRadarObjectColour()));
+ it->second.healthLevel_->setDimensions(this->healthLevelMarkerSize_ * this->getActualSize().x , 0.75f*this->healthLevelMarkerSize_ * this->getActualSize().y);
+ it->second.wasOutOfView_ = false;
+ it->second.healthLevel_->setTiling((float)HealthLevel , 1 ,0);
+ it->second.healthLevel_->setDimensions(this->healthLevelMarkerSize_ * this->getActualSize().x *0.1f*HealthLevel, 0.25f*this->healthLevelMarkerSize_ * this->getActualSize().y);
}
+
+
+ // sets Position and Dimensions (amount) health
+ it->second.health_->setUV(0.0f, 0.0f, 1.0f, 1.0f);
+ it->second.health_->setLeft((pos.x + 0.975f - it->second.panel_->getWidth()) * 0.5f);
+ it->second.health_->setTop((-pos.y + 1.04f - it->second.panel_->getHeight()) * 0.5f);
+
+
+ // because as soon as relative health drops below 10% (0.1) the descrete value is 0 but as long as the
+ // spaceship is still intact there should be at least one part of the bar left.
+ if(1<=discreteHealthScale){
+ it->second.health_->setTiling((float)discreteHealthScale , 1 ,0);
+ it->second.health_->setDimensions(this->healthMarkerSize_ * this->getActualSize().x *0.1f*discreteHealthScale, 0.75f*this->healthMarkerSize_ * this->getActualSize().y);
+ }
+
+
+ //sets Position and Dimensions (level) of healthLevel
+ it->second.healthLevel_->setMaterialName(TextureGenerator::getMaterialName("barSquare.png", it->first->getRadarObjectColour()));
+ it->second.healthLevel_->setUV(0.0f, 0.0f, 1.0f, 1.0f);
+ it->second.healthLevel_->setLeft((pos.x + 0.975f - it->second.panel_->getWidth()) * 0.5f);
+ it->second.healthLevel_->setTop((-pos.y + 1.125f - it->second.panel_->getHeight()) * 0.5f);
+
+ it->second.healthLevel_->setTiling((float)HealthLevel , 1 ,0);
+ it->second.healthLevel_->setDimensions(this->healthLevelMarkerSize_ * this->getActualSize().x *0.1f*HealthLevel, 0.25f*this->healthLevelMarkerSize_ * this->getActualSize().y);
+
+
// Position marker
it->second.panel_->setUV(0.0f, 0.0f, 1.0f, 1.0f);
it->second.panel_->setLeft((pos.x + 1.0f - it->second.panel_->getWidth()) * 0.5f);
@@ -375,7 +461,12 @@
it->second.text_->setLeft((pos.x + 1.0f + it->second.panel_->getWidth()) * 0.5f);
it->second.text_->setTop((-pos.y + 1.0f + it->second.panel_->getHeight()) * 0.5f);
+
+
+
// Make sure the overlays are shown
+ it->second.health_->show();
+ it->second.healthLevel_->show();
it->second.panel_->show();
it->second.text_->show();
@@ -418,6 +509,8 @@
else // do not display on HUD
{
+ it->second.health_->hide();
+ it->second.healthLevel_->hide();
it->second.panel_->hide();
it->second.text_->hide();
it->second.target_->hide();
@@ -441,6 +534,10 @@
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.healthLevel_ != NULL)
+ it->second.healthLevel_->setDimensions(this->healthLevelMarkerSize_ * xScale, this->healthLevelMarkerSize_ * yScale);
if (it->second.panel_ != NULL)
it->second.panel_->setDimensions(this->navMarkerSize_ * xScale, this->navMarkerSize_ * yScale);
if (it->second.text_ != NULL)
@@ -468,6 +565,20 @@
// 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("barSquare.png", object->getRadarObjectColour()));
+ health->setDimensions(this->healthMarkerSize_ * xScale, this->healthMarkerSize_ * yScale);
+ //panel->setColour(object->getRadarObjectColour());
+
+ // Create healthLevel
+ Ogre::PanelOverlayElement* healthLevel = static_cast<Ogre::PanelOverlayElement*>( Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", "HUDNavigation_healthLevelMarker_" + getUniqueNumberString()));
+ //panel->setMaterialName("Orxonox/NavTDC");
+ health->setMaterialName(TextureGenerator::getMaterialName("barSquare.png", object->getRadarObjectColour()));
+ health->setDimensions(this->healthLevelMarkerSize_ * xScale, this->healthLevelMarkerSize_ * yScale);
+
+
// Create arrow/marker
Ogre::PanelOverlayElement* panel = static_cast<Ogre::PanelOverlayElement*>( Ogre::OverlayManager::getSingleton()
.createOverlayElement("Panel", "HUDNavigation_navMarker_" + getUniqueNumberString()));
@@ -489,14 +600,18 @@
text->setCharHeight(text->getCharHeight() * yScale);
text->setColour(object->getRadarObjectColour());
+ health->hide();
+ healthLevel->hide();
panel->hide();
target->hide();
text->hide();
ObjectInfo tempStruct =
- { panel, target, text, false, false, false};
+ { health, healthLevel, panel, target, text, false, false, false};
this->activeObjectList_[object] = tempStruct;
+ this->background_->addChild(health);
+ this->background_->addChild(healthLevel);
this->background_->addChild(panel);
this->background_->addChild(target);
this->background_->addChild(text);
@@ -511,10 +626,14 @@
if (this->activeObjectList_.find(viewable) != this->activeObjectList_.end())
{
// Detach overlays
+ this->background_->removeChild(it->second.health_->getName());
+ this->background_->removeChild(it->second.healthLevel_->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.healthLevel_);
Ogre::OverlayManager::getSingleton().destroyOverlayElement(it->second.panel_);
Ogre::OverlayManager::getSingleton().destroyOverlayElement(it->second.target_);
Ogre::OverlayManager::getSingleton().destroyOverlayElement(it->second.text_);
Modified: code/branches/presentationHS14merge/src/modules/overlays/hud/HUDNavigation.h
===================================================================
--- code/branches/presentationHS14merge/src/modules/overlays/hud/HUDNavigation.h 2015-02-01 19:57:37 UTC (rev 10241)
+++ code/branches/presentationHS14merge/src/modules/overlays/hud/HUDNavigation.h 2015-02-01 19:58:38 UTC (rev 10242)
@@ -76,6 +76,11 @@
private:
struct ObjectInfo
{
+
+
+
+ Ogre::PanelOverlayElement* health_;
+ Ogre::PanelOverlayElement* healthLevel_;
Ogre::PanelOverlayElement* panel_;
Ogre::PanelOverlayElement* target_;
Ogre::TextAreaOverlayElement* text_;
@@ -87,6 +92,22 @@
bool showObject(RadarViewable* rv);
// XMLPort accessors
+ inline void setHealthMarkerSize(float size)
+ {
+ this->healthMarkerSize_ = size;
+ this->sizeChanged();
+ }
+ inline float getHealthMarkerSize() const
+ { return healthMarkerSize_; }
+
+ inline void setHealthLevelMarkerSize(float size)
+ {
+ this->healthLevelMarkerSize_ = size;
+ this->sizeChanged();
+ }
+ inline float getHealthLevelMarkerSize() const
+ { return healthLevelMarkerSize_; }
+
inline void setNavMarkerSize(float size)
{
this->navMarkerSize_ = size;
@@ -99,6 +120,7 @@
this->aimMarkerSize_ = size;
this->sizeChanged();
}
+
inline float getAimMarkerSize() const
{ return aimMarkerSize_; }
inline void setDetectionLimit(float limit)
@@ -120,6 +142,8 @@
std::map<RadarViewable*, ObjectInfo> activeObjectList_;
std::list<std::pair<RadarViewable*, unsigned int> > sortedObjectList_;
+ float healthMarkerSize_;
+ float healthLevelMarkerSize_;
float navMarkerSize_;
float aimMarkerSize_;
std::string fontName_;
More information about the Orxonox-commit
mailing list