summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Ernerfeldt <emil.ernerfeldt@gmail.com>2021-08-28 11:04:39 +0200
committerEmil Ernerfeldt <emil.ernerfeldt@gmail.com>2021-08-28 11:04:39 +0200
commit2ce99f3a127b49b00e2cec3f3b5ade666faa67bf (patch)
tree330186e94893b8a9b63feb8ed60c6f6679840ce3
parentfe2b3e26aa8680e45ffeee4108c87eaee4204521 (diff)
Release 0.14.1 - Bug fixes and better web blending0.14.1
-rw-r--r--CHANGELOG.md3
-rw-r--r--Cargo.lock4
-rw-r--r--docs/egui_demo_app.js395
-rw-r--r--docs/egui_demo_app_bg.wasmbin3659098 -> 3655112 bytes
-rw-r--r--egui/Cargo.toml2
-rw-r--r--egui_web/CHANGELOG.md3
-rw-r--r--egui_web/Cargo.toml2
7 files changed, 241 insertions, 168 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03cc3c9a..2da1b1f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ NOTE: [`eframe`](eframe/CHANGELOG.md), [`egui_web`](egui_web/CHANGELOG.md) and [
## Unreleased
+
+## 0.14.1 - 2021-08-28 - Layout bug fixes
+
### Added ⭐
* Add `Ui::horizontal_top`.
diff --git a/Cargo.lock b/Cargo.lock
index 405b9b9c..c18ed670 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -788,7 +788,7 @@ dependencies = [
[[package]]
name = "egui"
-version = "0.14.0"
+version = "0.14.1"
dependencies = [
"epaint",
"ron",
@@ -836,7 +836,7 @@ dependencies = [
[[package]]
name = "egui_web"
-version = "0.14.0"
+version = "0.14.1"
dependencies = [
"egui",
"epi",
diff --git a/docs/egui_demo_app.js b/docs/egui_demo_app.js
index 1a20f056..88e3735a 100644
--- a/docs/egui_demo_app.js
+++ b/docs/egui_demo_app.js
@@ -3,39 +3,14 @@ let wasm_bindgen;
const __exports = {};
let wasm;
- let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
-
- cachedTextDecoder.decode();
-
- let cachegetUint8Memory0 = null;
- function getUint8Memory0() {
- if (cachegetUint8Memory0 === null || cachegetUint8Memory0.buffer !== wasm.memory.buffer) {
- cachegetUint8Memory0 = new Uint8Array(wasm.memory.buffer);
- }
- return cachegetUint8Memory0;
- }
-
- function getStringFromWasm0(ptr, len) {
- return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
- }
-
const heap = new Array(32).fill(undefined);
heap.push(undefined, null, true, false);
- let heap_next = heap.length;
-
- function addHeapObject(obj) {
- if (heap_next === heap.length) heap.push(heap.length + 1);
- const idx = heap_next;
- heap_next = heap[idx];
-
- heap[idx] = obj;
- return idx;
- }
-
function getObject(idx) { return heap[idx]; }
+let heap_next = heap.length;
+
function dropObject(idx) {
if (idx < 36) return;
heap[idx] = heap_next;
@@ -48,6 +23,31 @@ function takeObject(idx) {
return ret;
}
+let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
+
+cachedTextDecoder.decode();
+
+let cachegetUint8Memory0 = null;
+function getUint8Memory0() {
+ if (cachegetUint8Memory0 === null || cachegetUint8Memory0.buffer !== wasm.memory.buffer) {
+ cachegetUint8Memory0 = new Uint8Array(wasm.memory.buffer);
+ }
+ return cachegetUint8Memory0;
+}
+
+function getStringFromWasm0(ptr, len) {
+ return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
+}
+
+function addHeapObject(obj) {
+ if (heap_next === heap.length) heap.push(heap.length + 1);
+ const idx = heap_next;
+ heap_next = heap[idx];
+
+ heap[idx] = obj;
+ return idx;
+}
+
function isLikeNone(x) {
return x === undefined || x === null;
}
@@ -213,43 +213,43 @@ function makeMutClosure(arg0, arg1, dtor, f) {
return real;
}
function __wbg_adapter_30(arg0, arg1) {
- wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h2b1a82a78d7601d4(arg0, arg1);
+ wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h25d1c8068b858e52(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__h102210977eedd46b(arg0, arg1, addHeapObject(arg2));
+ wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1aa09c58865fc68e(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__h102210977eedd46b(arg0, arg1, addHeapObject(arg2));
+ wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1aa09c58865fc68e(arg0, arg1, addHeapObject(arg2));
}
function __wbg_adapter_39(arg0, arg1, arg2) {
- wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h102210977eedd46b(arg0, arg1, addHeapObject(arg2));
+ wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1aa09c58865fc68e(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__h102210977eedd46b(arg0, arg1, addHeapObject(arg2));
+ wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1aa09c58865fc68e(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__h102210977eedd46b(arg0, arg1, addHeapObject(arg2));
+ wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1aa09c58865fc68e(arg0, arg1, addHeapObject(arg2));
}
-function __wbg_adapter_48(arg0, arg1) {
- wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h2c0957761331f1f5(arg0, arg1);
+function __wbg_adapter_48(arg0, arg1, arg2) {
+ wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1aa09c58865fc68e(arg0, arg1, addHeapObject(arg2));
}
-function __wbg_adapter_51(arg0, arg1, arg2) {
- wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h102210977eedd46b(arg0, arg1, addHeapObject(arg2));
+function __wbg_adapter_51(arg0, arg1) {
+ wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h649fd64bc47b4d69(arg0, arg1);
}
function __wbg_adapter_54(arg0, arg1, arg2) {
- wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h102210977eedd46b(arg0, arg1, addHeapObject(arg2));
+ wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1aa09c58865fc68e(arg0, arg1, addHeapObject(arg2));
}
function __wbg_adapter_57(arg0, arg1, arg2) {
- wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h102210977eedd46b(arg0, arg1, addHeapObject(arg2));
+ wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1aa09c58865fc68e(arg0, arg1, addHeapObject(arg2));
}
function makeClosure(arg0, arg1, dtor, f) {
@@ -274,11 +274,11 @@ function makeClosure(arg0, arg1, dtor, f) {
return real;
}
function __wbg_adapter_60(arg0, arg1, arg2) {
- wasm._dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h9b3ee0845fb75193(arg0, arg1, addHeapObject(arg2));
+ wasm._dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h05ea20c5e8f5e540(arg0, arg1, addHeapObject(arg2));
}
function __wbg_adapter_63(arg0, arg1, arg2) {
- wasm._dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h9b3ee0845fb75193(arg0, arg1, addHeapObject(arg2));
+ wasm._dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h05ea20c5e8f5e540(arg0, arg1, addHeapObject(arg2));
}
function __wbg_adapter_66(arg0, arg1, arg2) {
@@ -353,12 +353,16 @@ async function init(input) {
}
const imports = {};
imports.wbg = {};
+ imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
+ takeObject(arg0);
+ };
imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
var ret = getStringFromWasm0(arg0, arg1);
return addHeapObject(ret);
};
- imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
- takeObject(arg0);
+ imports.wbg.__wbindgen_object_clone_ref = function(arg0) {
+ var ret = getObject(arg0);
+ return addHeapObject(ret);
};
imports.wbg.__wbindgen_cb_drop = function(arg0) {
const obj = takeObject(arg0).original;
@@ -381,9 +385,22 @@ async function init(input) {
var ret = getObject(arg0).drawingBufferHeight;
return ret;
};
+ imports.wbg.__wbg_bindVertexArray_39627ebb88f949c0 = function(arg0, arg1) {
+ getObject(arg0).bindVertexArray(getObject(arg1));
+ };
imports.wbg.__wbg_bufferData_cc607a102bc62ccf = function(arg0, arg1, arg2, arg3) {
getObject(arg0).bufferData(arg1 >>> 0, getObject(arg2), arg3 >>> 0);
};
+ imports.wbg.__wbg_bufferData_5a5929d0089883c3 = function(arg0, arg1, arg2, arg3, arg4) {
+ getObject(arg0).bufferData(arg1 >>> 0, getArrayU8FromWasm0(arg2, arg3), arg4 >>> 0);
+ };
+ imports.wbg.__wbg_createVertexArray_f1b7d1424f3b36fd = function(arg0) {
+ var ret = getObject(arg0).createVertexArray();
+ return isLikeNone(ret) ? 0 : addHeapObject(ret);
+ };
+ imports.wbg.__wbg_deleteVertexArray_a384397ec06bcdb4 = function(arg0, arg1) {
+ getObject(arg0).deleteVertexArray(getObject(arg1));
+ };
imports.wbg.__wbg_texImage2D_6f5f6ef7dc3c8479 = function() { return 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));
}, arguments) };
@@ -396,6 +413,9 @@ async function init(input) {
imports.wbg.__wbg_bindBuffer_d4ae25360cb2cfe9 = function(arg0, arg1, arg2) {
getObject(arg0).bindBuffer(arg1 >>> 0, getObject(arg2));
};
+ imports.wbg.__wbg_bindFramebuffer_a56783a74954b4bb = function(arg0, arg1, arg2) {
+ getObject(arg0).bindFramebuffer(arg1 >>> 0, getObject(arg2));
+ };
imports.wbg.__wbg_bindTexture_3c8ee71342ff4e84 = function(arg0, arg1, arg2) {
getObject(arg0).bindTexture(arg1 >>> 0, getObject(arg2));
};
@@ -415,6 +435,10 @@ async function init(input) {
var ret = getObject(arg0).createBuffer();
return isLikeNone(ret) ? 0 : addHeapObject(ret);
};
+ imports.wbg.__wbg_createFramebuffer_e0e6588474035812 = function(arg0) {
+ var ret = getObject(arg0).createFramebuffer();
+ return isLikeNone(ret) ? 0 : addHeapObject(ret);
+ };
imports.wbg.__wbg_createProgram_0aaa2a1e9b6103f6 = function(arg0) {
var ret = getObject(arg0).createProgram();
return isLikeNone(ret) ? 0 : addHeapObject(ret);
@@ -427,6 +451,18 @@ async function init(input) {
var ret = getObject(arg0).createTexture();
return isLikeNone(ret) ? 0 : addHeapObject(ret);
};
+ imports.wbg.__wbg_deleteBuffer_ff8f7f7303f4f3f5 = function(arg0, arg1) {
+ getObject(arg0).deleteBuffer(getObject(arg1));
+ };
+ imports.wbg.__wbg_deleteFramebuffer_e2c93bfc38a4ee34 = function(arg0, arg1) {
+ getObject(arg0).deleteFramebuffer(getObject(arg1));
+ };
+ imports.wbg.__wbg_deleteProgram_e172f28c8296424f = function(arg0, arg1) {
+ getObject(arg0).deleteProgram(getObject(arg1));
+ };
+ imports.wbg.__wbg_deleteTexture_da071a3a52495e87 = function(arg0, arg1) {
+ getObject(arg0).deleteTexture(getObject(arg1));
+ };
imports.wbg.__wbg_disable_cd70c9f951a6e96e = function(arg0, arg1) {
getObject(arg0).disable(arg1 >>> 0);
};
@@ -439,6 +475,9 @@ async function init(input) {
imports.wbg.__wbg_enableVertexAttribArray_74e5805bc2159fe8 = function(arg0, arg1) {
getObject(arg0).enableVertexAttribArray(arg1 >>> 0);
};
+ imports.wbg.__wbg_framebufferTexture2D_e94da3e5a712283a = function(arg0, arg1, arg2, arg3, arg4, arg5) {
+ getObject(arg0).framebufferTexture2D(arg1 >>> 0, arg2 >>> 0, arg3 >>> 0, getObject(arg4), arg5);
+ };
imports.wbg.__wbg_getAttribLocation_f4ed958a3726dc43 = function(arg0, arg1, arg2, arg3) {
var ret = getObject(arg0).getAttribLocation(getObject(arg1), getStringFromWasm0(arg2, arg3));
return ret;
@@ -563,10 +602,6 @@ async function init(input) {
var ret = getObject(arg0).setTimeout(getObject(arg1), arg2);
return ret;
}, arguments) };
- imports.wbg.__wbindgen_object_clone_ref = function(arg0) {
- var ret = getObject(arg0);
- return addHeapObject(ret);
- };
imports.wbg.__wbg_writeText_aee8bfe649d3d88b = function(arg0, arg1, arg2) {
var ret = getObject(arg0).writeText(getStringFromWasm0(arg1, arg2));
return addHeapObject(ret);
@@ -595,22 +630,6 @@ async function init(input) {
var ret = new Request(getStringFromWasm0(arg0, arg1), getObject(arg2));
return addHeapObject(ret);
}, arguments) };
- imports.wbg.__wbg_identifier_45c8ee9f553502c0 = function(arg0) {
- var ret = getObject(arg0).identifier;
- return ret;
- };
- imports.wbg.__wbg_pageX_3519a257ccfc5923 = function(arg0) {
- var ret = getObject(arg0).pageX;
- return ret;
- };
- imports.wbg.__wbg_pageY_0aa275b68a299528 = function(arg0) {
- var ret = getObject(arg0).pageY;
- return ret;
- };
- imports.wbg.__wbg_force_f2d7c27d028552de = function(arg0) {
- var ret = getObject(arg0).force;
- return ret;
- };
imports.wbg.__wbg_instanceof_HtmlInputElement_80e9098b1138bf4b = function(arg0) {
var ret = getObject(arg0) instanceof HTMLInputElement;
return ret;
@@ -639,14 +658,6 @@ async function init(input) {
var ret = getObject(arg0).files;
return isLikeNone(ret) ? 0 : addHeapObject(ret);
};
- imports.wbg.__wbg_length_3757f81fc4dd5808 = function(arg0) {
- var ret = getObject(arg0).length;
- return ret;
- };
- imports.wbg.__wbg_get_1e343223f07eaa97 = function(arg0, arg1) {
- var ret = getObject(arg0)[arg1 >>> 0];
- return isLikeNone(ret) ? 0 : addHeapObject(ret);
- };
imports.wbg.__wbg_keyCode_3d61e0508dc1a02a = function(arg0) {
var ret = getObject(arg0).keyCode;
return ret;
@@ -678,6 +689,22 @@ async function init(input) {
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
};
+ imports.wbg.__wbg_identifier_45c8ee9f553502c0 = function(arg0) {
+ var ret = getObject(arg0).identifier;
+ return ret;
+ };
+ imports.wbg.__wbg_pageX_3519a257ccfc5923 = function(arg0) {
+ var ret = getObject(arg0).pageX;
+ return ret;
+ };
+ imports.wbg.__wbg_pageY_0aa275b68a299528 = function(arg0) {
+ var ret = getObject(arg0).pageY;
+ return ret;
+ };
+ imports.wbg.__wbg_force_f2d7c27d028552de = function(arg0) {
+ var ret = getObject(arg0).force;
+ return ret;
+ };
imports.wbg.__wbg_length_e42cdab4029acd41 = function(arg0) {
var ret = getObject(arg0).length;
return ret;
@@ -690,6 +717,19 @@ async function init(input) {
var ret = getObject(arg0)[arg1 >>> 0];
return isLikeNone(ret) ? 0 : addHeapObject(ret);
};
+ imports.wbg.__wbg_type_b7c49e7586d0a4d6 = function(arg0, arg1) {
+ var ret = getObject(arg1).type;
+ var ptr0 = 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_preventDefault_7a8483e2b1a95a37 = function(arg0) {
+ getObject(arg0).preventDefault();
+ };
+ imports.wbg.__wbg_stopPropagation_36adf718596c5abf = function(arg0) {
+ getObject(arg0).stopPropagation();
+ };
imports.wbg.__wbg_name_2c1297979e6bb968 = function(arg0, arg1) {
var ret = getObject(arg1).name;
var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -701,6 +741,14 @@ async function init(input) {
var ret = getObject(arg0).lastModified;
return ret;
};
+ imports.wbg.__wbg_length_3757f81fc4dd5808 = function(arg0) {
+ var ret = getObject(arg0).length;
+ return ret;
+ };
+ imports.wbg.__wbg_get_1e343223f07eaa97 = function(arg0, arg1) {
+ var ret = getObject(arg0)[arg1 >>> 0];
+ return isLikeNone(ret) ? 0 : addHeapObject(ret);
+ };
imports.wbg.__wbg_instanceof_HtmlCanvasElement_f6c37daa8caa628a = function(arg0) {
var ret = getObject(arg0) instanceof HTMLCanvasElement;
return ret;
@@ -733,27 +781,6 @@ async function init(input) {
imports.wbg.__wbg_speak_00753a2238d24be8 = function(arg0, arg1) {
getObject(arg0).speak(getObject(arg1));
};
- imports.wbg.__wbg_touches_b604d82c627fcdd2 = function(arg0) {
- var ret = getObject(arg0).touches;
- return addHeapObject(ret);
- };
- imports.wbg.__wbg_changedTouches_95c70fd68e7ea1c8 = function(arg0) {
- var ret = getObject(arg0).changedTouches;
- return addHeapObject(ret);
- };
- imports.wbg.__wbg_type_b7c49e7586d0a4d6 = function(arg0, arg1) {
- var ret = getObject(arg1).type;
- var ptr0 = 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_preventDefault_7a8483e2b1a95a37 = function(arg0) {
- getObject(arg0).preventDefault();
- };
- imports.wbg.__wbg_stopPropagation_36adf718596c5abf = function(arg0) {
- getObject(arg0).stopPropagation();
- };
imports.wbg.__wbg_clipboard_2fc8ce81ba7aa7d1 = function(arg0) {
var ret = getObject(arg0).clipboard;
return isLikeNone(ret) ? 0 : addHeapObject(ret);
@@ -765,6 +792,14 @@ async function init(input) {
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}, arguments) };
+ imports.wbg.__wbg_touches_b604d82c627fcdd2 = function(arg0) {
+ var ret = getObject(arg0).touches;
+ return addHeapObject(ret);
+ };
+ imports.wbg.__wbg_changedTouches_95c70fd68e7ea1c8 = function(arg0) {
+ var ret = getObject(arg0).changedTouches;
+ return addHeapObject(ret);
+ };
imports.wbg.__wbg_size_2daaec8d59811a6a = function(arg0) {
var ret = getObject(arg0).size;
return ret;
@@ -785,10 +820,6 @@ async function init(input) {
var ret = getObject(arg0).appendChild(getObject(arg1));
return addHeapObject(ret);
}, arguments) };
- imports.wbg.__wbg_error_ea1383027b44a876 = function(arg0) {
- var ret = getObject(arg0).error;
- return addHeapObject(ret);
- };
imports.wbg.__wbg_getItem_dca05ca17d9c222d = function() { return handleError(function (arg0, arg1, arg2, arg3) {
var ret = getObject(arg1).getItem(getStringFromWasm0(arg2, arg3));
var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -837,6 +868,9 @@ async function init(input) {
imports.wbg.__wbg_bufferData_fe39dd8c7189f533 = function(arg0, arg1, arg2, arg3) {
getObject(arg0).bufferData(arg1 >>> 0, getObject(arg2), arg3 >>> 0);
};
+ imports.wbg.__wbg_bufferData_d80479e18ce78f00 = function(arg0, arg1, arg2, arg3, arg4) {
+ getObject(arg0).bufferData(arg1 >>> 0, getArrayU8FromWasm0(arg2, arg3), arg4 >>> 0);
+ };
imports.wbg.__wbg_texImage2D_ea9a0b53cdcf1cf6 = function() { return 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));
}, arguments) };
@@ -849,6 +883,9 @@ async function init(input) {
imports.wbg.__wbg_bindBuffer_a2638a5e0667e694 = function(arg0, arg1, arg2) {
getObject(arg0).bindBuffer(arg1 >>> 0, getObject(arg2));
};
+ imports.wbg.__wbg_bindFramebuffer_90ec46fb1b797599 = function(arg0, arg1, arg2) {
+ getObject(arg0).bindFramebuffer(arg1 >>> 0, getObject(arg2));
+ };
imports.wbg.__wbg_bindTexture_2b5f790e7d4cd749 = function(arg0, arg1, arg2) {
getObject(arg0).bindTexture(arg1 >>> 0, getObject(arg2));
};
@@ -868,6 +905,10 @@ async function init(input) {
var ret = getObject(arg0).createBuffer();
return isLikeNone(ret) ? 0 : addHeapObject(ret);
};
+ imports.wbg.__wbg_createFramebuffer_ae1dc73e211d8c53 = function(arg0) {
+ var ret = getObject(arg0).createFramebuffer();
+ return isLikeNone(ret) ? 0 : addHeapObject(ret);
+ };
imports.wbg.__wbg_createProgram_cb87410d7953886a = function(arg0) {
var ret = getObject(arg0).createProgram();
return isLikeNone(ret) ? 0 : addHeapObject(ret);
@@ -880,6 +921,18 @@ async function init(input) {
var ret = getObject(arg0).createTexture();
return isLikeNone(ret) ? 0 : addHeapObject(ret);
};
+ imports.wbg.__wbg_deleteBuffer_8c4f7249107edcd4 = function(arg0, arg1) {
+ getObject(arg0).deleteBuffer(getObject(arg1));
+ };
+ imports.wbg.__wbg_deleteFramebuffer_27aa3056d66afdaf = function(arg0, arg1) {
+ getObject(arg0).deleteFramebuffer(getObject(arg1));
+ };
+ imports.wbg.__wbg_deleteProgram_dc878cbdc2ab395c = function(arg0, arg1) {
+ getObject(arg0).deleteProgram(getObject(arg1));
+ };
+ imports.wbg.__wbg_deleteTexture_d01966b7c40e021c = function(arg0, arg1) {
+ getObject(arg0).deleteTexture(getObject(arg1));
+ };
imports.wbg.__wbg_disable_17f1c6c5eb2ce0cc = function(arg0, arg1) {
getObject(arg0).disable(arg1 >>> 0);
};
@@ -892,10 +945,17 @@ async function init(input) {
imports.wbg.__wbg_enableVertexAttribArray_c3a081cad68729b3 = function(arg0, arg1) {
getObject(arg0).enableVertexAttribArray(arg1 >>> 0);
};
+ imports.wbg.__wbg_framebufferTexture2D_fff36e9399ff3dfc = function(arg0, arg1, arg2, arg3, arg4, arg5) {
+ getObject(arg0).framebufferTexture2D(arg1 >>> 0, arg2 >>> 0, arg3 >>> 0, getObject(arg4), arg5);
+ };
imports.wbg.__wbg_getAttribLocation_dffd2ef66035bc53 = function(arg0, arg1, arg2, arg3) {
var ret = getObject(arg0).getAttribLocation(getObject(arg1), getStringFromWasm0(arg2, arg3));
return ret;
};
+ imports.wbg.__wbg_getExtension_44e0ad41c54446d4 = function() { return handleError(function (arg0, arg1, arg2) {
+ var ret = getObject(arg0).getExtension(getStringFromWasm0(arg1, arg2));
+ return isLikeNone(ret) ? 0 : addHeapObject(ret);
+ }, arguments) };
imports.wbg.__wbg_getProgramInfoLog_85f178a2537873e4 = function(arg0, arg1, arg2) {
var ret = getObject(arg1).getProgramInfoLog(getObject(arg2));
var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -925,6 +985,9 @@ async function init(input) {
imports.wbg.__wbg_linkProgram_8f08623b5e4defde = function(arg0, arg1) {
getObject(arg0).linkProgram(getObject(arg1));
};
+ imports.wbg.__wbg_pixelStorei_6faf986633e3f402 = function(arg0, arg1, arg2) {
+ getObject(arg0).pixelStorei(arg1 >>> 0, arg2);
+ };
imports.wbg.__wbg_scissor_9dea0ce04835102f = function(arg0, arg1, arg2, arg3, arg4) {
getObject(arg0).scissor(arg1, arg2, arg3, arg4);
};
@@ -991,13 +1054,6 @@ async function init(input) {
imports.wbg.__wbg_focus_80a6e6cc38b4cf70 = function() { return handleError(function (arg0) {
getObject(arg0).focus();
}, arguments) };
- imports.wbg.__wbg_data_352e2eb30f35f2fe = function(arg0, arg1) {
- var ret = getObject(arg1).data;
- 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_getPropertyValue_09fe722f8d70dc83 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
var ret = getObject(arg1).getPropertyValue(getStringFromWasm0(arg2, arg3));
var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -1035,6 +1091,17 @@ async function init(input) {
var ret = getObject(arg0).button;
return ret;
};
+ imports.wbg.__wbg_error_ea1383027b44a876 = function(arg0) {
+ var ret = getObject(arg0).error;
+ return addHeapObject(ret);
+ };
+ imports.wbg.__wbg_data_352e2eb30f35f2fe = function(arg0, arg1) {
+ var ret = getObject(arg1).data;
+ 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_type_7afd7dad08e9d868 = function(arg0, arg1) {
var ret = getObject(arg1).type;
var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -1042,13 +1109,47 @@ async function init(input) {
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
};
+ imports.wbg.__wbg_set_e9985c5cb9fe73e2 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
+ getObject(arg0).set(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
+ }, arguments) };
+ imports.wbg.__wbg_setvolume_7edbd750e074de20 = function(arg0, arg1) {
+ getObject(arg0).volume = arg1;
+ };
+ imports.wbg.__wbg_setrate_54e1d19352cc908e = function(arg0, arg1) {
+ getObject(arg0).rate = arg1;
+ };
+ imports.wbg.__wbg_setpitch_2fa1c94da6d38088 = function(arg0, arg1) {
+ getObject(arg0).pitch = arg1;
+ };
+ imports.wbg.__wbg_setonstart_9d71404b2b52cde7 = function(arg0, arg1) {
+ getObject(arg0).onstart = getObject(arg1);
+ };
+ imports.wbg.__wbg_setonend_ff4dbf8aa29b3d96 = function(arg0, arg1) {
+ getObject(arg0).onend = getObject(arg1);
+ };
+ imports.wbg.__wbg_setonerror_9bc83b2d1e4e3390 = function(arg0, arg1) {
+ getObject(arg0).onerror = getObject(arg1);
+ };
+ imports.wbg.__wbg_newwithtext_6f8dbcb34cd6dcab = function() { return handleError(function (arg0, arg1) {
+ var ret = new SpeechSynthesisUtterance(getStringFromWasm0(arg0, arg1));
+ return addHeapObject(ret);
+ }, arguments) };
+ imports.wbg.__wbg_deltaX_ff98873a8ce9e156 = function(arg0) {
+ var ret = getObject(arg0).deltaX;
+ return ret;
+ };
+ imports.wbg.__wbg_deltaY_48411dcaf81863cf = function(arg0) {
+ var ret = getObject(arg0).deltaY;
+ return ret;
+ };
+ imports.wbg.__wbg_deltaMode_e5f4db662363d971 = function(arg0) {
+ var ret = getObject(arg0).deltaMode;
+ return ret;
+ };
imports.wbg.__wbg_dataTransfer_ac32feb60375ac4f = function(arg0) {
var ret = getObject(arg0).dataTransfer;
return isLikeNone(ret) ? 0 : addHeapObject(ret);
};
- imports.wbg.__wbg_set_e9985c5cb9fe73e2 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
- getObject(arg0).set(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
- }, arguments) };
imports.wbg.__wbg_addEventListener_de2304ba2cd4ae89 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
getObject(arg0).addEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3));
}, arguments) };
@@ -1086,40 +1187,6 @@ async function init(input) {
var ret = getObject(arg0).arrayBuffer();
return addHeapObject(ret);
}, arguments) };
- imports.wbg.__wbg_setvolume_7edbd750e074de20 = function(arg0, arg1) {
- getObject(arg0).volume = arg1;
- };
- imports.wbg.__wbg_setrate_54e1d19352cc908e = function(arg0, arg1) {
- getObject(arg0).rate = arg1;
- };
- imports.wbg.__wbg_setpitch_2fa1c94da6d38088 = function(arg0, arg1) {
- getObject(arg0).pitch = arg1;
- };
- imports.wbg.__wbg_setonstart_9d71404b2b52cde7 = function(arg0, arg1) {
- getObject(arg0).onstart = getObject(arg1);
- };
- imports.wbg.__wbg_setonend_ff4dbf8aa29b3d96 = function(arg0, arg1) {
- getObject(arg0).onend = getObject(arg1);
- };
- imports.wbg.__wbg_setonerror_9bc83b2d1e4e3390 = function(arg0, arg1) {
- getObject(arg0).onerror = getObject(arg1);
- };
- imports.wbg.__wbg_newwithtext_6f8dbcb34cd6dcab = function() { return handleError(function (arg0, arg1) {
- var ret = new SpeechSynthesisUtterance(getStringFromWasm0(arg0, arg1));
- return addHeapObject(ret);
- }, arguments) };
- imports.wbg.__wbg_deltaX_ff98873a8ce9e156 = function(arg0) {
- var ret = getObject(arg0).deltaX;
- return ret;
- };
- imports.wbg.__wbg_deltaY_48411dcaf81863cf = function(arg0) {
- var ret = getObject(arg0).deltaY;
- return ret;
- };
- imports.wbg.__wbg_deltaMode_e5f4db662363d971 = function(arg0) {
- var ret = getObject(arg0).deltaMode;
- return ret;
- };
imports.wbg.__wbg_get_73c087db0a496c21 = function(arg0, arg1) {
var ret = getObject(arg0)[arg1 >>> 0];
return addHeapObject(ret);
@@ -1308,56 +1375,56 @@ async function init(input) {
var ret = wasm.memory;
return addHeapObject(ret);
};
- imports.wbg.__wbindgen_closure_wrapper1821 = function(arg0, arg1, arg2) {
- var ret = makeMutClosure(arg0, arg1, 578, __wbg_adapter_30);
+ imports.wbg.__wbindgen_closure_wrapper2075 = function(arg0, arg1, arg2) {
+ var ret = makeMutClosure(arg0, arg1, 664, __wbg_adapter_30);
return addHeapObject(ret);
};
- imports.wbg.__wbindgen_closure_wrapper1822 = function(arg0, arg1, arg2) {
- var ret = makeMutClosure(arg0, arg1, 578, __wbg_adapter_33);
+ imports.wbg.__wbindgen_closure_wrapper2076 = function(arg0, arg1, arg2) {
+ var ret = makeMutClosure(arg0, arg1, 664, __wbg_adapter_33);
return addHeapObject(ret);
};
- imports.wbg.__wbindgen_closure_wrapper1824 = function(arg0, arg1, arg2) {
- var ret = makeMutClosure(arg0, arg1, 578, __wbg_adapter_36);
+ imports.wbg.__wbindgen_closure_wrapper2078 = function(arg0, arg1, arg2) {
+ var ret = makeMutClosure(arg0, arg1, 664, __wbg_adapter_36);
return addHeapObject(ret);
};
- imports.wbg.__wbindgen_closure_wrapper1826 = function(arg0, arg1, arg2) {
- var ret = makeMutClosure(arg0, arg1, 578, __wbg_adapter_39);
+ imports.wbg.__wbindgen_closure_wrapper2080 = function(arg0, arg1, arg2) {
+ var ret = makeMutClosure(arg0, arg1, 664, __wbg_adapter_39);
return addHeapObject(ret);
};
- imports.wbg.__wbindgen_closure_wrapper1828 = function(arg0, arg1, arg2) {
- var ret = makeMutClosure(arg0, arg1, 578, __wbg_adapter_42);
+ imports.wbg.__wbindgen_closure_wrapper2082 = function(arg0, arg1, arg2) {
+ var ret = makeMutClosure(arg0, arg1, 664, __wbg_adapter_42);
return addHeapObject(ret);
};
- imports.wbg.__wbindgen_closure_wrapper1830 = function(arg0, arg1, arg2) {
- var ret = makeMutClosure(arg0, arg1, 578, __wbg_adapter_45);
+ imports.wbg.__wbindgen_closure_wrapper2085 = function(arg0, arg1, arg2) {
+ var ret = makeMutClosure(arg0, arg1, 664, __wbg_adapter_45);
return addHeapObject(ret);
};
- imports.wbg.__wbindgen_closure_wrapper1833 = function(arg0, arg1, arg2) {
- var ret = makeMutClosure(arg0, arg1, 578, __wbg_adapter_48);
+ imports.wbg.__wbindgen_closure_wrapper2087 = function(arg0, arg1, arg2) {
+ var ret = makeMutClosure(arg0, arg1, 664, __wbg_adapter_48);
return addHeapObject(ret);
};
- imports.wbg.__wbindgen_closure_wrapper1835 = function(arg0, arg1, arg2) {
- var ret = makeMutClosure(arg0, arg1, 578, __wbg_adapter_51);
+ imports.wbg.__wbindgen_closure_wrapper2089 = function(arg0, arg1, arg2) {
+ var ret = makeMutClosure(arg0, arg1, 664, __wbg_adapter_51);
return addHeapObject(ret);
};
- imports.wbg.__wbindgen_closure_wrapper1837 = function(arg0, arg1, arg2) {
- var ret = makeMutClosure(arg0, arg1, 578, __wbg_adapter_54);
+ imports.wbg.__wbindgen_closure_wrapper2091 = function(arg0, arg1, arg2) {
+ var ret = makeMutClosure(arg0, arg1, 664, __wbg_adapter_54);
return addHeapObject(ret);
};
- imports.wbg.__wbindgen_closure_wrapper1839 = function(arg0, arg1, arg2) {
- var ret = makeMutClosure(arg0, arg1, 578, __wbg_adapter_57);
+ imports.wbg.__wbindgen_closure_wrapper2093 = function(arg0, arg1, arg2) {
+ var ret = makeMutClosure(arg0, arg1, 664, __wbg_adapter_57);
return addHeapObject(ret);
};
- imports.wbg.__wbindgen_closure_wrapper2133 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbindgen_closure_wrapper2153 = function(arg0, arg1, arg2) {
var ret = makeClosure(arg0, arg1, 721, __wbg_adapter_60);
return addHeapObject(ret);
};
- imports.wbg.__wbindgen_closure_wrapper2135 = function(arg0, arg1, arg2) {
+ imports.wbg.__wbindgen_closure_wrapper2155 = function(arg0, arg1, arg2) {
var ret = makeClosure(arg0, arg1, 721, __wbg_adapter_63);
return addHeapObject(ret);
};
- imports.wbg.__wbindgen_closure_wrapper3280 = function(arg0, arg1, arg2) {
- var ret = makeMutClosure(arg0, arg1, 746, __wbg_adapter_66);
+ imports.wbg.__wbindgen_closure_wrapper3335 = function(arg0, arg1, arg2) {
+ var ret = makeMutClosure(arg0, arg1, 747, __wbg_adapter_66);
return addHeapObject(ret);
};
diff --git a/docs/egui_demo_app_bg.wasm b/docs/egui_demo_app_bg.wasm
index c6006164..58eae24a 100644
--- a/docs/egui_demo_app_bg.wasm
+++ b/docs/egui_demo_app_bg.wasm
Binary files differ
diff --git a/egui/Cargo.toml b/egui/Cargo.toml
index bd111332..b61541b0 100644
--- a/egui/Cargo.toml
+++ b/egui/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "egui"
-version = "0.14.0"
+version = "0.14.1"
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
description = "Simple, portable immediate mode GUI library for Rust"
edition = "2018"
diff --git a/egui_web/CHANGELOG.md b/egui_web/CHANGELOG.md
index d187ae41..d56df482 100644
--- a/egui_web/CHANGELOG.md
+++ b/egui_web/CHANGELOG.md
@@ -5,6 +5,9 @@ All notable changes to the `egui_web` integration will be noted in this file.
## Unreleased
+
+## 0.14.1 - 2021-08-28
+
### Fixed 🐛
* Fix alpha blending for WebGL2 and WebGL1 with sRGB support backends, now having identical results as egui_glium.
* Fix use of egui on devices with both touch and mouse.
diff --git a/egui_web/Cargo.toml b/egui_web/Cargo.toml
index 6b713250..64df1885 100644
--- a/egui_web/Cargo.toml
+++ b/egui_web/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "egui_web"
-version = "0.14.0"
+version = "0.14.1"
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
description = "Bindings for compiling egui code to WASM for a web page"
license = "MIT OR Apache-2.0"