|
|
|
|
@ -13,8 +13,8 @@
|
|
|
|
|
#include "df/enabler.h"
|
|
|
|
|
#include "df/viewscreen_adopt_regionst.h"
|
|
|
|
|
#include "df/viewscreen_loadgamest.h"
|
|
|
|
|
#include "df/viewscreen_new_regionst.h"
|
|
|
|
|
#include "df/viewscreen_new_arenast.h"
|
|
|
|
|
#include "df/viewscreen_new_regionst.h"
|
|
|
|
|
|
|
|
|
|
using df::global::enabler;
|
|
|
|
|
using namespace DFHack;
|
|
|
|
|
@ -24,22 +24,6 @@ namespace DFHack {
|
|
|
|
|
DBG_DECLARE(core, textures, DebugCategory::LINFO);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool g_loaded = false;
|
|
|
|
|
static long g_num_dfhack_textures = 0;
|
|
|
|
|
static long g_dfhack_logo_texpos_start = -1;
|
|
|
|
|
static long g_green_pin_texpos_start = -1;
|
|
|
|
|
static long g_red_pin_texpos_start = -1;
|
|
|
|
|
static long g_icons_texpos_start = -1;
|
|
|
|
|
static long g_on_off_texpos_start = -1;
|
|
|
|
|
static long g_pathable_texpos_start = -1;
|
|
|
|
|
static long g_unsuspend_texpos_start = -1;
|
|
|
|
|
static long g_control_panel_texpos_start = -1;
|
|
|
|
|
static long g_thin_borders_texpos_start = -1;
|
|
|
|
|
static long g_medium_borders_texpos_start = -1;
|
|
|
|
|
static long g_bold_borders_texpos_start = -1;
|
|
|
|
|
static long g_panel_borders_texpos_start = -1;
|
|
|
|
|
static long g_window_borders_texpos_start = -1;
|
|
|
|
|
|
|
|
|
|
static std::unordered_map<TexposHandle, long> g_handle_to_texpos;
|
|
|
|
|
static std::unordered_map<TexposHandle, SDL_Surface*> g_handle_to_surface;
|
|
|
|
|
static std::mutex g_adding_mutex;
|
|
|
|
|
@ -47,6 +31,16 @@ static std::mutex g_adding_mutex;
|
|
|
|
|
const uint32_t TILE_WIDTH_PX = 8;
|
|
|
|
|
const uint32_t TILE_HEIGHT_PX = 12;
|
|
|
|
|
|
|
|
|
|
static std::vector<TexposHandle> empty{};
|
|
|
|
|
static std::unordered_map<std::string, std::vector<TexposHandle>> g_static_assets{
|
|
|
|
|
{"hack/data/art/dfhack.png", empty}, {"hack/data/art/green-pin.png", empty},
|
|
|
|
|
{"hack/data/art/red-pin.png", empty}, {"hack/data/art/icons.png", empty},
|
|
|
|
|
{"hack/data/art/on-off.png", empty}, {"hack/data/art/pathable.png", empty},
|
|
|
|
|
{"hack/data/art/unsuspend.png", empty}, {"hack/data/art/control-panel.png", empty},
|
|
|
|
|
{"hack/data/art/border-thin.png", empty}, {"hack/data/art/border-medium.png", empty},
|
|
|
|
|
{"hack/data/art/border-bold.png", empty}, {"hack/data/art/border-panel.png", empty},
|
|
|
|
|
{"hack/data/art/border-window.png", empty}};
|
|
|
|
|
|
|
|
|
|
// Converts an arbitrary Surface to something like the display format
|
|
|
|
|
// (32-bit RGBA), and converts magenta to transparency if convert_magenta is set
|
|
|
|
|
// and the source surface didn't already have an alpha channel.
|
|
|
|
|
@ -61,9 +55,15 @@ SDL_Surface* canonicalize_format(SDL_Surface* src) {
|
|
|
|
|
fmt.BytesPerPixel = 4;
|
|
|
|
|
fmt.Rloss = fmt.Gloss = fmt.Bloss = fmt.Aloss = 0;
|
|
|
|
|
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
|
|
|
|
|
fmt.Rshift = 24; fmt.Gshift = 16; fmt.Bshift = 8; fmt.Ashift = 0;
|
|
|
|
|
fmt.Rshift = 24;
|
|
|
|
|
fmt.Gshift = 16;
|
|
|
|
|
fmt.Bshift = 8;
|
|
|
|
|
fmt.Ashift = 0;
|
|
|
|
|
#else
|
|
|
|
|
fmt.Rshift = 0; fmt.Gshift = 8; fmt.Bshift = 16; fmt.Ashift = 24;
|
|
|
|
|
fmt.Rshift = 0;
|
|
|
|
|
fmt.Gshift = 8;
|
|
|
|
|
fmt.Bshift = 16;
|
|
|
|
|
fmt.Ashift = 24;
|
|
|
|
|
#endif
|
|
|
|
|
fmt.Rmask = 255 << fmt.Rshift;
|
|
|
|
|
fmt.Gmask = 255 << fmt.Gshift;
|
|
|
|
|
@ -97,7 +97,7 @@ TexposHandle Textures::loadTexture(SDL_Surface* surface) {
|
|
|
|
|
if (!surface)
|
|
|
|
|
return 0; // should be some error, i guess
|
|
|
|
|
|
|
|
|
|
auto handle = reinterpret_cast<TexposHandle>(surface);
|
|
|
|
|
auto handle = reinterpret_cast<TexposHandle>(surface); // not the best way? but cheap
|
|
|
|
|
g_handle_to_surface.emplace(handle, surface);
|
|
|
|
|
surface->refcount++; // prevent destruct on next FreeSurface by game
|
|
|
|
|
auto texpos = add_texture(surface);
|
|
|
|
|
@ -121,8 +121,8 @@ std::vector<TexposHandle> Textures::loadTileset(const std::string& file,
|
|
|
|
|
int dimy = surface->h / tile_px_h;
|
|
|
|
|
for (int y = 0; y < dimy; y++) {
|
|
|
|
|
for (int x = 0; x < dimx; x++) {
|
|
|
|
|
SDL_Surface* tile = DFSDL_CreateRGBSurface(0, tile_px_w, tile_px_h, 32,
|
|
|
|
|
surface->format->Rmask, surface->format->Gmask,
|
|
|
|
|
SDL_Surface* tile = DFSDL_CreateRGBSurface(
|
|
|
|
|
0, tile_px_w, tile_px_h, 32, surface->format->Rmask, surface->format->Gmask,
|
|
|
|
|
surface->format->Bmask, surface->format->Amask);
|
|
|
|
|
SDL_Rect vp{tile_px_w * x, tile_px_h * y, tile_px_w, tile_px_h};
|
|
|
|
|
DFSDL_UpperBlit(surface, &vp, tile, NULL);
|
|
|
|
|
@ -154,6 +154,14 @@ long Textures::getTexposByHandle(TexposHandle handle) {
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long Textures::getAsset(const std::string asset, size_t index) {
|
|
|
|
|
if (!g_static_assets.contains(asset))
|
|
|
|
|
return -1;
|
|
|
|
|
if (g_static_assets[asset].size() <= index)
|
|
|
|
|
return -1;
|
|
|
|
|
return Textures::getTexposByHandle(g_static_assets[asset][index]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void reset_texpos() {
|
|
|
|
|
g_handle_to_texpos.clear();
|
|
|
|
|
}
|
|
|
|
|
@ -190,7 +198,7 @@ struct tracking_stage_adopt_region : df::viewscreen_adopt_regionst {
|
|
|
|
|
DEFINE_VMETHOD_INTERPOSE(void, logic, ()) {
|
|
|
|
|
if (this->m_cur_step != this->cur_step) {
|
|
|
|
|
this->m_cur_step = this->cur_step;
|
|
|
|
|
if (this->m_cur_step == df::viewscreen_adopt_regionst::T_cur_step::ProcessingRawData)
|
|
|
|
|
if (this->m_cur_step == 2)
|
|
|
|
|
reset_texpos();
|
|
|
|
|
}
|
|
|
|
|
INTERPOSE_NEXT(logic)();
|
|
|
|
|
@ -208,7 +216,7 @@ struct tracking_stage_load_region : df::viewscreen_loadgamest {
|
|
|
|
|
DEFINE_VMETHOD_INTERPOSE(void, logic, ()) {
|
|
|
|
|
if (this->m_cur_step != this->cur_step) {
|
|
|
|
|
this->m_cur_step = this->cur_step;
|
|
|
|
|
if (this->m_cur_step == df::viewscreen_loadgamest::T_cur_step::ProcessingRawData)
|
|
|
|
|
if (this->m_cur_step == 1)
|
|
|
|
|
reset_texpos();
|
|
|
|
|
}
|
|
|
|
|
INTERPOSE_NEXT(logic)();
|
|
|
|
|
@ -251,180 +259,19 @@ static void uninstall_reset_point() {
|
|
|
|
|
INTERPOSE_HOOK(tracking_stage_new_arena, logic).remove();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static size_t load_tiles_from_image(color_ostream& out, const char* fname,
|
|
|
|
|
long* texpos_start,
|
|
|
|
|
int tile_w = TILE_WIDTH_PX,
|
|
|
|
|
int tile_h = TILE_HEIGHT_PX) {
|
|
|
|
|
SDL_Surface* s = DFIMG_Load(fname);
|
|
|
|
|
if (!s) {
|
|
|
|
|
out.printerr("unable to load textures from '%s'\n", fname);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s = canonicalize_format(s);
|
|
|
|
|
int dimx = s->w / tile_w;
|
|
|
|
|
int dimy = s->h / tile_h;
|
|
|
|
|
long count = 0;
|
|
|
|
|
for (int y = 0; y < dimy; y++) {
|
|
|
|
|
for (int x = 0; x < dimx; x++) {
|
|
|
|
|
SDL_Surface* tile = DFSDL_CreateRGBSurface(0, // SDL_SWSURFACE
|
|
|
|
|
tile_w, tile_h, 32,
|
|
|
|
|
s->format->Rmask, s->format->Gmask, s->format->Bmask,
|
|
|
|
|
s->format->Amask);
|
|
|
|
|
SDL_Rect vp;
|
|
|
|
|
vp.x = tile_w * x;
|
|
|
|
|
vp.y = tile_h * y;
|
|
|
|
|
vp.w = tile_w;
|
|
|
|
|
vp.h = tile_h;
|
|
|
|
|
DFSDL_UpperBlit(s, &vp, tile, NULL);
|
|
|
|
|
if (!count++)
|
|
|
|
|
*texpos_start = enabler->textures.raws.size();
|
|
|
|
|
enabler->textures.raws.push_back(tile);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
DFSDL_FreeSurface(s);
|
|
|
|
|
|
|
|
|
|
DEBUG(textures,out).print("loaded %ld textures from '%s'\n", count, fname);
|
|
|
|
|
return count;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Textures::initDynamic(color_ostream& out) {
|
|
|
|
|
void Textures::init(color_ostream& out) {
|
|
|
|
|
install_reset_point();
|
|
|
|
|
DEBUG(textures, out).print("dynamic texture reset points installed");
|
|
|
|
|
DEBUG(textures, out).print("dynamic texture loading ready");
|
|
|
|
|
|
|
|
|
|
for (auto& [key, value] : g_static_assets) {
|
|
|
|
|
g_static_assets[key] = Textures::loadTileset(key);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// DFHack could conceivably be loaded at any time, so we need to be able to
|
|
|
|
|
// handle loading textures before or after a world is loaded.
|
|
|
|
|
// If a world is already loaded, then append our textures to the raws. they'll
|
|
|
|
|
// be freed when the world is unloaded and we'll reload when we get to the title
|
|
|
|
|
// screen. If it's pre-world, append our textures and then adjust the "init"
|
|
|
|
|
// texture count so our textures will no longer be freed when worlds are
|
|
|
|
|
// unloaded.
|
|
|
|
|
//
|
|
|
|
|
void Textures::init(color_ostream& out) {
|
|
|
|
|
if (!enabler)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
auto& textures = enabler->textures;
|
|
|
|
|
long num_textures = textures.raws.size();
|
|
|
|
|
if (num_textures <= g_dfhack_logo_texpos_start)
|
|
|
|
|
g_loaded = false;
|
|
|
|
|
|
|
|
|
|
if (g_loaded)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
bool is_pre_world = num_textures == textures.init_texture_size;
|
|
|
|
|
|
|
|
|
|
g_num_dfhack_textures = load_tiles_from_image(out, "hack/data/art/dfhack.png",
|
|
|
|
|
&g_dfhack_logo_texpos_start);
|
|
|
|
|
g_num_dfhack_textures += load_tiles_from_image(out, "hack/data/art/green-pin.png",
|
|
|
|
|
&g_green_pin_texpos_start);
|
|
|
|
|
g_num_dfhack_textures += load_tiles_from_image(out, "hack/data/art/red-pin.png",
|
|
|
|
|
&g_red_pin_texpos_start);
|
|
|
|
|
g_num_dfhack_textures += load_tiles_from_image(out, "hack/data/art/icons.png",
|
|
|
|
|
&g_icons_texpos_start);
|
|
|
|
|
g_num_dfhack_textures += load_tiles_from_image(out, "hack/data/art/on-off.png",
|
|
|
|
|
&g_on_off_texpos_start);
|
|
|
|
|
g_num_dfhack_textures += load_tiles_from_image(out, "hack/data/art/pathable.png",
|
|
|
|
|
&g_pathable_texpos_start, 32, 32);
|
|
|
|
|
g_num_dfhack_textures += load_tiles_from_image(out, "hack/data/art/unsuspend.png",
|
|
|
|
|
&g_unsuspend_texpos_start, 32, 32);
|
|
|
|
|
g_num_dfhack_textures += load_tiles_from_image(out, "hack/data/art/control-panel.png",
|
|
|
|
|
&g_control_panel_texpos_start);
|
|
|
|
|
g_num_dfhack_textures += load_tiles_from_image(out, "hack/data/art/border-thin.png",
|
|
|
|
|
&g_thin_borders_texpos_start);
|
|
|
|
|
g_num_dfhack_textures += load_tiles_from_image(out, "hack/data/art/border-medium.png",
|
|
|
|
|
&g_medium_borders_texpos_start);
|
|
|
|
|
g_num_dfhack_textures += load_tiles_from_image(out, "hack/data/art/border-bold.png",
|
|
|
|
|
&g_bold_borders_texpos_start);
|
|
|
|
|
g_num_dfhack_textures += load_tiles_from_image(out, "hack/data/art/border-panel.png",
|
|
|
|
|
&g_panel_borders_texpos_start);
|
|
|
|
|
g_num_dfhack_textures += load_tiles_from_image(out, "hack/data/art/border-window.png",
|
|
|
|
|
&g_window_borders_texpos_start);
|
|
|
|
|
|
|
|
|
|
DEBUG(textures,out).print("loaded %ld textures\n", g_num_dfhack_textures);
|
|
|
|
|
|
|
|
|
|
if (is_pre_world)
|
|
|
|
|
textures.init_texture_size += g_num_dfhack_textures;
|
|
|
|
|
|
|
|
|
|
// NOTE: when GL modes are supported, we'll have to re-upload textures here
|
|
|
|
|
|
|
|
|
|
g_loaded = true;
|
|
|
|
|
DEBUG(textures, out).print("assets loaded");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// It's ok to leave NULLs in the raws list (according to usage in g_src)
|
|
|
|
|
void Textures::cleanup() {
|
|
|
|
|
reset_texpos();
|
|
|
|
|
reset_surface();
|
|
|
|
|
uninstall_reset_point();
|
|
|
|
|
|
|
|
|
|
if (!g_loaded)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
auto& textures = enabler->textures;
|
|
|
|
|
auto& raws = textures.raws;
|
|
|
|
|
size_t texpos_end = g_dfhack_logo_texpos_start + g_num_dfhack_textures - 1;
|
|
|
|
|
for (size_t idx = g_dfhack_logo_texpos_start; idx <= texpos_end; ++idx) {
|
|
|
|
|
DFSDL_FreeSurface((SDL_Surface *)raws[idx]);
|
|
|
|
|
raws[idx] = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (g_dfhack_logo_texpos_start == textures.init_texture_size - g_num_dfhack_textures)
|
|
|
|
|
textures.init_texture_size -= g_num_dfhack_textures;
|
|
|
|
|
|
|
|
|
|
g_loaded = false;
|
|
|
|
|
g_num_dfhack_textures = 0;
|
|
|
|
|
g_dfhack_logo_texpos_start = -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long Textures::getDfhackLogoTexposStart() {
|
|
|
|
|
return g_dfhack_logo_texpos_start;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long Textures::getGreenPinTexposStart() {
|
|
|
|
|
return g_green_pin_texpos_start;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long Textures::getRedPinTexposStart() {
|
|
|
|
|
return g_red_pin_texpos_start;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long Textures::getIconsTexposStart() {
|
|
|
|
|
return g_icons_texpos_start;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long Textures::getOnOffTexposStart() {
|
|
|
|
|
return g_on_off_texpos_start;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long Textures::getMapPathableTexposStart() {
|
|
|
|
|
return g_pathable_texpos_start;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long Textures::getMapUnsuspendTexposStart() {
|
|
|
|
|
return g_unsuspend_texpos_start;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long Textures::getControlPanelTexposStart() {
|
|
|
|
|
return g_control_panel_texpos_start;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long Textures::getThinBordersTexposStart() {
|
|
|
|
|
return g_thin_borders_texpos_start;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long Textures::getMediumBordersTexposStart() {
|
|
|
|
|
return g_medium_borders_texpos_start;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long Textures::getBoldBordersTexposStart() {
|
|
|
|
|
return g_bold_borders_texpos_start;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long Textures::getPanelBordersTexposStart() {
|
|
|
|
|
return g_panel_borders_texpos_start;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long Textures::getWindowBordersTexposStart() {
|
|
|
|
|
return g_window_borders_texpos_start;
|
|
|
|
|
}
|
|
|
|
|
|
shevernitskiy