Mercurial > mm7

diff GUI/GUIProgressBar.cpp @ 2524:c7264ab7132f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Main menu rendered using d3d11
author a.parshin
date Fri, 10 Oct 2014 17:42:05 +0300
parents a77c34acdbc9
children 4cc81f981afb
line wrap: on
line diff
--- a/GUI/GUIProgressBar.cpp	Thu Oct 09 23:33:36 2014 +0300
+++ b/GUI/GUIProgressBar.cpp	Fri Oct 10 17:42:05 2014 +0300
@@ -157,7 +157,7 @@
       pRenderer->Sub01();
 
       pRenderer->DrawTextureIndexed(80, 122, &pBardata);//прогрессбар для данжей
-      pRenderer->DrawTextureTransparent(100, 146, &pIcons_LOD->pTextures[pIconsFrameTable->GetFrame(uIconID_TurnHour, 0)->uTextureID]);
+      pRenderer->DrawTextureIndexedAlpha(100, 146, &pIcons_LOD->pTextures[pIconsFrameTable->GetFrame(uIconID_TurnHour, 0)->uTextureID]);
       //pRenderer->FillRectFast(174, 164, floorf(((double)(113 * uProgressCurrent) / (double)uProgressMax) + 0.5f),//COERCE_UNSIGNED_INT64(v4 + 6.7553994e15),
         //16, pRenderer->uTargetRMask);
       pRenderer->FillRectFast(174, 164, floorf(((double)(113 * uProgressCurrent) / (double)uProgressMax) + 0.5f),//COERCE_UNSIGNED_INT64(v4 + 6.7553994e15),
@@ -178,9 +178,9 @@
 
   pRenderer->DrawTextureRGB(0, 0, &pLoadingBg);
   pRenderer->SetRasterClipRect(0, 0, 639, 479);
-  pRenderer->SetTextureClipRect(172, 459, 15 * (signed int)(signed __int64)((double)(300 * uProgressCurrent) / (double)uProgressMax) / 15 + 172, 471);
-  pRenderer->DrawTextureTransparent(172, 459, &pLoadingProgress);
-  pRenderer->ResetTextureClipRect();
+  pRenderer->SetUIClipRect(172, 459, 15 * (signed int)(signed __int64)((double)(300 * uProgressCurrent) / (double)uProgressMax) / 15 + 172, 471);
+  pRenderer->DrawTextureIndexedAlpha(172, 459, &pLoadingProgress);
+  pRenderer->ResetUIClipRect();
   pRenderer->EndScene();
   pRenderer->Present();
 }
\ No newline at end of file