godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects 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

4
modules/csg/csg.cpp
View File

@@ -187,7 +187,7 @@ void CSGBrush::_regen_face_aabbs() {
}
}
void CSGBrush::build_from_faces(const PoolVector<Vector3> &p_vertices, const PoolVector<Vector2> &p_uvs, const PoolVector<bool> &p_smooth, const PoolVector<Ref<Material> > &p_materials, const PoolVector<bool> &p_invert_faces) {
void CSGBrush::build_from_faces(const PoolVector<Vector3> &p_vertices, const PoolVector<Vector2> &p_uvs, const PoolVector<bool> &p_smooth, const PoolVector<Ref<Material>> &p_materials, const PoolVector<bool> &p_invert_faces) {
faces.clear();
@@ -201,7 +201,7 @@ void CSGBrush::build_from_faces(const PoolVector<Vector3> &p_vertices, const Poo
int sc = p_smooth.size();
PoolVector<bool>::Read rs = p_smooth.read();
int mc = p_materials.size();
PoolVector<Ref<Material> >::Read rm = p_materials.read();
PoolVector<Ref<Material>>::Read rm = p_materials.read();
int ic = p_invert_faces.size();
PoolVector<bool>::Read ri = p_invert_faces.read();

4
modules/csg/csg.h
View File

@@ -56,12 +56,12 @@ struct CSGBrush {
};
Vector<Face> faces;
Vector<Ref<Material> > materials;
Vector<Ref<Material>> materials;
inline void _regen_face_aabbs();
// Create a brush from faces.
void build_from_faces(const PoolVector<Vector3> &p_vertices, const PoolVector<Vector2> &p_uvs, const PoolVector<bool> &p_smooth, const PoolVector<Ref<Material> > &p_materials, const PoolVector<bool> &p_invert_faces);
void build_from_faces(const PoolVector<Vector3> &p_vertices, const PoolVector<Vector2> &p_uvs, const PoolVector<bool> &p_smooth, const PoolVector<Ref<Material>> &p_materials, const PoolVector<bool> &p_invert_faces);
void copy_from(const CSGBrush &p_brush, const Transform &p_xform);
};

28
modules/csg/csg_shape.cpp
View File

@@ -669,7 +669,7 @@ CSGCombiner::CSGCombiner() {
/////////////////////
CSGBrush *CSGPrimitive::_create_brush_from_arrays(const PoolVector<Vector3> &p_vertices, const PoolVector<Vector2> &p_uv, const PoolVector<bool> &p_smooth, const PoolVector<Ref<Material> > &p_materials) {
CSGBrush *CSGPrimitive::_create_brush_from_arrays(const PoolVector<Vector3> &p_vertices, const PoolVector<Vector2> &p_uv, const PoolVector<bool> &p_smooth, const PoolVector<Ref<Material>> &p_materials) {
CSGBrush *brush = memnew(CSGBrush);
@@ -721,7 +721,7 @@ CSGBrush *CSGMesh::_build_brush() {
PoolVector<Vector3> vertices;
PoolVector<bool> smooth;
PoolVector<Ref<Material> > materials;
PoolVector<Ref<Material>> materials;
PoolVector<Vector2> uvs;
Ref<Material> material = get_material();
@@ -780,7 +780,7 @@ CSGBrush *CSGMesh::_build_brush() {
PoolVector<Vector3>::Write vw = vertices.write();
PoolVector<bool>::Write sw = smooth.write();
PoolVector<Vector2>::Write uvw = uvs.write();
PoolVector<Ref<Material> >::Write mw = materials.write();
PoolVector<Ref<Material>>::Write mw = materials.write();
PoolVector<int>::Read ir = aindices.read();
@@ -826,7 +826,7 @@ CSGBrush *CSGMesh::_build_brush() {
PoolVector<Vector3>::Write vw = vertices.write();
PoolVector<bool>::Write sw = smooth.write();
PoolVector<Vector2>::Write uvw = uvs.write();
PoolVector<Ref<Material> >::Write mw = materials.write();
PoolVector<Ref<Material>>::Write mw = materials.write();
for (int j = 0; j < is; j += 3) {
@@ -934,7 +934,7 @@ CSGBrush *CSGSphere::_build_brush() {
PoolVector<Vector3> faces;
PoolVector<Vector2> uvs;
PoolVector<bool> smooth;
PoolVector<Ref<Material> > materials;
PoolVector<Ref<Material>> materials;
PoolVector<bool> invert;
faces.resize(face_count * 3);
@@ -949,7 +949,7 @@ CSGBrush *CSGSphere::_build_brush() {
PoolVector<Vector3>::Write facesw = faces.write();
PoolVector<Vector2>::Write uvsw = uvs.write();
PoolVector<bool>::Write smoothw = smooth.write();
PoolVector<Ref<Material> >::Write materialsw = materials.write();
PoolVector<Ref<Material>>::Write materialsw = materials.write();
PoolVector<bool>::Write invertw = invert.write();
int face = 0;
@@ -1137,7 +1137,7 @@ CSGBrush *CSGBox::_build_brush() {
PoolVector<Vector3> faces;
PoolVector<Vector2> uvs;
PoolVector<bool> smooth;
PoolVector<Ref<Material> > materials;
PoolVector<Ref<Material>> materials;
PoolVector<bool> invert;
faces.resize(face_count * 3);
@@ -1152,7 +1152,7 @@ CSGBrush *CSGBox::_build_brush() {
PoolVector<Vector3>::Write facesw = faces.write();
PoolVector<Vector2>::Write uvsw = uvs.write();
PoolVector<bool>::Write smoothw = smooth.write();
PoolVector<Ref<Material> >::Write materialsw = materials.write();
PoolVector<Ref<Material>>::Write materialsw = materials.write();
PoolVector<bool>::Write invertw = invert.write();
int face = 0;
@@ -1315,7 +1315,7 @@ CSGBrush *CSGCylinder::_build_brush() {
PoolVector<Vector3> faces;
PoolVector<Vector2> uvs;
PoolVector<bool> smooth;
PoolVector<Ref<Material> > materials;
PoolVector<Ref<Material>> materials;
PoolVector<bool> invert;
faces.resize(face_count * 3);
@@ -1330,7 +1330,7 @@ CSGBrush *CSGCylinder::_build_brush() {
PoolVector<Vector3>::Write facesw = faces.write();
PoolVector<Vector2>::Write uvsw = uvs.write();
PoolVector<bool>::Write smoothw = smooth.write();
PoolVector<Ref<Material> >::Write materialsw = materials.write();
PoolVector<Ref<Material>>::Write materialsw = materials.write();
PoolVector<bool>::Write invertw = invert.write();
int face = 0;
@@ -1565,7 +1565,7 @@ CSGBrush *CSGTorus::_build_brush() {
PoolVector<Vector3> faces;
PoolVector<Vector2> uvs;
PoolVector<bool> smooth;
PoolVector<Ref<Material> > materials;
PoolVector<Ref<Material>> materials;
PoolVector<bool> invert;
faces.resize(face_count * 3);
@@ -1580,7 +1580,7 @@ CSGBrush *CSGTorus::_build_brush() {
PoolVector<Vector3>::Write facesw = faces.write();
PoolVector<Vector2>::Write uvsw = uvs.write();
PoolVector<bool>::Write smoothw = smooth.write();
PoolVector<Ref<Material> >::Write materialsw = materials.write();
PoolVector<Ref<Material>>::Write materialsw = materials.write();
PoolVector<bool>::Write invertw = invert.write();
int face = 0;
@@ -1865,7 +1865,7 @@ CSGBrush *CSGPolygon::_build_brush() {
PoolVector<Vector3> faces;
PoolVector<Vector2> uvs;
PoolVector<bool> smooth;
PoolVector<Ref<Material> > materials;
PoolVector<Ref<Material>> materials;
PoolVector<bool> invert;
faces.resize(face_count * 3);
@@ -1881,7 +1881,7 @@ CSGBrush *CSGPolygon::_build_brush() {
PoolVector<Vector3>::Write facesw = faces.write();
PoolVector<Vector2>::Write uvsw = uvs.write();
PoolVector<bool>::Write smoothw = smooth.write();
PoolVector<Ref<Material> >::Write materialsw = materials.write();
PoolVector<Ref<Material>>::Write materialsw = materials.write();
PoolVector<bool>::Write invertw = invert.write();
int face = 0;

2
modules/csg/csg_shape.h
View File

@@ -172,7 +172,7 @@ private:
bool invert_faces;
protected:
CSGBrush *_create_brush_from_arrays(const PoolVector<Vector3> &p_vertices, const PoolVector<Vector2> &p_uv, const PoolVector<bool> &p_smooth, const PoolVector<Ref<Material> > &p_materials);
CSGBrush *_create_brush_from_arrays(const PoolVector<Vector3> &p_vertices, const PoolVector<Vector2> &p_uv, const PoolVector<bool> &p_smooth, const PoolVector<Ref<Material>> &p_materials);
static void _bind_methods();
public: