StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

refactor: use snake case for method names

Browse Source
This commit is contained in:
Nova
2022-11-08 06:10:03 -05:00
parent da7e2c5e6e
commit 1f61d32877
16 changed files with 54 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nodes/data.rs
View File

@@ -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<Client>) {
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();
}

6
src/nodes/drawable/mod.rs
View File

@@ -12,9 +12,9 @@ use stereokit::{lifecycle::DrawContext, texture::Texture, StereoKit};
pub fn create_interface(client: &Arc<Client>) {
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();
}

2
src/nodes/drawable/model.rs
View File

@@ -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

4
src/nodes/drawable/text.rs
View File

@@ -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)

2
src/nodes/fields/box.rs
View File

@@ -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(())
}

2
src/nodes/fields/cylinder.rs
View File

@@ -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(())
}

6
src/nodes/fields/mod.rs
View File

@@ -215,9 +215,9 @@ impl Deref for Field {
pub fn create_interface(client: &Arc<Client>) {
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();
}

2
src/nodes/fields/sphere.rs
View File

@@ -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(())
}

6
src/nodes/input/mod.rs
View File

@@ -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<Client>) {
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();
}

2
src/nodes/input/tip.rs
View File

@@ -65,6 +65,6 @@ pub fn create_tip_flex(_node: &Node, calling_client: Arc<Client>, 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(())
}

2
src/nodes/items/environment.rs
View File

@@ -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<Client>, _data: &[u8]) -> Result<Vec<u8>> {

10
src/nodes/items/mod.rs
View File

@@ -103,7 +103,7 @@ impl Item {
type_info: &'static TypeInfo,
specialization: ItemType,
) -> Arc<Self> {
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<Client>) {
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();

8
src/nodes/root.rs
View File

@@ -19,9 +19,9 @@ pub struct Root {
impl Root {
pub fn create(client: &Arc<Client>) -> Arc<Self> {
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);
}
}
}

14
src/nodes/spatial/mod.rs
View File

@@ -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<Client>) {
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();
}

6
src/nodes/startup.rs
View File

@@ -53,7 +53,7 @@ impl StartupSettings {
pub fn create_interface(client: &Arc<Client>) {
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,
);

23
src/wayland/panel_item.rs
View File

@@ -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
}