mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 17:09:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolve from updating submodules

Browse Source
This commit is contained in:
sylvass
2022-02-22 15:35:07 -05:00
parent bcf463ad66
commit 46dc827180
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/skybrowser/src/browser.cpp
View File

@@ -103,9 +103,10 @@ namespace openspace {
bool Browser::initializeGL() {
_texture = std::make_unique<ghoul::opengl::Texture>(
glm::uvec3(_browserPixeldimensions.value(), 1.0f)
glm::uvec3(glm::ivec2(_browserPixeldimensions.value()), 1),
GL_TEXTURE_2D
);
_renderHandler->setTexture(*_texture);
_browserInstance->initialize();

5
modules/skybrowser/src/wwtdatahandler.cpp
View File

@@ -32,11 +32,10 @@ namespace openspace {
// Parsing and downloading of wtml files
bool downloadFile(const std::string& url, const std::string& fileDestination) {
// Get the web page and save to file
HttpRequest::RequestOptions opt{ 5 };
SyncHttpFileDownload wtml_root(
HttpFileDownload wtml_root(
url, fileDestination, HttpFileDownload::Overwrite::Yes
);
wtml_root.download(opt);
wtml_root.start(std::chrono::milliseconds(5));
return wtml_root.hasSucceeded();
}