From 356299d4f774c7e81c14cfd8f7fe11218dd6e64a Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 25 Sep 2012 21:21:58 +0200 Subject: [PATCH] Fixed: Don't compress textures in DXTC when used as buttons --- .../client/src/interface_v3/ctrl_button.cpp | 21 ++++++------------- .../client/src/interface_v3/view_bitmap.cpp | 3 --- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/ctrl_button.cpp b/code/ryzom/client/src/interface_v3/ctrl_button.cpp index a6fa08146..0c7dd2aa5 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_button.cpp +++ b/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); - _TextureIdNormal.setTexture(TxName.c_str()); + setTexture(toLower(TxName)); } prop = (char*) xmlGetProp( cur, (xmlChar*)"tx_pushed" ); if (prop) { string TxName = (const char *) prop; - TxName = strlwr(TxName); - _TextureIdPushed.setTexture(TxName.c_str()); + setTexturePushed(toLower(TxName)); } prop = (char*) xmlGetProp( cur, (xmlChar*)"tx_over" ); if (prop) { string TxName = (const char *) prop; - TxName = strlwr(TxName); - _TextureIdOver.setTexture(TxName.c_str()); + setTextureOver(toLower(TxName)); } // *** Misc. @@ -261,25 +258,19 @@ void CCtrlButton::updateCoords() // ---------------------------------------------------------------------------- void CCtrlButton::setTexture(const std::string&name) { -// CInterfaceManager *pIM = CInterfaceManager::getInstance(); -// CViewRenderer &rVR = pIM->getViewRenderer(); - _TextureIdNormal.setTexture(name.c_str()); + _TextureIdNormal.setTexture(name.c_str (), 0, 0, 0, 0, false); } // ---------------------------------------------------------------------------- void CCtrlButton::setTexturePushed(const std::string&name) { -// CInterfaceManager *pIM = CInterfaceManager::getInstance(); -// CViewRenderer &rVR = pIM->getViewRenderer(); - _TextureIdPushed.setTexture(name.c_str()); + _TextureIdPushed.setTexture(name.c_str (), 0, 0, 0, 0, false); } // ---------------------------------------------------------------------------- void CCtrlButton::setTextureOver(const std::string&name) { -// CInterfaceManager *pIM = CInterfaceManager::getInstance(); -// CViewRenderer &rVR = pIM->getViewRenderer(); - _TextureIdOver.setTexture(name.c_str()); + _TextureIdOver.setTexture(name.c_str (), 0, 0, 0, 0, false); } // ---------------------------------------------------------------------------- diff --git a/code/ryzom/client/src/interface_v3/view_bitmap.cpp b/code/ryzom/client/src/interface_v3/view_bitmap.cpp index 3960cb674..b71cbb464 100644 --- a/code/ryzom/client/src/interface_v3/view_bitmap.cpp +++ b/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); }