Final tweaks for draft

Author: lilizoey

godot-core/src/builtin/basis.rs

@@ -166,7 +166,7 @@ impl Basis {
     ///
     /// _Godot equivalent: `Basis()`_
     #[must_use]
-    pub fn to_quat(&self) -> Quaternion {
+    pub fn to_quat(self) -> Quaternion {
         glam::Quat::from_mat3(&self.orthonormalized().to_glam()).to_front()
     }
 
@@ -409,7 +409,7 @@ impl Basis {
     ///
     /// _Godot equivalent: `Basis.inverse()`_
     #[must_use]
-    pub fn inverse(&self) -> Basis {
+    pub fn inverse(self) -> Basis {
         self.glam(|mat| mat.inverse())
     }
 
@@ -429,7 +429,7 @@ impl Basis {
     ///
     /// _Godot equivalent: `Basis.orthonormalized()`_
     #[must_use]
-    pub fn orthonormalized(&self) -> Self {
+    pub fn orthonormalized(self) -> Self {
         assert!(
             !is_equal_approx(self.determinant(), 0.0),
             "Determinant should not be zero."
@@ -506,7 +506,7 @@ impl Basis {
     /// _Godot equivalent: `Basis.is_finite()`_
     #[must_use]
     pub fn is_finite(&self) -> bool {
-        self.to_glam().is_finite()
+        self[0].is_finite() && self[1].is_finite() && self[2].is_finite()
     }
 
     /// Returns `true` if this basis and `other` are approximately equal,
@@ -590,6 +590,12 @@ impl Display for Basis {
     }
 }
 
+impl From<Quaternion> for Basis {
+    fn from(quat: Quaternion) -> Self {
+        Basis::from_quat(quat)
+    }
+}
+
 impl GlamConv for Basis {
     type Glam = glam::f32::Mat3;
 }

godot-core/src/builtin/projection.rs

@@ -238,7 +238,7 @@ impl Projection {
     /// column flipped.
     ///
     /// _Godot equivalent: Projection.flipped_y()_
-    pub fn flipped_y(&self) -> Self {
+    pub fn flipped_y(self) -> Self {
         Self {
             cols: [self[0], -self[1], self[2], self[3]],
         }
@@ -326,7 +326,7 @@ impl Projection {
     /// projective transformation.
     ///
     /// _Godot equivalent: Projection.inverse()_
-    pub fn inverse(&self) -> Self {
+    pub fn inverse(self) -> Self {
         self.glam(|mat| mat.inverse())
     }
 

godot-core/src/builtin/transform2d.rs

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-use std::{f32::consts::PI, ops::*};
+use std::{f32::consts::PI, fmt::Display, ops::*};
 
 use godot_ffi as sys;
 use sys::{ffi_methods, GodotFfi};
@@ -106,7 +106,7 @@ impl Transform2D {
     /// transformation is composed of rotation, scaling and translation.
     ///
     /// _Godot equivalent: `Transform2D.affine_inverse()`_
-    pub fn affine_inverse(&self) -> Self {
+    pub fn affine_inverse(self) -> Self {
         self.glam(|aff| aff.inverse())
     }
 
@@ -164,7 +164,7 @@ impl Transform2D {
     /// normalized axis vectors (scale of 1 or -1).
     ///
     /// _Godot equivalent: `Transform2D.orthonormalized()`_
-    pub fn orthonormalized(&self) -> Self {
+    pub fn orthonormalized(self) -> Self {
         Self {
             basis: self.basis.orthonormalized(),
             origin: self.origin,
@@ -247,6 +247,21 @@ impl Transform2D {
     }
 }
 
+impl Display for Transform2D {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        // Godot output:
+        // [X: (1, 2), Y: (3, 4), O: (5, 6)]
+        // Where X,Y,O are the columns
+
+        let [Vector2 { x: x1, y: x2 }, Vector2 { x: y1, y: y2 }] = self.basis.cols;
+        let Vector2 { x: o1, y: o2 } = self.origin;
+
+        f.write_fmt(format_args!(
+            "[X: ({x1}, {x2}), Y: ({y1}, {y2}), O: ({o1}, {o2})]"
+        ))
+    }
+}
+
 impl Index<usize> for Transform2D {
     type Output = Vector2;
 
@@ -384,7 +399,7 @@ impl Basis2D {
     }
 
     /// Introduces an additional scaling.
-    pub fn scaled(&self, scale: Vector2) -> Self {
+    pub fn scaled(self, scale: Vector2) -> Self {
         Self {
             cols: [self[0] * scale.x, self[1] * scale.y],
         }
@@ -410,7 +425,7 @@ impl Basis2D {
 
     /// Returns the orthonormalized version of the basis.
     #[must_use]
-    pub fn orthonormalized(&self) -> Self {
+    pub fn orthonormalized(self) -> Self {
         assert!(
             !is_equal_approx(self.determinant(), 0.0),
             "Determinant should not be zero."
@@ -493,6 +508,14 @@ impl Default for Basis2D {
     }
 }
 
+impl Display for Basis2D {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let [Vector2 { x: x1, y: x2 }, Vector2 { x: y1, y: y2 }] = self.cols;
+
+        f.write_fmt(format_args!("[X: ({x1}, {x2}), Y: ({y1}, {y2}))]"))
+    }
+}
+
 impl Mul for Basis2D {
     type Output = Self;
 

godot-core/src/builtin/transform3d.rs

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-use std::ops::*;
+use std::{fmt::Display, ops::*};
 
 use godot_ffi as sys;
 use sys::{ffi_methods, GodotFfi};
@@ -81,7 +81,7 @@ impl Transform3D {
     /// transformation is composed of rotation, scaling and translation.
     ///
     /// _Godot equivalent: Transform3D.affine_inverse()_
-    pub fn affine_inverse(&self) -> Self {
+    pub fn affine_inverse(self) -> Self {
         self.glam(|aff| aff.inverse())
     }
 
@@ -129,7 +129,7 @@ impl Transform3D {
     /// See [`Basis::new_looking_at()`] for more information.
     ///
     /// _Godot equivalent: Transform3D.looking_at()_
-    pub fn looking_at(&self, target: Vector3, up: Vector3) -> Self {
+    pub fn looking_at(self, target: Vector3, up: Vector3) -> Self {
         Self {
             basis: Basis::new_looking_at(target - self.origin, up),
             origin: self.origin,
@@ -140,7 +140,7 @@ impl Transform3D {
     /// normalized axis vectors (scale of 1 or -1).
     ///
     /// _Godot equivalent: Transform3D.orthonormalized()_
-    pub fn orthonormalized(&self) -> Self {
+    pub fn orthonormalized(self) -> Self {
         Self {
             basis: self.basis.orthonormalized(),
             origin: self.origin,
@@ -153,7 +153,7 @@ impl Transform3D {
     /// This can be seen as transforming with respect to the global/parent frame.
     ///
     /// _Godot equivalent: `Transform2D.rotated()`_
-    pub fn rotated(&self, axis: Vector3, angle: f32) -> Self {
+    pub fn rotated(self, axis: Vector3, angle: f32) -> Self {
         let rotation = Basis::from_axis_angle(axis, angle);
         Self {
             basis: rotation * self.basis,
@@ -166,7 +166,7 @@ impl Transform3D {
     /// This can be seen as transforming with respect to the local frame.
     ///
     /// _Godot equivalent: `Transform2D.rotated_local()`_
-    pub fn rotated_local(&self, axis: Vector3, angle: f32) -> Self {
+    pub fn rotated_local(self, axis: Vector3, angle: f32) -> Self {
         Self {
             basis: self.basis * Basis::from_axis_angle(axis, angle),
             origin: self.origin,
@@ -179,7 +179,7 @@ impl Transform3D {
     /// This can be seen as transforming with respect to the global/parent frame.
     ///
     /// _Godot equivalent: `Transform2D.scaled()`_
-    pub fn scaled(&self, scale: Vector3) -> Self {
+    pub fn scaled(self, scale: Vector3) -> Self {
         Self {
             basis: Basis::from_scale(scale) * self.basis,
             origin: self.origin * scale,
@@ -192,7 +192,7 @@ impl Transform3D {
     /// This can be seen as transforming with respect to the local frame.
     ///
     /// _Godot equivalent: `Transform2D.scaled_local()`_
-    pub fn scaled_local(&self, scale: Vector3) -> Self {
+    pub fn scaled_local(self, scale: Vector3) -> Self {
         Self {
             basis: self.basis * Basis::from_scale(scale),
             origin: self.origin,
@@ -205,7 +205,7 @@ impl Transform3D {
     /// This can be seen as transforming with respect to the global/parent frame.
     ///
     /// _Godot equivalent: `Transform2D.translated()`_
-    pub fn translated(&self, offset: Vector3) -> Self {
+    pub fn translated(self, offset: Vector3) -> Self {
         Self {
             basis: self.basis,
             origin: self.origin + offset,
@@ -218,14 +218,42 @@ impl Transform3D {
     /// This can be seen as transforming with respect to the local frame.
     ///
     /// _Godot equivalent: `Transform2D.translated()`_
-    pub fn translated_local(&self, offset: Vector3) -> Self {
+    pub fn translated_local(self, offset: Vector3) -> Self {
         Self {
             basis: self.basis,
             origin: self.origin + (self.basis * offset),
         }
     }
 }
 
+impl Display for Transform3D {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        // Godot output:
+        // [X: (1, 2, 3), Y: (4, 5, 6), Z: (7, 8, 9), O: (10, 11, 12)]
+        // Where X,Y,O are the columns
+        let [Vector3 {
+            x: x1,
+            y: x2,
+            z: x3,
+        }, Vector3 {
+            x: y1,
+            y: y2,
+            z: y3,
+        }, Vector3 {
+            x: z1,
+            y: z2,
+            z: z3,
+        }] = self.basis.to_cols();
+        let Vector3 {
+            x: o1,
+            y: o2,
+            z: o3,
+        } = self.origin;
+
+        f.write_fmt(format_args!("[X: ({x1}, {x2}, {x3}), Y: ({y1}, {y2}, {y3}), Z: ({z1}, {z2}, {z3}), O: ({o1}, {o2}, {o3})]"))
+    }
+}
+
 impl From<Projection> for Transform3D {
     /// Constructs a let froma Projection by trimming the last row of
     /// the projection matrix.