From bd03447d1a641b9d7f63a54a6930d0f211b10cac Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@walton-rivers.uk>
Date: Wed, 12 Jul 2023 19:56:59 +0100
Subject: [PATCH] cleanup warnings
---
components/core/src/filesystem/finder.cpp | 3 +++
demo/demo/GameScene.cpp | 2 +-
demo/demo/hexboard/camera.cpp | 2 +-
demo/demo/robot/programmer.cpp | 2 +-
fggl/data/assimp/module.cpp | 6 ++----
fggl/gfx/ogl/types.cpp | 6 +++---
fggl/gfx/ogl4/canvas.cpp | 5 +++--
fggl/gfx/ogl4/module.cpp | 2 +-
fggl/gfx/ogl4/setup.cpp | 2 +-
fggl/phys/null.cpp | 8 ++------
include/fggl/gfx/ogl/renderer.hpp | 4 +---
include/fggl/math/easing.hpp | 4 ++--
include/fggl/math/triangulation.hpp | 2 ++
include/fggl/phys/null.hpp | 13 ++++---------
14 files changed, 27 insertions(+), 34 deletions(-)
diff --git a/components/core/src/filesystem/finder.cpp b/components/core/src/filesystem/finder.cpp
index 0b8cff5..bd6c9ae 100644
--- a/components/core/src/filesystem/finder.cpp
+++ b/components/core/src/filesystem/finder.cpp
@@ -54,6 +54,9 @@ namespace fggl::filesystem {
case Context::TMP:
return fggl::platform::locate_temp(m_paths, name);
}
+
+ // should be unreachable.
+ return {};
}
std::optional<Locator::Path> Locator::find(const char *name,
diff --git a/demo/demo/GameScene.cpp b/demo/demo/GameScene.cpp
index feccdcd..96dc701 100644
--- a/demo/demo/GameScene.cpp
+++ b/demo/demo/GameScene.cpp
@@ -105,7 +105,7 @@ static fggl::entity::EntityID setupTerrain(fggl::entity::EntityManager& world) {
for (std::size_t z = 0; z < fggl::data::heightMaxZ; ++z) {
for (std::size_t x = 0; x < fggl::data::heightMaxX; ++x) {
- const double noise = perlin.octave2D_11( (x * 0.01), (z * 0.01) , 4) * 10.f;
+ const double noise = perlin.octave2D_11( (x * 0.01), (z * 0.01) , 4) * 10.0;
terrainData.setValue(x, z, (float)noise);
}
}
diff --git a/demo/demo/hexboard/camera.cpp b/demo/demo/hexboard/camera.cpp
index c87e703..ac3265c 100644
--- a/demo/demo/hexboard/camera.cpp
+++ b/demo/demo/hexboard/camera.cpp
@@ -24,7 +24,7 @@
namespace demo::hexboard {
- void Camera2D::update(float delta) {
+ void Camera2D::update(float /*delta*/) {
m_location = fggl::math::smooth_add( m_location, m_target, m_scale );
if ( m_trauma > 0 ) {
m_trauma = std::max( m_trauma - TRAUMA_DECAY, 0.0F );
diff --git a/demo/demo/robot/programmer.cpp b/demo/demo/robot/programmer.cpp
index a4592d5..0978130 100644
--- a/demo/demo/robot/programmer.cpp
+++ b/demo/demo/robot/programmer.cpp
@@ -24,7 +24,7 @@ namespace demo::robot {
m_tracks.push_back(std::ref(program));
}
- void Timeline::update(float deltaTime) {
+ void Timeline::update(float /*deltaTime*/) {
auto currSize = size();
float trackHeight = m_tracks.size() * 32.0F;
diff --git a/fggl/data/assimp/module.cpp b/fggl/data/assimp/module.cpp
index 0afee18..70fb8af 100644
--- a/fggl/data/assimp/module.cpp
+++ b/fggl/data/assimp/module.cpp
@@ -75,9 +75,7 @@ namespace fggl::data::models {
}
// process material
- if ( assimpMesh->mMaterialIndex >= 0) {
- mesh.material = assets[assimpMesh->mMaterialIndex];
- }
+ mesh.material = assets[assimpMesh->mMaterialIndex];
}
static void process_node(mesh::MultiMesh3D& mesh, aiNode* node, const aiScene* scene, const std::vector<assets::AssetID>& assets) {
@@ -313,7 +311,7 @@ namespace fggl::data::models {
return true;
}
- void AssimpModule::wireServices(services::ModuleBinder &binder) {
+ void AssimpModule::wireServices(services::ModuleBinder &/*binder*/) {
// assimp provides no direct services, it's just plugs into the asset loading pipelines...
}
diff --git a/fggl/gfx/ogl/types.cpp b/fggl/gfx/ogl/types.cpp
index a72dde8..4143e97 100644
--- a/fggl/gfx/ogl/types.cpp
+++ b/fggl/gfx/ogl/types.cpp
@@ -58,7 +58,7 @@ namespace fggl::gfx::ogl {
}
void VertexArray::setAttribute(const ArrayBuffer &buff, GLuint idx, AttributeF &attr) {
- assert(0 <= idx && idx < GL_MAX_VERTEX_ATTRIBS);
+ assert(idx < GL_MAX_VERTEX_ATTRIBS);
assert(1 <= attr.elmCount && attr.elmCount <= 4);
assert(buff.isValid());
@@ -77,7 +77,7 @@ namespace fggl::gfx::ogl {
}
void VertexArray::setAttribute(const ArrayBuffer &buff, GLuint idx, AttributeI &attr, bool normalized) {
- assert(0 <= idx && idx < GL_MAX_VERTEX_ATTRIBS);
+ assert(idx < GL_MAX_VERTEX_ATTRIBS);
assert(1 <= attr.elmCount && attr.elmCount <= 4);
assert(buff.isValid());
@@ -99,7 +99,7 @@ namespace fggl::gfx::ogl {
}
void VertexArray::setAttributeI(const ArrayBuffer &buff, GLuint idx, AttributeI &attr) {
- assert(0 <= idx && idx < GL_MAX_VERTEX_ATTRIBS);
+ assert(idx < GL_MAX_VERTEX_ATTRIBS);
assert(1 <= attr.elmCount && attr.elmCount <= 4);
assert(buff.isValid());
diff --git a/fggl/gfx/ogl4/canvas.cpp b/fggl/gfx/ogl4/canvas.cpp
index a0a5828..fee599f 100644
--- a/fggl/gfx/ogl4/canvas.cpp
+++ b/fggl/gfx/ogl4/canvas.cpp
@@ -27,6 +27,7 @@
namespace fggl::gfx::ogl4 {
+ [[maybe_unused]]
static void make_box(gfx::Path2D &path, glm::vec2 topLeft, glm::vec2 bottomRight) {
path.moveTo({topLeft.x, topLeft.y});
path.pathTo({bottomRight.x, topLeft.y});
@@ -54,7 +55,7 @@ namespace fggl::gfx::ogl4 {
for (auto &type : path.m_types) {
if (type == PathType::PATH) {
- verts.push_back({path.m_points[idx++], colour});
+ verts.push_back({path.m_points[idx++], colour, {0,0}});
} else if (type == PathType::MOVE) {
// polygon finished
if (verts.size() < 3) {
@@ -69,7 +70,7 @@ namespace fggl::gfx::ogl4 {
}
verts.clear();
- verts.push_back({path.m_points[idx++], colour});
+ verts.push_back({path.m_points[idx++], colour, {0,0}});
} else if (type == PathType::COLOUR) {
colour = path.m_colours[colourIdx++];
} else {
diff --git a/fggl/gfx/ogl4/module.cpp b/fggl/gfx/ogl4/module.cpp
index 5a48807..3d84426 100644
--- a/fggl/gfx/ogl4/module.cpp
+++ b/fggl/gfx/ogl4/module.cpp
@@ -78,7 +78,7 @@ namespace fggl::gfx {
// procedural meshes are build as static meshes first
if (spec.config["shape"].IsSequence()) {
- mesh::MultiMesh3D* multiMesh;
+ mesh::MultiMesh3D* multiMesh = new mesh::MultiMesh3D();
for (const auto &node : spec.config["shape"]) {
auto* meshAsset = new mesh::Mesh3D();
diff --git a/fggl/gfx/ogl4/setup.cpp b/fggl/gfx/ogl4/setup.cpp
index 1b51992..b279461 100644
--- a/fggl/gfx/ogl4/setup.cpp
+++ b/fggl/gfx/ogl4/setup.cpp
@@ -20,7 +20,7 @@
namespace fggl::gfx::ogl4 {
- auto WindowGraphics::create(display::Window &window) -> Graphics * {
+ auto WindowGraphics::create(display::Window &/*window*/) -> Graphics * {
ShaderCache* cache = new ShaderCache(m_storage, m_reader);
return new OpenGL4Backend(m_fonts, m_assets, cache, (GlFunctionLoader)glfwGetProcAddress);
}
diff --git a/fggl/phys/null.cpp b/fggl/phys/null.cpp
index eeb2ca4..ed9a752 100644
--- a/fggl/phys/null.cpp
+++ b/fggl/phys/null.cpp
@@ -20,11 +20,7 @@
namespace fggl::phys {
- auto NullPhysics::factory(modules::ServiceName serviceName, modules::Services &serviceManager) -> bool {
- /*if (serviceName == phys::PhysicsProvider::service) {
- serviceManager.bind<phys::PhysicsProvider, NullPhysicsProvider>();
- return true;
- }*/
- return false;
+ void NullPhysics::wireServices(services::ModuleBinder &binder) {
+ binder.bind<phys::PhysicsProvider>().simplyTo<NullPhysicsProvider>();
}
}
\ No newline at end of file
diff --git a/include/fggl/gfx/ogl/renderer.hpp b/include/fggl/gfx/ogl/renderer.hpp
index fba80c3..8933eca 100644
--- a/include/fggl/gfx/ogl/renderer.hpp
+++ b/include/fggl/gfx/ogl/renderer.hpp
@@ -41,7 +41,7 @@ namespace fggl::gfx {
*/
class OpenGL4Backend : public Graphics {
public:
- explicit OpenGL4Backend(gui::FontLibrary *fonts, assets::AssetManager *assets, ShaderCache* cache, GlFunctionLoader loader);
+ explicit OpenGL4Backend(gui::FontLibrary* fonts, assets::AssetManager *assets, ShaderCache* cache, GlFunctionLoader loader);
~OpenGL4Backend() override;
// copy bad
@@ -94,8 +94,6 @@ namespace fggl::gfx {
std::unique_ptr<ogl4::DebugRenderer> m_debugRenderer;
std::shared_ptr<ogl::Shader> m_canvasPipeline;
ShaderCache* m_cache;
- //filesystem::Locator *m_storage;
- gui::FontLibrary *m_fontLibrary;
};
}; // namespace fggl::gfx
diff --git a/include/fggl/math/easing.hpp b/include/fggl/math/easing.hpp
index 2c07c2e..2943cac 100644
--- a/include/fggl/math/easing.hpp
+++ b/include/fggl/math/easing.hpp
@@ -73,11 +73,11 @@ namespace fggl::math {
}
constexpr inline float BounceClampBottom(float t) {
- return fabs(t);
+ return fabsf(t);
}
constexpr inline float BounceClampTop(float t) {
- return 1.f - fabs(1.f - t);
+ return 1.f - fabsf(1.f - t);
}
//
diff --git a/include/fggl/math/triangulation.hpp b/include/fggl/math/triangulation.hpp
index 628349e..6ba9ba9 100644
--- a/include/fggl/math/triangulation.hpp
+++ b/include/fggl/math/triangulation.hpp
@@ -65,6 +65,7 @@ namespace fggl::math {
*
* see https://math.stackexchange.com/a/1745427
*/
+ [[maybe_unused]]
static bool isConvex(const Polygon &polygon) {
if (polygon.size() < 3) {
return false;
@@ -126,6 +127,7 @@ namespace fggl::math {
return true;
}
+ [[maybe_unused]]
static data::Vertex2D pointToVertex(const math::vec2 &point) {
return data::Vertex2D{point, {1.0F, 1.0F, 1.0F}, {0.0F, 0.0F}};
}
diff --git a/include/fggl/phys/null.hpp b/include/fggl/phys/null.hpp
index 6d670cb..7f869bc 100644
--- a/include/fggl/phys/null.hpp
+++ b/include/fggl/phys/null.hpp
@@ -68,15 +68,10 @@ namespace fggl::phys {
}
};
- struct NullPhysics {
- constexpr static const char *name = "fggl::phys::null";
- constexpr static const std::array<modules::ServiceName, 1> provides = {
- FGGL_SERVICE(phys::PhysicsProvider)
- };
- constexpr static const std::array<modules::ServiceName, 1> depends = {
- FGGL_SERVICE(entity::EntityFactory)
- };
- static bool factory(modules::ServiceName serviceName, modules::Services &serviceManager);
+ struct NullPhysics : public services::Module {
+ FGGL_MODULE(fggl::phys::null)
+
+ void wireServices(services::ModuleBinder&) override;
};
} // namespace fggl::phys
--
GitLab