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

Merge branch 'modelviewbutnocontroller' into 'master'

Browse Source 
Collect string_views when deciding what to preload

See merge request OpenMW/openmw!3816
pull/3234/head
psi29a 11 months ago
parent 66b2d428c8 4ef68a8938
commit 7793a6d0d9
55 changed files with 132 additions and 122 deletions
Show Stats Download Patch File Download Diff File

9
apps/openmw/mwclass/activator.cpp
Unescape Escape View File

@ -62,7 +62,7 @@ namespace MWClass
physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
}
std::string Activator::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Activator::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Activator>(ptr);
}
@ -141,15 +141,14 @@ namespace MWClass
ESM::RefId Activator::getSoundIdFromSndGen(const MWWorld::Ptr& ptr, std::string_view name) const
{
const std::string model
= getModel(ptr); // Assume it's not empty, since we wouldn't have gotten the soundgen otherwise
// Assume it's not empty, since we wouldn't have gotten the soundgen otherwise
const std::string_view model = getModel(ptr);
const MWWorld::ESMStore& store = *MWBase::Environment::get().getESMStore();
const ESM::RefId* creatureId = nullptr;
for (const ESM::Creature& iter : store.get<ESM::Creature>())
{
if (!iter.mModel.empty()
&& Misc::StringUtils::ciEqual(model, Misc::ResourceHelpers::correctMeshPath(iter.mModel)))
if (!iter.mModel.empty() && Misc::StringUtils::ciEqual(model, iter.mModel))
{
creatureId = !iter.mOriginal.empty() ? &iter.mOriginal : &iter.mId;
break;

2
apps/openmw/mwclass/activator.hpp
Unescape Escape View File

@ -41,7 +41,7 @@ namespace MWClass
std::unique_ptr<MWWorld::Action> activate(const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
///< Generate action for activation
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
bool useAnim() const override;
///< Whether or not to use animated variant of model (default false)

2
apps/openmw/mwclass/apparatus.cpp
Unescape Escape View File

@ -35,7 +35,7 @@ namespace MWClass
}
}
std::string Apparatus::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Apparatus::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Apparatus>(ptr);
}

2
apps/openmw/mwclass/apparatus.hpp
Unescape Escape View File

@ -49,7 +49,7 @@ namespace MWClass
std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
///< Generate action for using via inventory menu
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;
};

2
apps/openmw/mwclass/armor.cpp
Unescape Escape View File

@ -44,7 +44,7 @@ namespace MWClass
}
}
std::string Armor::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Armor::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Armor>(ptr);
}

2
apps/openmw/mwclass/armor.hpp
Unescape Escape View File

@ -74,7 +74,7 @@ namespace MWClass
std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
///< Generate action for using via inventory menu
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
int getEnchantmentPoints(const MWWorld::ConstPtr& ptr) const override;

2
apps/openmw/mwclass/bodypart.cpp
Unescape Escape View File

@ -42,7 +42,7 @@ namespace MWClass
return false;
}
std::string BodyPart::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view BodyPart::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::BodyPart>(ptr);
}

2
apps/openmw/mwclass/bodypart.hpp
Unescape Escape View File

@ -25,7 +25,7 @@ namespace MWClass
bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
///< @return true if this object has a tooltip when focused (default implementation: true)
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
};
}

2
apps/openmw/mwclass/book.cpp
Unescape Escape View File

@ -41,7 +41,7 @@ namespace MWClass
}
}
std::string Book::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Book::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Book>(ptr);
}

2
apps/openmw/mwclass/book.hpp
Unescape Escape View File

@ -54,7 +54,7 @@ namespace MWClass
std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
///< Generate action for using via inventory menu
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
int getEnchantmentPoints(const MWWorld::ConstPtr& ptr) const override;

12
apps/openmw/mwclass/classmodel.hpp
Unescape Escape View File

@ -4,22 +4,16 @@
#include "../mwworld/livecellref.hpp"
#include "../mwworld/ptr.hpp"
#include <components/misc/resourcehelpers.hpp>
#include <components/resource/resourcesystem.hpp>
#include <string>
#include <string_view>
namespace MWClass
{
template <class Class>
std::string getClassModel(const MWWorld::ConstPtr& ptr)
std::string_view getClassModel(const MWWorld::ConstPtr& ptr)
{
const MWWorld::LiveCellRef<Class>* ref = ptr.get<Class>();
if (!ref->mBase->mModel.empty())
return Misc::ResourceHelpers::correctMeshPath(ref->mBase->mModel);
return {};
return ref->mBase->mModel;
}
}

