Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 07:17:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Initialize class/struct variables with default values in modules/

Browse Source
This commit is contained in:
Rafał Mikrut
2021-02-08 10:57:18 +01:00
parent 57e2822a05
commit f7209b459b
100 changed files with 533 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
modules/csg/csg.h
View File

@@ -48,9 +48,9 @@ struct CSGBrush {
Vector3 vertices[3];
Vector2 uvs[3];
AABB aabb;
bool smooth;
bool invert;
int material;
bool smooth = false;
bool invert = false;
int material = 0;
};
Vector<Face> faces;
@@ -74,20 +74,20 @@ struct CSGBrushOperation {
struct MeshMerge {
struct Face {
bool from_b;
bool inside;
int points[3];
bool from_b = false;
bool inside = false;
int points[3] = {};
Vector2 uvs[3];
bool smooth;
bool invert;
int material_idx;
bool smooth = false;
bool invert = false;
int material_idx = 0;
};
struct FaceBVH {
int face;
int left;
int right;
int next;
int face = 0;
int left = 0;
int right = 0;
int next = 0;
Vector3 center;
AABB aabb;
};
@@ -142,7 +142,7 @@ struct CSGBrushOperation {
Map<Ref<Material>, int> materials;
Map<Vector3, int> vertex_map;
OAHashMap<VertexKey, int, VertexKeyHash> snap_cache;
float vertex_snap;
float vertex_snap = 0.0;
inline void _add_distance(List<real_t> &r_intersectionsA, List<real_t> &r_intersectionsB, bool p_from_B, real_t p_distance) const;
inline bool _bvh_inside(FaceBVH *facebvhptr, int p_max_depth, int p_bvh_first, int p_face_idx) const;
@@ -159,7 +159,7 @@ struct CSGBrushOperation {
};
struct Face2D {
int vertex_idx[3];
int vertex_idx[3] = {};
};
Vector<Vertex2D> vertices;
@@ -167,7 +167,7 @@ struct CSGBrushOperation {
Plane plane;
Transform to_2D;
Transform to_3D;
float vertex_snap2;
float vertex_snap2 = 0.0;
inline int _get_point_idx(const Vector2 &p_point);
inline int _add_vertex(const Vertex2D &p_vertex);

9
modules/csg/csg_shape.cpp
View File

@@ -625,15 +625,6 @@ void CSGShape3D::_bind_methods() {
}
CSGShape3D::CSGShape3D() {
operation = OPERATION_UNION;
parent = nullptr;
brush = nullptr;
dirty = false;
snap = 0.001;
use_collision = false;
collision_layer = 1;
collision_mask = 1;
calculate_tangents = true;
set_notify_local_transform(true);
}

28
modules/csg/csg_shape.h
View File

@@ -50,23 +50,23 @@ public:
};
private:
Operation operation;
CSGShape3D *parent;
Operation operation = OPERATION_UNION;
CSGShape3D *parent = nullptr;
CSGBrush *brush;
CSGBrush *brush = nullptr;
AABB node_aabb;
bool dirty;
float snap;
bool dirty = false;
float snap = 0.001;
bool use_collision;
uint32_t collision_layer;
uint32_t collision_mask;
bool use_collision = false;
uint32_t collision_layer = 1;
uint32_t collision_mask = 1;
Ref<ConcavePolygonShape3D> root_collision_shape;
RID root_collision_instance;
bool calculate_tangents;
bool calculate_tangents = true;
Ref<ArrayMesh> root_mesh;
@@ -85,12 +85,12 @@ private:
Vector<Vector2> uvs;
Vector<float> tans;
Ref<Material> material;
int last_added;
int last_added = 0;
Vector3 *verticesw;
Vector3 *normalsw;
Vector2 *uvsw;
float *tansw;
Vector3 *verticesw = nullptr;
Vector3 *normalsw = nullptr;
Vector2 *uvsw = nullptr;
float *tansw = nullptr;
};
//mikktspace callbacks