From 55875fb4063a64de25ace0b5013a0f19bc86c19a Mon Sep 17 00:00:00 2001 From: Lizzy Fleckenstein Date: Wed, 15 Feb 2023 02:22:36 +0100 Subject: Implement NodeDefs and ItemDefs --- src/to_clt.rs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/to_clt.rs') diff --git a/src/to_clt.rs b/src/to_clt.rs index 9848dae..3792018 100644 --- a/src/to_clt.rs +++ b/src/to_clt.rs @@ -170,10 +170,7 @@ pub enum ToCltPkt { files: HashMap>, // name -> payload } = 56, #[mt(size = "u32", zlib)] - NodeDefs { - #[mt(const_before = "1u8")] // version - defs: Vec, - } = 58, + NodeDefs(#[mt(const_before = "1u8")] NodeDefs) = 58, AnnounceMedia { files: HashMap, // name -> base64 sha1 hash url: String, @@ -188,7 +185,7 @@ pub enum ToCltPkt { id: u32, name: String, gain: f32, - src_type: SoundSrcType, + source: SoundSource, pos: [f32; 3], src_obj_id: u16, #[serde(rename = "loop")] @@ -254,11 +251,11 @@ pub enum ToCltPkt { AddParticleSpawner { amount: u16, duration: f32, - pos: [[f32; 3]; 2], - vel: [[f32; 3]; 2], - acc: [[f32; 3]; 2], - expiration_time: [f32; 2], - size: [f32; 2], + pos: RangeInclusive<[f32; 3]>, + vel: RangeInclusive<[f32; 3]>, + acc: RangeInclusive<[f32; 3]>, + expiration_time: RangeInclusive, + size: RangeInclusive, collide: bool, #[mt(len = "u32")] texture: String, -- cgit v1.2.3