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

Merge pull request #1210 from OpenSpace/issue/1199-multi-monitor

Browse Source 
fixed reading config files, single_gui.xml, and updating webmodules 
closes 1199
This commit is contained in:
Alexander Bock
2020-06-23 15:22:22 +02:00
committed by GitHub
parent 89f1835994 f138708fd9
commit 66a2ba5c0c
9 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/OpenSpace/ext/sgct

Submodule apps/OpenSpace/ext/sgct updated: 0d902bbe4f...1ab6980ccc

16
apps/OpenSpace/main.cpp
View File

@@ -854,16 +854,16 @@ void mainLogCallback(Log::Level level, const char* message) {
// Remove the trailing \n that is passed along
switch (level) {
case Log::Level::Debug:
LDEBUGC("SGCT", msg.substr(0, msg.size() - 1));
LDEBUGC("SGCT", msg);
break;
case Log::Level::Info:
LINFOC("SGCT", msg.substr(0, msg.size() - 1));
LINFOC("SGCT", msg);
break;
case Log::Level::Warning:
LWARNINGC("SGCT", msg.substr(0, msg.size() - 1));
LWARNINGC("SGCT", msg);
break;
case Log::Level::Error:
LERRORC("SGCT", msg.substr(0, msg.size() - 1));
LERRORC("SGCT", msg);
break;
}
@@ -1272,7 +1272,7 @@ int main(int argc, char** argv) {
LDEBUG("Creating SGCT Engine");
std::vector<std::string> arg(argv + 1, argv + argc);
Configuration config = parseArguments(arg);
config::Cluster cluster = loadCluster(windowConfiguration);
config::Cluster cluster = loadCluster(absPath(windowConfiguration));
Engine::Callbacks callbacks;
callbacks.initOpenGL = mainInitFunc;
@@ -1293,6 +1293,12 @@ int main(int argc, char** argv) {
try {
Engine::create(cluster, callbacks, config);
}
catch (const std::runtime_error& e) {
LFATAL("main", e.what());
Engine::destroy();
global::openSpaceEngine.deinitialize();
ghoul::deinitialize();
}
catch (...) {
Engine::destroy();
global::openSpaceEngine.deinitialize();

4
config/gui_projector.xml
View File

@@ -4,7 +4,7 @@
<Display swapInterval="0" />
</Settings>
<Node address="localhost" port="20401">
<Window fullScreen="true" monitor="1" name="OpenSpace">
<Window fullScreen="true" monitor="1" name="OpenSpace" draw2d="false">
<Stereo type="none" />
<Size x="1920" y="1080" />
<Pos x="0" y="0" />
@@ -17,7 +17,7 @@
</PlanarProjection>
</Viewport>
</Window>
<Window fullScreen="false" border="false" name="GUI" tags="GUI">
<Window fullScreen="false" border="false" name="GUI" tags="GUI" draw3D="false">
<Stereo type="none" />
<Size x="1920" y="1080" />
<Pos x="0" y="0" />

4
config/single_fisheye_gui.xml
View File

@@ -6,7 +6,7 @@
<Scale value="1.0" />
</Scene> -->
<Node address="localhost" port="20401">
<Window fullScreen="false" name="OpenSpace">
<Window fullScreen="false" name="OpenSpace" draw2d="false">
<Stereo type="none" />
<!-- 16:9 aspect ratio -->
<Size x="1024" y="1024" />
@@ -32,7 +32,7 @@
</Window>
<Window fullScreen="false" name="GUI" tags="GUI">
<Window fullScreen="false" name="GUI" tags="GUI" draw3d="false">
<Stereo type="none" />
<Size x="1024" y="1024" />
<Pos x="50" y="50" />

8
config/single_gui.xml
View File

@@ -4,7 +4,7 @@
<Display swapInterval="0" />
</Settings>
<Node address="localhost" port="20401">
<Window fullScreen="false" name="OpenSpace">
<Window fullScreen="false" name="OpenSpace" draw2d="false">
<Stereo type="none" />
<Size x="1280" y="720" />
<Pos x="50" y="50" />
@@ -17,13 +17,17 @@
</PlanarProjection>
</Viewport>
</Window>
<Window fullScreen="false" name="GUI" tags="GUI">
<Window fullScreen="false" name="GUI" tags="GUI" draw3d="false">
<Stereo type="none" />
<Size x="1280" y="720" />
<Pos x="50" y="50" />
<Viewport>
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<PlanarProjection>
<FOV down="25.267007923362" left="40.0" right="40.0" up="25.267007923362" />
<Orientation heading="0.0" pitch="0.0" roll="0.0" />
</PlanarProjection>
</Viewport>
</Window>
</Node>

4
config/spherical_mirror_gui.xml
View File

@@ -19,7 +19,7 @@
-->
<!-- mesh path is relative to working directory-->
<!-- NOTE, if no working directory is set, mesh must be absolute path -->
<Viewport name="warped fisheye" mesh="mesh/standard_16x9.data">
<Viewport name="warped fisheye" mesh="mesh/standard_16x9.data" draw2d="false">
<Pos x="0.0" y="0.0" />
<Size x="1.0" y="1.0" />
<FisheyeProjection fov="180" quality="2k" tilt="30.0">
@@ -27,7 +27,7 @@
</FisheyeProjection>
</Viewport>
</Window>
<Window fullscreen="false" name="GUI" tags="GUI">
<Window fullscreen="false" name="GUI" tags="GUI" draw3d="false">
<Stereo type="none" />
<Size x="1280" y="720" />
<Res x="2048" y="2048" />

2
ext/ghoul

Submodule ext/ghoul updated: 19f324db68...d35be27b61

6
modules/cefwebgui/cefwebguimodule.cpp
View File

@@ -91,13 +91,9 @@ void CefWebGuiModule::startOrStopGui() {
WebBrowserModule* webBrowserModule = global::moduleEngine.module<WebBrowserModule>();
const bool isGuiWindow =
global::windowDelegate.hasGuiWindow() ?
global::windowDelegate.isGuiWindow() :
true;
const bool isMaster = global::windowDelegate.isMaster();
if (_enabled && isGuiWindow && isMaster) {
if (_enabled && isMaster) {
LDEBUGC("WebBrowser", fmt::format("Loading GUI from {}", _url));
if (!_instance) {

6
modules/webbrowser/webbrowsermodule.cpp
View File

@@ -138,13 +138,9 @@ void WebBrowserModule::internalInitialize(const ghoul::Dictionary& dictionary) {
_enabled = dictionary.value<bool>("Enabled");
}
const bool isGuiWindow =
global::windowDelegate.hasGuiWindow() ?
global::windowDelegate.isGuiWindow() :
true;
const bool isMaster = global::windowDelegate.isMaster();
if (!_enabled || !isGuiWindow || !isMaster) {
if (!_enabled || (!isMaster) ) {
return;
}