diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d4c0ce44d..205a7b6bc 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -24,7 +24,7 @@ jobs: command: check check_egui_demo_web: - name: Check egui_demo (web) + name: Check egui_demo_app (web) runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -37,7 +37,7 @@ jobs: - uses: actions-rs/cargo@v1 with: command: check - args: -p egui_demo --lib --target wasm32-unknown-unknown + args: -p egui_demo_app --lib --target wasm32-unknown-unknown test: name: Test Suite diff --git a/Cargo.lock b/Cargo.lock index 34675856c..83de9e1cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -642,7 +642,7 @@ dependencies = [ ] [[package]] -name = "egui_demo" +name = "egui_demo_app" version = "0.1.0" dependencies = [ "eframe", diff --git a/Cargo.toml b/Cargo.toml index 381775efb..68869bc4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] members = [ + "egui_demo_app", "egui_demo_lib", - "egui_demo", "egui_glium", "egui_web", "egui", diff --git a/build_demo_native.sh b/build_demo_native.sh index 6497d8a60..dd8e66aa3 100755 --- a/build_demo_native.sh +++ b/build_demo_native.sh @@ -1,4 +1,4 @@ #!/bin/bash set -eu -cargo run --bin egui_demo --release +cargo run --bin egui_demo_app --release diff --git a/build_demo_web.sh b/build_demo_web.sh index f4e4663d1..aaeb52ee0 100755 --- a/build_demo_web.sh +++ b/build_demo_web.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eu -CRATE_NAME="egui_demo" +CRATE_NAME="egui_demo_app" # This is required to enable the web_sys clipboard API which egui_web uses # https://rustwasm.github.io/wasm-bindgen/api/web_sys/struct.Clipboard.html diff --git a/check.sh b/check.sh index 567a78129..50f0f2600 100755 --- a/check.sh +++ b/check.sh @@ -8,7 +8,7 @@ cargo test --workspace --all-targets --all-features cargo test --workspace --doc cargo check -p egui_web --lib --target wasm32-unknown-unknown -cargo check -p egui_demo --lib --target wasm32-unknown-unknown +cargo check -p egui_demo_app --lib --target wasm32-unknown-unknown cargo check -p example_web --lib --target wasm32-unknown-unknown # For finding bloat: diff --git a/docs/egui_demo.js b/docs/egui_demo_app.js similarity index 96% rename from docs/egui_demo.js rename to docs/egui_demo_app.js index 5edf256ec..015826e20 100644 --- a/docs/egui_demo.js +++ b/docs/egui_demo_app.js @@ -791,36 +791,36 @@ async function init(input) { var ret = wasm.memory; return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper308 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 58, __wbg_adapter_24); + imports.wbg.__wbindgen_closure_wrapper633 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 110, __wbg_adapter_24); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper309 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 58, __wbg_adapter_27); + imports.wbg.__wbindgen_closure_wrapper634 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 110, __wbg_adapter_27); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper312 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 58, __wbg_adapter_30); + imports.wbg.__wbindgen_closure_wrapper637 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 110, __wbg_adapter_30); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper314 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 58, __wbg_adapter_33); + imports.wbg.__wbindgen_closure_wrapper639 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 110, __wbg_adapter_33); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper316 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 58, __wbg_adapter_36); + imports.wbg.__wbindgen_closure_wrapper641 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 110, __wbg_adapter_36); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper318 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 58, __wbg_adapter_39); + imports.wbg.__wbindgen_closure_wrapper643 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 110, __wbg_adapter_39); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper320 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 58, __wbg_adapter_42); + imports.wbg.__wbindgen_closure_wrapper645 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 110, __wbg_adapter_42); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper1111 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 129, __wbg_adapter_45); + imports.wbg.__wbindgen_closure_wrapper1422 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 179, __wbg_adapter_45); return addHeapObject(ret); }; diff --git a/docs/egui_demo_bg.wasm b/docs/egui_demo_app_bg.wasm similarity index 61% rename from docs/egui_demo_bg.wasm rename to docs/egui_demo_app_bg.wasm index e1918bc31..e68694c37 100644 Binary files a/docs/egui_demo_bg.wasm and b/docs/egui_demo_app_bg.wasm differ diff --git a/docs/index.html b/docs/index.html index 2efb8db9a..869899d12 100644 --- a/docs/index.html +++ b/docs/index.html @@ -57,13 +57,13 @@ - +