From 83db3b70ae1a50b88d68743e5aef9b7e121bdee0 Mon Sep 17 00:00:00 2001 From: Wei Tsang Ooi Date: Tue, 28 May 2024 18:12:56 +0800 Subject: [PATCH] Remove "dash" feature flag --- Cargo.toml | 22 +++++++++++----------- src/lib.rs | 1 - src/render/wgpu/reader.rs | 4 ---- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9396d38..95547c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,12 +54,13 @@ log = "0.4.17" env_logger = { version = "0.10.0", default-features = false } futures = { version = "0.3", optional = true } tokio = { version = "1", features = ["full"], optional = true } -regex = { version = "1.6.0", optional = true } -reqwest = { version = "0.11", features = ["gzip"], optional = true } -tempfile = { version = "3", optional = true } -serde = { version = "1", features = ["derive"], optional = true } -serde_with = { version = "3.0.0", optional = true } -quick-xml = { version = "0.25", features = ["serialize"], optional = true } +regex = { version = "1.6.0" } + +reqwest = { version = "0.11", features = ["gzip"] } +tempfile = { version = "3" } +serde = { version = "1", features = ["derive"] } +quick-xml = { version = "0.25", features = ["serialize"] } +serde_with = { version = "3.0.0" } crossbeam-channel = "0.5.6" # For GUI Rendering @@ -93,7 +94,7 @@ criterion = "0.5" [[bin]] name = "vvplay" -required-features = ["dash"] +# required-features = ["dash"] # [[bin]] # name = "vvdash" @@ -103,18 +104,17 @@ name = "vv" [[bin]] name = "vvplay_async" -required-features = ["dash"] +# required-features = ["dash"] [[bin]] name = "exporter" [features] -default = ["dash", "with-tmc2-rs-decoder"] +default = ["with-tmc2-rs-decoder", "async" ] with-tmc2-rs-decoder = ["dep:tmc2rs", "dep:ffmpeg-next"] # render = ["dep:winit", "dep:wgpu", "dep:wgpu_glyph", "dep:egui", "dep:egui_winit_platform", "dep:egui_wgpu_backend", "dep:epi"] -dash = ["dep:reqwest", "dep:regex", "dep:tempfile", "dep:quick-xml", "serde", "async"] +# dash = ["dep:reqwest", "dep:regex", "dep:tempfile", "dep:quick-xml", "serde", "async"] async = ["dep:tokio", "dep:futures"] -serde = ["dep:serde", "dep:serde_with"] # use this feature to support resizing to a screen size larger than 2048x2048 (depending on your gpu support) fullscreen = [] diff --git a/src/lib.rs b/src/lib.rs index eb3137a..fbc1155 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,7 +3,6 @@ pub mod abr; pub mod codec; -#[cfg(feature = "dash")] pub mod dash; pub mod downsample; pub mod estimatethroughput; diff --git a/src/render/wgpu/reader.rs b/src/render/wgpu/reader.rs index fae62c9..9e37d92 100644 --- a/src/render/wgpu/reader.rs +++ b/src/render/wgpu/reader.rs @@ -296,7 +296,6 @@ impl RenderReader> for LODFileReader { fn set_len(&mut self, _len: usize) {} } -#[cfg(feature = "dash")] pub struct PcdAsyncReader { total_frames: u64, rx: Receiver<(FrameRequest, PointCloud)>, @@ -306,7 +305,6 @@ pub struct PcdAsyncReader { tx: UnboundedSender, } -#[cfg(feature = "dash")] #[derive(Debug, Clone, Copy)] /// A request to the player backend for a frame to be displayed by the renderer. pub struct FrameRequest { @@ -325,7 +323,6 @@ impl PartialEq for FrameRequest { } } -#[cfg(feature = "dash")] impl PcdAsyncReader { pub fn new( rx: Receiver<(FrameRequest, PointCloud)>, @@ -344,7 +341,6 @@ impl PcdAsyncReader { } } -#[cfg(feature = "dash")] impl RenderReaderCameraPos> for PcdAsyncReader { fn start(&mut self) -> (Option, Option>) { RenderReaderCameraPos::get_at(self, 0, Some(CameraPosition::default()))