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

Merge branch 'paging' into 'master'

Browse source 
Unbreak un-paging (#7768)

Closes #7768

See merge request OpenMW/openmw!3754
This commit is contained in:
psi29a 2024-01-10 19:06:43 +00:00
commit a6e07dd33a
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwworld/scene.cpp
View file

@ -111,11 +111,16 @@ namespace
std::string model = getModel(ptr); std::string model = getModel(ptr);
const auto rotation = makeDirectNodeRotation(ptr); const auto rotation = makeDirectNodeRotation(ptr);
// Null node meant to distinguish objects that aren't in the scene from paged objects
// TODO: find a more clever way to make paging exclusion more reliable?
static const osg::ref_ptr<SceneUtil::PositionAttitudeTransform> pagedNode(
new SceneUtil::PositionAttitudeTransform);
ESM::RefNum refnum = ptr.getCellRef().getRefNum(); ESM::RefNum refnum = ptr.getCellRef().getRefNum();
if (!refnum.hasContentFile() || !std::binary_search(pagedRefs.begin(), pagedRefs.end(), refnum)) if (!refnum.hasContentFile() || !std::binary_search(pagedRefs.begin(), pagedRefs.end(), refnum))
ptr.getClass().insertObjectRendering(ptr, model, rendering); ptr.getClass().insertObjectRendering(ptr, model, rendering);
else else
ptr.getRefData().setBaseNode(nullptr); ptr.getRefData().setBaseNode(pagedNode);
setNodeRotation(ptr, rendering, rotation); setNodeRotation(ptr, rendering, rotation);
if (ptr.getClass().useAnim()) if (ptr.getClass().useAnim())