Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-09-20 14:32:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

rename LocalToWorld -> Transform and LocalToParent -> LocalTransform

Browse source
This commit is contained in:
Carter Anderson 2020-06-07 13:39:50 -07:00
parent d0298a4f89
commit 5add29f8cf
36 changed files with 131 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/bevy_core/src/lib.rs
View file

@ -7,7 +7,7 @@ pub use bevy_derive::Bytes;
use bevy_app::{stage, AppBuilder, AppPlugin};
use bevy_transform::{
components::{
Children, LocalToParent, LocalToWorld, NonUniformScale, Rotation, Scale, Translation,
Children, LocalTransform, Transform, NonUniformScale, Rotation, Scale, Translation,
},
transform_system_bundle,
};
@ -27,8 +27,8 @@ impl AppPlugin for CorePlugin {
app.init_resource::<Time>()
.register_component::<Children>()
.register_component::<LocalToParent>()
.register_component::<LocalToWorld>()
.register_component::<LocalTransform>()
.register_component::<Transform>()
.register_component::<Translation>()
.register_component::<Rotation>()
.register_component::<Scale>()

6
crates/bevy_core/src/transform/world_builder.rs
View file

@ -1,5 +1,5 @@
use bevy_app::EntityArchetype;
use bevy_transform::components::{LocalToParent, Parent};
use bevy_transform::components::{LocalTransform, Parent};
use legion::{
filter::{ChunksetFilterData, Filter},
prelude::*,
@ -90,7 +90,7 @@ impl<'a> WorldBuilder<'a> {
.add_component(current_entity, Parent(parent_entity));
let _ = self
.world
.add_component(current_entity, LocalToParent::identity());
.add_component(current_entity, LocalTransform::identity());
}
}
}
@ -179,7 +179,7 @@ impl<'a> CommandBufferBuilder<'a> {
.add_component(current_entity, Parent(parent_entity));
let _ = self
.command_buffer
.add_component(current_entity, LocalToParent::identity());
.add_component(current_entity, LocalTransform::identity());
}
}
}

6
crates/bevy_pbr/src/entity.rs
View file

