Changeset 7263
- Timestamp:
- Aug 29, 2010, 7:11:36 PM (14 years ago)
- Location:
- code/branches/png2
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/png2/data/overlays/hudtamplates_fps.oxo
r7163 r7263 14 14 position = "0.0 , 0.95 " 15 15 pickpoint = "0, 1" 16 bartexture = "healthbar_bar. tga"16 bartexture = "healthbar_bar.png" 17 17 textfont = "VeraMono" 18 18 textusebarcolour = true -
code/branches/png2/data/overlays/hudtemplates3.oxo
r6711 r7263 37 37 position = "0.0 , 0.95 " 38 38 pickpoint = "0, 1" 39 bartexture = "healthbar_bar. tga"39 bartexture = "healthbar_bar.png" 40 40 textfont = "VeraMono" 41 41 textusebarcolour = true -
code/branches/png2/data/overlays/underattackhud.oxo
r5781 r7263 7 7 position = "0.99 , 0.01" 8 8 pickpoint = "1, 0" 9 bartexture = "healthbar_bar. tga"9 bartexture = "healthbar_bar.png" 10 10 textfont = "VeraMono" 11 11 textusebarcolour = true -
code/branches/png2/data/particle/smoke1.particle
r5781 r7263 25 25 affector ColourImage 26 26 { 27 image smokecolors. tga27 image smokecolors.png 28 28 } 29 29 -
code/branches/png2/src/modules/overlays/hud/HUDBar.cc
r6677 r7263 76 76 material->getTechnique(0)->getPass(0)->setSceneBlending(Ogre::SBT_TRANSPARENT_ALPHA); 77 77 this->textureUnitState_ = material->getTechnique(0)->getPass(0)->createTextureUnitState(); 78 this->textureUnitState_->setTextureName("bar2. tga");78 this->textureUnitState_->setTextureName("bar2.png"); 79 79 this->textureUnitState_->setNumMipmaps(0); 80 80 // use the default colour -
code/branches/png2/src/modules/overlays/hud/HUDNavigation.cc
r7163 r7263 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() ); -
code/branches/png2/src/modules/overlays/hud/HUDRadar.cc
r7184 r7263 62 62 this->setMaximumDotSize(0.1f); 63 63 64 this->shapeMaterials_[RadarViewable::Dot] = "RadarDot. tga";65 this->shapeMaterials_[RadarViewable::Triangle] = "RadarTriangle. tga";66 this->shapeMaterials_[RadarViewable::Square] = "RadarSquare. tga";64 this->shapeMaterials_[RadarViewable::Dot] = "RadarDot.png"; 65 this->shapeMaterials_[RadarViewable::Triangle] = "RadarTriangle.png"; 66 this->shapeMaterials_[RadarViewable::Square] = "RadarSquare.png"; 67 67 68 68 this->owner_ = 0;
Note: See TracChangeset
for help on using the changeset viewer.