diff GUI/UI/Books/JournalBook.cpp @ 2574:dd36326a9994

More texture refactoring GetLeather -> DrawTextureCustomHeight
author a.parshin
date Mon, 07 Mar 2016 03:48:40 +0200
parents 0c67be4ec900
children
line wrap: on
line diff
--- a/GUI/UI/Books/JournalBook.cpp	Sat Mar 05 16:25:53 2016 +0200
+++ b/GUI/UI/Books/JournalBook.cpp	Mon Mar 07 03:48:40 2016 +0200
@@ -1,4 +1,5 @@
 #include "Engine/Engine.h"
+#include "Engine/AssetsManager.h"
 #include "Engine/LOD.h"
 #include "Engine/Party.h"
 #include "Engine/Timer.h"
@@ -14,6 +15,8 @@
 #include "Media/Audio/AudioPlayer.h"
 
 
+Image *ui_book_journal_background = nullptr;
+
 
 GUIWindow_JournalBook::GUIWindow_JournalBook() :
     GUIWindow_Book()
@@ -35,18 +38,19 @@
     unsigned int page_count; // esi@12
     GUIWindow journal_window; // [sp+18h] [bp-54h]@8
 
-    pSpellBookPagesTextr_11 = pIcons_LOD->LoadTexturePtr("sbplayrnot", TEXTURE_16BIT_PALETTE);
-    pTex_book_button1_on = pIcons_LOD->LoadTexturePtr("tab-an-6b", TEXTURE_16BIT_PALETTE);
-    pTex_book_button2_on = pIcons_LOD->LoadTexturePtr("tab-an-7b", TEXTURE_16BIT_PALETTE);
-    pTex_book_button1_off = pIcons_LOD->LoadTexturePtr("tab-an-6a", TEXTURE_16BIT_PALETTE);
-    pTex_book_button2_off = pIcons_LOD->LoadTexturePtr("tab-an-7a", TEXTURE_16BIT_PALETTE);
+    ui_book_journal_background = assets->GetImage_16BitColorKey(L"sbplayrnot", 0x7FF);
+
+    ui_book_button1_on = assets->GetImage_16BitAlpha(L"tab-an-6b");
+    ui_book_button2_on = assets->GetImage_16BitAlpha(L"tab-an-7b");
+    ui_book_button1_off = assets->GetImage_16BitAlpha(L"tab-an-6a");
+    ui_book_button2_off = assets->GetImage_16BitAlpha(L"tab-an-7a");
 
     pBtn_Book_1 = this->CreateButton(pViewport->uViewportTL_X + 398, pViewport->uViewportTL_Y + 1,
-        pTex_book_button1_on->uTextureWidth, pTex_book_button1_on->uTextureHeight, 1, 0,
-        UIMSG_ClickBooksBtn, 11, 0, pGlobalTXT_LocalizationStrings[192], pTex_book_button1_on, 0);
-    pBtn_Book_2 = this->CreateButton(pViewport->uViewportTL_X + 398, pViewport->uViewportTL_Y + 38, pTex_book_button2_on->uTextureHeight,
-        pTex_book_button2_on->uTextureHeight, 1, 0, UIMSG_ClickBooksBtn, 10, 0,
-        pGlobalTXT_LocalizationStrings[193], pTex_book_button2_on, 0);
+        ui_book_button1_on->GetWidth(), ui_book_button1_on->GetHeight(), 1, 0,
+        UIMSG_ClickBooksBtn, 11, 0, pGlobalTXT_LocalizationStrings[192], ui_book_button1_on, 0);
+    pBtn_Book_2 = this->CreateButton(pViewport->uViewportTL_X + 398, pViewport->uViewportTL_Y + 38,
+        ui_book_button2_on->GetWidth(), ui_book_button2_on->GetHeight(), 1, 0, UIMSG_ClickBooksBtn, 10, 0,
+        pGlobalTXT_LocalizationStrings[193], ui_book_button2_on, 0);
 
     num_achieved_awards = 0;
     journal_window.uFrameX = 48;
@@ -103,16 +107,16 @@
     char* pStringOnPage; // eax@22
     GUIWindow journal_window; // [sp+8h] [bp-54h]@10
 
-    pRenderer->DrawTextureTransparentColorKey(pViewport->uViewportTL_X, pViewport->uViewportTL_Y, pSpellBookPagesTextr_11);
+    pRenderer->DrawTextureAlphaNew(pViewport->uViewportTL_X/640.0f, pViewport->uViewportTL_Y/480.0f, ui_book_journal_background);
     if (BtnUp_flag || !books_primary_item_per_page)
-        pRenderer->DrawTextureIndexedAlpha(pViewport->uViewportTL_X + 407, pViewport->uViewportTL_Y + 2, pTex_book_button1_off);
+        pRenderer->DrawTextureAlphaNew((pViewport->uViewportTL_X + 407)/640.0f, (pViewport->uViewportTL_Y + 2)/480.0f, ui_book_button1_off);
     else
-        pRenderer->DrawTextureIndexedAlpha(pViewport->uViewportTL_X + 398, pViewport->uViewportTL_Y + 1, pTex_book_button1_on);
+        pRenderer->DrawTextureAlphaNew((pViewport->uViewportTL_X + 398)/640.0f, (pViewport->uViewportTL_Y + 1)/480.0f, ui_book_button1_on);
 
     if (BtnDown_flag || books_primary_item_per_page + num_achieved_awards >= full_num_items_in_book)
-        pRenderer->DrawTextureIndexedAlpha(pViewport->uViewportTL_X + 407, pViewport->uViewportTL_Y + 38, pTex_book_button2_off);
+        pRenderer->DrawTextureAlphaNew((pViewport->uViewportTL_X + 407)/640.0f, (pViewport->uViewportTL_Y + 38)/480.0f, ui_book_button2_off);
     else
-        pRenderer->DrawTextureIndexedAlpha(pViewport->uViewportTL_X + 398, pViewport->uViewportTL_Y + 38, pTex_book_button2_on);
+        pRenderer->DrawTextureAlphaNew((pViewport->uViewportTL_X + 398)/640.0f, (pViewport->uViewportTL_Y + 38)/480.0f, ui_book_button2_on);
 
     if (!Journal_limitation_factor[books_primary_item_per_page])//for title
     {