robin/vbsp
1
0
Fork 0
mirror of https://codeberg.org/icewind/vbsp.git synced 2026-06-03 10:44:07 +02:00
Code Issues Projects Releases Wiki Activity

deserialize bool with BoolVisitor

Browse source
This commit is contained in:
Quaternions 2025-02-24 14:08:15 -08:00
commit b7da004e7c
2 changed files with 61 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/data/entity.rs
View file

@ -274,8 +274,38 @@ impl<'de> Deserialize<'de> for LightColor {
} }
} }
struct BoolVisitor;
impl serde::de::Visitor<'_> for BoolVisitor {
type Value = bool;
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
write!(formatter, "bool value")
}
fn visit_i64<E>(self, v: i64) -> Result<Self::Value, E>
where
E: Error,
{
match v {
0 => Ok(false),
1 => Ok(true),
_ => Err(E::invalid_value(Unexpected::Signed(v), &"0 or 1")),
}
}
fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
where
E: Error,
{
match v {
"0" | "no" => Ok(false),
"1" | "yes" => Ok(true),
other => Err(E::invalid_value(Unexpected::Str(other), &"bool")),
}
}
}
#[allow(dead_code)] #[allow(dead_code)]
pub(crate) fn bool_from_int<'de, D: Deserializer<'de>>(deserializer: D) -> Result<bool, D::Error> { pub fn deserialize_bool<'de, D: Deserializer<'de>>(deserializer: D) -> Result<bool, D::Error> {
let int = u8::deserialize(deserializer)?; deserializer.deserialize_any(BoolVisitor)
Ok(int != 0)
} }

56
src/data/entity/basic.rs
View file

