Fixed: Don't compress textures in DXTC when used as buttons

code/ryzom/client/src/interface_v3/ctrl_button.cpp

@@ -50,24 +50,21 @@ bool CCtrlButton::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
 	if (prop)
 	{
 		string TxName = (const char *) prop;
-		TxName = strlwr(TxName);
+		setTexture(toLower(TxName));
-		_TextureIdNormal.setTexture(TxName.c_str());
 	}
 
 	prop = (char*) xmlGetProp( cur, (xmlChar*)"tx_pushed" );
 	if (prop)
 	{
 		string TxName = (const char *) prop;
-		TxName = strlwr(TxName);
+		setTexturePushed(toLower(TxName));
-		_TextureIdPushed.setTexture(TxName.c_str());
 	}
 
 	prop = (char*) xmlGetProp( cur, (xmlChar*)"tx_over" );
 	if (prop)
 	{
 		string TxName = (const char *) prop;
-		TxName = strlwr(TxName);
+		setTextureOver(toLower(TxName));
-		_TextureIdOver.setTexture(TxName.c_str());
 	}
 
 	// *** Misc.
@@ -261,25 +258,19 @@ void CCtrlButton::updateCoords()
 // ----------------------------------------------------------------------------
 void CCtrlButton::setTexture(const std::string&name)
 {
-//	CInterfaceManager *pIM = CInterfaceManager::getInstance();
+	_TextureIdNormal.setTexture(name.c_str (), 0, 0, 0, 0, false);
-//	CViewRenderer &rVR = pIM->getViewRenderer();
-	_TextureIdNormal.setTexture(name.c_str());
 }
 
 // ----------------------------------------------------------------------------
 void CCtrlButton::setTexturePushed(const std::string&name)
 {
-//	CInterfaceManager *pIM = CInterfaceManager::getInstance();
+	_TextureIdPushed.setTexture(name.c_str (), 0, 0, 0, 0, false);
-//	CViewRenderer &rVR = pIM->getViewRenderer();
-	_TextureIdPushed.setTexture(name.c_str());
 }
 
 // ----------------------------------------------------------------------------
 void CCtrlButton::setTextureOver(const std::string&name)
 {
-//	CInterfaceManager *pIM = CInterfaceManager::getInstance();
+	_TextureIdOver.setTexture(name.c_str (), 0, 0, 0, 0, false);
-//	CViewRenderer &rVR = pIM->getViewRenderer();
-	_TextureIdOver.setTexture(name.c_str());
 }
 
 // ----------------------------------------------------------------------------

code/ryzom/client/src/interface_v3/view_bitmap.cpp

@@ -221,9 +221,6 @@ void CViewBitmap::updateCoords()
 // ----------------------------------------------------------------------------
 void CViewBitmap::setTexture(const std::string & TxName)
 {
-//	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-//	CViewRenderer &rVR = pIM->getViewRenderer();
-
 	_TextureId.setTexture (TxName.c_str (), _TxtOffsetX, _TxtOffsetY, _TxtWidth, _TxtHeight, false);
 }