mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use string_view in Fallback::Map

Browse Source
crashfix_debugdraw
Evil Eye 2 years ago
parent 2222b47e3d
commit fb9bc5f535
20 changed files with 59 additions and 53 deletions
Show Stats Download Patch File Download Diff File

2
apps/opencs/model/world/columns.cpp
Unescape Escape View File

@ -629,7 +629,7 @@ std::vector<std::pair<int,std::string>>CSMWorld::Columns::getEnums (ColumnId col
{ {
for (int i=0; i<8; i++) for (int i=0; i<8; i++)
{ {
const std::string& bloodName = Fallback::Map::getString("Blood_Texture_Name_" + std::to_string(i)); std::string_view bloodName = Fallback::Map::getString("Blood_Texture_Name_" + std::to_string(i));
if (!bloodName.empty()) if (!bloodName.empty())
enums.emplace_back(i, bloodName); enums.emplace_back(i, bloodName);
} }

5
apps/opencs/view/render/cellwater.cpp
Unescape Escape View File

@ -162,8 +162,9 @@ namespace CSVRender
mWaterGeometry->setStateSet(SceneUtil::createSimpleWaterStateSet(Alpha, RenderBin)); mWaterGeometry->setStateSet(SceneUtil::createSimpleWaterStateSet(Alpha, RenderBin));
// Add water texture // Add water texture
std::string textureName = Fallback::Map::getString("Water_SurfaceTexture"); std::string textureName = "textures/water/";
textureName = "textures/water/" + textureName + "00.dds"; textureName += Fallback::Map::getString("Water_SurfaceTexture");
textureName += "00.dds";
Resource::ImageManager* imageManager = mData.getResourceSystem()->getImageManager(); Resource::ImageManager* imageManager = mData.getResourceSystem()->getImageManager();

4
apps/openmw/engine.cpp
Unescape Escape View File

@ -850,7 +850,7 @@ void OMW::Engine::prepareEngine()
if (!mSkipMenu) if (!mSkipMenu)
{ {
const std::string& logo = Fallback::Map::getString("Movies_Company_Logo"); std::string_view logo = Fallback::Map::getString("Movies_Company_Logo");
if (!logo.empty()) if (!logo.empty())
mWindowManager->playVideo(logo, true); mWindowManager->playVideo(logo, true);
} }
@ -1069,7 +1069,7 @@ void OMW::Engine::go()
// start in main menu // start in main menu
mWindowManager->pushGuiMode (MWGui::GM_MainMenu); mWindowManager->pushGuiMode (MWGui::GM_MainMenu);
mSoundManager->playTitleMusic(); mSoundManager->playTitleMusic();
const std::string& logo = Fallback::Map::getString("Movies_Morrowind_Logo"); std::string_view logo = Fallback::Map::getString("Movies_Morrowind_Logo");
if (!logo.empty()) if (!logo.empty())
mWindowManager->playVideo(logo, /*allowSkipping*/true, /*overrideSounds*/false); mWindowManager->playVideo(logo, /*allowSkipping*/true, /*overrideSounds*/false);
} }

2
apps/openmw/mwbase/windowmanager.hpp
Unescape Escape View File

@ -108,7 +108,7 @@ namespace MWBase
/// @note This method will block until the video finishes playing /// @note This method will block until the video finishes playing
/// (and will continually update the window while doing so) /// (and will continually update the window while doing so)
virtual void playVideo(const std::string& name, bool allowSkipping, bool overrideSounds = true) = 0; virtual void playVideo(std::string_view name, bool allowSkipping, bool overrideSounds = true) = 0;
virtual void setNewGame(bool newgame) = 0; virtual void setNewGame(bool newgame) = 0;

8
apps/openmw/mwgui/charactercreation.cpp
Unescape Escape View File

@ -45,10 +45,10 @@ namespace
{ {
number++; number++;
std::string question = Fallback::Map::getString("Question_" + MyGUI::utility::toString(number) + "_Question"); std::string question{Fallback::Map::getString("Question_" + MyGUI::utility::toString(number) + "_Question")};
std::string answer0 = Fallback::Map::getString("Question_" + MyGUI::utility::toString(number) + "_AnswerOne"); std::string answer0{Fallback::Map::getString("Question_" + MyGUI::utility::toString(number) + "_AnswerOne")};
std::string answer1 = Fallback::Map::getString("Question_" + MyGUI::utility::toString(number) + "_AnswerTwo"); std::string answer1{Fallback::Map::getString("Question_" + MyGUI::utility::toString(number) + "_AnswerTwo")};
std::string answer2 = Fallback::Map::getString("Question_" + MyGUI::utility::toString(number) + "_AnswerThree"); std::string answer2{Fallback::Map::getString("Question_" + MyGUI::utility::toString(number) + "_AnswerThree")};
std::string sound = "vo\\misc\\chargen qa" + MyGUI::utility::toString(number) + ".wav"; std::string sound = "vo\\misc\\chargen qa" + MyGUI::utility::toString(number) + ".wav";
Response r0 = {answer0, ESM::Class::Combat}; Response r0 = {answer0, ESM::Class::Combat};

7
apps/openmw/mwgui/levelupdialog.cpp
Unescape Escape View File

@ -18,6 +18,7 @@
#include "../mwmechanics/actorutil.hpp" #include "../mwmechanics/actorutil.hpp"
#include "class.hpp" #include "class.hpp"
#include "ustring.hpp"
namespace MWGui namespace MWGui
{ {
@ -138,13 +139,13 @@ namespace MWGui
int level = creatureStats.getLevel ()+1; int level = creatureStats.getLevel ()+1;
mLevelText->setCaptionWithReplacing("#{sLevelUpMenu1} " + MyGUI::utility::toString(level)); mLevelText->setCaptionWithReplacing("#{sLevelUpMenu1} " + MyGUI::utility::toString(level));
std::string levelupdescription; std::string_view levelupdescription;
levelupdescription = Fallback::Map::getString("Level_Up_Level"+MyGUI::utility::toString(level)); levelupdescription = Fallback::Map::getString("Level_Up_Level"+MyGUI::utility::toString(level));
if (levelupdescription == "") if (levelupdescription.empty())
levelupdescription = Fallback::Map::getString("Level_Up_Default"); levelupdescription = Fallback::Map::getString("Level_Up_Default");
mLevelDescription->setCaption (levelupdescription); mLevelDescription->setCaption(toUString(levelupdescription));
unsigned int availableAttributes = 0; unsigned int availableAttributes = 0;
for (int i = 0; i < 8; ++i) for (int i = 0; i < 8; ++i)

4
apps/openmw/mwgui/windowmanagerimp.cpp
Unescape Escape View File

@ -1807,9 +1807,9 @@ namespace MWGui
&& (!isGuiMode() || (mGuiModes.size() == 1 && (getMode() == GM_MainMenu || getMode() == GM_Rest))); && (!isGuiMode() || (mGuiModes.size() == 1 && (getMode() == GM_MainMenu || getMode() == GM_Rest)));
} }
void WindowManager::playVideo(const std::string &name, bool allowSkipping, bool overrideSounds) void WindowManager::playVideo(std::string_view name, bool allowSkipping, bool overrideSounds)
{ {
mVideoWidget->playVideo("video\\" + name); mVideoWidget->playVideo("video\\" + std::string{name});
mVideoWidget->eventKeyButtonPressed.clear(); mVideoWidget->eventKeyButtonPressed.clear();
mVideoBackground->eventKeyButtonPressed.clear(); mVideoBackground->eventKeyButtonPressed.clear();

2
apps/openmw/mwgui/windowmanagerimp.hpp
Unescape Escape View File

@ -149,7 +149,7 @@ namespace MWGui
/// @note This method will block until the video finishes playing /// @note This method will block until the video finishes playing
/// (and will continually update the window while doing so) /// (and will continually update the window while doing so)
void playVideo(const std::string& name, bool allowSkipping, bool overrideSounds = true) override; void playVideo(std::string_view name, bool allowSkipping, bool overrideSounds = true) override;
/// Warning: do not use MyGUI::InputManager::setKeyFocusWidget directly. Instead use this. /// Warning: do not use MyGUI::InputManager::setKeyFocusWidget directly. Instead use this.
void setKeyFocusWidget (MyGUI::Widget* widget) override; void setKeyFocusWidget (MyGUI::Widget* widget) override;

2
apps/openmw/mwrender/effectmanager.cpp
Unescape Escape View File

@ -27,7 +27,7 @@ EffectManager::~EffectManager()
clear(); clear();
} }
void EffectManager::addEffect(const std::string &model, const std::string& textureOverride, const osg::Vec3f &worldPosition, float scale, bool isMagicVFX) void EffectManager::addEffect(const std::string& model, std::string_view textureOverride, const osg::Vec3f& worldPosition, float scale, bool isMagicVFX)
{ {
osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(model); osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(model);

2
apps/openmw/mwrender/effectmanager.hpp
Unescape Escape View File

@ -33,7 +33,7 @@ namespace MWRender
~EffectManager(); ~EffectManager();
/// Add an effect. When it's finished playing, it will be removed automatically. /// Add an effect. When it's finished playing, it will be removed automatically.
void addEffect (const std::string& model, const std::string& textureOverride, const osg::Vec3f& worldPosition, float scale, bool isMagicVFX = true); void addEffect(const std::string& model, std::string_view textureOverride, const osg::Vec3f& worldPosition, float scale, bool isMagicVFX = true);
void update(float dt); void update(float dt);

2
apps/openmw/mwrender/renderingmanager.cpp
Unescape Escape View File

@ -1174,7 +1174,7 @@ namespace MWRender
mActorsPaths->updatePtr(old, updated); mActorsPaths->updatePtr(old, updated);
} }
void RenderingManager::spawnEffect(const std::string &model, const std::string &texture, const osg::Vec3f &worldPosition, float scale, bool isMagicVFX) void RenderingManager::spawnEffect(const std::string& model, std::string_view texture, const osg::Vec3f& worldPosition, float scale, bool isMagicVFX)
{ {
mEffectManager->addEffect(model, texture, worldPosition, scale, isMagicVFX); mEffectManager->addEffect(model, texture, worldPosition, scale, isMagicVFX);
} }

2
apps/openmw/mwrender/renderingmanager.hpp
Unescape Escape View File

@ -184,7 +184,7 @@ namespace MWRender
SkyManager* getSkyManager(); SkyManager* getSkyManager();
void spawnEffect(const std::string &model, const std::string &texture, const osg::Vec3f &worldPosition, float scale = 1.f, bool isMagicVFX = true); void spawnEffect(const std::string& model, std::string_view texture, const osg::Vec3f& worldPosition, float scale = 1.f, bool isMagicVFX = true);
/// Clear all savegame-specific data /// Clear all savegame-specific data
void clear(); void clear();

2
apps/openmw/mwrender/ripplesimulation.cpp
Unescape Escape View File

@ -34,7 +34,7 @@ namespace
if (rippleFrameCount <= 0) if (rippleFrameCount <= 0)
return; return;
const std::string& tex = Fallback::Map::getString("Water_RippleTexture"); std::string_view tex = Fallback::Map::getString("Water_RippleTexture");
std::vector<osg::ref_ptr<osg::Texture2D> > textures; std::vector<osg::ref_ptr<osg::Texture2D> > textures;
for (int i=0; i<rippleFrameCount; ++i) for (int i=0; i<rippleFrameCount; ++i)

4
apps/openmw/mwrender/water.cpp
Unescape Escape View File

@ -587,7 +587,7 @@ void Water::createSimpleWaterStateSet(osg::Node* node, float alpha)
// Add animated textures // Add animated textures
std::vector<osg::ref_ptr<osg::Texture2D> > textures; std::vector<osg::ref_ptr<osg::Texture2D> > textures;
const int frameCount = std::clamp(Fallback::Map::getInt("Water_SurfaceFrameCount"), 0, 320); const int frameCount = std::clamp(Fallback::Map::getInt("Water_SurfaceFrameCount"), 0, 320);
const std::string& texture = Fallback::Map::getString("Water_SurfaceTexture"); std::string_view texture = Fallback::Map::getString("Water_SurfaceTexture");
for (int i=0; i<frameCount; ++i) for (int i=0; i<frameCount; ++i)
{ {
std::ostringstream texname; std::ostringstream texname;
@ -734,7 +734,7 @@ Water::~Water()
void Water::listAssetsToPreload(std::vector<std::string> &textures) void Water::listAssetsToPreload(std::vector<std::string> &textures)
{ {
const int frameCount = std::clamp(Fallback::Map::getInt("Water_SurfaceFrameCount"), 0, 320); const int frameCount = std::clamp(Fallback::Map::getInt("Water_SurfaceFrameCount"), 0, 320);
const std::string& texture = Fallback::Map::getString("Water_SurfaceTexture"); std::string_view texture = Fallback::Map::getString("Water_SurfaceTexture");
for (int i=0; i<frameCount; ++i) for (int i=0; i<frameCount; ++i)
{ {
std::ostringstream texname; std::ostringstream texname;

2
apps/openmw/mwscript/miscextensions.cpp
Unescape Escape View File

@ -210,7 +210,7 @@ namespace MWScript
void execute (Interpreter::Runtime& runtime) override void execute (Interpreter::Runtime& runtime) override
{ {
std::string name{runtime.getStringLiteral(runtime[0].mInteger)}; std::string_view name = runtime.getStringLiteral(runtime[0].mInteger);
runtime.pop(); runtime.pop();
bool allowSkipping = runtime[0].mInteger != 0; bool allowSkipping = runtime[0].mInteger != 0;

6
apps/openmw/mwworld/worldimp.cpp
Unescape Escape View File

@ -271,7 +271,7 @@ namespace MWWorld
if (!bypass) if (!bypass)
{ {
const std::string& video = Fallback::Map::getString("Movies_New_Game"); std::string_view video = Fallback::Map::getString("Movies_New_Game");
if (!video.empty()) if (!video.empty())
MWBase::Environment::get().getWindowManager()->playVideo(video, true); MWBase::Environment::get().getWindowManager()->playVideo(video, true);
} }
@ -3713,12 +3713,12 @@ namespace MWWorld
if (ptr == getPlayerPtr() && Settings::Manager::getBool("hit fader", "GUI")) if (ptr == getPlayerPtr() && Settings::Manager::getBool("hit fader", "GUI"))
return; return;
std::string texture = Fallback::Map::getString("Blood_Texture_" + std::to_string(ptr.getClass().getBloodTexture(ptr))); std::string_view texture = Fallback::Map::getString("Blood_Texture_" + std::to_string(ptr.getClass().getBloodTexture(ptr)));
if (texture.empty()) if (texture.empty())
texture = Fallback::Map::getString("Blood_Texture_0"); texture = Fallback::Map::getString("Blood_Texture_0");
std::string model = Misc::ResourceHelpers::correctMeshPath( std::string model = Misc::ResourceHelpers::correctMeshPath(
Fallback::Map::getString("Blood_Model_" + std::to_string(Misc::Rng::rollDice(3))), // [0, 2] std::string{Fallback::Map::getString("Blood_Model_" + std::to_string(Misc::Rng::rollDice(3)))}, // [0, 2]
mResourceSystem->getVFS()); mResourceSystem->getVFS());
mRendering->spawnEffect(model, texture, worldPosition, 1.0f, false); mRendering->spawnEffect(model, texture, worldPosition, 1.0f, false);

35
components/fallback/fallback.cpp
Unescape Escape View File

@ -6,29 +6,31 @@
namespace Fallback namespace Fallback
{ {
std::map<std::string,std::string> Map::mFallbackMap; std::map<std::string, std::string, std::less<>> Map::mFallbackMap;
void Map::init(const std::map<std::string,std::string>& fallback) void Map::init(const std::map<std::string,std::string>& fallback)
{ {
mFallbackMap = fallback; for(const auto& entry : fallback)
mFallbackMap.insert(entry);
} }
std::string Map::getString(const std::string& fall) std::string_view Map::getString(std::string_view fall)
{ {
std::map<std::string,std::string>::const_iterator it; auto it = mFallbackMap.find(fall);
if ((it = mFallbackMap.find(fall)) == mFallbackMap.end()) if (it == mFallbackMap.end())
{ {
return std::string(); return {};
} }
return it->second; return it->second;
} }
float Map::getFloat(const std::string& fall) float Map::getFloat(std::string_view fall)
{ {
const std::string& fallback = getString(fall); std::string_view fallback = getString(fall);
if (!fallback.empty()) if (!fallback.empty())
{ {
std::stringstream stream(fallback); std::stringstream stream;
stream << fallback;
float number = 0.f; float number = 0.f;
stream >> number; stream >> number;
return number; return number;
@ -37,12 +39,13 @@ namespace Fallback
return 0; return 0;
} }
int Map::getInt(const std::string& fall) int Map::getInt(std::string_view fall)
{ {
const std::string& fallback = getString(fall); std::string_view fallback = getString(fall);
if (!fallback.empty()) if (!fallback.empty())
{ {
std::stringstream stream(fallback); std::stringstream stream;
stream << fallback;
int number = 0; int number = 0;
stream >> number; stream >> number;
return number; return number;
@ -51,15 +54,15 @@ namespace Fallback
return 0; return 0;
} }
bool Map::getBool(const std::string& fall) bool Map::getBool(std::string_view fall)
{ {
const std::string& fallback = getString(fall); std::string_view fallback = getString(fall);
return !fallback.empty() && fallback != "0"; return !fallback.empty() && fallback != "0";
} }
osg::Vec4f Map::getColour(const std::string& fall) osg::Vec4f Map::getColour(std::string_view fall)
{ {
const std::string& sum = getString(fall); std::string_view sum = getString(fall);
if (!sum.empty()) if (!sum.empty())
{ {
try try

13
components/fallback/fallback.hpp
Unescape Escape View File

@ -3,6 +3,7 @@
#include <map> #include <map>
#include <string> #include <string>
#include <string_view>
#include <osg/Vec4f> #include <osg/Vec4f>
@ -11,15 +12,15 @@ namespace Fallback
/// @brief contains settings imported from the Morrowind INI file. /// @brief contains settings imported from the Morrowind INI file.
class Map class Map
{ {
static std::map<std::string,std::string> mFallbackMap; static std::map<std::string, std::string, std::less<>> mFallbackMap;
public: public:
static void init(const std::map<std::string,std::string>& fallback); static void init(const std::map<std::string,std::string>& fallback);
static std::string getString(const std::string& fall); static std::string_view getString(std::string_view fall);
static float getFloat(const std::string& fall); static float getFloat(std::string_view fall);
static int getInt(const std::string& fall); static int getInt(std::string_view fall);
static bool getBool(const std::string& fall); static bool getBool(std::string_view fall);
static osg::Vec4f getColour(const std::string& fall); static osg::Vec4f getColour(std::string_view fall);
}; };
} }
#endif #endif

4
components/fontloader/fontloader.cpp
Unescape Escape View File

@ -169,8 +169,8 @@ namespace Gui
void FontLoader::loadFonts() void FontLoader::loadFonts()
{ {
std::string defaultFont = Fallback::Map::getString("Fonts_Font_0"); std::string defaultFont{Fallback::Map::getString("Fonts_Font_0")};
std::string scrollFont = Fallback::Map::getString("Fonts_Font_2"); std::string scrollFont{Fallback::Map::getString("Fonts_Font_2")};
loadFont(defaultFont, "DefaultFont"); loadFont(defaultFont, "DefaultFont");
loadFont(scrollFont, "ScrollFont"); loadFont(scrollFont, "ScrollFont");
loadFont("DejaVuLGCSansMono", "MonoFont"); // We need to use a TrueType monospace font to display debug texts properly. loadFont("DejaVuLGCSansMono", "MonoFont"); // We need to use a TrueType monospace font to display debug texts properly.

4
components/widgets/tags.cpp
Unescape Escape View File

@ -18,7 +18,7 @@ bool replaceTag(const MyGUI::UString& tag, MyGUI::UString& out)
if (tag.compare(0, fontcolourLength, fontcolour) == 0) if (tag.compare(0, fontcolourLength, fontcolour) == 0)
{ {
std::string fallbackName = "FontColor_color_" + tag.substr(fontcolourLength); std::string fallbackName = "FontColor_color_" + tag.substr(fontcolourLength);
std::string str = Fallback::Map::getString(fallbackName); std::string_view str = Fallback::Map::getString(fallbackName);
if (str.empty()) if (str.empty())
throw std::runtime_error("Unknown fallback name: " + fallbackName); throw std::runtime_error("Unknown fallback name: " + fallbackName);
@ -36,7 +36,7 @@ bool replaceTag(const MyGUI::UString& tag, MyGUI::UString& out)
else if (tag.compare(0, fontcolourhtmlLength, fontcolourhtml) == 0) else if (tag.compare(0, fontcolourhtmlLength, fontcolourhtml) == 0)
{ {
std::string fallbackName = "FontColor_color_" + tag.substr(fontcolourhtmlLength); std::string fallbackName = "FontColor_color_" + tag.substr(fontcolourhtmlLength);
std::string str = Fallback::Map::getString(fallbackName); std::string_view str = Fallback::Map::getString(fallbackName);
if (str.empty()) if (str.empty())
throw std::runtime_error("Unknown fallback name: " + fallbackName); throw std::runtime_error("Unknown fallback name: " + fallbackName);

Write Preview
Loading…
Cancel
Save