mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 18:15:32 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2813 from Capostrophic/collisionswitch

Browse source 
Fix collision switch node mask (again)
This commit is contained in:
Bret Curtis 2020-04-30 13:50:09 +02:00 committed by GitHub
commit 7345c89b54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -376,6 +376,7 @@ namespace MWRender
mViewer->getCamera()->setCullMask(~(Mask_UpdateVisitor|Mask_SimpleWater)); mViewer->getCamera()->setCullMask(~(Mask_UpdateVisitor|Mask_SimpleWater));
NifOsg::Loader::setHiddenNodeMask(Mask_UpdateVisitor); NifOsg::Loader::setHiddenNodeMask(Mask_UpdateVisitor);
NifOsg::Loader::setIntersectionDisabledNodeMask(Mask_Effect);
mNearClip = Settings::Manager::getFloat("near clip", "Camera"); mNearClip = Settings::Manager::getFloat("near clip", "Camera");
mViewDistance = Settings::Manager::getFloat("viewing distance", "Camera"); mViewDistance = Settings::Manager::getFloat("viewing distance", "Camera");

14
components/nifosg/nifloader.cpp
View file

@ -177,7 +177,7 @@ namespace NifOsg
void setEnabled(bool enabled) void setEnabled(bool enabled)
{ {
setNodeMask(enabled ? ~0 : 0); setNodeMask(enabled ? ~0 : Loader::getIntersectionDisabledNodeMask());
} }
}; };
@ -204,6 +204,18 @@ namespace NifOsg
return sHiddenNodeMask; return sHiddenNodeMask;
} }
unsigned int Loader::sIntersectionDisabledNodeMask = ~0;
void Loader::setIntersectionDisabledNodeMask(unsigned int mask)
{
sIntersectionDisabledNodeMask = mask;
}
unsigned int Loader::getIntersectionDisabledNodeMask()
{
return sIntersectionDisabledNodeMask;
}
class LoaderImpl class LoaderImpl
{ {
public: public:

6
components/nifosg/nifloader.hpp
View file

@ -79,8 +79,14 @@ namespace NifOsg
static void setHiddenNodeMask(unsigned int mask); static void setHiddenNodeMask(unsigned int mask);
static unsigned int getHiddenNodeMask(); static unsigned int getHiddenNodeMask();
// Set the mask to use for nodes that ignore the crosshair intersection. The default is the default node mask.
// This is used for NiCollisionSwitch nodes with NiCollisionSwitch state set to disabled.
static void setIntersectionDisabledNodeMask(unsigned int mask);
static unsigned int getIntersectionDisabledNodeMask();
private: private:
static unsigned int sHiddenNodeMask; static unsigned int sHiddenNodeMask;
static unsigned int sIntersectionDisabledNodeMask;
static bool sShowMarkers; static bool sShowMarkers;
}; };