Initialize class variables with default values in servers/

platform/iphone/plugin/godot_plugin_config.h

@@ -66,7 +66,10 @@ struct PluginConfigIOS {
 	inline static const char *DEPENDENCIES_SYSTEM_KEY = "system";
 	inline static const char *DEPENDENCIES_CAPABILITIES_KEY = "capabilities";
 	inline static const char *DEPENDENCIES_FILES_KEY = "files";
+<<<<<<< HEAD
 	inline static const char *DEPENDENCIES_LINKER_FLAGS = "linker_flags";
+=======
+>>>>>>> refs/remotes/origin/master
 
 	inline static const char *PLIST_SECTION = "plist";
 
@@ -197,6 +200,7 @@ static inline bool validate_plugin(PluginConfigIOS &plugin_config) {
 	return plugin_config.valid_config;
 }
 
+<<<<<<< HEAD
 static inline String get_plugin_main_binary(PluginConfigIOS &plugin_config, bool p_debug) {
 	if (!plugin_config.supports_targets) {
 		return plugin_config.binary;
@@ -210,6 +214,8 @@ static inline String get_plugin_main_binary(PluginConfigIOS &plugin_config, bool
 	return plugin_binary_dir.plus_file(plugin_file);
 }
 
+=======
+>>>>>>> refs/remotes/origin/master
 static inline uint64_t get_plugin_modification_time(const PluginConfigIOS &plugin_config, const String &config_path) {
 	uint64_t last_updated = FileAccess::get_modified_time(config_path);
 
@@ -264,8 +270,11 @@ static inline PluginConfigIOS load_plugin_config(Ref<ConfigFile> config_file, co
 		plugin_config.files_to_copy = resolve_local_dependencies(config_base_dir, files);
 
 		plugin_config.capabilities = config_file->get_value(PluginConfigIOS::DEPENDENCIES_SECTION, PluginConfigIOS::DEPENDENCIES_CAPABILITIES_KEY, Vector<String>());
+<<<<<<< HEAD
 
 		plugin_config.linker_flags = config_file->get_value(PluginConfigIOS::DEPENDENCIES_SECTION, PluginConfigIOS::DEPENDENCIES_LINKER_FLAGS, Vector<String>());
+=======
+>>>>>>> refs/remotes/origin/master
 	}
 
 	if (config_file->has_section(PluginConfigIOS::PLIST_SECTION)) {

platform/javascript/javascript_main.cpp

@@ -88,13 +88,16 @@ extern EMSCRIPTEN_KEEPALIVE int godot_js_main(int argc, char *argv[]) {
 
 	Main::start();
 	os->get_main_loop()->initialize();
+<<<<<<< HEAD
 #ifdef TOOLS_ENABLED
 	if (Main::is_project_manager() && FileAccess::exists("/tmp/preload.zip")) {
 		PackedStringArray ps;
 		ps.push_back("/tmp/preload.zip");
 		os->get_main_loop()->emit_signal("files_dropped", ps, -1);
 	}
 #endif
+=======
+>>>>>>> refs/remotes/origin/master
 	emscripten_set_main_loop(main_loop_callback, -1, false);
 	// Immediately run the first iteration.
 	// We are inside an animation frame, we want to immediately draw on the newly setup canvas.

scene/3d/collision_shape_3d.cpp

@@ -93,7 +93,6 @@ void CollisionShape3D::_notification(int p_what) {
 				if (shape.is_valid()) {
 					parent->shape_owner_add_shape(owner_id, shape);
 				}
-				_update_in_shape_owner();
 			}
 		} break;
 		case NOTIFICATION_ENTER_TREE: {

servers/audio/audio_driver_dummy.h

@@ -40,19 +40,19 @@ class AudioDriverDummy : public AudioDriver {
 	Thread thread;
 	Mutex mutex;
 
-	int32_t *samples_in;
+	int32_t *samples_in = nullptr;
 
 	static void thread_func(void *p_udata);
 
-	unsigned int buffer_frames;
-	unsigned int mix_rate;
-	SpeakerMode speaker_mode;
+	unsigned int buffer_frames = 0;
+	unsigned int mix_rate = 0;
+	SpeakerMode speaker_mode = SpeakerMode::SPEAKER_MODE_STEREO;
 
-	int channels;
+	int channels = 0;
 
-	bool active;
-	bool thread_exited;
-	mutable bool exit_thread;
+	bool active = false;
+	bool thread_exited = false;
+	mutable bool exit_thread = false;
 
 public:
 	const char *get_name() const {

servers/audio/audio_filter_sw.h

@@ -36,11 +36,11 @@
 class AudioFilterSW {
 public:
 	struct Coeffs {
-		float a1, a2;
-		float b0, b1, b2;
+		float a1 = 0.0, a2 = 0.0;
+		float b0 = 0.0, b1 = 0.0, b2 = 0.0;
 
 		//bool operator==(const Coeffs &p_rv) { return (FLOATS_EQ(a1,p_rv.a1) && FLOATS_EQ(a2,p_rv.a2) && FLOATS_EQ(b1,p_rv.b1) && FLOATS_EQ(b2,p_rv.b2) && FLOATS_EQ(b0,p_rv.b0) ); }
-		Coeffs() { a1 = a2 = b0 = b1 = b2 = 0.0; }
+		Coeffs() {}
 	};
 
 	enum Mode {
@@ -57,9 +57,9 @@ class AudioFilterSW {
 
 	class Processor { // simple filter processor
 
-		AudioFilterSW *filter;
+		AudioFilterSW *filter = nullptr;
 		Coeffs coeffs;
-		float ha1, ha2, hb1, hb2; //history
+		float ha1 = 0.0, ha2 = 0.0, hb1 = 0.0, hb2 = 0.0; //history
 		Coeffs incr_coeffs;
 
 	public:
@@ -73,12 +73,12 @@ class AudioFilterSW {
 	};
 
 private:
-	float cutoff;
-	float resonance;
-	float gain;
-	float sampling_rate;
-	int stages;
-	Mode mode;
+	float cutoff = 0.0;
+	float resonance = 0.0;
+	float gain = 0.0;
+	float sampling_rate = 0.0;
+	int stages = 0;
+	Mode mode = PEAK;
 
 public:
 	float get_response(float p_freq, Coeffs *p_coeffs);

servers/audio/audio_rb_resampler.h

@@ -37,26 +37,26 @@
 #include "servers/audio_server.h"
 
 struct AudioRBResampler {
-	uint32_t rb_bits;
-	uint32_t rb_len;
-	uint32_t rb_mask;
-	uint32_t read_buff_len;
-	uint32_t channels;
-	uint32_t src_mix_rate;
-	uint32_t target_mix_rate;
+	uint32_t rb_bits = 0;
+	uint32_t rb_len = 0;
+	uint32_t rb_mask = 0;
+	uint32_t read_buff_len = 0;
+	uint32_t channels = 0;
+	uint32_t src_mix_rate = 0;
+	uint32_t target_mix_rate = 0;
 
 	SafeNumeric<int> rb_read_pos;
 	SafeNumeric<int> rb_write_pos;
 
-	int32_t offset; //contains the fractional remainder of the resampler
+	int32_t offset = 0; //contains the fractional remainder of the resampler
 	enum {
 		MIX_FRAC_BITS = 13,
 		MIX_FRAC_LEN = (1 << MIX_FRAC_BITS),
 		MIX_FRAC_MASK = MIX_FRAC_LEN - 1,
 	};
 
-	float *read_buf;
-	float *rb;
+	float *read_buf = nullptr;
+	float *rb = nullptr;
 
 	template <int C>
 	uint32_t _resample(AudioFrame *p_dest, int p_todo, int32_t p_increment);

servers/audio/audio_stream.h

@@ -64,7 +64,7 @@ class AudioStreamPlaybackResampled : public AudioStreamPlayback {
 	};
 
 	AudioFrame internal_buffer[INTERNAL_BUFFER_LEN + CUBIC_INTERP_HISTORY];
-	uint64_t mix_offset;
+	uint64_t mix_offset = 0;
 
 protected:
 	void _begin_resample();
@@ -117,8 +117,8 @@ class AudioStreamPlaybackMicrophone : public AudioStreamPlaybackResampled {
 	GDCLASS(AudioStreamPlaybackMicrophone, AudioStreamPlaybackResampled);
 	friend class AudioStreamMicrophone;
 
-	bool active;
-	unsigned int input_ofs;
+	bool active = false;
+	unsigned int input_ofs = 0;
 
 	Ref<AudioStreamMicrophone> microphone;
 
@@ -152,7 +152,7 @@ class AudioStreamRandomPitch : public AudioStream {
 
 	Set<AudioStreamPlaybackRandomPitch *> playbacks;
 	Ref<AudioStream> audio_stream;
-	float random_pitch;
+	float random_pitch = 0.0;
 
 protected:
 	static void _bind_methods();
@@ -179,7 +179,7 @@ class AudioStreamPlaybackRandomPitch : public AudioStreamPlayback {
 	Ref<AudioStreamRandomPitch> random_pitch;
 	Ref<AudioStreamPlayback> playback;
 	Ref<AudioStreamPlayback> playing;
-	float pitch_scale;
+	float pitch_scale = 0.0;
 
 public:
 	virtual void start(float p_from_pos = 0.0) override;

servers/audio/effects/audio_effect_amplify.h

@@ -40,7 +40,7 @@ class AudioEffectAmplifyInstance : public AudioEffectInstance {
 	friend class AudioEffectAmplify;
 	Ref<AudioEffectAmplify> base;
 
-	float mix_volume_db;
+	float mix_volume_db = 0.0;
 
 public:
 	virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
@@ -50,7 +50,7 @@ class AudioEffectAmplify : public AudioEffect {
 	GDCLASS(AudioEffectAmplify, AudioEffect);
 
 	friend class AudioEffectAmplifyInstance;
-	float volume_db;
+	float volume_db = 0.0;
 
 protected:
 	static void _bind_methods();

servers/audio/effects/audio_effect_chorus.h

@@ -41,11 +41,11 @@ class AudioEffectChorusInstance : public AudioEffectInstance {
 	Ref<AudioEffectChorus> base;
 
 	Vector<AudioFrame> audio_buffer;
-	unsigned int buffer_pos;
-	unsigned int buffer_mask;
+	unsigned int buffer_pos = 0;
+	unsigned int buffer_mask = 0;
 
 	AudioFrame filter_h[4];
-	uint64_t cycles[4];
+	uint64_t cycles[4] = {};
 
 	void _process_chunk(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
 
@@ -72,28 +72,21 @@ class AudioEffectChorus : public AudioEffect {
 
 private:
 	struct Voice {
-		float delay;
-		float rate;
-		float depth;
-		float level;
-		float cutoff;
-		float pan;
-
-		Voice() {
-			delay = 12.0;
-			rate = 1;
-			depth = 0;
-			level = 0;
-			cutoff = MS_CUTOFF_MAX;
-			pan = 0;
-		}
+		float delay = 12.0;
+		float rate = 1.0;
+		float depth = 0.0;
+		float level = 0.0;
+		float cutoff = MS_CUTOFF_MAX;
+		float pan = 0.0;
+
+		Voice() {}
 
 	} voice[MAX_VOICES];
 
-	int voice_count;
+	int voice_count = 0;
 
-	float wet;
-	float dry;
+	float wet = 0.0;
+	float dry = 0.0;
 
 protected:
 	void _validate_property(PropertyInfo &property) const override;

servers/audio/effects/audio_effect_compressor.h

@@ -40,8 +40,8 @@ class AudioEffectCompressorInstance : public AudioEffectInstance {
 	friend class AudioEffectCompressor;
 	Ref<AudioEffectCompressor> base;
 
-	float rundb, averatio, runratio, runmax, maxover, gr_meter;
-	int current_channel;
+	float rundb = 0.0, averatio = 0.0, runratio = 0.0, runmax = 0.0, maxover = 0.0, gr_meter = 0.0;
+	int current_channel = 0;
 
 public:
 	void set_current_channel(int p_channel) { current_channel = p_channel; }
@@ -52,12 +52,12 @@ class AudioEffectCompressor : public AudioEffect {
 	GDCLASS(AudioEffectCompressor, AudioEffect);
 
 	friend class AudioEffectCompressorInstance;
-	float threshold;
-	float ratio;
-	float gain;
-	float attack_us;
-	float release_ms;
-	float mix;
+	float threshold = 0.0;
+	float ratio = 0.0;
+	float gain = 0.0;
+	float attack_us = 0.0;
+	float release_ms = 0.0;
+	float mix = 0.0;
 	StringName sidechain;
 
 protected:

servers/audio/effects/audio_effect_delay.h

@@ -42,13 +42,13 @@ class AudioEffectDelayInstance : public AudioEffectInstance {
 
 	Vector<AudioFrame> ring_buffer;
 
-	unsigned int ring_buffer_pos;
-	unsigned int ring_buffer_mask;
+	unsigned int ring_buffer_pos = 0;
+	unsigned int ring_buffer_mask = 0;
 
 	/* feedback buffer */
 	Vector<AudioFrame> feedback_buffer;
 
-	unsigned int feedback_buffer_pos;
+	unsigned int feedback_buffer_pos = 0;
 
 	AudioFrame h;
 	void _process_chunk(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count);
@@ -66,22 +66,22 @@ class AudioEffectDelay : public AudioEffect {
 		MAX_TAPS = 2
 	};
 
-	float dry;
+	float dry = 0.0;
 
-	bool tap_1_active;
-	float tap_1_delay_ms;
-	float tap_1_level;
-	float tap_1_pan;
+	bool tap_1_active = false;
+	float tap_1_delay_ms = 0.0;
+	float tap_1_level = 0.0;
+	float tap_1_pan = 0.0;
 
-	bool tap_2_active;
-	float tap_2_delay_ms;
-	float tap_2_level;
-	float tap_2_pan;
+	bool tap_2_active = false;
+	float tap_2_delay_ms = 0.0;
+	float tap_2_level = 0.0;
+	float tap_2_pan = 0.0;
 
-	bool feedback_active;
-	float feedback_delay_ms;
-	float feedback_level;
-	float feedback_lowpass;
+	bool feedback_active = false;
+	float feedback_delay_ms = 0.0;
+	float feedback_level = 0.0;
+	float feedback_lowpass = 0.0;
 
 protected:
 	static void _bind_methods();

servers/audio/effects/audio_effect_distortion.h

@@ -39,7 +39,7 @@ class AudioEffectDistortionInstance : public AudioEffectInstance {
 	GDCLASS(AudioEffectDistortionInstance, AudioEffectInstance);
 	friend class AudioEffectDistortion;
 	Ref<AudioEffectDistortion> base;
-	float h[2];
+	float h[2] = {};
 
 public:
 	virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) override;
@@ -58,11 +58,11 @@ class AudioEffectDistortion : public AudioEffect {
 	};
 
 	friend class AudioEffectDistortionInstance;
-	Mode mode;
-	float pre_gain;
-	float post_gain;
-	float keep_hf_hz;
-	float drive;
+	Mode mode = MODE_OVERDRIVE;
+	float pre_gain = 0.0;
+	float post_gain = 0.0;
+	float keep_hf_hz = 0.0;
+	float drive = 0.0;
 
 protected:
 	static void _bind_methods();