Skip to content

Commit af4e0d7

Browse files
committed
WIP serde support
rebased on #746 & #748 and squashed. Still writing more tests & awaiting final status on those PR's
1 parent 472cfcd commit af4e0d7

File tree

23 files changed

+1077
-2
lines changed

23 files changed

+1077
-2
lines changed

gdnative-core/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ edition = "2018"
1212

1313
[features]
1414
default = ["nativescript"]
15-
gd_test = []
15+
gd_test = ["serde", "ron", "serde_json", ]
1616
nativescript = ["bitflags", "parking_lot"]
1717
type_tag_fallback = []
1818

@@ -24,6 +24,9 @@ glam = "0.16.0"
2424
indexmap = "1.6.0"
2525
ahash = "0.7.0"
2626
once_cell = "1.7.2"
27+
serde = { version = "1", features = ["derive"], optional = true }
28+
ron = { version = "0.6.4", optional = true }
29+
serde_json = { version = "1.0.64", optional = true }
2730

2831
gdnative-impl-proc-macros = { path = "../impl/proc_macros", version = "=0.9.3" }
2932

gdnative-core/src/core_types/color.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use crate::core_types::GodotString;
66
/// RGBA color with 32 bits floating point components.
77
#[repr(C)]
88
#[derive(Copy, Clone, Debug, PartialEq)]
9+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
910
pub struct Color {
1011
pub r: f32,
1112
pub g: f32,

gdnative-core/src/core_types/dictionary.rs

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -597,6 +597,64 @@ where
597597
}
598598
}
599599

600+
#[cfg(feature = "serde")]
601+
pub(super) mod serde {
602+
use super::*;
603+
use ::serde::{
604+
de::{MapAccess, Visitor},
605+
ser::SerializeMap,
606+
Deserialize, Deserializer, Serialize, Serializer,
607+
};
608+
use std::fmt::Formatter;
609+
610+
impl Serialize for Dictionary {
611+
#[inline]
612+
fn serialize<S>(&self, ser: S) -> Result<S::Ok, S::Error>
613+
where
614+
S: Serializer,
615+
{
616+
let mut ser = ser.serialize_map(Some(self.len() as usize))?;
617+
for (key, value) in self.iter() {
618+
ser.serialize_entry(&key, &value)?
619+
}
620+
ser.end()
621+
}
622+
}
623+
624+
pub(in super::super) struct DictionaryVisitor;
625+
626+
impl<'de> Visitor<'de> for DictionaryVisitor {
627+
type Value = Dictionary<Unique>;
628+
629+
fn expecting(&self, formatter: &mut Formatter) -> fmt::Result {
630+
formatter.write_str("a Dictionary")
631+
}
632+
633+
fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
634+
where
635+
A: MapAccess<'de>,
636+
{
637+
let dict = Dictionary::new();
638+
while let Some((key, value)) = map.next_entry::<Variant, Variant>()? {
639+
dict.insert(key, value)
640+
}
641+
Ok(dict)
642+
}
643+
}
644+
645+
impl<'de, Access: ThreadAccess> Deserialize<'de> for Dictionary<Access> {
646+
#[inline]
647+
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
648+
where
649+
D: Deserializer<'de>,
650+
{
651+
deserializer
652+
.deserialize_map(DictionaryVisitor)
653+
.map(|dict| unsafe { dict.cast_access() })
654+
}
655+
}
656+
}
657+
600658
godot_test!(test_dictionary {
601659
use std::collections::HashSet;
602660

gdnative-core/src/core_types/error.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use crate::sys;
22

33
/// Error codes used in various Godot APIs.
44
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
5+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
56
#[repr(u32)]
67
pub enum GodotError {
78
Failed = sys::godot_error_GODOT_FAILED as u32,

gdnative-core/src/core_types/geom/aabb.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use crate::core_types::Vector3;
33
/// Axis-aligned bounding box.
44
#[repr(C)]
55
#[derive(Copy, Clone, Debug, PartialEq)]
6+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
67
pub struct Aabb {
78
pub position: Vector3,
89
pub size: Vector3,

gdnative-core/src/core_types/geom/basis.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use core::ops::Mul;
44
/// A 3x3 matrix.
55
#[repr(C)]
66
#[derive(Copy, Clone, Debug, PartialEq)]
7+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
78
pub struct Basis {
89
pub elements: [Vector3; 3],
910
}

gdnative-core/src/core_types/geom/plane.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use crate::core_types::{IsEqualApprox, Vector3};
33
/// Plane in hessian form.
44
#[repr(C)]
55
#[derive(Copy, Clone, Debug, PartialEq)]
6+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
67
pub struct Plane {
78
pub normal: Vector3,
89
pub d: f32,

gdnative-core/src/core_types/geom/transform.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use crate::core_types::{Basis, Vector3};
33
/// 3D Transformation (3x4 matrix) Using basis + origin representation.
44
#[repr(C)]
55
#[derive(Copy, Clone, Debug, PartialEq)]
6+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
67
pub struct Transform {
78
/// The basis is a matrix containing 3 Vector3 as its columns: X axis, Y axis, and Z axis.
89
/// These vectors can be interpreted as the basis vectors of local coordinate system

gdnative-core/src/core_types/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pub use rid::*;
4343
pub use string::*;
4444
pub use string_array::*;
4545
pub use transform2d::*;
46-
pub use typed_array::TypedArray;
46+
pub use typed_array::{Element, TypedArray};
4747
pub use variant::*;
4848
pub use variant_array::*;
4949
pub use vector2::*;

gdnative-core/src/core_types/node_path.rs

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,3 +176,60 @@ impl fmt::Debug for NodePath {
176176
write!(f, "NodePath({})", self.to_string())
177177
}
178178
}
179+
180+
#[cfg(feature = "serde")]
181+
mod serde {
182+
use super::*;
183+
use ::serde::{
184+
de::{Error, Visitor},
185+
Deserialize, Deserializer, Serialize, Serializer,
186+
};
187+
use std::fmt::Formatter;
188+
189+
impl Serialize for NodePath {
190+
#[inline]
191+
fn serialize<S>(&self, ser: S) -> Result<<S as Serializer>::Ok, <S as Serializer>::Error>
192+
where
193+
S: Serializer,
194+
{
195+
ser.serialize_newtype_struct("NodePath", &*self.to_string())
196+
}
197+
}
198+
199+
impl<'de> Deserialize<'de> for NodePath {
200+
#[inline]
201+
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
202+
where
203+
D: Deserializer<'de>,
204+
{
205+
struct NodePathVisitor;
206+
207+
impl<'de> Visitor<'de> for NodePathVisitor {
208+
type Value = NodePath;
209+
210+
fn expecting(&self, formatter: &mut Formatter) -> fmt::Result {
211+
formatter.write_str("a NodePath")
212+
}
213+
214+
fn visit_str<E>(self, s: &str) -> Result<Self::Value, E>
215+
where
216+
E: Error,
217+
{
218+
Ok(NodePath::from_str(s))
219+
}
220+
221+
fn visit_newtype_struct<D>(
222+
self,
223+
deserializer: D,
224+
) -> Result<Self::Value, <D as Deserializer<'de>>::Error>
225+
where
226+
D: Deserializer<'de>,
227+
{
228+
deserializer.deserialize_str(self)
229+
}
230+
}
231+
232+
deserializer.deserialize_newtype_struct("NodePath", NodePathVisitor)
233+
}
234+
}
235+
}

0 commit comments

Comments
 (0)