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

graphics: continue to change code to store some images as Texture...

Browse Source
This commit is contained in:
ALONSO Laurent
2020-10-16 12:20:49 +02:00
committed by Celtic Minstrel
parent c31bb2d0ff
commit fcc2db7a5e
12 changed files with 63 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/scenedit/scen.core.cpp
View File

@@ -3394,7 +3394,7 @@ void edit_custom_sheets() {
std::string resName = "sheet" + std::to_string(all_pics[cur]);
fs::path toPath = pic_dir/(resName + ".png");
img->saveToFile(toPath.string().c_str());
ResMgr::graphics.free(resName);
ResMgr::textures.free(resName);
return true;
}
sheets[cur] = *img;
@@ -3413,7 +3413,7 @@ void edit_custom_sheets() {
std::string resName = "sheet" + std::to_string(all_pics[cur]);
fs::path toPath = pic_dir/(resName + ".png");
img.saveToFile(toPath.string().c_str());
ResMgr::graphics.free(resName);
ResMgr::textures.free(resName);
return true;
}
sheets[cur] = img;
@@ -3479,7 +3479,7 @@ void edit_custom_sheets() {
if(!fs::exists(from)) continue; // Just in case
fs::remove(to);
fs::rename(from, to);
ResMgr::graphics.free("sheet" + std::to_string(which_pic));
ResMgr::textures.free("sheet" + std::to_string(which_pic));
}
auto end = std::find(all_pics.begin() + cur, all_pics.end(), which_pic - 1);
if(end != all_pics.end())
@@ -3492,7 +3492,7 @@ void edit_custom_sheets() {
all_pics.erase(all_pics.begin() + cur);
spec_scen_g.numSheets = which_pic;
spec_scen_g.sheets.resize(which_pic);
ResMgr::graphics.free("sheet" + std::to_string(which_pic));
ResMgr::textures.free("sheet" + std::to_string(which_pic));
}
}
fs::path fpath = pic_dir/("sheet" + std::to_string(which_pic) + ".png");

22
src/scenedit/scen.graphics.cpp
View File

