Skip to content

Commit

Permalink
Fast3D: Use external Fast3D lib
Browse files Browse the repository at this point in the history
  • Loading branch information
dcvz committed Jun 24, 2023
1 parent 8943980 commit cb391b8
Show file tree
Hide file tree
Showing 31 changed files with 22 additions and 6,667 deletions.
25 changes: 13 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,27 @@ name = "helix"
crate-type = ["lib", "staticlib"]

[features]
default = ["f3dex2", "opengl"]
default = ["f3dex2", "opengl_renderer"]

# Graphics Features
f3dex2 = []
f3dex2e = ["gbifloats", "f3dex2"]
f3dzex2 = ["f3dex2"]
f3dex2 = ["fast3d/f3dex2"]
f3dex2e = ["gbifloats", "f3dex2", "fast3d/f3dex2e"]
f3dzex2 = ["f3dex2", "fast3d/f3dzex2"]

gbifloats = []
gbifloats = ["fast3d/gbifloats"]

# Renderer Backend
wgpu = ["imgui-wgpu"]
opengl = ["glium", "glutin", "imgui-glium-renderer"]
wgpu_renderer = ["wgpu", "imgui-wgpu", "fast3d-wgpu-renderer"]
opengl_renderer = ["glium", "glutin", "imgui-glium-renderer", "fast3d-glium-renderer"]

# Additional Features
speech = ["dep:tts"]
network = ["dep:tokio"]

[dependencies]
anyhow = "1.0.70"
approx = "0.5.1"
env_logger = "0.10.0"
farbe = "0.2.0"
gilrs = { version = "0.10.2", features = ["serde", "serde-serialize"] }
glam = { git = "https://github.com/bitshifter/glam-rs.git", branch = "neon", features = ["approx", "bytemuck"] }
glium = { version = "0.32.1", optional = true }
imgui = { version = "0.11.0", features = ["docking"] }
imgui-wgpu = { git = "https://github.com/retrofoundry/imgui-wgpu-rs.git", branch = "helix", optional = true }
Expand All @@ -44,10 +41,14 @@ pollster = "0.3.0"
tokio = { version = "1.26.0", features = ["full"], optional = true }
tts = { version = "0.25.0", optional = true }
glutin = { version = "0.29.1", optional = true }
wgpu = "0.16"
wgpu = { version = "0.16", optional = true }
spin_sleep = "1.1.1"
bytemuck = { version = "1.13.1", features = ["derive"] }
arie = "0.2.0"
fast3d = { version = "0.1.0", default-features = false }
fast3d-glium-renderer = { git = "https://github.com/retrofoundry/fast3d-rs", optional = true }
fast3d-wgpu-renderer = { version = "0.1.0", optional = true }

[patch.crates-io]
glium = { git = "https://github.com/retrofoundry/glium", branch = "helix" }
fast3d = { git = "https://github.com/retrofoundry/fast3d-rs" } # remove once we have our glium fix upstreamed
fast3d-wgpu-renderer = { git = "https://github.com/retrofoundry/fast3d-rs" } # remove once we have our glium fix upstreamed
1 change: 0 additions & 1 deletion src/extensions.rs

This file was deleted.

54 changes: 0 additions & 54 deletions src/extensions/matrix.rs

This file was deleted.

6 changes: 0 additions & 6 deletions src/fast3d.rs

This file was deleted.

84 changes: 0 additions & 84 deletions src/fast3d/gbi.rs

This file was deleted.

Loading

0 comments on commit cb391b8

Please sign in to comment.