Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dash feature flag #62

Merged
merged 1 commit into from
May 28, 2024
Merged

Remove dash feature flag #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -93,7 +94,7 @@ criterion = "0.5"

[[bin]]
name = "vvplay"
required-features = ["dash"]
# required-features = ["dash"]

# [[bin]]
# name = "vvdash"
Expand All @@ -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 = []

Expand Down
1 change: 0 additions & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

pub mod abr;
pub mod codec;
#[cfg(feature = "dash")]
pub mod dash;
pub mod downsample;
pub mod estimatethroughput;
Expand Down
4 changes: 0 additions & 4 deletions src/render/wgpu/reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,6 @@ impl RenderReader<PointCloud<PointXyzRgba>> for LODFileReader {
fn set_len(&mut self, _len: usize) {}
}

#[cfg(feature = "dash")]
pub struct PcdAsyncReader {
total_frames: u64,
rx: Receiver<(FrameRequest, PointCloud<PointXyzRgba>)>,
Expand All @@ -306,7 +305,6 @@ pub struct PcdAsyncReader {
tx: UnboundedSender<BufMsg>,
}

#[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 {
Expand All @@ -325,7 +323,6 @@ impl PartialEq for FrameRequest {
}
}

#[cfg(feature = "dash")]
impl PcdAsyncReader {
pub fn new(
rx: Receiver<(FrameRequest, PointCloud<PointXyzRgba>)>,
Expand All @@ -344,7 +341,6 @@ impl PcdAsyncReader {
}
}

#[cfg(feature = "dash")]
impl RenderReaderCameraPos<PointCloud<PointXyzRgba>> for PcdAsyncReader {
fn start(&mut self) -> (Option<CameraPosition>, Option<PointCloud<PointXyzRgba>>) {
RenderReaderCameraPos::get_at(self, 0, Some(CameraPosition::default()))
Expand Down
Loading