Mercurial > hg > orthanc-stone
changeset 1008:4fda090b016b toa2019092002
Merge
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Fri, 20 Sep 2019 12:14:03 +0200 |
| parents | 1c82598d4e68 (current diff) d6b83ee3a950 (diff) |
| children | 211c7944d65f |
| files | |
| diffstat | 3 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Framework/OpenGL/WebAssemblyOpenGLContext.cpp Fri Sep 20 12:13:28 2019 +0200 +++ b/Framework/OpenGL/WebAssemblyOpenGLContext.cpp Fri Sep 20 12:14:03 2019 +0200 @@ -189,7 +189,7 @@ canvasWidth_ = static_cast<unsigned int>(boost::math::iround(w)); canvasHeight_ = static_cast<unsigned int>(boost::math::iround(h)); } - + emscripten_set_canvas_element_size(canvas_.c_str(), canvasWidth_, canvasHeight_); } };
--- a/Framework/Oracle/WebAssemblyOracle.cpp Fri Sep 20 12:13:28 2019 +0200 +++ b/Framework/Oracle/WebAssemblyOracle.cpp Fri Sep 20 12:14:03 2019 +0200 @@ -360,12 +360,12 @@ memcpy(message, fetch->statusText, kEmscriptenStatusTextSize); message[kEmscriptenStatusTextSize] = 0; - LOG(ERROR) << "Fetching " << fetch->url + /*LOG(ERROR) << "Fetching " << fetch->url << " failed, HTTP failure status code: " << fetch->status << " | statusText = " << message << " | numBytes = " << fetch->numBytes << " | totalBytes = " << fetch->totalBytes - << " | readyState = " << fetch->readyState; + << " | readyState = " << fetch->readyState;*/ } {
--- a/Framework/Viewport/WebAssemblyViewport.cpp Fri Sep 20 12:13:28 2019 +0200 +++ b/Framework/Viewport/WebAssemblyViewport.cpp Fri Sep 20 12:14:03 2019 +0200 @@ -43,9 +43,12 @@ void WebAssemblyOpenGLViewport::UpdateSize() { - if(compositor_.get() != NULL) + context_.UpdateSize(); // First read the size of the canvas + + if (compositor_.get() != NULL) + { compositor_->Refresh(); // Then refresh the content of the canvas - context_.UpdateSize(); // First read the size of the canvas + } } /*