2
apps/openmw/mwclass/clothing.cpp
Unescape Escape View File

@ -39,7 +39,7 @@ namespace MWClass
}
}
std::string Clothing::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Clothing::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Clothing>(ptr);
}

2
apps/openmw/mwclass/clothing.hpp
Unescape Escape View File

@ -66,7 +66,7 @@ namespace MWClass
std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
///< Generate action for using via inventory menu
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
int getEnchantmentPoints(const MWWorld::ConstPtr& ptr) const override;

2
apps/openmw/mwclass/container.cpp
Unescape Escape View File

@ -126,7 +126,7 @@ namespace MWClass
physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
}
std::string Container::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Container::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Container>(ptr);
}

2
apps/openmw/mwclass/container.hpp
Unescape Escape View File

@ -85,7 +85,7 @@ namespace MWClass
void respawn(const MWWorld::Ptr& ptr) const override;
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
bool useAnim() const override;

10
apps/openmw/mwclass/creature.cpp
Unescape Escape View File

@ -178,14 +178,14 @@ namespace MWClass
objects.insertCreature(ptr, model, hasInventoryStore(ptr));
}
std::string Creature::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Creature::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Creature>(ptr);
}
void Creature::getModelsToPreload(const MWWorld::ConstPtr& ptr, std::vector<std::string>& models) const
void Creature::getModelsToPreload(const MWWorld::ConstPtr& ptr, std::vector<std::string_view>& models) const
{
std::string model = getModel(ptr);
std::string_view model = getModel(ptr);
if (!model.empty())
models.push_back(model);
@ -651,13 +651,13 @@ namespace MWClass
if (sounds.empty())
{
const std::string model = getModel(ptr);
const std::string_view model = getModel(ptr);
if (!model.empty())
{
for (const ESM::Creature& creature : store.get<ESM::Creature>())
{
if (creature.mId != ourId && creature.mOriginal != ourId && !creature.mModel.empty()
&& Misc::StringUtils::ciEqual(model, Misc::ResourceHelpers::correctMeshPath(creature.mModel)))
&& Misc::StringUtils::ciEqual(model, creature.mModel))
{
const ESM::RefId& fallbackId = !creature.mOriginal.empty() ? creature.mOriginal : creature.mId;
sound = store.get<ESM::SoundGenerator>().begin();

4
apps/openmw/mwclass/creature.hpp
Unescape Escape View File

@ -105,9 +105,9 @@ namespace MWClass
float getMaxSpeed(const MWWorld::Ptr& ptr) const override;
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
void getModelsToPreload(const MWWorld::ConstPtr& ptr, std::vector<std::string>& models) const override;
void getModelsToPreload(const MWWorld::ConstPtr& ptr, std::vector<std::string_view>& models) const override;
///< Get a list of models to preload that this object may use (directly or indirectly). default implementation:
///< list getModel().

2
apps/openmw/mwclass/door.cpp
Unescape Escape View File

@ -94,7 +94,7 @@ namespace MWClass
return true;
}
std::string Door::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Door::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Door>(ptr);
}

2
apps/openmw/mwclass/door.hpp
Unescape Escape View File

@ -51,7 +51,7 @@ namespace MWClass
ESM::RefId getScript(const MWWorld::ConstPtr& ptr) const override;
///< Return name of the script attached to ptr
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
MWWorld::DoorState getDoorState(const MWWorld::ConstPtr& ptr) const override;
/// This does not actually cause the door to move. Use World::activateDoor instead.

4
apps/openmw/mwclass/esm4base.hpp
Unescape Escape View File

@ -96,9 +96,9 @@ namespace MWClass
std::string_view getName(const MWWorld::ConstPtr& ptr) const override { return {}; }
std::string getModel(const MWWorld::ConstPtr& ptr) const override
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override
{
std::string model = getClassModel<Record>(ptr);
std::string_view model = getClassModel<Record>(ptr);
// Hide meshes meshes/marker/* and *LOD.nif in ESM4 cells. It is a temporarty hack.
// Needed because otherwise LOD meshes are rendered on top of normal meshes.

9
apps/openmw/mwclass/esm4npc.cpp
Unescape Escape View File

@ -175,17 +175,14 @@ namespace MWClass
return getCustomData(ptr).mIsFemale;
}
std::string ESM4Npc::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view ESM4Npc::getModel(const MWWorld::ConstPtr& ptr) const
{
const ESM4NpcCustomData& data = getCustomData(ptr);
if (data.mTraits == nullptr)
return {};
std::string_view model;
if (data.mTraits->mIsTES4)
model = data.mTraits->mModel;
else
model = data.mIsFemale ? data.mRace->mModelFemale : data.mRace->mModelMale;
return Misc::ResourceHelpers::correctMeshPath(model);
return data.mTraits->mModel;
return data.mIsFemale ? data.mRace->mModelFemale : data.mRace->mModelMale;
}
std::string_view ESM4Npc::getName(const MWWorld::ConstPtr& ptr) const

2
apps/openmw/mwclass/esm4npc.hpp
Unescape Escape View File

@ -54,7 +54,7 @@ namespace MWClass
return ESM4Impl::getToolTipInfo(getName(ptr), count);
}
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getName(const MWWorld::ConstPtr& ptr) const override;
static const ESM4::Npc* getTraitsRecord(const MWWorld::Ptr& ptr);

2
apps/openmw/mwclass/ingredient.cpp
Unescape Escape View File

@ -39,7 +39,7 @@ namespace MWClass
}
}
std::string Ingredient::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Ingredient::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Ingredient>(ptr);
}

