[Orxonox-commit 2558] r7263 - in code/branches/png2: data/overlays data/particle src/modules/overlays/hud
rgrieder at orxonox.net
rgrieder at orxonox.net
Sun Aug 29 19:11:36 CEST 2010
Author: rgrieder
Date: 2010-08-29 19:11:36 +0200 (Sun, 29 Aug 2010)
New Revision: 7263
Modified:
code/branches/png2/data/overlays/hudtamplates_fps.oxo
code/branches/png2/data/overlays/hudtemplates3.oxo
code/branches/png2/data/overlays/underattackhud.oxo
code/branches/png2/data/particle/smoke1.particle
code/branches/png2/src/modules/overlays/hud/HUDBar.cc
code/branches/png2/src/modules/overlays/hud/HUDNavigation.cc
code/branches/png2/src/modules/overlays/hud/HUDRadar.cc
Log:
Changed *.tga to *.png in code too.
Modified: code/branches/png2/data/overlays/hudtamplates_fps.oxo
===================================================================
--- code/branches/png2/data/overlays/hudtamplates_fps.oxo 2010-08-29 17:10:36 UTC (rev 7262)
+++ code/branches/png2/data/overlays/hudtamplates_fps.oxo 2010-08-29 17:11:36 UTC (rev 7263)
@@ -13,7 +13,7 @@
size = "0.35, 0.0875"
position = "0.0 , 0.95 "
pickpoint = "0, 1"
- bartexture = "healthbar_bar.tga"
+ bartexture = "healthbar_bar.png"
textfont = "VeraMono"
textusebarcolour = true
textsize = 0.039
Modified: code/branches/png2/data/overlays/hudtemplates3.oxo
===================================================================
--- code/branches/png2/data/overlays/hudtemplates3.oxo 2010-08-29 17:10:36 UTC (rev 7262)
+++ code/branches/png2/data/overlays/hudtemplates3.oxo 2010-08-29 17:11:36 UTC (rev 7263)
@@ -36,7 +36,7 @@
size = "0.35, 0.0875"
position = "0.0 , 0.95 "
pickpoint = "0, 1"
- bartexture = "healthbar_bar.tga"
+ bartexture = "healthbar_bar.png"
textfont = "VeraMono"
textusebarcolour = true
textsize = 0.039
Modified: code/branches/png2/data/overlays/underattackhud.oxo
===================================================================
--- code/branches/png2/data/overlays/underattackhud.oxo 2010-08-29 17:10:36 UTC (rev 7262)
+++ code/branches/png2/data/overlays/underattackhud.oxo 2010-08-29 17:11:36 UTC (rev 7263)
@@ -6,7 +6,7 @@
size = "0.45, 0.0875"
position = "0.99 , 0.01"
pickpoint = "1, 0"
- bartexture = "healthbar_bar.tga"
+ bartexture = "healthbar_bar.png"
textfont = "VeraMono"
textusebarcolour = true
textsize = 0.039
Modified: code/branches/png2/data/particle/smoke1.particle
===================================================================
--- code/branches/png2/data/particle/smoke1.particle 2010-08-29 17:10:36 UTC (rev 7262)
+++ code/branches/png2/data/particle/smoke1.particle 2010-08-29 17:11:36 UTC (rev 7263)
@@ -24,7 +24,7 @@
affector ColourImage
{
- image smokecolors.tga
+ image smokecolors.png
}
affector Rotator
Modified: code/branches/png2/src/modules/overlays/hud/HUDBar.cc
===================================================================
--- code/branches/png2/src/modules/overlays/hud/HUDBar.cc 2010-08-29 17:10:36 UTC (rev 7262)
+++ code/branches/png2/src/modules/overlays/hud/HUDBar.cc 2010-08-29 17:11:36 UTC (rev 7263)
@@ -75,7 +75,7 @@
Ogre::MaterialPtr material = static_cast<Ogre::MaterialPtr>(Ogre::MaterialManager::getSingleton().create(materialname, "General"));
material->getTechnique(0)->getPass(0)->setSceneBlending(Ogre::SBT_TRANSPARENT_ALPHA);
this->textureUnitState_ = material->getTechnique(0)->getPass(0)->createTextureUnitState();
- this->textureUnitState_->setTextureName("bar2.tga");
+ this->textureUnitState_->setTextureName("bar2.png");
this->textureUnitState_->setNumMipmaps(0);
// use the default colour
this->textureUnitState_->setColourOperationEx(Ogre::LBX_MODULATE, Ogre::LBS_MANUAL, Ogre::LBS_CURRENT, ColourValue(0.2f, 0.7f, 0.2f));
Modified: code/branches/png2/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/png2/src/modules/overlays/hud/HUDNavigation.cc 2010-08-29 17:10:36 UTC (rev 7262)
+++ code/branches/png2/src/modules/overlays/hud/HUDNavigation.cc 2010-08-29 17:11:36 UTC (rev 7263)
@@ -199,7 +199,7 @@
// Change material only if outOfView changed
if ( !it->second.wasOutOfView_ )
{
- it->second.panel_->setMaterialName( TextureGenerator::getMaterialName( "arrows.tga", it->first->getRadarObjectColour()) );
+ it->second.panel_->setMaterialName( TextureGenerator::getMaterialName( "arrows.png", it->first->getRadarObjectColour()) );
it->second.wasOutOfView_ = true;
}
@@ -257,7 +257,7 @@
if ( it->second.wasOutOfView_ )
{
//it->second.panel_->setMaterialName ( "Orxonox/NavTDC" );
- it->second.panel_->setMaterialName( TextureGenerator::getMaterialName( "tdc.tga", it->first->getRadarObjectColour()) );
+ it->second.panel_->setMaterialName( TextureGenerator::getMaterialName( "tdc.png", it->first->getRadarObjectColour()) );
it->second.wasOutOfView_ = false;
}
@@ -327,7 +327,7 @@
Ogre::PanelOverlayElement* panel = static_cast<Ogre::PanelOverlayElement*> ( Ogre::OverlayManager::getSingleton()
.createOverlayElement ( "Panel", "HUDNavigation_navMarker_" + getUniqueNumberString() ) );
// panel->setMaterialName ( "Orxonox/NavTDC" );
- panel->setMaterialName( TextureGenerator::getMaterialName( "tdc.tga", object->getRadarObjectColour()) );
+ panel->setMaterialName( TextureGenerator::getMaterialName( "tdc.png", object->getRadarObjectColour()) );
panel->setDimensions ( navMarkerSize_ * xScale, navMarkerSize_ * yScale );
// panel->setColour( object->getRadarObjectColour() );
Modified: code/branches/png2/src/modules/overlays/hud/HUDRadar.cc
===================================================================
--- code/branches/png2/src/modules/overlays/hud/HUDRadar.cc 2010-08-29 17:10:36 UTC (rev 7262)
+++ code/branches/png2/src/modules/overlays/hud/HUDRadar.cc 2010-08-29 17:11:36 UTC (rev 7263)
@@ -61,9 +61,9 @@
this->setHalfDotSizeDistance(3000.0f);
this->setMaximumDotSize(0.1f);
- this->shapeMaterials_[RadarViewable::Dot] = "RadarDot.tga";
- this->shapeMaterials_[RadarViewable::Triangle] = "RadarTriangle.tga";
- this->shapeMaterials_[RadarViewable::Square] = "RadarSquare.tga";
+ this->shapeMaterials_[RadarViewable::Dot] = "RadarDot.png";
+ this->shapeMaterials_[RadarViewable::Triangle] = "RadarTriangle.png";
+ this->shapeMaterials_[RadarViewable::Square] = "RadarSquare.png";
this->owner_ = 0;
}
More information about the Orxonox-commit
mailing list