1 files changed, 34 insertions, 9 deletions

diff --git a/scene/3d/sprite_3d.h b/scene/3d/sprite_3d.h
index c5509aa723..873c321878 100644
--- a/scene/3d/sprite_3d.h
+++ b/scene/3d/sprite_3d.h
@@ -53,7 +53,9 @@ public:
 	enum AlphaCutMode {
 		ALPHA_CUT_DISABLED,
 		ALPHA_CUT_DISCARD,
-		ALPHA_CUT_OPAQUE_PREPASS
+		ALPHA_CUT_OPAQUE_PREPASS,
+		ALPHA_CUT_HASH,
+		ALPHA_CUT_MAX
 	};
 
 private:
@@ -85,6 +87,8 @@ private:
 
 	bool flags[FLAG_MAX] = {};
 	AlphaCutMode alpha_cut = ALPHA_CUT_DISABLED;
+	float alpha_scissor_threshold = 0.5;
+	float alpha_hash_scale = 1.0;
 	StandardMaterial3D::BillboardMode billboard_mode = StandardMaterial3D::BILLBOARD_DISABLED;
 	StandardMaterial3D::TextureFilter texture_filter = StandardMaterial3D::TEXTURE_FILTER_LINEAR_WITH_MIPMAPS;
 	bool pending_update = false;
@@ -143,6 +147,12 @@ public:
 	void set_alpha_cut_mode(AlphaCutMode p_mode);
 	AlphaCutMode get_alpha_cut_mode() const;
 
+	void set_alpha_scissor_threshold(float p_threshold);
+	float get_alpha_scissor_threshold() const;
+
+	void set_alpha_hash_scale(float p_hash_scale);
+	float get_alpha_hash_scale() const;
+
 	void set_billboard_mode(StandardMaterial3D::BillboardMode p_mode);
 	StandardMaterial3D::BillboardMode get_billboard_mode() const;
 
@@ -209,24 +219,29 @@ class AnimatedSprite3D : public SpriteBase3D {
 	GDCLASS(AnimatedSprite3D, SpriteBase3D);
 
 	Ref<SpriteFrames> frames;
+	String autoplay;
+
 	bool playing = false;
-	bool playing_backwards = false;
-	bool backwards = false;
 	StringName animation = "default";
 	int frame = 0;
 	float speed_scale = 1.0;
+	float custom_speed_scale = 1.0;
 
 	bool centered = false;
 
-	bool is_over = false;
-	double timeout = 0.0;
+	real_t frame_speed_scale = 1.0;
+	real_t frame_progress = 0.0;
 
 	void _res_changed();
 
 	double _get_frame_duration();
-	void _reset_timeout();
+	void _calc_frame_speed_scale();
+	void _stop_internal(bool p_reset);
 
 protected:
+#ifndef DISABLE_DEPRECATED
+	bool _set(const StringName &p_name, const Variant &p_value);
+#endif
 	virtual void _draw() override;
 	static void _bind_methods();
 	void _notification(int p_what);
@@ -236,20 +251,30 @@ public:
 	void set_sprite_frames(const Ref<SpriteFrames> &p_frames);
 	Ref<SpriteFrames> get_sprite_frames() const;
 
-	void play(const StringName &p_animation = StringName(), bool p_backwards = false);
+	void play(const StringName &p_name = StringName(), float p_custom_scale = 1.0, bool p_from_end = false);
+	void play_backwards(const StringName &p_name = StringName());
+	void pause();
 	void stop();
 
-	void set_playing(bool p_playing);
 	bool is_playing() const;
 
-	void set_animation(const StringName &p_animation);
+	void set_animation(const StringName &p_name);
 	StringName get_animation() const;
 
+	void set_autoplay(const String &p_name);
+	String get_autoplay() const;
+
 	void set_frame(int p_frame);
 	int get_frame() const;
 
+	void set_frame_progress(real_t p_progress);
+	real_t get_frame_progress() const;
+
+	void set_frame_and_progress(int p_frame, real_t p_progress);
+
 	void set_speed_scale(float p_speed_scale);
 	float get_speed_scale() const;
+	float get_playing_speed() const;
 
 	virtual Rect2 get_item_rect() const override;