Skip to content

Commit 250ee3c

Browse files
authored
Fixed clang warnings (#623)
1 parent 2f1bfed commit 250ee3c

48 files changed

Lines changed: 110 additions & 63 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Sources/OvAudio/premake5.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ project "OvAudio"
44
cppdialect "C++20"
55
targetdir (outputdir .. "%{cfg.buildcfg}/%{prj.name}")
66
objdir (objoutdir .. "%{cfg.buildcfg}/%{prj.name}")
7+
fatalwarnings { "All" }
78

89
files {
910
"**.h",

Sources/OvCore/include/OvCore/Rendering/PostProcess/AEffect.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,18 @@ namespace OvCore::Rendering::PostProcess
3232
*/
3333
AEffect(OvRendering::Core::CompositeRenderer& p_renderer);
3434

35+
/**
36+
* Virtual destructor
37+
*/
38+
virtual ~AEffect() = default;
39+
3540
/**
3641
* Returns true if the effect is applicable with the given settings.
3742
* If the effect is not applicable, it will be skipped by the post processing render pass
3843
* @param p_settings
3944
*/
4045
virtual bool IsApplicable(const EffectSettings& p_settings) const;
41-
46+
4247
/**
4348
* Draw the effect
4449
* @note: make sure the effect is applicable before calling this method

Sources/OvCore/include/OvCore/Rendering/ReflectionRenderFeature.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ namespace OvCore::Rendering
7171

7272
protected:
7373
virtual void OnBeginFrame(const OvRendering::Data::FrameDescriptor& p_frameDescriptor) override;
74-
virtual void OnBeforeDraw(OvRendering::Data::PipelineState& p_pso, const OvRendering::Entities::Drawable& p_drawable);
74+
virtual void OnBeforeDraw(OvRendering::Data::PipelineState& p_pso, const OvRendering::Entities::Drawable& p_drawable) override;
7575
};
7676
}

Sources/OvCore/premake5.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ project "OvCore"
44
cppdialect "C++20"
55
targetdir (outputdir .. "%{cfg.buildcfg}/%{prj.name}")
66
objdir (objoutdir .. "%{cfg.buildcfg}/%{prj.name}")
7+
fatalwarnings { "All" }
78

89
-- If MSVC, set big obj flag
910
filter { "toolset:msc" }

Sources/OvCore/src/OvCore/ECS/Components/CAudioSource.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ void OvCore::ECS::Components::CAudioSource::OnInspector(OvUI::Internal::WidgetCo
207207
{
208208
float graphY = graphX < m_audioSource.GetAttenuationThreshold() ? 1.0f : 1.0f / (1.0f + 1.0f * (graphX - m_audioSource.GetAttenuationThreshold()));
209209

210-
if (abs(graphX - distanceToListener) <= 0.25f)
210+
if (std::abs(graphX - distanceToListener) <= 0.25f)
211211
{
212212
graph.forceHover = static_cast<int>(graphX * 4.0f);
213213
graph.overlay = std::to_string(static_cast<int>(graphY * 100.0f)) + "%";

Sources/OvCore/src/OvCore/Rendering/PostProcessRenderPass.cpp

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,23 @@ void OvCore::Rendering::PostProcessRenderPass::Draw(OvRendering::Data::PipelineS
6868

6969
for (auto& effect : m_effects)
7070
{
71-
const auto& settings = stack->Get(typeid(*effect));
72-
73-
if (effect && effect->IsApplicable(settings))
71+
if (effect)
7472
{
75-
effect->Draw(
76-
p_pso,
77-
m_pingPongBuffers[0],
78-
m_pingPongBuffers[1],
79-
settings
80-
);
81-
82-
++m_pingPongBuffers;
73+
auto& effectRef = *effect;
74+
const auto& effectType = typeid(effectRef);
75+
const auto& settings = stack->Get(effectType);
76+
77+
if (effect->IsApplicable(settings))
78+
{
79+
effect->Draw(
80+
p_pso,
81+
m_pingPongBuffers[0],
82+
m_pingPongBuffers[1],
83+
settings
84+
);
85+
86+
++m_pingPongBuffers;
87+
}
8388
}
8489
}
8590

Sources/OvCore/src/OvCore/Rendering/SceneRenderer.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ SceneRenderer::SceneDrawablesDescriptor OvCore::Rendering::SceneRenderer::ParseS
297297
case MESH_BOUNDS: return mesh->GetBoundingSphere();
298298
case DEPRECATED_MODEL_BOUNDS: return model->GetBoundingSphere();
299299
case CUSTOM_BOUNDS: return modelRenderer->GetCustomBoundingSphere();
300+
default: return std::nullopt;
300301
}
301302
return std::nullopt;
302303
}();

Sources/OvCore/src/OvCore/ResourceManagement/MaterialManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OvCore::Resources::Material * OvCore::ResourceManagement::MaterialManager::Creat
1313
Resources::Material* material = OvCore::Resources::Loaders::MaterialLoader::Create(realPath);
1414
if (material)
1515
{
16-
*reinterpret_cast<std::string*>(reinterpret_cast<char*>(material) + offsetof(Resources::Material, path)) = p_path.string(); // Force the resource path to fit the given path
16+
const_cast<std::string&>(material->path) = p_path.string(); // Force the resource path to fit the given path
1717
}
1818

1919
return material;

Sources/OvCore/src/OvCore/ResourceManagement/ModelManager.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,17 @@ OvRendering::Resources::Parsers::EModelParserFlags GetAssetMetadata(const std::s
4646
if (metaFile.GetOrDefault("DROP_NORMALS", false)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::DROP_NORMALS;
4747
if (metaFile.GetOrDefault("GEN_BOUNDING_BOXES", false)) flags |= OvRendering::Resources::Parsers::EModelParserFlags::GEN_BOUNDING_BOXES;
4848

49-
return { flags };
49+
return flags;
5050
}
5151

5252
OvRendering::Resources::Model* OvCore::ResourceManagement::ModelManager::CreateResource(const std::filesystem::path& p_path)
5353
{
5454
std::string realPath = GetRealPath(p_path).string();
5555
auto model = OvRendering::Resources::Loaders::ModelLoader::Create(realPath, GetAssetMetadata(realPath));
5656
if (model)
57-
*reinterpret_cast<std::string*>(reinterpret_cast<char*>(model) + offsetof(OvRendering::Resources::Model, path)) = p_path.string(); // Force the resource path to fit the given path
57+
{
58+
const_cast<std::string&>(model->path) = p_path.string(); // Force the resource path to fit the given path
59+
}
5860

5961
return model;
6062
}

Sources/OvCore/src/OvCore/ResourceManagement/ShaderManager.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ OvRendering::Resources::Shader* OvCore::ResourceManagement::ShaderManager::Creat
1212
auto pathParserCallback = [this](const std::string& s) { return GetRealPath(std::filesystem::path{s}).string(); };
1313
OvRendering::Resources::Shader* shader = OvRendering::Resources::Loaders::ShaderLoader::Create(realPath, pathParserCallback);
1414
if (shader)
15-
*reinterpret_cast<std::string*>(reinterpret_cast<char*>(shader) + offsetof(OvRendering::Resources::Shader, path)) = p_path.string(); // Force the resource path to fit the given path
15+
{
16+
const_cast<std::string&>(shader->path) = p_path.string(); // Force the resource path to fit the given path
17+
}
1618

1719
return shader;
1820
}

0 commit comments

Comments
 (0)