openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Integrate a new resource manager which should have better performance

Browse Source
This commit is contained in:
Celtic Minstrel
2020-01-26 11:53:19 -05:00
parent 29ef8b9c1e
commit 542c037342
47 changed files with 753 additions and 644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/pcedit/pc.graphics.cpp
View File

@@ -186,13 +186,13 @@ void init_main_buttons() {
void Set_up_win () {
// Preload the main PC editor interface images
ResMgr::get<ImageRsrc>("pcedtitle");
ResMgr::get<ImageRsrc>("icon");
ResMgr::get<ImageRsrc>("invenbtns");
ResMgr::get<ImageRsrc>("staticons");
ResMgr::get<ImageRsrc>("dlogpics");
ResMgr::get<ImageRsrc>("pcedbuttons");
ResMgr::get<ImageRsrc>("pcs");
ResMgr::graphics.get("pcedtitle");
ResMgr::graphics.get("icon");
ResMgr::graphics.get("invenbtns");
ResMgr::graphics.get("staticons");
ResMgr::graphics.get("dlogpics");
ResMgr::graphics.get("pcedbuttons");
ResMgr::graphics.get("pcs");
}
static void draw_main_screen();
@@ -228,12 +228,12 @@ void draw_main_screen() {
tileImage(mainPtr,whole_win_rect,bg[12]); // fill whole window with background texture
sf::Texture& icon_gworld = *ResMgr::get<ImageRsrc>("icon");
sf::Texture& icon_gworld = *ResMgr::graphics.get("icon");
dest_rec = source_rect = rectangle(icon_gworld);
dest_rec.offset(23, 16);
rect_draw_some_item(icon_gworld,source_rect,mainPtr,dest_rec);
sf::Texture& title_gworld = *ResMgr::get<ImageRsrc>("pcedtitle");
sf::Texture& title_gworld = *ResMgr::graphics.get("pcedtitle");
dest_rec = source_rect = rectangle(title_gworld);
dest_rec.offset(66, 0);
rect_draw_some_item(title_gworld,source_rect,mainPtr,dest_rec,sf::BlendAlpha);
@@ -331,7 +331,7 @@ void draw_items() {
frame_dlog_rect(mainPtr,name_rect); // draw the frame
return; // If PC is dead, it has no items
}
sf::Texture& invenbtn_gworld = *ResMgr::get<ImageRsrc>("invenbtns");
sf::Texture& invenbtn_gworld = *ResMgr::graphics.get("invenbtns");
for(short i = 0; i < univ.party[current_active_pc].items.size(); i++) // Loop through items and draw each
if(univ.party[current_active_pc].items[i].variety != eItemType::NO_ITEM) { // i.e. does item exist
std::string to_draw = std::to_string(i + 1) + ". ";
@@ -373,7 +373,7 @@ void display_party() {
win_draw_string(mainPtr,no_party_rect,"No party loaded.",eTextMode::WRAP,style);
}
else {
sf::Texture& buttons_gworld = *ResMgr::get<ImageRsrc>("pcedbuttons");
sf::Texture& buttons_gworld = *ResMgr::graphics.get("pcedbuttons");
from_rect = pc_info_rect;
from_rect.top = from_rect.bottom - 11;
if(!party_in_scen)
@@ -392,7 +392,7 @@ void display_party() {
if(univ.party[i].main_status != eMainStatus::ABSENT) { // PC exists?
// draw PC graphic
pic_num_t pic = univ.party[i].which_graphic;
sf::Texture* from_gw;
const sf::Texture* from_gw;
if(pic >= 1000) {
bool isParty = pic >= 10000;
pic_num_t need_pic = pic % 1000;
@@ -404,10 +404,10 @@ void display_party() {
pic_num_t picture_wanted = m_pic_index[need_pic].i % 20;
from_rect = calc_rect(2 * (picture_wanted / 10), picture_wanted % 10);
int which_sheet = m_pic_index[need_pic].i / 20;
from_gw = ResMgr::get<ImageRsrc>("monst" + std::to_string(1 + which_sheet)).get();
from_gw = &ResMgr::graphics.get("monst" + std::to_string(1 + which_sheet));
} else {
from_rect = calc_rect(2 * (pic / 8), pic % 8);
from_gw = ResMgr::get<ImageRsrc>("pcs").get();
from_gw = &ResMgr::graphics.get("pcs");
}
rect_draw_some_item(*from_gw,from_rect,mainPtr,pc_area_buttons[i][1],sf::BlendAlpha);

4
src/pcedit/pc.main.cpp
View File

@@ -115,8 +115,8 @@ void Initialize(void) {
int height = 440 + getMenubarHeight();
mainPtr.create(sf::VideoMode(590, height), "Blades of Exile Character Editor", sf::Style::Titlebar | sf::Style::Close);
#ifndef __APPLE__ // This overrides Dock icon on OSX, which isn't what we want at all
ImageRsrc& icon = *ResMgr::get<ImageRsrc>("icon");
mainPtr.setIcon(icon.getSize().x, icon.getSize().y, icon.copyToImage().getPixelsPtr());
const ImageRsrc& icon = ResMgr::graphics.get("icon");
mainPtr.setIcon(icon->getSize().x, icon->getSize().y, icon->copyToImage().getPixelsPtr());
#endif
init_menubar();
}