mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature/thesis work merge (#566)

Browse Source 
Web GUI from Klas Eskilson (three new modules: webgui, webbrowser and cefwebgui)
Parallel connection refactorization
Wormhole server added to the main repository
Transfer function editor work from Cristoffer Särevall
Update ghoul
This commit is contained in:
Emil Axelsson
2018-03-20 09:30:59 +01:00
committed by GitHub
parent 35fe90cbfa
commit d64a0df5f6
340 changed files with 26401 additions and 1625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
modules/cefwebgui/cefwebguimodule.cpp Normal file
View File

@@ -0,0 +1,80 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <modules/webbrowser/webbrowsermodule.h>
#include "cefwebguimodule.h"
namespace {
const std::string _loggerCat = "CefWebGui";
}
namespace openspace {
CefWebGuiModule::CefWebGuiModule()
: OpenSpaceModule(CefWebGuiModule::Name)
{}
void CefWebGuiModule::internalInitialize(const ghoul::Dictionary&) {
_guiInstance = std::make_shared<BrowserInstance>(new GUIRenderHandler());
_guiLocation = OsEng.configurationManager().value<std::string>(
ConfigurationManager::KeyCefWebGuiUrl);
OsEng.registerModuleCallback(
OpenSpaceEngine::CallbackOption::Initialize,
[this]() {
LDEBUGC("WebBrowser", fmt::format("Loading GUI from {}", _guiLocation));
_guiInstance->loadUrl(_guiLocation);
auto webBrowserModule = OsEng.moduleEngine().module<WebBrowserModule>();
if (webBrowserModule != nullptr) {
webBrowserModule->attachEventHandler(_guiInstance);
webBrowserModule->addBrowser(_guiInstance);
}
}
);
OsEng.registerModuleCallback(
OpenSpaceEngine::CallbackOption::Render,
[this](){
WindowWrapper& wrapper = OsEng.windowWrapper();
if (wrapper.isMaster()) {
if (wrapper.windowHasResized()) {
_guiInstance->reshape(wrapper.currentWindowSize());
}
_guiInstance->draw();
}
});
OsEng.registerModuleCallback(
OpenSpaceEngine::CallbackOption::Deinitialize,
[this](){
_guiInstance->close(true);
auto webBrowserModule = OsEng.moduleEngine().module<WebBrowserModule>();
if (webBrowserModule != nullptr) {
webBrowserModule->removeBrowser(_guiInstance);
}
_guiInstance.reset();
});
}
}