mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-28 21:39:48 +00:00
Code Issues Releases Wiki Activity

Merge branch 'modernprometheus' into 'master'

Browse source 
Make torches held by creatures emit light

Closes #8002

See merge request OpenMW/openmw!4134
This commit is contained in:
Alexei Kotov 2024-05-27 18:19:58 +00:00
commit 340783e3a1
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -177,6 +177,7 @@
Bug #7970: Difference of GetPCSleep (?) behavior between vanilla and OpenMW Bug #7970: Difference of GetPCSleep (?) behavior between vanilla and OpenMW
Bug #7980: Paralyzed NPCs' lips move Bug #7980: Paralyzed NPCs' lips move
Bug #7997: Can toggle perspective when paralyzed Bug #7997: Can toggle perspective when paralyzed
Bug #8002: Portable light sources held by creatures do not emit lighting
Feature #1415: Infinite fall failsafe Feature #1415: Infinite fall failsafe
Feature #2566: Handle NAM9 records for manual cell references Feature #2566: Handle NAM9 records for manual cell references
Feature #3537: Shader-based water ripples Feature #3537: Shader-based water ripples

4
apps/openmw/mwrender/creatureanimation.cpp
View file

@ -5,6 +5,7 @@
#include <components/debug/debuglog.hpp> #include <components/debug/debuglog.hpp>
#include <components/esm3/loadcrea.hpp> #include <components/esm3/loadcrea.hpp>
#include <components/resource/resourcesystem.hpp> #include <components/resource/resourcesystem.hpp>
#include <components/sceneutil/lightcommon.hpp>
#include <components/sceneutil/positionattitudetransform.hpp> #include <components/sceneutil/positionattitudetransform.hpp>
#include <components/sceneutil/visitor.hpp> #include <components/sceneutil/visitor.hpp>
#include <components/settings/values.hpp> #include <components/settings/values.hpp>
@ -172,6 +173,9 @@ namespace MWRender
SceneUtil::AssignControllerSourcesVisitor assignVisitor(std::move(source)); SceneUtil::AssignControllerSourcesVisitor assignVisitor(std::move(source));
attached->accept(assignVisitor); attached->accept(assignVisitor);
if (item.getType() == ESM::Light::sRecordId)
addExtraLight(scene->getNode()->asGroup(), SceneUtil::LightCommon(*item.get<ESM::Light>()->mBase));
} }
catch (std::exception& e) catch (std::exception& e)
{ {