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

additional clean up for clang

This commit is contained in:
Bret Curtis 2023-08-07 14:09:32 +02:00
parent e97b07b6a4
commit 589a27d09c
3 changed files with 3 additions and 16 deletions

View file

@ -66,8 +66,6 @@ namespace osgMyGUI
void enableShaders(Shader::ShaderManager& shaderManager); void enableShaders(Shader::ShaderManager& shaderManager);
void setScalingFactor(float factor);
static RenderManager& getInstance() { return *getInstancePtr(); } static RenderManager& getInstance() { return *getInstancePtr(); }
static RenderManager* getInstancePtr() static RenderManager* getInstancePtr()
{ {
@ -77,16 +75,10 @@ namespace osgMyGUI
bool checkTexture(MyGUI::ITexture* _texture) override; bool checkTexture(MyGUI::ITexture* _texture) override;
/** @see RenderManager::getViewSize */ /** @see RenderManager::getViewSize */
const MyGUI::IntSize& getViewSize() const override const MyGUI::IntSize& getViewSize() const override { return mViewSize; }
{
return mViewSize;
}
/** @see RenderManager::getVertexFormat */ /** @see RenderManager::getVertexFormat */
MyGUI::VertexColourType getVertexFormat() const override MyGUI::VertexColourType getVertexFormat() const override { return mVertexFormat; }
{
return mVertexFormat;
}
/** @see RenderManager::isFormatSupported */ /** @see RenderManager::isFormatSupported */
bool isFormatSupported(MyGUI::PixelFormat format, MyGUI::TextureUsage usage) override; bool isFormatSupported(MyGUI::PixelFormat format, MyGUI::TextureUsage usage) override;
@ -119,10 +111,7 @@ namespace osgMyGUI
void setInjectState(osg::StateSet* stateSet); void setInjectState(osg::StateSet* stateSet);
/** @see IRenderTarget::getInfo */ /** @see IRenderTarget::getInfo */
const MyGUI::RenderTargetInfo& getInfo() const override const MyGUI::RenderTargetInfo& getInfo() const override { return mInfo; }
{
return mInfo;
}
void setViewSize(int width, int height) override; void setViewSize(int width, int height) override;

View file

@ -7,7 +7,6 @@
#include <MyGUI_TextBox.h> #include <MyGUI_TextBox.h>
#include <MyGUI_Widget.h> #include <MyGUI_Widget.h>
namespace Gui namespace Gui
{ {
class AutoSizedWidget class AutoSizedWidget

View file

@ -3,7 +3,6 @@
#include <MyGUI_EditBox.h> #include <MyGUI_EditBox.h>
namespace Gui namespace Gui
{ {