Merge branch 'master' into feature/godot-3.5

# Conflicts:
#	README.md
#	gdnative-core/src/core_types/geom/transform2d.rs

Author: Bromeon

CHANGELOG.md

@@ -17,15 +17,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Transform2D::from_rotation_translation_scale()` constructor needs more intuitive API ([#910](https://github.com/godot-rust/godot-rust/pull/910))
 
 
-## [0.10.2] - unreleased
+## [0.10.2] - 2022-10-02
 
 Last maintenance release for Godot 3.4.
 
-# Added
+### Added
 
-- `globalscope::load` method ([#940](https://github.com/godot-rust/godot-rust/pull/940), [#941](https://github.com/godot-rust/godot-rust/pull/941))
+- `globalscope::load()` function ([#940](https://github.com/godot-rust/godot-rust/pull/940), [#941](https://github.com/godot-rust/godot-rust/pull/941))
 - `Color` constructors from HTML string and integers ([#939](https://github.com/godot-rust/godot-rust/pull/939))
 - Version check to warn if Godot is not 3.4 ([#942](https://github.com/godot-rust/godot-rust/pull/942))
+- Support for iOS simulator on Mac M1 ([#944](https://github.com/godot-rust/godot-rust/pull/944))
+
+### Fixed
+
+- During tests, `get_api()` no longer aborts  ([#929](https://github.com/godot-rust/godot-rust/pull/929))
+- Confusing `Transform2D` constructor ([#930](https://github.com/godot-rust/godot-rust/pull/930))
+- Bug in `Rect2::intersects()` ([#948](https://github.com/godot-rust/godot-rust/pull/948))
+- Bug in `Vector2::rotated()` ([#952](https://github.com/godot-rust/godot-rust/pull/952))
+
 
 ## [0.10.1] - 2022-09-03
 

bindings-generator/Cargo.toml

@@ -6,7 +6,7 @@ documentation = "https://docs.rs/crate/gdnative_bindings_generator"
 repository = "https://github.com/godot-rust/godot-rust"
 homepage = "https://godot-rust.github.io/"
 license = "MIT"
-version = "0.10.1"
+version = "0.10.2"
 workspace = ".."
 edition = "2021"
 rust-version = "1.63"

gdnative-async/Cargo.toml

@@ -5,7 +5,7 @@ description = "Runtime async support for godot-rust."
 documentation = "https://docs.rs/crate/gdnative-async"
 repository = "https://github.com/godot-rust/godot-rust"
 homepage = "https://godot-rust.github.io/"
-version = "0.10.1"
+version = "0.10.2"
 license = "MIT"
 workspace = ".."
 edition = "2021"
@@ -14,9 +14,9 @@ rust-version = "1.63"
 [features]
 
 [dependencies]
-gdnative-derive = { path = "../gdnative-derive", version = "=0.10.1" }
-gdnative-core = { path = "../gdnative-core", version = "=0.10.1" }
-gdnative-bindings = { path = "../gdnative-bindings", version = "=0.10.1" }
+gdnative-derive = { path = "../gdnative-derive", version = "=0.10.2" }
+gdnative-core = { path = "../gdnative-core", version = "=0.10.2" }
+gdnative-bindings = { path = "../gdnative-bindings", version = "=0.10.2" }
 atomic-waker = "1"
 crossbeam-channel = "0.5"
 futures-task = "0.3"

gdnative-bindings/Cargo.toml

@@ -5,7 +5,7 @@ description = "The Godot game engine's automatcally generated bindings to Godot
 documentation = "https://docs.rs/crate/gdnative-bindings"
 repository = "https://github.com/godot-rust/godot-rust"
 homepage = "https://godot-rust.github.io/"
-version = "0.10.1"
+version = "0.10.2"
 license = "MIT"
 workspace = ".."
 edition = "2021"
@@ -17,8 +17,8 @@ one-class-one-file = []
 custom-godot = ["gdnative_bindings_generator/custom-godot"]
 
 [dependencies]
-gdnative-core = { path = "../gdnative-core", version = "=0.10.1" }
+gdnative-core = { path = "../gdnative-core", version = "=0.10.2" }
 libc = "0.2"
 
 [build-dependencies]
-gdnative_bindings_generator = { path = "../bindings-generator", version = "=0.10.1" }
+gdnative_bindings_generator = { path = "../bindings-generator", version = "=0.10.2" }

gdnative-core/Cargo.toml

@@ -5,7 +5,7 @@ description = "The Godot game engine's gdnative core bindings."
 documentation = "https://docs.rs/crate/gdnative-core"
 repository = "https://github.com/godot-rust/godot-rust"
 homepage = "https://godot-rust.github.io/"
-version = "0.10.1"
+version = "0.10.2"
 license = "MIT"
 workspace = ".."
 edition = "2021"
@@ -17,8 +17,8 @@ gd-test = []
 type-tag-fallback = []
 
 [dependencies]
-gdnative-sys = { path = "../gdnative-sys", version = "=0.10.1" }
-gdnative-impl-proc-macros = { path = "../impl/proc-macros", version = "=0.10.1" }
+gdnative-sys = { path = "../gdnative-sys", version = "=0.10.2" }
+gdnative-impl-proc-macros = { path = "../impl/proc-macros", version = "=0.10.2" }
 ahash = "0.8"
 approx = "0.5"
 atomic-take = "1"

gdnative-core/src/core_types/geom/rect2.rs

@@ -115,7 +115,7 @@ impl Rect2 {
         self.position.x < b.position.x + b.size.x
             && self.position.x + self.size.x > b.position.x
             && self.position.y < b.position.y + b.size.y
-            && self.position.y + self.size.y > b.size.y
+            && self.position.y + self.size.y > b.position.y
     }
 
     /// Returns true if the rectangle overlaps with `b` (i.e. they have at least one point in
@@ -130,7 +130,7 @@ impl Rect2 {
         self.position.x <= b.position.x + b.size.x
             && self.position.x + self.size.x >= b.position.x
             && self.position.y <= b.position.y + b.size.y
-            && self.position.y + self.size.y >= b.size.y
+            && self.position.y + self.size.y >= b.position.y
     }
 
     /// Returns true if this rectangle (inclusively) encloses `b`.

gdnative-core/src/core_types/geom/transform2d.rs

@@ -75,6 +75,29 @@ impl Transform2D {
         }
     }
 
+    /// Constructs the transform from a given scale, angle (in radians), and origin.
+    ///
+    /// This is **NOT** equivalent to either of these two lines:
+    /// ```ignore
+    /// Transform2D::IDENTITY.scaled(scale).rotated(rotation).translated(origin)
+    /// Transform2D::IDENTITY.translated(origin).rotated(rotation).scaled(scale)
+    /// ```
+    ///
+    /// Those transformations do not preserve the given origin; see documentation for [`rotated`], [`scaled`], and [`translated`].
+    ///
+    /// [`rotated`]: Self::rotated
+    /// [`scaled`]: Self::scaled
+    /// [`translated`]: Self::translated
+    #[inline]
+    pub fn from_scale_rotation_origin(scale: Vector2, rotation: f32, origin: Vector2) -> Self {
+        let mut tr = Self::IDENTITY;
+        tr.set_scale(scale);
+        tr.set_rotation(rotation);
+        tr.origin = origin;
+
+        tr
+    }
+
     /// Returns the inverse of the transform, under the assumption that the transformation is composed of rotation, scaling and translation.
     #[inline]
     pub fn affine_inverse(&self) -> Self {
@@ -151,7 +174,7 @@ impl Transform2D {
         self.set_scale(scale);
     }
 
-    /// Rotates the transform by the given angle (in radians), using matrix multiplication.
+    /// Rotates the transform by the given angle (in radians), using matrix multiplication. This will modify the transform's origin.
     #[inline]
     pub fn rotated(&self, rotation: f32) -> Self {
         let mut tr = Self::IDENTITY;
@@ -173,7 +196,7 @@ impl Transform2D {
         self.b = self.b.normalized() * scale.y;
     }
 
-    /// Scales the transform by the given scale factor, using matrix multiplication.
+    /// Scales the transform by the given scale factor, using matrix multiplication. This will modify the transform's origin.
     #[inline]
     pub fn scaled(&self, scale: Vector2) -> Self {
         let mut new = *self;
@@ -432,3 +455,25 @@ godot_test!(
         test_transform2d_behavior_impl()
     }
 );
+
+#[test]
+fn test_transform2d_constructor() {
+    use std::f32::consts::PI;
+
+    let scale = Vector2::new(2.0, 0.5);
+    let rotation = PI / 4.0;
+    let origin = Vector2::new(250.0, 150.0);
+
+    let tr = Transform2D::from_scale_rotation_origin(scale, rotation, origin);
+
+    assert_eq!(tr.origin, origin);
+
+    let actual_local_right = tr.basis_xform(Vector2::RIGHT);
+    let expected_local_right = Vector2::RIGHT.rotated(-rotation) * scale;
+    assert!(
+        actual_local_right.is_equal_approx(expected_local_right),
+        "{:?} != {:?}",
+        actual_local_right,
+        expected_local_right
+    );
+}

gdnative-core/src/core_types/vector2.rs

@@ -251,7 +251,7 @@ impl Vector2 {
     #[inline]
     pub fn rotated(self, angle: f32) -> Self {
         let (cos, sin) = (angle.cos(), angle.sin());
-        Self::new(cos * self.x + sin * self.y, sin * self.x + cos * self.y)
+        Self::new(cos * self.x - sin * self.y, sin * self.x + cos * self.y)
     }
 
     /// Returns the vector with all components rounded to the nearest integer, with halfway cases

gdnative-core/src/macros.rs

@@ -245,7 +245,12 @@ macro_rules! godot_test_impl {
                 ).is_ok();
 
                 if !ok {
-                    $crate::godot_error!("   !! Test {} failed", str_name);
+                    if ::std::panic::catch_unwind(|| {
+                        $crate::godot_error!("   !! Test {} failed", str_name);
+                    }).is_err() {
+                        eprintln!("   !! Test {} failed", str_name);
+                        eprintln!("   !! And failed to call Godot API to log error message");
+                    }
                 }
 
                 ok

gdnative-core/src/private.rs

@@ -80,13 +80,44 @@ unsafe fn check_api_compatibility(
 /// Returns a reference to the current API struct.
 ///
 /// This function is intended to be part of the internal API. It should only be called after
-/// `gdnative_init` and before `gdnative_terminate`. **Calling this function when the API is
-/// not bound will lead to an abort**, since in most cases there is simply no point to continue
-/// if `get_api` failed. This allows it to be used in FFI contexts without a `catch_unwind`.
+/// `gdnative_init` and before `gdnative_terminate`.
+///
+/// # Panics
+///
+/// **Calling this function when the API is not bound will panic**. Note that it will abort
+/// directly during tests (i.e. in unit testing or enable `feature = gd-test`). Since in
+/// most cases there is simply no point to continue if `get_api` failed. This allows it to
+/// be used in FFI contexts without a `catch_unwind`. (Unwinding across FFI boundary is an
+/// undefined behavior.)
+///
+/// In testing environment, this function use `Option::expect` because unwinding in this
+/// scenario should be safe.
+///
+/// See more: https://github.com/godot-rust/godot-rust/pull/929
 #[inline]
-#[allow(clippy::redundant_closure)] // clippy false positive: https://github.com/rust-lang/rust-clippy/issues/7812
 pub fn get_api() -> &'static sys::GodotApi {
-    unsafe { GODOT_API.as_ref().unwrap_or_else(|| std::process::abort()) }
+    const ERR_MSG: &str = "
+    This code requires the Godot engine to be running and the GDNative initialization \
+    to have completed. It cannot execute as a standalone Rust program.
+    
+    Hint: If you encounter this issue during unit testing, you might \
+    need to use the godot_test! macro, and invoke the test functions in test/src/lib.rs.
+    ";
+
+    // Unwinding during tests should be safe and provide more ergonomic UI.
+    #[cfg(any(test, feature = "gd-test"))]
+    unsafe {
+        return GODOT_API.as_ref().expect(ERR_MSG);
+    }
+
+    // Abort directly to avoid undefined behaviors.
+    #[cfg(not(any(test, feature = "gd-test")))]
+    unsafe {
+        return GODOT_API.as_ref().unwrap_or_else(|| {
+            eprintln!("{}", ERR_MSG);
+            std::process::abort();
+        });
+    }
 }
 
 /// Returns a reference to the current API struct if it is bounds, or `None` otherwise.