mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-25 15:11:33 +00:00
Code Issues Releases Wiki Activity

Hide ESM4 LOD objects and markers

Browse source
This commit is contained in:
Petr Mikheev 2023-05-16 10:24:56 +02:00
parent 29031d0586
commit c8056f6561
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/openmw/mwclass/esm4base.hpp
View file

@ -2,6 +2,7 @@
#define GAME_MWCLASS_ESM4BASE_H #define GAME_MWCLASS_ESM4BASE_H
#include <components/esm4/loadstat.hpp> #include <components/esm4/loadstat.hpp>
#include <components/misc/strings/algorithm.hpp>
#include "../mwgui/tooltips.hpp" #include "../mwgui/tooltips.hpp"
@ -44,9 +45,6 @@ namespace MWClass
void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model, void insertObjectRendering(const MWWorld::Ptr& ptr, const std::string& model,
MWRender::RenderingInterface& renderingInterface) const override MWRender::RenderingInterface& renderingInterface) const override
{ {
const MWWorld::LiveCellRef<Record>* ref = ptr.get<Record>();
if (ref->mBase->mFlags & ESM4::Rec_Marker)
return;
ESM4Impl::insertObjectRendering(ptr, model, renderingInterface); ESM4Impl::insertObjectRendering(ptr, model, renderingInterface);
} }
@ -59,9 +57,6 @@ namespace MWClass
void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation, void insertObjectPhysics(const MWWorld::Ptr& ptr, const std::string& model, const osg::Quat& rotation,
MWPhysics::PhysicsSystem& physics) const override MWPhysics::PhysicsSystem& physics) const override
{ {
const MWWorld::LiveCellRef<Record>* ref = ptr.get<Record>();
if (ref->mBase->mFlags & ESM4::Rec_Marker)
return;
ESM4Impl::insertObjectPhysics(ptr, model, rotation, physics); ESM4Impl::insertObjectPhysics(ptr, model, rotation, physics);
} }
@ -69,7 +64,19 @@ namespace MWClass
std::string_view getName(const MWWorld::ConstPtr& ptr) const override { return ""; } std::string_view getName(const MWWorld::ConstPtr& ptr) const override { return ""; }
std::string getModel(const MWWorld::ConstPtr& ptr) const override { return getClassModel<Record>(ptr); } std::string getModel(const MWWorld::ConstPtr& ptr) const override
{
std::string 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.
// TODO: Figure out a better way find markers and LOD meshes; show LOD only outside of active grid.
if (model.empty() || Misc::StringUtils::ciStartsWith(model, "meshes\\marker")
|| Misc::StringUtils::ciEndsWith(model, "lod.nif"))
return "";
return model;
}
}; };
class ESM4Static final : public MWWorld::RegisteredClass<ESM4Static, ESM4Base<ESM4::Static>> class ESM4Static final : public MWWorld::RegisteredClass<ESM4Static, ESM4Base<ESM4::Static>>