mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-02 16:59:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/thesis/2020/radiation' into thesis/2020/radiation

Browse Source
This commit is contained in:
Emilie
2020-06-26 15:52:45 +02:00
parent 3be7cfbffc 0667ea8a61
commit dd10247014
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/assets/bastille-mas-model.scene
+21 -12
View File
@@ -13,6 +13,9 @@ assetHelper.requestAll(asset, 'scene/solarsystem/sun/heliosphere')
-- must be >0
-- the textureIndex variable is used to select a texture from a list of textures
textureIndex = 2;
Endtime1 = "2000 JUL 14 19:00:00";
Starttimescript = "openspace.time.setTime('2000 JUL 14 08:34:00')";
Endtime2 = "2000 JUL 14 14:00:00";
local Keybindings = {
{
@@ -48,21 +51,27 @@ local Keybindings = {
Local = false
},
{
Key = "F7",
Command = propertyHelper.invert('Scene.MAS_MHD_Fieldlines.Renderable.Enabled'),
Documentation = "Toggle fieldlines",
Local = false
},
{
Key = "F8",
Command = propertyHelper.invert('Scene.SunGlare.Renderable.Enabled'),
Documentation = "Toggle sun glare",
Key = "F7",
Command = "openspace.scriptScheduler.loadScheduledScript(Endtime2, Starttimescript)",
Documentation = "Loop time 08:34- 14:00",
Name = "Loop Nodedata time 08:34 - 14:00",
GuiPath = "/CCMC/Nodes",
Local = false
},
{
Key = "F9",
Command = propertyHelper.invert('Scene.Sun.Renderable.Enabled'),
Documentation = "Toggle sun",
Key = "F8",
Command = "openspace.scriptScheduler.loadScheduledScript(Endtime1, Starttimescript)",
Documentation = "Loop time 08:34- 19:34",
Name = "Loop Nodedata time 08:34 - 19:34",
GuiPath = "/CCMC/Nodes",
Local = false
},
{
Key = "F9",
Command = "openspace.scriptScheduler.clear()",
Documentation = "Clear scriptScheduler",
Name = "Clear loopscripts",
GuiPath = "/CCMC/Nodes",
Local = false
},
{
modules/fieldlinessequence/rendering/renderablestreamnodes.cpp
+1 -1
View File
@@ -299,7 +299,7 @@ namespace openspace {
, _pColorTableRange(colorTableRangeInfo)
, _pDomainZ(DomainZInfo)
, _pFluxColorAlpha(FluxColorAlphaInfo, 1.f, 0.f, 1.f)
, _pThresholdFlux(ThresholdFluxInfo, -20.f, -20.f, 10.f)
, _pThresholdFlux(ThresholdFluxInfo, 0.f, -20.f, 20.f)
// , _pFiltering(FilteringInfo, 100000.f, 10000000.f, 1000000000000.f)
// , _pFilteringUpper(FilteringUpperInfo, 600000000000.f, 1000000.f, 1000000000000.f)
, _pFiltering(FilteringInfo, 0.f, 0.f, 5.f)