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

allow importing animated terrain icon

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-08-24 18:40:33 -05:00
parent b93daefb5d
commit ca16fb634d
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rsrc/dialogs/graphic-sheets.xml
View File

@@ -33,6 +33,7 @@
<text name='icon-max' relative='pos pos-in' rel-anchor='prev' top='0' left='0' width='30' framed='true'>0</text>
<button name='icon-terr' type='tiny' text-size='9' relative='pos-in pos' anchor='icon-min' top='2' left='0'>Import Terrain</button>
<button name='icon-terr-anim' type='tiny' text-size='9' relative='pos-in pos' rel-anchor='prev' top='2' left='0'>Import Animated Terrain</button>
<button name='strip-terr' type='tiny' text-size='9' relative='pos-in pos' rel-anchor='prev' top='2' left='0'>Strip Terrain Background</button>
<field name='diff-threshold' relative='pos-in pos' rel-anchor='prev' top='2' left='0' width='40' height='12' type='uint'>0</field>
<button name='add-terr' type='tiny' text-size='9' relative='pos-in pos' rel-anchor='prev' top='2' left='0'>Add Terrain Background</button>

2
src/dialogxml/widgets/pict.hpp
View File

@@ -86,7 +86,7 @@ public:
}
cPict& operator=(cPict& other) = delete;
cPict(cPict& other) = delete;
inline static void resetAnim() { animFrame = 0; }
inline static void resetAnim(int frame = 0) { animFrame = frame; }
void setAnimLoops(short value);
private:
static std::shared_ptr<const sf::Texture> getSheetInternal(eSheetType type, size_t n);

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

@@ -3736,7 +3736,7 @@ private:
int icon_min = 0;
int icon_max = 0;
// Buttons for working with icons
std::vector<std::string> icon_buttons = {"icon-terr", "strip-terr", "add-terr"};
std::vector<std::string> icon_buttons = {"icon-terr", "icon-terr-anim", "strip-terr", "add-terr"};
// Keep a single RenderTexture for splicing together custom graphics on a sheet
static sf::RenderTexture& canvas() {
@@ -4116,6 +4116,25 @@ private:
return replace_from_image("Import Terrain Icon", img);
}
bool import_teranim_icon() {
int sheet_start = 1000 + 100 * all_pics[cur];
set_up_canvas(all_pics[cur]);
pic_num_t icon = choose_graphic(0, PIC_TER_ANIM, &dlg);
for(int i = 0; i < 4; ++i){
int sheet_icon = icon_min + i - sheet_start;
int x = sheet_icon % 10;
int y = sheet_icon / 10;
rectangle dest {y * 36, x * 28, y * 36 + 36, x * 28 + 28};
// Force a specific frame to draw
cPict::resetAnim(i);
cPict::drawAt(mainPtr(),canvas(),dest,icon,PIC_TER_ANIM,false);
}
cPict::resetAnim();
canvas().display();
sf::Image img = canvas().getTexture().copyToImage();
return replace_from_image("Import Animated Terrain Icon", img);
}
bool strip_ter_floor() {
int sheet_start = 1000 + 100 * all_pics[cur];
static sf::BlendMode blend_replace(sf::BlendMode::Factor::One, sf::BlendMode::Factor::Zero, sf::BlendMode::Equation::Add);
@@ -4285,6 +4304,7 @@ public:
dlg["sheet"].attachClickHandler(std::bind(&cCustomGraphicsDialog::click_on_sheet, this));
dlg["icon-terr"].attachClickHandler(std::bind(&cCustomGraphicsDialog::import_ter_icon,this));
dlg["icon-terr-anim"].attachClickHandler(std::bind(&cCustomGraphicsDialog::import_teranim_icon,this));
dlg["strip-terr"].attachClickHandler(std::bind(&cCustomGraphicsDialog::strip_ter_floor,this));
dlg["add-terr"].attachClickHandler(std::bind(&cCustomGraphicsDialog::add_ter_floor,this));