Merge pull request #340 from digama0/no-serialize-extras

Don't serialize `Extras`
gltf-rs · Jun 12, 2022 · b34c75d · b34c75d
2 parents 51d8f5c + 6a24643
commit b34c75d
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 0 deletions.
diff --git a/gltf-json/src/accessor.rs b/gltf-json/src/accessor.rs
@@ -107,6 +107,7 @@ pub mod sparse {
         /// Optional application specific data.
         #[serde(default)]
         #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+        #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
         pub extras: Extras,
     }
 
@@ -136,6 +137,7 @@ pub mod sparse {
         /// Optional application specific data.
         #[serde(default)]
         #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+        #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
         pub extras: Extras,
     }
 
@@ -161,6 +163,7 @@ pub mod sparse {
         /// Optional application specific data.
         #[serde(default)]
         #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+        #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
         pub extras: Extras,
     }
 }
@@ -194,6 +197,7 @@ pub struct Accessor {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 
     /// Specifies if the attribute is a scalar, vector, or matrix.

diff --git a/gltf-json/src/animation.rs b/gltf-json/src/animation.rs
@@ -62,6 +62,7 @@ pub struct Animation {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 
     /// An array of channels, each of which targets an animation's sampler at a
@@ -99,6 +100,7 @@ pub struct Channel {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 
@@ -112,6 +114,7 @@ pub struct Target {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 
     /// The index of the node to target.
@@ -132,6 +135,7 @@ pub struct Sampler {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 
     /// The index of an accessor containing keyframe input values, e.g., time.

diff --git a/gltf-json/src/asset.rs b/gltf-json/src/asset.rs
@@ -16,6 +16,7 @@ pub struct Asset {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 
     /// Tool that generated this glTF model.

diff --git a/gltf-json/src/buffer.rs b/gltf-json/src/buffer.rs
@@ -66,6 +66,7 @@ pub struct Buffer {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 
@@ -113,6 +114,7 @@ pub struct View {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 

diff --git a/gltf-json/src/camera.rs b/gltf-json/src/camera.rs
@@ -50,6 +50,7 @@ pub struct Camera {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 
@@ -75,6 +76,7 @@ pub struct Orthographic {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 
@@ -103,6 +105,7 @@ pub struct Perspective {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 

diff --git a/gltf-json/src/extensions/material.rs b/gltf-json/src/extensions/material.rs
@@ -119,6 +119,7 @@ pub struct PbrSpecularGlossiness {
 
     /// Optional application specific data.
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 
@@ -203,6 +204,7 @@ pub struct Transmission {
 
     /// Optional application specific data.
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 
@@ -234,6 +236,7 @@ pub struct Ior {
 
     /// Optional application specific data.
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 
@@ -309,6 +312,7 @@ pub struct Volume {
 
     /// Optional application specific data.
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 
@@ -366,5 +370,6 @@ pub struct Specular {
 
     /// Optional application specific data.
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
diff --git a/gltf-json/src/extensions/scene.rs b/gltf-json/src/extensions/scene.rs
@@ -83,6 +83,7 @@ pub mod khr_lights_punctual {
         /// Optional application specific data.
         #[serde(default)]
         #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+        #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
         pub extras: Extras,
 
         /// Intensity of the light source. `point` and `spot` lights use luminous intensity

diff --git a/gltf-json/src/extensions/texture.rs b/gltf-json/src/extensions/texture.rs
@@ -50,6 +50,7 @@ pub struct TextureTransform {
 
     /// Optional application specific data.
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 

diff --git a/gltf-json/src/image.rs b/gltf-json/src/image.rs
@@ -38,6 +38,7 @@ pub struct Image {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 

diff --git a/gltf-json/src/material.rs b/gltf-json/src/material.rs
@@ -124,6 +124,7 @@ pub struct Material {
 
     /// Optional application specific data.
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 
@@ -170,6 +171,7 @@ pub struct PbrMetallicRoughness {
 
     /// Optional application specific data.
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 
@@ -196,6 +198,7 @@ pub struct NormalTexture {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 
@@ -224,6 +227,7 @@ pub struct OcclusionTexture {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 

diff --git a/gltf-json/src/mesh.rs b/gltf-json/src/mesh.rs
@@ -80,6 +80,7 @@ pub struct Mesh {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 
     /// Optional user-defined name for this object.
@@ -109,6 +110,7 @@ pub struct Primitive {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 
     /// The index of the accessor that contains the indices.

diff --git a/gltf-json/src/root.rs b/gltf-json/src/root.rs
@@ -59,6 +59,7 @@ pub struct Root {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 
     /// Names of glTF extensions used somewhere in this asset.

diff --git a/gltf-json/src/scene.rs b/gltf-json/src/scene.rs
@@ -30,6 +30,7 @@ pub struct Node {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 
     /// 4x4 column-major transformation matrix.
@@ -87,6 +88,7 @@ pub struct Scene {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 
     /// Optional user-defined name for this object.

diff --git a/gltf-json/src/skin.rs b/gltf-json/src/skin.rs
@@ -12,6 +12,7 @@ pub struct Skin {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 
     /// The index of the accessor containing the 4x4 inverse-bind matrices.

diff --git a/gltf-json/src/texture.rs b/gltf-json/src/texture.rs
@@ -162,6 +162,7 @@ pub struct Sampler {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 
@@ -187,6 +188,7 @@ pub struct Texture {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }
 
@@ -207,6 +209,7 @@ pub struct Info {
     /// Optional application specific data.
     #[serde(default)]
     #[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
+    #[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
     pub extras: Extras,
 }