@ -2,7 +2,7 @@ use crate::{light::Light, material::StandardMaterial};
use bevy_asset::Handle;
use bevy_derive::EntityArchetype;
use bevy_render::{mesh::Mesh, Renderable};
use bevy_transform::prelude::{LocalToWorld, Rotation, Scale, Translation};
use bevy_transform::prelude::{Transform, Rotation, Scale, Translation};
#[derive(EntityArchetype, Default)]
pub struct MeshEntity {
@ -11,7 +11,7 @@ pub struct MeshEntity {
// #[tag]
pub material: Handle<StandardMaterial>,
pub renderable: Renderable,
pub local_to_world: LocalToWorld,
pub transform: Transform,
pub translation: Translation,
pub rotation: Rotation,
pub scale: Scale,
@ -20,7 +20,7 @@ pub struct MeshEntity {
#[derive(EntityArchetype, Default)]
pub struct LightEntity {
pub light: Light,
pub local_to_world: LocalToWorld,
pub transform: Transform,
pub translation: Translation,
pub rotation: Rotation,
}

8
crates/bevy_pbr/src/forward_pbr_render_graph.rs
View file

@ -10,11 +10,11 @@ use bevy_render::{
},
shader::Shader,
};
use bevy_transform::prelude::LocalToWorld;
use bevy_transform::prelude::Transform;
use legion::prelude::Resources;
pub mod node {
pub const LOCAL_TO_WORLD: &str = "local_to_world";
pub const TRANSFORM: &str = "transform";
pub const STANDARD_MATERIAL: &str = "standard_material";
pub const LIGHTS: &str = "lights";
}
@ -29,7 +29,7 @@ pub trait ForwardPbrRenderGraphBuilder {
impl ForwardPbrRenderGraphBuilder for RenderGraph {
fn add_pbr_graph(&mut self, resources: &Resources) -> &mut Self {
self.add_system_node(node::LOCAL_TO_WORLD, UniformNode::<LocalToWorld>::new(true));
self.add_system_node(node::TRANSFORM, UniformNode::<Transform>::new(true));
self.add_system_node(
node::STANDARD_MATERIAL,
AssetUniformNode::<StandardMaterial>::new(true),
@ -50,7 +50,7 @@ impl ForwardPbrRenderGraphBuilder for RenderGraph {
// TODO: replace these with "autowire" groups
self.add_node_edge(node::STANDARD_MATERIAL, base_render_graph::node::MAIN_PASS)
.unwrap();
self.add_node_edge(node::LOCAL_TO_WORLD, base_render_graph::node::MAIN_PASS)
self.add_node_edge(node::TRANSFORM, base_render_graph::node::MAIN_PASS)
.unwrap();
self.add_node_edge(node::LIGHTS, base_render_graph::node::MAIN_PASS)
.unwrap();

1
crates/bevy_pbr/src/material.rs
View file

@ -4,7 +4,6 @@ use bevy_render::{texture::Texture, Color};
#[derive(Uniforms)]
pub struct StandardMaterial {
#[uniform(instance)]
pub albedo: Color,
#[uniform(shader_def)]
pub albedo_texture: Option<Handle<Texture>>,

6
crates/bevy_pbr/src/nodes/lights_node.rs
View file

@ -63,7 +63,7 @@ impl SystemNode for LightsNode {
render_resources: Res<RenderResources>,
// TODO: this write on RenderResourceAssignments will prevent this system from running in parallel with other systems that do the same
mut render_resource_assignments: ResMut<RenderResourceAssignments>,
query: &mut Query<(Read<Light>, Read<LocalToWorld>, Read<Translation>)>| {
query: &mut Query<(Read<Light>, Read<Transform>, Read<Translation>)>| {
if !lights_are_dirty {
return;
}
@ -117,11 +117,11 @@ impl SystemNode for LightsNode {
..Default::default()
},
&mut |data, _renderer| {
for ((light, local_to_world, translation), slot) in
for ((light, transform, translation), slot) in
query.iter(world).zip(data.chunks_exact_mut(size))
{
slot.copy_from_slice(
LightRaw::from(&light, &local_to_world.value, &translation).as_bytes(),
LightRaw::from(&light, &transform.value, &translation).as_bytes(),
);
}
},

20
crates/bevy_pbr/src/pipelines/forward/forward.vert
View file

@ -4,13 +4,6 @@ layout(location = 0) in vec3 Vertex_Position;
layout(location = 1) in vec3 Vertex_Normal;
layout(location = 2) in vec2 Vertex_Uv;
# ifdef INSTANCING
layout(location = 3) in vec4 I_Object_Model_0;
layout(location = 4) in vec4 I_Object_Model_1;
layout(location = 5) in vec4 I_Object_Model_2;
layout(location = 6) in vec4 I_Object_Model_3;
# endif
layout(location = 0) out vec3 v_Position;
layout(location = 1) out vec3 v_Normal;
layout(location = 2) out vec2 v_Uv;
@ -19,22 +12,11 @@ layout(set = 0, binding = 0) uniform Camera {
mat4 ViewProj;
};
# ifndef INSTANCING
layout(set = 1, binding = 0) uniform Object {
layout(set = 1, binding = 0) uniform Transform {
mat4 Model;
};
# endif
void main() {
# ifdef INSTANCING
mat4 Model = mat4(
I_Object_Model_0,
I_Object_Model_1,
I_Object_Model_2,
I_Object_Model_3
);
# endif
v_Normal = (Model * vec4(Vertex_Normal, 1.0)).xyz;
v_Normal = mat3(Model) * Vertex_Normal;
v_Position = (Model * vec4(Vertex_Position, 1.0)).xyz;

14
crates/bevy_render/src/entity.rs
View file

@ -4,14 +4,14 @@ use crate::{
};
use bevy_asset::Handle;
use bevy_derive::EntityArchetype;
use bevy_transform::components::{LocalToWorld, Rotation, Scale, Translation};
use bevy_transform::components::{Transform, Rotation, Scale, Translation};
#[derive(EntityArchetype, Default)]
pub struct MeshMaterialEntity<T: Default + Send + Sync + 'static> {
pub mesh: Handle<Mesh>,
pub material: Handle<T>,
pub renderable: Renderable,
pub local_to_world: LocalToWorld,
pub transform: Transform,
pub translation: Translation,
pub rotation: Rotation,
pub scale: Scale,
@ -21,7 +21,7 @@ pub struct MeshMaterialEntity<T: Default + Send + Sync + 'static> {
pub struct PerspectiveCameraEntity {
pub camera: Camera,
pub perspective_projection: PerspectiveProjection,
pub local_to_world: LocalToWorld,
pub transform: Transform,
pub translation: Translation,
pub rotation: Rotation,
}
@ -34,7 +34,7 @@ impl Default for PerspectiveCameraEntity {
..Default::default()
},
perspective_projection: Default::default(),
local_to_world: Default::default(),
transform: Default::default(),
translation: Default::default(),
rotation: Default::default(),
}
@ -45,7 +45,7 @@ impl Default for PerspectiveCameraEntity {
pub struct OrthographicCameraEntity {
pub camera: Camera,
pub orthographic_projection: OrthographicProjection,
pub local_to_world: LocalToWorld,
pub transform: Transform,
pub translation: Translation,
pub rotation: Rotation,
}
@ -61,7 +61,7 @@ impl OrthographicCameraEntity {
window_origin: WindowOrigin::BottomLeft,
..Default::default()
},
local_to_world: Default::default(),
transform: Default::default(),
translation: Default::default(),
rotation: Default::default(),
}
@ -76,7 +76,7 @@ impl Default for OrthographicCameraEntity {
..Default::default()
},
orthographic_projection: Default::default(),
local_to_world: Default::default(),
transform: Default::default(),
translation: Default::default(),
rotation: Default::default(),
}

2
crates/bevy_render/src/mesh.rs
View file

@ -430,7 +430,7 @@ pub fn mesh_resource_provider_system(resources: &mut Resources) -> Box<dyn Sched
#[cfg(test)]
mod tests {
use super::{Mesh, VertexAttribute};
use super::{Mesh, VertexAttribute, AsVertexBufferDescriptor};
use crate::{pipeline::state_descriptors::PrimitiveTopology, shader::Uniforms, Vertex};
use bevy_core::bytes::AsBytes;

6
crates/bevy_render/src/render_graph/nodes/camera_node.rs
View file

@ -52,7 +52,7 @@ impl SystemNode for CameraNode {
// PERF: this write on RenderResourceAssignments will prevent this system from running in parallel
// with other systems that do the same
mut render_resource_assignments: ResMut<RenderResourceAssignments>,
query: &mut Query<(Read<Camera>, Read<LocalToWorld>)>| {
query: &mut Query<(Read<Camera>, Read<Transform>)>| {
let render_resources = &render_resources.context;
if camera_buffer.is_none() {
let size = std::mem::size_of::<[[f32; 4]; 4]>();
@ -72,12 +72,12 @@ impl SystemNode for CameraNode {
camera_buffer = Some(buffer);
}
let matrix_size = std::mem::size_of::<[[f32; 4]; 4]>();
if let Some((camera, local_to_world)) = query
if let Some((camera, transform)) = query
.iter(world)
.find(|(camera, _)| camera.name.as_ref().map(|n| n.as_str()) == Some(&uniform_name))
{
let camera_matrix: [f32; 16] =
(camera.view_matrix * local_to_world.value).to_cols_array();
(camera.view_matrix * transform.value).to_cols_array();
let tmp_buffer = render_resources.create_buffer_mapped(
BufferInfo {

13
crates/bevy_render/src/shader/shader_reflect.rs
View file

@ -14,19 +14,6 @@ use spirv_reflect::{
ShaderModule,
};
use std::collections::HashSet;
// use rspirv::{binary::Parser, dr::Loader, lift::LiftContext};
// TODO: use rspirv when structured representation is ready. this way we can remove spirv_reflect, which is a non-rust dependency
// pub fn get_shader_layout(spirv_data: &[u32]) {
// let mut loader = Loader::new(); // You can use your own consumer here.
// {
// let p = Parser::new(spirv_data.as_bytes(), &mut loader);
// p.parse().unwrap();
// }
// let module = loader.module();
// let structured = LiftContext::convert(&module).unwrap();
// println!("{:?}", structured.types);
// }
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct ShaderLayout {

16
crates/bevy_render/src/shader/uniforms/local_to_world.rs → crates/bevy_render/src/shader/uniforms.rs
View file

@ -5,16 +5,16 @@ use crate::{
use bevy_asset::Handle;
use bevy_core::bytes::Bytes;
static LOCAL_TO_WORLD_FIELD_INFOS: &[FieldInfo] = &[FieldInfo {
name: "object",
uniform_name: "Object",
static TRANSFORM_FIELD_INFOS: &[FieldInfo] = &[FieldInfo {
name: "transform",
uniform_name: "Transform",
texture_name: "",
sampler_name: "",
}];
impl Uniforms for bevy_transform::prelude::LocalToWorld {
impl Uniforms for bevy_transform::prelude::Transform {
fn get_field_infos() -> &'static [FieldInfo] {
LOCAL_TO_WORLD_FIELD_INFOS
TRANSFORM_FIELD_INFOS
}
fn get_shader_defs(&self) -> Option<Vec<String>> {
@ -22,7 +22,7 @@ impl Uniforms for bevy_transform::prelude::LocalToWorld {
}
fn get_field_bind_type(&self, name: &str) -> Option<FieldBindType> {
match name {
"object" => self.value.get_bind_type(),
"transform" => self.value.get_bind_type(),
_ => None,
}
}
@ -32,13 +32,13 @@ impl Uniforms for bevy_transform::prelude::LocalToWorld {
fn write_uniform_bytes(&self, name: &str, buffer: &mut [u8]) {
match name {
"Object" => self.value.write_bytes(buffer),
"Transform" => self.value.write_bytes(buffer),
_ => {}
}
}
fn uniform_byte_len(&self, name: &str) -> usize {
match name {
"Object" => self.value.byte_len(),
"Transform" => self.value.byte_len(),
_ => 0,
}
}

3
crates/bevy_render/src/shader/uniforms/mod.rs
View file

@ -1,3 +0,0 @@
mod local_to_world;
pub use local_to_world::*;

4
crates/bevy_sprite/src/entity.rs
View file

@ -36,7 +36,7 @@ pub struct SpriteSheetEntity {
pub texture_atlas: Handle<TextureAtlas>,
pub renderable: Renderable,
pub mesh: Handle<Mesh>, // TODO: maybe abstract this out
// pub local_to_world: LocalToWorld,
// pub transform: Transform,
// pub translation: Translation,
// pub rotation: Rotation,
// pub scale: Scale,
@ -52,7 +52,7 @@ impl Default for SpriteSheetEntity {
..Default::default()
},
mesh: QUAD_HANDLE,
// local_to_world: Default::default(),
// transform: Default::default(),
// translation: Default::default(),
// rotation: Default::default(),
// scale: Default::default(),

6
crates/bevy_transform/benches/local_to_world.rs
View file

@ -3,15 +3,15 @@
// extern crate test;
// use legion::prelude::*;
// use bevy_transform::{local_to_world_system, prelude::*};
// use bevy_transform::{transform_system, prelude::*};
// use test::Bencher;
// #[bench]
// fn local_to_world_update_without_change(b: &mut Bencher) {
// fn transform_update_without_change(b: &mut Bencher) {
// let _ = env_logger::builder().is_test(true).try_init();
// let mut world = Universe::new().create_world();
// let system = local_to_world_system::build(&mut world);
// let system = transform_system::build(&mut world);
// let ltw = LocalToWorld::identity();
// let t = Translation::new(1.0, 2.0, 3.0);

4
crates/bevy_transform/examples/types_of_transforms.rs
View file

@ -85,10 +85,10 @@ fn main() {}
// // At this point all `LocalToWorld` components have correct values in them. Running the system
// // again will result in a short-circuit as only changed components are considered for update.
// let mut query = <Read<LocalToWorld>>::query();
// for (entity, local_to_world) in query.iter_entities(&mut world) {
// for (entity, transform) in query.iter_entities(&mut world) {
// println!(
// "Entity {} and a LocalToWorld matrix: {}",
// entity, *local_to_world
// entity, *transform
// );
// }
// }

8
crates/bevy_transform/src/components/local_to_parent.rs → crates/bevy_transform/src/components/local_transform.rs
View file

@ -5,21 +5,21 @@ use std::fmt;
#[derive(Shrinkwrap, Debug, PartialEq, Clone, Copy, Properties)]
#[shrinkwrap(mutable)]
pub struct LocalToParent(pub Mat4);
pub struct LocalTransform(pub Mat4);
impl LocalToParent {
impl LocalTransform {
pub fn identity() -> Self {
Self(Mat4::identity())
}
}
impl Default for LocalToParent {
impl Default for LocalTransform {
fn default() -> Self {
Self::identity()
}
}
impl fmt::Display for LocalToParent {
impl fmt::Display for LocalTransform {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", self.0)
}

8
crates/bevy_transform/src/components/mod.rs
View file

@ -1,6 +1,6 @@
mod children;
mod local_to_parent;
mod local_to_world;
mod local_transform;
mod transform;
mod non_uniform_scale;
mod parent;
mod rotation;
@ -8,8 +8,8 @@ mod scale;
mod translation;
pub use children::Children;
pub use local_to_parent::*;
pub use local_to_world::*;
pub use local_transform::*;
pub use transform::*;
pub use non_uniform_scale::*;
pub use parent::{Parent, PreviousParent};
pub use rotation::*;

14
crates/bevy_transform/src/components/local_to_world.rs → crates/bevy_transform/src/components/transform.rs
View file

@ -3,17 +3,17 @@ use bevy_property::Properties;
use std::fmt;
#[derive(Debug, PartialEq, Clone, Copy, Properties)]
pub struct LocalToWorld {
pub struct Transform {
pub value: Mat4,
pub sync: bool, // NOTE: this is hopefully a temporary measure to allow setting the transform directly.
// ideally setting the transform automatically propagates back to position / translation / rotation,
// but right now they are always considered the source of truth
}
impl LocalToWorld {
impl Transform {
#[inline(always)]
pub fn identity() -> Self {
LocalToWorld {
Transform {
value: Mat4::identity(),
sync: true,
}
@ -21,7 +21,7 @@ impl LocalToWorld {
#[inline(always)]
pub fn new(value: Mat4) -> Self {
LocalToWorld { value, sync: true }
Transform { value, sync: true }
}
/// This creates a new `LocalToWorld` transform with the `sync` field set to `false`.
@ -29,17 +29,17 @@ impl LocalToWorld {
/// This is helpful if you want to manually set the transform to a value (ex: Mat4::look_at_rh)
#[inline(always)]
pub fn new_sync_disabled(value: Mat4) -> Self {
LocalToWorld { value, sync: false }
Transform { value, sync: false }
}
}
impl Default for LocalToWorld {
impl Default for Transform {
fn default() -> Self {
Self::identity()
}
}
impl fmt::Display for LocalToWorld {
impl fmt::Display for Transform {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", self.value)
}

6
crates/bevy_transform/src/lib.rs
View file

@ -4,13 +4,13 @@ pub use legion as ecs;
pub mod components;
pub mod hierarchy_maintenance_system;
pub mod local_to_parent_system;
pub mod local_to_world_propagate_system;
pub mod local_to_world_system;
pub mod transform_propagate_system;
pub mod transform_system;
pub mod transform_system_bundle;
pub mod prelude {
pub use crate::{
components::*, hierarchy_maintenance_system, local_to_parent_system,
local_to_world_propagate_system, local_to_world_system, transform_system_bundle,
transform_propagate_system, transform_system, transform_system_bundle,
};
}

46
crates/bevy_transform/src/local_to_parent_system.rs
View file

@ -8,21 +8,21 @@ use crate::{
pub fn build(_: &mut World) -> Box<dyn Schedulable> {
SystemBuilder::<()>::new("LocalToParentUpdateSystem")
// Translation
.with_query(<(Write<LocalToParent>, Read<Translation>)>::query().filter(
.with_query(<(Write<LocalTransform>, Read<Translation>)>::query().filter(
!component::<Rotation>()
& !component::<Scale>()
& !component::<NonUniformScale>()
& (changed::<Translation>()),
))
// Rotation
.with_query(<(Write<LocalToParent>, Read<Rotation>)>::query().filter(
.with_query(<(Write<LocalTransform>, Read<Rotation>)>::query().filter(
!component::<Translation>()
& !component::<Scale>()
& !component::<NonUniformScale>()
& (changed::<Rotation>()),
))
// Scale
.with_query(<(Write<LocalToParent>, Read<Scale>)>::query().filter(
.with_query(<(Write<LocalTransform>, Read<Scale>)>::query().filter(
!component::<Translation>()
& !component::<Rotation>()
& !component::<NonUniformScale>()
@ -30,7 +30,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
))
// NonUniformScale
.with_query(
<(Write<LocalToParent>, Read<NonUniformScale>)>::query().filter(
<(Write<LocalTransform>, Read<NonUniformScale>)>::query().filter(
!component::<Translation>()
& !component::<Rotation>()
& !component::<Scale>()
@ -39,7 +39,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
)
// Translation + Rotation
.with_query(
<(Write<LocalToParent>, Read<Translation>, Read<Rotation>)>::query().filter(
<(Write<LocalTransform>, Read<Translation>, Read<Rotation>)>::query().filter(
!component::<Scale>()
& !component::<NonUniformScale>()
& (changed::<Translation>() | changed::<Rotation>()),
@ -47,7 +47,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
)
// Translation + Scale
.with_query(
<(Write<LocalToParent>, Read<Translation>, Read<Scale>)>::query().filter(
<(Write<LocalTransform>, Read<Translation>, Read<Scale>)>::query().filter(
!component::<Rotation>()
& !component::<NonUniformScale>()
& (changed::<Translation>() | changed::<Scale>()),
@ -56,7 +56,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
// Translation + NonUniformScale
.with_query(
<(
Write<LocalToParent>,
Write<LocalTransform>,
Read<Translation>,
Read<NonUniformScale>,
)>::query()
@ -68,7 +68,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
)
// Rotation + Scale
.with_query(
<(Write<LocalToParent>, Read<Rotation>, Read<Scale>)>::query().filter(
<(Write<LocalTransform>, Read<Rotation>, Read<Scale>)>::query().filter(
!component::<Translation>()
& !component::<NonUniformScale>()
& (changed::<Rotation>() | changed::<Scale>()),
@ -76,7 +76,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
)
// Rotation + NonUniformScale
.with_query(
<(Write<LocalToParent>, Read<Rotation>, Read<NonUniformScale>)>::query().filter(
<(Write<LocalTransform>, Read<Rotation>, Read<NonUniformScale>)>::query().filter(
!component::<Translation>()
& !component::<Scale>()
& (changed::<Rotation>() | changed::<NonUniformScale>()),
@ -85,7 +85,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
// Translation + Rotation + Scale
.with_query(
<(
Write<LocalToParent>,
Write<LocalTransform>,
Read<Translation>,
Read<Rotation>,
Read<Scale>,
@ -98,7 +98,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
// Translation + Rotation + NonUniformScale
.with_query(
<(
Write<LocalToParent>,
Write<LocalTransform>,
Read<Translation>,
Read<Rotation>,
Read<NonUniformScale>,
@ -111,38 +111,38 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
),
)
// Just to issue warnings: Scale + NonUniformScale
.with_query(<(Read<LocalToParent>, Read<Scale>, Read<NonUniformScale>)>::query())
.with_query(<(Read<LocalTransform>, Read<Scale>, Read<NonUniformScale>)>::query())
.build(move |_commands, world, _, queries| {
let (a, b, c, d, e, f, g, h, i, j, k, l) = queries;
rayon::scope(|s| {
s.spawn(|_| unsafe {
// Translation
a.for_each_unchecked(world, |(mut ltw, translation)| {
*ltw = LocalToParent(Mat4::from_translation(translation.0));
*ltw = LocalTransform(Mat4::from_translation(translation.0));
});
});
s.spawn(|_| unsafe {
// Rotation
b.for_each_unchecked(world, |(mut ltw, rotation)| {
*ltw = LocalToParent(Mat4::from_quat(rotation.0));
*ltw = LocalTransform(Mat4::from_quat(rotation.0));
});
});
s.spawn(|_| unsafe {
// Scale
c.for_each_unchecked(world, |(mut ltw, scale)| {
*ltw =
LocalToParent(Mat4::from_scale(Vec3::new(scale.0, scale.0, scale.0)));
LocalTransform(Mat4::from_scale(Vec3::new(scale.0, scale.0, scale.0)));
});
});
s.spawn(|_| unsafe {
// NonUniformScale
d.for_each_unchecked(world, |(mut ltw, non_uniform_scale)| {
*ltw = LocalToParent(Mat4::from_scale(non_uniform_scale.0));
*ltw = LocalTransform(Mat4::from_scale(non_uniform_scale.0));
});
// Translation + Rotation
e.for_each_unchecked(world, |(mut ltw, translation, rotation)| {
*ltw = LocalToParent(Mat4::from_rotation_translation(
*ltw = LocalTransform(Mat4::from_rotation_translation(
rotation.0,
translation.0,
));
@ -151,7 +151,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
s.spawn(|_| unsafe {
// Translation + Scale
f.for_each_unchecked(world, |(mut ltw, translation, scale)| {
*ltw = LocalToParent(Mat4::from_scale_rotation_translation(
*ltw = LocalTransform(Mat4::from_scale_rotation_translation(
Vec3::new(scale.0, scale.0, scale.0),
Quat::default(),
translation.0,
@ -160,7 +160,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
// Translation + NonUniformScale
g.for_each_unchecked(world, |(mut ltw, translation, non_uniform_scale)| {
*ltw = LocalToParent(Mat4::from_scale_rotation_translation(
*ltw = LocalTransform(Mat4::from_scale_rotation_translation(
non_uniform_scale.0,
Quat::default(),
translation.0,
@ -170,7 +170,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
s.spawn(|_| unsafe {
// Rotation + Scale
h.for_each_unchecked(world, |(mut ltw, rotation, scale)| {
*ltw = LocalToParent(Mat4::from_scale_rotation_translation(
*ltw = LocalTransform(Mat4::from_scale_rotation_translation(
Vec3::new(scale.0, scale.0, scale.0),
rotation.0,
Vec3::default(),
@ -180,7 +180,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
s.spawn(|_| unsafe {
// Rotation + NonUniformScale
i.for_each_unchecked(world, |(mut ltw, rotation, non_uniform_scale)| {
*ltw = LocalToParent(Mat4::from_scale_rotation_translation(
*ltw = LocalTransform(Mat4::from_scale_rotation_translation(
non_uniform_scale.0,
rotation.0,
Vec3::default(),
@ -190,7 +190,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
s.spawn(|_| unsafe {
// Translation + Rotation + Scale
j.for_each_unchecked(world, |(mut ltw, translation, rotation, scale)| {
*ltw = LocalToParent(Mat4::from_scale_rotation_translation(
*ltw = LocalTransform(Mat4::from_scale_rotation_translation(
Vec3::new(scale.0, scale.0, scale.0),
rotation.0,
translation.0,
@ -202,7 +202,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
k.for_each_unchecked(
world,
|(mut ltw, translation, rotation, non_uniform_scale)| {
*ltw = LocalToParent(Mat4::from_scale_rotation_translation(
*ltw = LocalTransform(Mat4::from_scale_rotation_translation(
non_uniform_scale.0,
rotation.0,
translation.0,

10
crates/bevy_transform/src/local_to_world_propagate_system.rs → crates/bevy_transform/src/transform_propagate_system.rs
View file

@ -8,9 +8,9 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
SystemBuilder::<()>::new("LocalToWorldPropagateSystem")
// Entities with a `Children` and `LocalToWorld` but NOT a `Parent` (ie those that are
// roots of a hierarchy).
.with_query(<(Read<Children>, Read<LocalToWorld>)>::query().filter(!component::<Parent>()))
.with_query(<(Read<Children>, Read<Transform>)>::query().filter(!component::<Parent>()))
.read_component::<Children>()
.read_component::<LocalToParent>()
.read_component::<LocalTransform>()
.build(move |commands, world, _resource, query| {
for (children, local_to_world) in query.iter(world) {
for child in children.0.iter() {
@ -21,14 +21,14 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
}
fn propagate_recursive(
parent_local_to_world: LocalToWorld,
parent_local_to_world: Transform,
world: &mut SubWorld,
entity: Entity,
commands: &mut CommandBuffer,
) {
log::trace!("Updating LocalToWorld for {}", entity);
let local_to_parent = {
if let Some(local_to_parent) = world.get_component::<LocalToParent>(entity) {
if let Some(local_to_parent) = world.get_component::<LocalTransform>(entity) {
*local_to_parent
} else {
log::warn!(
@ -39,7 +39,7 @@ fn propagate_recursive(
}
};
let new_local_to_world = LocalToWorld {
let new_local_to_world = Transform {
value: parent_local_to_world.value * local_to_parent.0,
sync: true,
};

46
crates/bevy_transform/src/local_to_world_system.rs → crates/bevy_transform/src/transform_system.rs
View file

@ -8,7 +8,7 @@ use crate::{
pub fn build(_: &mut World) -> Box<dyn Schedulable> {
SystemBuilder::<()>::new("LocalToWorldUpdateSystem")
// Translation
.with_query(<(Write<LocalToWorld>, Read<Translation>)>::query().filter(
.with_query(<(Write<Transform>, Read<Translation>)>::query().filter(
!component::<Parent>()
& !component::<Rotation>()
& !component::<Scale>()
@ -16,7 +16,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
& (changed::<Translation>()),
))
// Rotation
.with_query(<(Write<LocalToWorld>, Read<Rotation>)>::query().filter(
.with_query(<(Write<Transform>, Read<Rotation>)>::query().filter(
!component::<Parent>()
& !component::<Translation>()
& !component::<Scale>()
@ -24,7 +24,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
& (changed::<Rotation>()),
))
// Scale
.with_query(<(Write<LocalToWorld>, Read<Scale>)>::query().filter(
.with_query(<(Write<Transform>, Read<Scale>)>::query().filter(
!component::<Parent>()
& !component::<Translation>()
& !component::<Rotation>()
@ -33,7 +33,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
))
// NonUniformScale
.with_query(
<(Write<LocalToWorld>, Read<NonUniformScale>)>::query().filter(
<(Write<Transform>, Read<NonUniformScale>)>::query().filter(
!component::<Parent>()
& !component::<Translation>()
& !component::<Rotation>()
@ -43,7 +43,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
)
// Translation + Rotation
.with_query(
<(Write<LocalToWorld>, Read<Translation>, Read<Rotation>)>::query().filter(
<(Write<Transform>, Read<Translation>, Read<Rotation>)>::query().filter(
!component::<Parent>()
& !component::<Scale>()
& !component::<NonUniformScale>()
@ -52,7 +52,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
)
// Translation + Scale
.with_query(
<(Write<LocalToWorld>, Read<Translation>, Read<Scale>)>::query().filter(
<(Write<Transform>, Read<Translation>, Read<Scale>)>::query().filter(
!component::<Parent>()
& !component::<Rotation>()
& !component::<NonUniformScale>()
@ -62,7 +62,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
// Translation + NonUniformScale
.with_query(
<(
Write<LocalToWorld>,
Write<Transform>,
Read<Translation>,
Read<NonUniformScale>,
)>::query()
@ -75,7 +75,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
)
// Rotation + Scale
.with_query(
<(Write<LocalToWorld>, Read<Rotation>, Read<Scale>)>::query().filter(
<(Write<Transform>, Read<Rotation>, Read<Scale>)>::query().filter(
!component::<Parent>()
& !component::<Translation>()
& !component::<NonUniformScale>()
@ -84,7 +84,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
)
// Rotation + NonUniformScale
.with_query(
<(Write<LocalToWorld>, Read<Rotation>, Read<NonUniformScale>)>::query().filter(
<(Write<Transform>, Read<Rotation>, Read<NonUniformScale>)>::query().filter(
!component::<Parent>()
& !component::<Translation>()
& !component::<Scale>()
@ -94,7 +94,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
// Translation + Rotation + Scale
.with_query(
<(
Write<LocalToWorld>,
Write<Transform>,
Read<Translation>,
Read<Rotation>,
Read<Scale>,
@ -108,7 +108,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
// Translation + Rotation + NonUniformScale
.with_query(
<(
Write<LocalToWorld>,
Write<Transform>,
Read<Translation>,
Read<Rotation>,
Read<NonUniformScale>,
@ -123,7 +123,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
)
// Just to issue warnings: Scale + NonUniformScale
.with_query(
<(Read<LocalToWorld>, Read<Scale>, Read<NonUniformScale>)>::query()
<(Read<Transform>, Read<Scale>, Read<NonUniformScale>)>::query()
.filter(!component::<Parent>()),
)
.build(move |_commands, world, _, queries| {
@ -135,7 +135,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
if !ltw.sync {
return;
}
*ltw = LocalToWorld::new(Mat4::from_translation(translation.0));
*ltw = Transform::new(Mat4::from_translation(translation.0));
});
});
s.spawn(|_| unsafe {
@ -144,7 +144,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
if !ltw.sync {
return;
}
*ltw = LocalToWorld::new(Mat4::from_quat(rotation.0));
*ltw = Transform::new(Mat4::from_quat(rotation.0));
});
});
s.spawn(|_| unsafe {
@ -153,7 +153,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
if !ltw.sync {
return;
}
*ltw = LocalToWorld::new(Mat4::from_scale(Vec3::new(
*ltw = Transform::new(Mat4::from_scale(Vec3::new(
scale.0, scale.0, scale.0,
)));
});
@ -164,7 +164,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
if !ltw.sync {
return;
}
*ltw = LocalToWorld::new(Mat4::from_scale(non_uniform_scale.0));
*ltw = Transform::new(Mat4::from_scale(non_uniform_scale.0));
});
});
s.spawn(|_| unsafe {
@ -173,7 +173,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
if !ltw.sync {
return;
}
*ltw = LocalToWorld::new(Mat4::from_rotation_translation(
*ltw = Transform::new(Mat4::from_rotation_translation(
rotation.0,
translation.0,
));
@ -185,7 +185,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
if !ltw.sync {
return;
}
*ltw = LocalToWorld::new(Mat4::from_scale_rotation_translation(
*ltw = Transform::new(Mat4::from_scale_rotation_translation(
Vec3::new(scale.0, scale.0, scale.0),
Quat::default(),
translation.0,
@ -198,7 +198,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
if !ltw.sync {
return;
}
*ltw = LocalToWorld::new(Mat4::from_scale_rotation_translation(
*ltw = Transform::new(Mat4::from_scale_rotation_translation(
non_uniform_scale.0,
Quat::default(),
translation.0,
@ -211,7 +211,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
if !ltw.sync {
return;
}
*ltw = LocalToWorld::new(Mat4::from_scale_rotation_translation(
*ltw = Transform::new(Mat4::from_scale_rotation_translation(
Vec3::new(scale.0, scale.0, scale.0),
rotation.0,
Vec3::default(),
@ -224,7 +224,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
if !ltw.sync {
return;
}
*ltw = LocalToWorld::new(Mat4::from_scale_rotation_translation(
*ltw = Transform::new(Mat4::from_scale_rotation_translation(
non_uniform_scale.0,
rotation.0,
Vec3::default(),
@ -237,7 +237,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
if !ltw.sync {
return;
}
*ltw = LocalToWorld::new(Mat4::from_scale_rotation_translation(
*ltw = Transform::new(Mat4::from_scale_rotation_translation(
Vec3::new(scale.0, scale.0, scale.0),
rotation.0,
translation.0,
@ -252,7 +252,7 @@ pub fn build(_: &mut World) -> Box<dyn Schedulable> {
if !ltw.sync {
return;
}
*ltw = LocalToWorld::new(Mat4::from_scale_rotation_translation(
*ltw = Transform::new(Mat4::from_scale_rotation_translation(
non_uniform_scale.0,
rotation.0,
translation.0,

10
crates/bevy_transform/src/transform_system_bundle.rs
View file

@ -1,6 +1,6 @@
use crate::{
ecs::prelude::*, hierarchy_maintenance_system, local_to_parent_system,
local_to_world_propagate_system, local_to_world_system,
transform_propagate_system, transform_system,
};
pub fn build(world: &mut World) -> Vec<Box<dyn Schedulable>> {
@ -8,13 +8,13 @@ pub fn build(world: &mut World) -> Vec<Box<dyn Schedulable>> {
let mut hierarchy_maintenance_systems = hierarchy_maintenance_system::build(world);
let local_to_parent_system = local_to_parent_system::build(world);
let local_to_world_system = local_to_world_system::build(world);
let local_to_world_propagate_system = local_to_world_propagate_system::build(world);
let transform_system = transform_system::build(world);
let transform_propagate_system = transform_propagate_system::build(world);
all_systems.append(&mut hierarchy_maintenance_systems);
all_systems.push(local_to_parent_system);
all_systems.push(local_to_world_system);
all_systems.push(local_to_world_propagate_system);
all_systems.push(transform_system);
all_systems.push(transform_propagate_system);
all_systems
}

2
examples/3d/3d_scene.rs
View file

@ -50,7 +50,7 @@ fn setup(
})
// camera
.add_entity(PerspectiveCameraEntity {
local_to_world: LocalToWorld::new_sync_disabled(Mat4::look_at_rh(
transform: Transform::new_sync_disabled(Mat4::look_at_rh(
Vec3::new(3.0, 8.0, 5.0),
Vec3::new(0.0, 0.0, 0.0),
Vec3::new(0.0, 0.0, 1.0),

2
examples/3d/load_model.rs
View file

@ -39,7 +39,7 @@ fn setup(
})
// camera
.add_entity(PerspectiveCameraEntity {
local_to_world: LocalToWorld::new_sync_disabled(Mat4::look_at_rh(
transform: Transform::new_sync_disabled(Mat4::look_at_rh(
Vec3::new(2.0, -6.0, 2.0),
Vec3::new(0.0, 0.0, 0.0),
Vec3::new(0.0, 0.0, 1.0),

2
examples/3d/parenting.rs
View file

@ -53,7 +53,7 @@ fn setup(
})
// camera
.add_entity(PerspectiveCameraEntity {
local_to_world: LocalToWorld::new_sync_disabled(Mat4::look_at_rh(
transform: Transform::new_sync_disabled(Mat4::look_at_rh(
Vec3::new(5.0, 10.0, 10.0),
Vec3::new(0.0, 0.0, 0.0),
Vec3::new(0.0, 0.0, 1.0),

2
examples/3d/spawner.rs
View file

@ -63,7 +63,7 @@ fn setup(
})
// camera
.add_entity(PerspectiveCameraEntity {
local_to_world: LocalToWorld::new_sync_disabled(Mat4::look_at_rh(
transform: Transform::new_sync_disabled(Mat4::look_at_rh(
Vec3::new(3.0, 8.0, 5.0),
Vec3::new(0.0, 0.0, 0.0),
Vec3::new(0.0, 0.0, 1.0),

2
examples/3d/texture.rs
View file

@ -67,7 +67,7 @@ fn setup(
})
// camera
.add_entity(PerspectiveCameraEntity {
local_to_world: LocalToWorld::new_sync_disabled(Mat4::look_at_rh(
transform: Transform::new_sync_disabled(Mat4::look_at_rh(
Vec3::new(3.0, -8.0, 5.0),
Vec3::new(0.0, 0.0, 0.0),
Vec3::new(0.0, 0.0, 1.0),

2
examples/app/dynamic_plugin_loading/example_plugin/src/lib.rs
View file

@ -35,7 +35,7 @@ fn setup(
})
// camera
.add_entity(PerspectiveCameraEntity {
local_to_world: LocalToWorld::new_sync_disabled(Mat4::look_at_rh(
transform: Transform::new_sync_disabled(Mat4::look_at_rh(
Vec3::new(3.0, 8.0, 5.0),
Vec3::new(0.0, 0.0, 0.0),
Vec3::new(0.0, 0.0, 1.0),

2
examples/asset/asset_loading.rs
View file

@ -72,7 +72,7 @@ fn setup(
})
// camera
.add_entity(PerspectiveCameraEntity {
local_to_world: LocalToWorld::new_sync_disabled(Mat4::look_at_rh(
transform: Transform::new_sync_disabled(Mat4::look_at_rh(
Vec3::new(0.0, -10.0, 3.0),
Vec3::new(0.0, 0.0, 0.0),
Vec3::new(0.0, 0.0, 1.0),

2
examples/asset/hot_asset_reloading.rs
View file

@ -47,7 +47,7 @@ fn setup(
})
// camera
.add_entity(PerspectiveCameraEntity {
local_to_world: LocalToWorld::new_sync_disabled(Mat4::look_at_rh(
transform: Transform::new_sync_disabled(Mat4::look_at_rh(
Vec3::new(2.0, -6.0, 2.0),
Vec3::new(0.0, 0.0, 0.0),
Vec3::new(0.0, 0.0, 1.0),

4
examples/shader/shader_custom_material.rs
View file

@ -19,7 +19,7 @@ layout(location = 0) in vec3 Vertex_Position;
layout(set = 0, binding = 0) uniform Camera {
mat4 ViewProj;
};
layout(set = 1, binding = 0) uniform Object {
layout(set = 1, binding = 0) uniform Transform {
mat4 Model;
};
void main() {
@ -83,7 +83,7 @@ fn setup(
})
// camera
.add_entity(PerspectiveCameraEntity {
local_to_world: LocalToWorld::new_sync_disabled(Mat4::look_at_rh(
transform: Transform::new_sync_disabled(Mat4::look_at_rh(
Vec3::new(3.0, 8.0, 5.0),
Vec3::new(0.0, 0.0, 0.0),
Vec3::new(0.0, 0.0, 1.0),

4
examples/shader/shader_defs.rs
View file

@ -25,7 +25,7 @@ layout(location = 0) in vec3 Vertex_Position;
layout(set = 0, binding = 0) uniform Camera {
mat4 ViewProj;
};
layout(set = 1, binding = 0) uniform Object {
layout(set = 1, binding = 0) uniform Transform {
mat4 Model;
};
void main() {
@ -110,7 +110,7 @@ fn setup(
})
// camera
.add_entity(PerspectiveCameraEntity {
local_to_world: LocalToWorld::new_sync_disabled(Mat4::look_at_rh(
transform: Transform::new_sync_disabled(Mat4::look_at_rh(
Vec3::new(3.0, 8.0, 5.0),
Vec3::new(0.0, 0.0, 0.0),
Vec3::new(0.0, 0.0, 1.0),

2
examples/ui/ui.rs
View file

@ -50,7 +50,7 @@ fn setup(
// })
// // 3d camera
// .add_entity(CameraEntity {
// local_to_world: LocalToWorld(Mat4::look_at_rh(
// transform: Transform(Mat4::look_at_rh(
// Vec3::new(3.0, 8.0, 5.0),
// Vec3::new(0.0, 0.0, 0.0),
// Vec3::new(0.0, 0.0, 1.0),

2
src/prelude.rs
View file

@ -25,7 +25,7 @@ pub use crate::{
},
RenderGraph,
},
shader::{Shader, ShaderDefSuffixProvider, ShaderStage, ShaderStages},
shader::{Shader, ShaderDefSuffixProvider, ShaderStage, ShaderStages, Uniforms},
texture::Texture,
Camera, Color, ColorSource, OrthographicProjection, PerspectiveProjection, Renderable,
},