Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix blurry rendering on web demo #149

Closed
wants to merge 3 commits into from
Closed

Fix blurry rendering on web demo #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1fde53
Make sure that the canvas dimenions are always even numbers to preven…
aakamenov Jan 31, 2021
cb3f85e
Merge branch 'master' into fix-blur-on-web
aakamenov Jan 31, 2021
fe7ef01
Build web demo
aakamenov Jan 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions docs/egui_demo_app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,35 +213,35 @@ function makeMutClosure(arg0, arg1, dtor, f) {
return real;
}
function __wbg_adapter_26(arg0, arg1) {
wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h4e8015fef67db455(arg0, arg1);
wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hb41bf9bb7b1bcffb(arg0, arg1);
}

function __wbg_adapter_29(arg0, arg1, arg2) {
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h198dee18ab81b4f8(arg0, arg1, addHeapObject(arg2));
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h44771655bd0da199(arg0, arg1, addHeapObject(arg2));
}

function __wbg_adapter_32(arg0, arg1, arg2) {
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h198dee18ab81b4f8(arg0, arg1, addHeapObject(arg2));
function __wbg_adapter_32(arg0, arg1) {
wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hbb308406ba1a089c(arg0, arg1);
}

function __wbg_adapter_35(arg0, arg1, arg2) {
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h198dee18ab81b4f8(arg0, arg1, addHeapObject(arg2));
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h44771655bd0da199(arg0, arg1, addHeapObject(arg2));
}

function __wbg_adapter_38(arg0, arg1, arg2) {
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h198dee18ab81b4f8(arg0, arg1, addHeapObject(arg2));
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h44771655bd0da199(arg0, arg1, addHeapObject(arg2));
}

function __wbg_adapter_41(arg0, arg1, arg2) {
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h198dee18ab81b4f8(arg0, arg1, addHeapObject(arg2));
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h44771655bd0da199(arg0, arg1, addHeapObject(arg2));
}

function __wbg_adapter_44(arg0, arg1) {
wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hffe83366e633f515(arg0, arg1);
function __wbg_adapter_44(arg0, arg1, arg2) {
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h44771655bd0da199(arg0, arg1, addHeapObject(arg2));
}

function __wbg_adapter_47(arg0, arg1, arg2) {
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hfcae3bd1b2ceed2f(arg0, arg1, addHeapObject(arg2));
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h05413aa943d21c72(arg0, arg1, addHeapObject(arg2));
}

/**
Expand Down Expand Up @@ -1015,35 +1015,35 @@ async function init(input) {
var ret = wasm.memory;
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper1167 = function(arg0, arg1, arg2) {
var ret = makeMutClosure(arg0, arg1, 299, __wbg_adapter_26);
imports.wbg.__wbindgen_closure_wrapper1168 = function(arg0, arg1, arg2) {
var ret = makeMutClosure(arg0, arg1, 300, __wbg_adapter_26);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper1169 = function(arg0, arg1, arg2) {
var ret = makeMutClosure(arg0, arg1, 299, __wbg_adapter_29);
var ret = makeMutClosure(arg0, arg1, 300, __wbg_adapter_29);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper1171 = function(arg0, arg1, arg2) {
var ret = makeMutClosure(arg0, arg1, 299, __wbg_adapter_32);
var ret = makeMutClosure(arg0, arg1, 300, __wbg_adapter_32);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper1173 = function(arg0, arg1, arg2) {
var ret = makeMutClosure(arg0, arg1, 299, __wbg_adapter_35);
imports.wbg.__wbindgen_closure_wrapper1174 = function(arg0, arg1, arg2) {
var ret = makeMutClosure(arg0, arg1, 300, __wbg_adapter_35);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper1175 = function(arg0, arg1, arg2) {
var ret = makeMutClosure(arg0, arg1, 299, __wbg_adapter_38);
imports.wbg.__wbindgen_closure_wrapper1176 = function(arg0, arg1, arg2) {
var ret = makeMutClosure(arg0, arg1, 300, __wbg_adapter_38);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper1177 = function(arg0, arg1, arg2) {
var ret = makeMutClosure(arg0, arg1, 299, __wbg_adapter_41);
imports.wbg.__wbindgen_closure_wrapper1178 = function(arg0, arg1, arg2) {
var ret = makeMutClosure(arg0, arg1, 300, __wbg_adapter_41);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper1179 = function(arg0, arg1, arg2) {
var ret = makeMutClosure(arg0, arg1, 299, __wbg_adapter_44);
imports.wbg.__wbindgen_closure_wrapper1180 = function(arg0, arg1, arg2) {
var ret = makeMutClosure(arg0, arg1, 300, __wbg_adapter_44);
return addHeapObject(ret);
};
imports.wbg.__wbindgen_closure_wrapper2529 = function(arg0, arg1, arg2) {
imports.wbg.__wbindgen_closure_wrapper2530 = function(arg0, arg1, arg2) {
var ret = makeMutClosure(arg0, arg1, 440, __wbg_adapter_47);
return addHeapObject(ret);
};
Expand Down
Binary file modified docs/egui_demo_app_bg.wasm
View file
Open in desktop
Binary file not shown.
22 changes: 20 additions & 2 deletions egui_web/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,26 @@ pub fn resize_canvas_to_screen_size(canvas_id: &str) -> Option<()> {
let canvas_size_pixels = pixels_per_point * screen_size_points;
// Some browsers get slow with huge WebGL canvases, so we limit the size:
let max_size_pixels = egui::vec2(2048.0, 4096.0);
let canvas_size_pixels = canvas_size_pixels.min(max_size_pixels);
let canvas_size_points = canvas_size_pixels / pixels_per_point;
let mut canvas_size_pixels = canvas_size_pixels.min(max_size_pixels);
let mut canvas_size_points = canvas_size_pixels / pixels_per_point;

//HACK: Make sure that the height and width are always even numbers.
// Otherwise, the page renders blurry.
if canvas_size_points.x % 2f32 != 0f32 {
canvas_size_points.x -= 1f32;
}

if canvas_size_points.y % 2f32 != 0f32 {
canvas_size_points.y -= 1f32;
}

if canvas_size_pixels.x % 2f32 != 0f32 {
canvas_size_pixels.x -= 1f32;
}

if canvas_size_pixels.y % 2f32 != 0f32 {
canvas_size_pixels.y -= 1f32;
}

canvas
.style()
Expand Down