summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpsi29a <psi29a@gmail.com>2021-06-16 11:47:30 +0000
committerpsi29a <psi29a@gmail.com>2021-06-16 11:47:30 +0000
commit071786aff68ecb686a6f2930f98d7046a65cf8c3 (patch)
treeeb20fd07f48d61f01bbb9c69852c857b5258bb3d
parent329ec8f0440567ac9f557e846c40cc522239d12f (diff)
parent7fa67ff675e944e80dde261a62e6b8fccf8ba79e (diff)
Merge branch 'UseSameDistanceForAllLodsOfTheCurrentChunk' into 'master'
Use same distance for all lods of the current chunk Closes #6061 See merge request OpenMW/openmw!940
-rw-r--r--apps/openmw/mwrender/objectpaging.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index b6bae8cbb5..8e29f0af4f 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -477,6 +477,8 @@ namespace MWRender
constexpr auto copyMask = ~Mask_UpdateVisitor;
AnalyzeVisitor analyzeVisitor(copyMask);
+ osg::Vec3f center3 = { center.x(), center.y(), 0.f };
+ analyzeVisitor.mCurrentDistance = (viewPoint - center3).length2();
float minSize = mMinSize;
if (mMinSizeMergeFactor)
minSize *= mMinSizeMergeFactor;
@@ -546,7 +548,6 @@ namespace MWRender
continue;
}
- analyzeVisitor.mCurrentDistance = dSqr;
auto emplaced = nodes.emplace(cnode, InstanceList());
if (emplaced.second)
{