[Orxonox-commit 2663] r7368 - in code/trunk: . data/overlays data/particle src/modules/overlays/hud
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Sep 6 21:34:51 CEST 2010
Author: rgrieder
Date: 2010-09-06 21:34:51 +0200 (Mon, 06 Sep 2010)
New Revision: 7368
Modified:
code/trunk/
code/trunk/data/overlays/hudtamplates_fps.oxo
code/trunk/data/overlays/hudtemplates3.oxo
code/trunk/data/overlays/underattackhud.oxo
code/trunk/data/particle/smoke1.particle
code/trunk/src/modules/overlays/hud/HUDBar.cc
code/trunk/src/modules/overlays/hud/HUDNavigation.cc
code/trunk/src/modules/overlays/hud/HUDRadar.cc
Log:
Merged png2 branch back to trunk.
Property changes on: code/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/ai:6592-7033
/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/dynamicmatch:6584-7030
/code/branches/fps:6591-7072
/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/hudelements:6584-6941
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/map:2801-3086,3089
/code/branches/menu:5941-6146,6148
/code/branches/miniprojects:2754-2824
/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/network64:2210-2355
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/overlay:2117-2385
/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/pickup2:5942-6405
/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/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
/code/branches/presentation2:6106-6416
/code/branches/presentation3:6913-7162
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/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/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound3:5941-6102
/code/branches/steering:5949-6091
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weapons:2897-3051
/code/branches/weaponsystem:2742-2890
+ /code/branches/ai:6592-7033
/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/dynamicmatch:6584-7030
/code/branches/fps:6591-7072
/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/hudelements:6584-6941
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/map:2801-3086,3089
/code/branches/menu:5941-6146,6148
/code/branches/miniprojects:2754-2824
/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/network64:2210-2355
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/overlay:2117-2385
/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/pickup2:5942-6405
/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/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
/code/branches/presentation2:6106-6416
/code/branches/presentation3:6913-7162
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/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/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound3:5941-6102
/code/branches/steering:5949-6091
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weapons:2897-3051
/code/branches/weaponsystem:2742-2890
Modified: code/trunk/data/overlays/hudtamplates_fps.oxo
===================================================================
--- code/trunk/data/overlays/hudtamplates_fps.oxo 2010-09-06 13:51:29 UTC (rev 7367)
+++ code/trunk/data/overlays/hudtamplates_fps.oxo 2010-09-06 19:34:51 UTC (rev 7368)
@@ -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/trunk/data/overlays/hudtemplates3.oxo
===================================================================
--- code/trunk/data/overlays/hudtemplates3.oxo 2010-09-06 13:51:29 UTC (rev 7367)
+++ code/trunk/data/overlays/hudtemplates3.oxo 2010-09-06 19:34:51 UTC (rev 7368)
@@ -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/trunk/data/overlays/underattackhud.oxo
===================================================================
--- code/trunk/data/overlays/underattackhud.oxo 2010-09-06 13:51:29 UTC (rev 7367)
+++ code/trunk/data/overlays/underattackhud.oxo 2010-09-06 19:34:51 UTC (rev 7368)
@@ -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/trunk/data/particle/smoke1.particle
===================================================================
--- code/trunk/data/particle/smoke1.particle 2010-09-06 13:51:29 UTC (rev 7367)
+++ code/trunk/data/particle/smoke1.particle 2010-09-06 19:34:51 UTC (rev 7368)
@@ -24,7 +24,7 @@
affector ColourImage
{
- image smokecolors.tga
+ image smokecolors.png
}
affector Rotator
Modified: code/trunk/src/modules/overlays/hud/HUDBar.cc
===================================================================
--- code/trunk/src/modules/overlays/hud/HUDBar.cc 2010-09-06 13:51:29 UTC (rev 7367)
+++ code/trunk/src/modules/overlays/hud/HUDBar.cc 2010-09-06 19:34:51 UTC (rev 7368)
@@ -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/trunk/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/trunk/src/modules/overlays/hud/HUDNavigation.cc 2010-09-06 13:51:29 UTC (rev 7367)
+++ code/trunk/src/modules/overlays/hud/HUDNavigation.cc 2010-09-06 19:34:51 UTC (rev 7368)
@@ -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/trunk/src/modules/overlays/hud/HUDRadar.cc
===================================================================
--- code/trunk/src/modules/overlays/hud/HUDRadar.cc 2010-09-06 13:51:29 UTC (rev 7367)
+++ code/trunk/src/modules/overlays/hud/HUDRadar.cc 2010-09-06 19:34:51 UTC (rev 7368)
@@ -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