mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 02:29:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash related to deinitialization of screenspacebrowser

Browse Source
This commit is contained in:
Emil Axelsson
2019-07-19 16:51:52 +02:00
parent 5079f3fc60
commit 14d9bbe58b
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/webbrowser/include/screenspacebrowser.h
View File

@@ -63,9 +63,11 @@ class WebKeyboardHandler;
class ScreenSpaceBrowser : public ScreenSpaceRenderable {
public:
ScreenSpaceBrowser(const ghoul::Dictionary& dictionary);
virtual ~ScreenSpaceBrowser() = default;
bool initializeGL() override;
bool deinitializeGL() override;
bool initialize() override;
bool deinitialize() override;
void render() override;
void update() override;
bool isReady() const override;

22
modules/webbrowser/src/screenspacebrowser.cpp
View File

@@ -87,10 +87,6 @@ ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary &dictionary)
glm::vec2 windowDimensions = global::windowDelegate.currentSubwindowSize();
_dimensions = windowDimensions;
_texture = std::make_unique<ghoul::opengl::Texture>(
glm::uvec3(windowDimensions, 1.0f)
);
_renderHandler = new ScreenSpaceRenderHandler();
_keyboardHandler = new WebKeyboardHandler();
_browserInstance = std::make_unique<BrowserInstance>(
@@ -112,7 +108,11 @@ ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary &dictionary)
}
}
bool ScreenSpaceBrowser::initialize() {
bool ScreenSpaceBrowser::initializeGL() {
_texture = std::make_unique<ghoul::opengl::Texture>(
glm::uvec3(_dimensions.value(), 1.0f)
);
_renderHandler->setTexture(*_texture);
createShaders();
@@ -122,7 +122,10 @@ bool ScreenSpaceBrowser::initialize() {
return isReady();
}
bool ScreenSpaceBrowser::deinitialize() {
bool ScreenSpaceBrowser::deinitializeGL() {
_renderHandler->setTexture(0);
_texture = nullptr;
std::string urlString;
_url.getStringValue(urlString);
LDEBUG(fmt::format("Deinitializing ScreenSpaceBrowser: {}", urlString));
@@ -133,11 +136,12 @@ bool ScreenSpaceBrowser::deinitialize() {
if (webBrowser) {
webBrowser->removeBrowser(_browserInstance.get());
_browserInstance.reset();
return true;
}
else {
LWARNING("Could not find WebBrowserModule");
}
LWARNING("Could not find WebBrowserModule");
return false;
return ScreenSpaceRenderable::deinitializeGL();
}
void ScreenSpaceBrowser::render() {