Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Merged by Bors] - Fix incorrect rotation in Transform::rotate_around. #5300

Closed
wants to merge 2 commits into from
Closed

[Merged by Bors] - Fix incorrect rotation in Transform::rotate_around. #5300

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d009d8c
Nice quats bro.
tim-blackbird Jul 12, 2022
3516aba
Added more `rotate_local*` methods.
tim-blackbird Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/bevy_transform/src/components/global_transform.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ impl GlobalTransform {
#[inline]
pub fn rotate_around(&mut self, point: Vec3, rotation: Quat) {
self.translation = point + rotation * (self.translation - point);
self.rotation *= rotation;
self.rotate(rotation);
}

/// Multiplies `self` with `transform` component by component, returning the
Expand Down
18 changes: 13 additions & 5 deletions crates/bevy_transform/src/components/transform.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,28 +236,36 @@ impl Transform {
/// Rotates this [`Transform`] around its `X` axis by `angle` (in radians).
#[inline]
pub fn rotate_local_x(&mut self, angle: f32) {
self.rotate_axis(self.local_x(), angle);
self.rotation *= Quat::from_rotation_x(angle);
}

/// Rotates this [`Transform`] around its `Y` axis by `angle` (in radians).
#[inline]
pub fn rotate_local_y(&mut self, angle: f32) {
self.rotate_axis(self.local_y(), angle);
self.rotation *= Quat::from_rotation_y(angle);
}

/// Rotates this [`Transform`] around its `Z` axis by `angle` (in radians).
#[inline]
pub fn rotate_local_z(&mut self, angle: f32) {
self.rotate_axis(self.local_z(), angle);
self.rotation *= Quat::from_rotation_z(angle);
}

/// Translates this [`Transform`] around a `point` in space.
///
/// If this [`Transform`] has a parent, the `point` is relative to the [`Transform`] of the parent.
#[inline]
pub fn translate_around(&mut self, point: Vec3, rotation: Quat) {
self.translation = point + rotation * (self.translation - point);
}

/// Rotates this [`Transform`] around a `point` in space.
///
/// If this [`Transform`] has a parent, the `point` is relative to the [`Transform`] of the parent.
#[inline]
pub fn rotate_around(&mut self, point: Vec3, rotation: Quat) {
self.translation = point + rotation * (self.translation - point);
self.rotation *= rotation;
self.translate_around(point, rotation);
self.rotate(rotation);
}

/// Rotates this [`Transform`] so that its local negative `Z` direction is toward
Expand Down