Merge branch 'darkmagic' into 'master'

Implement the NegativeLight flag

Closes #7477

See merge request OpenMW/openmw!3240

CHANGELOG.md

@@ -83,6 +83,7 @@
     Feature #7148: Optimize string literal lookup in mwscript
     Feature #7194: Ori to show texture paths
     Feature #7214: Searching in the in-game console
+    Feature #7477: NegativeLight Magic Effect flag
     Task #7113: Move from std::atoi to std::from_char
     Task #7117: Replace boost::scoped_array with std::vector
     Task #7151: Do not use std::strerror to get errno error message

apps/openmw/mwrender/animation.cpp

@@ -1490,11 +1490,6 @@ namespace MWRender
 
     void Animation::addSpellCastGlow(const ESM::MagicEffect* effect, float glowDuration)
     {
-        osg::Vec4f glowColor(1, 1, 1, 1);
-        glowColor.x() = effect->mData.mRed / 255.f;
-        glowColor.y() = effect->mData.mGreen / 255.f;
-        glowColor.z() = effect->mData.mBlue / 255.f;
-
         if (!mGlowUpdater || (mGlowUpdater->isDone() || (mGlowUpdater->isPermanentGlowUpdater() == true)))
         {
             if (mGlowUpdater && mGlowUpdater->isDone())
@@ -1502,11 +1497,12 @@ namespace MWRender
 
             if (mGlowUpdater && mGlowUpdater->isPermanentGlowUpdater())
             {
-                mGlowUpdater->setColor(glowColor);
+                mGlowUpdater->setColor(effect->getColor());
                 mGlowUpdater->setDuration(glowDuration);
             }
             else
-                mGlowUpdater = SceneUtil::addEnchantedGlow(mObjectRoot, mResourceSystem, glowColor, glowDuration);
+                mGlowUpdater
+                    = SceneUtil::addEnchantedGlow(mObjectRoot, mResourceSystem, effect->getColor(), glowDuration);
         }
     }
 

apps/openmw/mwworld/projectilemanager.cpp

@@ -136,21 +136,14 @@ namespace
     {
         // Calculate combined light diffuse color from magical effects
         osg::Vec4 lightDiffuseColor;
-        float lightDiffuseRed = 0.0f;
+        for (const ESM::ENAMstruct& enam : effects.mList)
-        float lightDiffuseGreen = 0.0f;
-        float lightDiffuseBlue = 0.0f;
-        for (std::vector<ESM::ENAMstruct>::const_iterator iter(effects.mList.begin()); iter != effects.mList.end();
-             ++iter)
         {
             const ESM::MagicEffect* magicEffect
-                = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(iter->mEffectID);
+                = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(enam.mEffectID);
-            lightDiffuseRed += (static_cast<float>(magicEffect->mData.mRed) / 255.f);
+            lightDiffuseColor += magicEffect->getColor();
-            lightDiffuseGreen += (static_cast<float>(magicEffect->mData.mGreen) / 255.f);
-            lightDiffuseBlue += (static_cast<float>(magicEffect->mData.mBlue) / 255.f);
         }
         int numberOfEffects = effects.mList.size();
-        lightDiffuseColor = osg::Vec4(lightDiffuseRed / numberOfEffects, lightDiffuseGreen / numberOfEffects,
+        lightDiffuseColor /= numberOfEffects;
-            lightDiffuseBlue / numberOfEffects, 1.0f);
 
         return lightDiffuseColor;
     }

components/esm3/loadmgef.cpp

@@ -603,6 +603,14 @@ namespace ESM
         mDescription.clear();
     }
 
+    osg::Vec4f MagicEffect::getColor() const
+    {
+        osg::Vec4f color{ mData.mRed / 255.f, mData.mGreen / 255.f, mData.mBlue / 255.f, 1.f };
+        if (mData.mFlags & NegativeLight)
+            return osg::Vec4f(1.f, 1.f, 1.f, 2.f) - color;
+        return color;
+    }
+
     const std::string& MagicEffect::indexToGmstString(int effectID)
     {
         if (effectID < 0 || static_cast<std::size_t>(effectID) >= sGmstEffectIds.size())

components/esm3/loadmgef.hpp

@@ -10,6 +10,8 @@
 #include "components/esm/refid.hpp"
 #include "components/misc/strings/algorithm.hpp"
 
+#include <osg/Vec4>
+
 namespace ESM
 {
 
@@ -55,7 +57,7 @@ namespace ESM
             // Originally modifiable flags
             AllowSpellmaking = 0x200, // Can be used for spellmaking
             AllowEnchanting = 0x400, // Can be used for enchanting
-            NegativeLight = 0x800 // Unused
+            NegativeLight = 0x800 // Inverts the effect's color
         };
 
         enum MagnitudeDisplayType
@@ -113,6 +115,8 @@ namespace ESM
         /// Set record to default state (does not touch the ID/index).
         void blank();
 
+        osg::Vec4f getColor() const;
+
         enum Effects
         {
             WaterBreathing = 0,