PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix Image for non-existing textures in atlas

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/graphics/core/Atlas.cpp
View File

@ -34,6 +34,14 @@ const UVRegion& Atlas::get(const std::string& name) const {
return regions.at(name); 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 { Texture* Atlas::getTexture() const {
return texture.get(); return texture.get();
} }

2
src/graphics/core/Atlas.hpp
View File

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

19
src/graphics/ui/elements/Image.cpp
View File

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

2
src/logic/scripting/lua/libworld.cpp
View File

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