From 5771cf3de6f3a5d9f9128015ce6b974e0d673e5b Mon Sep 17 00:00:00 2001
From: amiani <amianijohns@gmail.com>
Date: Thu, 27 Oct 2022 13:51:15 +0300
Subject: [PATCH] add serialize feature to bevy_transform

---
 crates/bevy_internal/Cargo.toml                          | 2 +-
 crates/bevy_math/Cargo.toml                              | 5 +++--
 crates/bevy_math/src/ray.rs                              | 4 ++--
 crates/bevy_math/src/rect.rs                             | 4 ++--
 crates/bevy_transform/Cargo.toml                         | 4 ++++
 crates/bevy_transform/src/components/global_transform.rs | 1 +
 crates/bevy_transform/src/components/transform.rs        | 1 +
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml
index e61f55f24e243..aac9a3e6b8b20 100644
--- a/crates/bevy_internal/Cargo.toml
+++ b/crates/bevy_internal/Cargo.toml
@@ -45,7 +45,7 @@ wav = ["bevy_audio/wav"]
 # Enable watching file system for asset hot reload
 filesystem_watcher = ["bevy_asset/filesystem_watcher"]
 
-serialize = ["bevy_input/serialize", "bevy_time/serialize", "bevy_window/serialize"]
+serialize = ["bevy_input/serialize", "bevy_time/serialize", "bevy_window/serialize", "bevy_transform/serialize"]
 
 # Display server protocol support (X11 is enabled by default)
 wayland = ["bevy_winit/wayland"]
diff --git a/crates/bevy_math/Cargo.toml b/crates/bevy_math/Cargo.toml
index c519bf85e1690..23633bd99439a 100644
--- a/crates/bevy_math/Cargo.toml
+++ b/crates/bevy_math/Cargo.toml
@@ -9,9 +9,10 @@ license = "MIT OR Apache-2.0"
 keywords = ["bevy"]
 
 [dependencies]
-glam = { version = "0.21", features = ["serde", "bytemuck"] }
-serde = "1"
+glam = { version = "0.21", features = ["bytemuck"] }
+serde = { version = "1", features = ["derive"], optional = true }
 
 [features]
 # Enable interoperation of glam types with mint-compatible libraries
 mint = ["glam/mint"]
+serialize = ["serde", "glam/serde"]
\ No newline at end of file
diff --git a/crates/bevy_math/src/ray.rs b/crates/bevy_math/src/ray.rs
index cd1ec2b552d45..bf0a8f47310d8 100644
--- a/crates/bevy_math/src/ray.rs
+++ b/crates/bevy_math/src/ray.rs
@@ -1,8 +1,8 @@
 use crate::Vec3;
-use serde::{Deserialize, Serialize};
 
 /// A ray is an infinite line starting at `origin`, going in `direction`.
-#[derive(Default, Clone, Copy, Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Default, Clone, Copy, Debug, PartialEq)]
+#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 pub struct Ray {
     /// The origin of the ray.
     pub origin: Vec3,
diff --git a/crates/bevy_math/src/rect.rs b/crates/bevy_math/src/rect.rs
index 2674dce65e637..080b0cd69d376 100644
--- a/crates/bevy_math/src/rect.rs
+++ b/crates/bevy_math/src/rect.rs
@@ -1,5 +1,4 @@
 use crate::Vec2;
-use serde::{Deserialize, Serialize};
 
 /// A rectangle defined by two opposite corners.
 ///
@@ -10,7 +9,8 @@ use serde::{Deserialize, Serialize};
 /// methods instead, which will ensure this invariant is met, unless you already have
 /// the minimum and maximum corners.
 #[repr(C)]
-#[derive(Default, Clone, Copy, Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Default, Clone, Copy, Debug, PartialEq)]
+#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 pub struct Rect {
     /// The minimum corner point of the rect.
     pub min: Vec2,
diff --git a/crates/bevy_transform/Cargo.toml b/crates/bevy_transform/Cargo.toml
index d1fe39cc64bb2..4576f93625458 100644
--- a/crates/bevy_transform/Cargo.toml
+++ b/crates/bevy_transform/Cargo.toml
@@ -8,6 +8,9 @@ repository = "https://github.com/bevyengine/bevy"
 license = "MIT OR Apache-2.0"
 keywords = ["bevy"]
 
+[features]
+serialize = ["serde"]
+
 [dependencies]
 # bevy
 bevy_app = { path = "../bevy_app", version = "0.9.0-dev" }
@@ -15,3 +18,4 @@ bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev", features = ["bevy_refl
 bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.9.0-dev" }
 bevy_math = { path = "../bevy_math", version = "0.9.0-dev" }
 bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] }
+serde = { version = "1", features = ["derive"], optional = true }
\ No newline at end of file
diff --git a/crates/bevy_transform/src/components/global_transform.rs b/crates/bevy_transform/src/components/global_transform.rs
index 085bf8224cab3..9abfa1413e825 100644
--- a/crates/bevy_transform/src/components/global_transform.rs
+++ b/crates/bevy_transform/src/components/global_transform.rs
@@ -32,6 +32,7 @@ use bevy_reflect::{std_traits::ReflectDefault, FromReflect, Reflect};
 ///
 /// [`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, FromReflect)]
+#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[reflect(Component, Default, PartialEq)]
 pub struct GlobalTransform(Affine3A);
 
diff --git a/crates/bevy_transform/src/components/transform.rs b/crates/bevy_transform/src/components/transform.rs
index 4800292d8041e..439f3c53a1e05 100644
--- a/crates/bevy_transform/src/components/transform.rs
+++ b/crates/bevy_transform/src/components/transform.rs
@@ -35,6 +35,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, FromReflect)]
+#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 #[reflect(Component, Default, PartialEq)]
 pub struct Transform {
     /// Position of the entity. In 2d, the last value of the `Vec3` is used for z-ordering.