2
apps/openmw/mwclass/ingredient.hpp
Unescape Escape View File

@ -47,7 +47,7 @@ namespace MWClass
const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
///< Return name of inventory icon.
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
float getWeight(const MWWorld::ConstPtr& ptr) const override;

2
apps/openmw/mwclass/light.cpp
Unescape Escape View File

@ -70,7 +70,7 @@ namespace MWClass
return true;
}
std::string Light::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Light::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Light>(ptr);
}

2
apps/openmw/mwclass/light.hpp
Unescape Escape View File

@ -69,7 +69,7 @@ namespace MWClass
float getRemainingUsageTime(const MWWorld::ConstPtr& ptr) const override;
///< Returns the remaining duration of the object.
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
float getWeight(const MWWorld::ConstPtr& ptr) const override;

2
apps/openmw/mwclass/lockpick.cpp
Unescape Escape View File

@ -38,7 +38,7 @@ namespace MWClass
}
}
std::string Lockpick::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Lockpick::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Lockpick>(ptr);
}

2
apps/openmw/mwclass/lockpick.hpp
Unescape Escape View File

@ -59,7 +59,7 @@ namespace MWClass
std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
///< Generate action for using via inventory menu
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;

2
apps/openmw/mwclass/misc.cpp
Unescape Escape View File

@ -49,7 +49,7 @@ namespace MWClass
}
}
std::string Miscellaneous::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Miscellaneous::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Miscellaneous>(ptr);
}

2
apps/openmw/mwclass/misc.hpp
Unescape Escape View File

@ -45,7 +45,7 @@ namespace MWClass
const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
///< Return name of inventory icon.
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
///< Generate action for using via inventory menu

45
apps/openmw/mwclass/npc.cpp
Unescape Escape View File

