godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Style: Set clang-format Standard to c++14

Browse Source
This commit is contained in:
Rémi Verschelde
2021-05-04 14:20:36 +02:00
parent 7e61be3cb0
commit 6e600cb3f0
248 changed files with 841 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/fbx/data/fbx_mesh_data.h
View File

@@ -50,7 +50,7 @@ struct VertexWeightMapping {
Vector<int> bones;
// This extra vector is used because the bone id is computed in a second step.
// TODO Get rid of this extra step is a good idea.
Vector<Ref<FBXBone> > bones_ref;
Vector<Ref<FBXBone>> bones_ref;
};
template <class T>
@@ -107,10 +107,10 @@ private:
HashMap<int, Vector2> &r_uv_2,
HashMap<int, Color> &r_color,
HashMap<String, MorphVertexData> &r_morphs,
HashMap<int, HashMap<int, Vector3> > &r_normals_raw,
HashMap<int, HashMap<int, Color> > &r_colors_raw,
HashMap<int, HashMap<int, Vector2> > &r_uv_1_raw,
HashMap<int, HashMap<int, Vector2> > &r_uv_2_raw);
HashMap<int, HashMap<int, Vector3>> &r_normals_raw,
HashMap<int, HashMap<int, Color>> &r_colors_raw,
HashMap<int, HashMap<int, Vector2>> &r_uv_1_raw,
HashMap<int, HashMap<int, Vector2>> &r_uv_2_raw);
void add_vertex(
const ImportState &state,
@@ -160,7 +160,7 @@ private:
const std::vector<FBXDocParser::MeshGeometry::Edge> &p_edges,
const std::vector<int> &p_mesh_indices,
const FBXDocParser::MeshGeometry::MappingData<T> &p_mapping_data,
R (*collector_function)(const Vector<VertexData<T> > *p_vertex_data, R p_fall_back),
R (*collector_function)(const Vector<VertexData<T>> *p_vertex_data, R p_fall_back),
R p_fall_back) const;
/// Used to extract data from the `MappingData` organized per polygon.