Merge pull request #2710 from akortunov/collisionswitch

Take in account transformations of NiCollisionSwitch
pull/2693/head
Alexei Dobrohotov 5 years ago committed by GitHub
commit 4928aaf3f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -168,10 +168,10 @@ namespace
namespace NifOsg namespace NifOsg
{ {
class CollisionSwitch : public osg::Group class CollisionSwitch : public osg::MatrixTransform
{ {
public: public:
CollisionSwitch(bool enabled) : osg::Group() CollisionSwitch(const osg::Matrixf& transformations, bool enabled) : osg::MatrixTransform(transformations)
{ {
setEnabled(enabled); setEnabled(enabled);
} }
@ -477,7 +477,7 @@ namespace NifOsg
case Nif::RC_NiCollisionSwitch: case Nif::RC_NiCollisionSwitch:
{ {
bool enabled = nifNode->flags & Nif::NiNode::Flag_ActiveCollision; bool enabled = nifNode->flags & Nif::NiNode::Flag_ActiveCollision;
node = new CollisionSwitch(enabled); node = new CollisionSwitch(nifNode->trafo.toMatrix(), enabled);
dataVariance = osg::Object::STATIC; dataVariance = osg::Object::STATIC;
break; break;

Loading…
Cancel
Save