From 0426e74ed9d84f9d2680c098c8bd00db5a3ae346 Mon Sep 17 00:00:00 2001
From: DragonMoffon <happydog.aja@gmail.com>
Date: Thu, 14 Nov 2024 01:14:55 +1300
Subject: [PATCH 1/2] Update screen shake to add directionality, and context
 methods

---
 arcade/camera/grips/screen_shake_2d.py | 27 ++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/arcade/camera/grips/screen_shake_2d.py b/arcade/camera/grips/screen_shake_2d.py
index 3d92719c5b..7f415887ea 100644
--- a/arcade/camera/grips/screen_shake_2d.py
+++ b/arcade/camera/grips/screen_shake_2d.py
@@ -6,7 +6,7 @@
 from __future__ import annotations
 
 from math import exp, floor, log, pi, sin
-from random import uniform
+from random import randint, uniform
 
 from arcade.camera.data_types import CameraData
 from arcade.math import quaternion_rotation
@@ -40,6 +40,12 @@ class ScreenShake2D:
         shake_frequency:
             The number of peaks per second. Avoid making it a multiple of half
             the target frame-rate. (e.g. at 60 fps avoid 30, 60, 90, 120, etc.)
+        shake_angle:
+            The angle around which the shake will focus. Defaults to 0 (horizontal)
+        shake_range:
+            The range in degrees from the shake angle that the shake may fall within.
+            defaults to 90 degrees. This gives a range of +/- 90 degrees which covers the full circle because
+            the shake is mirrored across the circle.
     """
 
     def __init__(
@@ -50,6 +56,8 @@ def __init__(
         falloff_time: float = 1.0,
         acceleration_duration: float = 1.0,
         shake_frequency: float = 15.0,
+        shake_angle: float = 90.0,
+        shake_range: float = 90.0,
     ):
         self._data: CameraData = camera_data
 
@@ -70,6 +78,9 @@ def __init__(
 
         self._acceleration_duration: float = acceleration_duration
 
+        self.shake_angle: float = shake_angle
+        self.shake_range: float = shake_range
+
         self._shaking: bool = False
         self._length_shaking: float = 0.0
 
@@ -275,7 +286,12 @@ def update_camera(self) -> None:
             floor(self._last_update_time * 2 * self.shake_frequency)
             < floor(self._length_shaking * 2.0 * self.shake_frequency)
         ) or self._last_update_time == 0.0:
-            self._current_dir = uniform(-180, 180)
+            # Start from the shake angle and then offset by the reflected shake range, then randomly pick whether to mirror to the other side.
+            self._current_dir = (
+                self.shake_angle
+                + uniform(-self.shake_range, self.shake_range)
+                + (180 * randint(0, 1))
+            )
 
         _amp = self._calc_amplitude() * self.max_amplitude
         _vec = quaternion_rotation(self._data.forward, self._data.up, self._current_dir)
@@ -305,3 +321,10 @@ def readjust_camera(self) -> None:
             self._data.position[2] - self._last_vector[2],
         )
         self._last_vector = (0.0, 0.0, 0.0)
+
+    def __enter__(self):
+        self.update_camera()
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.readjust_camera()
+        return False
\ No newline at end of file

From bbb87641e35d146fd3a999b64c5d83695a97e2f3 Mon Sep 17 00:00:00 2001
From: DragonMoffon <happydog.aja@gmail.com>
Date: Thu, 14 Nov 2024 01:20:12 +1300
Subject: [PATCH 2/2] linting

---
 arcade/camera/grips/screen_shake_2d.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/arcade/camera/grips/screen_shake_2d.py b/arcade/camera/grips/screen_shake_2d.py
index 7f415887ea..b51fbbee34 100644
--- a/arcade/camera/grips/screen_shake_2d.py
+++ b/arcade/camera/grips/screen_shake_2d.py
@@ -42,10 +42,11 @@ class ScreenShake2D:
             the target frame-rate. (e.g. at 60 fps avoid 30, 60, 90, 120, etc.)
         shake_angle:
             The angle around which the shake will focus. Defaults to 0 (horizontal)
+            This is actuall 0 or 180 degress as the shake angle is mirrored.
         shake_range:
             The range in degrees from the shake angle that the shake may fall within.
-            defaults to 90 degrees. This gives a range of +/- 90 degrees which covers the full circle because
-            the shake is mirrored across the circle.
+            defaults to 90 degrees. This gives a range of +/- 90 degrees which covers the
+            full circle because the shake angle is mirrored 180 degrees.
     """
 
     def __init__(
@@ -286,7 +287,8 @@ def update_camera(self) -> None:
             floor(self._last_update_time * 2 * self.shake_frequency)
             < floor(self._length_shaking * 2.0 * self.shake_frequency)
         ) or self._last_update_time == 0.0:
-            # Start from the shake angle and then offset by the reflected shake range, then randomly pick whether to mirror to the other side.
+            # Start from the shake angle and then offset by the reflected shake range,
+            # then randomly pick whether to mirror to the other side.
             self._current_dir = (
                 self.shake_angle
                 + uniform(-self.shake_range, self.shake_range)
@@ -327,4 +329,4 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         self.readjust_camera()
-        return False
\ No newline at end of file
+        return False