@ -19,6 +19,7 @@
#include <components/esm3/loadsoun.hpp>
#include <components/esm3/npcstate.hpp>
#include <components/settings/values.hpp>
#include <components/vfs/pathutil.hpp>
#include "../mwbase/dialoguemanager.hpp"
#include "../mwbase/environment.hpp"
@ -424,45 +425,51 @@ namespace MWClass
return (ref->mBase->mRecordFlags & ESM::FLAG_Persistent) != 0;
}
std::string Npc::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Npc::getModel(const MWWorld::ConstPtr& ptr) const
{
const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
std::string_view model = Settings::models().mBaseanim.get();
const ESM::Race* race = MWBase::Environment::get().getESMStore()->get<ESM::Race>().find(ref->mBase->mRace);
if (race->mData.mFlags & ESM::Race::Beast)
model = Settings::models().mBaseanimkna.get();
// Base animations should be in the meshes dir
constexpr std::string_view prefix = "meshes/";
assert(VFS::Path::pathEqual(prefix, model.substr(0, prefix.size())));
return model.substr(prefix.size());
}
std::string model = Settings::models().mBaseanim;
std::string Npc::getCorrectedModel(const MWWorld::ConstPtr& ptr) const
{
const MWWorld::LiveCellRef<ESM::NPC>* ref = ptr.get<ESM::NPC>();
const std::string& model = Settings::models().mBaseanim;
const ESM::Race* race = MWBase::Environment::get().getESMStore()->get<ESM::Race>().find(ref->mBase->mRace);
if (race->mData.mFlags & ESM::Race::Beast)
model = Settings::models().mBaseanimkna;
return Settings::models().mBaseanimkna;
return model;
}
void Npc::getModelsToPreload(const MWWorld::ConstPtr& ptr, std::vector<std::string>& models) const
void Npc::getModelsToPreload(const MWWorld::ConstPtr& ptr, std::vector<std::string_view>& models) const
{
const MWWorld::LiveCellRef<ESM::NPC>* npc = ptr.get<ESM::NPC>();
const auto& esmStore = MWBase::Environment::get().getESMStore();
const ESM::Race* race = esmStore->get<ESM::Race>().search(npc->mBase->mRace);
if (race && race->mData.mFlags & ESM::Race::Beast)
models.push_back(Settings::models().mBaseanimkna);
// keep these always loaded just in case
models.push_back(Settings::models().mXargonianswimkna);
models.push_back(Settings::models().mXbaseanimfemale);
models.push_back(Settings::models().mXbaseanim);
models.push_back(getModel(ptr));
if (!npc->mBase->mModel.empty())
models.push_back(Misc::ResourceHelpers::correctMeshPath(npc->mBase->mModel));
models.push_back(npc->mBase->mModel);
if (!npc->mBase->mHead.empty())
{
const ESM::BodyPart* head = esmStore->get<ESM::BodyPart>().search(npc->mBase->mHead);
if (head)
models.push_back(Misc::ResourceHelpers::correctMeshPath(head->mModel));
models.push_back(head->mModel);
}
if (!npc->mBase->mHair.empty())
{
const ESM::BodyPart* hair = esmStore->get<ESM::BodyPart>().search(npc->mBase->mHair);
if (hair)
models.push_back(Misc::ResourceHelpers::correctMeshPath(hair->mModel));
models.push_back(hair->mModel);
}
bool female = (npc->mBase->mFlags & ESM::NPC::Female);
@ -486,7 +493,7 @@ namespace MWClass
const ESM::BodyPart* part = esmStore->get<ESM::BodyPart>().search(partname);
if (part && !part->mModel.empty())
models.push_back(Misc::ResourceHelpers::correctMeshPath(part->mModel));
models.push_back(part->mModel);
}
};
if (equipped->getType() == ESM::Clothing::sRecordId)
@ -501,7 +508,7 @@ namespace MWClass
}
else
{
std::string model = equipped->getClass().getModel(*equipped);
std::string_view model = equipped->getClass().getModel(*equipped);
if (!model.empty())
models.push_back(model);
}
@ -510,14 +517,14 @@ namespace MWClass
}
// preload body parts
if (race)
if (const ESM::Race* race = esmStore->get<ESM::Race>().search(npc->mBase->mRace))
{
const std::vector<const ESM::BodyPart*>& parts
= MWRender::NpcAnimation::getBodyParts(race->mId, female, false, false);
for (const ESM::BodyPart* part : parts)
{
if (part && !part->mModel.empty())
models.push_back(Misc::ResourceHelpers::correctMeshPath(part->mModel));
models.push_back(part->mModel);
}
}
}

6
apps/openmw/mwclass/npc.hpp
Unescape Escape View File

