1
0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 05:10:03 -04:00

Improve custom_3d_three-d example (#1923)

* Use correct FBO to output

* custom_3d_three-d web

* Update .gitignore

* Do not free the FBO

* Use three-d 0.13

* ThreeDApp

* Only construct model and camera once

* Clean-up and docs

* Web build instructions

* Remove unused dependencies

* Update Cargo.lock

* Fix build

* More fixes

* omg
This commit is contained in:
Asger Nyman Christiansen
2022-08-17 21:33:34 +02:00
committed by GitHub
parent 39b63f6163
commit eeeb4b7de2
7 changed files with 264 additions and 211 deletions

125
Cargo.lock generated
View File

@@ -281,7 +281,7 @@ dependencies = [
"cc",
"cfg-if",
"libc",
"miniz_oxide 0.5.3",
"miniz_oxide",
"object",
"rustc-demangle",
]
@@ -898,10 +898,13 @@ dependencies = [
name = "custom_3d_three-d"
version = "0.1.0"
dependencies = [
"console_error_panic_hook",
"eframe",
"egui_glow",
"glow",
"three-d",
"wasm-bindgen",
"wasm-bindgen-futures",
]
[[package]]
@@ -1003,16 +1006,6 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7046468a81e6a002061c01e6a7c83139daf91b11c30e66795b13217c2d885c8b"
[[package]]
name = "deflate"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174"
dependencies = [
"adler32",
"byteorder",
]
[[package]]
name = "deflate"
version = "1.0.0"
@@ -1123,7 +1116,7 @@ dependencies = [
"eframe",
"egui_extras",
"ehttp",
"image 0.24.2",
"image",
"poll-promise",
]
@@ -1258,7 +1251,7 @@ dependencies = [
"egui_demo_lib",
"egui_extras",
"ehttp",
"image 0.24.2",
"image",
"poll-promise",
"pollster",
"serde",
@@ -1290,7 +1283,7 @@ dependencies = [
"chrono",
"document-features",
"egui",
"image 0.24.2",
"image",
"resvg",
"serde",
"tiny-skia",
@@ -1308,7 +1301,7 @@ dependencies = [
"egui",
"egui-winit",
"glium",
"image 0.24.2",
"image",
]
[[package]]
@@ -1491,7 +1484,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
dependencies = [
"crc32fast",
"miniz_oxide 0.5.3",
"miniz_oxide",
]
[[package]]
@@ -1786,16 +1779,6 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]]
name = "gloo-timers"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9"
dependencies = [
"js-sys",
"wasm-bindgen",
]
[[package]]
name = "glow"
version = "0.11.2"
@@ -1948,7 +1931,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
dependencies = [
"num-traits",
"serde",
"zerocopy",
]
@@ -2033,22 +2015,6 @@ dependencies = [
"unicode-normalization",
]
[[package]]
name = "image"
version = "0.23.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
dependencies = [
"bytemuck",
"byteorder",
"color_quant",
"jpeg-decoder 0.1.22",
"num-iter",
"num-rational 0.3.2",
"num-traits",
"png 0.16.8",
]
[[package]]
name = "image"
version = "0.24.2"
@@ -2058,11 +2024,11 @@ dependencies = [
"bytemuck",
"byteorder",
"color_quant",
"jpeg-decoder 0.2.6",
"jpeg-decoder",
"num-iter",
"num-rational 0.4.1",
"num-rational",
"num-traits",
"png 0.17.5",
"png",
]
[[package]]
@@ -2143,12 +2109,6 @@ dependencies = [
"libc",
]
[[package]]
name = "jpeg-decoder"
version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
[[package]]
name = "jpeg-decoder"
version = "0.2.6"
@@ -2326,15 +2286,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
dependencies = [
"adler32",
]
[[package]]
name = "miniz_oxide"
version = "0.5.3"
@@ -2552,17 +2503,6 @@ dependencies = [
"num-traits",
]
[[package]]
name = "num-rational"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
dependencies = [
"autocfg",
"num-integer",
"num-traits",
]
[[package]]
name = "num-rational"
version = "0.4.1"
@@ -2872,18 +2812,6 @@ dependencies = [
"plotters-backend",
]
[[package]]
name = "png"
version = "0.16.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6"
dependencies = [
"bitflags",
"crc32fast",
"deflate 0.8.6",
"miniz_oxide 0.3.7",
]
[[package]]
name = "png"
version = "0.17.5"
@@ -2892,8 +2820,8 @@ checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba"
dependencies = [
"bitflags",
"crc32fast",
"deflate 1.0.0",
"miniz_oxide 0.5.3",
"deflate",
"miniz_oxide",
]
[[package]]
@@ -3150,10 +3078,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34489194784b86c03c3d688258e2ba73f3c82700ba4673ee2ecad5ae540b9438"
dependencies = [
"gif",
"jpeg-decoder 0.2.6",
"jpeg-decoder",
"log",
"pico-args",
"png 0.17.5",
"png",
"rgb",
"svgfilters",
"svgtypes",
@@ -3167,7 +3095,7 @@ version = "0.1.0"
dependencies = [
"eframe",
"egui_extras",
"image 0.24.2",
"image",
]
[[package]]
@@ -3813,32 +3741,27 @@ dependencies = [
[[package]]
name = "three-d"
version = "0.12.2"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cc0ef660c02244f00fc2d1759e67d30a3c282541458490de641f0e832c8d3c9"
checksum = "f7a5a1017829335f6761bdbae2daf3021a88314a1f8d5f188c9b62ce62e2fd31"
dependencies = [
"cgmath",
"gloo-timers",
"glow",
"half",
"js-sys",
"serde",
"instant",
"thiserror",
"three-d-asset",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
]
[[package]]
name = "three-d-asset"
version = "0.1.1"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af1886553d8b51093705b6d1a02ec2c41ac78260f68b40682d94d9976960d689"
checksum = "e953f34aa4169e098621a1ff23a68c47b7798711f7c769bf741248e850e93fbe"
dependencies = [
"cgmath",
"half",
"image 0.23.14",
"thiserror",
"web-sys",
]
@@ -3875,7 +3798,7 @@ dependencies = [
"arrayvec 0.5.2",
"bytemuck",
"cfg-if",
"png 0.17.5",
"png",
"safe_arch",
]
@@ -4229,8 +4152,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
dependencies = [
"cfg-if",
"serde",
"serde_json",
"wasm-bindgen-macro",
]