MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

review 2

develop
shevernitskiy 2023-08-13 08:33:31 +03:00
parent 20460fecca
commit 22b0671038
3 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Core.cpp
Unescape Escape View File

@ -2217,8 +2217,6 @@ void Core::onStateChange(color_ostream &out, state_change_event event)
} }
} }
break; break;
case SC_VIEWSCREEN_CHANGED:
break;
default: default:
break; break;
} }

12
library/include/modules/Textures.h
Unescape Escape View File

@ -6,9 +6,9 @@
#include "ColorText.h" #include "ColorText.h"
#include "Export.h" #include "Export.h"
#include <SDL_surface.h> struct SDL_Surface;
typedef void* TexposHandle; typedef SDL_Surface* TexposHandle;
namespace DFHack { namespace DFHack {
@ -19,6 +19,9 @@ namespace DFHack {
*/ */
namespace Textures { namespace Textures {
const uint32_t TILE_WIDTH_PX = 8;
const uint32_t TILE_HEIGHT_PX = 12;
/** /**
* Load texture and get handle. * Load texture and get handle.
* Keep it to obtain valid texpos. * Keep it to obtain valid texpos.
@ -29,8 +32,9 @@ DFHACK_EXPORT TexposHandle loadTexture(SDL_Surface* surface);
* Load tileset from image file. * Load tileset from image file.
* Return vector of handles to obtain valid texposes. * Return vector of handles to obtain valid texposes.
*/ */
DFHACK_EXPORT std::vector<TexposHandle> loadTileset(const std::string& file, int tile_px_w, DFHACK_EXPORT std::vector<TexposHandle> loadTileset(const std::string& file,
int tile_px_h); int tile_px_w = TILE_WIDTH_PX,
int tile_px_h = TILE_HEIGHT_PX);
/** /**
* Get texpos by handle. * Get texpos by handle.

53
library/modules/Textures.cpp
Unescape Escape View File

@ -16,6 +16,8 @@
#include "df/viewscreen_new_arenast.h" #include "df/viewscreen_new_arenast.h"
#include "df/viewscreen_new_regionst.h" #include "df/viewscreen_new_regionst.h"
#include <SDL_surface.h>
using df::global::enabler; using df::global::enabler;
using namespace DFHack; using namespace DFHack;
using namespace DFHack::DFSDL; using namespace DFHack::DFSDL;
@ -28,18 +30,24 @@ static std::unordered_map<TexposHandle, long> g_handle_to_texpos;
static std::unordered_map<TexposHandle, SDL_Surface*> g_handle_to_surface; static std::unordered_map<TexposHandle, SDL_Surface*> g_handle_to_surface;
static std::mutex g_adding_mutex; 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::vector<TexposHandle> empty{};
static std::unordered_map<std::string, std::vector<TexposHandle>> g_static_assets{ // handle, tile width px, tile height px
{"hack/data/art/dfhack.png", empty}, {"hack/data/art/green-pin.png", empty}, static std::tuple<std::vector<TexposHandle>, int, int> basic{empty, Textures::TILE_WIDTH_PX,
{"hack/data/art/red-pin.png", empty}, {"hack/data/art/icons.png", empty}, Textures::TILE_HEIGHT_PX};
{"hack/data/art/on-off.png", empty}, {"hack/data/art/pathable.png", empty}, static std::unordered_map<std::string, std::tuple<std::vector<TexposHandle>, int, int>>
{"hack/data/art/unsuspend.png", empty}, {"hack/data/art/control-panel.png", empty}, g_static_assets{{"hack/data/art/dfhack.png", basic},
{"hack/data/art/border-thin.png", empty}, {"hack/data/art/border-medium.png", empty}, {"hack/data/art/green-pin.png", basic},
{"hack/data/art/border-bold.png", empty}, {"hack/data/art/border-panel.png", empty}, {"hack/data/art/red-pin.png", basic},
{"hack/data/art/border-window.png", empty}}; {"hack/data/art/icons.png", basic},
{"hack/data/art/on-off.png", basic},
{"hack/data/art/pathable.png", std::make_tuple(empty, 32, 32)},
{"hack/data/art/unsuspend.png", std::make_tuple(empty, 32, 32)},
{"hack/data/art/control-panel.png", basic},
{"hack/data/art/border-thin.png", basic},
{"hack/data/art/border-medium.png", basic},
{"hack/data/art/border-bold.png", basic},
{"hack/data/art/border-panel.png", basic},
{"hack/data/art/border-window.png", basic}};
// Converts an arbitrary Surface to something like the display format // Converts an arbitrary Surface to something like the display format
// (32-bit RGBA), and converts magenta to transparency if convert_magenta is set // (32-bit RGBA), and converts magenta to transparency if convert_magenta is set
@ -97,7 +105,7 @@ TexposHandle Textures::loadTexture(SDL_Surface* surface) {
if (!surface) if (!surface)
return 0; // should be some error, i guess return 0; // should be some error, i guess
auto handle = reinterpret_cast<TexposHandle>(surface); // not the best way? but cheap auto handle = surface;
g_handle_to_surface.emplace(handle, surface); g_handle_to_surface.emplace(handle, surface);
surface->refcount++; // prevent destruct on next FreeSurface by game surface->refcount++; // prevent destruct on next FreeSurface by game
auto texpos = add_texture(surface); auto texpos = add_texture(surface);
@ -105,9 +113,8 @@ TexposHandle Textures::loadTexture(SDL_Surface* surface) {
return handle; return handle;
} }
std::vector<TexposHandle> Textures::loadTileset(const std::string& file, std::vector<TexposHandle> Textures::loadTileset(const std::string& file, int tile_px_w,
int tile_px_w = TILE_WIDTH_PX, int tile_px_h) {
int tile_px_h = TILE_HEIGHT_PX) {
std::vector<TexposHandle> handles{}; std::vector<TexposHandle> handles{};
SDL_Surface* surface = DFIMG_Load(file.c_str()); SDL_Surface* surface = DFIMG_Load(file.c_str());
@ -157,9 +164,10 @@ long Textures::getTexposByHandle(TexposHandle handle) {
long Textures::getAsset(const std::string asset, size_t index) { long Textures::getAsset(const std::string asset, size_t index) {
if (!g_static_assets.contains(asset)) if (!g_static_assets.contains(asset))
return -1; return -1;
if (g_static_assets[asset].size() <= index) auto handles = std::get<0>(g_static_assets[asset]);
if (handles.size() <= index)
return -1; return -1;
return Textures::getTexposByHandle(g_static_assets[asset][index]); return Textures::getTexposByHandle(handles[index]);
} }
static void reset_texpos() { static void reset_texpos() {
@ -264,13 +272,10 @@ void Textures::init(color_ostream& out) {
DEBUG(textures, out).print("dynamic texture loading ready"); DEBUG(textures, out).print("dynamic texture loading ready");
for (auto& [key, value] : g_static_assets) { for (auto& [key, value] : g_static_assets) {
auto tile_w = TILE_WIDTH_PX; auto tile_w = std::get<1>(value);
auto tile_h = TILE_HEIGHT_PX; auto tile_h = std::get<2>(value);
if (key == "hack/data/art/pathable.png" || key == "hack/data/art/unsuspend.png") { g_static_assets[key] =
tile_w = 32; std::make_tuple(Textures::loadTileset(key, tile_w, tile_h), tile_w, tile_h);
tile_h = 32;
}
g_static_assets[key] = Textures::loadTileset(key, tile_w, tile_h);
} }
DEBUG(textures, out).print("assets loaded"); DEBUG(textures, out).print("assets loaded");