@ -85,7 +85,7 @@ namespace MWClass
const MWWorld::Ptr& attacker, const osg::Vec3f& hitPosition, bool successful,
const MWMechanics::DamageSourceType sourceType) const override;
void getModelsToPreload(const MWWorld::ConstPtr& ptr, std::vector<std::string>& models) const override;
void getModelsToPreload(const MWWorld::ConstPtr& ptr, std::vector<std::string_view>& models) const override;
///< Get a list of models to preload that this object may use (directly or indirectly). default implementation:
///< list getModel().
@ -131,7 +131,9 @@ namespace MWClass
ESM::RefId getSoundIdFromSndGen(const MWWorld::Ptr& ptr, std::string_view name) const override;
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
std::string getCorrectedModel(const MWWorld::ConstPtr& ptr) const override;
float getSkill(const MWWorld::Ptr& ptr, ESM::RefId id) const override;

2
apps/openmw/mwclass/potion.cpp
Unescape Escape View File

@ -38,7 +38,7 @@ namespace MWClass
}
}
std::string Potion::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Potion::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Potion>(ptr);
}

2
apps/openmw/mwclass/potion.hpp
Unescape Escape View File

@ -47,7 +47,7 @@ namespace MWClass
const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
///< Return name of inventory icon.
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
float getWeight(const MWWorld::ConstPtr& ptr) const override;

2
apps/openmw/mwclass/probe.cpp
Unescape Escape View File

@ -38,7 +38,7 @@ namespace MWClass
}
}
std::string Probe::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Probe::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Probe>(ptr);
}

2
apps/openmw/mwclass/probe.hpp
Unescape Escape View File

@ -54,7 +54,7 @@ namespace MWClass
std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
///< Generate action for using via inventory menu
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;

2
apps/openmw/mwclass/repair.cpp
Unescape Escape View File

@ -36,7 +36,7 @@ namespace MWClass
}
}
std::string Repair::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Repair::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Repair>(ptr);
}

2
apps/openmw/mwclass/repair.hpp
Unescape Escape View File

@ -44,7 +44,7 @@ namespace MWClass
const std::string& getInventoryIcon(const MWWorld::ConstPtr& ptr) const override;
///< Return name of inventory icon.
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
///< Generate action for using via inventory menu (default implementation: return a

2
apps/openmw/mwclass/static.cpp
Unescape Escape View File

@ -43,7 +43,7 @@ namespace MWClass
physics.addObject(ptr, model, rotation, MWPhysics::CollisionType_World);
}
std::string Static::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Static::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Static>(ptr);
}

2
apps/openmw/mwclass/static.hpp
Unescape Escape View File

@ -32,7 +32,7 @@ namespace MWClass
bool hasToolTip(const MWWorld::ConstPtr& ptr) const override;
///< @return true if this object has a tooltip when focused (default implementation: true)
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
};
}

2
apps/openmw/mwclass/weapon.cpp
Unescape Escape View File

@ -43,7 +43,7 @@ namespace MWClass
}
}
std::string Weapon::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Weapon::getModel(const MWWorld::ConstPtr& ptr) const
{
return getClassModel<ESM::Weapon>(ptr);
}

2
apps/openmw/mwclass/weapon.hpp
Unescape Escape View File

@ -72,7 +72,7 @@ namespace MWClass
std::unique_ptr<MWWorld::Action> use(const MWWorld::Ptr& ptr, bool force = false) const override;
///< Generate action for using via inventory menu
std::string getModel(const MWWorld::ConstPtr& ptr) const override;
std::string_view getModel(const MWWorld::ConstPtr& ptr) const override;
bool canSell(const MWWorld::ConstPtr& item, int npcServices) const override;

8
apps/openmw/mwrender/actoranimation.cpp
Unescape Escape View File

