Mercurial > mm7
diff GUI/GUIProgressBar.cpp @ 2575:a76d408c5132 tip
DrawTranslucent -> DrawTextureGrayShade
Removed old texture drawing stuff
author | a.parshin |
---|---|
date | Wed, 09 Mar 2016 01:39:52 +0200 |
parents | 0c67be4ec900 |
children |
line wrap: on
line diff
--- a/GUI/GUIProgressBar.cpp Mon Mar 07 03:48:40 2016 +0200 +++ b/GUI/GUIProgressBar.cpp Wed Mar 09 01:39:52 2016 +0200 @@ -85,16 +85,21 @@ uWidth = 449; uHeight = 56; uProgressMax = 26; - pIcons_LOD->_410522(&pLoadingProgress, "loadprog", 2u); + + //pIcons_LOD->PlacementLoadTexture(&pLoadingProgress, "loadprog", 2u); + progressbar_loading = assets->GetImage_16BitColorKey("loadprog", 0x7FF); Draw(); return true; } switch (pParty->alignment) { - case PartyAlignment_Good: pIcons_LOD->_410522(&pBardata, "bardata-b", 2); break; - case PartyAlignment_Neutral: pIcons_LOD->_410522(&pBardata, "bardata", 2); break; - case PartyAlignment_Evil: pIcons_LOD->_410522(&pBardata, "bardata-c", 2); break; + case PartyAlignment_Good: progressbar_dungeon = assets->GetImage_16BitColorKey("bardata-b", 0x7FF); break; + case PartyAlignment_Neutral: progressbar_dungeon = assets->GetImage_16BitColorKey("bardata", 0x7FF); break; + case PartyAlignment_Evil: progressbar_dungeon = assets->GetImage_16BitColorKey("bardata-c", 0x7FF); break; + //case PartyAlignment_Good: pIcons_LOD->PlacementLoadTexture(&pBardata, "bardata-b", 2); break; + //case PartyAlignment_Neutral: pIcons_LOD->PlacementLoadTexture(&pBardata, "bardata", 2); break; + //case PartyAlignment_Evil: pIcons_LOD->PlacementLoadTexture(&pBardata, "bardata-c", 2); break; default: Error("Invalid alignment type: %u", pParty->alignment); } @@ -139,21 +144,33 @@ this->uProgressCurrent = this->uProgressMax - 1; Progress(); } - v3 = (int)&this->pLoadingProgress.paletted_pixels; - free(this->pLoadingProgress.paletted_pixels); - free(this->pLoadingProgress.pPalette16); - this->pLoadingProgress.pPalette16 = 0; + + if (progressbar_loading) + { + progressbar_loading->Release(); + progressbar_loading = nullptr; + } + //v3 = (int)&this->pLoadingProgress.paletted_pixels; + //free(this->pLoadingProgress.paletted_pixels); + //free(this->pLoadingProgress.pPalette16); + //this->pLoadingProgress.pPalette16 = 0; + //*(int *)v3 = 0; } else { - if ( !this->pBardata.paletted_pixels) - return; - free(this->pBardata.paletted_pixels); - v3 = (int)&this->pBardata.pPalette16; - free(this->pBardata.pPalette16); - this->pBardata.paletted_pixels = 0; + //if ( !this->pBardata.paletted_pixels) + // return; + //free(this->pBardata.paletted_pixels); + //v3 = (int)&this->pBardata.pPalette16; + //free(this->pBardata.pPalette16); + //this->pBardata.paletted_pixels = 0; + //*(int *)v3 = 0; + if (progressbar_dungeon) + { + progressbar_dungeon->Release(); + progressbar_dungeon = nullptr; + } } - *(int *)v3 = 0; } //----- (00443670) -------------------------------------------------------- @@ -162,12 +179,12 @@ pRenderer->BeginScene(); if (uType != TYPE_Fullscreen) { - if (pBardata.paletted_pixels) + //if (pBardata.paletted_pixels) { pRenderer->Sub01(); - pRenderer->DrawTextureTransparentColorKey(80, 122, &pBardata);//прогрессбар для данжей - pRenderer->DrawTextureIndexedAlpha(100, 146, &pIcons_LOD->pTextures[pIconsFrameTable->GetFrame(uIconID_TurnHour, 0)->uTextureID]); + pRenderer->DrawTextureAlphaNew(80/640.0f, 122/480.0f, progressbar_dungeon); + pRenderer->DrawTextureAlphaNew(100/640.0f, 146/480.0f, pIconsFrameTable->GetFrame(uIconID_TurnHour, 0)->texture); //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), @@ -187,11 +204,10 @@ } else { - pRenderer->DrawTextureNew(0, 0, loading_bg); //pRenderer->SetRasterClipRect(0, 0, 639, 479); pRenderer->SetUIClipRect(172, 459, 15 * (signed int)(signed __int64)((double)(300 * uProgressCurrent) / (double)uProgressMax) / 15 + 172, 471); - pRenderer->DrawTextureIndexedAlpha(172, 459, &pLoadingProgress); + pRenderer->DrawTextureAlphaNew(172/640.0f, 459/480.0f, progressbar_loading); pRenderer->ResetUIClipRect(); pRenderer->EndScene(); pRenderer->Present();