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

Projection quality value saved as pixel count rather than list index

Browse Source
This commit is contained in:
GPayne
2022-01-14 12:17:33 -07:00
parent ca7dd2028f
commit 07a291a388
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h
View File

@@ -53,6 +53,7 @@ public:
void uncheckWebGuiOption();
int projectionSelectedIndex();
int qualitySelectedIndex();
int qualitySelectedValue();
float fovH();
float fovV();
float heightOffset();
@@ -68,6 +69,8 @@ public:
std::string QualityTypeNames[10] = {"Low (256)", "Medium (512)", "High (1K)",
"1.5K (1536)", "2K (2048)", "4K (4096)", "8K (8192)", "16K (16384)",
"32K (32768)", "64K (65536)"};
int QualityValues[10] = {256, 512, 1024, 1536, 2048, 4096, 8192, 16384,
32768, 65536};
private slots:
void onSizeXChanged(const QString& newText);

10
apps/OpenSpace/ext/launcher/src/sgctedit/filesupport.cpp
View File

@@ -151,7 +151,7 @@ void FileSupport::saveProjectionInformation(bool isSpoutSelected, int projection
= sgct::config::SpoutOutputProjection::Mapping::Equirectangular;
break;
}
projection.quality = winControl->qualitySelectedIndex();
projection.quality = winControl->qualitySelectedValue();
projection.mappingSpoutName = "OpenSpace";
viewport.projection = std::move(projection);
}
@@ -160,7 +160,7 @@ void FileSupport::saveProjectionInformation(bool isSpoutSelected, int projection
case WindowControl::ProjectionIndeces::Fisheye:
{
sgct::config::FisheyeProjection projection;
projection.quality = winControl->qualitySelectedIndex();
projection.quality = winControl->qualitySelectedValue();
viewport.projection = std::move(projection);
}
break;
@@ -168,7 +168,7 @@ void FileSupport::saveProjectionInformation(bool isSpoutSelected, int projection
case WindowControl::ProjectionIndeces::Spherical_Mirror:
{
sgct::config::SphericalMirrorProjection projection;
projection.quality = winControl->qualitySelectedIndex();
projection.quality = winControl->qualitySelectedValue();
viewport.projection = std::move(projection);
}
break;
@@ -176,7 +176,7 @@ void FileSupport::saveProjectionInformation(bool isSpoutSelected, int projection
case WindowControl::ProjectionIndeces::Cylindrical:
{
sgct::config::CylindricalProjection projection;
projection.quality = winControl->qualitySelectedIndex();
projection.quality = winControl->qualitySelectedValue();
projection.heightOffset = winControl->heightOffset();
viewport.projection = std::move(projection);
}
@@ -185,7 +185,7 @@ void FileSupport::saveProjectionInformation(bool isSpoutSelected, int projection
case WindowControl::ProjectionIndeces::Equirectangular:
{
sgct::config::EquirectangularProjection projection;
projection.quality = winControl->qualitySelectedIndex();
projection.quality = winControl->qualitySelectedValue();
viewport.projection = std::move(projection);
}
break;

4
apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
View File

@@ -468,6 +468,10 @@ int WindowControl::qualitySelectedIndex() {
return _comboQuality->currentIndex();
}
int WindowControl::qualitySelectedValue() {
return QualityValues[_comboQuality->currentIndex()];
}
float WindowControl::fovH() {
return _lineFovH->text().toFloat();
}

2
apps/OpenSpace/ext/sgct

Submodule apps/OpenSpace/ext/sgct updated: ee93d3e894...bdab900632