mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-17 21:13:09 +00:00
Code Issues Releases Wiki Activity

Use normalized path in LuaUi::TextureData

Browse source
This commit is contained in:
elsid 2025-09-07 15:54:57 +02:00
parent 538e5d5502
commit 2c142faaa9
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwlua/uibindings.cpp
View file

@ -217,7 +217,7 @@ namespace MWLua
LuaUi::TextureData data;
sol::object path = LuaUtil::getFieldOrNil(options, "path");
if (path.is<std::string>())
data.mPath = path.as<std::string>();
data.mPath = VFS::Path::Normalized(path.as<std::string>());
if (data.mPath.empty())
throw std::logic_error("Invalid texture path");
sol::object offset = LuaUtil::getFieldOrNil(options, "offset");

2
components/lua_ui/resources.cpp
View file

@ -6,8 +6,6 @@ namespace LuaUi
{
std::shared_ptr<TextureResource> ResourceManager::registerTexture(TextureData data)
{
VFS::Path::normalizeFilenameInPlace(data.mPath);
TextureResources& list = mTextures[data.mPath];
list.push_back(std::make_shared<TextureResource>(data));
return list.back();

7
components/lua_ui/resources.hpp
View file

@ -2,12 +2,13 @@
#define OPENMW_LUAUI_RESOURCES
#include <memory>
#include <string>
#include <unordered_map>
#include <vector>
#include <osg/Vec2f>
#include <components/vfs/pathutil.hpp>
namespace VFS
{
class Manager;
@ -17,7 +18,7 @@ namespace LuaUi
{
struct TextureData
{
std::string mPath;
VFS::Path::Normalized mPath;
osg::Vec2f mOffset;
osg::Vec2f mSize;
};
@ -33,7 +34,7 @@ namespace LuaUi
private:
using TextureResources = std::vector<std::shared_ptr<TextureResource>>;
std::unordered_map<std::string, TextureResources> mTextures;
std::unordered_map<VFS::Path::Normalized, TextureResources, VFS::Path::Hash> mTextures;
};
}