Skip to content

Commit 15757f3

Browse files
committed
WIP serde support
Some tests working, still a few TODO's left
1 parent d688332 commit 15757f3

25 files changed

+1331
-2
lines changed

gdnative-core/Cargo.toml

Lines changed: 2 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"]
1616
nativescript = ["bitflags", "parking_lot"]
1717
type_tag_fallback = []
1818

@@ -24,6 +24,7 @@ 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 }
2728

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

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
@@ -573,6 +573,64 @@ where
573573
}
574574
}
575575

576+
#[cfg(feature = "serde")]
577+
pub(super) mod serde {
578+
use super::*;
579+
use ::serde::{
580+
de::{MapAccess, Visitor},
581+
ser::SerializeMap,
582+
Deserialize, Deserializer, Serialize, Serializer,
583+
};
584+
use std::fmt::Formatter;
585+
586+
impl Serialize for Dictionary {
587+
#[inline]
588+
fn serialize<S>(&self, ser: S) -> Result<S::Ok, S::Error>
589+
where
590+
S: Serializer,
591+
{
592+
let mut ser = ser.serialize_map(Some(self.len() as usize))?;
593+
for (key, value) in self.iter() {
594+
ser.serialize_entry(&key, &value)?
595+
}
596+
ser.end()
597+
}
598+
}
599+
600+
pub(in super::super) struct DictionaryVisitor;
601+
602+
impl<'de> Visitor<'de> for DictionaryVisitor {
603+
type Value = Dictionary<Unique>;
604+
605+
fn expecting(&self, formatter: &mut Formatter) -> fmt::Result {
606+
formatter.write_str("a Dictionary")
607+
}
608+
609+
fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
610+
where
611+
A: MapAccess<'de>,
612+
{
613+
let dict = Dictionary::new();
614+
while let Some((key, value)) = map.next_entry::<Variant, Variant>()? {
615+
dict.insert(key, value)
616+
}
617+
Ok(dict)
618+
}
619+
}
620+
621+
impl<'de, Access: ThreadAccess> Deserialize<'de> for Dictionary<Access> {
622+
#[inline]
623+
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
624+
where
625+
D: Deserializer<'de>,
626+
{
627+
deserializer
628+
.deserialize_map(DictionaryVisitor)
629+
.map(|dict| unsafe { dict.cast_access() })
630+
}
631+
}
632+
}
633+
576634
godot_test!(test_dictionary {
577635
use std::collections::HashSet;
578636

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+
}

gdnative-core/src/core_types/quat.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use super::IsEqualApprox;
22

33
#[derive(Copy, Clone, Debug, PartialEq)]
4+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
45
#[repr(C)]
56
pub struct Quat {
67
pub x: f32,

gdnative-core/src/core_types/rect2.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use super::Vector2;
22

3+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
34
#[repr(C)]
45
pub struct Rect2 {
56
pub position: Vector2,

gdnative-core/src/core_types/rid.rs

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,49 @@ impl PartialOrd for Rid {
8484
}
8585
}
8686
}
87+
88+
#[cfg(feature = "serde")]
89+
mod serde {
90+
use super::*;
91+
use ::serde::{
92+
de::{Error, Visitor},
93+
Deserialize, Deserializer, Serialize, Serializer,
94+
};
95+
use std::fmt::Formatter;
96+
97+
impl Serialize for Rid {
98+
#[inline]
99+
fn serialize<S>(&self, serializer: S) -> Result<<S as Serializer>::Ok, S::Error>
100+
where
101+
S: Serializer,
102+
{
103+
serializer.serialize_unit()
104+
}
105+
}
106+
107+
impl<'de> Deserialize<'de> for Rid {
108+
#[inline]
109+
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
110+
where
111+
D: Deserializer<'de>,
112+
{
113+
struct RidVisitor;
114+
impl<'de> Visitor<'de> for RidVisitor {
115+
type Value = Rid;
116+
117+
fn expecting(&self, formatter: &mut Formatter) -> std::fmt::Result {
118+
formatter.write_str("Unit as an RID placeholder")
119+
}
120+
121+
fn visit_unit<E>(self) -> Result<Self::Value, E>
122+
where
123+
E: Error,
124+
{
125+
Ok(Rid::new())
126+
}
127+
}
128+
deserializer.deserialize_unit(RidVisitor)?;
129+
Ok(Rid::new())
130+
}
131+
}
132+
}

gdnative-core/src/core_types/string.rs

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,55 @@ where
612612
}
613613
}
614614

