From d34d4b12196c90b352bf8b71fbdbcd40b505afc1 Mon Sep 17 00:00:00 2001 From: Grant Hur <22hurg@sjchrisitan.org> Date: Sat, 6 May 2023 16:36:45 -0700 Subject: [PATCH 1/6] Add move towards+change face_point name in spirte --- arcade/sprite/sprite.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/arcade/sprite/sprite.py b/arcade/sprite/sprite.py index b958287a2..809bdbb99 100644 --- a/arcade/sprite/sprite.py +++ b/arcade/sprite/sprite.py @@ -4,7 +4,7 @@ from arcade import Texture, load_texture from arcade.hitbox import HitBox, RotatableHitBox -from arcade.math import get_angle_degrees +from arcade.math import get_angle_degrees, lerp_vec, lerp_angle from arcade.texture import get_default_texture from arcade.types import PathOrTexture, Point @@ -312,16 +312,25 @@ def stop(self) -> None: self.velocity = 0, 0 self.change_angle = 0 - def face_point(self, point: Point) -> None: + def face_towards_point(self, point: Point, max_rotation: float = float("inf")) -> None: """ Face the sprite towards a point. Assumes sprite image is facing upwards. :param Point point: Point to face towards. """ angle = get_angle_degrees(self.center_x, self.center_y, point[0], point[1]) - + # Reverse angle because sprite angles are backwards - self.angle = -angle + self.angle = lerp_angle(self.angle, -angle, max_rotation) + + def move_towards(self, point: Point, max_move: float = float("inf")) -> None: + """ + Move the sprite towards a point. + + :param Point point: Point to face towards. + :param float max: Maximum the sprite will move + """ + self.position = lerp_vec(self.position, Point, max_move) # ---- Draw Methods ---- From f16eeb46df83a6c4ab0a8892d736983986f7b549 Mon Sep 17 00:00:00 2001 From: Grant Hur <22hurg@sjchrisitan.org> Date: Sat, 6 May 2023 17:11:14 -0700 Subject: [PATCH 2/6] Changed Point to point --- arcade/sprite/sprite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arcade/sprite/sprite.py b/arcade/sprite/sprite.py index 809bdbb99..10fe92f2b 100644 --- a/arcade/sprite/sprite.py +++ b/arcade/sprite/sprite.py @@ -330,7 +330,7 @@ def move_towards(self, point: Point, max_move: float = float("inf")) -> None: :param Point point: Point to face towards. :param float max: Maximum the sprite will move """ - self.position = lerp_vec(self.position, Point, max_move) + self.position = lerp_vec(self.position, point, max_move) # ---- Draw Methods ---- From aeb110d3ca26452d1702a46c424251c48176cc4f Mon Sep 17 00:00:00 2001 From: Grant Hur <22hurg@sjchrisitan.org> Date: Sat, 6 May 2023 17:13:43 -0700 Subject: [PATCH 3/6] Remove whitespace --- arcade/sprite/sprite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arcade/sprite/sprite.py b/arcade/sprite/sprite.py index 10fe92f2b..a62cbdc82 100644 --- a/arcade/sprite/sprite.py +++ b/arcade/sprite/sprite.py @@ -319,7 +319,7 @@ def face_towards_point(self, point: Point, max_rotation: float = float("inf")) - :param Point point: Point to face towards. """ angle = get_angle_degrees(self.center_x, self.center_y, point[0], point[1]) - + # Reverse angle because sprite angles are backwards self.angle = lerp_angle(self.angle, -angle, max_rotation) From 1ffb638e4ed9fbbf03b6e3139f819adf89c9fb60 Mon Sep 17 00:00:00 2001 From: Grant Hur <22hurg@sjchrisitan.org> Date: Sat, 6 May 2023 17:15:56 -0700 Subject: [PATCH 4/6] Add/Improve Docstrings --- arcade/sprite/sprite.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arcade/sprite/sprite.py b/arcade/sprite/sprite.py index a62cbdc82..0eda7f07b 100644 --- a/arcade/sprite/sprite.py +++ b/arcade/sprite/sprite.py @@ -316,7 +316,10 @@ def face_towards_point(self, point: Point, max_rotation: float = float("inf")) - """ Face the sprite towards a point. Assumes sprite image is facing upwards. + Lower max_rotation and update regularly to have smooth rotation. + :param Point point: Point to face towards. + :param float max_rotation: Maximun the Sprite can rotate """ angle = get_angle_degrees(self.center_x, self.center_y, point[0], point[1]) @@ -327,8 +330,10 @@ def move_towards(self, point: Point, max_move: float = float("inf")) -> None: """ Move the sprite towards a point. + Lower max_move and update regularly to have smooth movement. + :param Point point: Point to face towards. - :param float max: Maximum the sprite will move + :param float max_move: Maximum the sprite will move """ self.position = lerp_vec(self.position, point, max_move) From f85f8a0a7cb1470d88547296a764f42e3cde5377 Mon Sep 17 00:00:00 2001 From: Grant Hur <22hurg@sjchrisitan.org> Date: Sun, 7 May 2023 09:17:57 -0700 Subject: [PATCH 5/6] Remove whitespace --- arcade/sprite/sprite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arcade/sprite/sprite.py b/arcade/sprite/sprite.py index 0eda7f07b..919af2705 100644 --- a/arcade/sprite/sprite.py +++ b/arcade/sprite/sprite.py @@ -322,7 +322,7 @@ def face_towards_point(self, point: Point, max_rotation: float = float("inf")) - :param float max_rotation: Maximun the Sprite can rotate """ angle = get_angle_degrees(self.center_x, self.center_y, point[0], point[1]) - + # Reverse angle because sprite angles are backwards self.angle = lerp_angle(self.angle, -angle, max_rotation) From d87acb32cbba50bb0a000f728f1268518bf7d2ea Mon Sep 17 00:00:00 2001 From: Grant Hur Date: Mon, 29 May 2023 10:53:49 -0700 Subject: [PATCH 6/6] TOTAL CHANGE --- arcade/sprite/sprite.py | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/arcade/sprite/sprite.py b/arcade/sprite/sprite.py index 919af2705..06ae32cc9 100644 --- a/arcade/sprite/sprite.py +++ b/arcade/sprite/sprite.py @@ -4,7 +4,6 @@ from arcade import Texture, load_texture from arcade.hitbox import HitBox, RotatableHitBox -from arcade.math import get_angle_degrees, lerp_vec, lerp_angle from arcade.texture import get_default_texture from arcade.types import PathOrTexture, Point @@ -312,31 +311,6 @@ def stop(self) -> None: self.velocity = 0, 0 self.change_angle = 0 - def face_towards_point(self, point: Point, max_rotation: float = float("inf")) -> None: - """ - Face the sprite towards a point. Assumes sprite image is facing upwards. - - Lower max_rotation and update regularly to have smooth rotation. - - :param Point point: Point to face towards. - :param float max_rotation: Maximun the Sprite can rotate - """ - angle = get_angle_degrees(self.center_x, self.center_y, point[0], point[1]) - - # Reverse angle because sprite angles are backwards - self.angle = lerp_angle(self.angle, -angle, max_rotation) - - def move_towards(self, point: Point, max_move: float = float("inf")) -> None: - """ - Move the sprite towards a point. - - Lower max_move and update regularly to have smooth movement. - - :param Point point: Point to face towards. - :param float max_move: Maximum the sprite will move - """ - self.position = lerp_vec(self.position, point, max_move) - # ---- Draw Methods ---- def draw(self, *, filter=None, pixelated=None, blend_function=None) -> None: