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

Merge branch 'master' into feature/animation-fixes

Browse Source
This commit is contained in:
Malin E
2021-10-08 16:22:18 +02:00
parent db4f4e18ac 821e746c1a
commit 48597ec222
25 changed files with 55 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp
View File

@@ -306,11 +306,30 @@ void ActionDialog::createKeyboardWidgets(QGridLayout* layout) {
_keybindingWidgets.key = new QComboBox;
QStringList keyList;
for (const KeyInfo& ki : KeyInfos) {
// We don't want to use the Shift, Alt, and Ctrl keys directly since we already
// have them as modifier keys
if (ki.key == Key::LeftShift || ki.key == Key::RightShift ||
ki.key == Key::LeftAlt || ki.key == Key::RightAlt ||
ki.key == Key::LeftControl || ki.key == Key::RightControl ||
ki.key == Key::LeftSuper || ki.key == Key::RightSuper ||
ki.key == Key::Menu || ki.key == Key::NumLock ||
ki.key == Key::World1 || ki.key == Key::World2)
{
continue;
}
keyList += QString::fromStdString(std::string(ki.name));
}
_keybindingWidgets.key->addItems(keyList);
_keybindingWidgets.key->setCurrentIndex(-1);
_keybindingWidgets.key->setEnabled(false);
connect(
_keybindingWidgets.key, QOverload<int>::of(&QComboBox::currentIndexChanged),
[this](int newIndex) {
_keybindingWidgets.saveButtons->button(QDialogButtonBox::Save)->setEnabled(
newIndex > 0
);
}
);
layout->addWidget(_keybindingWidgets.key, 11, 2);
layout->addWidget(new QLabel("Action chooser"), 12, 1);
@@ -632,7 +651,9 @@ void ActionDialog::keybindingSelected() {
std::string key = ghoul::to_string(keybinding->key.key);
_keybindingWidgets.key->setCurrentText(QString::fromStdString(key));
_keybindingWidgets.key->setEnabled(true);
_keybindingWidgets.action->setCurrentText(QString::fromStdString(keybinding->action));
_keybindingWidgets.action->setCurrentText(
QString::fromStdString(keybinding->action)
);
_keybindingWidgets.action->setEnabled(true);
_keybindingWidgets.actionText->setText(
QString::fromStdString(keybinding->action)
@@ -640,7 +661,13 @@ void ActionDialog::keybindingSelected() {
_keybindingWidgets.actionText->setEnabled(true);
_keybindingWidgets.addButton->setEnabled(false);
_keybindingWidgets.removeButton->setEnabled(true);
_keybindingWidgets.saveButtons->setEnabled(true);
// Only enable the save buttons if a key is selected, otherwise we would get an
// exception as the None key cannot be bound
_keybindingWidgets.saveButtons->button(QDialogButtonBox::Save)->setEnabled(
_keybindingWidgets.key->currentIndex() > 0
);
}
else {
// No keybinding selected
@@ -656,7 +683,7 @@ void ActionDialog::keybindingActionSelected(int) {
void ActionDialog::keybindingSaved() {
Profile::Keybinding* keybinding = selectedKeybinding();
ghoul_assert(keybinding, "There must be a selected action at this point");
ghoul_assert(keybinding, "There must be a selected keybinding at this point");
KeyModifier km = KeyModifier::None;
if (_keybindingWidgets.shiftModifier->isChecked()) {

2
apps/OpenSpace/ext/sgct

Submodule apps/OpenSpace/ext/sgct updated: a7b225f605...d89724510f

2
data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset
View File

@@ -21,7 +21,7 @@ local Hydra = {
SegmentsPerPatch = 64,
Layers = {}
},
Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto" },
Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor" },
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto"
}

2
data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset
View File

@@ -20,7 +20,7 @@ local Kerberos = {
SegmentsPerPatch = 64,
Layers = {}
},
Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto" },
Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor" },
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto"
}

2
data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset
View File

@@ -20,7 +20,7 @@ local Nix = {
SegmentsPerPatch = 64,
Layers = {}
},
Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto" },
Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor" },
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto"
}

2
data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset
View File

@@ -19,7 +19,7 @@ local Styx = {
SegmentsPerPatch = 64,
Layers = {}
},
Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto" },
Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor" },
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto"
}

2
data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
View File

@@ -7,7 +7,7 @@ local kernel = asset.require('../kernels').jup341
local parentIdentifier = transforms.JupiterBarycenter.Identifier
local parentSpice = "JUPITER BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_ananke"}
local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_ananke", "moon_minor" }
local trailColor = { 0.4, 0.3, 0.01 }
local trailTags = {
"moonTrail_solarSystem",

2
data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
View File

@@ -7,7 +7,7 @@ local kernel = asset.require('../kernels').jup341
local parentIdentifier = transforms.JupiterBarycenter.Identifier
local parentSpice = "JUPITER BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_carme" }
local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_carme", "moon_minor" }
local trailColor = { 0.4, 0.3, 0.01 }
local trailTags = {
"moonTrail_solarSystem",

2
data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
View File

@@ -7,7 +7,7 @@ local kernel = asset.require('../kernels').jup341
local parentIdentifier = transforms.JupiterBarycenter.Identifier
local parentSpice = "JUPITER BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_carpo" }
local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_carpo", "moon_minor" }
local trailColor = { 0.4, 0.3, 0.01 }
local trailTags = {
"moonTrail_solarSystem",

2
data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
View File

@@ -7,7 +7,7 @@ local kernel = asset.require('../kernels').jup341
local parentIdentifier = transforms.JupiterBarycenter.Identifier
local parentSpice = "JUPITER BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_himalia" }
local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_himalia", "moon_minor" }
local trailColor = { 0.4, 0.3, 0.01 }
local trailTags = {
"moonTrail_solarSystem",

2
data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
View File

@@ -7,7 +7,7 @@ local kernel = asset.require('../kernels').jup341
local parentIdentifier = transforms.JupiterBarycenter.Identifier
local parentSpice = "JUPITER BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_inner" }
local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_inner", "moon_minor" }
local trailColor = { 0.4, 0.3, 0.01 }
local trailTags = {
"moonTrail_solarSystem",

2
data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
View File

@@ -7,7 +7,7 @@ local kernel = asset.require('../kernels').jup341
local parentIdentifier = transforms.JupiterBarycenter.Identifier
local parentSpice = "JUPITER BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_other" }
local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_other", "moon_minor" }
local trailColor = { 0.4, 0.3, 0.01 }
local trailTags = {
"moonTrail_solarSystem",

2
data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
View File

@@ -7,7 +7,7 @@ local kernel = asset.require('../kernels').jup341
local parentIdentifier = transforms.JupiterBarycenter.Identifier
local parentSpice = "JUPITER BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_pasiphae" }
local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_pasiphae", "moon_minor" }
local trailColor = { 0.4, 0.3, 0.01 }
local trailTags = {
"moonTrail_solarSystem",

2
data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
View File

@@ -7,7 +7,7 @@ local kernel = asset.require('../kernels').jup341
local parentIdentifier = transforms.JupiterBarycenter.Identifier
local parentSpice = "JUPITER BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_themisto" }
local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_themisto", "moon_minor" }
local trailColor = { 0.4, 0.3, 0.01 }
local trailTags = {
"moonTrail_solarSystem",

2
data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
View File

@@ -10,7 +10,7 @@ local kernel088 = kernels.nep088
local parentIdentifier = transforms.NeptuneBarycenter.Identifier
local parentSpice = "NEPTUNE BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_inner" }
local tags = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_inner", "moon_minor" }
local trailColor = { 0.2, 0.5, 0.75 }
local trailTags = {
"moonTrail_solarSystem",

2
data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset
View File

@@ -10,7 +10,7 @@ local kernel088 = kernels.nep088
local parentIdentifier = transforms.NeptuneBarycenter.Identifier
local parentSpice = "NEPTUNE BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_irregular_prograde" }
local tags = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_irregular_prograde", "moon_minor" }
local trailColor = { 0.2, 0.5, 0.75 }
local trailTags = {
"moonTrail_solarSystem",

2
data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset
View File

@@ -9,7 +9,7 @@ local kernel086 = kernels.nep086
local parentIdentifier = transforms.NeptuneBarycenter.Identifier
local parentSpice = "NEPTUNE BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_irregular_retrograde" }
local tags = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_irregular_retrograde", "moon_minor" }
local trailColor = { 0.2, 0.5, 0.75 }
local trailTags = {
"moonTrail_solarSystem",

2
data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
View File

@@ -7,7 +7,7 @@ local kernel = asset.require('../kernels').sat368
local parentIdentifier = transforms.SaturnBarycenter.Identifier
local parentSpice = "SATURN BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_gallic" }
local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_gallic", "moon_minor" }
local trailColor = { 0.5, 0.3, 0.3 }
local trailTags = {
"moonTrail_solarSystem",

2
data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
View File

@@ -7,7 +7,7 @@ local kernel = asset.require('../kernels').sat368
local parentIdentifier = transforms.SaturnBarycenter.Identifier
local parentSpice = "SATURN BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_inuit" }
local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_inuit", "moon_minor" }
local trailColor = { 0.5, 0.3, 0.3 }
local trailTags = {
"moonTrail_solarSystem",

2
data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
View File

@@ -9,7 +9,7 @@ local kernel375 = kernels.sat375
local parentIdentifier = transforms.SaturnBarycenter.Identifier
local parentSpice = "SATURN BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_norse" }
local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_norse", "moon_minor" }
local trailColor = { 0.5, 0.3, 0.3 }
local trailTags = {
"moonTrail_solarSystem",

2
data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
View File

@@ -9,7 +9,7 @@ local kernel393 = kernels.sat393
local parentIdentifier = transforms.SaturnBarycenter.Identifier
local parentSpice = "SATURN BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_other" }
local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_other", "moon_minor" }
local trailColor = { 0.5, 0.3, 0.3 }
local trailTags = {
"moonTrail_solarSystem",

2
data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
View File

@@ -7,7 +7,7 @@ local kernel = asset.require('./kernels').ura091
local parentIdentifier = transforms.UranusBarycenter.Identifier
local parentSpice = "URANUS BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_inner" }
local tags = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_inner", "moon_minor" }
local trailColor = { 0.60, 0.65, 0.84 }
local trailTags = {

2
data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
View File

@@ -7,7 +7,7 @@ local kernel = asset.require('./kernels').ura112
local parentIdentifier = transforms.UranusBarycenter.Identifier
local parentSpice = "URANUS BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_irregular_prograde" }
local tags = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_irregular_prograde", "moon_minor" }
local trailColor = { 0.60, 0.65, 0.84 }
local trailTags = {
"moonTrail_solarSystem",

2
data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
View File

@@ -7,7 +7,7 @@ local kernel = asset.require('./kernels').ura112
local parentIdentifier = transforms.UranusBarycenter.Identifier
local parentSpice = "URANUS BARYCENTER"
local tags = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_irregular_retrograde" }
local tags = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_irregular_retrograde", "moon_minor" }
local trailColor = { 0.60, 0.65, 0.84 }
local trailTags = {
"moonTrail_solarSystem",

4
modules/base/rendering/renderableplaneimageonline.cpp
View File

@@ -95,7 +95,9 @@ void RenderablePlaneImageOnline::bindTexture() {
}
}
void RenderablePlaneImageOnline::update(const UpdateData&) {
void RenderablePlaneImageOnline::update(const UpdateData& data) {
RenderablePlane::update(data);
if (!_textureIsDirty) {
return;
}