Move initialization of some classes to headers

4 files changed, 26 insertions, 62 deletions

diff --git a/scene/3d/node_3d.cpp b/scene/3d/node_3d.cpp
index e8005f38ed..deb04f0978 100644
--- a/scene/3d/node_3d.cpp
+++ b/scene/3d/node_3d.cpp
@@ -784,28 +784,4 @@ void Node3D::_bind_methods() {
 }
 
 Node3D::Node3D() :
-		xform_change(this) {
-	data.dirty = DIRTY_NONE;
-	data.children_lock = 0;
-
-	data.ignore_notification = false;
-	data.top_level = false;
-	data.top_level_active = false;
-	data.scale = Vector3(1, 1, 1);
-	data.viewport = nullptr;
-	data.inside_world = false;
-	data.visible = true;
-	data.disable_scale = false;
-
-#ifdef TOOLS_ENABLED
-	data.gizmo_disabled = false;
-	data.gizmo_dirty = false;
-#endif
-	data.notify_local_transform = false;
-	data.notify_transform = false;
-	data.parent = nullptr;
-	data.C = nullptr;
-}
-
-Node3D::~Node3D() {
-}
+		xform_change(this) {}
diff --git a/scene/3d/node_3d.h b/scene/3d/node_3d.h
index 5fb421c930..180c441a2a 100644
--- a/scene/3d/node_3d.h
+++ b/scene/3d/node_3d.h
@@ -65,32 +65,32 @@ class Node3D : public Node {
 		mutable Transform global_transform;
 		mutable Transform local_transform;
 		mutable Vector3 rotation;
-		mutable Vector3 scale;
+		mutable Vector3 scale = Vector3(1, 1, 1);
 
-		mutable int dirty;
+		mutable int dirty = DIRTY_NONE;
 
-		Viewport *viewport;
+		Viewport *viewport = nullptr;
 
-		bool top_level_active;
-		bool top_level;
-		bool inside_world;
+		bool top_level_active = false;
+		bool top_level = false;
+		bool inside_world = false;
 
-		int children_lock;
-		Node3D *parent;
+		int children_lock = 0;
+		Node3D *parent = nullptr;
 		List<Node3D *> children;
-		List<Node3D *>::Element *C;
+		List<Node3D *>::Element *C = nullptr;
 
-		bool ignore_notification;
-		bool notify_local_transform;
-		bool notify_transform;
+		bool ignore_notification = false;
+		bool notify_local_transform = false;
+		bool notify_transform = false;
 
-		bool visible;
-		bool disable_scale;
+		bool visible = true;
+		bool disable_scale = false;
 
 #ifdef TOOLS_ENABLED
 		Ref<Node3DGizmo> gizmo;
-		bool gizmo_disabled;
-		bool gizmo_dirty;
+		bool gizmo_disabled = false;
+		bool gizmo_dirty = false;
 #endif
 
 	} data;
@@ -197,7 +197,6 @@ public:
 	void force_update_transform();
 
 	Node3D();
-	~Node3D();
 };
 
 #endif // NODE_3D_H
diff --git a/scene/3d/path_3d.cpp b/scene/3d/path_3d.cpp
index ae6bbad8bf..54e6330722 100644
--- a/scene/3d/path_3d.cpp
+++ b/scene/3d/path_3d.cpp
@@ -385,14 +385,3 @@ void PathFollow3D::set_loop(bool p_loop) {
 bool PathFollow3D::has_loop() const {
 	return loop;
 }
-
-PathFollow3D::PathFollow3D() {
-	offset = 0;
-	delta_offset = 0;
-	h_offset = 0;
-	v_offset = 0;
-	path = nullptr;
-	rotation_mode = ROTATION_XYZ;
-	cubic = true;
-	loop = true;
-}
diff --git a/scene/3d/path_3d.h b/scene/3d/path_3d.h
index 1b0f5fa4e0..39f04f1556 100644
--- a/scene/3d/path_3d.h
+++ b/scene/3d/path_3d.h
@@ -65,14 +65,14 @@ public:
 	};
 
 private:
-	Path3D *path;
-	real_t delta_offset; // change in offset since last _update_transform
-	real_t offset;
-	real_t h_offset;
-	real_t v_offset;
-	bool cubic;
-	bool loop;
-	RotationMode rotation_mode;
+	Path3D *path = nullptr;
+	real_t delta_offset = 0; // Change in offset since last _update_transform.
+	real_t offset = 0;
+	real_t h_offset = 0;
+	real_t v_offset = 0;
+	bool cubic = true;
+	bool loop = true;
+	RotationMode rotation_mode = ROTATION_XYZ;
 
 	void _update_transform(bool p_update_xyz_rot = true);
 
@@ -106,7 +106,7 @@ public:
 
 	String get_configuration_warning() const override;
 
-	PathFollow3D();
+	PathFollow3D() {}
 };
 
 VARIANT_ENUM_CAST(PathFollow3D::RotationMode);