Merge branch 'jamescameronsnif' into 'master'

NiPiñaColada and friends

See merge request OpenMW/openmw!1739

components/nif/controlled.cpp

@@ -34,11 +34,12 @@ namespace Nif
         mipmap = nif->getUInt();
         alpha = nif->getUInt();
 
-        nif->getChar(); // always 1
+        // Renderer hints, typically of no use for us
+        /* bool mIsStatic = */nif->getChar();
         if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,103))
-            nif->getBoolean(); // Direct rendering
+            /* bool mDirectRendering = */nif->getBoolean();
         if (nif->getVersion() >= NIFStream::generateVersion(20,2,0,4))
-            nif->getBoolean(); // NiPersistentSrcTextureRendererData is used instead of NiPixelData
+            /* bool mPersistRenderData = */nif->getBoolean();
     }
 
     void NiSourceTexture::post(NIFFile *nif)
@@ -99,11 +100,11 @@ namespace Nif
         NiParticleModifier::read(nif);
 
         mBounceFactor = nif->getFloat();
-        if (nif->getVersion() >= NIFStream::generateVersion(4,2,2,0))
+        if (nif->getVersion() >= NIFStream::generateVersion(4,2,0,2))
         {
             // Unused in NifSkope. Need to figure out what these do.
-            /*bool spawnOnCollision = */nif->getBoolean();
-            /*bool dieOnCollision = */nif->getBoolean();
+            /*bool mSpawnOnCollision = */nif->getBoolean();
+            /*bool mDieOnCollision = */nif->getBoolean();
         }
     }
 
@@ -111,11 +112,10 @@ namespace Nif
     {
         NiParticleCollider::read(nif);
 
-        /*unknown*/nif->getFloat();
-
-        for (int i=0;i<10;++i)
-            /*unknown*/nif->getFloat();
-
+        mExtents = nif->getVector2();
+        mPosition = nif->getVector3();
+        mXVector = nif->getVector3();
+        mYVector = nif->getVector3();
         mPlaneNormal = nif->getVector3();
         mPlaneDistance = nif->getFloat();
     }
@@ -124,12 +124,9 @@ namespace Nif
     {
         NiParticleModifier::read(nif);
 
-        /*
-           byte (0 or 1)
-           float (1)
-           float*3
-        */
-        nif->skip(17);
+        /* bool mRandomInitialAxis = */nif->getChar();
+        /* osg::Vec3f mInitialAxis = */nif->getVector3();
+        /* float mRotationSpeed = */nif->getFloat();
     }
 
     void NiSphericalCollider::read(NIFStream* nif)

components/nif/controlled.hpp

@@ -131,10 +131,13 @@ struct NiParticleCollider : public NiParticleModifier
 // NiPinaColada
 struct NiPlanarCollider : public NiParticleCollider
 {
-    void read(NIFStream *nif) override;
-
+    osg::Vec2f mExtents;
+    osg::Vec3f mPosition;
+    osg::Vec3f mXVector, mYVector;
     osg::Vec3f mPlaneNormal;
     float mPlaneDistance;
+
+    void read(NIFStream *nif) override;
 };
 
 struct NiSphericalCollider : public NiParticleCollider

components/nifosg/particle.cpp

@@ -468,18 +468,24 @@ void FindGroupByRecIndex::applyNode(osg::Node &searchNode)
 
 PlanarCollider::PlanarCollider(const Nif::NiPlanarCollider *collider)
     : mBounceFactor(collider->mBounceFactor)
+    , mExtents(collider->mExtents)
+    , mPosition(collider->mPosition)
+    , mXVector(collider->mXVector)
+    , mYVector(collider->mYVector)
     , mPlane(-collider->mPlaneNormal, collider->mPlaneDistance)
 {
 }
 
-PlanarCollider::PlanarCollider()
-    : mBounceFactor(0.f)
-{
-}
-
 PlanarCollider::PlanarCollider(const PlanarCollider &copy, const osg::CopyOp &copyop)
     : osgParticle::Operator(copy, copyop)
     , mBounceFactor(copy.mBounceFactor)
