1 files changed, 44 insertions, 42 deletions

diff --git a/scene/3d/area_3d.h b/scene/3d/area_3d.h
index 07d24f39a7..847d1c5966 100644
--- a/scene/3d/area_3d.h
+++ b/scene/3d/area_3d.h
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -31,7 +31,7 @@
 #ifndef AREA_3D_H
 #define AREA_3D_H
 
-#include "core/vset.h"
+#include "core/templates/vset.h"
 #include "scene/3d/collision_object_3d.h"
 
 class Area3D : public CollisionObject3D {
@@ -47,19 +47,20 @@ public:
 	};
 
 private:
-	SpaceOverride space_override;
+	SpaceOverride space_override = SPACE_OVERRIDE_DISABLED;
 	Vector3 gravity_vec;
 	real_t gravity;
-	bool gravity_is_point;
-	real_t gravity_distance_scale;
-	real_t angular_damp;
-	real_t linear_damp;
-	uint32_t collision_mask;
-	uint32_t collision_layer;
-	int priority;
-	bool monitoring;
-	bool monitorable;
-	bool locked;
+	bool gravity_is_point = false;
+	real_t gravity_distance_scale = 0.0;
+	real_t angular_damp = 0.1;
+	real_t linear_damp = 0.1;
+	int priority = 0;
+	real_t wind_force_magnitude = 0.0;
+	real_t wind_attenuation_factor = 0.0;
+	NodePath wind_source_path;
+	bool monitoring = false;
+	bool monitorable = false;
+	bool locked = false;
 
 	void _body_inout(int p_status, const RID &p_body, ObjectID p_instance, int p_body_shape, int p_area_shape);
 
@@ -67,8 +68,8 @@ private:
 	void _body_exit_tree(ObjectID p_id);
 
 	struct ShapePair {
-		int body_shape;
-		int area_shape;
+		int body_shape = 0;
+		int area_shape = 0;
 		bool operator<(const ShapePair &p_sp) const {
 			if (body_shape == p_sp.body_shape) {
 				return area_shape < p_sp.area_shape;
@@ -85,8 +86,9 @@ private:
 	};
 
 	struct BodyState {
-		int rc;
-		bool in_tree;
+		RID rid;
+		int rc = 0;
+		bool in_tree = false;
 		VSet<ShapePair> shapes;
 	};
 
@@ -98,8 +100,8 @@ private:
 	void _area_exit_tree(ObjectID p_id);
 
 	struct AreaShapePair {
-		int area_shape;
-		int self_shape;
+		int area_shape = 0;
+		int self_shape = 0;
 		bool operator<(const AreaShapePair &p_sp) const {
 			if (area_shape == p_sp.area_shape) {
 				return self_shape < p_sp.self_shape;
@@ -116,24 +118,27 @@ private:
 	};
 
 	struct AreaState {
-		int rc;
-		bool in_tree;
+		RID rid;
+		int rc = 0;
+		bool in_tree = false;
 		VSet<AreaShapePair> shapes;
 	};
 
 	Map<ObjectID, AreaState> area_map;
 	void _clear_monitoring();
 
-	bool audio_bus_override;
-	StringName audio_bus;
+	bool audio_bus_override = false;
+	StringName audio_bus = "Master";
 
-	bool use_reverb_bus;
-	StringName reverb_bus;
-	float reverb_amount;
-	float reverb_uniformity;
+	bool use_reverb_bus = false;
+	StringName reverb_bus = "Master";
+	float reverb_amount = 0.0;
+	float reverb_uniformity = 0.0;
 
 	void _validate_property(PropertyInfo &property) const override;
 
+	void _initialize_wind();
+
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();
@@ -163,24 +168,21 @@ public:
 	void set_priority(real_t p_priority);
 	real_t get_priority() const;
 
+	void set_wind_force_magnitude(real_t p_wind_force_magnitude);
+	real_t get_wind_force_magnitude() const;
+
+	void set_wind_attenuation_factor(real_t p_wind_attenuation_factor);
+	real_t get_wind_attenuation_factor() const;
+
+	void set_wind_source_path(const NodePath &p_wind_source_path);
+	const NodePath &get_wind_source_path() const;
+
 	void set_monitoring(bool p_enable);
 	bool is_monitoring() const;
 
 	void set_monitorable(bool p_enable);
 	bool is_monitorable() const;
 
-	void set_collision_mask(uint32_t p_mask);
-	uint32_t get_collision_mask() const;
-
-	void set_collision_layer(uint32_t p_layer);
-	uint32_t get_collision_layer() const;
-
-	void set_collision_mask_bit(int p_bit, bool p_value);
-	bool get_collision_mask_bit(int p_bit) const;
-
-	void set_collision_layer_bit(int p_bit, bool p_value);
-	bool get_collision_layer_bit(int p_bit) const;
-
 	TypedArray<Node3D> get_overlapping_bodies() const;
 	TypedArray<Area3D> get_overlapping_areas() const; //function for script
 
@@ -190,8 +192,8 @@ public:
 	void set_audio_bus_override(bool p_override);
 	bool is_overriding_audio_bus() const;
 
-	void set_audio_bus(const StringName &p_audio_bus);
-	StringName get_audio_bus() const;
+	void set_audio_bus_name(const StringName &p_audio_bus);
+	StringName get_audio_bus_name() const;
 
 	void set_use_reverb_bus(bool p_enable);
 	bool is_using_reverb_bus() const;