Update `glow` to 0.12 (#2695)
* Remove three-d example due to glow incompatibility * Update to glow 0.12 * Remove three-d from deny.toml * Add line to changelog
This commit is contained in:
Emil Ernerfeldt
GitHub
parent
be9b5a3641
commit
636a39cbe1
|
|
@ -188,15 +188,6 @@ version = "1.0.68"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
|
checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "approx"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278"
|
|
||||||
dependencies = [
|
|
||||||
"num-traits",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "arboard"
|
name = "arboard"
|
||||||
version = "3.2.0"
|
version = "3.2.0"
|
||||||
|
|
@ -625,16 +616,6 @@ dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "cgmath"
|
|
||||||
version = "0.18.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317"
|
|
||||||
dependencies = [
|
|
||||||
"approx",
|
|
||||||
"num-traits",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "chrono"
|
name = "chrono"
|
||||||
version = "0.4.23"
|
version = "0.4.23"
|
||||||
|
|
@ -955,20 +936,7 @@ version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"eframe",
|
"eframe",
|
||||||
"egui_glow",
|
"egui_glow",
|
||||||
"glow 0.11.2",
|
"glow",
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "custom_3d_three-d"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"console_error_panic_hook",
|
|
||||||
"eframe",
|
|
||||||
"egui_glow",
|
|
||||||
"glow 0.11.2",
|
|
||||||
"three-d",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"wasm-bindgen-futures",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -1276,7 +1244,7 @@ dependencies = [
|
||||||
"egui-wgpu",
|
"egui-wgpu",
|
||||||
"egui-winit",
|
"egui-winit",
|
||||||
"egui_glow",
|
"egui_glow",
|
||||||
"glow 0.11.2",
|
"glow",
|
||||||
"glutin",
|
"glutin",
|
||||||
"glutin-winit",
|
"glutin-winit",
|
||||||
"image",
|
"image",
|
||||||
|
|
@ -1403,7 +1371,7 @@ dependencies = [
|
||||||
"document-features",
|
"document-features",
|
||||||
"egui",
|
"egui",
|
||||||
"egui-winit",
|
"egui-winit",
|
||||||
"glow 0.11.2",
|
"glow",
|
||||||
"glutin",
|
"glutin",
|
||||||
"glutin-winit",
|
"glutin-winit",
|
||||||
"memoffset",
|
"memoffset",
|
||||||
|
|
@ -1772,18 +1740,6 @@ version = "0.3.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
|
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "glow"
|
|
||||||
version = "0.11.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919"
|
|
||||||
dependencies = [
|
|
||||||
"js-sys",
|
|
||||||
"slotmap",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"web-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "glow"
|
name = "glow"
|
||||||
version = "0.12.0"
|
version = "0.12.0"
|
||||||
|
|
@ -1946,10 +1902,6 @@ name = "half"
|
||||||
version = "1.8.2"
|
version = "1.8.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
|
checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
|
||||||
dependencies = [
|
|
||||||
"num-traits",
|
|
||||||
"zerocopy",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hashbrown"
|
name = "hashbrown"
|
||||||
|
|
@ -2221,12 +2173,6 @@ dependencies = [
|
||||||
"winapi",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "libm"
|
|
||||||
version = "0.2.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "line-wrap"
|
name = "line-wrap"
|
||||||
version = "0.1.1"
|
version = "0.1.1"
|
||||||
|
|
@ -2523,7 +2469,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
|
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg",
|
"autocfg",
|
||||||
"libm",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -3585,33 +3530,6 @@ dependencies = [
|
||||||
"once_cell",
|
"once_cell",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "three-d"
|
|
||||||
version = "0.13.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f7a5a1017829335f6761bdbae2daf3021a88314a1f8d5f188c9b62ce62e2fd31"
|
|
||||||
dependencies = [
|
|
||||||
"cgmath",
|
|
||||||
"glow 0.11.2",
|
|
||||||
"instant",
|
|
||||||
"thiserror",
|
|
||||||
"three-d-asset",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"web-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "three-d-asset"
|
|
||||||
version = "0.3.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e953f34aa4169e098621a1ff23a68c47b7798711f7c769bf741248e850e93fbe"
|
|
||||||
dependencies = [
|
|
||||||
"cgmath",
|
|
||||||
"half",
|
|
||||||
"thiserror",
|
|
||||||
"web-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "time"
|
name = "time"
|
||||||
version = "0.1.45"
|
version = "0.1.45"
|
||||||
|
|
@ -4274,7 +4192,7 @@ dependencies = [
|
||||||
"d3d12",
|
"d3d12",
|
||||||
"foreign-types",
|
"foreign-types",
|
||||||
"fxhash",
|
"fxhash",
|
||||||
"glow 0.12.0",
|
"glow",
|
||||||
"gpu-alloc",
|
"gpu-alloc",
|
||||||
"gpu-allocator",
|
"gpu-allocator",
|
||||||
"gpu-descriptor",
|
"gpu-descriptor",
|
||||||
|
|
@ -4747,27 +4665,6 @@ dependencies = [
|
||||||
"zvariant",
|
"zvariant",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "zerocopy"
|
|
||||||
version = "0.6.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "332f188cc1bcf1fe1064b8c58d150f497e697f49774aa846f2dc949d9a25f236"
|
|
||||||
dependencies = [
|
|
||||||
"byteorder",
|
|
||||||
"zerocopy-derive",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "zerocopy-derive"
|
|
||||||
version = "0.3.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6505e6815af7de1746a08f69c69606bb45695a17149517680f3b2149713b19a3"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote",
|
|
||||||
"syn",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zstd"
|
name = "zstd"
|
||||||
version = "0.11.2+zstd.1.5.2"
|
version = "0.11.2+zstd.1.5.2"
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@ tracing = { version = "0.1", default-features = false, features = ["std"] }
|
||||||
document-features = { version = "0.2", optional = true }
|
document-features = { version = "0.2", optional = true }
|
||||||
|
|
||||||
egui_glow = { version = "0.20.0", path = "../egui_glow", optional = true, default-features = false }
|
egui_glow = { version = "0.20.0", path = "../egui_glow", optional = true, default-features = false }
|
||||||
glow = { version = "0.11", optional = true }
|
glow = { version = "0.12", optional = true }
|
||||||
ron = { version = "0.8", optional = true, features = ["integer128"] }
|
ron = { version = "0.8", optional = true, features = ["integer128"] }
|
||||||
serde = { version = "1", optional = true, features = ["derive"] }
|
serde = { version = "1", optional = true, features = ["derive"] }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ All notable changes to the `egui_glow` integration will be noted in this file.
|
||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
* Remove the `screen_reader` feature ([#2669](https://github.com/emilk/egui/pull/2669)).
|
* Remove the `screen_reader` feature ([#2669](https://github.com/emilk/egui/pull/2669)).
|
||||||
|
* Update to `glow` 0.12 ([#2695](https://github.com/emilk/egui/pull/2695)).
|
||||||
|
|
||||||
|
|
||||||
## 0.20.1 - 2022-12-11
|
## 0.20.1 - 2022-12-11
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ egui = { version = "0.20.0", path = "../egui", default-features = false, feature
|
||||||
] }
|
] }
|
||||||
|
|
||||||
bytemuck = "1.7"
|
bytemuck = "1.7"
|
||||||
glow = "0.11"
|
glow = "0.12"
|
||||||
memoffset = "0.6"
|
memoffset = "0.6"
|
||||||
tracing = { version = "0.1", default-features = false, features = ["std"] }
|
tracing = { version = "0.1", default-features = false, features = ["std"] }
|
||||||
|
|
||||||
|
|
@ -69,7 +69,7 @@ wasm-bindgen = { version = "0.2" }
|
||||||
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
glutin = "0.30" # examples/pure_glow
|
glutin = "0.30" # examples/pure_glow
|
||||||
raw-window-handle = "0.5.0"
|
raw-window-handle = "0.5.0"
|
||||||
glutin-winit = "0.3.0"
|
glutin-winit = "0.3.0"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,6 @@ skip-tree = [
|
||||||
{ name = "darling" }, # old version via tts
|
{ name = "darling" }, # old version via tts
|
||||||
{ name = "foreign-types" }, # old version from wgpu
|
{ name = "foreign-types" }, # old version from wgpu
|
||||||
{ name = "rfd" }, # example dependency
|
{ name = "rfd" }, # example dependency
|
||||||
{ name = "three-d" }, # example dependency
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,4 +13,4 @@ eframe = { path = "../../crates/eframe", features = [
|
||||||
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
|
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
|
||||||
] }
|
] }
|
||||||
egui_glow = { path = "../../crates/egui_glow" }
|
egui_glow = { path = "../../crates/egui_glow" }
|
||||||
glow = "0.11"
|
glow = "0.12"
|
||||||
|
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
[package]
|
|
||||||
name = "custom_3d_three-d"
|
|
||||||
version = "0.1.0"
|
|
||||||
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
|
|
||||||
license = "MIT OR Apache-2.0"
|
|
||||||
edition = "2021"
|
|
||||||
rust-version = "1.65"
|
|
||||||
publish = false
|
|
||||||
|
|
||||||
[lib]
|
|
||||||
crate-type = ["cdylib", "rlib"]
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
eframe = { path = "../../crates/eframe", features = [
|
|
||||||
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
|
|
||||||
] }
|
|
||||||
egui_glow = { path = "../../crates/egui_glow" }
|
|
||||||
glow = "0.11"
|
|
||||||
three-d = { version = "0.13", default-features = false }
|
|
||||||
|
|
||||||
[target.'cfg(target_arch = "wasm32")'.dependencies] # Web dependencies
|
|
||||||
console_error_panic_hook = "0.1" # For logging
|
|
||||||
wasm-bindgen = "0.2" # Core bindings
|
|
||||||
wasm-bindgen-futures = "0.4" # Core bindings
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
This demo shows how to embed 3D rendering using [`three-d`](https://github.com/asny/three-d) in `eframe`.
|
|
||||||
|
|
||||||
Any 3D library built on top of [`glow`](https://github.com/grovesNL/glow) can be used in `eframe`.
|
|
||||||
|
|
||||||
Alternatively you can render 3D stuff to a texture and display it using [`egui::Ui::image`].
|
|
||||||
|
|
||||||
If you are content of having egui sit on top of a 3D background, take a look at:
|
|
||||||
|
|
||||||
* [`bevy_egui`](https://github.com/mvlabat/bevy_egui)
|
|
||||||
* [`three-d`](https://github.com/asny/three-d)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
```sh
|
|
||||||
cargo run -p custom_3d_three-d
|
|
||||||
```
|
|
||||||
|
|
||||||
```
|
|
||||||
wasm-pack build examples/custom_3d_three-d --target web
|
|
||||||
```
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta content="text/html;charset=utf-8" http-equiv="Content-Type"/>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<canvas id="my" style="position: absolute;top:0;bottom: 0;left: 0;right: 0;margin:auto;"></canvas>
|
|
||||||
<!-- Note the usage of `type=module` here as this is an ES6 module -->
|
|
||||||
<script type="module">
|
|
||||||
// Use ES module import syntax to import functionality from the module
|
|
||||||
// that we have compiled.
|
|
||||||
//
|
|
||||||
// Note that the `default` import is an initialization function which
|
|
||||||
// will "boot" the module and make it ready to use. Currently browsers
|
|
||||||
// don't support natively imported WebAssembly as an ES module, but
|
|
||||||
// eventually the manual initialization won't be required!
|
|
||||||
import init from './pkg/custom_3d_three_d.js';
|
|
||||||
|
|
||||||
async function run() {
|
|
||||||
// First up we need to actually load the wasm file, so we use the
|
|
||||||
// default export to inform it where the wasm file is located on the
|
|
||||||
// server, and then we wait on the returned promise to wait for the
|
|
||||||
// wasm to be loaded.
|
|
||||||
// It may look like this: `await init('./pkg/without_a_bundler_bg.wasm');`,
|
|
||||||
// but there is also a handy default inside `init` function, which uses
|
|
||||||
// `import.meta` to locate the wasm file relatively to js file
|
|
||||||
//
|
|
||||||
// Note that instead of a string here you can also pass in an instance
|
|
||||||
// of `WebAssembly.Module` which allows you to compile your own module.
|
|
||||||
// Also note that the promise, when resolved, yields the wasm module's
|
|
||||||
// exports which is the same as importing the `*_bg` module in other
|
|
||||||
// modes
|
|
||||||
await init('./pkg/custom_3d_three_d_bg.wasm');
|
|
||||||
}
|
|
||||||
|
|
||||||
run();
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 52 KiB |
|
|
@ -1,21 +0,0 @@
|
||||||
#![allow(special_module_name)]
|
|
||||||
|
|
||||||
mod main;
|
|
||||||
|
|
||||||
// Entry point for wasm
|
|
||||||
#[cfg(target_arch = "wasm32")]
|
|
||||||
use wasm_bindgen::prelude::*;
|
|
||||||
|
|
||||||
#[cfg(target_arch = "wasm32")]
|
|
||||||
#[wasm_bindgen(start)]
|
|
||||||
pub async fn start() -> Result<(), JsValue> {
|
|
||||||
std::panic::set_hook(Box::new(console_error_panic_hook::hook));
|
|
||||||
|
|
||||||
let web_options = eframe::WebOptions::default();
|
|
||||||
eframe::start_web(
|
|
||||||
"my",
|
|
||||||
web_options,
|
|
||||||
Box::new(|cc| Box::new(main::MyApp::new(cc))),
|
|
||||||
)?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
@ -1,231 +0,0 @@
|
||||||
#![allow(dead_code)]
|
|
||||||
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
|
|
||||||
|
|
||||||
use eframe::egui;
|
|
||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
|
||||||
fn main() -> Result<(), eframe::Error> {
|
|
||||||
let options = eframe::NativeOptions {
|
|
||||||
initial_window_size: Some(egui::vec2(550.0, 610.0)),
|
|
||||||
multisampling: 4,
|
|
||||||
renderer: eframe::Renderer::Glow,
|
|
||||||
depth_buffer: 24,
|
|
||||||
..Default::default()
|
|
||||||
};
|
|
||||||
eframe::run_native(
|
|
||||||
"Custom 3D painting in eframe!",
|
|
||||||
options,
|
|
||||||
Box::new(|cc| Box::new(MyApp::new(cc))),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct MyApp {
|
|
||||||
angle: f32,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl MyApp {
|
|
||||||
pub fn new(_cc: &eframe::CreationContext<'_>) -> Self {
|
|
||||||
Self { angle: 0.2 }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl eframe::App for MyApp {
|
|
||||||
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
|
|
||||||
egui::CentralPanel::default().show(ctx, |ui| {
|
|
||||||
egui::widgets::global_dark_light_mode_buttons(ui);
|
|
||||||
|
|
||||||
ui.horizontal(|ui| {
|
|
||||||
ui.spacing_mut().item_spacing.x = 0.0;
|
|
||||||
ui.label("The triangle is being painted using ");
|
|
||||||
ui.hyperlink_to("three-d", "https://github.com/asny/three-d");
|
|
||||||
ui.label(".");
|
|
||||||
});
|
|
||||||
|
|
||||||
egui::ScrollArea::both().show(ui, |ui| {
|
|
||||||
egui::Frame::canvas(ui.style()).show(ui, |ui| {
|
|
||||||
let (rect, response) =
|
|
||||||
ui.allocate_exact_size(egui::Vec2::splat(512.0), egui::Sense::drag());
|
|
||||||
|
|
||||||
self.angle += response.drag_delta().x * 0.01;
|
|
||||||
|
|
||||||
// Clone locals so we can move them into the paint callback:
|
|
||||||
let angle = self.angle;
|
|
||||||
|
|
||||||
let callback = egui::PaintCallback {
|
|
||||||
rect,
|
|
||||||
callback: std::sync::Arc::new(egui_glow::CallbackFn::new(
|
|
||||||
move |info, painter| {
|
|
||||||
with_three_d(painter.gl(), |three_d| {
|
|
||||||
three_d.frame(
|
|
||||||
FrameInput::new(&three_d.context, &info, painter),
|
|
||||||
angle,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
},
|
|
||||||
)),
|
|
||||||
};
|
|
||||||
ui.painter().add(callback);
|
|
||||||
});
|
|
||||||
ui.label("Drag to rotate!");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// We get a [`glow::Context`] from `eframe` and we want to construct a [`ThreeDApp`].
|
|
||||||
///
|
|
||||||
/// Sadly we can't just create a [`ThreeDApp`] in [`MyApp::new`] and pass it
|
|
||||||
/// to the [`egui::PaintCallback`] because [`glow::Context`] isn't `Send+Sync` on web, which
|
|
||||||
/// [`egui::PaintCallback`] needs. If you do not target web, then you can construct the [`ThreeDApp`] in [`MyApp::new`].
|
|
||||||
fn with_three_d<R>(gl: &std::sync::Arc<glow::Context>, f: impl FnOnce(&mut ThreeDApp) -> R) -> R {
|
|
||||||
use std::cell::RefCell;
|
|
||||||
thread_local! {
|
|
||||||
pub static THREE_D: RefCell<Option<ThreeDApp>> = RefCell::new(None);
|
|
||||||
}
|
|
||||||
|
|
||||||
THREE_D.with(|three_d| {
|
|
||||||
let mut three_d = three_d.borrow_mut();
|
|
||||||
let three_d = three_d.get_or_insert_with(|| ThreeDApp::new(gl.clone()));
|
|
||||||
f(three_d)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
///
|
|
||||||
/// Translates from egui input to three-d input
|
|
||||||
///
|
|
||||||
pub struct FrameInput<'a> {
|
|
||||||
screen: three_d::RenderTarget<'a>,
|
|
||||||
viewport: three_d::Viewport,
|
|
||||||
scissor_box: three_d::ScissorBox,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl FrameInput<'_> {
|
|
||||||
pub fn new(
|
|
||||||
context: &three_d::Context,
|
|
||||||
info: &egui::PaintCallbackInfo,
|
|
||||||
painter: &egui_glow::Painter,
|
|
||||||
) -> Self {
|
|
||||||
use three_d::*;
|
|
||||||
|
|
||||||
// Disable sRGB textures for three-d
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
|
||||||
#[allow(unsafe_code)]
|
|
||||||
unsafe {
|
|
||||||
use glow::HasContext as _;
|
|
||||||
context.disable(glow::FRAMEBUFFER_SRGB);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Constructs a screen render target to render the final image to
|
|
||||||
let screen = painter.intermediate_fbo().map_or_else(
|
|
||||||
|| {
|
|
||||||
RenderTarget::screen(
|
|
||||||
context,
|
|
||||||
info.viewport.width() as u32,
|
|
||||||
info.viewport.height() as u32,
|
|
||||||
)
|
|
||||||
},
|
|
||||||
|fbo| {
|
|
||||||
RenderTarget::from_framebuffer(
|
|
||||||
context,
|
|
||||||
info.viewport.width() as u32,
|
|
||||||
info.viewport.height() as u32,
|
|
||||||
fbo,
|
|
||||||
)
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
// Set where to paint
|
|
||||||
let viewport = info.viewport_in_pixels();
|
|
||||||
let viewport = Viewport {
|
|
||||||
x: viewport.left_px.round() as _,
|
|
||||||
y: viewport.from_bottom_px.round() as _,
|
|
||||||
width: viewport.width_px.round() as _,
|
|
||||||
height: viewport.height_px.round() as _,
|
|
||||||
};
|
|
||||||
|
|
||||||
// Respect the egui clip region (e.g. if we are inside an `egui::ScrollArea`).
|
|
||||||
let clip_rect = info.clip_rect_in_pixels();
|
|
||||||
let scissor_box = ScissorBox {
|
|
||||||
x: clip_rect.left_px.round() as _,
|
|
||||||
y: clip_rect.from_bottom_px.round() as _,
|
|
||||||
width: clip_rect.width_px.round() as _,
|
|
||||||
height: clip_rect.height_px.round() as _,
|
|
||||||
};
|
|
||||||
Self {
|
|
||||||
screen,
|
|
||||||
scissor_box,
|
|
||||||
viewport,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
///
|
|
||||||
/// Based on the `three-d` [Triangle example](https://github.com/asny/three-d/blob/master/examples/triangle/src/main.rs).
|
|
||||||
/// This is where you'll need to customize
|
|
||||||
///
|
|
||||||
use three_d::*;
|
|
||||||
pub struct ThreeDApp {
|
|
||||||
context: Context,
|
|
||||||
camera: Camera,
|
|
||||||
model: Gm<Mesh, ColorMaterial>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ThreeDApp {
|
|
||||||
pub fn new(gl: std::sync::Arc<glow::Context>) -> Self {
|
|
||||||
let context = Context::from_gl_context(gl).unwrap();
|
|
||||||
// Create a camera
|
|
||||||
let camera = Camera::new_perspective(
|
|
||||||
Viewport::new_at_origo(1, 1),
|
|
||||||
vec3(0.0, 0.0, 2.0),
|
|
||||||
vec3(0.0, 0.0, 0.0),
|
|
||||||
vec3(0.0, 1.0, 0.0),
|
|
||||||
degrees(45.0),
|
|
||||||
0.1,
|
|
||||||
10.0,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Create a CPU-side mesh consisting of a single colored triangle
|
|
||||||
let positions = vec![
|
|
||||||
vec3(0.5, -0.5, 0.0), // bottom right
|
|
||||||
vec3(-0.5, -0.5, 0.0), // bottom left
|
|
||||||
vec3(0.0, 0.5, 0.0), // top
|
|
||||||
];
|
|
||||||
let colors = vec![
|
|
||||||
Color::new(255, 0, 0, 255), // bottom right
|
|
||||||
Color::new(0, 255, 0, 255), // bottom left
|
|
||||||
Color::new(0, 0, 255, 255), // top
|
|
||||||
];
|
|
||||||
let cpu_mesh = CpuMesh {
|
|
||||||
positions: Positions::F32(positions),
|
|
||||||
colors: Some(colors),
|
|
||||||
..Default::default()
|
|
||||||
};
|
|
||||||
|
|
||||||
// Construct a model, with a default color material, thereby transferring the mesh data to the GPU
|
|
||||||
let model = Gm::new(Mesh::new(&context, &cpu_mesh), ColorMaterial::default());
|
|
||||||
Self {
|
|
||||||
context,
|
|
||||||
camera,
|
|
||||||
model,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn frame(&mut self, frame_input: FrameInput<'_>, angle: f32) -> Option<glow::Framebuffer> {
|
|
||||||
// Ensure the viewport matches the current window viewport which changes if the window is resized
|
|
||||||
self.camera.set_viewport(frame_input.viewport);
|
|
||||||
|
|
||||||
// Set the current transformation of the triangle
|
|
||||||
self.model
|
|
||||||
.set_transformation(Mat4::from_angle_y(radians(angle)));
|
|
||||||
|
|
||||||
// Get the screen render target to be able to render something on the screen
|
|
||||||
frame_input
|
|
||||||
.screen
|
|
||||||
// Clear the color and depth of the screen render target
|
|
||||||
.clear_partially(frame_input.scissor_box, ClearState::depth(1.0))
|
|
||||||
// Render the triangle with the color material which uses the per vertex colors defined at construction
|
|
||||||
.render_partially(frame_input.scissor_box, &self.camera, &[&self.model], &[]);
|
|
||||||
|
|
||||||
frame_input.screen.into_framebuffer() // Take back the screen fbo, we will continue to use it.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue