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

Code cleanup branch (#618)

Browse Source 
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
This commit is contained in:
Alexander Bock
2018-06-10 04:47:34 +00:00
committed by GitHub
parent 5de728442d
commit 4952f8f977
796 changed files with 22428 additions and 24063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
modules/cefwebgui/cefwebguimodule.cpp
View File

@@ -25,9 +25,18 @@
#include <modules/webbrowser/webbrowsermodule.h>
#include "cefwebguimodule.h"
#include <openspace/engine/configuration.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/moduleengine.h>
#include <openspace/engine/wrapper/windowwrapper.h>
#include <modules/webbrowser/include/browserinstance.h>
#include <modules/cefwebgui/include/guirenderhandler.h>
#include <ghoul/fmt.h>
#include <ghoul/logging/logmanager.h>
namespace {
const std::string _loggerCat = "CefWebGui";
}
constexpr const char* _loggerCat = "CefWebGui";
} // namespace
namespace openspace {
@@ -36,45 +45,49 @@ CefWebGuiModule::CefWebGuiModule()
{}
void CefWebGuiModule::internalInitialize(const ghoul::Dictionary&) {
_guiInstance = std::make_shared<BrowserInstance>(new GUIRenderHandler());
_guiLocation = OsEng.configurationManager().value<std::string>(
ConfigurationManager::KeyCefWebGuiUrl);
_guiInstance = std::make_shared<BrowserInstance>(new GUIRenderHandler);
_guiLocation = OsEng.configuration().cefWebGuiUrl;
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);
}
OpenSpaceEngine::CallbackOption::Initialize,
[this]() {
LDEBUGC("WebBrowser", fmt::format("Loading GUI from {}", _guiLocation));
_guiInstance->loadUrl(_guiLocation);
WebBrowserModule* webBrowserModule =
OsEng.moduleEngine().module<WebBrowserModule>();
if (webBrowserModule) {
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();
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();
});
}
OpenSpaceEngine::CallbackOption::Deinitialize,
[this]() {
_guiInstance->close(true);
WebBrowserModule* webBrowserModule =
OsEng.moduleEngine().module<WebBrowserModule>();
if (webBrowserModule) {
webBrowserModule->removeBrowser(_guiInstance);
}
_guiInstance.reset();
}
);
}
} // namespace openspace