Merge pull request #24924 from danilo2205/rename-oriented-path-follow

Merge OrientedPathFollow into PathFollow

1 files changed, 2 insertions, 46 deletions

diff --git a/scene/3d/path.h b/scene/3d/path.h
index c514811c62..2a12c4a826 100644
--- a/scene/3d/path.h
+++ b/scene/3d/path.h
@@ -63,7 +63,8 @@ public:
 		ROTATION_NONE,
 		ROTATION_Y,
 		ROTATION_XY,
-		ROTATION_XYZ
+		ROTATION_XYZ,
+		ROTATION_ORIENTED
 	};
 
 private:
@@ -113,49 +114,4 @@ public:
 
 VARIANT_ENUM_CAST(PathFollow::RotationMode);
 
-class OrientedPathFollow : public Spatial {
-
-	GDCLASS(OrientedPathFollow, Spatial);
-
-private:
-	Path *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;
-
-	void _update_transform();
-
-protected:
-	virtual void _validate_property(PropertyInfo &property) const;
-
-	void _notification(int p_what);
-	static void _bind_methods();
-
-public:
-	void set_offset(float p_offset);
-	float get_offset() const;
-
-	void set_h_offset(float p_h_offset);
-	float get_h_offset() const;
-
-	void set_v_offset(float p_v_offset);
-	float get_v_offset() const;
-
-	void set_unit_offset(float p_unit_offset);
-	float get_unit_offset() const;
-
-	void set_loop(bool p_loop);
-	bool has_loop() const;
-
-	void set_cubic_interpolation(bool p_enable);
-	bool get_cubic_interpolation() const;
-
-	String get_configuration_warning() const;
-
-	OrientedPathFollow();
-};
-
 #endif // PATH_H