From 5d2fe5e887b10ca84f645af42008723777b1e31a Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sun, 27 Aug 2017 21:22:17 +0000
Subject: [PATCH] Implement lightmode/vertmode of NiVertexColorProperty

---
 components/nifosg/nifloader.cpp | 40 +++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index e514cca12..522cf6ac3 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1674,6 +1674,8 @@ namespace NifOsg
 
             bool hasMatCtrl = false;
 
+            int lightmode = 1;
+
             for (std::vector<const Nif::Property*>::const_reverse_iterator it = properties.rbegin(); it != properties.rend(); ++it)
             {
                 const Nif::Property* property = *it;
@@ -1706,19 +1708,25 @@ namespace NifOsg
                 case Nif::RC_NiVertexColorProperty:
                 {
                     const Nif::NiVertexColorProperty* vertprop = static_cast<const Nif::NiVertexColorProperty*>(property);
-                    if (!hasVertexColors)
-                        break;
-                    switch (vertprop->flags)
+                    lightmode = vertprop->data.lightmode;
+
+                    if (hasVertexColors)
                     {
-                    case 0:
-                        mat->setColorMode(osg::Material::OFF);
-                        break;
-                    case 1:
-                        mat->setColorMode(osg::Material::EMISSION);
-                        break;
-                    case 2:
-                        mat->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
-                        break;
+                        switch (vertprop->data.vertmode)
+                        {
+                        case 0:
+                            mat->setColorMode(osg::Material::OFF);
+                            break;
+                        case 1:
+                            mat->setColorMode(osg::Material::EMISSION);
+                            break;
+                        case 2:
+                            if (lightmode != 0)
+                                mat->setColorMode(osg::Material::AMBIENT_AND_DIFFUSE);
+                            else
+                                mat->setColorMode(osg::Material::OFF);
+                            break;
+                        }
                     }
                     break;
                 }
@@ -1772,6 +1780,14 @@ namespace NifOsg
                 mat->setColorMode(osg::Material::AMBIENT);
             }
 
+            if (lightmode == 0)
+            {
+                osg::Vec4f diffuse = mat->getDiffuse(osg::Material::FRONT_AND_BACK);
+                diffuse = osg::Vec4f(0,0,0,diffuse.a());
+                mat->setDiffuse(osg::Material::FRONT_AND_BACK, diffuse);
+                mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f());
+            }
+
             if (!hasMatCtrl && mat->getColorMode() == osg::Material::OFF
                     && mat->getEmission(osg::Material::FRONT_AND_BACK) == osg::Vec4f(0,0,0,1)
                     && mat->getDiffuse(osg::Material::FRONT_AND_BACK) == osg::Vec4f(1,1,1,1)