mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-26 12:41:34 +00:00
Code Issues Releases Wiki Activity

Use AdditiveLayer for the hit fader

Browse source
This commit is contained in:
scrawl 2015-11-07 18:04:03 +01:00
parent a90ef8afd0
commit d85d74e615
6 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwgui/screenfader.cpp
View file

@ -66,8 +66,8 @@ namespace MWGui
mFader->notifyOperationFinished(); mFader->notifyOperationFinished();
} }
ScreenFader::ScreenFader(const std::string & texturePath) ScreenFader::ScreenFader(const std::string & texturePath, const std::string& layout)
: WindowBase("openmw_screen_fader.layout") : WindowBase(layout)
, mCurrentAlpha(0.f) , mCurrentAlpha(0.f)
, mFactor(1.f) , mFactor(1.f)
, mRepeat(false) , mRepeat(false)

2
apps/openmw/mwgui/screenfader.hpp
View file

@ -36,7 +36,7 @@ namespace MWGui
class ScreenFader : public WindowBase class ScreenFader : public WindowBase
{ {
public: public:
ScreenFader(const std::string & texturePath); ScreenFader(const std::string & texturePath, const std::string& layout = "openmw_screen_fader.layout");
void setTexture(const std::string & texturePath); void setTexture(const std::string & texturePath);

2
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -329,7 +329,7 @@ namespace MWGui
// TODO: check if non-BM versions actually use player_hit_01.dds // TODO: check if non-BM versions actually use player_hit_01.dds
if(!mResourceSystem->getVFS()->exists(hitFaderTexture)) if(!mResourceSystem->getVFS()->exists(hitFaderTexture))
hitFaderTexture = "textures\\player_hit_01.dds"; hitFaderTexture = "textures\\player_hit_01.dds";
mHitFader = new ScreenFader(hitFaderTexture); mHitFader = new ScreenFader(hitFaderTexture, "openmw_screen_fader_hit.layout");
mScreenFader = new ScreenFader("black"); mScreenFader = new ScreenFader("black");
mDebugWindow = new DebugWindow(); mDebugWindow = new DebugWindow();

1
files/mygui/CMakeLists.txt
View file

@ -80,6 +80,7 @@ set(MYGUI_FILES
openmw_savegame_dialog.layout openmw_savegame_dialog.layout
openmw_recharge_dialog.layout openmw_recharge_dialog.layout
openmw_screen_fader.layout openmw_screen_fader.layout
openmw_screen_fader_hit.layout
openmw_edit_note.layout openmw_edit_note.layout
openmw_debug_window.layout openmw_debug_window.layout
openmw_debug_window.skin.xml openmw_debug_window.skin.xml

1
files/mygui/openmw_layers.xml
View file

@ -2,6 +2,7 @@
<MyGUI type="Layer" version="1.0"> <MyGUI type="Layer" version="1.0">
<Layer name="Overlay" overlapped="false" pick="false"/> <Layer name="Overlay" overlapped="false" pick="false"/>
<Layer name="AdditiveOverlay" type="AdditiveLayer" pick="false"/>
<Layer name="HUD" overlapped="false" pick="true"/> <Layer name="HUD" overlapped="false" pick="true"/>
<Layer name="Menu" overlapped="false" pick="false"/> <Layer name="Menu" overlapped="false" pick="false"/>
<Layer name="Windows" overlapped="true" pick="true"/> <Layer name="Windows" overlapped="true" pick="true"/>

7
files/mygui/openmw_screen_fader_hit.layout Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="ImageBox" skin="ImageBox" layer="AdditiveOverlay" position="0 0 300 200" name="_Main" align="Stretch">
<Property key="ImageTexture" value="black"/>
</Widget>
</MyGUI>