@ -1,4 +1,4 @@
use crate::bool_from_int; use crate::deserialize_bool;
use crate::{Angles, Color, LightColor, Vector}; use crate::{Angles, Color, LightColor, Vector};
use serde::Deserialize; use serde::Deserialize;
@ -150,10 +150,10 @@ pub struct LightSpot {
pub struct PropDynamic<'a> { pub struct PropDynamic<'a> {
pub angles: Angles, pub angles: Angles,
#[serde(rename = "disablereceiveshadows", default)] #[serde(rename = "disablereceiveshadows", default)]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub disable_receive_shadows: bool, pub disable_receive_shadows: bool,
#[serde(rename = "disableshadows", default)] #[serde(rename = "disableshadows", default)]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub disable_shadows: bool, pub disable_shadows: bool,
#[serde(rename = "modelscale")] #[serde(rename = "modelscale")]
pub scale: f32, pub scale: f32,
@ -171,10 +171,10 @@ pub struct PropDynamic<'a> {
pub struct PropDynamicOverride<'a> { pub struct PropDynamicOverride<'a> {
pub angles: Angles, pub angles: Angles,
#[serde(rename = "disablereceiveshadows", default)] #[serde(rename = "disablereceiveshadows", default)]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub disable_receive_shadows: bool, pub disable_receive_shadows: bool,
#[serde(rename = "disableshadows", default)] #[serde(rename = "disableshadows", default)]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub disable_shadows: bool, pub disable_shadows: bool,
#[serde(rename = "modelscale")] #[serde(rename = "modelscale")]
pub scale: f32, pub scale: f32,
@ -206,7 +206,7 @@ pub struct Spawn<'a> {
#[serde(rename = "controlpoint", default)] #[serde(rename = "controlpoint", default)]
pub control_point: Option<&'a str>, pub control_point: Option<&'a str>,
#[serde(rename = "startdisabled", default)] #[serde(rename = "startdisabled", default)]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub start_disabled: bool, pub start_disabled: bool,
#[serde(rename = "teamnum")] #[serde(rename = "teamnum")]
pub team: u8, pub team: u8,
@ -218,7 +218,7 @@ pub struct RespawnRoom<'a> {
pub target: Option<&'a str>, pub target: Option<&'a str>,
pub model: &'a str, pub model: &'a str,
#[serde(rename = "startdisabled", default)] #[serde(rename = "startdisabled", default)]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub start_disabled: bool, pub start_disabled: bool,
#[serde(rename = "teamnum")] #[serde(rename = "teamnum")]
pub team: u8, pub team: u8,
@ -240,7 +240,7 @@ pub struct Door<'a> {
pub target: &'a str, pub target: &'a str,
pub speed: f32, pub speed: f32,
#[serde(rename = "forceclosed", default)] #[serde(rename = "forceclosed", default)]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub force_closed: bool, pub force_closed: bool,
#[serde(rename = "movedir")] #[serde(rename = "movedir")]
pub move_direction: Vector, pub move_direction: Vector,
@ -278,7 +278,7 @@ pub struct WorldSpawn<'a> {
#[derive(Debug, Clone, Deserialize)] #[derive(Debug, Clone, Deserialize)]
pub struct ObserverPoint<'a> { pub struct ObserverPoint<'a> {
#[serde(rename = "startdisabled", default)] #[serde(rename = "startdisabled", default)]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub start_disabled: bool, pub start_disabled: bool,
pub angles: Angles, pub angles: Angles,
pub origin: Vector, pub origin: Vector,
@ -293,7 +293,7 @@ pub struct BrushEntity<'a> {
pub model: &'a str, pub model: &'a str,
pub origin: Vector, pub origin: Vector,
#[serde(rename = "startdisabled", default)] #[serde(rename = "startdisabled", default)]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub start_disabled: bool, pub start_disabled: bool,
#[serde(rename = "rendercolor")] #[serde(rename = "rendercolor")]
pub color: Color, pub color: Color,
@ -307,7 +307,7 @@ pub struct LightGlow {
#[serde(rename = "horizontalhlowsize")] #[serde(rename = "horizontalhlowsize")]
pub horizontal_size: u32, pub horizontal_size: u32,
#[serde(rename = "startdisabled", default)] #[serde(rename = "startdisabled", default)]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub start_disabled: bool, pub start_disabled: bool,
#[serde(rename = "rendercolor")] #[serde(rename = "rendercolor")]
pub color: Color, pub color: Color,
@ -337,7 +337,7 @@ pub struct TriggerMultiple<'a> {
pub filter: Option<&'a str>, pub filter: Option<&'a str>,
pub wait: Option<u32>, pub wait: Option<u32>,
#[serde(rename = "startdisabled", default)] #[serde(rename = "startdisabled", default)]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub start_disabled: bool, pub start_disabled: bool,
} }
@ -374,7 +374,7 @@ pub struct DustMotes<'a> {
pub origin: Vector, pub origin: Vector,
pub model: &'a str, pub model: &'a str,
#[serde(rename = "startdisabled", default)] #[serde(rename = "startdisabled", default)]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub start_disabled: bool, pub start_disabled: bool,
#[serde(rename = "color")] #[serde(rename = "color")]
pub color: Color, pub color: Color,
@ -392,9 +392,9 @@ pub struct DustMotes<'a> {
pub struct SkyCamera { pub struct SkyCamera {
pub origin: Vector, pub origin: Vector,
#[serde(rename = "fogenable")] #[serde(rename = "fogenable")]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub fog: bool, pub fog: bool,
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub use_angles: bool, pub use_angles: bool,
#[serde(rename = "fogstart")] #[serde(rename = "fogstart")]
pub fog_start: f32, pub fog_start: f32,
@ -439,7 +439,7 @@ pub struct RespawnVisualizer<'a> {
pub room_name: &'a str, pub room_name: &'a str,
#[serde(rename = "rendercolor")] #[serde(rename = "rendercolor")]
pub color: Color, pub color: Color,
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub solid_to_enemies: bool, pub solid_to_enemies: bool,
} }
@ -451,7 +451,7 @@ pub struct ParticleSystem<'a> {
pub target_name: Option<&'a str>, pub target_name: Option<&'a str>,
pub effect_name: &'a str, pub effect_name: &'a str,
#[serde(default)] #[serde(default)]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub start_active: bool, pub start_active: bool,
} }
@ -471,7 +471,7 @@ pub struct TeamControlPoint<'a> {
#[serde(default)] #[serde(default)]
pub point_default_owner: u8, pub point_default_owner: u8,
#[serde(rename = "startdisabled", default)] #[serde(rename = "startdisabled", default)]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub start_disabled: bool, pub start_disabled: bool,
} }
@ -482,7 +482,7 @@ pub struct AreaPortal {
#[serde(rename = "portalnumber")] #[serde(rename = "portalnumber")]
pub number: u8, pub number: u8,
#[serde(rename = "startopen")] #[serde(rename = "startopen")]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub start_open: bool, pub start_open: bool,
} }
@ -514,18 +514,18 @@ pub struct RopeKeyFrame<'a> {
#[serde(rename = "ropematerial")] #[serde(rename = "ropematerial")]
pub material: &'a str, pub material: &'a str,
#[serde(rename = "dangling")] #[serde(rename = "dangling")]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub dangling: bool, pub dangling: bool,
#[serde(rename = "barbed")] #[serde(rename = "barbed")]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub barbed: bool, pub barbed: bool,
#[serde(rename = "breakable")] #[serde(rename = "breakable")]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub breakable: bool, pub breakable: bool,
#[serde(rename = "texturescale")] #[serde(rename = "texturescale")]
pub texture_scale: f32, pub texture_scale: f32,
#[serde(rename = "collide")] #[serde(rename = "collide")]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub collide: bool, pub collide: bool,
#[serde(rename = "width")] #[serde(rename = "width")]
pub width: f32, pub width: f32,
@ -549,13 +549,13 @@ pub struct RopeMove<'a> {
#[serde(rename = "width")] #[serde(rename = "width")]
pub width: f32, pub width: f32,
#[serde(rename = "dangling")] #[serde(rename = "dangling")]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub dangling: bool, pub dangling: bool,
#[serde(rename = "barbed")] #[serde(rename = "barbed")]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub barbed: bool, pub barbed: bool,
#[serde(rename = "breakable")] #[serde(rename = "breakable")]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub breakable: bool, pub breakable: bool,
#[serde(rename = "positioninterpolator")] #[serde(rename = "positioninterpolator")]
pub interpolator: u8, pub interpolator: u8,
@ -575,7 +575,7 @@ pub struct GameRules<'a> {
#[serde(rename = "targetname", default)] #[serde(rename = "targetname", default)]
pub target_name: Option<&'a str>, pub target_name: Option<&'a str>,
#[serde(default)] #[serde(default)]
#[serde(deserialize_with = "bool_from_int")] #[serde(deserialize_with = "deserialize_bool")]
pub ctf_overtime: bool, pub ctf_overtime: bool,
#[serde(default)] #[serde(default)]
pub hud_type: u32, pub hud_type: u32,
@ -651,6 +651,6 @@ pub struct Occluder<'a> {
#[serde(rename = "occludernumber", default)] #[serde(rename = "occludernumber", default)]
pub occluder_number: u32, pub occluder_number: u32,
pub model: &'a str, pub model: &'a str,
#[serde(rename = "startactive", deserialize_with = "bool_from_int")] #[serde(rename = "startactive", deserialize_with = "deserialize_bool")]
pub start_active: bool, pub start_active: bool,
} }