Changeset 7368 for code/trunk/src/modules/overlays/hud/HUDNavigation.cc
- Timestamp:
- Sep 6, 2010, 9:34:51 PM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/png2 (added) merged: 7262-7263
- Property svn:mergeinfo changed
-
code/trunk/src/modules/overlays/hud/HUDNavigation.cc
r7163 r7368 200 200 if ( !it->second.wasOutOfView_ ) 201 201 { 202 it->second.panel_->setMaterialName( TextureGenerator::getMaterialName( "arrows. tga", it->first->getRadarObjectColour()) );202 it->second.panel_->setMaterialName( TextureGenerator::getMaterialName( "arrows.png", it->first->getRadarObjectColour()) ); 203 203 it->second.wasOutOfView_ = true; 204 204 } … … 258 258 { 259 259 //it->second.panel_->setMaterialName ( "Orxonox/NavTDC" ); 260 it->second.panel_->setMaterialName( TextureGenerator::getMaterialName( "tdc. tga", it->first->getRadarObjectColour()) );260 it->second.panel_->setMaterialName( TextureGenerator::getMaterialName( "tdc.png", it->first->getRadarObjectColour()) ); 261 261 it->second.wasOutOfView_ = false; 262 262 } … … 328 328 .createOverlayElement ( "Panel", "HUDNavigation_navMarker_" + getUniqueNumberString() ) ); 329 329 // panel->setMaterialName ( "Orxonox/NavTDC" ); 330 panel->setMaterialName( TextureGenerator::getMaterialName( "tdc. tga", object->getRadarObjectColour()) );330 panel->setMaterialName( TextureGenerator::getMaterialName( "tdc.png", object->getRadarObjectColour()) ); 331 331 panel->setDimensions ( navMarkerSize_ * xScale, navMarkerSize_ * yScale ); 332 332 // panel->setColour( object->getRadarObjectColour() );
Note: See TracChangeset
for help on using the changeset viewer.