Changeset 7368 for code/trunk

Timestamp:

Sep 6, 2010, 9:34:51 PM (14 years ago)

Author:

rgrieder

Message:

Merged png2 branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/overlays/hudtamplates_fps.oxo (modified) (1 diff)
• data/overlays/hudtemplates3.oxo (modified) (1 diff)
• data/overlays/underattackhud.oxo (modified) (1 diff)
• data/particle/smoke1.particle (modified) (1 diff)
• src/modules/overlays/hud/HUDBar.cc (modified) (1 diff)
• src/modules/overlays/hud/HUDNavigation.cc (modified) (3 diffs)
• src/modules/overlays/hud/HUDRadar.cc (modified) (1 diff)

code/trunk/data/overlays/hudtamplates_fps.oxo

@@ -14 +14 @@
      position          = "0.0 , 0.95 "
      pickpoint         = "0, 1"
-     bartexture        = "healthbar_bar.tga"
+     bartexture        = "healthbar_bar.png"
      textfont          = "VeraMono"
      textusebarcolour  = true

code/trunk/data/overlays/hudtemplates3.oxo

@@ -37 +37 @@
      position          = "0.0 , 0.95 "
      pickpoint         = "0, 1"
-     bartexture        = "healthbar_bar.tga"
+     bartexture        = "healthbar_bar.png"
      textfont          = "VeraMono"
      textusebarcolour  = true

code/trunk/data/overlays/underattackhud.oxo

@@ -7 +7 @@
      position             = "0.99 , 0.01"
      pickpoint            = "1, 0"
-     bartexture           = "healthbar_bar.tga"
+     bartexture           = "healthbar_bar.png"
      textfont             = "VeraMono"
      textusebarcolour     = true

code/trunk/data/particle/smoke1.particle

@@ -25 +25 @@
         affector ColourImage
         {
-                image           smokecolors.tga
+                image           smokecolors.png
         }
 

code/trunk/src/modules/overlays/hud/HUDBar.cc

@@ -76 +76 @@
         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

code/trunk/src/modules/overlays/hud/HUDNavigation.cc

@@ -200 +200 @@
                 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;
                 }
@@ -258 +258 @@
                 {
                   //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;
                 }
@@ -328 +328 @@
                                        .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() );

code/trunk/src/modules/overlays/hud/HUDRadar.cc

@@ -62 +62 @@
         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;