AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-23 11:54:58 -04:00
Code Issues Packages Projects 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 a79e121df6
commit bc219b6a1e
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

@ -231,7 +231,7 @@ namespace MWLua
LuaUi::TextureData data; LuaUi::TextureData data;
sol::object path = LuaUtil::getFieldOrNil(options, "path"); sol::object path = LuaUtil::getFieldOrNil(options, "path");
if (path.is<std::string>()) if (path.is<std::string>())
data.mPath = path.as<std::string>(); data.mPath = VFS::Path::Normalized(path.as<std::string>());
if (data.mPath.empty()) if (data.mPath.empty())
throw std::logic_error("Invalid texture path"); throw std::logic_error("Invalid texture path");
sol::object offset = LuaUtil::getFieldOrNil(options, "offset"); 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) std::shared_ptr<TextureResource> ResourceManager::registerTexture(TextureData data)
{ {
VFS::Path::normalizeFilenameInPlace(data.mPath);
TextureResources& list = mTextures[data.mPath]; TextureResources& list = mTextures[data.mPath];
list.push_back(std::make_shared<TextureResource>(data)); list.push_back(std::make_shared<TextureResource>(data));
return list.back(); return list.back();

7
components/lua_ui/resources.hpp
View File

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