fix Image for non-existing textures in atlas

This commit is contained in:
MihailRis 2024-06-30 22:25:31 +03:00
parent 2dffdf757c
commit 71c754b039
4 changed files with 22 additions and 9 deletions

View File

@ -34,6 +34,14 @@ const UVRegion& Atlas::get(const std::string& name) const {
return regions.at(name);
}
std::optional<UVRegion> Atlas::getIf(const std::string& name) const {
const auto& found = regions.find(name);
if (found == regions.end()) {
return std::nullopt;
}
return found->second;
}
Texture* Atlas::getTexture() const {
return texture.get();
}

View File

@ -5,6 +5,7 @@
#include <string>
#include <memory>
#include <vector>
#include <optional>
#include <unordered_map>
#include "../../maths/UVRegion.hpp"
#include "../../typedefs.hpp"
@ -31,6 +32,7 @@ public:
bool has(const std::string& name) const;
const UVRegion& get(const std::string& name) const;
std::optional<UVRegion> getIf(const std::string& name) const;
Texture* getTexture() const;
ImageData* getImage() const;

View File

@ -30,14 +30,17 @@ void Image::draw(const DrawContext* pctx, Assets* assets) {
} else {
auto atlasName = this->texture.substr(0, separator);
if (auto atlas = assets->get<Atlas>(atlasName)) {
texture = atlas->getTexture();
batch->texture(atlas->getTexture());
auto& region = atlas->get(this->texture.substr(separator+1));
batch->setRegion(region);
if (autoresize) {
setSize(glm::vec2(
texture->getWidth()*region.getWidth(),
texture->getHeight()*region.getHeight()));
if (auto region = atlas->getIf(this->texture.substr(separator+1))) {
texture = atlas->getTexture();
batch->texture(atlas->getTexture());
batch->setRegion(*region);
if (autoresize) {
setSize(glm::vec2(
texture->getWidth()*region->getWidth(),
texture->getHeight()*region->getHeight()));
}
} else {
batch->texture(nullptr);
}
}
}

View File

@ -26,7 +26,7 @@ static int l_world_get_list(lua::State* L) {
lua::setfield(L, "name");
auto assets = engine->getAssets();
std::string icon = "world:"+name+".icon";
std::string icon = "world#"+name+".icon";
if (!AssetsLoader::loadExternalTexture(assets, icon, {
worlds[i]/fs::path("icon.png"),
worlds[i]/fs::path("preview.png")