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

New hotkeys and changed appearance on dashboard delta time

Browse Source
This commit is contained in:
Emilie
2020-09-30 15:25:23 +02:00
parent 08e45aa8b9
commit 8c764060a2
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/assets/bastille-mas-model.scene
+21 -4
View File
@@ -48,14 +48,18 @@ local Keybindings = {
{
Key = "F2",
Name = "Show Flux Value Legend",
Command = "openspace.setPropertyValueSingle('ScreenSpace.Legendstreamnodes.Enabled', true);",
Command =
"openspace.setPropertyValueSingle('ScreenSpace.Legendstreamnodes.Alpha', 0.000000);" ..
"openspace.setPropertyValueSingle('ScreenSpace.Legendstreamnodes.Alpha', 1.000000, 4);" ..
"openspace.setPropertyValueSingle('ScreenSpace.Legendstreamnodes.Enabled', true);",
Documentation = "Show the legend image",
Local = true
},
{
Key = "F3",
Name = "Show Flux Value Legend",
Command = "openspace.setPropertyValueSingle('ScreenSpace.Legendstreamnodes.Enabled', false);",
Command =
"openspace.setPropertyValueSingle('ScreenSpace.Legendstreamnodes.Alpha', 0.000000, 2);",
Documentation = "Hides the legend image",
Local = true
},
@@ -380,7 +384,20 @@ local Keybindings = {
GuiPath = "/CCMC/Nodes",
Local = false
},
{
{
Key = "Shift+a",
Command =
--"openspace.setPropertyValueSingle('Scene.Earths_Magnetosphere.Renderable.Enabled', true);" ..
propertyHelper.invert('Scene.Earths_Magnetosphere.Renderable.Enabled') ..
"openspace.setPropertyValueSingle('Scene.Earths_Magnetosphere.Renderable.lineWidth', 1.500000);" ..
"openspace.setPropertyValueSingle('Scene.Earths_Magnetosphere.Renderable.Color.uniform', {0.300000,0.570000,0.750000,0.00000});" ..
"openspace.setPropertyValueSingle('Scene.Earths_Magnetosphere.Renderable.Color.uniform', {0.300000,0.570000,0.750000,0.50000}, 5);",
Documentation = "Transition Magnetosphere",
Name = "Transition Magnetosphere",
GuiPath = "/CCMC/Nodes",
Local = false
},
{
Key = "Shift+h",
Command =
"openspace.setPropertyValueSingle('Scene.MAS_MHD_StreamNodes.Renderable.Enabled', true);" ..
@@ -388,7 +405,7 @@ local Keybindings = {
"openspace.setPropertyValueSingle('Scene.MAS_MHD_StreamNodes.Renderable.NodeGroup.nodeSizeLargerFlux', 5.200000);" ..
"openspace.setPropertyValueSingle('Scene.MAS_MHD_StreamNodes.Renderable.Streams.filterUpper', 0.190000);",
Documentation = "Turn on off glare",
Name = "Second transition Emilie",
Name = "Last transition Emilie",
GuiPath = "/CCMC/Nodes",
Local = false
},
modules/base/dashboard/dashboarditemdate.cpp
+5 -3
View File
@@ -119,13 +119,15 @@ void DashboardItemDate::render(glm::vec2& penPosition) {
std::string DeltaStringEnd = "";
if (deltatime > 60) {
deltatime = deltatime / 60;
DeltaStringEnd = " MINUTES / SECOND";
DeltaStringEnd = " MINUTES / SECOND";
}
else {
DeltaStringEnd = " SECONDS / SECOND";
}
timestring += '\n';
timestring += std::to_string(int(deltatime)) + DeltaStringEnd;
if (deltatime != 0) {
timestring += '\n';
timestring += std::to_string(int(deltatime)) + DeltaStringEnd;
}
RenderFont(
*_font,