Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

disable mumble-link on macos

Browse Source
This commit is contained in:
Marcel Märtens 2021-09-03 01:07:07 +02:00
parent 0dcfe2721b
commit 02d6462858
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
voxygen/Cargo.toml
View File

@ -84,9 +84,6 @@ vek = {version = "=0.14.1", features = ["serde"]}
# Controller
gilrs = {version = "0.8.0", features = ["serde-serialize"]}
# Mumble
mumble-link = "0.1.0"
# Singleplayer
server = { package = "veloren-server", path = "../server", optional = true, default-features = false, features = ["worldgen"] }
@ -137,6 +134,10 @@ coreaudio-sys = { version = "=0.2.8", default-features = false }
[target.'cfg(windows)'.build-dependencies]
winres = "0.1"
# Mumble
[target.'cfg(not(target_os="macos"))'.dependencies]
mumble-link = "0.1.0"
[dev-dependencies]
criterion = "0.3"
world = {package = "veloren-world", path = "../world"}

40
voxygen/src/session/mod.rs
View File

@ -2,6 +2,7 @@ pub mod settings_change;
use std::{cell::RefCell, collections::HashSet, rc::Rc, result::Result, sync::Arc, time::Duration};
#[cfg(not(target_os = "macos"))]
use mumble_link::SharedLink;
use ordered_float::OrderedFloat;
use specs::{Join, WorldExt};
@ -78,6 +79,7 @@ pub struct SessionState {
target_entity: Option<specs::Entity>,
selected_entity: Option<(specs::Entity, std::time::Instant)>,
interactable: Option<Interactable>,
#[cfg(not(target_os = "macos"))]
mumble_link: SharedLink,
hitboxes: HashMap<specs::Entity, DebugShapeId>,
}
@ -97,6 +99,7 @@ impl SessionState {
scene
.camera_mut()
.set_fov_deg(global_state.settings.graphics.fov);
#[cfg(not(target_os = "macos"))]
let mut mumble_link = SharedLink::new("veloren", "veloren-voxygen");
{
let mut client = client.borrow_mut();
@ -104,6 +107,7 @@ impl SessionState {
client.request_lossy_terrain_compression(
global_state.settings.graphics.lossy_terrain_compression,
);
#[cfg(not(target_os = "macos"))]
if let Some(uid) = client.uid() {
let identiy = if let Some(info) = client.player_list().get(&uid) {
format!("{}-{}", info.player_alias, uid.to_string())
@ -136,6 +140,7 @@ impl SessionState {
target_entity: None,
selected_entity: None,
interactable: None,
#[cfg(not(target_os = "macos"))]
mumble_link,
hitboxes: HashMap::new(),
}
@ -160,22 +165,25 @@ impl SessionState {
self.scene
.maintain_debug_hitboxes(&client, &global_state.settings, &mut self.hitboxes);
// Update mumble positional audio
let pos = client.position().unwrap_or_default();
let ori = client
.state()
.read_storage::<comp::Ori>()
.get(client.entity())
.map_or_else(comp::Ori::default, |o| *o);
let front = ori.look_dir().to_vec();
let top = ori.up().to_vec();
// converting from veloren z = height axis, to mumble y = height axis
let player_pos = mumble_link::Position {
position: [pos.x, pos.z, pos.y],
front: [front.x, front.z, front.y],
top: [top.x, top.z, top.y],
};
self.mumble_link.update(player_pos, player_pos);
#[cfg(not(target_os = "macos"))]
{
// Update mumble positional audio
let pos = client.position().unwrap_or_default();
let ori = client
.state()
.read_storage::<comp::Ori>()
.get(client.entity())
.map_or_else(comp::Ori::default, |o| *o);
let front = ori.look_dir().to_vec();
let top = ori.up().to_vec();
// converting from veloren z = height axis, to mumble y = height axis
let player_pos = mumble_link::Position {
position: [pos.x, pos.z, pos.y],
front: [front.x, front.z, front.y],
top: [top.x, top.z, top.y],
};
self.mumble_link.update(player_pos, player_pos);
}
for event in client.tick(self.inputs.clone(), dt, crate::ecs::sys::add_local_systems)? {
match event {