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

Merge pull request #9 from krakow10/fromstr

Browse source 
FromStrProp impls for Expanded Parsing Capability
This commit is contained in:
Robin Appelman 2025-02-14 20:52:10 +01:00 • committed by GitHub
commit fab5ba8b3b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 46 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/data/entity.rs
View file

@ -1,5 +1,5 @@
use crate::error::EntityParseError; use crate::error::EntityParseError;
use crate::Vector; use crate::{Angles, Vector};
use serde::de::{Error, Unexpected}; use serde::de::{Error, Unexpected};
use serde::{Deserialize, Deserializer}; use serde::{Deserialize, Deserializer};
use std::fmt; use std::fmt;
@ -133,7 +133,10 @@ impl FromStrProp for u16 {}
impl FromStrProp for f32 {} impl FromStrProp for f32 {}
impl FromStrProp for u32 {} impl FromStrProp for u32 {}
impl FromStrProp for i32 {} impl FromStrProp for i32 {}
impl FromStrProp for Color {}
impl FromStrProp for Angles {}
impl FromStrProp for Vector {} impl FromStrProp for Vector {}
impl FromStrProp for LightColor {}
impl<T: FromStrProp> EntityProp<'_> for T impl<T: FromStrProp> EntityProp<'_> for T
where where
@ -184,6 +187,21 @@ pub struct Color {
pub b: u8, pub b: u8,
} }
impl FromStr for Color {
type Err = EntityParseError;
fn from_str(s: &str) -> Result<Self, Self::Err> {
let mut floats = s.split(' ').map(u8::from_str);
let r = floats.next().ok_or(EntityParseError::ElementCount)??;
let g = floats.next().ok_or(EntityParseError::ElementCount)??;
let b = floats.next().ok_or(EntityParseError::ElementCount)??;
if floats.next().is_some() {
return Err(EntityParseError::ElementCount);
}
Ok(Self { r, g, b })
}
}
impl<'de> Deserialize<'de> for Color { impl<'de> Deserialize<'de> for Color {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where where
@ -213,28 +231,30 @@ impl FromStr for LightColor {
fn from_str(str: &str) -> Result<Self, Self::Err> { fn from_str(str: &str) -> Result<Self, Self::Err> {
let mut values = str.split(' '); let mut values = str.split(' ');
Ok(LightColor { let r = values
r: values .next()
.next() .ok_or(EntityParseError::ElementCount)?
.ok_or(EntityParseError::ElementCount)? .parse()
.parse() .map_err(EntityParseError::Int)?;
.map_err(EntityParseError::Int)?, let g = values
g: values .next()
.next() .ok_or(EntityParseError::ElementCount)?
.ok_or(EntityParseError::ElementCount)? .parse()
.parse() .map_err(EntityParseError::Int)?;
.map_err(EntityParseError::Int)?, let b = values
b: values .next()
.next() .ok_or(EntityParseError::ElementCount)?
.ok_or(EntityParseError::ElementCount)? .parse()
.parse() .map_err(EntityParseError::Int)?;
.map_err(EntityParseError::Int)?, let intensity = values
intensity: values .next()
.next() .ok_or(EntityParseError::ElementCount)?
.ok_or(EntityParseError::ElementCount)? .parse()
.parse() .map_err(EntityParseError::Int)?;
.map_err(EntityParseError::Int)?, if values.next().is_some() {
}) return Err(EntityParseError::ElementCount);
}
Ok(LightColor { r, g, b, intensity })
} }
} }

3
src/data/vector.rs
View file

@ -103,6 +103,9 @@ impl FromStr for Vector {
let x = floats.next().ok_or(EntityParseError::ElementCount)??; let x = floats.next().ok_or(EntityParseError::ElementCount)??;
let y = floats.next().ok_or(EntityParseError::ElementCount)??; let y = floats.next().ok_or(EntityParseError::ElementCount)??;
let z = floats.next().ok_or(EntityParseError::ElementCount)??; let z = floats.next().ok_or(EntityParseError::ElementCount)??;
if floats.next().is_some() {
return Err(EntityParseError::ElementCount);
}
Ok(Vector { x, y, z }) Ok(Vector { x, y, z })
} }
} }