@ -134,7 +134,7 @@ namespace MWRender
}
}
}
return shield.getClass().getModel(shield);
return shield.getClass().getCorrectedModel(shield);
}
std::string ActorAnimation::getSheathedShieldMesh(const MWWorld::ConstPtr& shield) const
@ -339,7 +339,7 @@ namespace MWRender
if (MWMechanics::getWeaponType(type)->mWeaponClass == ESM::WeaponType::Thrown)
showHolsteredWeapons = false;
std::string mesh = weapon->getClass().getModel(*weapon);
std::string mesh = weapon->getClass().getCorrectedModel(*weapon);
std::string scabbardName = mesh;
std::string_view boneName = getHolsteredWeaponBoneName(*weapon);
@ -409,7 +409,7 @@ namespace MWRender
if (weapon == inv.end() || weapon->getType() != ESM::Weapon::sRecordId)
return;
std::string mesh = weapon->getClass().getModel(*weapon);
std::string_view mesh = weapon->getClass().getModel(*weapon);
std::string_view boneName = getHolsteredWeaponBoneName(*weapon);
if (mesh.empty() || boneName.empty())
return;
@ -466,7 +466,7 @@ namespace MWRender
// Add new ones
osg::Vec4f glowColor = ammo->getClass().getEnchantmentColor(*ammo);
std::string model = ammo->getClass().getModel(*ammo);
std::string model = ammo->getClass().getCorrectedModel(*ammo);
for (unsigned int i = 0; i < ammoCount; ++i)
{
osg::ref_ptr<osg::Group> arrowNode = ammoNode->getChild(i)->asGroup();

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

@ -110,7 +110,7 @@ namespace MWRender
MWWorld::ConstPtr item = *it;
std::string_view bonename;
std::string itemModel = item.getClass().getModel(item);
std::string itemModel = item.getClass().getCorrectedModel(item);
if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
{
if (item.getType() == ESM::Weapon::sRecordId)

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

@ -22,7 +22,7 @@ namespace MWRender
const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem)
: Animation(ptr, std::move(parentNode), resourceSystem)
{
setObjectRoot(mPtr.getClass().getModel(mPtr), true, true, false);
setObjectRoot(mPtr.getClass().getCorrectedModel(mPtr), true, true, false);
updateParts();
}

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

@ -952,7 +952,7 @@ namespace MWRender
if (weapon != inv.end())
{
osg::Vec4f glowColor = weapon->getClass().getEnchantmentColor(*weapon);
std::string mesh = weapon->getClass().getModel(*weapon);
std::string mesh = weapon->getClass().getCorrectedModel(*weapon);
addOrReplaceIndividualPart(ESM::PRT_Weapon, MWWorld::InventoryStore::Slot_CarriedRight, 1, mesh,
!weapon->getClass().getEnchantment(*weapon).empty(), &glowColor);
@ -1012,7 +1012,7 @@ namespace MWRender
if (show && iter != inv.end())
{
osg::Vec4f glowColor = iter->getClass().getEnchantmentColor(*iter);
std::string mesh = iter->getClass().getModel(*iter);
std::string mesh = iter->getClass().getCorrectedModel(*iter);
// For shields we must try to use the body part model
if (iter->getType() == ESM::Armor::sRecordId)
{

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

@ -1497,7 +1497,7 @@ namespace MWRender
osg::Vec3f RenderingManager::getHalfExtents(const MWWorld::ConstPtr& object) const
{
osg::Vec3f halfExtents(0, 0, 0);
std::string modelName = object.getClass().getModel(object);
std::string modelName = object.getClass().getCorrectedModel(object);
if (modelName.empty())
return halfExtents;
@ -1519,7 +1519,7 @@ namespace MWRender
osg::BoundingBox RenderingManager::getCullSafeBoundingBox(const MWWorld::Ptr& ptr) const
{
const std::string model = ptr.getClass().getModel(ptr);
const std::string model = ptr.getClass().getCorrectedModel(ptr);
if (model.empty())
return {};

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

@ -86,7 +86,7 @@ namespace MWRender
MWWorld::ConstContainerStoreIterator ammo = inv.getSlot(MWWorld::InventoryStore::Slot_Ammunition);
if (ammo == inv.end())
return;
std::string model = ammo->getClass().getModel(*ammo);
std::string model = ammo->getClass().getCorrectedModel(*ammo);
osg::ref_ptr<osg::Node> arrow = getResourceSystem()->getSceneManager()->getInstance(model, parent);

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

@ -1435,7 +1435,7 @@ namespace MWScript
msg << "Coordinates: " << pos.x() << " " << pos.y() << " " << pos.z() << std::endl;
auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
std::string model
= ::Misc::ResourceHelpers::correctActorModelPath(ptr.getClass().getModel(ptr), vfs);
= ::Misc::ResourceHelpers::correctActorModelPath(ptr.getClass().getCorrectedModel(ptr), vfs);
msg << "Model: " << model << std::endl;
if (!model.empty())
{
@ -1711,7 +1711,7 @@ namespace MWScript
for (const T& record : store.get<T>())
{
MWWorld::ManualRef ref(store, record.mId);
std::string model = ref.getPtr().getClass().getModel(ref.getPtr());
std::string model = ref.getPtr().getClass().getCorrectedModel(ref.getPtr());
if (!model.empty())
{
sceneManager->getTemplate(model);

26
apps/openmw/mwworld/cellpreloader.cpp
Unescape Escape View File

@ -9,6 +9,7 @@
#include <components/loadinglistener/reporter.hpp>
#include <components/misc/constants.hpp>
#include <components/misc/resourcehelpers.hpp>
#include <components/misc/strings/algorithm.hpp>
#include <components/misc/strings/lower.hpp>
#include <components/resource/bulletshapemanager.hpp>
#include <components/resource/keyframemanager.hpp>
@ -59,7 +60,7 @@ namespace MWWorld
return true;
}
std::vector<std::string>& mOut;
std::vector<std::string_view>& mOut;
};
/// Worker thread item: preload models in a cell.
@ -105,28 +106,28 @@ namespace MWWorld
}
}
for (std::string& mesh : mMeshes)
std::string mesh;
std::string kfname;
for (std::string_view path : mMeshes)
{
if (mAbort)
break;
try
{
mesh = Misc::ResourceHelpers::correctMeshPath(path);
mesh = Misc::ResourceHelpers::correctActorModelPath(mesh, mSceneManager->getVFS());
size_t slashpos = mesh.find_last_of("/\\");
if (slashpos != std::string::npos && slashpos != mesh.size() - 1)
{
Misc::StringUtils::lowerCaseInPlace(mesh);
if (mesh[slashpos + 1] == 'x')
if (Misc::StringUtils::toLower(mesh[slashpos + 1]) == 'x'
&& Misc::StringUtils::ciEndsWith(mesh, ".nif"))
{
if (mesh.size() > 4 && mesh.ends_with(".nif"))
{
std::string kfname = mesh;
kfname.replace(kfname.size() - 4, 4, ".kf");
if (mSceneManager->getVFS()->exists(kfname))
mPreloadedObjects.insert(mKeyframeManager->get(kfname));
}
kfname = mesh;
kfname.replace(kfname.size() - 4, 4, ".kf");
if (mSceneManager->getVFS()->exists(kfname))
mPreloadedObjects.insert(mKeyframeManager->get(kfname));
}
}
mPreloadedObjects.insert(mSceneManager->getTemplate(mesh));
@ -144,11 +145,10 @@ namespace MWWorld
}
private:
typedef std::vector<std::string> MeshList;
bool mIsExterior;
int mX;
int mY;
MeshList mMeshes;
std::vector<std::string_view> mMeshes;
Resource::SceneManager* mSceneManager;
Resource::BulletShapeManager* mBulletShapeManager;
Resource::KeyframeManager* mKeyframeManager;

15
apps/openmw/mwworld/class.cpp
Unescape Escape View File

@ -6,6 +6,7 @@
#include <components/esm3/loadench.hpp>
#include <components/esm3/loadmgef.hpp>
#include <components/esm3/loadsoun.hpp>
#include <components/misc/resourcehelpers.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/windowmanager.hpp"
@ -305,19 +306,27 @@ namespace MWWorld
void Class::adjustScale(const MWWorld::ConstPtr& ptr, osg::Vec3f& scale, bool rendering) const {}
std::string Class::getModel(const MWWorld::ConstPtr& ptr) const
std::string_view Class::getModel(const MWWorld::ConstPtr& ptr) const
{
return {};
}
std::string Class::getCorrectedModel(const MWWorld::ConstPtr& ptr) const
{
std::string_view model = getModel(ptr);
if (!model.empty())
return Misc::ResourceHelpers::correctMeshPath(model);
return {};
}
bool Class::useAnim() const
{
return false;
}
void Class::getModelsToPreload(const ConstPtr& ptr, std::vector<std::string>& models) const
void Class::getModelsToPreload(const ConstPtr& ptr, std::vector<std::string_view>& models) const
{
std::string model = getModel(ptr);
std::string_view model = getModel(ptr);
if (!model.empty())
models.push_back(model);
}

6
apps/openmw/mwworld/class.hpp
Unescape Escape View File

@ -275,12 +275,14 @@ namespace MWWorld
virtual int getServices(const MWWorld::ConstPtr& actor) const;
virtual std::string getModel(const MWWorld::ConstPtr& ptr) const;
virtual std::string_view getModel(const MWWorld::ConstPtr& ptr) const;
virtual std::string getCorrectedModel(const MWWorld::ConstPtr& ptr) const;
virtual bool useAnim() const;
///< Whether or not to use animated variant of model (default false)
virtual void getModelsToPreload(const MWWorld::ConstPtr& ptr, std::vector<std::string>& models) const;
virtual void getModelsToPreload(const MWWorld::ConstPtr& ptr, std::vector<std::string_view>& models) const;
///< Get a list of models to preload that this object may use (directly or indirectly). default implementation:
///< list getModel().

8
apps/openmw/mwworld/projectilemanager.cpp
Unescape Escape View File

@ -311,7 +311,7 @@ namespace MWWorld
osg::Vec4 lightDiffuseColor = getMagicBoltLightDiffuseColor(state.mEffects);
auto model = ptr.getClass().getModel(ptr);
auto model = ptr.getClass().getCorrectedModel(ptr);
createModel(state, model, pos, orient, true, true, lightDiffuseColor, texture);
MWBase::SoundManager* sndMgr = MWBase::Environment::get().getSoundManager();
@ -351,7 +351,7 @@ namespace MWWorld
MWWorld::ManualRef ref(*MWBase::Environment::get().getESMStore(), projectile.getCellRef().getRefId());
MWWorld::Ptr ptr = ref.getPtr();
const auto model = ptr.getClass().getModel(ptr);
const auto model = ptr.getClass().getCorrectedModel(ptr);
createModel(state, model, pos, orient, false, false, osg::Vec4(0, 0, 0, 0));
if (!ptr.getClass().getEnchantment(ptr).empty())
SceneUtil::addEnchantedGlow(state.mNode, mResourceSystem, ptr.getClass().getEnchantmentColor(ptr));
@ -696,7 +696,7 @@ namespace MWWorld
{
MWWorld::ManualRef ref(*MWBase::Environment::get().getESMStore(), esm.mId);
MWWorld::Ptr ptr = ref.getPtr();
model = ptr.getClass().getModel(ptr);
model = ptr.getClass().getCorrectedModel(ptr);
int weaponType = ptr.get<ESM::Weapon>()->mBase->mData.mType;
state.mThrown = MWMechanics::getWeaponType(weaponType)->mWeaponClass == ESM::WeaponType::Thrown;
@ -749,7 +749,7 @@ namespace MWWorld
{
MWWorld::ManualRef ref(*MWBase::Environment::get().getESMStore(), state.mIdMagic.at(0));
MWWorld::Ptr ptr = ref.getPtr();
model = ptr.getClass().getModel(ptr);
model = ptr.getClass().getCorrectedModel(ptr);
}
catch (...)
{

2
apps/openmw/mwworld/scene.cpp
Unescape Escape View File

@ -96,7 +96,7 @@ namespace
{
if (Misc::ResourceHelpers::isHiddenMarker(ptr.getCellRef().getRefId()))
return {};
return ptr.getClass().getModel(ptr);
return ptr.getClass().getCorrectedModel(ptr);
}
void addObject(const MWWorld::Ptr& ptr, const MWWorld::World& world, const std::vector<ESM::RefNum>& pagedRefs,

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

@ -2306,7 +2306,7 @@ namespace MWWorld
MWBase::Environment::get().getWindowManager()->watchActor(getPlayerPtr());
mPhysics->remove(getPlayerPtr());
mPhysics->addActor(getPlayerPtr(), getPlayerPtr().getClass().getModel(getPlayerPtr()));
mPhysics->addActor(getPlayerPtr(), getPlayerPtr().getClass().getCorrectedModel(getPlayerPtr()));
applyLoopingParticles(player);
@ -3696,7 +3696,7 @@ namespace MWWorld
try
{
MWWorld::ManualRef ref(store, obj);
std::string model = ref.getPtr().getClass().getModel(ref.getPtr());
std::string model = ref.getPtr().getClass().getCorrectedModel(ref.getPtr());
if (!model.empty())
scene->preload(model, ref.getPtr().getClass().useAnim());
}

Write Preview
Loading…
Cancel
Save