diff --git a/crates/renderide-shared/src/shared.rs b/crates/renderide-shared/src/shared.rs index 9228eac6d..fe469e940 100644 --- a/crates/renderide-shared/src/shared.rs +++ b/crates/renderide-shared/src/shared.rs @@ -1,5 +1,5 @@ // This file is automatically generated by SharedTypeGenerator. Please do not modify this file. -// Generated for FrooxEngine, Version=2026.5.27.1300, Culture=neutral, PublicKeyToken=null +// Generated for FrooxEngine, Version=2026.7.7.829, Culture=neutral, PublicKeyToken=null #![allow( missing_docs, @@ -3336,6 +3336,7 @@ pub struct OutputState { pub lock_cursor: bool, pub lock_cursor_position: Option, pub keyboard_input_active: bool, + pub composition_cursor_position: Option, pub vr: Option, } @@ -3344,6 +3345,7 @@ impl MemoryPackable for OutputState { packer.write_bool(self.lock_cursor); packer.write_option(self.lock_cursor_position.as_ref()); packer.write_bool(self.keyboard_input_active); + packer.write_option(self.composition_cursor_position.as_ref()); packer.write_object(self.vr.as_mut()); } fn unpack( @@ -3353,6 +3355,7 @@ impl MemoryPackable for OutputState { self.lock_cursor = unpacker.read_bool()?; self.lock_cursor_position = unpacker.read_option()?; self.keyboard_input_active = unpacker.read_bool()?; + self.composition_cursor_position = unpacker.read_option()?; self.vr = unpacker.read_object::()?; Ok(()) } @@ -4589,12 +4592,16 @@ impl MemoryPackable for MouseState { pub struct KeyboardState { pub type_delta: Option, pub held_keys: Vec, + pub composition_active: bool, + pub composition_text: Option, } impl MemoryPackable for KeyboardState { fn pack(&mut self, packer: &mut MemoryPacker<'_>) { packer.write_str(self.type_delta.as_deref()); packer.write_enum_value_list(Some(&self.held_keys)); + packer.write_bool(self.composition_active); + packer.write_str(self.composition_text.as_deref()); } fn unpack( &mut self, @@ -4602,6 +4609,8 @@ impl MemoryPackable for KeyboardState { ) -> Result<(), WireDecodeError> { self.type_delta = unpacker.read_str()?; self.held_keys = unpacker.read_enum_value_list()?; + self.composition_active = unpacker.read_bool()?; + self.composition_text = unpacker.read_str()?; Ok(()) } } @@ -4809,6 +4818,7 @@ impl MemoryPackable for TouchState { #[derive(Debug, Default, Clone)] pub struct DisplayState { pub display_index: i32, + pub monitor_handle: u64, pub resolution: IVec2, pub offset: IVec2, pub refresh_rate: f64, @@ -4820,6 +4830,7 @@ pub struct DisplayState { impl MemoryPackable for DisplayState { fn pack(&mut self, packer: &mut MemoryPacker<'_>) { packer.write(&self.display_index); + packer.write(&self.monitor_handle); packer.write(&self.resolution); packer.write(&self.offset); packer.write(&self.refresh_rate); @@ -4832,6 +4843,7 @@ impl MemoryPackable for DisplayState { unpacker: &mut MemoryUnpacker<'_, '_, P>, ) -> Result<(), WireDecodeError> { self.display_index = unpacker.read()?; + self.monitor_handle = unpacker.read()?; self.resolution = unpacker.read()?; self.offset = unpacker.read()?; self.refresh_rate = unpacker.read()?; diff --git a/crates/renderide/src/diagnostics/hud/input.rs b/crates/renderide/src/diagnostics/hud/input.rs index 6711ce5b1..620d9f282 100644 --- a/crates/renderide/src/diagnostics/hud/input.rs +++ b/crates/renderide/src/diagnostics/hud/input.rs @@ -376,6 +376,8 @@ mod sanitize_input_state_tests { keyboard: Some(KeyboardState { type_delta: Some("hi".into()), held_keys: vec![Key::A], + composition_active: false, + composition_text: None, }), window: None, vr: None, @@ -409,6 +411,8 @@ mod sanitize_input_state_tests { keyboard: Some(KeyboardState { type_delta: Some("x".into()), held_keys: vec![], + composition_active: false, + composition_text: None, }), window: None, vr: None, diff --git a/crates/renderide/src/frontend/input/accumulator/state_snapshot.rs b/crates/renderide/src/frontend/input/accumulator/state_snapshot.rs index 2bc81b638..799b74bc8 100644 --- a/crates/renderide/src/frontend/input/accumulator/state_snapshot.rs +++ b/crates/renderide/src/frontend/input/accumulator/state_snapshot.rs @@ -49,6 +49,8 @@ impl WindowInputAccumulator { let keyboard = Some(KeyboardState { type_delta, held_keys: self.held_keys.clone(), + composition_active: false, + composition_text: None, }); InputState { mouse: Some(mouse),