Merge pull request #2781 from mp3butcher/partsysfix

Particle System shading and lighting (fixing bug#3676 and #4949)

CHANGELOG.md

@@ -1,6 +1,8 @@
 0.47.0
 ------
 
+    Bug #3676: NiParticleColorModifier isn't applied properly
+    Bug #4949: Incorrect particle lighting when force shaders = true
     Bug #5358: ForceGreeting always resets the dialogue window completely
     Bug #5363: Enchantment autocalc not always 0/1
     Bug #5364: Script fails/stops if trying to startscript an unknown script

components/nifosg/nifloader.cpp

@@ -1078,6 +1078,8 @@ namespace NifOsg
                 trans->addChild(toAttach);
                 parentNode->addChild(trans);
             }
+            // create partsys stateset in order to pass in ShaderVisitor like all other Drawables
+            partsys->getOrCreateStateSet();
         }
 
         void triCommonToGeometry(osg::Geometry *geometry, const std::vector<osg::Vec3f>& vertices, const std::vector<osg::Vec3f>& normals, const std::vector<std::vector<osg::Vec2f>>& uvlist, const std::vector<osg::Vec4f>& colors, const std::vector<unsigned int>& boundTextures, const std::string& name)
@@ -1812,14 +1814,6 @@ namespace NifOsg
             if (mVersion <= Nif::NIFFile::NIFVersion::VER_MW || specFlags == 0)
                 mat->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4f(0.f,0.f,0.f,0.f));
 
-            // Particles don't have normals, so can't be diffuse lit.
-            if (particleMaterial)
-            {
-                // NB ignoring diffuse.a()
-                mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(0,0,0,1));
-                mat->setColorMode(osg::Material::AMBIENT);
-            }
-
             if (lightmode == 0)
             {
                 osg::Vec4f diffuse = mat->getDiffuse(osg::Material::FRONT_AND_BACK);

components/nifosg/particle.cpp

@@ -2,6 +2,7 @@
 
 #include <limits>
 
+#include <osg/Version>
 #include <osg/MatrixTransform>
 #include <osg/Geometry>
 
@@ -19,12 +20,19 @@ ParticleSystem::ParticleSystem()
     : osgParticle::ParticleSystem()
     , mQuota(std::numeric_limits<int>::max())
 {
+    mNormalArray = new osg::Vec3Array(1);
+    mNormalArray->setBinding(osg::Array::BIND_OVERALL);
+    (*mNormalArray.get())[0] = osg::Vec3(0.3, 0.3, 0.3);
 }
 
 ParticleSystem::ParticleSystem(const ParticleSystem &copy, const osg::CopyOp &copyop)
     : osgParticle::ParticleSystem(copy, copyop)
     , mQuota(copy.mQuota)
 {
+    mNormalArray = new osg::Vec3Array(1);
+    mNormalArray->setBinding(osg::Array::BIND_OVERALL);
+    (*mNormalArray.get())[0] = osg::Vec3(0.3, 0.3, 0.3);
+
     // For some reason the osgParticle constructor doesn't copy the particles
     for (int i=0;i<copy.numParticles()-copy.numDeadParticles();++i)
         ParticleSystem::createParticle(copy.getParticle(i));
@@ -42,6 +50,25 @@ osgParticle::Particle* ParticleSystem::createParticle(const osgParticle::Particl
     return nullptr;
 }
 
+void ParticleSystem::drawImplementation(osg::RenderInfo& renderInfo) const
+{
+    osg::State & state = *renderInfo.getState();
+#if OSG_MIN_VERSION_REQUIRED(3, 5, 6)
+    if(state.useVertexArrayObject(getUseVertexArrayObject()))
+    {
+        state.getCurrentVertexArrayState()->assignNormalArrayDispatcher();
+        state.getCurrentVertexArrayState()->setNormalArray(state, mNormalArray);
+    }
+    else
+    {
+        state.getAttributeDispatchers().activateNormalArray(mNormalArray);
+    }
+#else
+     state.Normal(0.3, 0.3, 0.3);
+#endif
+     osgParticle::ParticleSystem::drawImplementation(renderInfo);
+}
+
 void InverseWorldMatrix::operator()(osg::Node *node, osg::NodeVisitor *nv)
 {
     if (nv && nv->getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
@@ -159,8 +186,11 @@ void ParticleColorAffector::operate(osgParticle::Particle* particle, double /* d
 {
     float time = static_cast<float>(particle->getAge()/particle->getLifeTime());
     osg::Vec4f color = mData.interpKey(time);
+    float alpha = color.a();
+    color.a() = 1.0f;
 
     particle->setColorRange(osgParticle::rangev4(color, color));
+    particle->setAlphaRange(osgParticle::rangef(alpha, alpha));
 }
 
 GravityAffector::GravityAffector(const Nif::NiGravity *gravity)

components/nifosg/particle.hpp

@@ -36,8 +36,11 @@ namespace NifOsg
 
         void setQuota(int quota);
 
+        virtual void drawImplementation(osg::RenderInfo& renderInfo) const;
+
     private:
         int mQuota;
+        osg::ref_ptr<osg::Vec3Array> mNormalArray;
     };
 
     // HACK: Particle doesn't allow setting the initial age, but we need this for loading the particle system state