Update to eframe / egui 0.8.0
This commit is contained in:
Emil Ernerfeldt
parent
0492545a7a
commit
a4db3498f6
130
Cargo.lock
generated
130
Cargo.lock
generated
|
|
@ -27,7 +27,7 @@ version = "0.6.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a75b7e6a93ecd6dbd2c225154d0fa7f86205574ecaa6c87429fb5f66ee677c44"
|
||||
dependencies = [
|
||||
"getrandom 0.2.1",
|
||||
"getrandom",
|
||||
"lazy_static",
|
||||
"version_check",
|
||||
]
|
||||
|
|
@ -353,9 +353,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "dirs-sys-next"
|
||||
version = "0.1.1"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "99de365f605554ae33f115102a02057d4fc18b01f3284d6870be0938743cfe7d"
|
||||
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"redox_users",
|
||||
|
|
@ -385,9 +385,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
|
|||
|
||||
[[package]]
|
||||
name = "eframe"
|
||||
version = "0.7.0"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e9d45b24f7ffb090780029d210f345bada5f27c1cfed650ada44e4a381f121ef"
|
||||
checksum = "3fe79090a83fcc15016a0eee2194431ae56c590bbbb3b3125ac0679336db81d9"
|
||||
dependencies = [
|
||||
"egui",
|
||||
"egui_glium",
|
||||
|
|
@ -397,21 +397,19 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "egui"
|
||||
version = "0.7.0"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f073ba598f9a5c37d920cf934eee70f2d3bb945a2950620a5e4cd0894db69e5d"
|
||||
checksum = "6f550e7f51023f5ea92eae420fae368a52927deed22dcbefc7c22c140b02d7b4"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"atomic_refcell",
|
||||
"rusttype",
|
||||
"epaint",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "egui_glium"
|
||||
version = "0.7.0"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32434c256026c89521dfa07ad58dc37eaa0693dff01b01bf064ea2b65ab173d6"
|
||||
checksum = "81ce5f3b58630b6cb35a7bb9e566a7dfd5ccb464f68c2e80c76a929e931f6dc3"
|
||||
dependencies = [
|
||||
"clipboard",
|
||||
"directories-next",
|
||||
|
|
@ -434,9 +432,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "egui_web"
|
||||
version = "0.7.0"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0602627e30da70039d33a1fe23a566bd45a0c1450b2eabfca9e8a1b4cb33570c"
|
||||
checksum = "476a7488d74e7ebe38847c86e413f0bdb495ef1ac1b40c286be31f965aa3a248"
|
||||
dependencies = [
|
||||
"egui",
|
||||
"epi",
|
||||
|
|
@ -449,10 +447,32 @@ dependencies = [
|
|||
]
|
||||
|
||||
[[package]]
|
||||
name = "epi"
|
||||
version = "0.7.0"
|
||||
name = "emath"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a9698a50f1c78d153f856821b2b2a6179833b64c45672529089b58ff6bb82867"
|
||||
checksum = "6d876a5b910712537191b8d9aa1550a212a62fd2dd6f44f6ca5c671cf89bb841"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "epaint"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9fdb7fdb35896a43ad950a28b5188240cfbd186b22aa50269978575170b73c83"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"atomic_refcell",
|
||||
"emath",
|
||||
"rusttype",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "epi"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e358eaf8b9898aa366bed1c0645dd439f272341e5cd1404c8a6a604e544ee065"
|
||||
dependencies = [
|
||||
"egui",
|
||||
"serde",
|
||||
|
|
@ -506,17 +526,6 @@ version = "0.3.3"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.1.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"libc",
|
||||
"wasi 0.9.0+wasi-snapshot-preview1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.1"
|
||||
|
|
@ -525,7 +534,7 @@ checksum = "4060f4657be78b8e766215b02b18a2e862d83745545de804638e2b545e81aee6"
|
|||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"libc",
|
||||
"wasi 0.10.0+wasi-snapshot-preview1",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -719,15 +728,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
|
|||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.81"
|
||||
version = "0.2.82"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
|
||||
checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
|
||||
|
||||
[[package]]
|
||||
name = "libloading"
|
||||
version = "0.6.6"
|
||||
version = "0.6.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e9367bdfa836b7e3cf895867f7a570283444da90562980ec2263d6e1569b16bc"
|
||||
checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"winapi 0.3.9",
|
||||
|
|
@ -744,9 +753,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.11"
|
||||
version = "0.4.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
|
||||
checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2"
|
||||
dependencies = [
|
||||
"cfg-if 0.1.10",
|
||||
]
|
||||
|
|
@ -1028,7 +1037,7 @@ dependencies = [
|
|||
"cfg-if 1.0.0",
|
||||
"instant",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"redox_syscall 0.1.57",
|
||||
"smallvec",
|
||||
"winapi 0.3.9",
|
||||
]
|
||||
|
|
@ -1088,13 +1097,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
|
||||
|
||||
[[package]]
|
||||
name = "redox_users"
|
||||
version = "0.3.5"
|
||||
name = "redox_syscall"
|
||||
version = "0.2.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
|
||||
checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570"
|
||||
dependencies = [
|
||||
"getrandom 0.1.16",
|
||||
"redox_syscall",
|
||||
"bitflags",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_users"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"redox_syscall 0.2.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1180,18 +1198,18 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.118"
|
||||
version = "1.0.119"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
|
||||
checksum = "9bdd36f49e35b61d49efd8aa7fc068fd295961fd2286d0b2ee9a4c7a14e99cc3"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.118"
|
||||
version = "1.0.119"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
|
||||
checksum = "552954ce79a059ddd5fd68c271592374bd15cab2274970380c000118aeffe1cd"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1227,9 +1245,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
|
|||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.6.0"
|
||||
version = "1.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a55ca5f3b68e41c979bf8c46a6f1da892ca4db8f94023ce0bd32407573b1ac0"
|
||||
checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
|
||||
|
||||
[[package]]
|
||||
name = "smithay-client-toolkit"
|
||||
|
|
@ -1264,9 +1282,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
|
|||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.57"
|
||||
version = "1.0.58"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4211ce9909eb971f111059df92c45640aad50a619cf55cd76476be803c4c68e6"
|
||||
checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1361,9 +1379,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
|
|||
|
||||
[[package]]
|
||||
name = "ureq"
|
||||
version = "2.0.0"
|
||||
version = "2.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e562326b32e3766fee6a4890b62489b4b095e94ac07232cfea631668002c19d7"
|
||||
checksum = "96014ded8c85822677daee4f909d18acccca744810fd4f8ffc492c284f2324bc"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"chunked_transfer",
|
||||
|
|
@ -1406,15 +1424,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.9.0+wasi-snapshot-preview1"
|
||||
version = "0.10.1+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.10.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
|
||||
checksum = "93c6c3420963c5c64bca373b25e77acb562081b9bb4dd5bb864187742186cea9"
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ edition = "2018"
|
|||
crate-type = ["cdylib", "rlib"]
|
||||
|
||||
[dependencies]
|
||||
eframe = "0.7" # Gives us egui, epi and web+native backends
|
||||
eframe = "0.8.0" # Gives us egui, epi and web+native backends
|
||||
|
||||
serde = { version = "1", features = ["derive"], optional = true }
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
# Egui Template
|
||||
# egui template
|
||||
|
||||
[](https://deps.rs/repo/github/emilk/egui_template)
|
||||
[](https://github.com/emilk/egui_template/actions?workflow=CI)
|
||||
|
||||
This is a template repo for [Egui](https://github.com/emilk/egui/).
|
||||
This is a template repo for [egui](https://github.com/emilk/egui/).
|
||||
|
||||
The goal is for this to be the simplest way to get started writing a GUI app in Rust.
|
||||
|
||||
|
|
@ -43,6 +43,6 @@ The finished we app is found in the `docs/` folder (this is so that you can easi
|
|||
|
||||
You can test the template app at <https://emilk.github.io/egui_template/>.
|
||||
|
||||
## Updating Egui
|
||||
## Updating egui
|
||||
|
||||
As of 2020, Egui is in active development with frequent releases with breaking changes. [egui_template](https://github.com/emilk/egui_template/) will be updated in lock-step to always use the latest version of Egui.
|
||||
As of 2021, egui is in active development with frequent releases with breaking changes. [egui_template](https://github.com/emilk/egui_template/) will be updated in lock-step to always use the latest version of egui.
|
||||
|
|
|
|||
|
|
@ -213,35 +213,35 @@ function makeMutClosure(arg0, arg1, dtor, f) {
|
|||
return real;
|
||||
}
|
||||
function __wbg_adapter_24(arg0, arg1) {
|
||||
wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h4db4fbbc679e9fdf(arg0, arg1);
|
||||
wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h67329898b0697c05(arg0, arg1);
|
||||
}
|
||||
|
||||
function __wbg_adapter_27(arg0, arg1, arg2) {
|
||||
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h3854978ea0066dbc(arg0, arg1, addHeapObject(arg2));
|
||||
function __wbg_adapter_27(arg0, arg1) {
|
||||
wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__he232669b961831c5(arg0, arg1);
|
||||
}
|
||||
|
||||
function __wbg_adapter_30(arg0, arg1, arg2) {
|
||||
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h3854978ea0066dbc(arg0, arg1, addHeapObject(arg2));
|
||||
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h17586ada2fcc7afa(arg0, arg1, addHeapObject(arg2));
|
||||
}
|
||||
|
||||
function __wbg_adapter_33(arg0, arg1, arg2) {
|
||||
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h3854978ea0066dbc(arg0, arg1, addHeapObject(arg2));
|
||||
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h17586ada2fcc7afa(arg0, arg1, addHeapObject(arg2));
|
||||
}
|
||||
|
||||
function __wbg_adapter_36(arg0, arg1, arg2) {
|
||||
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h3854978ea0066dbc(arg0, arg1, addHeapObject(arg2));
|
||||
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h17586ada2fcc7afa(arg0, arg1, addHeapObject(arg2));
|
||||
}
|
||||
|
||||
function __wbg_adapter_39(arg0, arg1) {
|
||||
wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h76d6ede093c07723(arg0, arg1);
|
||||
function __wbg_adapter_39(arg0, arg1, arg2) {
|
||||
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h17586ada2fcc7afa(arg0, arg1, addHeapObject(arg2));
|
||||
}
|
||||
|
||||
function __wbg_adapter_42(arg0, arg1, arg2) {
|
||||
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h3854978ea0066dbc(arg0, arg1, addHeapObject(arg2));
|
||||
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h17586ada2fcc7afa(arg0, arg1, addHeapObject(arg2));
|
||||
}
|
||||
|
||||
function __wbg_adapter_45(arg0, arg1, arg2) {
|
||||
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h6f43a93dde0ee379(arg0, arg1, addHeapObject(arg2));
|
||||
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hfcae3bd1b2ceed2f(arg0, arg1, addHeapObject(arg2));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -257,6 +257,10 @@ __exports.start = function(canvas_id) {
|
|||
wasm.start(ptr0, len0);
|
||||
};
|
||||
|
||||
function getArrayU8FromWasm0(ptr, len) {
|
||||
return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
|
||||
}
|
||||
|
||||
function handleError(f) {
|
||||
return function () {
|
||||
try {
|
||||
|
|
@ -268,10 +272,6 @@ function handleError(f) {
|
|||
};
|
||||
}
|
||||
|
||||
function getArrayU8FromWasm0(ptr, len) {
|
||||
return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
|
||||
}
|
||||
|
||||
async function load(module, imports) {
|
||||
if (typeof Response === 'function' && module instanceof Response) {
|
||||
|
||||
|
|
@ -333,6 +333,136 @@ async function init(input) {
|
|||
var ret = false;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_instanceof_WebGl2RenderingContext_9818b789249374d3 = function(arg0) {
|
||||
var ret = getObject(arg0) instanceof WebGL2RenderingContext;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_drawingBufferWidth_efc3fcc01d710783 = function(arg0) {
|
||||
var ret = getObject(arg0).drawingBufferWidth;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_drawingBufferHeight_0ef66118ee2081ad = function(arg0) {
|
||||
var ret = getObject(arg0).drawingBufferHeight;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_bufferData_b5889c60c7d61946 = function(arg0, arg1, arg2, arg3) {
|
||||
getObject(arg0).bufferData(arg1 >>> 0, getObject(arg2), arg3 >>> 0);
|
||||
};
|
||||
imports.wbg.__wbg_texImage2D_79c0e000ef5e1b0a = handleError(function(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10) {
|
||||
getObject(arg0).texImage2D(arg1 >>> 0, arg2, arg3, arg4, arg5, arg6, arg7 >>> 0, arg8 >>> 0, arg9 === 0 ? undefined : getArrayU8FromWasm0(arg9, arg10));
|
||||
});
|
||||
imports.wbg.__wbg_activeTexture_a756131b7b4547f3 = function(arg0, arg1) {
|
||||
getObject(arg0).activeTexture(arg1 >>> 0);
|
||||
};
|
||||
imports.wbg.__wbg_attachShader_386953a8caf97e31 = function(arg0, arg1, arg2) {
|
||||
getObject(arg0).attachShader(getObject(arg1), getObject(arg2));
|
||||
};
|
||||
imports.wbg.__wbg_bindBuffer_2cb370d7ee8c8faa = function(arg0, arg1, arg2) {
|
||||
getObject(arg0).bindBuffer(arg1 >>> 0, getObject(arg2));
|
||||
};
|
||||
imports.wbg.__wbg_bindTexture_f3ab6393f75a763f = function(arg0, arg1, arg2) {
|
||||
getObject(arg0).bindTexture(arg1 >>> 0, getObject(arg2));
|
||||
};
|
||||
imports.wbg.__wbg_blendFunc_8593e88646aa2829 = function(arg0, arg1, arg2) {
|
||||
getObject(arg0).blendFunc(arg1 >>> 0, arg2 >>> 0);
|
||||
};
|
||||
imports.wbg.__wbg_clear_8e691dd4fbcdb78d = function(arg0, arg1) {
|
||||
getObject(arg0).clear(arg1 >>> 0);
|
||||
};
|
||||
imports.wbg.__wbg_clearColor_c478bc8e70dd1fde = function(arg0, arg1, arg2, arg3, arg4) {
|
||||
getObject(arg0).clearColor(arg1, arg2, arg3, arg4);
|
||||
};
|
||||
imports.wbg.__wbg_compileShader_3c4bd5d4666a9951 = function(arg0, arg1) {
|
||||
getObject(arg0).compileShader(getObject(arg1));
|
||||
};
|
||||
imports.wbg.__wbg_createBuffer_a9e0a9167dc2f2b4 = function(arg0) {
|
||||
var ret = getObject(arg0).createBuffer();
|
||||
return isLikeNone(ret) ? 0 : addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_createProgram_4823f8197c94860f = function(arg0) {
|
||||
var ret = getObject(arg0).createProgram();
|
||||
return isLikeNone(ret) ? 0 : addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_createShader_9378e5028efeddcf = function(arg0, arg1) {
|
||||
var ret = getObject(arg0).createShader(arg1 >>> 0);
|
||||
return isLikeNone(ret) ? 0 : addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_createTexture_151a385cd028c893 = function(arg0) {
|
||||
var ret = getObject(arg0).createTexture();
|
||||
return isLikeNone(ret) ? 0 : addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_disable_5c31195749c90c83 = function(arg0, arg1) {
|
||||
getObject(arg0).disable(arg1 >>> 0);
|
||||
};
|
||||
imports.wbg.__wbg_drawElements_4572c575d9e77ece = function(arg0, arg1, arg2, arg3, arg4) {
|
||||
getObject(arg0).drawElements(arg1 >>> 0, arg2, arg3 >>> 0, arg4);
|
||||
};
|
||||
imports.wbg.__wbg_enable_f7d5513a12216046 = function(arg0, arg1) {
|
||||
getObject(arg0).enable(arg1 >>> 0);
|
||||
};
|
||||
imports.wbg.__wbg_enableVertexAttribArray_3f2a29ade8fb65f9 = function(arg0, arg1) {
|
||||
getObject(arg0).enableVertexAttribArray(arg1 >>> 0);
|
||||
};
|
||||
imports.wbg.__wbg_getAttribLocation_713a1d120f1e32ba = function(arg0, arg1, arg2, arg3) {
|
||||
var ret = getObject(arg0).getAttribLocation(getObject(arg1), getStringFromWasm0(arg2, arg3));
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_getProgramInfoLog_900722958284ce83 = function(arg0, arg1, arg2) {
|
||||
var ret = getObject(arg1).getProgramInfoLog(getObject(arg2));
|
||||
var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
|
||||
var len0 = WASM_VECTOR_LEN;
|
||||
getInt32Memory0()[arg0 / 4 + 1] = len0;
|
||||
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
|
||||
};
|
||||
imports.wbg.__wbg_getProgramParameter_7f66eafe63848c93 = function(arg0, arg1, arg2) {
|
||||
var ret = getObject(arg0).getProgramParameter(getObject(arg1), arg2 >>> 0);
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_getShaderInfoLog_6e3d36e74e32aa2b = function(arg0, arg1, arg2) {
|
||||
var ret = getObject(arg1).getShaderInfoLog(getObject(arg2));
|
||||
var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
|
||||
var len0 = WASM_VECTOR_LEN;
|
||||
getInt32Memory0()[arg0 / 4 + 1] = len0;
|
||||
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
|
||||
};
|
||||
imports.wbg.__wbg_getShaderParameter_d3ad5fb12a1da258 = function(arg0, arg1, arg2) {
|
||||
var ret = getObject(arg0).getShaderParameter(getObject(arg1), arg2 >>> 0);
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_getUniformLocation_02d298730d44dadc = function(arg0, arg1, arg2, arg3) {
|
||||
var ret = getObject(arg0).getUniformLocation(getObject(arg1), getStringFromWasm0(arg2, arg3));
|
||||
return isLikeNone(ret) ? 0 : addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_linkProgram_be955380b2064b69 = function(arg0, arg1) {
|
||||
getObject(arg0).linkProgram(getObject(arg1));
|
||||
};
|
||||
imports.wbg.__wbg_pixelStorei_8ec92e6e4c16982c = function(arg0, arg1, arg2) {
|
||||
getObject(arg0).pixelStorei(arg1 >>> 0, arg2);
|
||||
};
|
||||
imports.wbg.__wbg_scissor_967dc192f6260c23 = function(arg0, arg1, arg2, arg3, arg4) {
|
||||
getObject(arg0).scissor(arg1, arg2, arg3, arg4);
|
||||
};
|
||||
imports.wbg.__wbg_shaderSource_0b51ed30c2234a07 = function(arg0, arg1, arg2, arg3) {
|
||||
getObject(arg0).shaderSource(getObject(arg1), getStringFromWasm0(arg2, arg3));
|
||||
};
|
||||
imports.wbg.__wbg_texParameteri_6e7ba8c54bb639f2 = function(arg0, arg1, arg2, arg3) {
|
||||
getObject(arg0).texParameteri(arg1 >>> 0, arg2 >>> 0, arg3);
|
||||
};
|
||||
imports.wbg.__wbg_uniform1i_2cb54693e4c3bace = function(arg0, arg1, arg2) {
|
||||
getObject(arg0).uniform1i(getObject(arg1), arg2);
|
||||
};
|
||||
imports.wbg.__wbg_uniform2f_9983be9fcaad4947 = function(arg0, arg1, arg2, arg3) {
|
||||
getObject(arg0).uniform2f(getObject(arg1), arg2, arg3);
|
||||
};
|
||||
imports.wbg.__wbg_useProgram_6b54e2f64672af62 = function(arg0, arg1) {
|
||||
getObject(arg0).useProgram(getObject(arg1));
|
||||
};
|
||||
imports.wbg.__wbg_vertexAttribPointer_12aeb3ec86d48d18 = function(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
|
||||
getObject(arg0).vertexAttribPointer(arg1 >>> 0, arg2, arg3 >>> 0, arg4 !== 0, arg5, arg6);
|
||||
};
|
||||
imports.wbg.__wbg_viewport_ec826bf788ce964f = function(arg0, arg1, arg2, arg3, arg4) {
|
||||
getObject(arg0).viewport(arg1, arg2, arg3, arg4);
|
||||
};
|
||||
imports.wbg.__wbg_instanceof_Window_49f532f06a9786ee = function(arg0) {
|
||||
var ret = getObject(arg0) instanceof Window;
|
||||
return ret;
|
||||
|
|
@ -381,13 +511,28 @@ async function init(input) {
|
|||
var ret = getObject(arg0).setInterval(getObject(arg1), arg2);
|
||||
return ret;
|
||||
});
|
||||
imports.wbg.__wbg_body_c8cb19d760637268 = function(arg0) {
|
||||
var ret = getObject(arg0).body;
|
||||
return isLikeNone(ret) ? 0 : addHeapObject(ret);
|
||||
imports.wbg.__wbg_clientX_3a14a1583294607f = function(arg0) {
|
||||
var ret = getObject(arg0).clientX;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_getElementById_15aef17a620252b4 = function(arg0, arg1, arg2) {
|
||||
var ret = getObject(arg0).getElementById(getStringFromWasm0(arg1, arg2));
|
||||
return isLikeNone(ret) ? 0 : addHeapObject(ret);
|
||||
imports.wbg.__wbg_clientY_4b4a322b80551002 = function(arg0) {
|
||||
var ret = getObject(arg0).clientY;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_writeText_f3dba2a1b4785c80 = function(arg0, arg1, arg2) {
|
||||
var ret = getObject(arg0).writeText(getStringFromWasm0(arg1, arg2));
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_addEventListener_6a37bc32387cb66d = handleError(function(arg0, arg1, arg2, arg3) {
|
||||
getObject(arg0).addEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3));
|
||||
});
|
||||
imports.wbg.__wbg_deltaX_5fac4f36a42e6ec9 = function(arg0) {
|
||||
var ret = getObject(arg0).deltaX;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_deltaY_2722120e563d3160 = function(arg0) {
|
||||
var ret = getObject(arg0).deltaY;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_now_7628760b7b640632 = function(arg0) {
|
||||
var ret = getObject(arg0).now();
|
||||
|
|
@ -458,10 +603,6 @@ async function init(input) {
|
|||
getInt32Memory0()[arg0 / 4 + 1] = len0;
|
||||
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
|
||||
};
|
||||
imports.wbg.__wbg_touches_3d22a22deb0f5409 = function(arg0) {
|
||||
var ret = getObject(arg0).touches;
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_getData_10c8cb329803d2b8 = handleError(function(arg0, arg1, arg2, arg3) {
|
||||
var ret = getObject(arg1).getData(getStringFromWasm0(arg2, arg3));
|
||||
var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
|
||||
|
|
@ -475,13 +616,17 @@ async function init(input) {
|
|||
imports.wbg.__wbg_stopPropagation_697200010cec9b7e = function(arg0) {
|
||||
getObject(arg0).stopPropagation();
|
||||
};
|
||||
imports.wbg.__wbg_clipboardData_503a7e4407c6231c = function(arg0) {
|
||||
var ret = getObject(arg0).clipboardData;
|
||||
imports.wbg.__wbg_touches_3d22a22deb0f5409 = function(arg0) {
|
||||
var ret = getObject(arg0).touches;
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_body_c8cb19d760637268 = function(arg0) {
|
||||
var ret = getObject(arg0).body;
|
||||
return isLikeNone(ret) ? 0 : addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_clipboard_a2f55b432ef7d0b0 = function(arg0) {
|
||||
var ret = getObject(arg0).clipboard;
|
||||
return addHeapObject(ret);
|
||||
imports.wbg.__wbg_getElementById_15aef17a620252b4 = function(arg0, arg1, arg2) {
|
||||
var ret = getObject(arg0).getElementById(getStringFromWasm0(arg1, arg2));
|
||||
return isLikeNone(ret) ? 0 : addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_getBoundingClientRect_505844bd8eb35668 = function(arg0) {
|
||||
var ret = getObject(arg0).getBoundingClientRect();
|
||||
|
|
@ -491,6 +636,14 @@ async function init(input) {
|
|||
var ret = getObject(arg0) instanceof WebGLRenderingContext;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_drawingBufferWidth_fab3e20dd1ba5d4e = function(arg0) {
|
||||
var ret = getObject(arg0).drawingBufferWidth;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_drawingBufferHeight_31bc93d4dc3a0dcc = function(arg0) {
|
||||
var ret = getObject(arg0).drawingBufferHeight;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_bufferData_dc5899657e9f1803 = function(arg0, arg1, arg2, arg3) {
|
||||
getObject(arg0).bufferData(arg1 >>> 0, getObject(arg2), arg3 >>> 0);
|
||||
};
|
||||
|
|
@ -609,6 +762,9 @@ async function init(input) {
|
|||
imports.wbg.__wbg_error_e325755affc8634b = function(arg0) {
|
||||
console.error(getObject(arg0));
|
||||
};
|
||||
imports.wbg.__wbg_log_f2e13ca55da8bad3 = function(arg0) {
|
||||
console.log(getObject(arg0));
|
||||
};
|
||||
imports.wbg.__wbg_warn_9e92ccdc67085e1b = function(arg0) {
|
||||
console.warn(getObject(arg0));
|
||||
};
|
||||
|
|
@ -616,6 +772,14 @@ async function init(input) {
|
|||
var ret = getObject(arg0).style;
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_clipboardData_503a7e4407c6231c = function(arg0) {
|
||||
var ret = getObject(arg0).clipboardData;
|
||||
return isLikeNone(ret) ? 0 : addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_clipboard_a2f55b432ef7d0b0 = function(arg0) {
|
||||
var ret = getObject(arg0).clipboard;
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_top_80a2533bf82e7a3e = function(arg0) {
|
||||
var ret = getObject(arg0).top;
|
||||
return ret;
|
||||
|
|
@ -644,29 +808,6 @@ async function init(input) {
|
|||
imports.wbg.__wbg_setItem_57767b71f09c3545 = handleError(function(arg0, arg1, arg2, arg3, arg4) {
|
||||
getObject(arg0).setItem(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
|
||||
});
|
||||
imports.wbg.__wbg_clientX_3a14a1583294607f = function(arg0) {
|
||||
var ret = getObject(arg0).clientX;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_clientY_4b4a322b80551002 = function(arg0) {
|
||||
var ret = getObject(arg0).clientY;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_writeText_f3dba2a1b4785c80 = function(arg0, arg1, arg2) {
|
||||
var ret = getObject(arg0).writeText(getStringFromWasm0(arg1, arg2));
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_addEventListener_6a37bc32387cb66d = handleError(function(arg0, arg1, arg2, arg3) {
|
||||
getObject(arg0).addEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3));
|
||||
});
|
||||
imports.wbg.__wbg_deltaX_5fac4f36a42e6ec9 = function(arg0) {
|
||||
var ret = getObject(arg0).deltaX;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_deltaY_2722120e563d3160 = function(arg0) {
|
||||
var ret = getObject(arg0).deltaY;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_call_951bd0c6d815d6f1 = handleError(function(arg0, arg1) {
|
||||
var ret = getObject(arg0).call(getObject(arg1));
|
||||
return addHeapObject(ret);
|
||||
|
|
@ -791,36 +932,36 @@ async function init(input) {
|
|||
var ret = wasm.memory;
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbindgen_closure_wrapper311 = function(arg0, arg1, arg2) {
|
||||
var ret = makeMutClosure(arg0, arg1, 62, __wbg_adapter_24);
|
||||
imports.wbg.__wbindgen_closure_wrapper399 = function(arg0, arg1, arg2) {
|
||||
var ret = makeMutClosure(arg0, arg1, 91, __wbg_adapter_24);
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbindgen_closure_wrapper312 = function(arg0, arg1, arg2) {
|
||||
var ret = makeMutClosure(arg0, arg1, 62, __wbg_adapter_27);
|
||||
imports.wbg.__wbindgen_closure_wrapper400 = function(arg0, arg1, arg2) {
|
||||
var ret = makeMutClosure(arg0, arg1, 91, __wbg_adapter_27);
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbindgen_closure_wrapper314 = function(arg0, arg1, arg2) {
|
||||
var ret = makeMutClosure(arg0, arg1, 62, __wbg_adapter_30);
|
||||
imports.wbg.__wbindgen_closure_wrapper402 = function(arg0, arg1, arg2) {
|
||||
var ret = makeMutClosure(arg0, arg1, 91, __wbg_adapter_30);
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbindgen_closure_wrapper316 = function(arg0, arg1, arg2) {
|
||||
var ret = makeMutClosure(arg0, arg1, 62, __wbg_adapter_33);
|
||||
imports.wbg.__wbindgen_closure_wrapper405 = function(arg0, arg1, arg2) {
|
||||
var ret = makeMutClosure(arg0, arg1, 91, __wbg_adapter_33);
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbindgen_closure_wrapper319 = function(arg0, arg1, arg2) {
|
||||
var ret = makeMutClosure(arg0, arg1, 62, __wbg_adapter_36);
|
||||
imports.wbg.__wbindgen_closure_wrapper407 = function(arg0, arg1, arg2) {
|
||||
var ret = makeMutClosure(arg0, arg1, 91, __wbg_adapter_36);
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbindgen_closure_wrapper321 = function(arg0, arg1, arg2) {
|
||||
var ret = makeMutClosure(arg0, arg1, 62, __wbg_adapter_39);
|
||||
imports.wbg.__wbindgen_closure_wrapper409 = function(arg0, arg1, arg2) {
|
||||
var ret = makeMutClosure(arg0, arg1, 91, __wbg_adapter_39);
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbindgen_closure_wrapper323 = function(arg0, arg1, arg2) {
|
||||
var ret = makeMutClosure(arg0, arg1, 62, __wbg_adapter_42);
|
||||
imports.wbg.__wbindgen_closure_wrapper411 = function(arg0, arg1, arg2) {
|
||||
var ret = makeMutClosure(arg0, arg1, 91, __wbg_adapter_42);
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbindgen_closure_wrapper398 = function(arg0, arg1, arg2) {
|
||||
var ret = makeMutClosure(arg0, arg1, 94, __wbg_adapter_45);
|
||||
imports.wbg.__wbindgen_closure_wrapper463 = function(arg0, arg1, arg2) {
|
||||
var ret = makeMutClosure(arg0, arg1, 111, __wbg_adapter_45);
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -6,7 +6,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
|
||||
|
||||
<head>
|
||||
<title>Egui Template</title>
|
||||
<title>egui template</title>
|
||||
<style>
|
||||
html {
|
||||
/* Remove touch delay: */
|
||||
|
|
@ -14,8 +14,9 @@
|
|||
}
|
||||
|
||||
body {
|
||||
/* Background color for what is not covered by the canvas, and where the canvas is translucent. */
|
||||
background: #202020;
|
||||
/* Background color for what is not covered by the egui canvas,
|
||||
or where the egui canvas is translucent. */
|
||||
background: #404040;
|
||||
}
|
||||
|
||||
/* Allow canvas to fill entire web page: */
|
||||
|
|
@ -75,4 +76,4 @@
|
|||
|
||||
</html>
|
||||
|
||||
<!-- Powered by Egui: https://github.com/emilk/egui/ -->
|
||||
<!-- Powered by egui: https://github.com/emilk/egui/ -->
|
||||
|
|
|
|||
13
src/app.rs
13
src/app.rs
|
|
@ -22,7 +22,7 @@ impl Default for TemplateApp {
|
|||
|
||||
impl epi::App for TemplateApp {
|
||||
fn name(&self) -> &str {
|
||||
"Egui template"
|
||||
"egui template"
|
||||
}
|
||||
|
||||
/// Called by the framework to load old app state (if any).
|
||||
|
|
@ -83,7 +83,7 @@ impl epi::App for TemplateApp {
|
|||
});
|
||||
|
||||
egui::CentralPanel::default().show(ctx, |ui| {
|
||||
ui.heading("Egui Template");
|
||||
ui.heading("egui template");
|
||||
ui.hyperlink("https://github.com/emilk/egui_template");
|
||||
ui.add(egui::github_link_file_line!(
|
||||
"https://github.com/emilk/egui_template/blob/master/",
|
||||
|
|
@ -112,9 +112,6 @@ impl epi::App for TemplateApp {
|
|||
ui.label("You would normally chose either panels OR windows.");
|
||||
});
|
||||
}
|
||||
|
||||
// Resize the native window to be just the size we need it to be:
|
||||
frame.set_window_size(ctx.used_size());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -139,7 +136,7 @@ impl Default for Painting {
|
|||
impl Painting {
|
||||
pub fn ui_control(&mut self, ui: &mut egui::Ui) -> egui::Response {
|
||||
ui.horizontal(|ui| {
|
||||
self.stroke.ui(ui, "Stroke");
|
||||
egui::stroke_ui(ui, &mut self.stroke, "Stroke");
|
||||
ui.separator();
|
||||
if ui.button("Clear Painting").clicked {
|
||||
self.lines.clear();
|
||||
|
|
@ -170,12 +167,14 @@ impl Painting {
|
|||
self.lines.push(vec![]);
|
||||
}
|
||||
|
||||
let mut shapes = vec![];
|
||||
for line in &self.lines {
|
||||
if line.len() >= 2 {
|
||||
let points: Vec<egui::Pos2> = line.iter().map(|p| rect.min + *p).collect();
|
||||
painter.add(egui::PaintCmd::line(points, self.stroke));
|
||||
shapes.push(egui::Shape::line(points, self.stroke));
|
||||
}
|
||||
}
|
||||
painter.extend(shapes);
|
||||
|
||||
response
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue