mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-07 04:15:34 +00:00
Merge branch 'rm_redundant_ctors' into 'master'
Remove redundant SizeProxy and RenderTarget constructors See merge request OpenMW/openmw!3769
This commit is contained in:
commit
4f21ea2eae
1 changed files with 0 additions and 20 deletions
|
@ -29,16 +29,6 @@ namespace fx
|
||||||
std::optional<int> mWidth;
|
std::optional<int> mWidth;
|
||||||
std::optional<int> mHeight;
|
std::optional<int> mHeight;
|
||||||
|
|
||||||
SizeProxy() = default;
|
|
||||||
|
|
||||||
SizeProxy(const SizeProxy& other)
|
|
||||||
: mWidthRatio(other.mWidthRatio)
|
|
||||||
, mHeightRatio(other.mHeightRatio)
|
|
||||||
, mWidth(other.mWidth)
|
|
||||||
, mHeight(other.mHeight)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
std::tuple<int, int> get(int width, int height) const
|
std::tuple<int, int> get(int width, int height) const
|
||||||
{
|
{
|
||||||
int scaledWidth = width;
|
int scaledWidth = width;
|
||||||
|
@ -64,16 +54,6 @@ namespace fx
|
||||||
SizeProxy mSize;
|
SizeProxy mSize;
|
||||||
bool mMipMap = false;
|
bool mMipMap = false;
|
||||||
osg::Vec4f mClearColor = osg::Vec4f(0.0, 0.0, 0.0, 1.0);
|
osg::Vec4f mClearColor = osg::Vec4f(0.0, 0.0, 0.0, 1.0);
|
||||||
|
|
||||||
RenderTarget() = default;
|
|
||||||
|
|
||||||
RenderTarget(const RenderTarget& other)
|
|
||||||
: mTarget(other.mTarget)
|
|
||||||
, mSize(other.mSize)
|
|
||||||
, mMipMap(other.mMipMap)
|
|
||||||
, mClearColor(other.mClearColor)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
template <class T>
|
template <class T>
|
||||||
|
|
Loading…
Reference in a new issue