From dd7453176e23448da071bc6155eea4319fe921fc Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@walton-rivers.uk>
Date: Sat, 11 Jun 2022 16:05:21 +0100
Subject: [PATCH] cut down on log spam using guards
---
fggl/gfx/ogl4/models.cpp | 19 ++++++++-----------
fggl/phys/bullet/simulation.cpp | 4 ++--
include/fggl/ecs3/prototype/world.h | 11 +++++++++++
include/fggl/gfx/phong.hpp | 18 +++++++++++++-----
4 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/fggl/gfx/ogl4/models.cpp b/fggl/gfx/ogl4/models.cpp
index 6034413..3af5329 100644
--- a/fggl/gfx/ogl4/models.cpp
+++ b/fggl/gfx/ogl4/models.cpp
@@ -163,18 +163,15 @@ namespace fggl::gfx::ogl4 {
shader->setUniformMtx(shader->uniform("view"), viewMatrix);
shader->setUniformMtx(shader->uniform("projection"), projectionMatrix);
- auto* material = world.tryGet<fggl::gfx::PhongMaterial>(entity);
- if ( material == nullptr) {
- shader->setUniformF(shader->uniform("material.ambient"), math::vec3(0.05F, 0.05F, 0.05F));
- shader->setUniformF(shader->uniform("material.diffuse"), math::vec3(0.5F, 0.5F, 0.5F));
- shader->setUniformF(shader->uniform("material.specular"), math::vec3(0.7F, 0.7F, 0.7F));
- shader->setUniformF(shader->uniform("material.shininess"), .078125F);
- } else {
- shader->setUniformF(shader->uniform("material.ambient"), material->ambient);
- shader->setUniformF(shader->uniform("material.diffuse"), material->diffuse);
- shader->setUniformF(shader->uniform("material.specular"), material->specular);
- shader->setUniformF(shader->uniform("material.shininess"), material->shininess);
+ // material detection with fallback
+ auto* material = &gfx::DEFAULT_MATERIAL;
+ if ( world.has<PhongMaterial>(entity) ) {
+ material = world.get<PhongMaterial>(entity);
}
+ shader->setUniformF(shader->uniform("material.ambient"), material->ambient);
+ shader->setUniformF(shader->uniform("material.diffuse"), material->diffuse);
+ shader->setUniformF(shader->uniform("material.specular"), material->specular);
+ shader->setUniformF(shader->uniform("material.shininess"), material->shininess);
auto lightPosIdx = shader->uniform("lightPos");
if ( lightPosIdx != -1 ) {
diff --git a/fggl/phys/bullet/simulation.cpp b/fggl/phys/bullet/simulation.cpp
index e2256cc..f0c49e5 100644
--- a/fggl/phys/bullet/simulation.cpp
+++ b/fggl/phys/bullet/simulation.cpp
@@ -199,11 +199,11 @@ namespace fggl::phys::bullet {
}
static void handleCollisionCallbacks(ecs3::World* world, ecs3::entity_t owner, ecs3::entity_t other) {
- auto* callbacks = world->tryGet<CollisionCallbacks>(owner);
- if ( callbacks == nullptr ) {
+ if ( !world->has<CollisionCallbacks>(owner) ) {
return;
}
+ auto* callbacks = world->tryGet<CollisionCallbacks>(owner);
auto* cache = world->tryGet<CollisionCache>(owner);
if ( cache != nullptr ) {
auto itr = cache->collisions.find(other);
diff --git a/include/fggl/ecs3/prototype/world.h b/include/fggl/ecs3/prototype/world.h
index 7cd6287..87a6d66 100644
--- a/include/fggl/ecs3/prototype/world.h
+++ b/include/fggl/ecs3/prototype/world.h
@@ -233,6 +233,17 @@ namespace fggl::ecs3::prototype {
return entities;
}
+ template<typename ...Cs>
+ bool has(entity_t entityIdx) const {
+ if ( !alive(entityIdx)) {
+ return false;
+ }
+
+ std::vector<ecs::component_type_t> key;
+ (key.push_back(Component<Cs>::typeID()), ...);
+ return m_entities.at(entityIdx).hasComponents(key);
+ }
+
template<typename C>
C *add(entity_t entity_id) {
assert( alive(entity_id) && "attempted to add component on null entity" );
diff --git a/include/fggl/gfx/phong.hpp b/include/fggl/gfx/phong.hpp
index 03faae4..ca1d09e 100644
--- a/include/fggl/gfx/phong.hpp
+++ b/include/fggl/gfx/phong.hpp
@@ -29,11 +29,6 @@
namespace fggl::gfx {
- constexpr math::vec3 DEFAULT_AMBIENT { 0.05F, 0.05F, 0.05F};
- constexpr math::vec3 DEFAULT_DIFFUSE { 0.5F, 0.5F, 0.5F};
- constexpr math::vec3 DEFAULT_SPECULAR { 0.7F, 0.7F, 0.7F};
- constexpr float DEFAULT_SHININESS = .078125F;
-
struct PhongMaterial {
constexpr static const char* name = "gfx::material";
math::vec3 ambient;
@@ -42,6 +37,19 @@ namespace fggl::gfx {
float shininess;
};
+ constexpr math::vec3 DEFAULT_AMBIENT { 0.05F, 0.05F, 0.05F};
+ constexpr math::vec3 DEFAULT_DIFFUSE { 0.5F, 0.5F, 0.5F};
+ constexpr math::vec3 DEFAULT_SPECULAR { 0.7F, 0.7F, 0.7F};
+ constexpr float DEFAULT_SHININESS = .078125F;
+
+ constexpr PhongMaterial DEFAULT_MATERIAL {
+ DEFAULT_AMBIENT,
+ DEFAULT_DIFFUSE,
+ DEFAULT_SPECULAR,
+ DEFAULT_SHININESS
+ };
+
+
enum class LightType {
Directional,
Point,
--
GitLab