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] - Derive FromReflect for Transform and GlobalTransform #6015

Closed
wants to merge 2 commits into from
Closed

[Merged by Bors] - Derive FromReflect for Transform and GlobalTransform #6015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
243ed7e
Added FromReflect derive for Transform and GlobalTransform
afonsolage Sep 18, 2022
424cd91
Merge branch 'main' into transform_from_reflect
afonsolage Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/bevy_transform/src/components/global_transform.rs
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ use std::ops::Mul;
use super::Transform;
use bevy_ecs::{component::Component, reflect::ReflectComponent};
use bevy_math::{Affine3A, Mat4, Quat, Vec3, Vec3A};
use bevy_reflect::Reflect;
use bevy_reflect::{FromReflect, Reflect};

/// Describe the position of an entity relative to the reference frame.
///
Expand Down Expand Up @@ -31,7 +31,7 @@ use bevy_reflect::Reflect;
/// - [`global_vs_local_translation`]
///
/// [`global_vs_local_translation`]: https://github.com/bevyengine/bevy/blob/latest/examples/transforms/global_vs_local_translation.rs
#[derive(Component, Debug, PartialEq, Clone, Copy, Reflect)]
#[derive(Component, Debug, PartialEq, Clone, Copy, Reflect, FromReflect)]
#[reflect(Component, PartialEq)]
pub struct GlobalTransform(Affine3A);

Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_transform/src/components/transform.rs
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@ use std::ops::Mul;
///
/// [`global_vs_local_translation`]: https://github.com/bevyengine/bevy/blob/latest/examples/transforms/global_vs_local_translation.rs
/// [`transform`]: https://github.com/bevyengine/bevy/blob/latest/examples/transforms/transform.rs
#[derive(Component, Debug, PartialEq, Clone, Copy, Reflect)]
#[derive(Component, Debug, PartialEq, Clone, Copy, Reflect, FromReflect)]
#[reflect(Component, Default, PartialEq)]
pub struct Transform {
/// Position of the entity. In 2d, the last value of the `Vec3` is used for z-ordering.
Expand Down