various source cleanup

- missing includes - missing const - C cast style - superfluous inline keyword
google · Jan 17, 2025 · 040a086 · 040a086
1 parent 5472dea
commit 040a086
Show file tree

Hide file tree

Showing 15 changed files with 209 additions and 169 deletions.
diff --git a/filament/include/filament/Camera.h b/filament/include/filament/Camera.h
@@ -400,14 +400,14 @@ class UTILS_PUBLIC Camera : public FilamentAPI {
      *          engine.getTransformManager().getInstance(camera->getEntity()), model);
      * ~~~~~~~~~~~
      *
-     * @param model The camera position and orientation provided as a rigid transform matrix.
+     * @param modelMatrix The camera position and orientation provided as a rigid transform matrix.
      *
      * @note The Camera "looks" towards its -z axis
      *
      * @warning \p model must be a rigid transform
      */
-    void setModelMatrix(const math::mat4& model) noexcept;
-    void setModelMatrix(const math::mat4f& model) noexcept; //!< @overload
+    void setModelMatrix(const math::mat4& modelMatrix) noexcept;
+    void setModelMatrix(const math::mat4f& modelMatrix) noexcept; //!< @overload
 
     /** Set the position of an eye relative to this Camera (head).
      *

diff --git a/filament/include/filament/Material.h b/filament/include/filament/Material.h
@@ -177,7 +177,7 @@ class UTILS_PUBLIC Material : public FilamentAPI {
          *            memory or other resources.
          * @exception utils::PreConditionPanic if a parameter to a builder function was invalid.
          */
-        Material* UTILS_NULLABLE build(Engine& engine);
+        Material* UTILS_NULLABLE build(Engine& engine) const;
     private:
         friend class FMaterial;
     };

diff --git a/filament/src/Froxelizer.cpp b/filament/src/Froxelizer.cpp
@@ -16,27 +16,47 @@
 
 #include "Froxelizer.h"
 
+#include "Allocators.h"
 #include "Intersections.h"
 
 #include "details/Engine.h"
 #include "details/Scene.h"
 
-#include "private/backend/DriverApi.h"
+#include <private/filament/EngineEnums.h>
+#include <private/backend/DriverApi.h>
 
+#include <filament/Box.h>
 #include <filament/Viewport.h>
 
+#include <backend/DriverEnums.h>
+
 #include <utils/BinaryTreeArray.h>
+#include <utils/JobSystem.h>
 #include <utils/Log.h>
+#include <utils/Slice.h>
 #include <utils/Systrace.h>
+#include <utils/compiler.h>
 #include <utils/debug.h>
 
-#include <math/mat4.h>
 #include <math/fast.h>
+#include <math/mat3.h>
+#include <math/mat4.h>
 #include <math/scalar.h>
+#include <math/vec2.h>
+#include <math/vec3.h>
+#include <math/vec4.h>
 
 #include <algorithm>
+#include <utils/architecture.h>
+#include <array>
+#include <cmath>
+#include <limits>
+#include <type_traits>
+#include <utility>
 
 #include <stddef.h>
+#include <stdint.h>
+#include <string.h>
 
 using namespace filament::math;
 using namespace utils;
@@ -603,7 +623,7 @@ void Froxelizer::froxelizeLoop(FEngine& engine,
     JobSystem& js = engine.getJobSystem();
 
     constexpr bool SINGLE_THREADED = false;
-    if (!SINGLE_THREADED) {
+    if constexpr (!SINGLE_THREADED) {
         auto *parent = js.createJob();
         for (size_t i = 0; i < GROUP_COUNT; i++) {
             js.run(jobs::createJob(js, parent, std::cref(process),
@@ -737,7 +757,7 @@ void Froxelizer::froxelizeAssignRecordsCompress() noexcept {
     ;
 }
 
-static inline float2 project(mat4f const& p, float3 const& v) noexcept {
+static float2 project(mat4f const& p, float3 const& v) noexcept {
     const float vx = v[0];
     const float vy = v[1];
     const float vz = v[2];

diff --git a/filament/src/Frustum.cpp b/filament/src/Frustum.cpp
@@ -19,7 +19,13 @@
 #include "Culler.h"
 
 #include <utils/compiler.h>
-#include <utils/Log.h>
+#include <utils/ostream.h>
+
+#include <math/vec3.h>
+#include <math/vec4.h>
+#include <math/mat4.h>
+
+#include <algorithm>
 
 using namespace filament::math;
 

diff --git a/filament/src/Material.cpp b/filament/src/Material.cpp
@@ -16,8 +16,22 @@
 
 #include "details/Material.h"
 
+#include <filament/Material.h>
+#include <filament/MaterialEnums.h>
+
+#include <backend/CallbackHandler.h>
+#include <backend/DriverEnums.h>
+
+#include <utils/Invocable.h>
+
+#include <utility>
+
+#include <stddef.h>
+
 namespace filament {
 
+class MaterialInstance;
+
 using namespace backend;
 
 MaterialInstance* Material::createInstance(const char* name) const noexcept {
@@ -140,9 +154,9 @@ MaterialInstance const* Material::getDefaultInstance() const noexcept {
     return downcast(this)->getDefaultInstance();
 }
 
-void Material::compile(CompilerPriorityQueue const priority, UserVariantFilterMask const variantFilter,
+void Material::compile(CompilerPriorityQueue const priority, UserVariantFilterMask const variants,
         CallbackHandler* handler, utils::Invocable<void(Material*)>&& callback) noexcept {
-    downcast(this)->compile(priority, variantFilter, handler, std::move(callback));
+    downcast(this)->compile(priority, variants, handler, std::move(callback));
 }
 
 UserVariantFilterMask Material::getSupportedVariants() const noexcept {