Skip to content

Commit

Permalink
Merge branch 'main' into feature/vulkan-pipeline
Browse files Browse the repository at this point in the history
# Conflicts:
#	assets/shaders/rendering.wgsl
#	assets/shaders/viewport_render.wgsl
#	examples/wgpu_render.rs
#	src/octree/raytracing/mod.rs
#	src/octree/raytracing/wgpu/data.rs
#	src/octree/raytracing/wgpu/mod.rs
#	src/octree/raytracing/wgpu/pipeline.rs
#	src/octree/raytracing/wgpu/render.rs
#	src/octree/raytracing/wgpu/types.rs
  • Loading branch information
davids91 committed Jul 21, 2024
2 parents b7add49 + a77fd8a commit 10019a0
Show file tree
Hide file tree
Showing 18 changed files with 206 additions and 933 deletions.
12 changes: 2 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shocovox-rs"
version = "0.3.1"
version = "0.3.2"
edition = "2021"
authors = ["Dávid Tóth <[email protected]>"]
license = "MIT OR Apache-2.0"
Expand All @@ -9,25 +9,17 @@ license = "MIT OR Apache-2.0"
default = []
raytracing = ["dep:image", "dep:show-image"]
serialization = ["dep:serde"]
wgpu = ["raytracing", "dep:encase","dep:wgpu", "dep:winit", "dep:env_logger", "dep:futures"]
bevy_wgpu = ["raytracing", "dep:bevy"]

[dependencies]
serde = { version = "1.0.183", features = ["derive"], optional = true }
bendy = { git = "https://github.com/davids91/bendy.git" , features = ["std", "serde"]}
array-init = "2.1.0"
wgpu = { version = "0.20.1", optional = true }
winit = { version = "0.30.3", optional = true }
env_logger = { version = "0.11.3", optional = true }
futures = { version = "0.3.30", optional = true }
encase = { version = "0.9.0", optional = true }

# for example cpu_render
image = { version = "0.25.1", optional = true }
show-image = { version = "0.14.0", optional = true }

# for example bevy_wgpu
bevy = { version = "0.13.2", features = ["dynamic_linking"], optional = true}
bevy = { version = "0.14.0", features = [], optional = true}

# debugging
#linker = "/usr/bin/clang"
Expand Down
Loading

0 comments on commit 10019a0

Please sign in to comment.