mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 07:23:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2602 from elsid/clang_tidy

Browse source 
Fix clang-tidy issues
This commit is contained in:
Andrei Kortunov 2019-12-03 08:27:43 +04:00 committed by GitHub
commit eec82f676a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -241,7 +241,7 @@ namespace MWGui
MyGUI::FactoryManager::getInstance().registerFactory<ResourceImageSetPointerFix>("Resource", "ResourceImageSetPointer");
MyGUI::FactoryManager::getInstance().registerFactory<AutoSizedResourceSkin>("Resource", "AutoSizedResourceSkin");
MyGUI::ResourceManager::getInstance().load("core.xml");
loadUserFonts();
WindowManager::loadUserFonts();
bool keyboardNav = Settings::Manager::getBool("keyboard navigation", "GUI");
mKeyboardNavigation.reset(new KeyboardNavigation());

6
apps/openmw/mwrender/animation.cpp
View file

@ -515,13 +515,11 @@ namespace MWRender
protected:
virtual void setDefaults(osg::StateSet* stateset)
{
osg::Material* material = static_cast<osg::Material*>(stateset->getAttribute(osg::StateAttribute::MATERIAL));
osg::BlendFunc* blendfunc (new osg::BlendFunc);
stateset->setAttributeAndModes(blendfunc, osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
// FIXME: overriding diffuse/ambient/emissive colors
material = new osg::Material;
osg::Material* material = new osg::Material;
material->setColorMode(osg::Material::OFF);
material->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,mAlpha));
material->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
@ -635,7 +633,7 @@ namespace MWRender
Animation::~Animation()
{
setLightEffect(0.f);
Animation::setLightEffect(0.f);
if (mObjectRoot)
mInsert->removeChild(mObjectRoot);

2
apps/openmw/mwsound/openal_output.cpp
View file

@ -1489,7 +1489,7 @@ OpenAL_Output::OpenAL_Output(SoundManager &mgr)
OpenAL_Output::~OpenAL_Output()
{
deinit();
OpenAL_Output::deinit();
}
}

2
apps/openmw/mwsound/soundmanagerimp.cpp
View file

@ -1362,7 +1362,7 @@ namespace MWSound
void SoundManager::clear()
{
stopMusic();
SoundManager::stopMusic();
for(SoundMap::value_type &snd : mActiveSounds)
{

2
components/nifosg/particle.cpp
View file

@ -27,7 +27,7 @@ ParticleSystem::ParticleSystem(const ParticleSystem &copy, const osg::CopyOp &co
{
// For some reason the osgParticle constructor doesn't copy the particles
for (int i=0;i<copy.numParticles()-copy.numDeadParticles();++i)
createParticle(copy.getParticle(i));
ParticleSystem::createParticle(copy.getParticle(i));
}
void ParticleSystem::setQuota(int quota)

10
components/sceneutil/mwshadowtechnique.hpp
View file

@ -261,18 +261,18 @@ namespace SceneUtil {
float _shadowFadeStart = 0.0;
class DebugHUD : public osg::Referenced
class DebugHUD final : public osg::Referenced
{
public:
DebugHUD(int numberOfShadowMapsPerLight);
virtual void draw(osg::ref_ptr<osg::Texture2D> texture, unsigned int shadowMapNumber, const osg::Matrixd &matrix, osgUtil::CullVisitor& cv);
void draw(osg::ref_ptr<osg::Texture2D> texture, unsigned int shadowMapNumber, const osg::Matrixd &matrix, osgUtil::CullVisitor& cv);
virtual void releaseGLObjects(osg::State* state = 0) const;
void releaseGLObjects(osg::State* state = 0) const;
virtual void setFrustumVertices(osg::ref_ptr<osg::Vec3Array> vertices, unsigned int traversalNumber);
void setFrustumVertices(osg::ref_ptr<osg::Vec3Array> vertices, unsigned int traversalNumber);
protected:
virtual void addAnotherShadowMap();
void addAnotherShadowMap();
static const int sDebugTextureUnit = 0;

10
components/sceneutil/shadow.hpp
View file

@ -19,15 +19,13 @@ namespace SceneUtil
ShadowManager(osg::ref_ptr<osg::Group> sceneRoot, osg::ref_ptr<osg::Group> rootNode, unsigned int outdoorShadowCastingMask, unsigned int indoorShadowCastingMask, Shader::ShaderManager &shaderManager);
virtual ~ShadowManager() = default;
void setupShadowSettings();
virtual void setupShadowSettings();
Shader::ShaderManager::DefineMap getShadowDefines();
virtual Shader::ShaderManager::DefineMap getShadowDefines();
void enableIndoorMode();
virtual void enableIndoorMode();
virtual void enableOutdoorMode();
void enableOutdoorMode();
protected:
bool mEnableShadows;

2
components/sdlutil/sdlgraphicswindow.cpp
View file

@ -20,7 +20,7 @@ GraphicsWindowSDL2::GraphicsWindowSDL2(osg::GraphicsContext::Traits *traits)
_traits = traits;
init();
if(valid())
if(GraphicsWindowSDL2::valid())
{
setState(new osg::State);
getState()->setGraphicsContext(this);

2
components/terrain/terraingrid.cpp
View file

@ -28,7 +28,7 @@ TerrainGrid::~TerrainGrid()
{
while (!mGrid.empty())
{
unloadCell(mGrid.begin()->first.first, mGrid.begin()->first.second);
TerrainGrid::unloadCell(mGrid.begin()->first.first, mGrid.begin()->first.second);
}
}