Skip to content

Commit

Permalink
feat(server): ✨ Split server into _openvr and _core
Browse files Browse the repository at this point in the history
  • Loading branch information
zmerp authored and failboat committed Aug 17, 2024
1 parent 3761045 commit e20a981
Show file tree
Hide file tree
Showing 234 changed files with 235 additions and 313 deletions.
12 changes: 6 additions & 6 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
alvr/client_core/cpp/VrApi_* linguist-vendored
alvr/client_core/cpp/glm/** linguist-vendored
alvr/client_core/cpp/tinygltf/** linguist-vendored
alvr/server/cpp/alvr_server/include/** linguist-vendored
alvr/server/cpp/alvr_server/nvEncodeAPI.h linguist-vendored
alvr/server/cpp/platform/win32/NvCodecUtils.h linguist-vendored
alvr/server/cpp/platform/win32/NvEncoder.cpp linguist-vendored
alvr/server/cpp/platform/win32/NvEncoder.h linguist-vendored
alvr/server/cpp/shared/** linguist-vendored
alvr/server_openvr/cpp/alvr_server/include/** linguist-vendored
alvr/server_openvr/cpp/alvr_server/nvEncodeAPI.h linguist-vendored
alvr/server_openvr/cpp/platform/win32/NvCodecUtils.h linguist-vendored
alvr/server_openvr/cpp/platform/win32/NvEncoder.cpp linguist-vendored
alvr/server_openvr/cpp/platform/win32/NvEncoder.h linguist-vendored
alvr/server_openvr/cpp/shared/** linguist-vendored
# note: some of these folders contain ALVR code, but only a minor amount
alvr/vulkan_layer/layer/** linguist-vendored
alvr/vulkan_layer/util/** linguist-vendored
Expand Down
22 changes: 17 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ alvr_client_core = { path = "alvr/client_core" }
alvr_common = { path = "alvr/common" }
alvr_events = { path = "alvr/events" }
alvr_filesystem = { path = "alvr/filesystem" }
alvr_gui_common = { path = "alvr/gui_common" }
alvr_packets = { path = "alvr/packets" }
alvr_server_core = { path = "alvr/server_core"}
alvr_server_io = { path = "alvr/server_io" }
alvr_session = { path = "alvr/session" }
alvr_sockets = { path = "alvr/sockets" }
alvr_gui_common = { path = "alvr/gui_common" }

[profile.release]
debug = "limited"
Expand Down
3 changes: 0 additions & 3 deletions alvr/server/README.md

This file was deleted.

41 changes: 0 additions & 41 deletions alvr/server/src/openvr/graphics.rs

This file was deleted.

122 changes: 56 additions & 66 deletions alvr/server/Cargo.toml → alvr/server_core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,66 +1,56 @@
[package]
name = "alvr_server"
version.workspace = true
edition.workspace = true
rust-version.workspace = true
authors = ["alvr-org", "Valve Corporation"]
license = "MIT"

[lib]
crate-type = ["cdylib"]

[features]
gpl = [] # Enable for FFmpeg support on Windows. Always enabled on Linux
trace-performance = ["profiling/profile-with-tracy"]

[dependencies]
alvr_audio.workspace = true
alvr_common.workspace = true
alvr_events.workspace = true
alvr_filesystem.workspace = true
alvr_packets.workspace = true
alvr_server_io.workspace = true
alvr_session.workspace = true
alvr_sockets.workspace = true

ash = "0.38"
bincode = "1"
bytes = "1"
chrono = "0.4"
fern = "0.6"
flume = "0.11"
futures = "0.3"
headers = "0.3"
hyper = { version = "0.14", features = [
"http2",
"server",
"stream",
"runtime",
"tcp",
] }
mdns-sd = "0.11"
profiling = { version = "1", optional = true }
reqwest = "0.11" # not used but webserver does not work without it. todo: investigate
rosc = "0.10"
tokio = { version = "1", features = [
"rt-multi-thread",
"macros",
"process",
"io-util",
"net",
"fs",
] }
tokio-tungstenite = "0.20"
tokio-util = { version = "0.7", features = ["codec"] }
serde = "1"
serde_json = "1"
sysinfo = { version = "0.30", default-features = false }

[build-dependencies]
alvr_filesystem = { path = "../filesystem" }
bindgen = "0.69"
cc = { version = "1", features = ["parallel"] }
walkdir = "2"

[target.'cfg(target_os = "linux")'.build-dependencies]
pkg-config = "0.3"
[package]
name = "alvr_server_core"
version.workspace = true
edition.workspace = true
rust-version.workspace = true
authors = ["alvr-org", "Valve Corporation"]
license = "MIT"

[lib]
crate-type = ["rlib", "cdylib"]

[features]
trace-performance = ["profiling/profile-with-tracy"]

[dependencies]
alvr_audio.workspace = true
alvr_common.workspace = true
alvr_events.workspace = true
alvr_filesystem.workspace = true
alvr_packets.workspace = true
alvr_server_io.workspace = true
alvr_session.workspace = true
alvr_sockets.workspace = true

ash = "0.38"
bincode = "1"
bytes = "1"
chrono = "0.4"
fern = "0.6"
flume = "0.11"
futures = "0.3"
headers = "0.3"
hyper = { version = "0.14", features = [
"http2",
"server",
"stream",
"runtime",
"tcp",
] }
mdns-sd = "0.11"
profiling = { version = "1", optional = true }
reqwest = "0.11" # not used but webserver does not work without it. todo: investigate
rosc = "0.10"
tokio = { version = "1", features = [
"rt-multi-thread",
"macros",
"process",
"io-util",
"net",
"fs",
] }
tokio-tungstenite = "0.20"
tokio-util = { version = "0.7", features = ["codec"] }
serde = "1"
serde_json = "1"
sysinfo = { version = "0.30", default-features = false }
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit e20a981

Please sign in to comment.