Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

MyGUI HEAD compatibility

Browse source 
Makes OpenMW compatible with the current MyGUI HEAD at:
f93d4fb614

Refs #5806
This commit is contained in:
Gleb Mazovetskiy 2021-01-23 13:49:16 +00:00
parent e2fc5d87b3
commit 4495b67d77
9 changed files with 72 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/myguiplatform/scalinglayer.cpp
View file

@ -3,6 +3,8 @@
#include <MyGUI_RenderManager.h>
#include <algorithm>
#include "myguicompat.h"
namespace osgMyGUI
{
@ -37,7 +39,7 @@ namespace osgMyGUI
mTarget->doRender(_buffer, _texture, _count);
}
const MyGUI::RenderTargetInfo& getInfo() override
const MyGUI::RenderTargetInfo& getInfo() OPENMW_MYGUI_CONST_GETTER_3_4_1 override
{
mInfo = mTarget->getInfo();
mInfo.hOffset = mHOffset;
@ -51,7 +53,7 @@ namespace osgMyGUI
MyGUI::IRenderTarget* mTarget;
MyGUI::IntSize mViewSize;
float mHOffset, mVOffset;
MyGUI::RenderTargetInfo mInfo;
mutable MyGUI::RenderTargetInfo mInfo;
};
MyGUI::ILayerItem *ScalingLayer::getLayerItemByPoint(int _left, int _top) const