mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 04:00:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn

Browse Source
This commit is contained in:
Agnes Heppich
2019-01-14 17:17:34 -05:00
parent 4c1c816b47 ed0df0319b
commit a41e2e6c75
38 changed files with 208 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/assets/scene/solarsystem/dsn/spacecrafts/cassini/cassini.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "Cassini";
local Cassini = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-2-18:00:00",
End = "2017-SEP-15-14:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/clu1/clu1.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "CLU1";
local CLU1 = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-01-06:00:00",
End = "2015-JUN-19-15:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/clu2/clu2.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "CLU2";
local CLU2 = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-04-02:00:00",
End = "2015-JUN-13-23:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/clu3/clu3.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "CLU3";
local CLU3 = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-2-17:00:00",
End = "2015-MAR-2-16:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/clu4/clu4.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "CLU4";
local CLU4 = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-1-10:00:00",
End = "2015-JUN-1-22:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/dawn/dawn.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "Dawn";
local Dawn = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-3-16:00:00",
End = "2018-SEP-14-01:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/gaia/gaia.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "Gaia";
local Gaia = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2018-APR-10-15:00:00",
End = "2018-JUN-03-06:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/genesis/genesis.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "Genesis";
local Genesis = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2015-SEP-11-21:00:00",
End = "2015-SEP-11-22:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/hayabusa2/hayabusa2.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "Hayabusa2";
local Hayabusa2 = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-DEC-3-06:00:00",
End = "2018-DEC-29-13:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/ice/ice.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "Ice";
local Ice = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JUN-18-20:00:00",
End = "2014-JUL-11-16:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/image/image.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "Image";
local Image = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2018-FEB-8-06:00:00",
End = "2018-FEB-10-01:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

