Skip to content

Commit

Permalink
Use released version of three-d-asset
Browse files Browse the repository at this point in the history
  • Loading branch information
asny committed Aug 10, 2023
1 parent 6eab59b commit 600e2ff
Show file tree
Hide file tree
Showing 21 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ egui-gui = ["egui_glow", "egui", "getrandom"] # Additional GUI features
[dependencies]
glow = "0.12"
cgmath = "0.18"
three-d-asset = {git = "https://github.com/asny/three-d-asset"}
three-d-asset = {version = "0.6"}
thiserror = "1"
winit = {version = "0.28", optional = true}
egui = { version = "0.22", optional = true }
Expand All @@ -47,7 +47,7 @@ instant = "0.1.12"

[dev-dependencies]
rand = "0.7"
three-d-asset = {git = "https://github.com/asny/three-d-asset", features = ["hdr", "gltf", "obj", "vol", "pcd", "png", "jpeg", "http", "data-url"] }
three-d-asset = {version = "0.6", features = ["hdr", "gltf", "obj", "vol", "pcd", "png", "jpeg", "http", "data-url"] }
noise = {version = "0.6", default-features = false}
winit = "0.28"

Expand Down
2 changes: 1 addition & 1 deletion examples/animation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../" }
three-d-asset = {git = "https://github.com/asny/three-d-asset", features = ["gltf", "png", "jpeg", "http", "data-url"] }
three-d-asset = {version = "0.6", features = ["gltf", "png", "jpeg", "http", "data-url"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/environment/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../", features=["egui-gui"] }
three-d-asset = {git = "https://github.com/asny/three-d-asset",features = ["hdr", "http"] }
three-d-asset = {version = "0.6",features = ["hdr", "http"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/fog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../" }
three-d-asset = {git = "https://github.com/asny/three-d-asset",features = ["obj", "http"] }
three-d-asset = {version = "0.6",features = ["obj", "http"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/forest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../" }
three-d-asset = {git = "https://github.com/asny/three-d-asset",features = ["obj", "jpeg", "http"] }
three-d-asset = {version = "0.6",features = ["obj", "jpeg", "http"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/headless/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../", features=["headless"] }
three-d-asset = {git = "https://github.com/asny/three-d-asset", features=["png"]}
three-d-asset = {version = "0.6", features=["png"]}

[target.'cfg(target_arch = "wasm32")'.dependencies]
log = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion examples/image/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../", features=["egui-gui"] }
three-d-asset = {git = "https://github.com/asny/three-d-asset",features = ["hdr", "http"] }
three-d-asset = {version = "0.6",features = ["hdr", "http"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../", features=["egui-gui"] }
three-d-asset = {git = "https://github.com/asny/three-d-asset",features = ["gltf", "jpeg", "http"] }
three-d-asset = {version = "0.6",features = ["gltf", "jpeg", "http"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/lights/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../", features=["egui-gui"] }
three-d-asset = {git = "https://github.com/asny/three-d-asset",features = ["gltf", "png", "jpeg", "http"] }
three-d-asset = {version = "0.6",features = ["gltf", "png", "jpeg", "http"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
rand = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion examples/logo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../" }
three-d-asset = {git = "https://github.com/asny/three-d-asset",features = ["png", "http"] }
three-d-asset = {version = "0.6",features = ["png", "http"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/normals/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../" }
three-d-asset = {git = "https://github.com/asny/three-d-asset",features = ["gltf", "png", "http"] }
three-d-asset = {version = "0.6",features = ["gltf", "png", "http"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/pbr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../", features=["egui-gui"] }
three-d-asset = {git = "https://github.com/asny/three-d-asset",features = ["gltf", "hdr", "jpeg", "http"] }
three-d-asset = {version = "0.6",features = ["gltf", "hdr", "jpeg", "http"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/picking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../" }
three-d-asset = {git = "https://github.com/asny/three-d-asset",features = ["obj", "http"] }
three-d-asset = {version = "0.6",features = ["obj", "http"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/point_cloud/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../" }
three-d-asset = {git = "https://github.com/asny/three-d-asset", features = ["pcd", "http"] }
three-d-asset = {version = "0.6",features = ["pcd", "http"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1.16", features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/sprites/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../" }
three-d-asset = {git = "https://github.com/asny/three-d-asset",features = ["jpeg", "http"] }
three-d-asset = {version = "0.6",features = ["jpeg", "http"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/statues/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../", features=["egui-gui"] }
three-d-asset = {git = "https://github.com/asny/three-d-asset",features = ["obj", "png", "http"] }
three-d-asset = {version = "0.6",features = ["obj", "png", "http"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/terrain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../", features=["egui-gui"] }
three-d-asset = {git = "https://github.com/asny/three-d-asset",features = ["gltf", "jpeg", "png", "hdr", "http"] }
three-d-asset = {version = "0.6",features = ["gltf", "jpeg", "png", "hdr", "http"] }
noise = {version = "0.6", default-features = false}

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion examples/texture/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../" }
three-d-asset = {git = "https://github.com/asny/three-d-asset",features = ["obj", "png", "jpeg", "http"] }
three-d-asset = {version = "0.6",features = ["obj", "png", "jpeg", "http"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/triangle_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../" }
three-d-asset = { git = "https://github.com/asny/three-d-asset" }
three-d-asset = {version = "0.6"}

[target.'cfg(target_arch = "wasm32")'.dependencies]
log = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion examples/volume/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../", features=["egui-gui"] }
three-d-asset = {git = "https://github.com/asny/three-d-asset",features = ["vol", "http"] }
three-d-asset = {version = "0.6",features = ["vol", "http"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/wireframe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ crate-type = ["cdylib"]

[dependencies]
three-d = { path = "../../" }
three-d-asset = {git = "https://github.com/asny/three-d-asset",features = ["obj", "http"] }
three-d-asset = {version = "0.6",features = ["obj", "http"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
Expand Down

0 comments on commit 600e2ff

Please sign in to comment.