From 1f61d32877edcc0f5def63f83d94bdfbcc7e61ac Mon Sep 17 00:00:00 2001 From: Nova Date: Tue, 8 Nov 2022 06:10:03 -0500 Subject: [PATCH] refactor: use snake case for method names --- src/nodes/data.rs | 10 +++++----- src/nodes/drawable/mod.rs | 6 +++--- src/nodes/drawable/model.rs | 2 +- src/nodes/drawable/text.rs | 4 ++-- src/nodes/fields/box.rs | 2 +- src/nodes/fields/cylinder.rs | 2 +- src/nodes/fields/mod.rs | 6 +++--- src/nodes/fields/sphere.rs | 2 +- src/nodes/input/mod.rs | 6 +++--- src/nodes/input/tip.rs | 2 +- src/nodes/items/environment.rs | 2 +- src/nodes/items/mod.rs | 10 +++++----- src/nodes/root.rs | 8 ++++---- src/nodes/spatial/mod.rs | 14 +++++++------- src/nodes/startup.rs | 6 +++--- src/wayland/panel_item.rs | 23 +++++++++++++---------- 16 files changed, 54 insertions(+), 51 deletions(-) diff --git a/src/nodes/data.rs b/src/nodes/data.rs index 45293db..21f845b 100644 --- a/src/nodes/data.rs +++ b/src/nodes/data.rs @@ -70,7 +70,7 @@ impl PulseSender { }; let sender = PULSE_SENDER_REGISTRY.add(sender); let _ = node.pulse_sender.set(sender); - node.add_local_signal("sendData", PulseSender::send_data_flex); + node.add_local_signal("send_data", PulseSender::send_data_flex); let sender = node.pulse_sender.get().unwrap(); for receiver in PULSE_RECEIVER_REGISTRY.get_valid_contents() { sender.handle_new_receiver(&receiver); @@ -145,12 +145,12 @@ impl PulseSender { rotation: rotation.into(), }; - let _ = tx_node.send_remote_signal("newReceiver", &serialize(info).unwrap()); + let _ = tx_node.send_remote_signal("new_receiver", &serialize(info).unwrap()); } fn handle_drop_receiver(&self, uid: String) { if let Some(tx_node) = self.node.upgrade() { - let _ = tx_node.send_remote_signal("dropReceiver", &serialize(&uid).unwrap()); + let _ = tx_node.send_remote_signal("drop_receiver", &serialize(&uid).unwrap()); } self.aliases.remove(&uid); self.aliases.remove(&(uid + "-field")); @@ -230,8 +230,8 @@ impl Drop for PulseReceiver { pub fn create_interface(client: &Arc) { let node = Node::create(client, "", "data", false); - node.add_local_signal("createPulseSender", create_pulse_sender_flex); - node.add_local_signal("createPulseReceiver", create_pulse_receiver_flex); + node.add_local_signal("create_pulse_sender", create_pulse_sender_flex); + node.add_local_signal("create_pulse_receiver", create_pulse_receiver_flex); node.add_to_scenegraph(); } diff --git a/src/nodes/drawable/mod.rs b/src/nodes/drawable/mod.rs index 5a8963a..8c19d1d 100644 --- a/src/nodes/drawable/mod.rs +++ b/src/nodes/drawable/mod.rs @@ -12,9 +12,9 @@ use stereokit::{lifecycle::DrawContext, texture::Texture, StereoKit}; pub fn create_interface(client: &Arc) { let node = Node::create(client, "", "drawable", false); - node.add_local_signal("createModel", model::create_flex); - node.add_local_signal("createText", text::create_flex); - node.add_local_signal("setSkyFile", set_sky_file_flex); + node.add_local_signal("create_model", model::create_flex); + node.add_local_signal("create_text", text::create_flex); + node.add_local_signal("set_sky_file", set_sky_file_flex); node.add_to_scenegraph(); } diff --git a/src/nodes/drawable/model.rs b/src/nodes/drawable/model.rs index e03da50..6e290d0 100644 --- a/src/nodes/drawable/model.rs +++ b/src/nodes/drawable/model.rs @@ -58,7 +58,7 @@ impl Model { pending_material_replacements: Mutex::new(FxHashMap::default()), sk_model: OnceCell::new(), }; - node.add_local_signal("setMaterialParameter", Model::set_material_parameter); + node.add_local_signal("set_material_parameter", Model::set_material_parameter); let model_arc = MODEL_REGISTRY.add(model); let _ = model_arc.pending_model_path.set( model_arc diff --git a/src/nodes/drawable/text.rs b/src/nodes/drawable/text.rs index 6344912..3cd6f99 100644 --- a/src/nodes/drawable/text.rs +++ b/src/nodes/drawable/text.rs @@ -82,8 +82,8 @@ impl Text { color, }), }); - node.add_local_signal("setCharacterHeight", Text::set_character_height_flex); - node.add_local_signal("setText", Text::set_text_flex); + node.add_local_signal("set_character_height", Text::set_character_height_flex); + node.add_local_signal("set_text", Text::set_text_flex); let _ = node.text.set(text.clone()); Ok(text) diff --git a/src/nodes/fields/box.rs b/src/nodes/fields/box.rs index 1455319..c0cfe1d 100644 --- a/src/nodes/fields/box.rs +++ b/src/nodes/fields/box.rs @@ -30,7 +30,7 @@ impl BoxField { size: Mutex::new(size.into()), }; box_field.add_field_methods(node); - node.add_local_signal("setSize", BoxField::set_size_flex); + node.add_local_signal("set_size", BoxField::set_size_flex); let _ = node.field.set(Arc::new(Field::Box(box_field))); Ok(()) } diff --git a/src/nodes/fields/cylinder.rs b/src/nodes/fields/cylinder.rs index d41d68c..96c03d9 100644 --- a/src/nodes/fields/cylinder.rs +++ b/src/nodes/fields/cylinder.rs @@ -33,7 +33,7 @@ impl CylinderField { radius: AtomicF32::new(radius.abs()), }; cylinder_field.add_field_methods(node); - node.add_local_signal("setSize", CylinderField::set_size_flex); + node.add_local_signal("set_size", CylinderField::set_size_flex); let _ = node.field.set(Arc::new(Field::Cylinder(cylinder_field))); Ok(()) } diff --git a/src/nodes/fields/mod.rs b/src/nodes/fields/mod.rs index dd3e5bf..d81b875 100644 --- a/src/nodes/fields/mod.rs +++ b/src/nodes/fields/mod.rs @@ -215,9 +215,9 @@ impl Deref for Field { pub fn create_interface(client: &Arc) { let node = Node::create(client, "", "field", false); - node.add_local_signal("createBoxField", create_box_field_flex); - node.add_local_signal("createCylinderField", create_cylinder_field_flex); - node.add_local_signal("createSphereField", create_sphere_field_flex); + node.add_local_signal("create_box_field", create_box_field_flex); + node.add_local_signal("create_cylinder_field", create_cylinder_field_flex); + node.add_local_signal("create_sphere_field", create_sphere_field_flex); node.add_to_scenegraph(); } diff --git a/src/nodes/fields/sphere.rs b/src/nodes/fields/sphere.rs index 5e972db..e0e22aa 100644 --- a/src/nodes/fields/sphere.rs +++ b/src/nodes/fields/sphere.rs @@ -30,7 +30,7 @@ impl SphereField { radius: AtomicF32::new(radius), }; sphere_field.add_field_methods(node); - node.add_local_signal("setRadius", SphereField::set_radius_flex); + node.add_local_signal("set_radius", SphereField::set_radius_flex); let _ = node.field.set(Arc::new(Field::Sphere(sphere_field))); Ok(()) } diff --git a/src/nodes/input/mod.rs b/src/nodes/input/mod.rs index 6d0866d..fc41c89 100644 --- a/src/nodes/input/mod.rs +++ b/src/nodes/input/mod.rs @@ -83,7 +83,7 @@ impl InputMethod { "Internal: Node does not have a spatial attached!" ); - node.add_local_signal("setDatamap", InputMethod::set_datamap); + node.add_local_signal("set_datamap", InputMethod::set_datamap); let method = InputMethod { uid: node.uid.clone(), @@ -210,8 +210,8 @@ impl Drop for InputHandler { pub fn create_interface(client: &Arc) { let node = Node::create(client, "", "input", false); - node.add_local_signal("createInputHandler", create_input_handler_flex); - node.add_local_signal("createInputMethodTip", tip::create_tip_flex); + node.add_local_signal("create_input_handler", create_input_handler_flex); + node.add_local_signal("create_input_method_tip", tip::create_tip_flex); node.add_to_scenegraph(); } diff --git a/src/nodes/input/tip.rs b/src/nodes/input/tip.rs index 0bcefdf..eea929b 100644 --- a/src/nodes/input/tip.rs +++ b/src/nodes/input/tip.rs @@ -65,6 +65,6 @@ pub fn create_tip_flex(_node: &Node, calling_client: Arc, data: &[u8]) - }), info.datamap.and_then(|datamap| Datamap::new(datamap).ok()), )?; - node.add_local_signal("setRadius", Tip::set_radius); + node.add_local_signal("set_radius", Tip::set_radius); Ok(()) } diff --git a/src/nodes/items/environment.rs b/src/nodes/items/environment.rs index 839e8e2..86e3ca9 100644 --- a/src/nodes/items/environment.rs +++ b/src/nodes/items/environment.rs @@ -24,7 +24,7 @@ impl EnvironmentItem { &ITEM_TYPE_INFO_ENVIRONMENT, ItemType::Environment(EnvironmentItem { path }), ); - node.add_local_method("getPath", EnvironmentItem::get_path_flex); + node.add_local_method("get_path", EnvironmentItem::get_path_flex); } fn get_path_flex(node: &Node, _calling_client: Arc, _data: &[u8]) -> Result> { diff --git a/src/nodes/items/mod.rs b/src/nodes/items/mod.rs index b885131..d40034c 100644 --- a/src/nodes/items/mod.rs +++ b/src/nodes/items/mod.rs @@ -103,7 +103,7 @@ impl Item { type_info: &'static TypeInfo, specialization: ItemType, ) -> Arc { - node.add_local_signal("captureInto", capture_into_flex); + node.add_local_signal("capture_into", capture_into_flex); let item = Item { node: Arc::downgrade(node), uid: nanoid!(), @@ -323,16 +323,16 @@ impl Drop for ItemAcceptor { pub fn create_interface(client: &Arc) { let node = Node::create(client, "", "item", false); node.add_local_signal( - "createEnvironmentItem", + "create_environment_item_", environment::create_environment_item_flex, ); node.add_local_signal( - "registerEnvironmentItemUI", + "register_environment_item_ui", environment::register_environment_item_ui_flex, ); - node.add_local_signal("registerPanelItemUI", register_panel_item_ui_flex); + node.add_local_signal("register_panel_item_ui", register_panel_item_ui_flex); node.add_local_signal( - "createEnvironmentItemAcceptor", + "create_environment_item_acceptor", environment::create_environment_item_acceptor_flex, ); node.add_to_scenegraph(); diff --git a/src/nodes/root.rs b/src/nodes/root.rs index 31e91db..9a7d8fb 100644 --- a/src/nodes/root.rs +++ b/src/nodes/root.rs @@ -19,9 +19,9 @@ pub struct Root { impl Root { pub fn create(client: &Arc) -> Arc { let node = Node::create(client, "", "", false); - node.add_local_signal("applyDesktopStartupID", Root::apply_desktop_startup_id); - node.add_local_signal("subscribeLogicStep", Root::subscribe_logic_step); - node.add_local_signal("setBasePrefixes", Root::set_base_prefixes); + node.add_local_signal("apply_desktop_startup_id", Root::apply_desktop_startup_id); + node.add_local_signal("subscribe_logic_step", Root::subscribe_logic_step); + node.add_local_signal("set_base_prefixes", Root::set_base_prefixes); let node = node.add_to_scenegraph(); let _ = Spatial::add_to(&node, None, Mat4::IDENTITY, false); @@ -62,7 +62,7 @@ impl Root { if let Ok(data) = serialize((delta, 0.0)) { for root in ROOT_REGISTRY.get_valid_contents() { if root.logic_step.load(Ordering::Relaxed) { - let _ = root.node.send_remote_signal("logicStep", &data); + let _ = root.node.send_remote_signal("logic_step", &data); } } } diff --git a/src/nodes/spatial/mod.rs b/src/nodes/spatial/mod.rs index af9e7e6..0e19154 100644 --- a/src/nodes/spatial/mod.rs +++ b/src/nodes/spatial/mod.rs @@ -55,14 +55,14 @@ impl Spatial { transform: Mutex::new(transform), zone: Mutex::new(Weak::new()), }; - node.add_local_method("getTransform", Spatial::get_transform_flex); - node.add_local_signal("setTransform", Spatial::set_transform_flex); - node.add_local_signal("setSpatialParent", Spatial::set_spatial_parent_flex); + node.add_local_method("get_transform", Spatial::get_transform_flex); + node.add_local_signal("set_transform", Spatial::set_transform_flex); + node.add_local_signal("set_spatial_parent", Spatial::set_spatial_parent_flex); node.add_local_signal( - "setSpatialParentInPlace", + "set_spatial_parent_in_place", Spatial::set_spatial_parent_in_place_flex, ); - node.add_local_signal("setZoneable", Spatial::set_zoneable); + node.add_local_signal("set_zoneable", Spatial::set_zoneable); let spatial_arc = Arc::new(spatial); if zoneable { ZONEABLE_REGISTRY.add_raw(&spatial_arc); @@ -316,8 +316,8 @@ pub fn find_reference_space( pub fn create_interface(client: &Arc) { let node = Node::create(client, "", "spatial", false); - node.add_local_signal("createSpatial", create_spatial_flex); - node.add_local_signal("createZone", create_zone_flex); + node.add_local_signal("create_spatial", create_spatial_flex); + node.add_local_signal("create_zone", create_zone_flex); node.add_to_scenegraph(); } diff --git a/src/nodes/startup.rs b/src/nodes/startup.rs index 1b31384..3b12809 100644 --- a/src/nodes/startup.rs +++ b/src/nodes/startup.rs @@ -53,7 +53,7 @@ impl StartupSettings { pub fn create_interface(client: &Arc) { let node = Node::create(client, "", "startup", false); - node.add_local_signal("createStartupSettings", create_startup_settings_flex); + node.add_local_signal("create_startup_settings", create_startup_settings_flex); node.add_to_scenegraph(); } @@ -66,9 +66,9 @@ pub fn create_startup_settings_flex( let node = Node::create(&calling_client, "/startup/settings", name, true).add_to_scenegraph(); StartupSettings::add_to(&node); - node.add_local_signal("setRoot", StartupSettings::set_root_flex); + node.add_local_signal("set_root", StartupSettings::set_root_flex); node.add_local_method( - "generateDesktopStartupID", + "generate_desktop_startup_id", StartupSettings::generate_desktop_startup_id_flex, ); diff --git a/src/wayland/panel_item.rs b/src/wayland/panel_item.rs index 8224138..96e7238 100644 --- a/src/wayland/panel_item.rs +++ b/src/wayland/panel_item.rs @@ -78,24 +78,27 @@ impl PanelItem { } node.add_local_signal( - "applySurfaceMaterial", + "apply_surface_material", PanelItem::apply_surface_material_flex, ); - node.add_local_signal("applyCursorMaterial", PanelItem::apply_cursor_material_flex); - node.add_local_signal("pointerDeactivate", PanelItem::pointer_deactivate_flex); - node.add_local_signal("pointerScroll", PanelItem::pointer_scroll_flex); - node.add_local_signal("pointerButton", PanelItem::pointer_button_flex); - node.add_local_signal("pointerMotion", PanelItem::pointer_motion_flex); node.add_local_signal( - "keyboardActivateString", + "apply_cursor_material", + PanelItem::apply_cursor_material_flex, + ); + node.add_local_signal("pointer_deactivate", PanelItem::pointer_deactivate_flex); + node.add_local_signal("pointer_scroll", PanelItem::pointer_scroll_flex); + node.add_local_signal("pointer_button", PanelItem::pointer_button_flex); + node.add_local_signal("pointer_motion", PanelItem::pointer_motion_flex); + node.add_local_signal( + "keyboard_activate_string", PanelItem::keyboard_activate_string_flex, ); node.add_local_signal( - "keyboardActivateNames", + "keyboard_activate_names", PanelItem::keyboard_activate_names_flex, ); - node.add_local_signal("keyboardDeactivate", PanelItem::keyboard_deactivate_flex); - node.add_local_signal("keyboardKeyState", PanelItem::keyboard_key_state_flex); + node.add_local_signal("keyboard_deactivate", PanelItem::keyboard_deactivate_flex); + node.add_local_signal("keyboard_key_state", PanelItem::keyboard_key_state_flex); node.add_local_signal("resize", PanelItem::resize_flex); node }