diff --git a/README.md b/README.md index d70dde43..d920803d 100644 --- a/README.md +++ b/README.md @@ -23,14 +23,14 @@ Loop: ## Available backends: Wherever you can render textured triangles you can use Egui. -* WebAssembly (`egui_web`) for making a web app. [Click to run](https://emilk.github.io/emigui/index.html). +* WebAssembly (`egui_web`) for making a web app. [Click to run](https://emilk.github.io/egui/index.html). * [Glium](https://github.com/glium/glium) for native apps (see example_glium). * [miniquad](https://github.com/not-fl3/emigui-miniquad) [web demo](https://not-fl3.github.io/miniquad-samples/emigui.html) [demo source](https://github.com/not-fl3/good-web-game/blob/master/examples/emigui.rs) The same application code can thus be compiled to either into a native app or a web app. ## Demos -[Egui feature demo](https://emilk.github.io/emigui/index.html), (partial) source: https://github.com/emilk/emigui/blob/master/egui/src/demos/app.rs +[Egui feature demo](https://emilk.github.io/egui/index.html), (partial) source: https://github.com/emilk/egui/blob/master/egui/src/demos/app.rs [Hobogo: A small game using Egui](https://emilk.github.io/hobogo/index.html), source: https://github.com/emilk/hobogo @@ -60,7 +60,7 @@ The one and only [Dear ImGui](https://github.com/ocornut/imgui) is a great Immed ## Name The name of the gui library is "Egui", written like that in text and as `egui` in code and pronounced as "e-gooey". -The library used to be called `Emigui`, which is why it is still hosted at [github.com/emilk/emigui](https://github.com/emilk/emigui). If you like, `emigui` is the collection of helper crates that surrounds `egui`, while `egui` is the actual GUI library. +The library was originally called "Emigui", but was renamed to Egui in 2020. ## Credits / Licenses Fonts: diff --git a/docs/demo_web.js b/docs/demo_web.js index 7eadbfb0..af6ea969 100644 --- a/docs/demo_web.js +++ b/docs/demo_web.js @@ -212,8 +212,8 @@ function makeMutClosure(arg0, arg1, dtor, f) { return real; } -function __wbg_adapter_24(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h8ac16b787f5fa676(arg0, arg1, addHeapObject(arg2)); +function __wbg_adapter_24(arg0, arg1) { + wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h74e3475b1fcd9cd1(arg0, arg1); } function __wbg_adapter_27(arg0, arg1) { @@ -224,8 +224,8 @@ function __wbg_adapter_30(arg0, arg1, arg2) { wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h8ac16b787f5fa676(arg0, arg1, addHeapObject(arg2)); } -function __wbg_adapter_33(arg0, arg1) { - wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h74e3475b1fcd9cd1(arg0, arg1); +function __wbg_adapter_33(arg0, arg1, arg2) { + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h8ac16b787f5fa676(arg0, arg1, addHeapObject(arg2)); } function __wbg_adapter_36(arg0, arg1, arg2) { @@ -728,10 +728,6 @@ async function init(input) { return addHeapObject(ret); }; imports.wbg.__wbindgen_closure_wrapper363 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 76, __wbg_adapter_30); - return addHeapObject(ret); - }; - imports.wbg.__wbindgen_closure_wrapper367 = function(arg0, arg1, arg2) { var ret = makeMutClosure(arg0, arg1, 76, __wbg_adapter_33); return addHeapObject(ret); }; @@ -739,16 +735,20 @@ async function init(input) { var ret = makeMutClosure(arg0, arg1, 76, __wbg_adapter_27); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper365 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 76, __wbg_adapter_24); - return addHeapObject(ret); - }; imports.wbg.__wbindgen_closure_wrapper369 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 76, __wbg_adapter_36); + var ret = makeMutClosure(arg0, arg1, 76, __wbg_adapter_39); return addHeapObject(ret); }; imports.wbg.__wbindgen_closure_wrapper371 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 76, __wbg_adapter_39); + var ret = makeMutClosure(arg0, arg1, 76, __wbg_adapter_30); + return addHeapObject(ret); + }; + imports.wbg.__wbindgen_closure_wrapper367 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 76, __wbg_adapter_24); + return addHeapObject(ret); + }; + imports.wbg.__wbindgen_closure_wrapper365 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 76, __wbg_adapter_36); return addHeapObject(ret); }; diff --git a/docs/demo_web_bg.wasm b/docs/demo_web_bg.wasm index a86a7ade..7f012f48 100644 Binary files a/docs/demo_web_bg.wasm and b/docs/demo_web_bg.wasm differ diff --git a/egui/Cargo.toml b/egui/Cargo.toml index ac877ac4..98b0f9b1 100644 --- a/egui/Cargo.toml +++ b/egui/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.3" authors = ["Emil Ernerfeldt "] description = "Simple, portable immediate mode GUI library for Rust" edition = "2018" -homepage = "https://github.com/emilk/emigui/" +homepage = "https://github.com/emilk/egui" license = "MIT OR Apache-2.0" readme = "../README.md" -repository = "https://github.com/emilk/emigui" +repository = "https://github.com/emilk/egui" categories = ["gui", "graphics"] keywords = ["gui", "imgui", "immediate", "portable", "gamedev"] include = [ "**/*.rs", "Cargo.toml", "fonts/ProggyClean.ttf", "fonts/Comfortaa-Regular.ttf"] diff --git a/egui/src/demos/app.rs b/egui/src/demos/app.rs index 08f90de8..ea703d29 100644 --- a/egui/src/demos/app.rs +++ b/egui/src/demos/app.rs @@ -82,7 +82,7 @@ impl DemoApp { ui.label("This is also work in progress, and not ready for production... yet :)"); ui.horizontal(|ui| { ui.label("Project home page:"); - ui.hyperlink("https://github.com/emilk/emigui/"); + ui.hyperlink("https://github.com/emilk/egui"); }); } else { ui.add(label!("Egui").text_style(TextStyle::Heading)); @@ -202,7 +202,7 @@ fn show_menu_bar(ui: &mut Ui, windows: &mut OpenWindows) { }); menu::menu(ui, "About", |ui| { ui.add(label!("This is Egui")); - ui.add(Hyperlink::new("https://github.com/emilk/emigui/").text("Egui home page")); + ui.add(Hyperlink::new("https://github.com/emilk/egui").text("Egui home page")); }); if let Some(time) = ui.input().seconds_since_midnight { @@ -262,7 +262,7 @@ impl DemoWindow { ui.horizontal(|ui| { ui.label("Project home page:"); - ui.hyperlink("https://github.com/emilk/emigui/"); + ui.hyperlink("https://github.com/emilk/egui"); }); }); diff --git a/egui/src/widgets.rs b/egui/src/widgets.rs index 6f4968e2..cc9b3c16 100644 --- a/egui/src/widgets.rs +++ b/egui/src/widgets.rs @@ -147,7 +147,7 @@ impl Into