mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 11:18:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

More fixes for full json output functionality

Browse Source
This commit is contained in:
GPayne
2022-01-26 19:11:14 -07:00
parent 3e2b035893
commit 025b61f7af
5 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSpace/ext/launcher/CMakeLists.txt
+1
View File
@@ -136,6 +136,7 @@ target_include_directories(
PUBLIC
include
${OPENSPACE_APPS_DIR}/OpenSpace/ext/sgct/include
${OPENSPACE_APPS_DIR}/OpenSpace/ext/sgct/sgct/ext/glm
)
target_link_libraries(
openspace-ui-launcher
apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h
+2 -1
View File
@@ -15,8 +15,9 @@
#include <QVector>
#include <QWidget>
#include <vector>
#include <glm/gtc/constants.hpp>
#include <iostream>
#include <vector>
#include <sgct/config.h>
apps/OpenSpace/ext/launcher/src/sgctedit/filesupport.cpp
+8 -4
View File
@@ -168,6 +168,8 @@ void FileSupport::saveProjectionInformation(bool isSpoutSelected, int projection
{
sgct::config::FisheyeProjection projection;
projection.quality = winControl->qualitySelectedValue();
projection.fov = 180.0;
projection.tilt = 0.0;
viewport.projection = std::move(projection);
}
break;
@@ -200,11 +202,13 @@ void FileSupport::saveProjectionInformation(bool isSpoutSelected, int projection
case WindowControl::ProjectionIndeces::Planar:
default:
{
// The negative values for left & down are according to sgct's
// convection for importing
sgct::config::PlanarProjection projection;
projection.fov.left = winControl->fovH() / 2.0;
projection.fov.right = projection.fov.left;
projection.fov.down = winControl->fovV() / 2.0;
projection.fov.up = projection.fov.down;
projection.fov.right = winControl->fovH() / 2.0;
projection.fov.left = -projection.fov.right;
projection.fov.up = winControl->fovV() / 2.0;
projection.fov.down = -projection.fov.up;
viewport.projection = std::move(projection);
}
break;
apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp
+7 -3
View File
@@ -70,9 +70,13 @@ OrientationDialog::OrientationDialog(sgct::quat& orientation, QWidget* parent)
}
void OrientationDialog::ok() {
_orientationValue.x = QString(_linePitch->text()).toFloat();
_orientationValue.y = QString(_lineYaw->text()).toFloat();
_orientationValue.z = QString(_lineRoll->text()).toFloat();
_orientationValue.x = QString(_linePitch->text()).toFloat() / 180.0
* glm::pi<float>();
_orientationValue.y = QString(_lineYaw->text()).toFloat() / 180.0
* glm::pi<float>();
_orientationValue.z = QString(_lineRoll->text()).toFloat() / 180.0
* glm::pi<float>();
_orientationValue.w = 1.0;
accept();
}
apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
+1 -2
View File
@@ -68,7 +68,6 @@ WindowControl::WindowControl(unsigned int nMonitors, unsigned int monitorIndex,
SLOT(onOffsetXChanged(const QString&)));
connect(_offset_y, SIGNAL(textChanged(const QString&)), this,
SLOT(onOffsetYChanged(const QString&)));
connect(_comboMonitorSelect, SIGNAL(currentIndexChanged(int)),
this, SLOT(onMonitorChanged(int)));
connect(_comboProjection, SIGNAL(currentIndexChanged(int)),
@@ -77,7 +76,6 @@ WindowControl::WindowControl(unsigned int nMonitors, unsigned int monitorIndex,
this, SLOT(onSpoutSelection(int)));
connect(_checkBoxWebGui, SIGNAL(stateChanged(int)),
this, SLOT(onWebGuiSelection(int)));
connect(_fullscreenButton, SIGNAL(released()), this, SLOT(onFullscreenClicked()));
}
@@ -295,6 +293,7 @@ void WindowControl::onFullscreenClicked() {
_offset_y->setText("0");
_size_x->setText(QString::number(_monitorResolutions[_monIndex].width()));
_size_y->setText(QString::number(_monitorResolutions[_monIndex].height()));
_checkBoxWindowDecor->setCheckState(Qt::Unchecked);
}
void WindowControl::enableGuiWindowSelection(bool enabled) {