From 7335cf87def15aff91766544c94de0d8e96e624a Mon Sep 17 00:00:00 2001 From: Erik Ogenvik Date: Wed, 8 Feb 2023 14:15:30 +0100 Subject: [PATCH] Fixed various compiler warnings. --- external/pagedgeometry/include/ImpostorPage.h | 2 +- .../include/StaticBillboardSet.h | 8 +-- .../model/ModelDefinitionAtlasComposer.cpp | 2 +- .../ogre/scripting/bindings/lua/LuaIcon.cpp | 7 +- .../ogre/terrain/techniques/Shader.cpp | 72 +++++++++---------- .../ogre/widgets/ContainerWidget.cpp | 2 +- 6 files changed, 44 insertions(+), 49 deletions(-) diff --git a/external/pagedgeometry/include/ImpostorPage.h b/external/pagedgeometry/include/ImpostorPage.h index de7929c0b..23b19c6b0 100644 --- a/external/pagedgeometry/include/ImpostorPage.h +++ b/external/pagedgeometry/include/ImpostorPage.h @@ -186,7 +186,7 @@ public: static void regenerateAll(); - inline void setBlendMode(ImpostorBlendMode blendMode) { this->blendMode = blendMode; } + inline void setBlendMode(ImpostorBlendMode blendMode_) { this->blendMode = blendMode_; } inline ImpostorBlendMode getBlendMode() { return blendMode; } protected: diff --git a/external/pagedgeometry/include/StaticBillboardSet.h b/external/pagedgeometry/include/StaticBillboardSet.h index 74c874afa..3237b9eb0 100644 --- a/external/pagedgeometry/include/StaticBillboardSet.h +++ b/external/pagedgeometry/include/StaticBillboardSet.h @@ -160,11 +160,11 @@ public: \brief Sets whether or not this StaticBillboardSet will be rendered. \param visible The desired visibility state of the StaticBillboardSet (true/false) */ - inline void setVisible(bool visible) + inline void setVisible(bool visible_) { - if (StaticBillboardSet::visible != visible){ - StaticBillboardSet::visible = visible; - node->setVisible(visible); + if (visible != visible_){ + visible = visible_; + node->setVisible(visible_); } } diff --git a/src/components/ogre/model/ModelDefinitionAtlasComposer.cpp b/src/components/ogre/model/ModelDefinitionAtlasComposer.cpp index d61232288..520f20eca 100644 --- a/src/components/ogre/model/ModelDefinitionAtlasComposer.cpp +++ b/src/components/ogre/model/ModelDefinitionAtlasComposer.cpp @@ -141,7 +141,7 @@ Atlas::Message::Element ModelDefinitionAtlasComposer::composeGeometry(Model* mod } else if (collisionType == "asset") { geometryMap["path"] = model->getSubModel(0)->getEntity()->getMesh()->getName(); } - return std::move(geometryMap); + return geometryMap; } diff --git a/src/components/ogre/scripting/bindings/lua/LuaIcon.cpp b/src/components/ogre/scripting/bindings/lua/LuaIcon.cpp index 80af286a1..a7e36c372 100644 --- a/src/components/ogre/scripting/bindings/lua/LuaIcon.cpp +++ b/src/components/ogre/scripting/bindings/lua/LuaIcon.cpp @@ -26,9 +26,10 @@ using namespace Ember::Lua; template <> void registerLua(sol::table& space) { - auto icon = space.new_usertype("Icon", sol::no_constructor); - icon["getImage"] = &Icon::getImage; - + { + auto icon = space.new_usertype("Icon", sol::no_constructor); + icon["getImage"] = &Icon::getImage; + } auto iconManager = space.new_usertype("IconManager", sol::no_constructor); diff --git a/src/components/ogre/terrain/techniques/Shader.cpp b/src/components/ogre/terrain/techniques/Shader.cpp index 2ec9b08ec..99f95346c 100644 --- a/src/components/ogre/terrain/techniques/Shader.cpp +++ b/src/components/ogre/terrain/techniques/Shader.cpp @@ -27,21 +27,16 @@ #include #include -namespace Ember { -namespace OgreView { - -namespace Terrain { - -namespace Techniques { +namespace Ember::OgreView::Terrain::Techniques { const std::string Shader::NORMAL_TEXTURE_ALIAS = "EmberTerrain/NormalTexture"; const std::string Shader::COMPOSITE_MAP_ALIAS = "EmberTerrain/CompositeMap"; Shader::Shader(bool includeShadows, const TerrainPageGeometryPtr& mGeometry, - const SurfaceLayerStore& mTerrainPageSurfaces, + const SurfaceLayerStore& terrainPageSurfaces, Ogre::SceneManager& sceneManager, bool UseNormalMapping) : - Base(mGeometry, mTerrainPageSurfaces), + Base(mGeometry, terrainPageSurfaces), mIncludeShadows(includeShadows), mSceneManager(sceneManager), mUseNormalMapping(UseNormalMapping), @@ -122,12 +117,11 @@ bool Shader::compileMaterial(Ogre::MaterialPtr material, std::set& Ogre::Material::LodValueList lodList; Ogre::MaterialPtr shadowCasterMaterial = Ogre::MaterialManager::getSingleton().getByName("/common/ShadowCaster/NoAlpha"); - Ogre::Technique* technique = nullptr; unsigned short currentLodIndex = 0; if (mUseNormalMapping) { // Create separate normal mapped technique - technique = material->createTechnique(); + auto technique = material->createTechnique(); technique->setLodIndex(currentLodIndex++); technique->setShadowCasterMaterial(shadowCasterMaterial); // Use normal mapping for everything nearer than 50 units @@ -145,24 +139,26 @@ bool Shader::compileMaterial(Ogre::MaterialPtr material, std::set& } } - // Create the default technique - technique = material->createTechnique(); - technique->setLodIndex(currentLodIndex++); - technique->setShadowCasterMaterial(shadowCasterMaterial); - for (auto& shaderPass: mPasses) { - Ogre::Pass* pass = technique->createPass(); - if (!shaderPass->finalize(*pass, managedTextures, mIncludeShadows, materialSuffix)) { - return false; - } - //If we use multipasses we need to disable fog for all passes except the last one (else the fog will stack up). - if (shaderPass != mPasses.back()) { - pass->getFragmentProgramParameters()->setNamedConstant("disableFogColour", 1); - } - } + { + // Create the default technique + auto technique = material->createTechnique(); + technique->setLodIndex(currentLodIndex++); + technique->setShadowCasterMaterial(shadowCasterMaterial); + for (auto &shaderPass: mPasses) { + Ogre::Pass *pass = technique->createPass(); + if (!shaderPass->finalize(*pass, managedTextures, mIncludeShadows, materialSuffix)) { + return false; + } + //If we use multipasses we need to disable fog for all passes except the last one (else the fog will stack up). + if (shaderPass != mPasses.back()) { + pass->getFragmentProgramParameters()->setNamedConstant("disableFogColour", 1); + } + } + } if (mUseCompositeMap) { // Create a technique which renders using the pre-rendered composite map - technique = material->createTechnique(); + auto technique = material->createTechnique(); technique->setShadowCasterMaterial(shadowCasterMaterial); technique->setLodIndex(currentLodIndex++); // Use it for everything farther away than this limit @@ -219,17 +215,19 @@ bool Shader::compileMaterial(Ogre::MaterialPtr material, std::set& } } - //Now also add a "Low" technique, for use in the compass etc. - technique = material->createTechnique(); - technique->setLodIndex(currentLodIndex++); - technique->setSchemeName("Low"); + { + //Now also add a "Low" technique, for use in the compass etc. + auto technique = material->createTechnique(); + technique->setLodIndex(currentLodIndex); + technique->setSchemeName("Low"); - for (auto& shaderPass: mPasses) { - Ogre::Pass* pass = technique->createPass(); - if (!shaderPass->finalize(*pass, managedTextures, false, "/Simple")) { - return false; - } - } + for (auto &shaderPass: mPasses) { + Ogre::Pass *pass = technique->createPass(); + if (!shaderPass->finalize(*pass, managedTextures, false, "/Simple")) { + return false; + } + } + } // Apply the LOD levels material->setLodLevels(lodList); @@ -293,7 +291,3 @@ ShaderPass* Shader::addPassNormalMapped() { } } - -} -} -} diff --git a/src/components/ogre/widgets/ContainerWidget.cpp b/src/components/ogre/widgets/ContainerWidget.cpp index ef11432a1..ffac70d3d 100644 --- a/src/components/ogre/widgets/ContainerWidget.cpp +++ b/src/components/ogre/widgets/ContainerWidget.cpp @@ -98,7 +98,7 @@ ContainerWidget::ContainerWidget(GUIManager& guiManager, EmberEntity& entity, in guiManager.getEntityTooltip()->getTooltipWindow(), *mWidget->getWindow("IconContainer"), 32); - mContainerView->EventEntityPicked.connect([&](EmberEntity* entity) { + mContainerView->EventEntityPicked.connect([&guiManager](EmberEntity* entity) { guiManager.EmitEntityAction("pick", entity); }); mContainerView->EventIconDropped.connect([&](EntityIcon* entityIcon, EntityIconSlot* entityIconSlot) {