mirror of
https://github.com/godotengine/godot.git
synced 2024-12-04 01:52:56 +00:00
Style: Apply clang-tidy
fixes
• `modernize-use-default-member-init` and `readability-redundant-member-init` • Minor adjustments to `.clang-tidy` to improve syntax & remove redundancies
This commit is contained in:
parent
1bffd6c73b
commit
89a311205f
21
.clang-tidy
21
.clang-tidy
@ -1,14 +1,12 @@
|
|||||||
---
|
Checks:
|
||||||
Checks: >-
|
- -*
|
||||||
-*,
|
- cppcoreguidelines-pro-type-member-init
|
||||||
cppcoreguidelines-pro-type-member-init,
|
- modernize-redundant-void-arg
|
||||||
modernize-redundant-void-arg,
|
- modernize-use-bool-literals
|
||||||
modernize-use-bool-literals,
|
- modernize-use-default-member-init
|
||||||
modernize-use-default-member-init,
|
- modernize-use-nullptr
|
||||||
modernize-use-nullptr,
|
- readability-braces-around-statements
|
||||||
readability-braces-around-statements,
|
- readability-redundant-member-init
|
||||||
readability-redundant-member-init
|
|
||||||
WarningsAsErrors: ''
|
|
||||||
HeaderFileExtensions: ['', h, hh, hpp, hxx, inc, glsl]
|
HeaderFileExtensions: ['', h, hh, hpp, hxx, inc, glsl]
|
||||||
ImplementationFileExtensions: [c, cc, cpp, cxx, m, mm, java]
|
ImplementationFileExtensions: [c, cc, cpp, cxx, m, mm, java]
|
||||||
HeaderFilterRegex: (core|doc|drivers|editor|main|modules|platform|scene|servers|tests)/
|
HeaderFilterRegex: (core|doc|drivers|editor|main|modules|platform|scene|servers|tests)/
|
||||||
@ -19,4 +17,3 @@ CheckOptions:
|
|||||||
modernize-use-bool-literals.IgnoreMacros: false
|
modernize-use-bool-literals.IgnoreMacros: false
|
||||||
modernize-use-default-member-init.IgnoreMacros: false
|
modernize-use-default-member-init.IgnoreMacros: false
|
||||||
modernize-use-default-member-init.UseAssignment: true
|
modernize-use-default-member-init.UseAssignment: true
|
||||||
...
|
|
||||||
|
@ -315,6 +315,4 @@ struct BuildIndexSequence<0, Is...> : IndexSequence<Is...> {};
|
|||||||
#define ___gd_is_defined(val) ____gd_is_defined(__GDARG_PLACEHOLDER_##val)
|
#define ___gd_is_defined(val) ____gd_is_defined(__GDARG_PLACEHOLDER_##val)
|
||||||
#define GD_IS_DEFINED(x) ___gd_is_defined(x)
|
#define GD_IS_DEFINED(x) ___gd_is_defined(x)
|
||||||
|
|
||||||
#define FORCE_SEMICOLON ;
|
|
||||||
|
|
||||||
#endif // TYPEDEFS_H
|
#endif // TYPEDEFS_H
|
||||||
|
@ -2719,8 +2719,7 @@ Variant::Variant(const Vector<Plane> &p_array) :
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Variant::Variant(const Vector<Face3> &p_face_array) :
|
Variant::Variant(const Vector<Face3> &p_face_array) {
|
||||||
type(NIL) {
|
|
||||||
PackedVector3Array vertices;
|
PackedVector3Array vertices;
|
||||||
int face_count = p_face_array.size();
|
int face_count = p_face_array.size();
|
||||||
vertices.resize(face_count * 3);
|
vertices.resize(face_count * 3);
|
||||||
@ -2739,8 +2738,7 @@ Variant::Variant(const Vector<Face3> &p_face_array) :
|
|||||||
*this = vertices;
|
*this = vertices;
|
||||||
}
|
}
|
||||||
|
|
||||||
Variant::Variant(const Vector<Variant> &p_array) :
|
Variant::Variant(const Vector<Variant> &p_array) {
|
||||||
type(NIL) {
|
|
||||||
Array arr;
|
Array arr;
|
||||||
arr.resize(p_array.size());
|
arr.resize(p_array.size());
|
||||||
for (int i = 0; i < p_array.size(); i++) {
|
for (int i = 0; i < p_array.size(); i++) {
|
||||||
@ -2749,8 +2747,7 @@ Variant::Variant(const Vector<Variant> &p_array) :
|
|||||||
*this = arr;
|
*this = arr;
|
||||||
}
|
}
|
||||||
|
|
||||||
Variant::Variant(const Vector<StringName> &p_array) :
|
Variant::Variant(const Vector<StringName> &p_array) {
|
||||||
type(NIL) {
|
|
||||||
PackedStringArray v;
|
PackedStringArray v;
|
||||||
int len = p_array.size();
|
int len = p_array.size();
|
||||||
v.resize(len);
|
v.resize(len);
|
||||||
@ -2908,8 +2905,7 @@ Variant::Variant(const IPAddress &p_address) :
|
|||||||
memnew_placement(_data._mem, String(p_address));
|
memnew_placement(_data._mem, String(p_address));
|
||||||
}
|
}
|
||||||
|
|
||||||
Variant::Variant(const Variant &p_variant) :
|
Variant::Variant(const Variant &p_variant) {
|
||||||
type(NIL) {
|
|
||||||
reference(p_variant);
|
reference(p_variant);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -814,8 +814,7 @@ public:
|
|||||||
static void unregister_types();
|
static void unregister_types();
|
||||||
|
|
||||||
Variant(const Variant &p_variant);
|
Variant(const Variant &p_variant);
|
||||||
_FORCE_INLINE_ Variant() :
|
_FORCE_INLINE_ Variant() {}
|
||||||
type(NIL) {}
|
|
||||||
_FORCE_INLINE_ ~Variant() {
|
_FORCE_INLINE_ ~Variant() {
|
||||||
clear();
|
clear();
|
||||||
}
|
}
|
||||||
|
@ -4017,7 +4017,7 @@ RDD::UniformSetID RenderingDeviceDriverVulkan::uniform_set_create(VectorView<Bou
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Need a descriptor pool.
|
// Need a descriptor pool.
|
||||||
DescriptorSetPools::Iterator pool_sets_it = {};
|
DescriptorSetPools::Iterator pool_sets_it;
|
||||||
VkDescriptorPool vk_pool = _descriptor_set_pool_find_or_create(pool_key, &pool_sets_it);
|
VkDescriptorPool vk_pool = _descriptor_set_pool_find_or_create(pool_key, &pool_sets_it);
|
||||||
DEV_ASSERT(vk_pool);
|
DEV_ASSERT(vk_pool);
|
||||||
pool_sets_it->value[vk_pool]++;
|
pool_sets_it->value[vk_pool]++;
|
||||||
|
@ -487,7 +487,7 @@ private:
|
|||||||
struct UniformSetInfo {
|
struct UniformSetInfo {
|
||||||
VkDescriptorSet vk_descriptor_set = VK_NULL_HANDLE;
|
VkDescriptorSet vk_descriptor_set = VK_NULL_HANDLE;
|
||||||
VkDescriptorPool vk_descriptor_pool = VK_NULL_HANDLE;
|
VkDescriptorPool vk_descriptor_pool = VK_NULL_HANDLE;
|
||||||
DescriptorSetPools::Iterator pool_sets_it = {};
|
DescriptorSetPools::Iterator pool_sets_it;
|
||||||
};
|
};
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -789,7 +789,7 @@ public:
|
|||||||
|
|
||||||
struct AdditiveNodeEntry {
|
struct AdditiveNodeEntry {
|
||||||
Node *node = nullptr;
|
Node *node = nullptr;
|
||||||
NodePath parent = NodePath();
|
NodePath parent;
|
||||||
Node *owner = nullptr;
|
Node *owner = nullptr;
|
||||||
int index = 0;
|
int index = 0;
|
||||||
// Used if the original parent node is lost
|
// Used if the original parent node is lost
|
||||||
|
@ -649,8 +649,9 @@ QuickOpenDisplayMode QuickOpenResultContainer::get_adaptive_display_mode(const V
|
|||||||
|
|
||||||
for (const StringName &type : grid_preferred_types) {
|
for (const StringName &type : grid_preferred_types) {
|
||||||
for (const StringName &base_type : p_base_types) {
|
for (const StringName &base_type : p_base_types) {
|
||||||
if (base_type == type || ClassDB::is_parent_class(base_type, type))
|
if (base_type == type || ClassDB::is_parent_class(base_type, type)) {
|
||||||
return QuickOpenDisplayMode::GRID;
|
return QuickOpenDisplayMode::GRID;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -91,7 +91,7 @@ public:
|
|||||||
TileSetAtlasSourceEditor *tiles_set_atlas_source_editor = nullptr;
|
TileSetAtlasSourceEditor *tiles_set_atlas_source_editor = nullptr;
|
||||||
|
|
||||||
Ref<TileSetAtlasSource> tile_set_atlas_source;
|
Ref<TileSetAtlasSource> tile_set_atlas_source;
|
||||||
RBSet<TileSelection> tiles = RBSet<TileSelection>();
|
RBSet<TileSelection> tiles;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
bool _set(const StringName &p_name, const Variant &p_value);
|
bool _set(const StringName &p_name, const Variant &p_value);
|
||||||
|
@ -91,10 +91,10 @@ class BetsyCompressor : public Object {
|
|||||||
RenderingDevice *compress_rd = nullptr;
|
RenderingDevice *compress_rd = nullptr;
|
||||||
RenderingContextDriver *compress_rcd = nullptr;
|
RenderingContextDriver *compress_rcd = nullptr;
|
||||||
HashMap<String, BetsyShader> cached_shaders;
|
HashMap<String, BetsyShader> cached_shaders;
|
||||||
RID src_sampler = RID();
|
RID src_sampler;
|
||||||
|
|
||||||
// Format-specific resources.
|
// Format-specific resources.
|
||||||
RID dxt1_encoding_table_buffer = RID();
|
RID dxt1_encoding_table_buffer;
|
||||||
|
|
||||||
void _init();
|
void _init();
|
||||||
void _assign_mt_ids(WorkerThreadPool::TaskID p_pump_task_id);
|
void _assign_mt_ids(WorkerThreadPool::TaskID p_pump_task_id);
|
||||||
|
@ -67,7 +67,7 @@ class NavAgent : public NavRid {
|
|||||||
uint32_t avoidance_mask = 1;
|
uint32_t avoidance_mask = 1;
|
||||||
real_t avoidance_priority = 1.0;
|
real_t avoidance_priority = 1.0;
|
||||||
|
|
||||||
Callable avoidance_callback = Callable();
|
Callable avoidance_callback;
|
||||||
|
|
||||||
bool agent_dirty = true;
|
bool agent_dirty = true;
|
||||||
|
|
||||||
|
@ -298,8 +298,7 @@ void OpenXRExtensionWrapperExtension::register_extension_wrapper() {
|
|||||||
OpenXRAPI::register_extension_wrapper(this);
|
OpenXRAPI::register_extension_wrapper(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
OpenXRExtensionWrapperExtension::OpenXRExtensionWrapperExtension() :
|
OpenXRExtensionWrapperExtension::OpenXRExtensionWrapperExtension() {
|
||||||
Object(), OpenXRExtensionWrapper() {
|
|
||||||
openxr_api.instantiate();
|
openxr_api.instantiate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -162,7 +162,7 @@ private:
|
|||||||
Vector<int> parentless_bones;
|
Vector<int> parentless_bones;
|
||||||
AHashMap<String, int> name_to_bone_index;
|
AHashMap<String, int> name_to_bone_index;
|
||||||
|
|
||||||
mutable StringName concatenated_bone_names = StringName();
|
mutable StringName concatenated_bone_names;
|
||||||
void _update_bone_names() const;
|
void _update_bone_names() const;
|
||||||
|
|
||||||
void _make_dirty();
|
void _make_dirty();
|
||||||
|
@ -131,7 +131,7 @@ class SkeletonIK3D : public SkeletonModifier3D {
|
|||||||
real_t min_distance = 0.01;
|
real_t min_distance = 0.01;
|
||||||
int max_iterations = 10;
|
int max_iterations = 10;
|
||||||
|
|
||||||
Variant target_node_override_ref = Variant();
|
Variant target_node_override_ref;
|
||||||
FabrikInverseKinematic::Task *task = nullptr;
|
FabrikInverseKinematic::Task *task = nullptr;
|
||||||
|
|
||||||
#ifndef DISABLE_DEPRECATED
|
#ifndef DISABLE_DEPRECATED
|
||||||
|
@ -251,13 +251,13 @@ private:
|
|||||||
Ref<Texture2D> completion_color_bg;
|
Ref<Texture2D> completion_color_bg;
|
||||||
|
|
||||||
Color breakpoint_color = Color(1, 1, 1);
|
Color breakpoint_color = Color(1, 1, 1);
|
||||||
Ref<Texture2D> breakpoint_icon = Ref<Texture2D>();
|
Ref<Texture2D> breakpoint_icon;
|
||||||
|
|
||||||
Color bookmark_color = Color(1, 1, 1);
|
Color bookmark_color = Color(1, 1, 1);
|
||||||
Ref<Texture2D> bookmark_icon = Ref<Texture2D>();
|
Ref<Texture2D> bookmark_icon;
|
||||||
|
|
||||||
Color executing_line_color = Color(1, 1, 1);
|
Color executing_line_color = Color(1, 1, 1);
|
||||||
Ref<Texture2D> executing_line_icon = Ref<Texture2D>();
|
Ref<Texture2D> executing_line_icon;
|
||||||
|
|
||||||
Color line_number_color = Color(1, 1, 1);
|
Color line_number_color = Color(1, 1, 1);
|
||||||
|
|
||||||
|
@ -139,7 +139,7 @@ private:
|
|||||||
Variant metadata;
|
Variant metadata;
|
||||||
bool clickable = false;
|
bool clickable = false;
|
||||||
|
|
||||||
Ref<Texture2D> icon = Ref<Texture2D>();
|
Ref<Texture2D> icon;
|
||||||
String text = "";
|
String text = "";
|
||||||
Color color = Color(1, 1, 1);
|
Color color = Color(1, 1, 1);
|
||||||
};
|
};
|
||||||
|
@ -64,7 +64,7 @@ public:
|
|||||||
execution_mode_physics_process
|
execution_mode_physics_process
|
||||||
};
|
};
|
||||||
|
|
||||||
Vector<Ref<SkeletonModification2D>> modifications = Vector<Ref<SkeletonModification2D>>();
|
Vector<Ref<SkeletonModification2D>> modifications;
|
||||||
|
|
||||||
void setup();
|
void setup();
|
||||||
void execute(float p_delta, int p_execution_mode);
|
void execute(float p_delta, int p_execution_mode);
|
||||||
|
@ -836,7 +836,7 @@ private:
|
|||||||
bool flip_v = false;
|
bool flip_v = false;
|
||||||
bool transpose = false;
|
bool transpose = false;
|
||||||
Vector2i texture_origin;
|
Vector2i texture_origin;
|
||||||
Ref<Material> material = Ref<Material>();
|
Ref<Material> material;
|
||||||
Color modulate = Color(1.0, 1.0, 1.0, 1.0);
|
Color modulate = Color(1.0, 1.0, 1.0, 1.0);
|
||||||
int z_index = 0;
|
int z_index = 0;
|
||||||
int y_sort_origin = 0;
|
int y_sort_origin = 0;
|
||||||
|
@ -102,9 +102,9 @@ private:
|
|||||||
/* Canvas Texture API */
|
/* Canvas Texture API */
|
||||||
|
|
||||||
struct CanvasTextureCache {
|
struct CanvasTextureCache {
|
||||||
RID diffuse = RID();
|
RID diffuse;
|
||||||
RID normal = RID();
|
RID normal;
|
||||||
RID specular = RID();
|
RID specular;
|
||||||
};
|
};
|
||||||
|
|
||||||
class CanvasTexture {
|
class CanvasTexture {
|
||||||
|
@ -1213,7 +1213,7 @@ public:
|
|||||||
struct ShaderCompileInfo {
|
struct ShaderCompileInfo {
|
||||||
HashMap<StringName, FunctionInfo> functions;
|
HashMap<StringName, FunctionInfo> functions;
|
||||||
Vector<ModeInfo> render_modes;
|
Vector<ModeInfo> render_modes;
|
||||||
VaryingFunctionNames varying_function_names = VaryingFunctionNames();
|
VaryingFunctionNames varying_function_names;
|
||||||
HashSet<String> shader_types;
|
HashSet<String> shader_types;
|
||||||
GlobalShaderUniformGetTypeFunc global_shader_uniform_type_func = nullptr;
|
GlobalShaderUniformGetTypeFunc global_shader_uniform_type_func = nullptr;
|
||||||
bool is_include = false;
|
bool is_include = false;
|
||||||
|
@ -49,7 +49,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
unsigned function1_calls{ 0 };
|
unsigned function1_calls{ 0 };
|
||||||
Variant function1_latest_arg0{};
|
Variant function1_latest_arg0;
|
||||||
};
|
};
|
||||||
|
|
||||||
static inline Array build_array() {
|
static inline Array build_array() {
|
||||||
|
Loading…
Reference in New Issue
Block a user