6
data/assets/scene/solarsystem/dsn/spacecrafts/insight/insight.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "InSight";
local InSight = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2018-MAY-05-11:05:00",
End = "2019-JAN-1-00:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",
@@ -18,7 +23,6 @@ local InSight = {
DataFileType = "json",
ObjectIdentifier = spacecraftID
}
},
GUI = {
Name = "InSight",

5
data/assets/scene/solarsystem/dsn/spacecrafts/marcoa/marcoa.asset
View File

@@ -12,6 +12,11 @@ local spacecraftID = "MarCO A";
local MarCOA = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2018-MAY-05-11:05:00",
End = "2019-JAN-1-00:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/marcob/marcob.asset
View File

@@ -12,6 +12,11 @@ local spacecraftID = "MarCO B";
local MarCOB = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2018-MAY-05-11:05:00",
End = "2019-JAN-1-00:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/messenger/messenger.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "Messenger";
local Messenger = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-2-01:00:00",
End = "2015-MAY-1-05:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/mms1/mms1.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "MMS1";
local MMS1 = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-15-23:00:00",
End = "2018-DEC-30-04:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/mms2/mms2.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "MMS2";
local MMS2 = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-16-00:00:00",
End = "2018-DEC-30-05:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/mms3/mms3.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "MMS3";
local MMS3 = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-16-00:00:00",
End = "2018-DEC-30-05:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/mms4/mms4.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "MMS4";
local MMS4 = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-16-00:00:00",
End = "2018-DEC-30-05:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/osirisrex/osirisrex.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "OsirisRex";
local OsirisRex = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2016-SEP-9-07:00:00",
End = "2019-JAN-1-04:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/parkersolarprobe/parkersolarprobe.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "ParkerSolarProbe";
local ParkerSolarProbe = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2018-AUG-12-08:00:00",
End = "2018-DEC-31-07:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/planetc/planetc.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "PlanetC";
local PlanetC = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2015-JAN-19-15:00:00",
End = "2018-AUG-27-01:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/prcn/prcn.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "PRCN";
local PRCN = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-1-00:00:00",
End = "2018-OCT-17-09:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/rosetta/rosetta.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "Rosetta";
local Rosetta = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-20-14:00:00",
End = "2016-OCT-1-21:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/td10/td10.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "TD10";
local TD10 = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2016-AUG-9-16:00:00",
End = "2016-AUG-18-21:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/td12/td12.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "TD12";
local TD12 = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2017-AUG-18-13:00:00",
End = "2018-JUL-1-08:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/td13/td13.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "TD13";
local TD13 = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-20-14:00:00",
End = "2016-OCT-1-21:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/tdr3/tdr3.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "TDR3";
local TDR3 = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-28-18:00:00",
End = "2018-JUN-28-19:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/tdr5/tdr5.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "TDR5";
local TDR5 = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2017-AUG-31-20:00:00",
End = "2018-FEB-5-09:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/tdr7/tdr7.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "TDR7";
local TDR7 = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2017-MAR-16-19:00:00",
End = "2017-APR-13-17:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/tdr9/tdr9.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "TDR9";
local TDR9 = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2015-MAR-19-19:00:00",
End = "2017-NOV-7-20:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/terr/terr.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "TERR";
local TERR = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-22-04:00:00",
End = "2016-NOV-1-07:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/tracegasorbiter/tracegasorbiter.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "TraceGasOrbiter";
local TraceGasOrbiter = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2016-JAN-12-12:00:00",
End = "2018-DEC-30-23:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/transitexoplanetsurvey/transitexoplanetsurvey.asset
View File

@@ -12,6 +12,11 @@ local spacecraftID = "Tess";
local TransitExoplanetSurvey = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2018-APR-18-23:00:00",
End = "2019-JAN-1-01:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/venusexpress/venusexpress.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "VenusExpress";
local VenusExpress = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-JAN-20-05:00:00",
End = "2014-DEC-10-22:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

5
data/assets/scene/solarsystem/dsn/spacecrafts/xray/xray.asset
View File

@@ -11,6 +11,11 @@ local spacecraftID = "XRay";
local XRay = {
Identifier = spacecraftID,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2014-FEB-1-15:00:00",
End = "2017-NOV-19-02:00:00"
},
Transform = {
Translation = {
Type = "RadecTranslation",

165
data/assets/scene/solarsystem/dsn/spacecraftslabels.asset
View File

@@ -7,10 +7,6 @@ local spacecrafts = asset.require('scene/solarsystem/dsn/spacecrafts')
local CassiniLabel = {
LabelText = ".Cassini",
TimeFrame = {
Start = "2014-002T18:00:00",
End = "2017-258T14:00:00"
},
ObjectIdentifier = spacecrafts.CassiniAsset.spacecraftID
}
local ChandraLabel = {
@@ -19,63 +15,34 @@ local ChandraLabel = {
}
local CLU1Label = {
LabelText = ".CLU1",
TimeFrame = {
Start = "2014-001T06:00:00",
End = "2015-171T15:00:00"
},
ObjectIdentifier = spacecrafts.CLU1Asset.spacecraftID
}
local CLU2Label = {
LabelText = ".CLU2",
TimeFrame = {
Start = "2014-004T02:00:00",
End = "2015-164T23:00:00"
},
ObjectIdentifier = spacecrafts.CLU2Asset.spacecraftID
}
local CLU3Label = {
LabelText = ".CLU3",
TimeFrame = {
Start = "2014-002T17:00:00",
End = "2015-061T16:00:00"
},
ObjectIdentifier = spacecrafts.CLU3Asset.spacecraftID
}
local CLU4Label = {
LabelText = ".CLU4",
TimeFrame = {
Start = "2014-001T10:00:00",
End = "2015-152T22:00:00"
},
ObjectIdentifier = spacecrafts.CLU4Asset.spacecraftID
}
local CuriosityLabel = {
LabelText = ".Curiosity",
ObjectIdentifier = spacecrafts.CuriosityAsset.spacecraftID
}
local DawnLabel = {
LabelText = ".Dawn",
TimeFrame = {
Start = "2014-003T16:00:00",
End = "2018-257T01:00:00"
},
ObjectIdentifier = spacecrafts.DawnAsset.spacecraftID
}
local GaiaLabel = {
LabelText = ".Gaia",
TimeFrame = {
Start = "2018-100T15:00:00",
End = "2018-154T06:00:00"
},
ObjectIdentifier = spacecrafts.GaiaAsset.spacecraftID
}
local GenesisLabel = {
LabelText = ".Genesis",
TimeFrame = {
Start = "2015-254T21:00:00",
End = "2015-254T22:00:00"
},
ObjectIdentifier = spacecrafts.GenesisAsset.spacecraftID
}
local GeotailLabel = {
@@ -84,34 +51,18 @@ local GeotailLabel = {
}
local Hayabusa2Label = {
LabelText = ".Hayabusa 2",
TimeFrame = {
Start = "2014-337T06:00:00",
End = "2018-363T13:00:00"
},
ObjectIdentifier = spacecrafts.Hayabusa2Asset.spacecraftID
}
local IceLabel = {
LabelText = ".Ice",
TimeFrame = {
Start = "2014-169T20:00:00",
End = "2014-192T16:00:00"
},
ObjectIdentifier = spacecrafts.IceAsset.spacecraftID
}
local ImageLabel = {
LabelText = ".Image",
TimeFrame = {
Start = "2018-039T06:00:00",
End = "2018-041T01:00:00"
},
ObjectIdentifier = spacecrafts.ImageAsset.spacecraftID
}
local InSightLabel = {
LabelText = ".InSight",
TimeFrame = {
Start = "2017-142T18:00:00",
End = "2018-365T11:00:00"
},
ObjectIdentifier = spacecrafts.InSightAsset.spacecraftID
}
local JunoLabel = {
@@ -124,18 +75,10 @@ local KeplerLabel = {
}
local MarCOALabel = {
LabelText = ".MarCO A",
TimeFrame = {
Start = "2018-125T12:00:00",
End = "2018-365T19:00:00"
},
ObjectIdentifier = spacecrafts.MarCOAAsset.spacecraftID
}
local MarCOBLabel = {
LabelText = ".MarCO B",
TimeFrame = {
Start = "2018-125T12:00:00",
End = "2018-365T19:00:00"
},
ObjectIdentifier = spacecrafts.MarCOBAsset.spacecraftID
}
local MarsRecOrbLabel = {
@@ -148,42 +91,22 @@ local MarsOdysseyLabel = {
}
local MessengerLabel = {
LabelText = ".Messenger",
TimeFrame = {
Start = "2014-002T01:00:00",
End = "2015-121T05:00:00"
},
ObjectIdentifier = spacecrafts.MessengerAsset.spacecraftID
}
local MMS1Label = {
LabelText = ".MMS1",
TimeFrame = {
Start = "2014-015T23:00:00",
End = "2018-364T04:00:00"
},
ObjectIdentifier = spacecrafts.MMS1Asset.spacecraftID
}
local MMS2Label = {
LabelText = ".MMS2",
TimeFrame = {
Start = "2014-016T00:00:00",
End = "2018-364T05:00:00"
},
ObjectIdentifier = spacecrafts.MMS2Asset.spacecraftID
}
local MMS3Label = {
LabelText = ".MMS3",
TimeFrame = {
Start = "2014-016T01:00:00",
End = "2018-364T07:00:00"
},
ObjectIdentifier = spacecrafts.MMS3Asset.spacecraftID
}
local MMS4Label = {
LabelText = ".MMS4",
TimeFrame = {
Start = "2014-016T02:00:00",
End = "2018-364T09:00:00"
},
ObjectIdentifier = spacecrafts.MMS4Asset.spacecraftID
}
local MomLabel = {
@@ -200,34 +123,18 @@ local OpportunityLabel = {
}
local OsirisRexLabel = {
LabelText = ".Osiris Rex",
TimeFrame = {
Start = "2016-253T07:00:00",
End = "2019-001T04:00:00"
},
ObjectIdentifier = spacecrafts.OsirisRexAsset.spacecraftID
}
local ParkerSolarProbeLabel = {
LabelText = ".Parker Solar Probe",
TimeFrame = {
Start = "2018-224T08:00:00",
End = "2018-365T07:00:00"
},
ObjectIdentifier = spacecrafts.ParkerSolarProbeAsset.spacecraftID
}
local PlanetCLabel = {
LabelText = ".Planet C",
TimeFrame = {
Start = "2015-019T15:00:00",
End = "2018-239T01:00:00"
},
ObjectIdentifier = spacecrafts.PlanetCAsset.spacecraftID
}
local PRCNCLabel = {
LabelText = ".PRCN",
TimeFrame = {
Start = "2015-025T11:00:00",
End = "2016-078T10:00:00"
},
ObjectIdentifier = spacecrafts.PRCNAsset.spacecraftID
}
local SohoLabel = {
@@ -244,91 +151,47 @@ local StereoALabel = {
}
local StereoBLabel = {
LabelText = ".Stereo B",
TimeFrame = {
Start = "2014-001T00:00:00",
End = "2018-290T09:00:00"
},
ObjectIdentifier = spacecrafts.StereoBAsset.spacecraftID
}
local RosettaLabel = {
LabelText = ".Rosetta",
TimeFrame = {
Start = "2014-020T14:00:00",
End = "2016-275T21:00:00"
},
ObjectIdentifier = spacecrafts.RosettaAsset.spacecraftID
}
local TD10Label = {
LabelText = ".TD10",
TimeFrame = {
Start = "2016-222T16:00:00",
End = "2016-231T21:00:00"
},
ObjectIdentifier = spacecrafts.TD10Asset.spacecraftID
}
local TD12Label = {
LabelText = ".TD12",
TimeFrame = {
Start = "2017-230T13:00:00",
End = "2018-182T08:00:00"
},
ObjectIdentifier = spacecrafts.TD12Asset.spacecraftID
}
local TD13Label = {
LabelText = ".TD13",
TimeFrame = {
Start = "2014-020T14:00:00",
End = "2016-275T21:00:00"
},
ObjectIdentifier = spacecrafts.TD13Asset.spacecraftID
}
local TDR3Label = {
LabelText = ".TDR3",
TimeFrame = {
Start = "2014-028T18:00:00",
End = "2018-179T19:00:00"
},
ObjectIdentifier = spacecrafts.TDR3Asset.spacecraftID
}
local TDR5Label = {
LabelText = ".TDR5",
TimeFrame = {
Start = "2017-243T20:00:00",
End = "2018-036T09:00:00"
},
ObjectIdentifier = spacecrafts.TDR5Asset.spacecraftID
}
local TDR7Label = {
LabelText = ".TDR7",
TimeFrame = {
Start = "2017-075T19:00:00",
End = "2017-103T17:00:00"
},
ObjectIdentifier = spacecrafts.TDR7Asset.spacecraftID
}
local TDR9Label = {
LabelText = ".TDR9",
TimeFrame = {
Start = "2015-078T19:00:00",
End = "2017-311T20:00:00"
},
ObjectIdentifier = spacecrafts.TDR9Asset.spacecraftID
}
local TERRLabel = {
LabelText = ".TERR",
TimeFrame = {
Start = "2014-022T04:00:00",
End = "2016-306T07:00:00"
},
ObjectIdentifier = spacecrafts.TERRAsset.spacecraftID
}
--Transit exoplanet Survey Satellite
local TessLabel = {
LabelText = ".TESS",
TimeFrame = {
Start = "2018-108T23:00:00",
End = "2019-001T01:00:00"
},
ObjectIdentifier = spacecrafts.TessAsset.spacecraftID
}
local ThemisBLabel = {
@@ -341,18 +204,10 @@ local ThemisCLabel = {
}
local TraceGasOrbiterLabel = {
LabelText = ".Trace Gas Orbiter",
TimeFrame = {
Start = "2016-012T12:00:00",
End = "2018-364T23:00:00"
},
ObjectIdentifier = spacecrafts.TraceGasOrbiterAsset.spacecraftID
}
local VenusExpressLabel = {
LabelText = ".Venus Express",
TimeFrame = {
Start = "2014-020T05:00:00",
End = "2014-344T22:00:00"
},
ObjectIdentifier = spacecrafts.VenusExpressAsset.spacecraftID
}
local Voyager1Label = {
@@ -369,10 +224,6 @@ local WindLabel = {
}
local XRayLabel = {
LabelText = ".X-Ray",
TimeFrame = {
Start = "2014-032T15:00:00",
End = "2017-323T02:00:00"
},
ObjectIdentifier = spacecrafts.XRayAsset.spacecraftID
}
@@ -385,6 +236,11 @@ local MarsClusterLabel = {
ObjectIdentifier = "Mars"
}
local InsightClusterLabel = {
LabelText = "InSight, MarCO A & B ",
ObjectIdentifier = spacecrafts.InSightAsset.spacecraftID
}
-----------------------------------------------
-------------------- Id Maps ------------------
-----------------------------------------------
@@ -394,7 +250,10 @@ local labelMapMarsMissions = {
label3 = OpportunityLabel,
label4 = MomLabel,
label5 = TraceGasOrbiterLabel,
label6 = CuriosityLabel
label6 = CuriosityLabel,
label7 = MarCOALabel,
label8 = MarCOBLabel,
label9 = InSightLabel
}
@@ -416,9 +275,6 @@ local labelMapInnerSpace = {
label8 = GenesisLabel,
label9 = Hayabusa2Label,
label10 = MessengerLabel,
label12 = MarCOALabel,
label13 = MarCOBLabel,
label14 = InSightLabel,
label15 = OsirisRexLabel,
label16 = PlanetCLabel,
label17 = RosettaLabel,
@@ -459,7 +315,8 @@ local labelMapNearEarth = {
}
local labelMapClusters = {
Label1 = MarsClusterLabel
Label1 = MarsClusterLabel,
Label2 = InsightClusterLabel
}

32
modules/dsn/rendering/renderabledsnlabels.cpp
View File

@@ -557,23 +557,25 @@ namespace openspace {
for (int i = 0; i < labelDataInfo.size(); i++) {
LabelInfo labelinfo = labelDataInfo.at(i);
double currentTime = time.j2000Seconds();
bool inTimeFrame = (currentTime > labelinfo.startTime && currentTime < labelinfo.endTime);
if ( (labelinfo.hasKeyTimeFrame == true && inTimeFrame) || labelinfo.hasKeyTimeFrame == false) {
if (global::renderEngine.scene()->sceneGraphNode(labelinfo.attachedId)) {
glm::dvec3 position = global::renderEngine.scene()->sceneGraphNode(labelinfo.attachedId)->worldPosition();
if (!global::renderEngine.scene()->sceneGraphNode(labelinfo.attachedId)) {
LERROR(fmt::format("No SceneGraphNode found with identifier {}", labelinfo.attachedId));
return false;
}
// if the label is timeframe active
bool labelIsInTimeFrame = (currentTime > labelinfo.startTime && currentTime < labelinfo.endTime);
// if the node it is attached to is timeframe active
bool nodeIsInTimeFrame = global::renderEngine.scene()->sceneGraphNode(labelinfo.attachedId)->isTimeFrameActive(time);
glm::dvec3 transformedPos = glm::dvec3(
_transformationMatrix * glm::dvec4(position, 1.0)
);
_labelData.emplace_back(std::make_tuple(transformedPos, labelinfo.text, labelinfo.textColor));
}
else {
LERROR(fmt::format("No SceneGraphNode found with identifier {}", labelinfo.attachedId));
return false;
}
if ( nodeIsInTimeFrame &&
((labelinfo.hasKeyTimeFrame && labelIsInTimeFrame) || !labelinfo.hasKeyTimeFrame )) {
glm::dvec3 position = global::renderEngine.scene()->sceneGraphNode(labelinfo.attachedId)->worldPosition();
glm::dvec3 transformedPos = glm::dvec3(
_transformationMatrix * glm::dvec4(position, 1.0)
);
_labelData.emplace_back(std::make_tuple(transformedPos, labelinfo.text, labelinfo.textColor));
}
}