@@ -381,10 +381,10 @@ void load_graphics(){
// Preload the main editor interface graphics
ResMgr::textures.get("edbuttons");
ResMgr::textures.get("teranim");
ResMgr::graphics.get("fields");
ResMgr::textures.get("fields");
ResMgr::textures.get("objects");
ResMgr::textures.get("tinyobj");
ResMgr::graphics.get("termap");
ResMgr::textures.get("termap");
}
void redraw_screen() {
@@ -542,7 +542,7 @@ void set_up_terrain_buttons(bool reset) {
pic = pic % 50;
ter_from.offset(28 * (pic % 10), 36 * (pic / 10));
int which_sheet = scenario.ter_types[i].picture / 50;
rect_draw_some_item(*ResMgr::graphics.get("ter" + std::to_string(1 + which_sheet)),
rect_draw_some_item(*ResMgr::textures.get("ter" + std::to_string(1 + which_sheet)),
ter_from, mainPtr, draw_rect);
}
else {
@@ -754,8 +754,8 @@ void draw_terrain(){
destrec.bottom = destrec.top + BITMAP_HEIGHT;
destrec.offset(TER_RECT_UL_X,TER_RECT_UL_Y);
sf::Texture& fields_gworld = *ResMgr::graphics.get("fields");
sf::Texture& vehicle_gworld = *ResMgr::graphics.get("vehicle");
auto const & fields_gworld = *ResMgr::textures.get("fields");
auto const & vehicle_gworld = *ResMgr::textures.get("vehicle");
if(is_road(cen_x + q - 4,cen_y + r - 4))
rect_draw_some_item(fields_gworld, calc_rect(0, 2), mainPtr, destrec, sf::BlendAlpha);
@@ -1184,7 +1184,7 @@ void draw_one_tiny_terrain_spot (short i,short j,ter_num_t terrain_to_draw,short
from_rect.offset((picture_wanted / 3) * 12, (picture_wanted % 3) * 12);
rect_draw_some_item(*from_gw, from_rect, mainPtr, dest_rect);
} else {
sf::Texture& small_ter_gworld = *ResMgr::graphics.get("termap");
auto const & small_ter_gworld = *ResMgr::textures.get("termap");
if(picture_wanted >= 960) {
picture_wanted -= 960;
from_rect.offset(12 * 20, (picture_wanted - 960) * 12);
@@ -1294,7 +1294,7 @@ static void place_selected_terrain(ter_num_t ter, rectangle draw_rect) {
else {
source_rect = get_template_rect(ter);
int which_sheet = picture_wanted / 50;
sf::Texture& terrain_gworld = *ResMgr::graphics.get("ter" + std::to_string(1 + which_sheet));
auto const & terrain_gworld = *ResMgr::textures.get("ter" + std::to_string(1 + which_sheet));
rect_draw_some_item(terrain_gworld,source_rect,
mainPtr,draw_rect);
}
@@ -1495,12 +1495,12 @@ void place_location() {
rect_draw_some_item(*source_gworld,source_rect,mainPtr,draw_rect,sf::BlendAlpha);
} else if(picture_wanted < 55) {
source_rect = calc_rect(picture_wanted % 5,picture_wanted / 5);
rect_draw_some_item(*ResMgr::graphics.get("objects"),source_rect,mainPtr,draw_rect,sf::BlendAlpha);
rect_draw_some_item(*ResMgr::textures.get("objects"),source_rect,mainPtr,draw_rect,sf::BlendAlpha);
} else {
draw_rect.inset(5, 9);
rectangle tiny_from = {0,0,18,18};
tiny_from.offset((picture_wanted % 10) * 18,(picture_wanted / 10) * 18);
rect_draw_some_item(*ResMgr::graphics.get("tinyobj"),tiny_from,mainPtr,draw_rect,sf::BlendAlpha);
rect_draw_some_item(*ResMgr::textures.get("tinyobj"),tiny_from,mainPtr,draw_rect,sf::BlendAlpha);
}
} else if(overall_mode == MODE_TOGGLE_SPECIAL_DOT) {
draw_field = true;
@@ -1519,7 +1519,7 @@ void place_location() {
source_rect = calc_rect(7, 0);
} else if(overall_mode == MODE_PLACE_FIRE_BARRIER) {
source_rect = calc_rect(8, 4);
rect_draw_some_item(*ResMgr::graphics.get("teranim"),source_rect,mainPtr,draw_rect,sf::BlendAlpha);
rect_draw_some_item(*ResMgr::textures.get("teranim"),source_rect,mainPtr,draw_rect,sf::BlendAlpha);
} else if(overall_mode == MODE_PLACE_FORCE_BARRIER) {
source_rect = calc_rect(8, 4);
rect_draw_some_item(*ResMgr::textures.get("teranim"),source_rect,mainPtr,draw_rect,sf::BlendAlpha);
@@ -1534,7 +1534,7 @@ void place_location() {
source_rect = calc_rect(mode_count, 3);
}
if(draw_field) {
const sf::Texture& fields_gworld = *ResMgr::graphics.get("fields");
auto const & fields_gworld = *ResMgr::textures.get("fields");
rect_draw_some_item(fields_gworld,source_rect,mainPtr,draw_rect,sf::BlendAlpha);
}
draw_rect.offset(0,40);

2
src/scenedit/scen.main.cpp
View File

@@ -188,7 +188,7 @@ void adjust_windows (sf::RenderWindow & mainPtr, sf::View & mainView) {
mainPtr.setView(mainView);
#ifndef SFML_SYSTEM_MAC // This overrides Dock icon on OSX, which isn't what we want at all
const ImageRsrc& icon = ResMgr::graphics.get("icon", true);
auto const & icon = *ResMgr::textures.get("icon", true);
mainPtr.setIcon(icon->getSize().x, icon->getSize().y, icon->copyToImage().getPixelsPtr());
#endif
init_menubar();