mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-29 08:15:35 +00:00
Code Issues Releases Wiki Activity

Clarify scope and constness of the variables

Browse source
This commit is contained in:
elsid 2024-05-05 13:33:04 +02:00
parent d9d8802f3a
commit 3790e97184
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
3 changed files with 50 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwbase/world.hpp
View file

@ -148,7 +148,7 @@ namespace MWBase
virtual MWWorld::ConstPtr getPlayerConstPtr() const = 0; virtual MWWorld::ConstPtr getPlayerConstPtr() const = 0;
virtual MWWorld::ESMStore& getStore() = 0; virtual MWWorld::ESMStore& getStore() = 0;
const MWWorld::ESMStore& getStore() const { return const_cast<MWBase::World*>(this)->getStore(); } virtual const MWWorld::ESMStore& getStore() const = 0;
virtual const std::vector<int>& getESMVersions() const = 0; virtual const std::vector<int>& getESMVersions() const = 0;

104
apps/openmw/mwrender/objectpaging.cpp
View file

@ -59,7 +59,7 @@ namespace MWRender
} }
} }
std::string getModel(int type, const ESM::RefId& id, const MWWorld::ESMStore& store) std::string getModel(int type, ESM::RefId id, const MWWorld::ESMStore& store)
{ {
switch (type) switch (type)
{ {
@ -77,24 +77,21 @@ namespace MWRender
} }
} }
osg::ref_ptr<osg::Node> ObjectPaging::getChunk(float size, const osg::Vec2f& center, unsigned char lod, osg::ref_ptr<osg::Node> ObjectPaging::getChunk(float size, const osg::Vec2f& center, unsigned char /*lod*/,
unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile) unsigned int lodFlags, bool activeGrid, const osg::Vec3f& viewPoint, bool compile)
{ {
lod = static_cast<unsigned char>(lodFlags >> (4 * 4));
if (activeGrid && !mActiveGrid) if (activeGrid && !mActiveGrid)
return nullptr; return nullptr;
ChunkId id = std::make_tuple(center, size, activeGrid); const ChunkId id = std::make_tuple(center, size, activeGrid);
osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(id); if (const osg::ref_ptr<osg::Object> obj = mCache->getRefFromObjectCache(id))
if (obj)
return static_cast<osg::Node*>(obj.get()); return static_cast<osg::Node*>(obj.get());
else
{ const unsigned char lod = static_cast<unsigned char>(lodFlags >> (4 * 4));
osg::ref_ptr<osg::Node> node = createChunk(size, center, activeGrid, viewPoint, compile, lod); osg::ref_ptr<osg::Node> node = createChunk(size, center, activeGrid, viewPoint, compile, lod);
mCache->addEntryToObjectCache(id, node.get()); mCache->addEntryToObjectCache(id, node.get());
return node; return node;
}
} }
namespace namespace
@ -489,10 +486,10 @@ namespace MWRender
} }
std::map<ESM::RefNum, PagedCellRef> collectESM3References( std::map<ESM::RefNum, PagedCellRef> collectESM3References(
float size, const osg::Vec2i& startCell, ESM::ReadersCache& readers) float size, const osg::Vec2i& startCell, const MWWorld::ESMStore& store)
{ {
std::map<ESM::RefNum, PagedCellRef> refs; std::map<ESM::RefNum, PagedCellRef> refs;
const auto& store = MWBase::Environment::get().getWorld()->getStore(); ESM::ReadersCache readers;
for (int cellX = startCell.x(); cellX < startCell.x() + size; ++cellX) for (int cellX = startCell.x(); cellX < startCell.x() + size; ++cellX)
{ {
for (int cellY = startCell.y(); cellY < startCell.y() + size; ++cellY) for (int cellY = startCell.y(); cellY < startCell.y() + size; ++cellY)
@ -560,19 +557,15 @@ namespace MWRender
osg::ref_ptr<osg::Node> ObjectPaging::createChunk(float size, const osg::Vec2f& center, bool activeGrid, osg::ref_ptr<osg::Node> ObjectPaging::createChunk(float size, const osg::Vec2f& center, bool activeGrid,
const osg::Vec3f& viewPoint, bool compile, unsigned char lod) const osg::Vec3f& viewPoint, bool compile, unsigned char lod)
{ {
osg::Vec2i startCell = osg::Vec2i(std::floor(center.x() - size / 2.f), std::floor(center.y() - size / 2.f)); const osg::Vec2i startCell(std::floor(center.x() - size / 2.f), std::floor(center.y() - size / 2.f));
const MWBase::World& world = *MWBase::Environment::get().getWorld();
osg::Vec3f worldCenter = osg::Vec3f(center.x(), center.y(), 0) * getCellSize(mWorldspace); const MWWorld::ESMStore& store = world.getStore();
osg::Vec3f relativeViewPoint = viewPoint - worldCenter;
std::map<ESM::RefNum, PagedCellRef> refs; std::map<ESM::RefNum, PagedCellRef> refs;
ESM::ReadersCache readers;
const auto& world = MWBase::Environment::get().getWorld();
const auto& store = world->getStore();
if (mWorldspace == ESM::Cell::sDefaultWorldspaceId) if (mWorldspace == ESM::Cell::sDefaultWorldspaceId)
{ {
refs = collectESM3References(size, startCell, readers); refs = collectESM3References(size, startCell, store);
} }
else else
{ {
@ -594,8 +587,8 @@ namespace MWRender
} }
} }
osg::Vec2f minBound = (center - osg::Vec2f(size / 2.f, size / 2.f)); const osg::Vec2f minBound = (center - osg::Vec2f(size / 2.f, size / 2.f));
osg::Vec2f maxBound = (center + osg::Vec2f(size / 2.f, size / 2.f)); const osg::Vec2f maxBound = (center + osg::Vec2f(size / 2.f, size / 2.f));
struct InstanceList struct InstanceList
{ {
std::vector<const PagedCellRef*> mInstances; std::vector<const PagedCellRef*> mInstances;
@ -604,7 +597,7 @@ namespace MWRender
}; };
typedef std::map<osg::ref_ptr<const osg::Node>, InstanceList> NodeMap; typedef std::map<osg::ref_ptr<const osg::Node>, InstanceList> NodeMap;
NodeMap nodes; NodeMap nodes;
osg::ref_ptr<RefnumSet> refnumSet = activeGrid ? new RefnumSet : nullptr; const osg::ref_ptr<RefnumSet> refnumSet = activeGrid ? new RefnumSet : nullptr;
// Mask_UpdateVisitor is used in such cases in NIF loader: // Mask_UpdateVisitor is used in such cases in NIF loader:
// 1. For collision nodes, which is not supposed to be rendered. // 1. For collision nodes, which is not supposed to be rendered.
@ -612,18 +605,13 @@ namespace MWRender
// Since ObjectPaging does not handle VisController, we can just ignore both types of nodes. // Since ObjectPaging does not handle VisController, we can just ignore both types of nodes.
constexpr auto copyMask = ~Mask_UpdateVisitor; constexpr auto copyMask = ~Mask_UpdateVisitor;
auto cellSize = getCellSize(mWorldspace); const int cellSize = getCellSize(mWorldspace);
const auto smallestDistanceToChunk = (size > 1 / 8.f) ? (size * cellSize) : 0.f; const float smallestDistanceToChunk = (size > 1 / 8.f) ? (size * cellSize) : 0.f;
const auto higherDistanceToChunk = [&] { const float higherDistanceToChunk
if (!activeGrid) = activeGrid ? ((size < 1) ? 5 : 3) * cellSize * size + 1 : smallestDistanceToChunk + 1;
return smallestDistanceToChunk + 1;
return ((size < 1) ? 5 : 3) * cellSize * size + 1;
}();
AnalyzeVisitor analyzeVisitor(copyMask); AnalyzeVisitor analyzeVisitor(copyMask);
float minSize = mMinSize; const float minSize = mMinSizeMergeFactor ? mMinSize * mMinSizeMergeFactor : mMinSize;
if (mMinSizeMergeFactor)
minSize *= mMinSizeMergeFactor;
for (const auto& [refNum, ref] : refs) for (const auto& [refNum, ref] : refs)
{ {
if (size < 1.f) if (size < 1.f)
@ -674,13 +662,13 @@ namespace MWRender
if (found != mLODNameCache.end() && found->first == key) if (found != mLODNameCache.end() && found->first == key)
model = found->second; model = found->second;
else else
model = mLODNameCache model
.insert(found, = mLODNameCache
{ key, .insert(found,
Misc::ResourceHelpers::getLODMeshName( { key,
world->getESMVersions()[refNum.mContentFile], model, Misc::ResourceHelpers::getLODMeshName(world.getESMVersions()[refNum.mContentFile],
mSceneManager->getVFS(), lod) }) model, mSceneManager->getVFS(), lod) })
->second; ->second;
} }
osg::ref_ptr<const osg::Node> cnode = mSceneManager->getTemplate(model, false); osg::ref_ptr<const osg::Node> cnode = mSceneManager->getTemplate(model, false);
@ -726,6 +714,7 @@ namespace MWRender
emplaced.first->second.mInstances.push_back(&ref); emplaced.first->second.mInstances.push_back(&ref);
} }
const osg::Vec3f worldCenter = osg::Vec3f(center.x(), center.y(), 0) * getCellSize(mWorldspace);
osg::ref_ptr<osg::Group> group = new osg::Group; osg::ref_ptr<osg::Group> group = new osg::Group;
osg::ref_ptr<osg::Group> mergeGroup = new osg::Group; osg::ref_ptr<osg::Group> mergeGroup = new osg::Group;
osg::ref_ptr<Resource::TemplateMultiRef> templateRefs = new Resource::TemplateMultiRef; osg::ref_ptr<Resource::TemplateMultiRef> templateRefs = new Resource::TemplateMultiRef;
@ -738,15 +727,14 @@ namespace MWRender
const AnalyzeVisitor::Result& analyzeResult = pair.second.mAnalyzeResult; const AnalyzeVisitor::Result& analyzeResult = pair.second.mAnalyzeResult;
float mergeCost = analyzeResult.mNumVerts * size; const float mergeCost = analyzeResult.mNumVerts * size;
float mergeBenefit = analyzeVisitor.getMergeBenefit(analyzeResult) * mMergeFactor; const float mergeBenefit = analyzeVisitor.getMergeBenefit(analyzeResult) * mMergeFactor;
bool merge = mergeBenefit > mergeCost; const bool merge = mergeBenefit > mergeCost;
float minSizeMerged = mMinSize; const float factor2
float factor2 = mergeBenefit > 0 ? std::min(1.f, mergeCost * mMinSizeCostMultiplier / mergeBenefit) : 1; = mergeBenefit > 0 ? std::min(1.f, mergeCost * mMinSizeCostMultiplier / mergeBenefit) : 1;
float minSizeMergeFactor2 = (1 - factor2) * mMinSizeMergeFactor + factor2; const float minSizeMergeFactor2 = (1 - factor2) * mMinSizeMergeFactor + factor2;
if (minSizeMergeFactor2 > 0) const float minSizeMerged = minSizeMergeFactor2 > 0 ? mMinSize * minSizeMergeFactor2 : mMinSize;
minSizeMerged *= minSizeMergeFactor2;
unsigned int numinstances = 0; unsigned int numinstances = 0;
for (const PagedCellRef* refPtr : pair.second.mInstances) for (const PagedCellRef* refPtr : pair.second.mInstances)
@ -758,11 +746,11 @@ namespace MWRender
< (viewPoint - ref.mPosition).length2() * minSizeMerged * minSizeMerged) < (viewPoint - ref.mPosition).length2() * minSizeMerged * minSizeMerged)
continue; continue;
osg::Vec3f nodePos = ref.mPosition - worldCenter; const osg::Vec3f nodePos = ref.mPosition - worldCenter;
osg::Quat nodeAttitude = osg::Quat(ref.mRotation.z(), osg::Vec3f(0, 0, -1)) const osg::Quat nodeAttitude = osg::Quat(ref.mRotation.z(), osg::Vec3f(0, 0, -1))
* osg::Quat(ref.mRotation.y(), osg::Vec3f(0, -1, 0)) * osg::Quat(ref.mRotation.y(), osg::Vec3f(0, -1, 0))
* osg::Quat(ref.mRotation.x(), osg::Vec3f(-1, 0, 0)); * osg::Quat(ref.mRotation.x(), osg::Vec3f(-1, 0, 0));
osg::Vec3f nodeScale = osg::Vec3f(ref.mScale, ref.mScale, ref.mScale); const osg::Vec3f nodeScale(ref.mScale, ref.mScale, ref.mScale);
osg::ref_ptr<osg::Group> trans; osg::ref_ptr<osg::Group> trans;
if (merge) if (merge)
@ -815,7 +803,7 @@ namespace MWRender
} }
} }
osg::Group* attachTo = merge ? mergeGroup : group; osg::Group* const attachTo = merge ? mergeGroup : group;
attachTo->addChild(trans); attachTo->addChild(trans);
++numinstances; ++numinstances;
} }
@ -836,6 +824,8 @@ namespace MWRender
} }
} }
const osg::Vec3f relativeViewPoint = viewPoint - worldCenter;
if (mergeGroup->getNumChildren()) if (mergeGroup->getNumChildren())
{ {
SceneUtil::Optimizer optimizer; SceneUtil::Optimizer optimizer;
@ -845,7 +835,7 @@ namespace MWRender
optimizer.setMergeAlphaBlending(true); optimizer.setMergeAlphaBlending(true);
} }
optimizer.setIsOperationPermissibleForObjectCallback(new CanOptimizeCallback); optimizer.setIsOperationPermissibleForObjectCallback(new CanOptimizeCallback);
unsigned int options = SceneUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS const unsigned int options = SceneUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS
| SceneUtil::Optimizer::REMOVE_REDUNDANT_NODES | SceneUtil::Optimizer::MERGE_GEOMETRY; | SceneUtil::Optimizer::REMOVE_REDUNDANT_NODES | SceneUtil::Optimizer::MERGE_GEOMETRY;
optimizer.optimize(mergeGroup, options); optimizer.optimize(mergeGroup, options);
@ -864,7 +854,7 @@ namespace MWRender
} }
} }
auto ico = mSceneManager->getIncrementalCompileOperation(); osgUtil::IncrementalCompileOperation* const ico = mSceneManager->getIncrementalCompileOperation();
if (!stateToCompile.empty() && ico) if (!stateToCompile.empty() && ico)
{ {
auto compileSet = new osgUtil::IncrementalCompileOperation::CompileSet(group); auto compileSet = new osgUtil::IncrementalCompileOperation::CompileSet(group);
@ -1020,7 +1010,7 @@ namespace MWRender
if (!std::get<2>(chunkId)) if (!std::get<2>(chunkId))
return; return;
const osg::Vec2f& center = std::get<0>(chunkId); const osg::Vec2f& center = std::get<0>(chunkId);
bool activeGrid = (center.x() > mActiveGrid.x() || center.y() > mActiveGrid.y() const bool activeGrid = (center.x() > mActiveGrid.x() || center.y() > mActiveGrid.y()
|| center.x() < mActiveGrid.z() || center.y() < mActiveGrid.w()); || center.x() < mActiveGrid.z() || center.y() < mActiveGrid.w());
if (!activeGrid) if (!activeGrid)
return; return;

2
apps/openmw/mwworld/worldimp.hpp
View file

@ -239,6 +239,8 @@ namespace MWWorld
MWWorld::ESMStore& getStore() override { return mStore; } MWWorld::ESMStore& getStore() override { return mStore; }
const MWWorld::ESMStore& getStore() const override { return mStore; }
const std::vector<int>& getESMVersions() const override; const std::vector<int>& getESMVersions() const override;
LocalScripts& getLocalScripts() override; LocalScripts& getLocalScripts() override;