+    , mExtents(copy.mExtents)
+    , mPosition(copy.mPosition)
+    , mPositionInParticleSpace(copy.mPositionInParticleSpace)
+    , mXVector(copy.mXVector)
+    , mXVectorInParticleSpace(copy.mXVectorInParticleSpace)
+    , mYVector(copy.mYVector)
+    , mYVectorInParticleSpace(copy.mYVectorInParticleSpace)
     , mPlane(copy.mPlane)
     , mPlaneInParticleSpace(copy.mPlaneInParticleSpace)
 {
@@ -487,25 +493,44 @@ PlanarCollider::PlanarCollider(const PlanarCollider &copy, const osg::CopyOp &co
 
 void PlanarCollider::beginOperate(osgParticle::Program *program)
 {
+    mPositionInParticleSpace = mPosition;
     mPlaneInParticleSpace = mPlane;
+    mXVectorInParticleSpace = mXVector;
+    mYVectorInParticleSpace = mYVector;
     if (program->getReferenceFrame() == osgParticle::ParticleProcessor::ABSOLUTE_RF)
+    {
+        mPositionInParticleSpace = program->transformLocalToWorld(mPosition);
         mPlaneInParticleSpace.transform(program->getLocalToWorldMatrix());
+        mXVectorInParticleSpace = program->rotateLocalToWorld(mXVector);
+        mYVectorInParticleSpace = program->rotateLocalToWorld(mYVector);
+    }
 }
 
 void PlanarCollider::operate(osgParticle::Particle *particle, double dt)
 {
-    float dotproduct = particle->getVelocity() * mPlaneInParticleSpace.getNormal();
+    // Does the particle in question move towards the collider?
+    float velDotProduct = particle->getVelocity() * mPlaneInParticleSpace.getNormal();
+    if (velDotProduct <= 0)
+        return;
 
-    if (dotproduct > 0)
-    {
-        osg::BoundingSphere bs(particle->getPosition(), 0.f);
-        if (mPlaneInParticleSpace.intersect(bs) == 1)
-        {
-            osg::Vec3 reflectedVelocity = particle->getVelocity() - mPlaneInParticleSpace.getNormal() * (2 * dotproduct);
-            reflectedVelocity *= mBounceFactor;
-            particle->setVelocity(reflectedVelocity);
-        }
-    }
+    // Does it intersect the collider's plane?
+    osg::BoundingSphere bs(particle->getPosition(), 0.f);
+    if (mPlaneInParticleSpace.intersect(bs) != 1)
+        return;
+
+    // Is it inside the collider's bounds?
+    osg::Vec3f relativePos = particle->getPosition() - mPositionInParticleSpace;
+    float xDotProduct = relativePos * mXVectorInParticleSpace;
+    float yDotProduct = relativePos * mYVectorInParticleSpace;
+    if (-mExtents.x() * 0.5f > xDotProduct || mExtents.x() * 0.5f < xDotProduct)
+        return;
+    if (-mExtents.y() * 0.5f > yDotProduct || mExtents.y() * 0.5f < yDotProduct)
+        return;
+
+    // Deflect the particle
+    osg::Vec3 reflectedVelocity = particle->getVelocity() - mPlaneInParticleSpace.getNormal() * (2 * velDotProduct);
+    reflectedVelocity *= mBounceFactor;
+    particle->setVelocity(reflectedVelocity);
 }
 
 SphericalCollider::SphericalCollider(const Nif::NiSphericalCollider* collider)

components/nifosg/particle.hpp

@@ -104,7 +104,7 @@ namespace NifOsg
     {
     public:
         PlanarCollider(const Nif::NiPlanarCollider* collider);
-        PlanarCollider();
+        PlanarCollider() = default;
         PlanarCollider(const PlanarCollider& copy, const osg::CopyOp& copyop);
 
         META_Object(NifOsg, PlanarCollider)
@@ -113,9 +113,12 @@ namespace NifOsg
         void operate(osgParticle::Particle* particle, double dt) override;
 
     private:
-        float mBounceFactor;
-        osg::Plane mPlane;
-        osg::Plane mPlaneInParticleSpace;
+        float mBounceFactor{0.f};
+        osg::Vec2f mExtents;
+        osg::Vec3f mPosition, mPositionInParticleSpace;
+        osg::Vec3f mXVector, mXVectorInParticleSpace;
+        osg::Vec3f mYVector, mYVectorInParticleSpace;
+        osg::Plane mPlane, mPlaneInParticleSpace;
     };
 
     class SphericalCollider : public osgParticle::Operator