mmo-ref/ember
1
0
Fork 0
mirror of https://github.com/worldforge/ember synced 2026-08-13 16:23:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fixed various compiler warnings.

Browse source
This commit is contained in:
Erik Ogenvik 2023-02-08 14:15:30 +01:00
parent 9378bf77d4
commit 7335cf87de
6 changed files with 44 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
external/pagedgeometry/include/ImpostorPage.h vendored
View file

@ -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:

8
external/pagedgeometry/include/StaticBillboardSet.h vendored
View file

@ -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_);
}
}

2
src/components/ogre/model/ModelDefinitionAtlasComposer.cpp
View file

@ -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;
}

7
src/components/ogre/scripting/bindings/lua/LuaIcon.cpp
View file

@ -26,9 +26,10 @@ using namespace Ember::Lua;
template <>
void registerLua<Icon>(sol::table& space) {
auto icon = space.new_usertype<Icon>("Icon", sol::no_constructor);
icon["getImage"] = &Icon::getImage;
{
auto icon = space.new_usertype<Icon>("Icon", sol::no_constructor);
icon["getImage"] = &Icon::getImage;
}
auto iconManager = space.new_usertype<IconManager>("IconManager", sol::no_constructor);

72
src/components/ogre/terrain/techniques/Shader.cpp
View file

@ -27,21 +27,16 @@
#include <OgreMaterialManager.h>
#include <OgreSceneManager.h>
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<std::string>&
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<std::string>&
}
}
// 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<std::string>&
}
}
//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() {
}
}
}
}
}

2
src/components/ogre/widgets/ContainerWidget.cpp
View file

@ -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) {