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

gave audio interface proper name

Browse Source
This commit is contained in:
awtterpip
2023-02-07 09:13:55 -06:00
parent bccdc8221e
commit 5c605932ef
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/client.rs
View File

@@ -2,7 +2,7 @@ use super::scenegraph::Scenegraph;
use crate::{ use crate::{
core::{registry::OwnedRegistry, task}, core::{registry::OwnedRegistry, task},
nodes::{ nodes::{
data, drawable, fields, hmd, input, items, sound, data, drawable, fields, hmd, input, items, audio,
root::Root, root::Root,
spatial, spatial,
startup::{self, StartupSettings, STARTUP_SETTINGS}, startup::{self, StartupSettings, STARTUP_SETTINGS},
@@ -103,7 +103,7 @@ impl Client {
spatial::create_interface(&client)?; spatial::create_interface(&client)?;
fields::create_interface(&client)?; fields::create_interface(&client)?;
drawable::create_interface(&client)?; drawable::create_interface(&client)?;
sound::create_interface(&client)?; audio::create_interface(&client)?;
data::create_interface(&client)?; data::create_interface(&client)?;
items::create_interface(&client)?; items::create_interface(&client)?;
input::create_interface(&client)?; input::create_interface(&client)?;

4
src/main.rs
View File

@@ -5,7 +5,7 @@ mod objects;
mod wayland; mod wayland;
use crate::core::destroy_queue; use crate::core::destroy_queue;
use crate::nodes::{drawable, hmd, input, sound}; use crate::nodes::{drawable, hmd, input, audio};
use crate::objects::input::mouse_pointer::MousePointer; use crate::objects::input::mouse_pointer::MousePointer;
use crate::objects::input::sk_controller::SkController; use crate::objects::input::sk_controller::SkController;
use crate::objects::input::sk_hand::SkHand; use crate::objects::input::sk_hand::SkHand;
@@ -207,7 +207,7 @@ fn main() -> Result<()> {
}); });
} }
drawable::draw(sk); drawable::draw(sk);
sound::update(); audio::update();
#[cfg(feature = "wayland")] #[cfg(feature = "wayland")]
wayland.make_context_current(); wayland.make_context_current();
}, },

2
src/nodes/sound.rs → src/nodes/audio.rs
View File

@@ -117,7 +117,7 @@ pub fn create_flex(_node: &Node, calling_client: Arc<Client>, data: &[u8]) -> Re
resource: ResourceID, resource: ResourceID,
} }
let info: CreateSoundInfo = deserialize(data)?; let info: CreateSoundInfo = deserialize(data)?;
let node = Node::create(&calling_client, "/audio/sounds", info.name, true); let node = Node::create(&calling_client, "/audio/sound", info.name, true);
let parent = find_spatial_parent(&calling_client, info.parent_path)?; let parent = find_spatial_parent(&calling_client, info.parent_path)?;
let transform = parse_transform(info.transform, true, true, true); let transform = parse_transform(info.transform, true, true, true);
let node = node.add_to_scenegraph()?; let node = node.add_to_scenegraph()?;

4
src/nodes/mod.rs
View File

@@ -8,7 +8,7 @@ pub mod items;
pub mod root; pub mod root;
pub mod spatial; pub mod spatial;
pub mod startup; pub mod startup;
pub mod sound; pub mod audio;
use color_eyre::eyre::{eyre, Result}; use color_eyre::eyre::{eyre, Result};
use nanoid::nanoid; use nanoid::nanoid;
@@ -39,7 +39,7 @@ use self::drawable::text::Text;
use self::fields::Field; use self::fields::Field;
use self::input::{InputHandler, InputMethod}; use self::input::{InputHandler, InputMethod};
use self::items::{Item, ItemAcceptor, ItemUI}; use self::items::{Item, ItemAcceptor, ItemUI};
use self::sound::Sound; use self::audio::Sound;
use self::spatial::zone::Zone; use self::spatial::zone::Zone;
use self::spatial::Spatial; use self::spatial::Spatial;
use self::startup::StartupSettings; use self::startup::StartupSettings;