615+
#[cfg(feature = "serde")]
616+
mod serde {
617+
use super::*;
618+
use ::serde::{
619+
de::{Error, Visitor},
620+
Deserialize, Deserializer, Serialize, Serializer,
621+
};
622+
use std::fmt::Formatter;
623+
624+
impl Serialize for GodotString {
625+
#[inline]
626+
fn serialize<S>(
627+
&self,
628+
serializer: S,
629+
) -> Result<<S as Serializer>::Ok, <S as Serializer>::Error>
630+
where
631+
S: Serializer,
632+
{
633+
serializer.serialize_str(&*self.to_string())
634+
}
635+
}
636+
637+
#[cfg(feature = "serde")]
638+
impl<'de> serde::Deserialize<'de> for GodotString {
639+
#[inline]
640+
fn deserialize<D>(deserializer: D) -> Result<Self, <D as Deserializer<'de>>::Error>
641+
where
642+
D: Deserializer<'de>,
643+
{
644+
struct GodotStringVisitor;
645+
impl<'de> Visitor<'de> for GodotStringVisitor {
646+
type Value = GodotString;
647+
648+
fn expecting(&self, formatter: &mut Formatter) -> fmt::Result {
649+
formatter.write_str("a GodotString")
650+
}
651+
652+
fn visit_str<E>(self, s: &str) -> Result<Self::Value, E>
653+
where
654+
E: Error,
655+
{
656+
Ok(GodotString::from(s))
657+
}
658+
}
659+
660+
deserializer.deserialize_str(GodotStringVisitor)
661+
}
662+
}
663+
}
615664
godot_test!(test_string {
616665
use crate::core_types::{GodotString, Variant, VariantType, ToVariant};
617666

gdnative-core/src/core_types/transform2d.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use super::Vector2;
22

3+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
34
#[repr(C)]
45
pub struct Transform2D {
56
pub x: Vector2,

gdnative-core/src/core_types/typed_array.rs

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,3 +483,63 @@ macros::impl_typed_array_element! {
483483
mod private {
484484
pub trait Sealed {}
485485
}
486+
487+
#[cfg(feature = "serde")]
488+
mod serde {
489+
use super::*;
490+
use ::serde::{
491+
de::{SeqAccess, Visitor},
492+
ser::SerializeSeq,
493+
Deserialize, Deserializer, Serialize, Serializer,
494+
};
495+
use std::fmt::Formatter;
496+
use std::marker::PhantomData;
497+
498+
impl<T: Serialize + Element> Serialize for TypedArray<T> {
499+
#[inline]
500+
fn serialize<S>(&self, ser: S) -> Result<<S as Serializer>::Ok, <S as Serializer>::Error>
501+
where
502+
S: Serializer,
503+
{
504+
let read = self.read();
505+
let mut ser = ser.serialize_seq(Some(read.len()))?;
506+
for e in read.iter() {
507+
ser.serialize_element(e)?
508+
}
509+
ser.end()
510+
}
511+
}
512+
513+
impl<'de, T: Deserialize<'de> + Element> Deserialize<'de> for TypedArray<T> {
514+
#[inline]
515+
fn deserialize<D>(deserializer: D) -> Result<Self, <D as Deserializer<'de>>::Error>
516+
where
517+
D: Deserializer<'de>,
518+
{
519+
struct TypedArrayVisitor<T>(PhantomData<T>);
520+
impl<'de, T: Deserialize<'de> + Element> Visitor<'de> for TypedArrayVisitor<T> {
521+
type Value = TypedArray<T>;
522+
523+
fn expecting(&self, formatter: &mut Formatter) -> fmt::Result {
524+
formatter.write_str(std::any::type_name::<Self::Value>())
525+
}
526+
527+
fn visit_seq<A>(
528+
self,
529+
mut seq: A,
530+
) -> Result<Self::Value, <A as SeqAccess<'de>>::Error>
531+
where
532+
A: SeqAccess<'de>,
533+
{
534+
let mut vec = seq.size_hint().map_or_else(Vec::new, Vec::with_capacity);
535+
while let Some(val) = seq.next_element::<T>()? {
536+
vec.push(val);
537+
}
538+
Ok(Self::Value::from_vec(vec))
539+
}
540+
}
541+
542+
deserializer.deserialize_seq(TypedArrayVisitor::<T>(PhantomData))
543+
}
544+
}
545+
}

0 commit comments

Comments
 (0)