Benchmark work (#31)

Cleptomania · web-flow · commit 1009f5d4cdbb · 2024-03-01T18:13:37.000-05:00
* Multiprocessing re-work for benchmark utility

* Update pyo3 and maturin

* Math fixes and some tests to check them

* Formatting
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,5 +10,5 @@ crate-type = ["cdylib"]
 
 [dependencies]
 float_eq = "1"
-pyo3 = "0.18.1"
+pyo3 = "0.20.3"
 rand = "0.8.5"
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["maturin>=0.14,<0.15"]
+requires = ["maturin>=1.4.0,<1.5.0"]
 build-backend = "maturin"
 
 [project]
diff --git a/python/arcade_accelerate/__init__.py b/python/arcade_accelerate/__init__.py
@@ -24,19 +24,19 @@ def patch_hitboxes(patches):
 
 
 def patch_spritelist_collision(patches):
-    patches[
-        "arcade.sprite_list.collision"
-    ].check_for_collision_with_list = arcade_accelerate.check_for_collision_with_list
-    patches[
-        "arcade.sprite_list.collision"
-    ].check_for_collision_with_lists = arcade_accelerate.check_for_collision_with_lists
+    patches["arcade.sprite_list.collision"].check_for_collision_with_list = (
+        arcade_accelerate.check_for_collision_with_list
+    )
+    patches["arcade.sprite_list.collision"].check_for_collision_with_lists = (
+        arcade_accelerate.check_for_collision_with_lists
+    )
 
 
 def patch_math(patches):
     patches["arcade.math"].rotate_point = arcade_accelerate.rotate_point
 
 
 def patch_geometry(patches):
-    patches[
-        "arcade.geometry"
-    ].are_polygons_intersecting = arcade_accelerate.are_polygons_intersecting
+    patches["arcade.geometry"].are_polygons_intersecting = (
+        arcade_accelerate.are_polygons_intersecting
+    )
diff --git a/src/geometry.rs b/src/geometry.rs
@@ -2,6 +2,10 @@ use pyo3::prelude::*;
 
 #[pyfunction]
 pub fn are_polygons_intersecting(poly_a: Vec<(f32, f32)>, poly_b: Vec<(f32, f32)>) -> bool {
+    // If either polygon is empty, we should just return False
+    if poly_a.is_empty() || poly_b.is_empty() {
+        return false;
+    }
     let polygons = [poly_a, poly_b];
     for polygon in &polygons {
         for i1 in 0..polygon.len() {
@@ -171,6 +175,14 @@ mod tests {
         assert!(!result);
     }
 
+    #[test]
+    fn test_empty_polygons_intersecting() {
+        let poly_a: Vec<(f32, f32)> = vec![];
+        let poly_b: Vec<(f32, f32)> = vec![];
+        let result = are_polygons_intersecting(poly_a, poly_b);
+        assert!(!result);
+    }
+
     #[test]
     fn test_is_point_in_box() {
         // point inside
diff --git a/src/hitbox.rs b/src/hitbox.rs
@@ -158,8 +158,8 @@ impl RotatableHitBox {
         let rad_cos = rad.cos();
         let rad_sin = rad.sin();
         for point in super_.points.iter() {
-            let x = ((point.0 * rad_cos - point.1 * rad_sin) * super_.scale.0) + super_.position.0;
-            let y = ((point.0 * rad_sin + point.1 * rad_cos) * super_.scale.1) + super_.position.1;
+            let x = ((point.0 * rad_cos + point.1 * rad_sin) * super_.scale.0) + super_.position.0;
+            let y = ((-point.0 * rad_sin + point.1 * rad_cos) * super_.scale.1) + super_.position.1;
             new_points.push((x, y));
         }
 
diff --git a/src/math.rs b/src/math.rs
@@ -14,8 +14,8 @@ pub fn rotate_point(x: f32, y: f32, cx: f32, cy: f32, angle: f32) -> (f32, f32)
     let temp_y = y - cy;
 
     // rotate point
-    let xnew = (temp_x * c - temp_y * s) + cx;
-    let ynew = (temp_x * s + temp_y * c) + cy;
+    let xnew = (temp_x * c + temp_y * s) + cx;
+    let ynew = (-temp_x * s + temp_y * c) + cy;
 
     let precision = 10i32.pow(_PRECISION) as f32;
     let x_rounded = (xnew * precision).round() / precision;
@@ -232,6 +232,11 @@ mod tests {
     use super::*;
     use float_eq::assert_float_eq;
 
+    fn round_float(n: f32, decimals: u32) -> f32 {
+        let nn = 10i32.pow(decimals) as f32;
+        (n * nn).round() / nn
+    }
+
     #[test]
     fn test_clamp() {
         let mut result = clamp(1.2, 1.0, 2.0);
@@ -392,4 +397,52 @@ mod tests {
         assert_eq!(result.x, 0.0);
         assert_eq!(result.y, 0.0);
     }
+
+    #[test]
+    fn test_rotate_point() {
+        let mut x: f32 = 0.0;
+        let mut y: f32 = 0.0;
+        let mut cx: f32 = 0.0;
+        let mut cy: f32 = 0.0;
+        let mut angle: f32 = 0.0;
+        let mut point: (f32, f32) = rotate_point(x, y, cx, cy, angle);
+        assert_float_eq!(round_float(point.0, 2), 0.0, abs <= 1.0e-3);
+        assert_float_eq!(round_float(point.1, 2), 0.0, abs <= 1.0e-3);
+
+        x = 0.0;
+        y = 0.0;
+        cx = 0.0;
+        cy = 0.0;
+        angle = 90.0;
+        point = rotate_point(x, y, cx, cy, angle);
+        assert_float_eq!(round_float(point.0, 2), 0.0, abs <= 1.0e-3);
+        assert_float_eq!(round_float(point.1, 2), 0.0, abs <= 1.0e-3);
+
+        x = 50.0;
+        y = 50.0;
+        cx = 0.0;
+        cy = 0.0;
+        angle = 0.0;
+        point = rotate_point(x, y, cx, cy, angle);
+        assert_float_eq!(round_float(point.0, 2), 50.0, abs <= 1.0e-3);
+        assert_float_eq!(round_float(point.1, 2), 50.0, abs <= 1.0e-3);
+
+        x = 50.0;
+        y = 0.0;
+        cx = 0.0;
+        cy = 0.0;
+        angle = 90.0;
+        point = rotate_point(x, y, cx, cy, angle);
+        assert_float_eq!(round_float(point.0, 2), 0.0, abs <= 1.0e-3);
+        assert_float_eq!(round_float(point.1, 2), -50.0, abs <= 1.0e-3);
+
+        x = 20.0;
+        y = 10.0;
+        cx = 10.0;
+        cy = 10.0;
+        angle = 180.0;
+        point = rotate_point(x, y, cx, cy, angle);
+        assert_float_eq!(round_float(point.0, 2), 0.0, abs <= 1.0e-3);
+        assert_float_eq!(round_float(point.1, 2), 10.0, abs <= 1.0e-3);
+    }
 }
