diff --git a/data/assets/dawn.scene b/data/assets/dawn.scene index ffd93aa271..8b373157a5 100644 --- a/data/assets/dawn.scene +++ b/data/assets/dawn.scene @@ -4,7 +4,7 @@ local sceneHelper = asset.require('util/scene_helper') -- Specifying which other assets should be loaded in this scene asset.require('spice/base') assetHelper.requestAll(asset, 'scene/solarsystem/sun') -assetHelper.requestAll(asset, 'scene/solarsystem/planets') +asset.request('scene/solarsystem/planets') asset.request('scene/digitaluniverse/stars') asset.request('scene/digitaluniverse/milkyway') asset.require('scene/solarsystem/missions/dawn/ceres') diff --git a/data/assets/juno.scene b/data/assets/juno.scene index c73a8fd830..dfcf4081da 100644 --- a/data/assets/juno.scene +++ b/data/assets/juno.scene @@ -4,7 +4,7 @@ local sceneHelper = asset.require('util/scene_helper') -- Specifying which other assets should be loaded in this scene asset.require('spice/base') assetHelper.requestAll(asset, 'scene/solarsystem/sun') -assetHelper.requestAll(asset, 'scene/solarsystem/planets') +asset.request('scene/solarsystem/planets') asset.request('scene/digitaluniverse/stars') asset.request('scene/digitaluniverse/milkyway') assetHelper.requireAll(asset, 'scene/solarsystem/missions/juno') diff --git a/data/assets/scene/solarsystem/missions/dawn/ceres.asset b/data/assets/scene/solarsystem/missions/dawn/ceres.asset index 119e42b728..0e7fd2fead 100644 --- a/data/assets/scene/solarsystem/missions/dawn/ceres.asset +++ b/data/assets/scene/solarsystem/missions/dawn/ceres.asset @@ -20,9 +20,9 @@ local Ceres = { SourceFrame = "IAU_CERES", DestinationFrame = "GALACTIC", Kernels = { - kernels .. "/pck/dawn_ceres_v01.tpc", - kernels .. "/spk/sb_ceres_140724.bsp", - kernels .. "/spk/sb_ceres_110211.bsp" + kernels .. "/dawn_ceres_v01.tpc", + kernels .. "/sb_ceres_140724.bsp", + kernels .. "/sb_ceres_110211.bsp" } }, Translation = { @@ -30,9 +30,9 @@ local Ceres = { Target = "CERES", Observer = "SSB", Kernels = { - kernels .. "/pck/dawn_ceres_v01.tpc", - kernels .. "/spk/sb_ceres_140724.bsp", - kernels .. "/spk/sb_ceres_110211.bsp" + kernels .. "/dawn_ceres_v01.tpc", + kernels .. "/sb_ceres_140724.bsp", + kernels .. "/sb_ceres_110211.bsp" } } }, diff --git a/data/assets/scene/solarsystem/missions/dawn/dawn.asset b/data/assets/scene/solarsystem/missions/dawn/dawn.asset index 1c7ab5f19e..1ac2764765 100644 --- a/data/assets/scene/solarsystem/missions/dawn/dawn.asset +++ b/data/assets/scene/solarsystem/missions/dawn/dawn.asset @@ -19,601 +19,601 @@ local models = asset.syncedResource({ }) local KernelFiles = { - kernels .. "/DawnKernels/spk/dawn_ref_070926-150201_070829.bsp", + kernels .. "/dawn_ref_070926-150201_070829.bsp", --ik - kernels .. "/DawnKernels/ik/dawn_fc_v10.ti", + kernels .. "/dawn_fc_v10.ti", -- SPK - kernels .. "/DawnKernels/spk/sb_ceres_110211.bsp", - kernels .. "/DawnKernels/spk/sb_ceres_140724.bsp", - kernels .. "/DawnKernels/spk/sb_vesta_071107.bsp", + kernels .. "/sb_ceres_110211.bsp", + kernels .. "/sb_ceres_140724.bsp", + kernels .. "/sb_vesta_071107.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_070927_070930_081218_v1.bsp", - --[[kernels .. "/DawnKernels/spk/dawn_rec_070930_071201_081218_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_071201_080205_081218_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_080205_080325_081218_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_080325_080503_081218_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_080503_080601_081218_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_080601_080718_081218_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_080718_080910_081218_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_080910_081022_090218_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_081022_081109_090218_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_081109_090228_090306_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_090228_090501_090702_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_090501_090801_090916_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_090801_090915_090923_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_090915_091201_091202_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_091201_100208_100209_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_100208_100316_100323_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_100316_100413_100422_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_100413_100622_100830_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_100622_100824_100830_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_100824_101130_101202_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_101130_110201_110201_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_110201_110328_110328_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_110328_110419_110420_v1.bsp",--]] + kernels .. "/dawn_rec_070927_070930_081218_v1.bsp", + --[[kernels .. "/dawn_rec_070930_071201_081218_v1.bsp", + kernels .. "/dawn_rec_071201_080205_081218_v1.bsp", + kernels .. "/dawn_rec_080205_080325_081218_v1.bsp", + kernels .. "/dawn_rec_080325_080503_081218_v1.bsp", + kernels .. "/dawn_rec_080503_080601_081218_v1.bsp", + kernels .. "/dawn_rec_080601_080718_081218_v1.bsp", + kernels .. "/dawn_rec_080718_080910_081218_v1.bsp", + kernels .. "/dawn_rec_080910_081022_090218_v1.bsp", + kernels .. "/dawn_rec_081022_081109_090218_v1.bsp", + kernels .. "/dawn_rec_081109_090228_090306_v1.bsp", + kernels .. "/dawn_rec_090228_090501_090702_v1.bsp", + kernels .. "/dawn_rec_090501_090801_090916_v1.bsp", + kernels .. "/dawn_rec_090801_090915_090923_v1.bsp", + kernels .. "/dawn_rec_090915_091201_091202_v1.bsp", + kernels .. "/dawn_rec_091201_100208_100209_v1.bsp", + kernels .. "/dawn_rec_100208_100316_100323_v1.bsp", + kernels .. "/dawn_rec_100316_100413_100422_v1.bsp", + kernels .. "/dawn_rec_100413_100622_100830_v1.bsp", + kernels .. "/dawn_rec_100622_100824_100830_v1.bsp", + kernels .. "/dawn_rec_100824_101130_101202_v1.bsp", + kernels .. "/dawn_rec_101130_110201_110201_v1.bsp", + kernels .. "/dawn_rec_110201_110328_110328_v1.bsp", + kernels .. "/dawn_rec_110328_110419_110420_v1.bsp",--]] - kernels .. "/DawnKernels/spk/dawn_rec_110416_110802_110913_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_110802_110831_110922_v1.bsp", + kernels .. "/dawn_rec_110416_110802_110913_v1.bsp", + kernels .. "/dawn_rec_110802_110831_110922_v1.bsp", --[[kernels .. "/spk/dawn_rec_110831_110928_111221_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_110928_111102_120615_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_111102_111210_120618_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_111211_120501_120620_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_120501_120611_120625_v1.bsp", - kernels .. "/DawnKernels/spk/dawn_rec_120611_120724_121101_v1.bsp",--]] - kernels .. "/DawnKernels/spk/dawn_rec_120724_120913_121213_v1.bsp", + kernels .. "/dawn_rec_110928_111102_120615_v1.bsp", + kernels .. "/dawn_rec_111102_111210_120618_v1.bsp", + kernels .. "/dawn_rec_111211_120501_120620_v1.bsp", + kernels .. "/dawn_rec_120501_120611_120625_v1.bsp", + kernels .. "/dawn_rec_120611_120724_121101_v1.bsp",--]] + kernels .. "/dawn_rec_120724_120913_121213_v1.bsp", --PCK - --kernels .. "/pck/dawn_vesta_v06.tpc", - --kernels .. "/pck/dawn_ceres_v01.tpc", - --kernels .. "/pck/pck00008.tpc", + --kernels .. "/dawn_vesta_v06.tpc", + --kernels .. "/dawn_ceres_v01.tpc", + --kernels .. "/pck00008.tpc", -- FK - kernels .. "/DawnKernels/fk/dawn_vesta_v00.tf", - kernels .. "/DawnKernels/fk/dawn_v12.tf", + kernels .. "/dawn_vesta_v00.tf", + kernels .. "/dawn_v12.tf", --SCLK - kernels .. "/DawnKernels/sclk/dawn_203_sclkscet_00039.tsc", + kernels .. "/dawn_203_sclkscet_00039.tsc", -- CK - kernels .. "/DawnKernels/ck/dawn_sc_070927_070930.bc", - kernels .. "/DawnKernels/ck/dawn_sc_110801_110807.bc", - kernels .. "/DawnKernels/ck/dawn_sc_110808_110814.bc", - kernels .. "/DawnKernels/ck/dawn_sc_120910_120916.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_111226_120101.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120102_120108.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120109_120115.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120116_120122.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120123_120129.bc", + kernels .. "/dawn_sc_070927_070930.bc", + kernels .. "/dawn_sc_110801_110807.bc", + kernels .. "/dawn_sc_110808_110814.bc", + kernels .. "/dawn_sc_120910_120916.bc", + -- kernels .. "/dawn_sc_111226_120101.bc", + -- kernels .. "/dawn_sc_120102_120108.bc", + -- kernels .. "/dawn_sc_120109_120115.bc", + -- kernels .. "/dawn_sc_120116_120122.bc", + -- kernels .. "/dawn_sc_120123_120129.bc", -- all space craft CK files, ~10 gb - -- kernels .. "/DawnKernels/ck/dawn_sc_120123_120129.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_070927_070930.bc", + -- kernels .. "/dawn_sc_120123_120129.bc", + -- kernels .. "/dawn_sc_070927_070930.bc", --[[kernels .. "/ck/dawn_sc_071001_071007.bc", - kernels .. "/DawnKernels/ck/dawn_sc_071008_071014_v2.bc", - kernels .. "/DawnKernels/ck/dawn_sc_071015_071021.bc", - kernels .. "/DawnKernels/ck/dawn_sc_071022_071028_v2.bc", - kernels .. "/DawnKernels/ck/dawn_sc_071029_071104.bc", - kernels .. "/DawnKernels/ck/dawn_sc_071105_071111.bc", - kernels .. "/DawnKernels/ck/dawn_sc_071112_071118.bc", - kernels .. "/DawnKernels/ck/dawn_sc_071119_071125.bc", - kernels .. "/DawnKernels/ck/dawn_sc_071126_071202.bc", - kernels .. "/DawnKernels/ck/dawn_sc_071203_071209.bc", - kernels .. "/DawnKernels/ck/dawn_sc_071210_071216.bc", - kernels .. "/DawnKernels/ck/dawn_sc_071217_071223.bc", - kernels .. "/DawnKernels/ck/dawn_sc_071224_071230.bc", - kernels .. "/DawnKernels/ck/dawn_sc_071231_080106.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080107_080113.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080114_080120.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080121_080127.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080128_080203.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080204_080210.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080211_080217.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080218_080224.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080225_080302.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080303_080309.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080310_080316.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080317_080323.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080324_080330.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080331_080406.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080407_080413.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080414_080420.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080421_080427.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080428_080504.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080505_080511.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080512_080518.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080519_080525.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080526_080601.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080602_080608.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080609_080615.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080616_080622.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080623_080629.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080630_080706.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080707_080713.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080714_080720.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080721_080727.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080728_080803.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080804_080810.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080811_080817.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080818_080824.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080825_080831.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080901_080907.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080908_080914.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080915_080921.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080922_080928.bc", - kernels .. "/DawnKernels/ck/dawn_sc_080929_081005.bc", - kernels .. "/DawnKernels/ck/dawn_sc_081006_081012.bc", - kernels .. "/DawnKernels/ck/dawn_sc_081013_081019.bc", - kernels .. "/DawnKernels/ck/dawn_sc_081020_081026.bc", - kernels .. "/DawnKernels/ck/dawn_sc_081027_081102.bc", - kernels .. "/DawnKernels/ck/dawn_sc_081103_081109.bc", - kernels .. "/DawnKernels/ck/dawn_sc_081110_081116.bc", - kernels .. "/DawnKernels/ck/dawn_sc_081117_081123.bc", - kernels .. "/DawnKernels/ck/dawn_sc_081124_081130.bc", - kernels .. "/DawnKernels/ck/dawn_sc_081201_081207.bc", - kernels .. "/DawnKernels/ck/dawn_sc_081208_081214.bc", - kernels .. "/DawnKernels/ck/dawn_sc_081215_081221.bc", - kernels .. "/DawnKernels/ck/dawn_sc_081222_081228.bc", - kernels .. "/DawnKernels/ck/dawn_sc_081229_090104.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090105_090111.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090112_090118.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090119_090125.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090126_090201.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090202_090208.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090209_090215.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090216_090222.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090223_090301.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090302_090308.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090309_090315.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090316_090322.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090323_090329.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090330_090405.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090406_090412.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090413_090419.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090420_090426.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090427_090503.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090504_090510.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090511_090517.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090518_090524.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090525_090531.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090601_090607.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090608_090614.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090615_090621.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090622_090628.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090629_090705.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090706_090712.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090713_090719.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090720_090726.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090727_090802.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090803_090809.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090810_090816.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090817_090823.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090824_090830.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090831_090906.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090907_090913.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090914_090920.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090921_090927.bc", - kernels .. "/DawnKernels/ck/dawn_sc_090928_091004.bc", - kernels .. "/DawnKernels/ck/dawn_sc_091005_091011.bc", - kernels .. "/DawnKernels/ck/dawn_sc_091012_091018.bc", - kernels .. "/DawnKernels/ck/dawn_sc_091019_091025.bc", - kernels .. "/DawnKernels/ck/dawn_sc_091026_091101.bc", - kernels .. "/DawnKernels/ck/dawn_sc_091102_091108.bc", - kernels .. "/DawnKernels/ck/dawn_sc_091109_091115.bc", - kernels .. "/DawnKernels/ck/dawn_sc_091116_091122.bc", - kernels .. "/DawnKernels/ck/dawn_sc_091123_091129.bc", - kernels .. "/DawnKernels/ck/dawn_sc_091130_091206.bc", - kernels .. "/DawnKernels/ck/dawn_sc_091207_091213.bc", - kernels .. "/DawnKernels/ck/dawn_sc_091214_091220.bc", - kernels .. "/DawnKernels/ck/dawn_sc_091221_091227.bc", - kernels .. "/DawnKernels/ck/dawn_sc_091228_100103.bc", - kernels .. "/DawnKernels/ck/dawn_sc_100104_100110_v2.bc", - kernels .. "/DawnKernels/ck/dawn_sc_100111_100117_v2.bc",--]] - -- kernels .. "/DawnKernels/ck/dawn_sc_100118_100124.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100125_100131.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100201_100207.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100208_100214.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100215_100221.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100222_100228.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100301_100307.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100308_100314.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100315_100321.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100322_100328.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100329_100404.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100405_100411.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100412_100418.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100419_100425.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100426_100502.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100503_100509.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100510_100516.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100517_100523.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100524_100530.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100531_100606.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100607_100613.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100614_100620.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100621_100627.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100628_100704.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100705_100711.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100712_100718.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100719_100725.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100726_100801.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100802_100808.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100809_100815.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100816_100822.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100823_100829.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100830_100905.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100906_100912.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100913_100919.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100920_100926.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_100927_101003.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_101004_101010.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_101011_101017.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_101018_101024.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_101025_101031.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_101101_101107.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_101108_101114.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_101115_101121.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_101122_101128.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_101129_101205.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_101206_101212.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_101213_101219.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_101220_101226.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_101227_110102.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110103_110109.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110110_110116.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110117_110123.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110124_110130.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110131_110206.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110207_110213.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110214_110220.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110221_110227.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110228_110306.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110307_110313.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110314_110320.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110321_110327.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110328_110403.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110404_110410.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110411_110417.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110418_110424.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110425_110501.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110502_110508.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110509_110515.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110516_110522.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110523_110529.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110530_110605.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110606_110612.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110613_110619.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110620_110626.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110627_110703.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110704_110710.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110711_110717.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110718_110724.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110725_110731.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110801_110807.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110808_110814.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110815_110821.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110822_110828.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110829_110904.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110905_110911.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110912_110918.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110919_110925.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_110926_111002.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_111003_111009.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_111010_111016.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_111017_111023.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_111024_111030.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_111031_111106.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_111107_111113.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_111114_111120.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_111121_111127.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_111128_111204.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_111205_111211.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_111212_111218.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_111219_111225.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_111226_120101.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120102_120108.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120109_120115.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120116_120122.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120123_120129.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120130_120205.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120206_120212.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120213_120219.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120220_120226.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120227_120304.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120305_120311.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120312_120318.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120319_120325.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120326_120401.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120402_120408.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120409_120415.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120416_120422.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120423_120429.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120430_120506.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120507_120513.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120514_120520.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120521_120527.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120528_120603.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120604_120610.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120611_120617.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120618_120624.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120625_120701.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120702_120708.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120709_120715.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120716_120722.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120723_120729.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120730_120805.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120806_120812.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120813_120819.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120820_120826.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120827_120902.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120903_120909.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_120910_120916.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_f2_3942xxxxx.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_pred_da028b_00_eu.bc", - -- kernels .. "/DawnKernels/ck/dawn_sc_pred_dc041a_00.bc", + kernels .. "/dawn_sc_071008_071014_v2.bc", + kernels .. "/dawn_sc_071015_071021.bc", + kernels .. "/dawn_sc_071022_071028_v2.bc", + kernels .. "/dawn_sc_071029_071104.bc", + kernels .. "/dawn_sc_071105_071111.bc", + kernels .. "/dawn_sc_071112_071118.bc", + kernels .. "/dawn_sc_071119_071125.bc", + kernels .. "/dawn_sc_071126_071202.bc", + kernels .. "/dawn_sc_071203_071209.bc", + kernels .. "/dawn_sc_071210_071216.bc", + kernels .. "/dawn_sc_071217_071223.bc", + kernels .. "/dawn_sc_071224_071230.bc", + kernels .. "/dawn_sc_071231_080106.bc", + kernels .. "/dawn_sc_080107_080113.bc", + kernels .. "/dawn_sc_080114_080120.bc", + kernels .. "/dawn_sc_080121_080127.bc", + kernels .. "/dawn_sc_080128_080203.bc", + kernels .. "/dawn_sc_080204_080210.bc", + kernels .. "/dawn_sc_080211_080217.bc", + kernels .. "/dawn_sc_080218_080224.bc", + kernels .. "/dawn_sc_080225_080302.bc", + kernels .. "/dawn_sc_080303_080309.bc", + kernels .. "/dawn_sc_080310_080316.bc", + kernels .. "/dawn_sc_080317_080323.bc", + kernels .. "/dawn_sc_080324_080330.bc", + kernels .. "/dawn_sc_080331_080406.bc", + kernels .. "/dawn_sc_080407_080413.bc", + kernels .. "/dawn_sc_080414_080420.bc", + kernels .. "/dawn_sc_080421_080427.bc", + kernels .. "/dawn_sc_080428_080504.bc", + kernels .. "/dawn_sc_080505_080511.bc", + kernels .. "/dawn_sc_080512_080518.bc", + kernels .. "/dawn_sc_080519_080525.bc", + kernels .. "/dawn_sc_080526_080601.bc", + kernels .. "/dawn_sc_080602_080608.bc", + kernels .. "/dawn_sc_080609_080615.bc", + kernels .. "/dawn_sc_080616_080622.bc", + kernels .. "/dawn_sc_080623_080629.bc", + kernels .. "/dawn_sc_080630_080706.bc", + kernels .. "/dawn_sc_080707_080713.bc", + kernels .. "/dawn_sc_080714_080720.bc", + kernels .. "/dawn_sc_080721_080727.bc", + kernels .. "/dawn_sc_080728_080803.bc", + kernels .. "/dawn_sc_080804_080810.bc", + kernels .. "/dawn_sc_080811_080817.bc", + kernels .. "/dawn_sc_080818_080824.bc", + kernels .. "/dawn_sc_080825_080831.bc", + kernels .. "/dawn_sc_080901_080907.bc", + kernels .. "/dawn_sc_080908_080914.bc", + kernels .. "/dawn_sc_080915_080921.bc", + kernels .. "/dawn_sc_080922_080928.bc", + kernels .. "/dawn_sc_080929_081005.bc", + kernels .. "/dawn_sc_081006_081012.bc", + kernels .. "/dawn_sc_081013_081019.bc", + kernels .. "/dawn_sc_081020_081026.bc", + kernels .. "/dawn_sc_081027_081102.bc", + kernels .. "/dawn_sc_081103_081109.bc", + kernels .. "/dawn_sc_081110_081116.bc", + kernels .. "/dawn_sc_081117_081123.bc", + kernels .. "/dawn_sc_081124_081130.bc", + kernels .. "/dawn_sc_081201_081207.bc", + kernels .. "/dawn_sc_081208_081214.bc", + kernels .. "/dawn_sc_081215_081221.bc", + kernels .. "/dawn_sc_081222_081228.bc", + kernels .. "/dawn_sc_081229_090104.bc", + kernels .. "/dawn_sc_090105_090111.bc", + kernels .. "/dawn_sc_090112_090118.bc", + kernels .. "/dawn_sc_090119_090125.bc", + kernels .. "/dawn_sc_090126_090201.bc", + kernels .. "/dawn_sc_090202_090208.bc", + kernels .. "/dawn_sc_090209_090215.bc", + kernels .. "/dawn_sc_090216_090222.bc", + kernels .. "/dawn_sc_090223_090301.bc", + kernels .. "/dawn_sc_090302_090308.bc", + kernels .. "/dawn_sc_090309_090315.bc", + kernels .. "/dawn_sc_090316_090322.bc", + kernels .. "/dawn_sc_090323_090329.bc", + kernels .. "/dawn_sc_090330_090405.bc", + kernels .. "/dawn_sc_090406_090412.bc", + kernels .. "/dawn_sc_090413_090419.bc", + kernels .. "/dawn_sc_090420_090426.bc", + kernels .. "/dawn_sc_090427_090503.bc", + kernels .. "/dawn_sc_090504_090510.bc", + kernels .. "/dawn_sc_090511_090517.bc", + kernels .. "/dawn_sc_090518_090524.bc", + kernels .. "/dawn_sc_090525_090531.bc", + kernels .. "/dawn_sc_090601_090607.bc", + kernels .. "/dawn_sc_090608_090614.bc", + kernels .. "/dawn_sc_090615_090621.bc", + kernels .. "/dawn_sc_090622_090628.bc", + kernels .. "/dawn_sc_090629_090705.bc", + kernels .. "/dawn_sc_090706_090712.bc", + kernels .. "/dawn_sc_090713_090719.bc", + kernels .. "/dawn_sc_090720_090726.bc", + kernels .. "/dawn_sc_090727_090802.bc", + kernels .. "/dawn_sc_090803_090809.bc", + kernels .. "/dawn_sc_090810_090816.bc", + kernels .. "/dawn_sc_090817_090823.bc", + kernels .. "/dawn_sc_090824_090830.bc", + kernels .. "/dawn_sc_090831_090906.bc", + kernels .. "/dawn_sc_090907_090913.bc", + kernels .. "/dawn_sc_090914_090920.bc", + kernels .. "/dawn_sc_090921_090927.bc", + kernels .. "/dawn_sc_090928_091004.bc", + kernels .. "/dawn_sc_091005_091011.bc", + kernels .. "/dawn_sc_091012_091018.bc", + kernels .. "/dawn_sc_091019_091025.bc", + kernels .. "/dawn_sc_091026_091101.bc", + kernels .. "/dawn_sc_091102_091108.bc", + kernels .. "/dawn_sc_091109_091115.bc", + kernels .. "/dawn_sc_091116_091122.bc", + kernels .. "/dawn_sc_091123_091129.bc", + kernels .. "/dawn_sc_091130_091206.bc", + kernels .. "/dawn_sc_091207_091213.bc", + kernels .. "/dawn_sc_091214_091220.bc", + kernels .. "/dawn_sc_091221_091227.bc", + kernels .. "/dawn_sc_091228_100103.bc", + kernels .. "/dawn_sc_100104_100110_v2.bc", + kernels .. "/dawn_sc_100111_100117_v2.bc",--]] + -- kernels .. "/dawn_sc_100118_100124.bc", + -- kernels .. "/dawn_sc_100125_100131.bc", + -- kernels .. "/dawn_sc_100201_100207.bc", + -- kernels .. "/dawn_sc_100208_100214.bc", + -- kernels .. "/dawn_sc_100215_100221.bc", + -- kernels .. "/dawn_sc_100222_100228.bc", + -- kernels .. "/dawn_sc_100301_100307.bc", + -- kernels .. "/dawn_sc_100308_100314.bc", + -- kernels .. "/dawn_sc_100315_100321.bc", + -- kernels .. "/dawn_sc_100322_100328.bc", + -- kernels .. "/dawn_sc_100329_100404.bc", + -- kernels .. "/dawn_sc_100405_100411.bc", + -- kernels .. "/dawn_sc_100412_100418.bc", + -- kernels .. "/dawn_sc_100419_100425.bc", + -- kernels .. "/dawn_sc_100426_100502.bc", + -- kernels .. "/dawn_sc_100503_100509.bc", + -- kernels .. "/dawn_sc_100510_100516.bc", + -- kernels .. "/dawn_sc_100517_100523.bc", + -- kernels .. "/dawn_sc_100524_100530.bc", + -- kernels .. "/dawn_sc_100531_100606.bc", + -- kernels .. "/dawn_sc_100607_100613.bc", + -- kernels .. "/dawn_sc_100614_100620.bc", + -- kernels .. "/dawn_sc_100621_100627.bc", + -- kernels .. "/dawn_sc_100628_100704.bc", + -- kernels .. "/dawn_sc_100705_100711.bc", + -- kernels .. "/dawn_sc_100712_100718.bc", + -- kernels .. "/dawn_sc_100719_100725.bc", + -- kernels .. "/dawn_sc_100726_100801.bc", + -- kernels .. "/dawn_sc_100802_100808.bc", + -- kernels .. "/dawn_sc_100809_100815.bc", + -- kernels .. "/dawn_sc_100816_100822.bc", + -- kernels .. "/dawn_sc_100823_100829.bc", + -- kernels .. "/dawn_sc_100830_100905.bc", + -- kernels .. "/dawn_sc_100906_100912.bc", + -- kernels .. "/dawn_sc_100913_100919.bc", + -- kernels .. "/dawn_sc_100920_100926.bc", + -- kernels .. "/dawn_sc_100927_101003.bc", + -- kernels .. "/dawn_sc_101004_101010.bc", + -- kernels .. "/dawn_sc_101011_101017.bc", + -- kernels .. "/dawn_sc_101018_101024.bc", + -- kernels .. "/dawn_sc_101025_101031.bc", + -- kernels .. "/dawn_sc_101101_101107.bc", + -- kernels .. "/dawn_sc_101108_101114.bc", + -- kernels .. "/dawn_sc_101115_101121.bc", + -- kernels .. "/dawn_sc_101122_101128.bc", + -- kernels .. "/dawn_sc_101129_101205.bc", + -- kernels .. "/dawn_sc_101206_101212.bc", + -- kernels .. "/dawn_sc_101213_101219.bc", + -- kernels .. "/dawn_sc_101220_101226.bc", + -- kernels .. "/dawn_sc_101227_110102.bc", + -- kernels .. "/dawn_sc_110103_110109.bc", + -- kernels .. "/dawn_sc_110110_110116.bc", + -- kernels .. "/dawn_sc_110117_110123.bc", + -- kernels .. "/dawn_sc_110124_110130.bc", + -- kernels .. "/dawn_sc_110131_110206.bc", + -- kernels .. "/dawn_sc_110207_110213.bc", + -- kernels .. "/dawn_sc_110214_110220.bc", + -- kernels .. "/dawn_sc_110221_110227.bc", + -- kernels .. "/dawn_sc_110228_110306.bc", + -- kernels .. "/dawn_sc_110307_110313.bc", + -- kernels .. "/dawn_sc_110314_110320.bc", + -- kernels .. "/dawn_sc_110321_110327.bc", + -- kernels .. "/dawn_sc_110328_110403.bc", + -- kernels .. "/dawn_sc_110404_110410.bc", + -- kernels .. "/dawn_sc_110411_110417.bc", + -- kernels .. "/dawn_sc_110418_110424.bc", + -- kernels .. "/dawn_sc_110425_110501.bc", + -- kernels .. "/dawn_sc_110502_110508.bc", + -- kernels .. "/dawn_sc_110509_110515.bc", + -- kernels .. "/dawn_sc_110516_110522.bc", + -- kernels .. "/dawn_sc_110523_110529.bc", + -- kernels .. "/dawn_sc_110530_110605.bc", + -- kernels .. "/dawn_sc_110606_110612.bc", + -- kernels .. "/dawn_sc_110613_110619.bc", + -- kernels .. "/dawn_sc_110620_110626.bc", + -- kernels .. "/dawn_sc_110627_110703.bc", + -- kernels .. "/dawn_sc_110704_110710.bc", + -- kernels .. "/dawn_sc_110711_110717.bc", + -- kernels .. "/dawn_sc_110718_110724.bc", + -- kernels .. "/dawn_sc_110725_110731.bc", + -- kernels .. "/dawn_sc_110801_110807.bc", + -- kernels .. "/dawn_sc_110808_110814.bc", + -- kernels .. "/dawn_sc_110815_110821.bc", + -- kernels .. "/dawn_sc_110822_110828.bc", + -- kernels .. "/dawn_sc_110829_110904.bc", + -- kernels .. "/dawn_sc_110905_110911.bc", + -- kernels .. "/dawn_sc_110912_110918.bc", + -- kernels .. "/dawn_sc_110919_110925.bc", + -- kernels .. "/dawn_sc_110926_111002.bc", + -- kernels .. "/dawn_sc_111003_111009.bc", + -- kernels .. "/dawn_sc_111010_111016.bc", + -- kernels .. "/dawn_sc_111017_111023.bc", + -- kernels .. "/dawn_sc_111024_111030.bc", + -- kernels .. "/dawn_sc_111031_111106.bc", + -- kernels .. "/dawn_sc_111107_111113.bc", + -- kernels .. "/dawn_sc_111114_111120.bc", + -- kernels .. "/dawn_sc_111121_111127.bc", + -- kernels .. "/dawn_sc_111128_111204.bc", + -- kernels .. "/dawn_sc_111205_111211.bc", + -- kernels .. "/dawn_sc_111212_111218.bc", + -- kernels .. "/dawn_sc_111219_111225.bc", + -- kernels .. "/dawn_sc_111226_120101.bc", + -- kernels .. "/dawn_sc_120102_120108.bc", + -- kernels .. "/dawn_sc_120109_120115.bc", + -- kernels .. "/dawn_sc_120116_120122.bc", + -- kernels .. "/dawn_sc_120123_120129.bc", + -- kernels .. "/dawn_sc_120130_120205.bc", + -- kernels .. "/dawn_sc_120206_120212.bc", + -- kernels .. "/dawn_sc_120213_120219.bc", + -- kernels .. "/dawn_sc_120220_120226.bc", + -- kernels .. "/dawn_sc_120227_120304.bc", + -- kernels .. "/dawn_sc_120305_120311.bc", + -- kernels .. "/dawn_sc_120312_120318.bc", + -- kernels .. "/dawn_sc_120319_120325.bc", + -- kernels .. "/dawn_sc_120326_120401.bc", + -- kernels .. "/dawn_sc_120402_120408.bc", + -- kernels .. "/dawn_sc_120409_120415.bc", + -- kernels .. "/dawn_sc_120416_120422.bc", + -- kernels .. "/dawn_sc_120423_120429.bc", + -- kernels .. "/dawn_sc_120430_120506.bc", + -- kernels .. "/dawn_sc_120507_120513.bc", + -- kernels .. "/dawn_sc_120514_120520.bc", + -- kernels .. "/dawn_sc_120521_120527.bc", + -- kernels .. "/dawn_sc_120528_120603.bc", + -- kernels .. "/dawn_sc_120604_120610.bc", + -- kernels .. "/dawn_sc_120611_120617.bc", + -- kernels .. "/dawn_sc_120618_120624.bc", + -- kernels .. "/dawn_sc_120625_120701.bc", + -- kernels .. "/dawn_sc_120702_120708.bc", + -- kernels .. "/dawn_sc_120709_120715.bc", + -- kernels .. "/dawn_sc_120716_120722.bc", + -- kernels .. "/dawn_sc_120723_120729.bc", + -- kernels .. "/dawn_sc_120730_120805.bc", + -- kernels .. "/dawn_sc_120806_120812.bc", + -- kernels .. "/dawn_sc_120813_120819.bc", + -- kernels .. "/dawn_sc_120820_120826.bc", + -- kernels .. "/dawn_sc_120827_120902.bc", + -- kernels .. "/dawn_sc_120903_120909.bc", + -- kernels .. "/dawn_sc_120910_120916.bc", + -- kernels .. "/dawn_sc_f2_3942xxxxx.bc", + -- kernels .. "/dawn_sc_pred_da028b_00_eu.bc", + -- kernels .. "/dawn_sc_pred_dc041a_00.bc", -- Solar array rotation kernels ~ 2gb - kernels .. "/DawnKernels/ck/dawn_sa_070927_070930.bc", + kernels .. "/dawn_sa_070927_070930.bc", --[[kernels .. "/ck/dawn_sa_071001_071007.bc", - kernels .. "/DawnKernels/ck/dawn_sa_071008_071014.bc", - kernels .. "/DawnKernels/ck/dawn_sa_071015_071021.bc", - kernels .. "/DawnKernels/ck/dawn_sa_071022_071028_v2.bc", - kernels .. "/DawnKernels/ck/dawn_sa_071029_071104.bc", - kernels .. "/DawnKernels/ck/dawn_sa_071105_071111.bc", - kernels .. "/DawnKernels/ck/dawn_sa_071112_071118.bc", - kernels .. "/DawnKernels/ck/dawn_sa_071119_071125.bc", - kernels .. "/DawnKernels/ck/dawn_sa_071126_071202.bc", - kernels .. "/DawnKernels/ck/dawn_sa_071203_071209.bc", - kernels .. "/DawnKernels/ck/dawn_sa_071210_071216.bc", - kernels .. "/DawnKernels/ck/dawn_sa_071217_071223.bc", - kernels .. "/DawnKernels/ck/dawn_sa_071224_071230.bc", - kernels .. "/DawnKernels/ck/dawn_sa_071231_080106.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080107_080113.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080114_080120.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080121_080127.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080128_080203.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080204_080210.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080211_080217.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080218_080224.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080225_080302.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080303_080309.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080310_080316.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080317_080323.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080324_080330.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080331_080406.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080407_080413.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080414_080420.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080421_080427.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080428_080504.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080505_080511.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080512_080518.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080519_080525.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080526_080601.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080602_080608.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080609_080615.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080616_080622.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080623_080629.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080630_080706.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080707_080713.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080714_080720.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080721_080727.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080728_080803.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080804_080810.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080811_080817.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080818_080824.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080825_080831.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080901_080907.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080908_080914.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080915_080921.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080922_080928.bc", - kernels .. "/DawnKernels/ck/dawn_sa_080929_081005.bc", - kernels .. "/DawnKernels/ck/dawn_sa_081006_081012.bc", - kernels .. "/DawnKernels/ck/dawn_sa_081013_081019.bc", - kernels .. "/DawnKernels/ck/dawn_sa_081020_081026.bc", - kernels .. "/DawnKernels/ck/dawn_sa_081027_081102.bc", - kernels .. "/DawnKernels/ck/dawn_sa_081103_081109.bc", - kernels .. "/DawnKernels/ck/dawn_sa_081110_081116.bc", - kernels .. "/DawnKernels/ck/dawn_sa_081117_081123.bc", - kernels .. "/DawnKernels/ck/dawn_sa_081124_081130.bc", - kernels .. "/DawnKernels/ck/dawn_sa_081201_081207.bc", - kernels .. "/DawnKernels/ck/dawn_sa_081208_081214.bc", - kernels .. "/DawnKernels/ck/dawn_sa_081215_081221.bc", - kernels .. "/DawnKernels/ck/dawn_sa_081222_081228.bc", - kernels .. "/DawnKernels/ck/dawn_sa_081229_090104.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090105_090111.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090112_090118.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090119_090125.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090126_090201.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090202_090208.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090209_090215.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090216_090222.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090223_090301.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090302_090308.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090309_090315.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090316_090322.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090323_090329.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090330_090405.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090406_090412.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090413_090419.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090420_090426.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090427_090503.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090504_090510.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090511_090517.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090518_090524.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090525_090531.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090601_090607.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090608_090614.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090615_090621.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090622_090628.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090629_090705.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090706_090712.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090713_090719.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090720_090726.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090727_090802.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090803_090809.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090810_090816.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090817_090823.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090824_090830.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090831_090906.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090907_090913.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090914_090920.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090921_090927.bc", - kernels .. "/DawnKernels/ck/dawn_sa_090928_091004.bc", - kernels .. "/DawnKernels/ck/dawn_sa_091005_091011.bc", - kernels .. "/DawnKernels/ck/dawn_sa_091012_091018.bc", - kernels .. "/DawnKernels/ck/dawn_sa_091019_091025.bc", - kernels .. "/DawnKernels/ck/dawn_sa_091026_091101.bc", - kernels .. "/DawnKernels/ck/dawn_sa_091102_091108.bc", - kernels .. "/DawnKernels/ck/dawn_sa_091109_091115.bc", - kernels .. "/DawnKernels/ck/dawn_sa_091116_091122.bc", - kernels .. "/DawnKernels/ck/dawn_sa_091123_091129.bc", - kernels .. "/DawnKernels/ck/dawn_sa_091130_091206.bc", - kernels .. "/DawnKernels/ck/dawn_sa_091207_091213.bc", - kernels .. "/DawnKernels/ck/dawn_sa_091214_091220.bc", - kernels .. "/DawnKernels/ck/dawn_sa_091221_091227.bc", - kernels .. "/DawnKernels/ck/dawn_sa_091228_100103.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100104_100110_v2.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100111_100117_v2.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100118_100124.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100125_100131.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100201_100207.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100208_100214.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100215_100221.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100222_100228.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100301_100307.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100308_100314.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100315_100321.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100322_100328.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100329_100404.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100405_100411.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100412_100418.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100419_100425.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100426_100502.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100503_100509.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100510_100516.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100517_100523.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100524_100530.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100531_100606.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100607_100613.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100614_100620.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100621_100627.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100628_100704.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100705_100711.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100712_100718.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100719_100725.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100726_100801.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100802_100808.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100809_100815.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100816_100822.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100823_100829.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100830_100905.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100906_100912.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100913_100919.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100920_100926.bc", - kernels .. "/DawnKernels/ck/dawn_sa_100927_101003.bc", - kernels .. "/DawnKernels/ck/dawn_sa_101004_101010.bc", - kernels .. "/DawnKernels/ck/dawn_sa_101011_101017.bc", --]] - -- kernels .. "/DawnKernels/ck/dawn_sa_101018_101024.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_101025_101031.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_101101_101107.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_101108_101114.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_101115_101121.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_101122_101128.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_101129_101205.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_101206_101212.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_101213_101219.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_101220_101226.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_101227_110102.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110103_110109.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110110_110116.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110117_110123.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110124_110130.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110131_110206.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110207_110213.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110214_110220.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110221_110227.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110228_110306.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110307_110313.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110314_110320.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110321_110327.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110328_110403.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110404_110410.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110411_110417.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110418_110424.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110425_110501.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110502_110508.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110509_110515.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110516_110522.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110523_110529.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110530_110605.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110606_110612.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110613_110619.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110620_110626.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110627_110703.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110704_110710.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110711_110717.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110718_110724.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110725_110731.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110801_110807.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110808_110814.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110815_110821.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110822_110828.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110829_110904.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110905_110911.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110912_110918.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110919_110925.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_110926_111002.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_111003_111009.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_111010_111016.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_111017_111023.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_111024_111030.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_111031_111106.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_111107_111113.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_111114_111120.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_111121_111127.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_111128_111204.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_111205_111211.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_111212_111218.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_111219_111225.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_111226_120101.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120102_120108.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120109_120115.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120116_120122.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120123_120129.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120130_120205.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120206_120212.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120213_120219.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120220_120226.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120227_120304.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120305_120311.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120312_120318.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120319_120325.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120326_120401.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120402_120408.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120409_120415.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120416_120422.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120423_120429.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120430_120506.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120507_120513.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120514_120520.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120521_120527.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120528_120603.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120604_120610.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120611_120617.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120618_120624.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120625_120701.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120702_120708.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120709_120715.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120716_120722.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120723_120729.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120730_120805.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120806_120812.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120813_120819.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120820_120826.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120827_120902.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120903_120909.bc", - -- kernels .. "/DawnKernels/ck/dawn_sa_120910_120916.bc", + kernels .. "/dawn_sa_071008_071014.bc", + kernels .. "/dawn_sa_071015_071021.bc", + kernels .. "/dawn_sa_071022_071028_v2.bc", + kernels .. "/dawn_sa_071029_071104.bc", + kernels .. "/dawn_sa_071105_071111.bc", + kernels .. "/dawn_sa_071112_071118.bc", + kernels .. "/dawn_sa_071119_071125.bc", + kernels .. "/dawn_sa_071126_071202.bc", + kernels .. "/dawn_sa_071203_071209.bc", + kernels .. "/dawn_sa_071210_071216.bc", + kernels .. "/dawn_sa_071217_071223.bc", + kernels .. "/dawn_sa_071224_071230.bc", + kernels .. "/dawn_sa_071231_080106.bc", + kernels .. "/dawn_sa_080107_080113.bc", + kernels .. "/dawn_sa_080114_080120.bc", + kernels .. "/dawn_sa_080121_080127.bc", + kernels .. "/dawn_sa_080128_080203.bc", + kernels .. "/dawn_sa_080204_080210.bc", + kernels .. "/dawn_sa_080211_080217.bc", + kernels .. "/dawn_sa_080218_080224.bc", + kernels .. "/dawn_sa_080225_080302.bc", + kernels .. "/dawn_sa_080303_080309.bc", + kernels .. "/dawn_sa_080310_080316.bc", + kernels .. "/dawn_sa_080317_080323.bc", + kernels .. "/dawn_sa_080324_080330.bc", + kernels .. "/dawn_sa_080331_080406.bc", + kernels .. "/dawn_sa_080407_080413.bc", + kernels .. "/dawn_sa_080414_080420.bc", + kernels .. "/dawn_sa_080421_080427.bc", + kernels .. "/dawn_sa_080428_080504.bc", + kernels .. "/dawn_sa_080505_080511.bc", + kernels .. "/dawn_sa_080512_080518.bc", + kernels .. "/dawn_sa_080519_080525.bc", + kernels .. "/dawn_sa_080526_080601.bc", + kernels .. "/dawn_sa_080602_080608.bc", + kernels .. "/dawn_sa_080609_080615.bc", + kernels .. "/dawn_sa_080616_080622.bc", + kernels .. "/dawn_sa_080623_080629.bc", + kernels .. "/dawn_sa_080630_080706.bc", + kernels .. "/dawn_sa_080707_080713.bc", + kernels .. "/dawn_sa_080714_080720.bc", + kernels .. "/dawn_sa_080721_080727.bc", + kernels .. "/dawn_sa_080728_080803.bc", + kernels .. "/dawn_sa_080804_080810.bc", + kernels .. "/dawn_sa_080811_080817.bc", + kernels .. "/dawn_sa_080818_080824.bc", + kernels .. "/dawn_sa_080825_080831.bc", + kernels .. "/dawn_sa_080901_080907.bc", + kernels .. "/dawn_sa_080908_080914.bc", + kernels .. "/dawn_sa_080915_080921.bc", + kernels .. "/dawn_sa_080922_080928.bc", + kernels .. "/dawn_sa_080929_081005.bc", + kernels .. "/dawn_sa_081006_081012.bc", + kernels .. "/dawn_sa_081013_081019.bc", + kernels .. "/dawn_sa_081020_081026.bc", + kernels .. "/dawn_sa_081027_081102.bc", + kernels .. "/dawn_sa_081103_081109.bc", + kernels .. "/dawn_sa_081110_081116.bc", + kernels .. "/dawn_sa_081117_081123.bc", + kernels .. "/dawn_sa_081124_081130.bc", + kernels .. "/dawn_sa_081201_081207.bc", + kernels .. "/dawn_sa_081208_081214.bc", + kernels .. "/dawn_sa_081215_081221.bc", + kernels .. "/dawn_sa_081222_081228.bc", + kernels .. "/dawn_sa_081229_090104.bc", + kernels .. "/dawn_sa_090105_090111.bc", + kernels .. "/dawn_sa_090112_090118.bc", + kernels .. "/dawn_sa_090119_090125.bc", + kernels .. "/dawn_sa_090126_090201.bc", + kernels .. "/dawn_sa_090202_090208.bc", + kernels .. "/dawn_sa_090209_090215.bc", + kernels .. "/dawn_sa_090216_090222.bc", + kernels .. "/dawn_sa_090223_090301.bc", + kernels .. "/dawn_sa_090302_090308.bc", + kernels .. "/dawn_sa_090309_090315.bc", + kernels .. "/dawn_sa_090316_090322.bc", + kernels .. "/dawn_sa_090323_090329.bc", + kernels .. "/dawn_sa_090330_090405.bc", + kernels .. "/dawn_sa_090406_090412.bc", + kernels .. "/dawn_sa_090413_090419.bc", + kernels .. "/dawn_sa_090420_090426.bc", + kernels .. "/dawn_sa_090427_090503.bc", + kernels .. "/dawn_sa_090504_090510.bc", + kernels .. "/dawn_sa_090511_090517.bc", + kernels .. "/dawn_sa_090518_090524.bc", + kernels .. "/dawn_sa_090525_090531.bc", + kernels .. "/dawn_sa_090601_090607.bc", + kernels .. "/dawn_sa_090608_090614.bc", + kernels .. "/dawn_sa_090615_090621.bc", + kernels .. "/dawn_sa_090622_090628.bc", + kernels .. "/dawn_sa_090629_090705.bc", + kernels .. "/dawn_sa_090706_090712.bc", + kernels .. "/dawn_sa_090713_090719.bc", + kernels .. "/dawn_sa_090720_090726.bc", + kernels .. "/dawn_sa_090727_090802.bc", + kernels .. "/dawn_sa_090803_090809.bc", + kernels .. "/dawn_sa_090810_090816.bc", + kernels .. "/dawn_sa_090817_090823.bc", + kernels .. "/dawn_sa_090824_090830.bc", + kernels .. "/dawn_sa_090831_090906.bc", + kernels .. "/dawn_sa_090907_090913.bc", + kernels .. "/dawn_sa_090914_090920.bc", + kernels .. "/dawn_sa_090921_090927.bc", + kernels .. "/dawn_sa_090928_091004.bc", + kernels .. "/dawn_sa_091005_091011.bc", + kernels .. "/dawn_sa_091012_091018.bc", + kernels .. "/dawn_sa_091019_091025.bc", + kernels .. "/dawn_sa_091026_091101.bc", + kernels .. "/dawn_sa_091102_091108.bc", + kernels .. "/dawn_sa_091109_091115.bc", + kernels .. "/dawn_sa_091116_091122.bc", + kernels .. "/dawn_sa_091123_091129.bc", + kernels .. "/dawn_sa_091130_091206.bc", + kernels .. "/dawn_sa_091207_091213.bc", + kernels .. "/dawn_sa_091214_091220.bc", + kernels .. "/dawn_sa_091221_091227.bc", + kernels .. "/dawn_sa_091228_100103.bc", + kernels .. "/dawn_sa_100104_100110_v2.bc", + kernels .. "/dawn_sa_100111_100117_v2.bc", + kernels .. "/dawn_sa_100118_100124.bc", + kernels .. "/dawn_sa_100125_100131.bc", + kernels .. "/dawn_sa_100201_100207.bc", + kernels .. "/dawn_sa_100208_100214.bc", + kernels .. "/dawn_sa_100215_100221.bc", + kernels .. "/dawn_sa_100222_100228.bc", + kernels .. "/dawn_sa_100301_100307.bc", + kernels .. "/dawn_sa_100308_100314.bc", + kernels .. "/dawn_sa_100315_100321.bc", + kernels .. "/dawn_sa_100322_100328.bc", + kernels .. "/dawn_sa_100329_100404.bc", + kernels .. "/dawn_sa_100405_100411.bc", + kernels .. "/dawn_sa_100412_100418.bc", + kernels .. "/dawn_sa_100419_100425.bc", + kernels .. "/dawn_sa_100426_100502.bc", + kernels .. "/dawn_sa_100503_100509.bc", + kernels .. "/dawn_sa_100510_100516.bc", + kernels .. "/dawn_sa_100517_100523.bc", + kernels .. "/dawn_sa_100524_100530.bc", + kernels .. "/dawn_sa_100531_100606.bc", + kernels .. "/dawn_sa_100607_100613.bc", + kernels .. "/dawn_sa_100614_100620.bc", + kernels .. "/dawn_sa_100621_100627.bc", + kernels .. "/dawn_sa_100628_100704.bc", + kernels .. "/dawn_sa_100705_100711.bc", + kernels .. "/dawn_sa_100712_100718.bc", + kernels .. "/dawn_sa_100719_100725.bc", + kernels .. "/dawn_sa_100726_100801.bc", + kernels .. "/dawn_sa_100802_100808.bc", + kernels .. "/dawn_sa_100809_100815.bc", + kernels .. "/dawn_sa_100816_100822.bc", + kernels .. "/dawn_sa_100823_100829.bc", + kernels .. "/dawn_sa_100830_100905.bc", + kernels .. "/dawn_sa_100906_100912.bc", + kernels .. "/dawn_sa_100913_100919.bc", + kernels .. "/dawn_sa_100920_100926.bc", + kernels .. "/dawn_sa_100927_101003.bc", + kernels .. "/dawn_sa_101004_101010.bc", + kernels .. "/dawn_sa_101011_101017.bc", --]] + -- kernels .. "/dawn_sa_101018_101024.bc", + -- kernels .. "/dawn_sa_101025_101031.bc", + -- kernels .. "/dawn_sa_101101_101107.bc", + -- kernels .. "/dawn_sa_101108_101114.bc", + -- kernels .. "/dawn_sa_101115_101121.bc", + -- kernels .. "/dawn_sa_101122_101128.bc", + -- kernels .. "/dawn_sa_101129_101205.bc", + -- kernels .. "/dawn_sa_101206_101212.bc", + -- kernels .. "/dawn_sa_101213_101219.bc", + -- kernels .. "/dawn_sa_101220_101226.bc", + -- kernels .. "/dawn_sa_101227_110102.bc", + -- kernels .. "/dawn_sa_110103_110109.bc", + -- kernels .. "/dawn_sa_110110_110116.bc", + -- kernels .. "/dawn_sa_110117_110123.bc", + -- kernels .. "/dawn_sa_110124_110130.bc", + -- kernels .. "/dawn_sa_110131_110206.bc", + -- kernels .. "/dawn_sa_110207_110213.bc", + -- kernels .. "/dawn_sa_110214_110220.bc", + -- kernels .. "/dawn_sa_110221_110227.bc", + -- kernels .. "/dawn_sa_110228_110306.bc", + -- kernels .. "/dawn_sa_110307_110313.bc", + -- kernels .. "/dawn_sa_110314_110320.bc", + -- kernels .. "/dawn_sa_110321_110327.bc", + -- kernels .. "/dawn_sa_110328_110403.bc", + -- kernels .. "/dawn_sa_110404_110410.bc", + -- kernels .. "/dawn_sa_110411_110417.bc", + -- kernels .. "/dawn_sa_110418_110424.bc", + -- kernels .. "/dawn_sa_110425_110501.bc", + -- kernels .. "/dawn_sa_110502_110508.bc", + -- kernels .. "/dawn_sa_110509_110515.bc", + -- kernels .. "/dawn_sa_110516_110522.bc", + -- kernels .. "/dawn_sa_110523_110529.bc", + -- kernels .. "/dawn_sa_110530_110605.bc", + -- kernels .. "/dawn_sa_110606_110612.bc", + -- kernels .. "/dawn_sa_110613_110619.bc", + -- kernels .. "/dawn_sa_110620_110626.bc", + -- kernels .. "/dawn_sa_110627_110703.bc", + -- kernels .. "/dawn_sa_110704_110710.bc", + -- kernels .. "/dawn_sa_110711_110717.bc", + -- kernels .. "/dawn_sa_110718_110724.bc", + -- kernels .. "/dawn_sa_110725_110731.bc", + -- kernels .. "/dawn_sa_110801_110807.bc", + -- kernels .. "/dawn_sa_110808_110814.bc", + -- kernels .. "/dawn_sa_110815_110821.bc", + -- kernels .. "/dawn_sa_110822_110828.bc", + -- kernels .. "/dawn_sa_110829_110904.bc", + -- kernels .. "/dawn_sa_110905_110911.bc", + -- kernels .. "/dawn_sa_110912_110918.bc", + -- kernels .. "/dawn_sa_110919_110925.bc", + -- kernels .. "/dawn_sa_110926_111002.bc", + -- kernels .. "/dawn_sa_111003_111009.bc", + -- kernels .. "/dawn_sa_111010_111016.bc", + -- kernels .. "/dawn_sa_111017_111023.bc", + -- kernels .. "/dawn_sa_111024_111030.bc", + -- kernels .. "/dawn_sa_111031_111106.bc", + -- kernels .. "/dawn_sa_111107_111113.bc", + -- kernels .. "/dawn_sa_111114_111120.bc", + -- kernels .. "/dawn_sa_111121_111127.bc", + -- kernels .. "/dawn_sa_111128_111204.bc", + -- kernels .. "/dawn_sa_111205_111211.bc", + -- kernels .. "/dawn_sa_111212_111218.bc", + -- kernels .. "/dawn_sa_111219_111225.bc", + -- kernels .. "/dawn_sa_111226_120101.bc", + -- kernels .. "/dawn_sa_120102_120108.bc", + -- kernels .. "/dawn_sa_120109_120115.bc", + -- kernels .. "/dawn_sa_120116_120122.bc", + -- kernels .. "/dawn_sa_120123_120129.bc", + -- kernels .. "/dawn_sa_120130_120205.bc", + -- kernels .. "/dawn_sa_120206_120212.bc", + -- kernels .. "/dawn_sa_120213_120219.bc", + -- kernels .. "/dawn_sa_120220_120226.bc", + -- kernels .. "/dawn_sa_120227_120304.bc", + -- kernels .. "/dawn_sa_120305_120311.bc", + -- kernels .. "/dawn_sa_120312_120318.bc", + -- kernels .. "/dawn_sa_120319_120325.bc", + -- kernels .. "/dawn_sa_120326_120401.bc", + -- kernels .. "/dawn_sa_120402_120408.bc", + -- kernels .. "/dawn_sa_120409_120415.bc", + -- kernels .. "/dawn_sa_120416_120422.bc", + -- kernels .. "/dawn_sa_120423_120429.bc", + -- kernels .. "/dawn_sa_120430_120506.bc", + -- kernels .. "/dawn_sa_120507_120513.bc", + -- kernels .. "/dawn_sa_120514_120520.bc", + -- kernels .. "/dawn_sa_120521_120527.bc", + -- kernels .. "/dawn_sa_120528_120603.bc", + -- kernels .. "/dawn_sa_120604_120610.bc", + -- kernels .. "/dawn_sa_120611_120617.bc", + -- kernels .. "/dawn_sa_120618_120624.bc", + -- kernels .. "/dawn_sa_120625_120701.bc", + -- kernels .. "/dawn_sa_120702_120708.bc", + -- kernels .. "/dawn_sa_120709_120715.bc", + -- kernels .. "/dawn_sa_120716_120722.bc", + -- kernels .. "/dawn_sa_120723_120729.bc", + -- kernels .. "/dawn_sa_120730_120805.bc", + -- kernels .. "/dawn_sa_120806_120812.bc", + -- kernels .. "/dawn_sa_120813_120819.bc", + -- kernels .. "/dawn_sa_120820_120826.bc", + -- kernels .. "/dawn_sa_120827_120902.bc", + -- kernels .. "/dawn_sa_120903_120909.bc", + -- kernels .. "/dawn_sa_120910_120916.bc", } local Dawn = { diff --git a/data/assets/scene/solarsystem/missions/dawn/dawn_kernels.asset b/data/assets/scene/solarsystem/missions/dawn/dawn_kernels.asset index 1a52f806c2..6ee7f55abc 100644 --- a/data/assets/scene/solarsystem/missions/dawn/dawn_kernels.asset +++ b/data/assets/scene/solarsystem/missions/dawn/dawn_kernels.asset @@ -1,8 +1,8 @@ local Kernels = asset.syncedResource({ Name = "Dawn Kernels", - Type = "TorrentSynchronization", + Type = "HttpSynchronization", Identifier = "dawn_kernels", - Magnet = "magnet:?xt=urn:btih:31997fff4bffa6959c7144d24a13f5fad4604fa6&dn=DawnKernels" + Version = 1 }) asset.export("Kernels", Kernels) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/missions/dawn/vesta.asset b/data/assets/scene/solarsystem/missions/dawn/vesta.asset index 2279c520a4..d6b1735e36 100644 --- a/data/assets/scene/solarsystem/missions/dawn/vesta.asset +++ b/data/assets/scene/solarsystem/missions/dawn/vesta.asset @@ -19,9 +19,9 @@ local images = asset.syncedResource({ local models = asset.syncedResource({ Name = "Vesta Models", - Type = "TorrentSynchronization", + Type = "HttpSynchronization", Identifier = "vesta_comet", - Magnet = "magnet:?xt=urn:btih:4250685907FAEC6AE242485AB3E2018DE0377559&dn=VestaComet" + Version = 1 }) local Vesta = { @@ -33,8 +33,8 @@ local Vesta = { Target = "VESTA", Observer = "SUN", Kernels = { - --kernels .. "/pck/dawn_vesta_v06.tpc", - kernels .. "/DawnKernels/spk/sb_vesta_071107.bsp" + --kernels .. "/dawn_vesta_v06.tpc", + kernels .. "/sb_vesta_071107.bsp" } }, Rotation = { diff --git a/data/assets/scene/solarsystem/missions/juno/juno.asset b/data/assets/scene/solarsystem/missions/juno/juno.asset index 8919a2235d..e3cb17202b 100644 --- a/data/assets/scene/solarsystem/missions/juno/juno.asset +++ b/data/assets/scene/solarsystem/missions/juno/juno.asset @@ -18,115 +18,115 @@ local model = asset.syncedResource({ local kernels = asset.syncedResource({ Name = "Juno Kernels", - Type = "TorrentSynchronization", + Type = "HttpSynchronization", Identifier = "juno_kernels", - Magnet = "magnet:?xt=urn:btih:5A14C9E647C689A54BAB7A7DAEB5F312E8199C91&dn=Juno&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.opentrackr.org%3a1337%2fannounce" + Version = 1 }) local JunoKernels = { - kernels .. "/Juno/JNO_SCLKSCET.00039.tsc", - kernels .. "/Juno/juno_jade_v00.ti", - kernels .. "/Juno/juno_jedi_v00.ti", - kernels .. "/Juno/juno_jiram_v01.ti", - kernels .. "/Juno/juno_junocam_v00.ti", - kernels .. "/Juno/juno_mag_v00.ti", - kernels .. "/Juno/juno_mwr_v01.ti", - kernels .. "/Juno/juno_struct_v01.ti", - kernels .. "/Juno/juno_uvs_v00.ti", - kernels .. "/Juno/juno_v08.tf", - kernels .. "/Juno/juno_waves_v00.ti", - kernels .. "/Juno/juno_mwr_v01.ti", - kernels .. "/Juno/spk_merge_110805_171017_130515.bsp", - kernels .. "/Juno/ck/juno_sc_prl_110930_111028_jc003c01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_111028_111125_jc004b00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_111125_111223_jc005b00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_111223_120127_jc006a02_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_120127_120217_jc007a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_120217_120316_jc008b00_v02.bc", - kernels .. "/Juno/ck/juno_sc_prl_120316_120413_jc009a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_120413_120511_jc010a04_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_120511_120608_jc011a01_v02.bc", - kernels .. "/Juno/ck/juno_sc_prl_120608_120706_jc012b01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_120706_120802_jc013a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_120802_120824_jc014b01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_120824_120928_jc015m00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_120919_120928_jc015o00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_120928_121026_jc016c03_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_121026_121123_jc017a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_121123_121221_jc018b01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_121221_130118_jc019a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_130118_130215_jc020b01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_130315_130412_jc022b01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_130412_130510_jc023b03_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_130510_130607_jc024a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_130607_130705_jc025a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_130705_130802_jc026a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_130726_131020_jx024a02_EFB_v03.bc", - kernels .. "/Juno/ck/juno_sc_prl_130802_130830_jc027a02_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_130830_130927_jc028a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_130926_131025_jc029a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_130927_131025_jc029c01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_131022_131025_jc029f00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_131025_131122_jc030b04_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_131122_131220_jc031b01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_131220_140124_jc032a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_140124_140214_jc033a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_140214_140314_jc034b01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_140314_140411_jc035a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_140411_140509_jc036b01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_140509_140606_jc037b02_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_140606_140704_jc038a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_140704_140801_jc039b01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_140801_140829_jc040a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_140829_140926_jc041a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_140926_141024_jc042a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_141024_141121_jc043a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_141105_141121_jc043m01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_141107_141121_jc043s01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_141121_141219_jc044a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_141219_150123_jc045a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_150123_150213_jc046a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_150213_150313_jc047a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_150312_150409_jc048a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_150410_150508_jc049a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_150508_150605_jc050a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_150605_150703_jc051a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_150703_150731_jc052a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_150731_150828_jc053a01_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_150805_150828_jc053m00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_150807_150828_jc053s00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_150828_150924_jc054a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_150924_151023_jc055a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_151023_151120_jc056a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_151120_151218_jc057a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_151218_160115_jc058a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_160115_160212_jc059a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_160212_160311_jc060a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_160311_160408_jc061a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_160408_160506_jc062a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_160506_160603_jc063a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_160603_160630_jc064a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_160708_160729_jm0001rp_v02.bc", - kernels .. "/Juno/ck/juno_sc_prl_160729_160826_jm0002rp_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_160827_160920_jm0003a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_160924_161019_jm0004a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_161014_161115_jm0005a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_161022_161115_jm0005b00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_161115_161213_jx0405rp_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_161210_170115_jm0031a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_170115_170201_jm0032a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_170201_170309_jm0041a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_170309_170326_jm0042rp_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_170326_170427_jm0051rp_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_170427_170518_jm0052rp_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_170518_170615_jm0061a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_170615_170710_jm0062a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_170710_170805_jm0071a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_170805_170831_jm0072a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_170831_170927_jm0081a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_170927_171023_jm0082a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_171023_171030_jm0091a00_v01.bc", - kernels .. "/Juno/ck/juno_sc_prl_171023_171030_jm0091a00_v01.bc" + kernels .. "/JNO_SCLKSCET.00039.tsc", + kernels .. "/juno_jade_v00.ti", + kernels .. "/juno_jedi_v00.ti", + kernels .. "/juno_jiram_v01.ti", + kernels .. "/juno_junocam_v00.ti", + kernels .. "/juno_mag_v00.ti", + kernels .. "/juno_mwr_v01.ti", + kernels .. "/juno_struct_v01.ti", + kernels .. "/juno_uvs_v00.ti", + kernels .. "/juno_v08.tf", + kernels .. "/juno_waves_v00.ti", + kernels .. "/juno_mwr_v01.ti", + kernels .. "/spk_merge_110805_171017_130515.bsp", + kernels .. "/juno_sc_prl_110930_111028_jc003c01_v01.bc", + kernels .. "/juno_sc_prl_111028_111125_jc004b00_v01.bc", + kernels .. "/juno_sc_prl_111125_111223_jc005b00_v01.bc", + kernels .. "/juno_sc_prl_111223_120127_jc006a02_v01.bc", + kernels .. "/juno_sc_prl_120127_120217_jc007a00_v01.bc", + kernels .. "/juno_sc_prl_120217_120316_jc008b00_v02.bc", + kernels .. "/juno_sc_prl_120316_120413_jc009a00_v01.bc", + kernels .. "/juno_sc_prl_120413_120511_jc010a04_v01.bc", + kernels .. "/juno_sc_prl_120511_120608_jc011a01_v02.bc", + kernels .. "/juno_sc_prl_120608_120706_jc012b01_v01.bc", + kernels .. "/juno_sc_prl_120706_120802_jc013a01_v01.bc", + kernels .. "/juno_sc_prl_120802_120824_jc014b01_v01.bc", + kernels .. "/juno_sc_prl_120824_120928_jc015m00_v01.bc", + kernels .. "/juno_sc_prl_120919_120928_jc015o00_v01.bc", + kernels .. "/juno_sc_prl_120928_121026_jc016c03_v01.bc", + kernels .. "/juno_sc_prl_121026_121123_jc017a01_v01.bc", + kernels .. "/juno_sc_prl_121123_121221_jc018b01_v01.bc", + kernels .. "/juno_sc_prl_121221_130118_jc019a01_v01.bc", + kernels .. "/juno_sc_prl_130118_130215_jc020b01_v01.bc", + kernels .. "/juno_sc_prl_130315_130412_jc022b01_v01.bc", + kernels .. "/juno_sc_prl_130412_130510_jc023b03_v01.bc", + kernels .. "/juno_sc_prl_130510_130607_jc024a01_v01.bc", + kernels .. "/juno_sc_prl_130607_130705_jc025a00_v01.bc", + kernels .. "/juno_sc_prl_130705_130802_jc026a01_v01.bc", + kernels .. "/juno_sc_prl_130726_131020_jx024a02_EFB_v03.bc", + kernels .. "/juno_sc_prl_130802_130830_jc027a02_v01.bc", + kernels .. "/juno_sc_prl_130830_130927_jc028a01_v01.bc", + kernels .. "/juno_sc_prl_130926_131025_jc029a00_v01.bc", + kernels .. "/juno_sc_prl_130927_131025_jc029c01_v01.bc", + kernels .. "/juno_sc_prl_131022_131025_jc029f00_v01.bc", + kernels .. "/juno_sc_prl_131025_131122_jc030b04_v01.bc", + kernels .. "/juno_sc_prl_131122_131220_jc031b01_v01.bc", + kernels .. "/juno_sc_prl_131220_140124_jc032a01_v01.bc", + kernels .. "/juno_sc_prl_140124_140214_jc033a01_v01.bc", + kernels .. "/juno_sc_prl_140214_140314_jc034b01_v01.bc", + kernels .. "/juno_sc_prl_140314_140411_jc035a01_v01.bc", + kernels .. "/juno_sc_prl_140411_140509_jc036b01_v01.bc", + kernels .. "/juno_sc_prl_140509_140606_jc037b02_v01.bc", + kernels .. "/juno_sc_prl_140606_140704_jc038a01_v01.bc", + kernels .. "/juno_sc_prl_140704_140801_jc039b01_v01.bc", + kernels .. "/juno_sc_prl_140801_140829_jc040a01_v01.bc", + kernels .. "/juno_sc_prl_140829_140926_jc041a01_v01.bc", + kernels .. "/juno_sc_prl_140926_141024_jc042a01_v01.bc", + kernels .. "/juno_sc_prl_141024_141121_jc043a01_v01.bc", + kernels .. "/juno_sc_prl_141105_141121_jc043m01_v01.bc", + kernels .. "/juno_sc_prl_141107_141121_jc043s01_v01.bc", + kernels .. "/juno_sc_prl_141121_141219_jc044a01_v01.bc", + kernels .. "/juno_sc_prl_141219_150123_jc045a01_v01.bc", + kernels .. "/juno_sc_prl_150123_150213_jc046a01_v01.bc", + kernels .. "/juno_sc_prl_150213_150313_jc047a01_v01.bc", + kernels .. "/juno_sc_prl_150312_150409_jc048a01_v01.bc", + kernels .. "/juno_sc_prl_150410_150508_jc049a01_v01.bc", + kernels .. "/juno_sc_prl_150508_150605_jc050a01_v01.bc", + kernels .. "/juno_sc_prl_150605_150703_jc051a01_v01.bc", + kernels .. "/juno_sc_prl_150703_150731_jc052a01_v01.bc", + kernels .. "/juno_sc_prl_150731_150828_jc053a01_v01.bc", + kernels .. "/juno_sc_prl_150805_150828_jc053m00_v01.bc", + kernels .. "/juno_sc_prl_150807_150828_jc053s00_v01.bc", + kernels .. "/juno_sc_prl_150828_150924_jc054a00_v01.bc", + kernels .. "/juno_sc_prl_150924_151023_jc055a00_v01.bc", + kernels .. "/juno_sc_prl_151023_151120_jc056a00_v01.bc", + kernels .. "/juno_sc_prl_151120_151218_jc057a00_v01.bc", + kernels .. "/juno_sc_prl_151218_160115_jc058a00_v01.bc", + kernels .. "/juno_sc_prl_160115_160212_jc059a00_v01.bc", + kernels .. "/juno_sc_prl_160212_160311_jc060a00_v01.bc", + kernels .. "/juno_sc_prl_160311_160408_jc061a00_v01.bc", + kernels .. "/juno_sc_prl_160408_160506_jc062a00_v01.bc", + kernels .. "/juno_sc_prl_160506_160603_jc063a00_v01.bc", + kernels .. "/juno_sc_prl_160603_160630_jc064a00_v01.bc", + kernels .. "/juno_sc_prl_160708_160729_jm0001rp_v02.bc", + kernels .. "/juno_sc_prl_160729_160826_jm0002rp_v01.bc", + kernels .. "/juno_sc_prl_160827_160920_jm0003a00_v01.bc", + kernels .. "/juno_sc_prl_160924_161019_jm0004a00_v01.bc", + kernels .. "/juno_sc_prl_161014_161115_jm0005a00_v01.bc", + kernels .. "/juno_sc_prl_161022_161115_jm0005b00_v01.bc", + kernels .. "/juno_sc_prl_161115_161213_jx0405rp_v01.bc", + kernels .. "/juno_sc_prl_161210_170115_jm0031a00_v01.bc", + kernels .. "/juno_sc_prl_170115_170201_jm0032a00_v01.bc", + kernels .. "/juno_sc_prl_170201_170309_jm0041a00_v01.bc", + kernels .. "/juno_sc_prl_170309_170326_jm0042rp_v01.bc", + kernels .. "/juno_sc_prl_170326_170427_jm0051rp_v01.bc", + kernels .. "/juno_sc_prl_170427_170518_jm0052rp_v01.bc", + kernels .. "/juno_sc_prl_170518_170615_jm0061a00_v01.bc", + kernels .. "/juno_sc_prl_170615_170710_jm0062a00_v01.bc", + kernels .. "/juno_sc_prl_170710_170805_jm0071a00_v01.bc", + kernels .. "/juno_sc_prl_170805_170831_jm0072a00_v01.bc", + kernels .. "/juno_sc_prl_170831_170927_jm0081a00_v01.bc", + kernels .. "/juno_sc_prl_170927_171023_jm0082a00_v01.bc", + kernels .. "/juno_sc_prl_171023_171030_jm0091a00_v01.bc", + kernels .. "/juno_sc_prl_171023_171030_jm0091a00_v01.bc" } local RotationMatrix = { diff --git a/data/assets/scene/solarsystem/missions/newhorizons/charon.asset b/data/assets/scene/solarsystem/missions/newhorizons/charon.asset index cbfb0391b7..b99860f62d 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/charon.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/charon.asset @@ -1,7 +1,6 @@ local assetHelper = asset.require('util/asset_helper') local transforms = asset.require('./transforms') local sunTransforms = asset.require('scene/solarsystem/sun/transforms') -local kernels = asset.require('./kernels') diff --git a/data/assets/scene/solarsystem/missions/newhorizons/hydra.asset b/data/assets/scene/solarsystem/missions/newhorizons/hydra.asset index 3f5b5da8cb..153c653dd4 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/hydra.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/hydra.asset @@ -19,7 +19,7 @@ local Hydra = { Type = "SpiceTranslation", Target = "HYDRA", Observer = "PLUTO BARYCENTER", - Kernels = kernels .. "/new_horizons/spk/NavSE_plu047_od122.bsp" + Kernels = kernels .. "/NavSE_plu047_od122.bsp" } }, Renderable = { diff --git a/data/assets/scene/solarsystem/missions/newhorizons/kerberos.asset b/data/assets/scene/solarsystem/missions/newhorizons/kerberos.asset index e5929a7e7f..87c156dd2c 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/kerberos.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/kerberos.asset @@ -19,7 +19,7 @@ local Kerberos = { Type = "SpiceTranslation", Target = "KERBEROS", Observer = "PLUTO BARYCENTER", - Kernels = kernels.Kernels .. "/new_horizons/spk/NavSE_plu047_od122.bsp" + Kernels = kernels.Kernels .. "/NavSE_plu047_od122.bsp" }, Rotation = { Type = "SpiceRotation", diff --git a/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset b/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset index f86a31820f..ed6816032b 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/kernels.asset @@ -1,44 +1,44 @@ local Kernels = asset.syncedResource({ Name = "New Horizons Kernels", - Type = "TorrentSynchronization", + Type = "HttpSynchronization", Identifier = "newhorizons_kernels", - Magnet = "magnet:?xt=urn:btih:4AF38BDD42C5B29A0EF1CE4AB274CD91C017B8CC&dn=new_horizons&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.opentrackr.org%3a1337%2fannounce" + Version = 1 }) local NewHorizonsKernels = { - Kernels .. "/new_horizons/spk/nh_pred_20141201_20190301_od122.bsp", - Kernels .. "/new_horizons/spk/NavSE_plu047_od122.bsp", - Kernels .. "/new_horizons/spk/NavPE_de433_od122.bsp", + Kernels .. "/nh_pred_20141201_20190301_od122.bsp", + Kernels .. "/NavSE_plu047_od122.bsp", + Kernels .. "/NavPE_de433_od122.bsp", - Kernels .. "/new_horizons/sclk/new-horizons_1121.tsc", + Kernels .. "/new-horizons_1121.tsc", - Kernels .. "/new_horizons/ck/nh_scispi_2015_pred.bc", - Kernels .. "/new_horizons/ck/nh_scispi_2015_recon.bc", - Kernels .. "/new_horizons/ck/nh_lorri_wcs.bc", + Kernels .. "/nh_scispi_2015_pred.bc", + Kernels .. "/nh_scispi_2015_recon.bc", + Kernels .. "/nh_lorri_wcs.bc", - Kernels .. "/new_horizons/smithed_pc_and_sp/PLU_LORRI_ALL_161216.bc", + Kernels .. "/PLU_LORRI_ALL_161216.bc", - Kernels .. "/new_horizons/pck/nh_targets_v001.tpc", - Kernels .. "/new_horizons/pck/nh_pcnh_005.tpc", + Kernels .. "/nh_targets_v001.tpc", + Kernels .. "/nh_pcnh_005.tpc", - Kernels .. "/new_horizons/fk/nh_v220.tf", - Kernels .. "/new_horizons/ik/nh_allinstruments_v002.ti", - Kernels .. "/new_horizons/ik/nh_alice_v200.ti", - Kernels .. "/new_horizons/ik/nh_lorri_v201.ti", - Kernels .. "/new_horizons/ik/nh_pepssi_v110.ti", - Kernels .. "/new_horizons/ik/nh_ralph_v100.ti", - Kernels .. "/new_horizons/ik/nh_rex_v100.ti", - Kernels .. "/new_horizons/ik/nh_sdc_v101.ti", - Kernels .. "/new_horizons/ik/nh_swap_v100.ti", - Kernels .. "/new_horizons/ik/nh_astr_v000.ti", - Kernels .. "/new_horizons/ik/nh_fss_v000.ti", - Kernels .. "/new_horizons/fk/nh_soc_misc_v001.tf", - Kernels .. "/new_horizons/spk/nh_stars.bsp", + Kernels .. "/nh_v220.tf", + Kernels .. "/nh_allinstruments_v002.ti", + Kernels .. "/nh_alice_v200.ti", + Kernels .. "/nh_lorri_v201.ti", + Kernels .. "/nh_pepssi_v110.ti", + Kernels .. "/nh_ralph_v100.ti", + Kernels .. "/nh_rex_v100.ti", + Kernels .. "/nh_sdc_v101.ti", + Kernels .. "/nh_swap_v100.ti", + Kernels .. "/nh_astr_v000.ti", + Kernels .. "/nh_fss_v000.ti", + Kernels .. "/nh_soc_misc_v001.tf", + Kernels .. "/nh_stars.bsp", } local PlutoKernels = { - Kernels .. "/new_horizons/spk/NavPE_de433_od122.bsp", - Kernels .. "/new_horizons/spk/NavSE_plu047_od122.bsp" + Kernels .. "/NavPE_de433_od122.bsp", + Kernels .. "/NavSE_plu047_od122.bsp" } diff --git a/data/assets/scene/solarsystem/missions/newhorizons/nix.asset b/data/assets/scene/solarsystem/missions/newhorizons/nix.asset index 20494361e5..86c04c376d 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/nix.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/nix.asset @@ -19,7 +19,7 @@ local Nix = { Type = "SpiceTranslation", Target = "NIX", Observer = "PLUTO BARYCENTER", - Kernels = kernels.Kernels .. "/new_horizons/spk/NavSE_plu047_od122.bsp" + Kernels = kernels.Kernels .. "/NavSE_plu047_od122.bsp" } }, Renderable = { diff --git a/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset b/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset index 953866302a..039dc62354 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset @@ -1,7 +1,6 @@ local assetHelper = asset.require('util/asset_helper') local transforms = asset.require('./transforms') local sunTransforms = asset.require('scene/solarsystem/sun/transforms') -local kernels = asset.require('./kernels') diff --git a/data/assets/scene/solarsystem/missions/newhorizons/styx.asset b/data/assets/scene/solarsystem/missions/newhorizons/styx.asset index 56ed5b9c62..85459c5c66 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/styx.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/styx.asset @@ -19,7 +19,7 @@ local Styx = { Type = "SpiceTranslation", Target = "STYX", Observer = "PLUTO BARYCENTER", - Kernels = kernels.Kernels .. "/new_horizons/spk/NavSE_plu047_od122.bsp" + Kernels = kernels.Kernels .. "/NavSE_plu047_od122.bsp" } }, Renderable = { diff --git a/data/assets/scene/solarsystem/missions/osirisrex/model.asset b/data/assets/scene/solarsystem/missions/osirisrex/model.asset index bc611bbf75..b1366bbc51 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/model.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/model.asset @@ -7,9 +7,9 @@ local earthTransforms = asset.require('scene/solarsystem/planets/earth/transform local kernels = asset.syncedResource({ Name = "Osiris Rex Kernels", - Type = "TorrentSynchronization", + Type = "HttpSynchronization", Identifier = "osirisrex_kernels", - Magnet = "magnet:?xt=urn:btih:26719889CAAB41792B97639D29AD49B1EDBA051E&dn=OsirisRexKernels&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.opentrackr.org%3a1337%2fannounce" + Version = 1 }) local textures = asset.syncedResource({ @@ -33,116 +33,116 @@ KernelCase = 2 -- Right now we only have the image times for case 2 local CaseDependentKernels if KernelCase == 2 then CaseDependentKernels = { - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/525m_Sortie_v2/ORX_Recon_525mSortie_Case02.bsp", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/525m_Sortie_v2/Recon_525mSortie_Case02_0Latitude.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/525m_Sortie_v2/Recon_525mSortie_Case02_atl_19145_04.atf", + kernels .. "/ORX_Recon_525mSortie_Case02.bsp", + kernels .. "/Recon_525mSortie_Case02_0Latitude.bc", + kernels .. "/Recon_525mSortie_Case02_atl_19145_04.atf", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/ORX_Recon_225mSortie_Case02.bsp", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/Recon_225mSortie_Case02_0Latitude.bc" + kernels .. "/ORX_Recon_225mSortie_Case02.bsp", + kernels .. "/Recon_225mSortie_Case02_0Latitude.bc" } elseif KernelCase == 5 then CaseDependentKernels = { - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/525m_Sortie_v2/ORX_Recon_525mSortie_Case05.bsp", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/525m_Sortie_v2/Recon_525mSortie_Case05_20negLatitude.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/525m_Sortie_v2/Recon_525mSortie_Case05_atl_19145_04.atf", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/525m_Sortie_v2/Recon_525mSortie_Case05_NominalProfile.bc", + kernels .. "/ORX_Recon_525mSortie_Case05.bsp", + kernels .. "/Recon_525mSortie_Case05_20negLatitude.bc", + kernels .. "/Recon_525mSortie_Case05_atl_19145_04.atf", + kernels .. "/Recon_525mSortie_Case05_NominalProfile.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/ORX_Recon_225mSortie_Case05.bsp", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/Recon_225mSortie_Case05_20negLatitude.bc" + kernels .. "/ORX_Recon_225mSortie_Case05.bsp", + kernels .. "/Recon_225mSortie_Case05_20negLatitude.bc" } elseif KernelCase == 8 then CaseDependentKernels = { - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/525m_Sortie_v2/Recon_525mSortie_Case08_NominalProfile.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/ORX_Recon_225mSortie_Case08.bsp", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/Recon_225mSortie_Case08_40negLatitude.bc" + kernels .. "/Recon_525mSortie_Case08_NominalProfile.bc", + kernels .. "/ORX_Recon_225mSortie_Case08.bsp", + kernels .. "/Recon_225mSortie_Case08_40negLatitude.bc" } elseif KernelCase == 11 then CaseDependentKernels = { - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/ORX_Recon_225mSortie_Case11.bsp", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/Recon_225mSortie_Case11_60negLatitude.bc" + kernels .. "/ORX_Recon_225mSortie_Case11.bsp", + kernels .. "/Recon_225mSortie_Case11_60negLatitude.bc" } end local OsirisRexKernels = { -- background -- SCLK kernels needs to be loaded before CK kernels (and generally first) - kernels .. "/OsirisRexKernels/background/sclk/ORX_SCLKSCET.00000.tsc", + kernels .. "/ORX_SCLKSCET.00000.tsc", -- This cannot be loaded correctly for some reason! --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/background/dsk/RQ36mod.oct12_CCv0001.bds") - kernels .. "/OsirisRexKernels/background/fk/orx_v04.tf", - kernels .. "/OsirisRexKernels/background/ik/orx_lidar_v00.ti", - kernels .. "/OsirisRexKernels/background/ik/orx_ocams_v03.ti", - kernels .. "/OsirisRexKernels/background/ik/orx_otes_v00.ti", - kernels .. "/OsirisRexKernels/background/ik/orx_rexis_v00.ti", - kernels .. "/OsirisRexKernels/background/ik/orx_struct_v00.ti", - kernels .. "/OsirisRexKernels/background/ik/orx_navcam_v00.ti", - kernels .. "/OsirisRexKernels/background/ik/orx_ola_v00.ti", - kernels .. "/OsirisRexKernels/background/ik/orx_ovirs_v00.ti", - kernels .. "/OsirisRexKernels/background/ik/orx_stowcam_v00.ti", - -- kernels .. "/OsirisRexKernels/background/lsk/naif0011.tls", - kernels .. "/OsirisRexKernels/background/pck/bennu_SPH250m.tpc", - kernels .. "/OsirisRexKernels/background/pck/bennu_v10.tpc", + kernels .. "/orx_v04.tf", + kernels .. "/orx_lidar_v00.ti", + kernels .. "/orx_ocams_v03.ti", + kernels .. "/orx_otes_v00.ti", + kernels .. "/orx_rexis_v00.ti", + kernels .. "/orx_struct_v00.ti", + kernels .. "/orx_navcam_v00.ti", + kernels .. "/orx_ola_v00.ti", + kernels .. "/orx_ovirs_v00.ti", + kernels .. "/orx_stowcam_v00.ti", + -- kernels .. "/naif0011.tls", + kernels .. "/bennu_SPH250m.tpc", + kernels .. "/bennu_v10.tpc", -- Low res SPK - kernels .. "/OsirisRexKernels/background/spk/orx_160917_231024_pgaa3_day15m60_v1.bsp", - kernels .. "/OsirisRexKernels/background/spk/orx_160914_231024_pgaa3_day12m60_v1.bsp", + kernels .. "/orx_160917_231024_pgaa3_day15m60_v1.bsp", + kernels .. "/orx_160914_231024_pgaa3_day12m60_v1.bsp", - kernels .. "/OsirisRexKernels/background/spk/orx_160908_231024_pgaa3_day06m60_v1.bsp", - kernels .. "/OsirisRexKernels/background/spk/spk_orx_160908_231024_pgaa2_day06m60_v3.bsp", - kernels .. "/OsirisRexKernels/background/spk/orx_160908_231024_pgaa2_day06m60.bsp", + kernels .. "/orx_160908_231024_pgaa3_day06m60_v1.bsp", + kernels .. "/spk_orx_160908_231024_pgaa2_day06m60_v3.bsp", + kernels .. "/orx_160908_231024_pgaa2_day06m60.bsp", - kernels .. "/OsirisRexKernels/background/spk/OREX_20160908_M60_complete.bsp", - kernels .. "/OsirisRexKernels/background/spk/OREX_20160904_M45_complete.bsp", + kernels .. "/OREX_20160908_M60_complete.bsp", + kernels .. "/OREX_20160904_M45_complete.bsp", -- SPK - kernels .. "/OsirisRexKernels/background/spk/de421.bsp", - kernels .. "/OsirisRexKernels/background/spk/sb-101955-76.bsp", + kernels .. "/de421.bsp", + kernels .. "/sb-101955-76.bsp", -- Nominal_Profile_LowRes - kernels .. "/OsirisRexKernels/Nominal_Profile_LowRes/Approach_600s_20180816T230000_20181119T010000.bsp", - kernels .. "/OsirisRexKernels/Nominal_Profile_LowRes/Approach_NominalProfile_600s_20180816T230000_20181119T010000.bc", - kernels .. "/OsirisRexKernels/Nominal_Profile_LowRes/DetailedSurvey_600s_20190108T000000_20190317T000000.bsp", - kernels .. "/OsirisRexKernels/Nominal_Profile_LowRes/OrbitalA_600s_20181203T230000_20190109T000000.bsp", - kernels .. "/OsirisRexKernels/Nominal_Profile_LowRes/OrbitalA_NominalProfile_600s_20181203T230000_20190109T000000.bc", - kernels .. "/OsirisRexKernels/Nominal_Profile_LowRes/OrbitalB_600s_20190316T000000_20190521T000000.bsp", - kernels .. "/OsirisRexKernels/Nominal_Profile_LowRes/DetailedSurvey_NominalProfile_600s_20190108T000000_20190317T000000.bc", - kernels .. "/OsirisRexKernels/Nominal_Profile_LowRes/OrbitalB_NominalProfile600s_20190316T000000_20190521T000000.bc", - kernels .. "/OsirisRexKernels/Nominal_Profile_LowRes/PrelimSurvey_600s_20181119T230000_20181204T010000.bsp", - kernels .. "/OsirisRexKernels/Nominal_Profile_LowRes/PrelimSurvey_NominalProfile_600s_20181119T230000_20181204T010000.bc", - kernels .. "/OsirisRexKernels/Nominal_Profile_LowRes/Recon_600s_20190519T000000_20190830T000000.bsp", - kernels .. "/OsirisRexKernels/Nominal_Profile_LowRes/Recon_NominalProfile_600s_20190519T000000_20190830T000000.bc", + kernels .. "/Approach_600s_20180816T230000_20181119T010000.bsp", + kernels .. "/Approach_NominalProfile_600s_20180816T230000_20181119T010000.bc", + kernels .. "/DetailedSurvey_600s_20190108T000000_20190317T000000.bsp", + kernels .. "/OrbitalA_600s_20181203T230000_20190109T000000.bsp", + kernels .. "/OrbitalA_NominalProfile_600s_20181203T230000_20190109T000000.bc", + kernels .. "/OrbitalB_600s_20190316T000000_20190521T000000.bsp", + kernels .. "/DetailedSurvey_NominalProfile_600s_20190108T000000_20190317T000000.bc", + kernels .. "/OrbitalB_NominalProfile600s_20190316T000000_20190521T000000.bc", + kernels .. "/PrelimSurvey_600s_20181119T230000_20181204T010000.bsp", + kernels .. "/PrelimSurvey_NominalProfile_600s_20181119T230000_20181204T010000.bc", + kernels .. "/Recon_600s_20190519T000000_20190830T000000.bsp", + kernels .. "/Recon_NominalProfile_600s_20190519T000000_20190830T000000.bc", -- Nominal_Observations_Science - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/03_Approach/DustSearch_v1/Phase03_AP_DustSearch_1.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/03_Approach/LightCurve_v1/Phase03_AP_LightCurve_1.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/03_Approach/LightCurve_v1/Phase03_AP_LightCurve_2.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/03_Approach/NatSatSearch_v1/Phase03_AP_SatSearch_1.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/03_Approach/NatSatSearch_v1/Phase03_AP_SatSearch_2.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/03_Approach/PhaseFunction_v1/Phase03_AP_PhaseFunction_1.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_1.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_2.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_3.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_4.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_5.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_6.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_7.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_8.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/03_Approach/ShapeModel_v1/Phase03_AP_ShapeModel_9_Forced4x4.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/03_Approach/SpectraMap_v1/Phase03_AP_SpectraMap_1.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/MapCamOLA_v1/Phase04_PS_MC_1_v1_1a.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/MapCamOLA_v1/Phase04_PS_MC_2_v1_1a.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/OLA_v1/Phase04_PS_OLA_Nominal_1.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/OLA_v1/Phase04_PS_OLA_Nominal_2.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/OLA_v1/Phase04_PS_OLA_Nominal_3.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/OLA_v1/Phase04_PS_OLA_Nominal_4.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/PolyCam_v1/Phase04_PS_PolyCam_1.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/PolyCam_v1/Phase04_PS_PolyCam_2.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/PolyCam_v1/Phase04_PS_PolyCam_3.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/PolyCam_v1/Phase04_PS_PolyCam_4.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/PolyCam_v1/Phase04_PS_PolyCam_5.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/04_PrelimSurvey/PolyCam_v1/Phase04_PS_PolyCam_6.bc", + kernels .. "/Phase03_AP_DustSearch_1.bc", + kernels .. "/Phase03_AP_LightCurve_1.bc", + kernels .. "/Phase03_AP_LightCurve_2.bc", + kernels .. "/Phase03_AP_SatSearch_1.bc", + kernels .. "/Phase03_AP_SatSearch_2.bc", + kernels .. "/Phase03_AP_PhaseFunction_1.bc", + kernels .. "/Phase03_AP_ShapeModel_1.bc", + kernels .. "/Phase03_AP_ShapeModel_2.bc", + kernels .. "/Phase03_AP_ShapeModel_3.bc", + kernels .. "/Phase03_AP_ShapeModel_4.bc", + kernels .. "/Phase03_AP_ShapeModel_5.bc", + kernels .. "/Phase03_AP_ShapeModel_6.bc", + kernels .. "/Phase03_AP_ShapeModel_7.bc", + kernels .. "/Phase03_AP_ShapeModel_8.bc", + kernels .. "/Phase03_AP_ShapeModel_9_Forced4x4.bc", + kernels .. "/Phase03_AP_SpectraMap_1.bc", + kernels .. "/Phase04_PS_MC_1_v1_1a.bc", + kernels .. "/Phase04_PS_MC_2_v1_1a.bc", + kernels .. "/Phase04_PS_OLA_Nominal_1.bc", + kernels .. "/Phase04_PS_OLA_Nominal_2.bc", + kernels .. "/Phase04_PS_OLA_Nominal_3.bc", + kernels .. "/Phase04_PS_OLA_Nominal_4.bc", + kernels .. "/Phase04_PS_PolyCam_1.bc", + kernels .. "/Phase04_PS_PolyCam_2.bc", + kernels .. "/Phase04_PS_PolyCam_3.bc", + kernels .. "/Phase04_PS_PolyCam_4.bc", + kernels .. "/Phase04_PS_PolyCam_5.bc", + kernels .. "/Phase04_PS_PolyCam_6.bc", --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19013_18_BBD1_info.TXT") --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19014_16_BBD2_info.TXT") @@ -150,32 +150,32 @@ local OsirisRexKernels = { --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19021_19_BBD4_info.TXT") --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/README.txt") - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19013_18_BBD1_v2.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19014_16_BBD2_v2.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19020_18_BBD3_v2.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19021_19_BBD4_v2.bc", + kernels .. "/atl_19013_18_BBD1_v2.bc", + kernels .. "/atl_19014_16_BBD2_v2.bc", + kernels .. "/atl_19020_18_BBD3_v2.bc", + kernels .. "/atl_19021_19_BBD4_v2.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/EquatorialStations_v1/Phase06_DS_Equatorial_Stations_1.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/EquatorialStations_v1/Phase06_DS_Equatorial_Stations_2.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/EquatorialStations_v1/Phase06_DS_Equatorial_Stations_3.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/EquatorialStations_v1/Phase06_DS_Equatorial_Stations_4.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/EquatorialStations_v1/Phase06_DS_Equatorial_Stations_5.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/EquatorialStations_v1/Phase06_DS_Equatorial_Stations_6.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/EquatorialStations_v1/Phase06_DS_Equatorial_Stations_7.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/PlumeSearch_v1/Phase06_DS_Plume_Search_1.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/PlumeSearch_v1/Phase06_DS_Plume_Search_2.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/07_OrbitalB/CandidateSampleSite_v1/Phase07_OB_CSS_Mapping_1.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/07_OrbitalB/CandidateSampleSite_v1/Phase07_OB_CSS_Mapping_2.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/07_OrbitalB/CandidateSampleSite_v1/Phase07_OB_CSS_Mapping_3.bc", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/07_OrbitalB/CandidateSampleSite_v2/CSS_Mapping_1.a", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/07_OrbitalB/CandidateSampleSite_v2/CSS_Mapping_2.a", - kernels .. "/OsirisRexKernels/Nominal_Observations_Science/07_OrbitalB/CandidateSampleSite_v2/CSS_Mapping_3.a", + kernels .. "/Phase06_DS_Equatorial_Stations_1.bc", + kernels .. "/Phase06_DS_Equatorial_Stations_2.bc", + kernels .. "/Phase06_DS_Equatorial_Stations_3.bc", + kernels .. "/Phase06_DS_Equatorial_Stations_4.bc", + kernels .. "/Phase06_DS_Equatorial_Stations_5.bc", + kernels .. "/Phase06_DS_Equatorial_Stations_6.bc", + kernels .. "/Phase06_DS_Equatorial_Stations_7.bc", + kernels .. "/Phase06_DS_Plume_Search_1.bc", + kernels .. "/Phase06_DS_Plume_Search_2.bc", + kernels .. "/Phase07_OB_CSS_Mapping_1.bc", + kernels .. "/Phase07_OB_CSS_Mapping_2.bc", + kernels .. "/Phase07_OB_CSS_Mapping_3.bc", + kernels .. "/CSS_Mapping_1.a", + kernels .. "/CSS_Mapping_2.a", + kernels .. "/CSS_Mapping_3.a", - --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/Case02_0Latitude.wmv") - --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/Case05_20negLatitude.wmv") - --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/Case08_40negLatitude.wmv") - --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/08_Recon/225m_Sortie_v2/Case11_60negLatitude.wmv") + --openspace.spice.loadKernel(kernels .. "/Case02_0Latitude.wmv") + --openspace.spice.loadKernel(kernels .. "/Case05_20negLatitude.wmv") + --openspace.spice.loadKernel(kernels .. "/Case08_40negLatitude.wmv") + --openspace.spice.loadKernel(kernels .. "/Case11_60negLatitude.wmv") } -- Append the CaseDependentKernels at the end of the OsirisRexKernels set diff --git a/data/assets/scene/solarsystem/missions/rosetta/67p.asset b/data/assets/scene/solarsystem/missions/rosetta/67p.asset index 65739cd7f0..06ff4db8e2 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/67p.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/67p.asset @@ -12,25 +12,18 @@ local textures = asset.syncedResource({ local models = asset.syncedResource({ Name = "67P Models", - Type = "TorrentSynchronization", + Type = "HttpSynchronization", Identifier = "67p_models", - Magnet = "magnet:?xt=urn:btih:16BDDBA5346219C64CD818AE00DEC6FEE095BCEC&dn=67P_rotated_5_130.obj&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce" + Version = 1 }) -local imagesLocal = asset.syncedResource({ +local images = asset.syncedResource({ Name = "Rosetta Images", Type = "HttpSynchronization", Identifier = "rosettaimages", Version = 1 }) -local imagesTorrent = asset.syncedResource({ - Name = "Rosetta Image Torrent", - Type = "TorrentSynchronization", - Identifier = "rosettaimages", - Magnet = "magnet:?xt=urn:btih:4218A4C0DA6DFE418A3FD408C1AC9CCB7886165E&dn=rosettaimages&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.opentrackr.org%3a1337%2fannounce" -}) .. "/rosettaimages" - local Barycenter = { Identifier = "67PBarycenter", Parent = transforms.SolarSystemBarycenter.Identifier, @@ -65,8 +58,7 @@ local Comet67P = { }, ColorTexture = textures .. "/gray.jpg", Projection = { - Sequence = { imagesTorrent }, - -- Sequence = { imagesLocal, imagesTorrent }, + Sequence = { images }, SequenceType = "image-sequence", Observer = "ROSETTA", Target = "CHURYUMOV-GERASIMENKO", diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset index 1d61cf68bc..566695f1fe 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset @@ -20,59 +20,59 @@ local models = asset.syncedResource({ local kernels = asset.syncedResource({ Name = "Rosetta Kernels", - Type = "TorrentSynchronization", + Type = "HttpSynchronization", Identifier = "rosetta_kernels", - Magnet = "magnet:?xt=urn:btih:5DE346AE06D62FC53BEBBBBF591D1CA7715F6F64&dn=Rosetta&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.opentrackr.org%3a1337%2fannounce" + Version = 1 }) local RosettaKernels = { - kernels .. "/Rosetta/SCLK/ROS_160718_STEP.TSC", - kernels .. "/Rosetta/SCLK/ros_triv.tsc", + kernels .. "/ROS_160718_STEP.TSC", + kernels .. "/ros_triv.tsc", - kernels .. "/Rosetta/SPK/CORB_DV_243_01___T19_00325.BSP", - kernels .. "/Rosetta/SPK/CORB_DV_223_01___T19_00302.BSP", - kernels .. "/Rosetta/SPK/CORB_DV_145_01___T19_00216.BSP", + kernels .. "/CORB_DV_243_01___T19_00325.BSP", + kernels .. "/CORB_DV_223_01___T19_00302.BSP", + kernels .. "/CORB_DV_145_01___T19_00216.BSP", - kernels .. "/Rosetta/SPK/LORB_DV_236_01___T19_00318.BSP", - kernels .. "/Rosetta/SPK/LORB_DV_223_01___T19_00302.BSP", - kernels .. "/Rosetta/SPK/LORB_DV_145_01___T19_00216.BSP", + kernels .. "/LORB_DV_236_01___T19_00318.BSP", + kernels .. "/LORB_DV_223_01___T19_00302.BSP", + kernels .. "/LORB_DV_145_01___T19_00216.BSP", - kernels .. "/Rosetta/SPK/RORB_DV_243_01___T19_00325.BSP", - kernels .. "/Rosetta/SPK/RORB_DV_223_01___T19_00302.BSP", - kernels .. "/Rosetta/SPK/RORB_DV_145_01___T19_00216.BSP", + kernels .. "/RORB_DV_243_01___T19_00325.BSP", + kernels .. "/RORB_DV_223_01___T19_00302.BSP", + kernels .. "/RORB_DV_145_01___T19_00216.BSP", - kernels .. "/Rosetta/CK/ATNR_P040302093352_00127.BC", + kernels .. "/ATNR_P040302093352_00127.BC", - kernels .. "/Rosetta/SPK/ROS_STRUCT_V5.BSP", + kernels .. "/ROS_STRUCT_V5.BSP", - kernels .. "/Rosetta/IK/ROS_NAVCAM_V01.TI", + kernels .. "/ROS_NAVCAM_V01.TI", - kernels .. "/Rosetta/FK/ROS_CHURYUMOV_V01.TF", - kernels .. "/Rosetta/FK/ROS_V26.TF", + kernels .. "/ROS_CHURYUMOV_V01.TF", + kernels .. "/ROS_V26.TF", -- CK -- Rosetta attitude - kernels .. "/Rosetta/CK/RATT_DV_243_01_01____00325.BC", - kernels .. "/Rosetta/CK/RATT_DV_223_01_01____00302.BC", - kernels .. "/Rosetta/CK/RATT_DV_145_01_01____00216.BC", + kernels .. "/RATT_DV_243_01_01____00325.BC", + kernels .. "/RATT_DV_223_01_01____00302.BC", + kernels .. "/RATT_DV_145_01_01____00216.BC", -- Comet attitude - kernels .. "/Rosetta/CK/CATT_DV_243_01_______00325.BC", - kernels .. "/Rosetta/CK/CATT_DV_223_01_______00302.BC", - kernels .. "/Rosetta/CK/CATT_DV_145_01_______00216.BC", + kernels .. "/CATT_DV_243_01_______00325.BC", + kernels .. "/CATT_DV_223_01_______00302.BC", + kernels .. "/CATT_DV_145_01_______00216.BC", -- High gain antenna - kernels .. "/Rosetta/CK/ROS_HGA_2016_V0035.BC", - kernels .. "/Rosetta/CK/ROS_HGA_2015_V0053.BC", - kernels .. "/Rosetta/CK/ROS_HGA_2014_V0044.BC", + kernels .. "/ROS_HGA_2016_V0035.BC", + kernels .. "/ROS_HGA_2015_V0053.BC", + kernels .. "/ROS_HGA_2014_V0044.BC", -- Solar arrays - kernels .. "/Rosetta/CK/ROS_SA_2016_V0034.BC", - kernels .. "/Rosetta/CK/ROS_SA_2015_V0042.BC", - kernels .. "/Rosetta/CK/ROS_SA_2014_V0047.BC", + kernels .. "/ROS_SA_2016_V0034.BC", + kernels .. "/ROS_SA_2015_V0042.BC", + kernels .. "/ROS_SA_2014_V0047.BC", - kernels .. "/Rosetta/PCK/ROS_CGS_RSOC_V03.TPC" + kernels .. "/ROS_CGS_RSOC_V03.TPC" } local RotationMatrix = { diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset index 6f1abe17c6..2075bbe6c8 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset @@ -2,7 +2,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') asset.require("spice/base") asset.request('./trail') -local kernels = asset.require('../jup310').Kernels +local kernel = asset.require('../kernels').jup310 @@ -21,13 +21,13 @@ local Callisto = { Type = "SpiceRotation", SourceFrame = "IAU_CALLISTO", DestinationFrame = "GALACTIC", - Kernels = kernels + Kernels = kernel }, Translation = { Type = "SpiceTranslation", Target = "CALLISTO", Observer = "JUPITER BARYCENTER", - Kernels = kernels + Kernels = kernel } }, Renderable = { diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset index 2c4f4e58a0..f3dccc4bb8 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset @@ -1,7 +1,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') asset.require("spice/base") -local kernels = asset.require('../jup310').Kernels +local kernel = asset.require('../kernels').jup310 @@ -14,7 +14,7 @@ local CallistoTrail = { Type = "SpiceTranslation", Target = "CALLISTO", Observer = "JUPITER BARYCENTER", - Kernels = kernels + Kernels = kernel }, Color = { 0.4, 0.3, 0.01 }, Period = 17.0, diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset index d37e1d2d3b..39f6578a3b 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset @@ -2,7 +2,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') asset.require("spice/base") asset.request('./trail') -local kernels = asset.require('../jup310').Kernels +local kernel = asset.require('../kernels').jup310 @@ -21,13 +21,13 @@ local Europa = { Type = "SpiceRotation", SourceFrame = "IAU_EUROPA", DestinationFrame = "GALACTIC", - Kernels = kernels + Kernels = kernel }, Translation = { Type = "SpiceTranslation", Target = "EUROPA", Observer = "JUPITER BARYCENTER", - Kernels = kernels + Kernels = kernel } }, Renderable = { diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset index 9c450158f7..63adced944 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset @@ -1,7 +1,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') asset.require("spice/base") -local kernels = asset.require('../jup310').Kernels +local kernel = asset.require('../kernels').jup310 @@ -14,7 +14,7 @@ local EuropaTrail = { Type = "SpiceTranslation", Target = "EUROPA", Observer = "JUPITER BARYCENTER", - Kernels = kernels + Kernels = kernel }, Color = { 0.5, 0.3, 0.3 }, Period = 85.0 / 24.0, diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset index 42efa8d7cb..7f61f4d7e1 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset @@ -2,7 +2,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') asset.require("spice/base") asset.request('./trail') -local kernels = asset.require('../jup310').Kernels +local kernel = asset.require('../kernels').jup310 @@ -21,13 +21,13 @@ local Ganymede = { Type = "SpiceRotation", SourceFrame = "IAU_GANYMEDE", DestinationFrame = "GALACTIC", - Kernels = kernels + Kernels = kernel }, Translation = { Type = "SpiceTranslation", Target = "GANYMEDE", Observer = "JUPITER BARYCENTER", - Kernels = kernels + Kernels = kernel } }, Renderable = { diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset index 580e1429f3..3dfb4913d9 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset @@ -1,7 +1,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') asset.require("spice/base") -local kernels = asset.require('../jup310').Kernels +local kernel = asset.require('../kernels').jup310 @@ -14,7 +14,7 @@ local GanymedeTrail = { Type = "SpiceTranslation", Target = "GANYMEDE", Observer = "JUPITER BARYCENTER", - Kernels = kernels + Kernels = kernel }, Color = { 0.4, 0.3, 0.3 }, Period = 172.0 / 24.0, diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset index 62d8309243..a5e7c63ecd 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset @@ -2,7 +2,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') asset.require("spice/base") asset.request('./trail') -local kernels = asset.require('../jup310').Kernels +local kernel = asset.require('../kernels').jup310 @@ -21,13 +21,13 @@ local Io = { Type = "SpiceRotation", SourceFrame = "IAU_IO", DestinationFrame = "GALACTIC", - Kernels = kernels + Kernels = kernel }, Translation = { Type = "SpiceTranslation", Target = "IO", Observer = "JUPITER BARYCENTER", - Kernels = kernels + Kernels = kernel }, }, Renderable = { diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset index a971aaf806..75fd312b91 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset @@ -1,7 +1,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') asset.require("spice/base") -local kernels = asset.require('../jup310').Kernels +local kernel = asset.require('../kernels').jup310 @@ -14,7 +14,7 @@ local IoTrail = { Type = "SpiceTranslation", Target = "IO", Observer = "JUPITER BARYCENTER", - Kernels = kernels + Kernels = kernel }, Color = { 0.4, 0.4, 0.2 }, Period = 42.0 / 24.0, diff --git a/data/assets/scene/solarsystem/planets/jupiter/jup310.asset b/data/assets/scene/solarsystem/planets/jupiter/jup310.asset deleted file mode 100644 index c15f6d9553..0000000000 --- a/data/assets/scene/solarsystem/planets/jupiter/jup310.asset +++ /dev/null @@ -1,8 +0,0 @@ -local Kernels = asset.syncedResource({ - Name = "Jupiter Spice Kernels (jup310)", - Type = "TorrentSynchronization", - Identifier = "jup310", - Magnet = "magnet:?xt=urn:btih:E8B7D7E136DE1C6249158B254BFC8B9ECE2A0539&dn=jup310.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce" -}) - -asset.export("Kernels", Kernels .. '/jup310.bsp') diff --git a/data/assets/scene/solarsystem/planets/jupiter/jup341.asset b/data/assets/scene/solarsystem/planets/jupiter/jup341.asset deleted file mode 100644 index c6a3a49291..0000000000 --- a/data/assets/scene/solarsystem/planets/jupiter/jup341.asset +++ /dev/null @@ -1,8 +0,0 @@ -local Kernels = asset.syncedResource({ - Name = "Jupiter Spice Kernels (jup341)", - Type = "TorrentSynchronization", - Identifier = "jup341", - Magnet = "magnet:?xt=urn:btih:276AC14CF861D45102DF8509F1D978C54A8C8D92&dn=jup341.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce" -}) - -asset.export("Kernels", Kernels .. '/jup341.bsp') diff --git a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset new file mode 100644 index 0000000000..cbceefcfc2 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset @@ -0,0 +1,9 @@ +local Kernels = asset.syncedResource({ + Name = "Jupiter Spice Kernels", + Type = "HttpSynchronization", + Identifier = "jupiter_kernels", + Version = 1 +}) + +asset.export("jup310", Kernels .. '/jup310.bsp') +asset.export("jup341", Kernels .. '/jup341.bsp') diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset index dad2a58ad3..10e0a917db 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset @@ -1,7 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('../transforms') -local kernels341 = asset.require('../jup341').Kernels +local kernel = asset.require('../kernels').jup341 @@ -26,7 +26,7 @@ local anankeGroup = { }, TrailColor = trailColor, OrbitPeriod = 588.36, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Thelxinoe", @@ -42,7 +42,7 @@ local anankeGroup = { }, TrailColor = trailColor, OrbitPeriod = 597.61, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Euanthe", @@ -58,7 +58,7 @@ local anankeGroup = { }, TrailColor = trailColor, OrbitPeriod = 598.09, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Iocaste", @@ -74,7 +74,7 @@ local anankeGroup = { }, TrailColor = trailColor, OrbitPeriod = 609.43, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "S2003J16", @@ -91,7 +91,7 @@ local anankeGroup = { }, TrailColor = trailColor, OrbitPeriod = 610.36, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Praxidike", @@ -107,7 +107,7 @@ local anankeGroup = { }, TrailColor = trailColor, OrbitPeriod = 613.90, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Harpalyke", @@ -123,7 +123,7 @@ local anankeGroup = { }, TrailColor = trailColor, OrbitPeriod = 624.54, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Mneme", @@ -139,7 +139,7 @@ local anankeGroup = { }, TrailColor = trailColor, OrbitPeriod = 627.48, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Hermippe", @@ -155,7 +155,7 @@ local anankeGroup = { }, TrailColor = trailColor, OrbitPeriod = 629.81, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Thyone", @@ -171,7 +171,7 @@ local anankeGroup = { }, TrailColor = trailColor, OrbitPeriod = 639.80, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Ananke", @@ -187,7 +187,7 @@ local anankeGroup = { }, TrailColor = trailColor, OrbitPeriod = 640.38, - Kernels = kernels341 + Kernels = kernel } } diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset index e84e241bf7..8de8a13d85 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset @@ -1,7 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('../transforms') -local kernels341 = asset.require('../jup341').Kernels +local kernel = asset.require('../kernels').jup341 @@ -25,7 +25,7 @@ local carmeGroup = { }, TrailColor = trailColor, OrbitPeriod = 672.75, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Aitne", @@ -41,7 +41,7 @@ local carmeGroup = { }, TrailColor = trailColor, OrbitPeriod = 679.64, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Kale", @@ -57,7 +57,7 @@ local carmeGroup = { }, TrailColor = trailColor, OrbitPeriod = 685.32, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Taygete", @@ -73,7 +73,7 @@ local carmeGroup = { }, TrailColor = trailColor, OrbitPeriod = 686.67, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Chaldene", @@ -89,7 +89,7 @@ local carmeGroup = { }, TrailColor = trailColor, OrbitPeriod = 699.33, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Erinome", @@ -105,7 +105,7 @@ local carmeGroup = { }, TrailColor = trailColor, OrbitPeriod = 711.96, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Kallichore", @@ -121,7 +121,7 @@ local carmeGroup = { }, TrailColor = trailColor, OrbitPeriod = 717.81, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Kalyke", @@ -137,7 +137,7 @@ local carmeGroup = { }, TrailColor = trailColor, OrbitPeriod = 721.02, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Pasithee", @@ -153,7 +153,7 @@ local carmeGroup = { }, TrailColor = trailColor, OrbitPeriod = 726.93, - Kernels = kernel341 + Kernels = kernel }, { Identifier = "S2010J1", @@ -170,7 +170,7 @@ local carmeGroup = { }, TrailColor = trailColor, OrbitPeriod = 722.83, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Eukelade", @@ -186,7 +186,7 @@ local carmeGroup = { }, TrailColor = trailColor, OrbitPeriod = 735.20, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Arche", @@ -202,7 +202,7 @@ local carmeGroup = { }, TrailColor = trailColor, OrbitPeriod = 746.19, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Isonoe", @@ -218,7 +218,7 @@ local carmeGroup = { }, TrailColor = trailColor, OrbitPeriod = 750.13, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Carme", @@ -234,7 +234,7 @@ local carmeGroup = { }, TrailColor = trailColor, OrbitPeriod = 763.95, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "S2003J5", @@ -251,7 +251,7 @@ local carmeGroup = { }, TrailColor = trailColor, OrbitPeriod = 758.34, - Kernels = kernels341 + Kernels = kernel }, } diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset index 0125e88f37..157b5dbbfd 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset @@ -1,7 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('../transforms') -local kernels341 = asset.require('../jup341').Kernels +local kernel = asset.require('../kernels').jup341 @@ -25,7 +25,7 @@ local carpoGroup = { }, TrailColor = trailColor, OrbitPeriod = 458.62, - Kernels = kernels341 + Kernels = kernel } } diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset index 11091923d4..be1c62726f 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset @@ -1,7 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('../transforms') -local kernels341 = asset.require('../jup341').Kernels +local kernel = asset.require('../kernels').jup341 @@ -25,7 +25,7 @@ local himaliaGroup = { }, TrailColor = trailColor, OrbitPeriod = 240.82, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Himalia", @@ -41,7 +41,7 @@ local himaliaGroup = { }, TrailColor = trailColor, OrbitPeriod = 250.23, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Lysithea", @@ -57,7 +57,7 @@ local himaliaGroup = { }, TrailColor = trailColor, OrbitPeriod = 259.89, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Elara", @@ -73,7 +73,7 @@ local himaliaGroup = { }, TrailColor = trailColor, OrbitPeriod = 257.62, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Dia", @@ -90,7 +90,7 @@ local himaliaGroup = { }, TrailColor = trailColor, OrbitPeriod = 287.93, - Kernels = kernels341 + Kernels = kernel } } diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset index fbc0a0713e..2cf3045233 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset @@ -1,7 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('../transforms') -local kernels341 = asset.require('../jup341').Kernels +local kernel = asset.require('../kernels').jup341 @@ -25,7 +25,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.117912037, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Adrastea", @@ -41,7 +41,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.2982638889, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Amalthea", @@ -57,7 +57,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.4981828704, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Thebe", @@ -73,7 +73,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.6745023148, - Kernels = kernels341 + Kernels = kernel } } diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset index b03ce0909e..d7951c5185 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset @@ -1,7 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('../transforms') -local kernels341 = asset.require('../jup341').Kernels +local kernel = asset.require('../kernels').jup341 @@ -26,7 +26,7 @@ local otherGroups = { }, TrailColor = trailColor, OrbitPeriod = 482.69, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "S/2003J3", @@ -43,7 +43,7 @@ local otherGroups = { }, TrailColor = trailColor, OrbitPeriod = 561.52, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "S2011J1", @@ -60,7 +60,7 @@ local otherGroups = { }, TrailColor = trailColor, OrbitPeriod = 582.22, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "S2003J19", @@ -77,7 +77,7 @@ local otherGroups = { }, TrailColor = trailColor, OrbitPeriod = 699.12, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "S2003J10", @@ -94,7 +94,7 @@ local otherGroups = { }, TrailColor = trailColor, OrbitPeriod = 700.13, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "S2003J23", @@ -111,7 +111,7 @@ local otherGroups = { }, TrailColor = trailColor, OrbitPeriod = 700.54, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "S2003J9", @@ -128,7 +128,7 @@ local otherGroups = { }, TrailColor = trailColor, OrbitPeriod = 752.84, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "S2003J2", @@ -145,7 +145,7 @@ local otherGroups = { }, TrailColor = trailColor, OrbitPeriod = 981.55, - Kernels = kernels341 + Kernels = kernel } } diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset index ed922bbd00..b577a3e5f1 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset @@ -1,7 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('../transforms') -local kernels341 = asset.require('../jup341').Kernels +local kernel = asset.require('../kernels').jup341 @@ -25,7 +25,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 538.78, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "S2003J18", @@ -42,7 +42,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 587.38, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Helike", @@ -58,7 +58,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 601.40, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Orthosie", @@ -74,7 +74,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 602.62, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "S2016J1", @@ -91,7 +91,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 603.83, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "S2003J15", @@ -108,7 +108,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 699.68, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Aoede", @@ -124,7 +124,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 714.66, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Callirrhoe", @@ -140,7 +140,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 727.11, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Eurydome", @@ -156,7 +156,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 723.36, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Kore", @@ -172,7 +172,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 776.02, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Cyllene", @@ -188,7 +188,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 731.10, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "S2011J2", @@ -205,7 +205,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 731.32, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "S2017J1", @@ -222,7 +222,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 734.15, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "S2003J4", @@ -239,7 +239,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 739.29, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Pasiphae", @@ -255,7 +255,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 739.80, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Hegemone", @@ -271,7 +271,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 745.50, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Sinope", @@ -287,7 +287,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 739.33, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Sponde", @@ -303,7 +303,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 771.60, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Autonoe", @@ -319,7 +319,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 772.17, - Kernels = kernels341 + Kernels = kernel }, { Identifier = "Megaclite", @@ -336,7 +336,7 @@ local pasiphaeGroup = { }, TrailColor = trailColor, OrbitPeriod = 792.44, - Kernels = kernels341 + Kernels = kernel } } diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset index d5d43ccaa3..f7a5899dc9 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset @@ -1,7 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('../transforms') -local kernels341 = asset.require('../jup341').Kernels +local kernel = asset.require('../kernels').jup341 @@ -25,7 +25,7 @@ local themistoGroup = { }, TrailColor = trailColor, OrbitPeriod = 129.87, - Kernels = kernels341 + Kernels = kernel } } diff --git a/data/assets/scene/solarsystem/planets/mars/mar097.asset b/data/assets/scene/solarsystem/planets/mars/mar097.asset index 55c9a3908e..42513084d3 100644 --- a/data/assets/scene/solarsystem/planets/mars/mar097.asset +++ b/data/assets/scene/solarsystem/planets/mars/mar097.asset @@ -1,8 +1,8 @@ local Kernels = asset.syncedResource({ Name = "Mars Spice Kernels", - Type = "TorrentSynchronization", - Identifier = "mar097", - Magnet = "magnet:?xt=urn:btih:308F326B9AF864294D73042FBBED33B17291E27E&dn=mar097.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce" + Type = "HttpSynchronization", + Identifier = "mars_kernels", + Version = 1 }) asset.export("Kernels", Kernels .. '/mar097.bsp') diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset index 73c0488c87..27a273c308 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars.asset @@ -31,7 +31,7 @@ local color_layers = { }, { Identifier = "MOC_WA_Color_LiU", - Name = "MOC WA Color [LiU]", + Name = "MOC WA Color [Sweden]", FilePath = mapServiceConfigs .. "/LiU/Color.wms", Fallback = { Name = "Mars Texture", diff --git a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset index f767bc9cbc..f81bb85487 100644 --- a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset @@ -1,9 +1,10 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('./transforms') -local kernels081 = asset.require('./nep081').Kernels -local kernels087 = asset.require('./nep087').Kernels -local kernels088 = asset.require('./nep088').Kernels +local kernels = asset.require('./kernels') +local kernel081 = kernels.nep081 +local kernel087 = kernels.nep087 +local kernel088 = kernels.nep088 @@ -27,7 +28,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.294, - Kernels = kernels088 + Kernels = kernel088 }, { Identifier = "Thalassa", @@ -43,7 +44,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.311, - Kernels = kernels088 + Kernels = kernel088 }, { Identifier = "Despina", @@ -59,7 +60,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.335, - Kernels = kernels088 + Kernels = kernel088 }, { Identifier = "Galatea", @@ -75,7 +76,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.429, - Kernels = kernels088 + Kernels = kernel088 }, { Identifier = "Larissa", @@ -91,7 +92,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.555, - Kernels = kernels088 + Kernels = kernel088 }, { Identifier = "S2004N1", @@ -108,7 +109,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.936, - Kernels = kernels088 + Kernels = kernel088 }, { Identifier = "Proteus", @@ -124,7 +125,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 1.122, - Kernels = kernels081 + Kernels = kernel081 } } diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset index 41b2868905..4b726b03d6 100644 --- a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset @@ -1,9 +1,10 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('./transforms') -local kernels081 = asset.require('./nep081').Kernels -local kernels086 = asset.require('./nep086').Kernels -local kernels088 = asset.require('./nep088').Kernels +local kernels = asset.require('./kernels') +local kernel081 = kernels.nep081 +local kernel087 = kernels.nep087 +local kernel088 = kernels.nep088 @@ -27,7 +28,7 @@ local irregularProgradeMoons = { }, TrailColor = trailColor, OrbitPeriod = 1879.08, - Kernels = kernels086 + Kernels = kernel086 }, { Identifier = "Psamathe", @@ -43,7 +44,7 @@ local irregularProgradeMoons = { }, TrailColor = trailColor, OrbitPeriod = 9074.3, - Kernels = kernels086 + Kernels = kernel086 }, { Identifier = "Neso", @@ -59,7 +60,7 @@ local irregularProgradeMoons = { }, TrailColor = trailColor, OrbitPeriod = 9740.73, - Kernels = kernels086 + Kernels = kernel086 } } diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset index d07e7e26c3..340af608cd 100644 --- a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset @@ -1,9 +1,9 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('./transforms') -local kernels081 = asset.require('./nep081').Kernels -local kernels086 = asset.require('./nep086').Kernels -local kernels088 = asset.require('./nep088').Kernels +local kernels = asset.require('./kernels') +local kernel081 = kernels.nep081 +local kernel086 = kernels.nep086 @@ -27,7 +27,7 @@ local irregularRetrogradeMoons = { }, TrailColor = trailColor, OrbitPeriod = 360.13, - Kernels = kernels081 + Kernels = kernel081 }, { Identifier = "Sao", @@ -43,7 +43,7 @@ local irregularRetrogradeMoons = { }, TrailColor = trailColor, OrbitPeriod = 2912.72, - Kernels = kernels086 + Kernels = kernel086 }, { Identifier = "Laomedeia", @@ -59,7 +59,7 @@ local irregularRetrogradeMoons = { }, TrailColor = trailColor, OrbitPeriod = 3171.33, - Kernels = kernels086 + Kernels = kernel086 } } diff --git a/data/assets/scene/solarsystem/planets/neptune/kernels.asset b/data/assets/scene/solarsystem/planets/neptune/kernels.asset new file mode 100644 index 0000000000..2637699924 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/neptune/kernels.asset @@ -0,0 +1,11 @@ +local Kernels = asset.syncedResource({ + Name = "Neptune Spice Kernels", + Type = "HttpSynchronization", + Identifier = "neptune_kernels", + Version = 1 +}) + +asset.export("nep081", Kernels .. '/nep081.bsp') +asset.export("nep086", Kernels .. '/nep086.bsp') +asset.export("nep087", Kernels .. '/nep087.bsp') +asset.export("nep088", Kernels .. '/nep088.bsp') diff --git a/data/assets/scene/solarsystem/planets/neptune/nep081.asset b/data/assets/scene/solarsystem/planets/neptune/nep081.asset deleted file mode 100644 index e9c49cecfe..0000000000 --- a/data/assets/scene/solarsystem/planets/neptune/nep081.asset +++ /dev/null @@ -1,8 +0,0 @@ -local Kernels = asset.syncedResource({ - Name = "Neptune Spice Kernels (nep081)", - Type = "TorrentSynchronization", - Identifier = "nep081", - Magnet = "magnet:?xt=urn:btih:A6079CF8D4BF3B6BB38F4F9F633CB7724FF91693&dn=nep081.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce" -}) - -asset.export("Kernels", Kernels .. '/nep081.bsp') diff --git a/data/assets/scene/solarsystem/planets/neptune/nep086.asset b/data/assets/scene/solarsystem/planets/neptune/nep086.asset deleted file mode 100644 index 70894eaeaf..0000000000 --- a/data/assets/scene/solarsystem/planets/neptune/nep086.asset +++ /dev/null @@ -1,8 +0,0 @@ -local Kernels = asset.syncedResource({ - Name = "Neptune Spice Kernels (nep086)", - Type = "TorrentSynchronization", - Identifier = "nep086", - Magnet = "magnet:?xt=urn:btih:A71F50987F90FE3BE951D05241341B7505383D8F&dn=nep086.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce" -}) - -asset.export("Kernels", Kernels .. '/nep086.bsp') diff --git a/data/assets/scene/solarsystem/planets/neptune/nep087.asset b/data/assets/scene/solarsystem/planets/neptune/nep087.asset deleted file mode 100644 index ca79b1757a..0000000000 --- a/data/assets/scene/solarsystem/planets/neptune/nep087.asset +++ /dev/null @@ -1,8 +0,0 @@ -local Kernels = asset.syncedResource({ - Name = "Neptune Spice Kernels (nep087)", - Type = "TorrentSynchronization", - Identifier = "nep087", - Magnet = "magnet:?xt=urn:btih:3F2B1C7A499D320ADD7E67DFF28C3FF3562AF935&dn=nep087.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce" -}) - -asset.export("Kernels", Kernels .. '/nep087.bsp') diff --git a/data/assets/scene/solarsystem/planets/neptune/nep088.asset b/data/assets/scene/solarsystem/planets/neptune/nep088.asset deleted file mode 100644 index 188db17e7e..0000000000 --- a/data/assets/scene/solarsystem/planets/neptune/nep088.asset +++ /dev/null @@ -1,8 +0,0 @@ -local Kernels = asset.syncedResource({ - Name = "Neptune Spice Kernels (nep088)", - Type = "TorrentSynchronization", - Identifier = "nep088", - Magnet = "magnet:?xt=urn:btih:1693A31C360BCABAEDC4B72C910E39C07AF3CA5F&dn=nep088.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce" -}) - -asset.export("Kernels", Kernels .. '/nep088.bsp') diff --git a/data/assets/scene/solarsystem/planets/neptune/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton.asset index 92a57ab4cc..55bf22fbb5 100644 --- a/data/assets/scene/solarsystem/planets/neptune/triton.asset +++ b/data/assets/scene/solarsystem/planets/neptune/triton.asset @@ -1,7 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('./transforms') -local kernels081 = asset.require('./nep081').Kernels +local kernel = asset.require('./kernels').nep081 @@ -19,7 +19,7 @@ local Triton = { }, TrailColor = { 0.2, 0.5, 0.75 }, OrbitPeriod = 5.877, - Kernels = kernels081 + Kernels = kernel } diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset index dc185156e9..e5ed17e5f6 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset @@ -1,6 +1,6 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') -local kernels375 = asset.require('../sat375').Kernels +local kernel = asset.require('../kernels').sat375 asset.request('./trail') @@ -20,7 +20,7 @@ local Dione = { Type = "SpiceTranslation", Target = "DIONE", Observer = "SATURN BARYCENTER", - Kernels = kernels375 + Kernels = kernel }, Rotation = { Type = "SpiceRotation", diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset index 95fe6b1953..e68eea7f46 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset @@ -1,6 +1,6 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') -local kernels375 = asset.require('../sat375').Kernels +local kernel = asset.require('../kernels').sat375 @@ -13,7 +13,7 @@ local DioneTrail = { Type = "SpiceTranslation", Target = "DIONE", Observer = "SATURN BARYCENTER", - Kernels = kernels375 + Kernels = kernel }, Color = { 0.5, 0.3, 0.3 }, Period = 66.0 / 24.0, diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset index 1e443df8e4..0d5535ca8e 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset @@ -1,6 +1,6 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') -local kernels375 = asset.require('../sat375').Kernels +local kernel = asset.require('../kernels').sat375 asset.request('./trail') @@ -20,7 +20,7 @@ local Enceladus = { Type = "SpiceTranslation", Target = "ENCELADUS", Observer = "SATURN BARYCENTER", - Kernels = kernels375 + Kernels = kernel }, Rotation = { Type = "SpiceRotation", diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset index 466281b1f4..8cb64aee9e 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset @@ -1,6 +1,6 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') -local kernels375 = asset.require('../sat375').Kernels +local kernel = asset.require('../kernels').sat375 @@ -13,7 +13,7 @@ local EnceladusTrail = { Type = "SpiceTranslation", Target = "ENCELADUS", Observer = "SATURN BARYCENTER", - Kernels = kernels375 + Kernels = kernel }, Color = { 0.5, 0.3, 0.3 }, Period = 33.0 / 24.0, diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset index cfbdea7f7e..594338d145 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset @@ -1,6 +1,6 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') -local kernels375 = asset.require('../sat375').Kernels +local kernel = asset.require('../kernels').sat375 asset.request('./trail') @@ -20,7 +20,7 @@ local Hyperion = { Type = "SpiceTranslation", Target = "HYPERION", Observer = "SATURN BARYCENTER", - Kernels = kernels375 + Kernels = kernel }, Rotation = { Type = "SpiceRotation", diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset index 9b52198e2c..7f34aed667 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset @@ -1,6 +1,6 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') -local kernels375 = asset.require('../sat375').Kernels +local kernel = asset.require('../kernels').sat375 @@ -13,7 +13,7 @@ local HyperionTrail = { Type = "SpiceTranslation", Target = "HYPERION", Observer = "SATURN BARYCENTER", - Kernels = kernels375 + Kernels = kernel }, Color = { 0.5, 0.3, 0.3 }, Period = 21.276, diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset index be23afba40..f57014adce 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset @@ -1,6 +1,6 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') -local kernels375 = asset.require('../sat375').Kernels +local kernel = asset.require('../kernels').sat375 asset.request('./trail') @@ -20,7 +20,7 @@ local Iapetus = { Type = "SpiceTranslation", Target = "IAPETUS", Observer = "SATURN BARYCENTER", - Kernels = kernels375 + Kernels = kernel }, Rotation = { Type = "SpiceRotation", diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset index fdc7a468a4..12c6df8975 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset @@ -1,6 +1,6 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') -local kernels375 = asset.require('../sat375').Kernels +local kernel = asset.require('../kernels').sat375 @@ -13,7 +13,7 @@ local IapetusTrail = { Type = "SpiceTranslation", Target = "IAPETUS", Observer = "SATURN BARYCENTER", - Kernels = kernels375 + Kernels = kernel }, Color = { 0.5, 0.3, 0.3 }, Period = 79.0, diff --git a/data/assets/scene/solarsystem/planets/saturn/kernels.asset b/data/assets/scene/solarsystem/planets/saturn/kernels.asset new file mode 100644 index 0000000000..c641fa4b6c --- /dev/null +++ b/data/assets/scene/solarsystem/planets/saturn/kernels.asset @@ -0,0 +1,11 @@ +local Kernels = asset.syncedResource({ + Name = "Saturn Spice Kernels", + Type = "HttpSynchronization", + Identifier = "saturn_kernels", + Version = 1 +}) + +asset.export("sat319", Kernels .. '/sat319.bsp') +asset.export("sat368", Kernels .. '/sat368.bsp') +asset.export("sat375", Kernels .. '/sat375.bsp') +asset.export("sat393", Kernels .. '/sat393.bsp') diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset index b15f141cd7..8e2368e228 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset @@ -1,6 +1,6 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') -local kernels375 = asset.require('../sat375').Kernels +local kernel = asset.require('../kernels').sat375 asset.request('./trail') @@ -20,7 +20,7 @@ local Mimas = { Type = "SpiceTranslation", Target = "MIMAS", Observer = "SATURN BARYCENTER", - Kernels = kernels375 + Kernels = kernel }, Rotation = { Type = "SpiceRotation", diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset index c1ad48a0e1..996d15614c 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset @@ -1,6 +1,6 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') -local kernels375 = asset.require('../sat375').Kernels +local kernel = asset.require('../kernels').sat375 @@ -13,7 +13,7 @@ local MimasTrail = { Type = "SpiceTranslation", Target = "MIMAS", Observer = "SATURN BARYCENTER", - Kernels = kernels + Kernels = kernel }, Color = { 0.5, 0.3, 0.3 }, Period = 23.0 / 24.0, diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset index 129814643f..a92d78ef07 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset @@ -1,7 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('../transforms') -local kernels368 = asset.require('../sat368').Kernels +local kernel = asset.require('../kernels').sat368 @@ -25,7 +25,7 @@ local gallicGroup = { }, TrailColor = trailColor, OrbitPeriod = 774.58, - Kernels = kernels368 + Kernels = kernel }, { Identifier = "Bebhionn", @@ -41,7 +41,7 @@ local gallicGroup = { }, TrailColor = trailColor, OrbitPeriod = 838.77, - Kernels = kernels368 + Kernels = kernel }, { Identifier = "Erriapus", @@ -57,7 +57,7 @@ local gallicGroup = { }, TrailColor = trailColor, OrbitPeriod = 844.89, - Kernels = kernels368 + Kernels = kernel }, { Identifier = "Tarvos", @@ -73,7 +73,7 @@ local gallicGroup = { }, TrailColor = trailColor, OrbitPeriod = 944.23, - Kernels = kernels368 + Kernels = kernel }, } diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset index e19528647f..273a95d9f7 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset @@ -1,7 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('../transforms') -local kernels368 = asset.require('../sat368').Kernels +local kernel = asset.require('../kernels').sat368 @@ -25,7 +25,7 @@ local inuitGroup = { }, TrailColor = trailColor, OrbitPeriod = 448.16, - Kernels = kernels368 + Kernels = kernel }, { Identifier = "Ijiraq", @@ -41,7 +41,7 @@ local inuitGroup = { }, TrailColor = trailColor, OrbitPeriod = 451.77, - Kernels = kernels368 + Kernels = kernel }, { Identifier = "Paaliaq", @@ -57,7 +57,7 @@ local inuitGroup = { }, TrailColor = trailColor, OrbitPeriod = 692.98, - Kernels = kernels368 + Kernels = kernel }, { Identifier = "Siarnaq", @@ -73,7 +73,7 @@ local inuitGroup = { }, TrailColor = trailColor, OrbitPeriod = 884.88, - Kernels = kernels368 + Kernels = kernel }, { Identifier = "Tarqeq", @@ -89,7 +89,7 @@ local inuitGroup = { }, TrailColor = trailColor, OrbitPeriod = 894.86, - Kernels = kernels368 + Kernels = kernel }, } diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset index a81ff133c3..8776452fd1 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset @@ -1,8 +1,9 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('../transforms') -local kernels368 = asset.require('../sat368').Kernels -local kernels375 = asset.require('../sat375').Kernels +local kernels = asset.require('../kernels') +local kernel368 = kernels.sat368 +local kernel375 = kernels.sat375 @@ -26,7 +27,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 545.09, - Kernels = kernels375 + Kernels = kernel375 }, { Identifier = "Skathi", @@ -42,7 +43,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 732.52, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "S2007S2", @@ -59,7 +60,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 792.96, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "Skoll", @@ -75,7 +76,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 862.37, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "S2004S13", @@ -92,7 +93,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 905.85, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "Greip", @@ -108,7 +109,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 906.56, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "Hyrrokkin", @@ -124,7 +125,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 914.29, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "Jarnsaxa", @@ -140,7 +141,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 943.78, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "Mundilfari", @@ -156,7 +157,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 956.70, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "S2006S1", @@ -173,7 +174,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 972.41, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "S2004S17", @@ -190,7 +191,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 985.45, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "Bergelmir", @@ -206,7 +207,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 985.83, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "Narvi", @@ -222,7 +223,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 1008.45, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "Suttungr", @@ -238,7 +239,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 1022.82, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "Hati", @@ -254,7 +255,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 1033.05, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "S2004S12", @@ -271,7 +272,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 1048.54, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "Farbauti", @@ -287,7 +288,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 1054.78, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "Thrymr", @@ -303,7 +304,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 1078.09, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "Aegir", @@ -319,7 +320,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 1094.46, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "S2007S3", @@ -336,7 +337,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 1100, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "Bestla", @@ -352,7 +353,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 1101.45, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "S2004S7", @@ -369,7 +370,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 1101.99, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "S2006S3", @@ -386,7 +387,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 1142.37, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "FENRIR", @@ -402,7 +403,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 1212.53, - Kernels = kernels368 + Kernels = kernel368 }, -- Not yet in the Spice kernels -- { @@ -435,7 +436,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 1245.06, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "Ymir", @@ -451,7 +452,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 1254.15, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "Loge", @@ -467,7 +468,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 1300.95, - Kernels = kernels368 + Kernels = kernel368 }, { Identifier = "Fornjot", @@ -483,7 +484,7 @@ local norseGroup = { }, TrailColor = trailColor, OrbitPeriod = 1432.16, - Kernels = kernels368 + Kernels = kernel368 }, } diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset index 0203893816..765ae86ad5 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset @@ -1,8 +1,9 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('../transforms') -local kernels393 = asset.require('../sat393').Kernels -local kernels375 = asset.require('../sat375').Kernels +local kernels = asset.require('../kernels') +local kernel375 = kernels.sat375 +local kernel393 = kernels.sat393 @@ -26,7 +27,7 @@ local otherGroup = { }, TrailColor = trailColor, OrbitPeriod = 0.60169, - Kernels = kernels393 + Kernels = kernel393 }, { Identifier = "Prometheus", @@ -42,7 +43,7 @@ local otherGroup = { }, TrailColor = trailColor, OrbitPeriod = 0.61299, - Kernels = kernels393 + Kernels = kernel393 }, { Identifier = "Pandora", @@ -58,7 +59,7 @@ local otherGroup = { }, TrailColor = trailColor, OrbitPeriod = 0.62850, - Kernels = kernels393 + Kernels = kernel393 }, { Identifier = "Epimetheus", @@ -74,7 +75,7 @@ local otherGroup = { }, TrailColor = trailColor, OrbitPeriod = 0.69433, - Kernels = kernels393 + Kernels = kernel393 }, { Identifier = "Janus", @@ -90,7 +91,7 @@ local otherGroup = { }, TrailColor = trailColor, OrbitPeriod = 0.69466, - Kernels = kernels393 + Kernels = kernel393 }, { Identifier = "Aegaeon", @@ -106,7 +107,7 @@ local otherGroup = { }, TrailColor = trailColor, OrbitPeriod = 0.80812, - Kernels = kernels393 + Kernels = kernel393 }, { Identifier = "Methone", @@ -122,7 +123,7 @@ local otherGroup = { }, TrailColor = trailColor, OrbitPeriod = 1.00957, - Kernels = kernels393 + Kernels = kernel393 }, { Identifier = "Anthe", @@ -138,7 +139,7 @@ local otherGroup = { }, TrailColor = trailColor, OrbitPeriod = 1.05089, - Kernels = kernels393 + Kernels = kernel393 }, { Identifier = "Pallene", @@ -154,7 +155,7 @@ local otherGroup = { }, TrailColor = trailColor, OrbitPeriod = 1.370218, - Kernels = kernels393 + Kernels = kernel393 }, { Identifier = "Telesto", @@ -170,7 +171,7 @@ local otherGroup = { }, TrailColor = trailColor, OrbitPeriod = 1.887802, - Kernels = kernels375 + Kernels = kernel375 }, { Identifier = "Calypso", @@ -186,7 +187,7 @@ local otherGroup = { }, TrailColor = trailColor, OrbitPeriod = 1.887802, - Kernels = kernels375 + Kernels = kernel375 }, { Identifier = "Helene", @@ -202,7 +203,7 @@ local otherGroup = { }, TrailColor = trailColor, OrbitPeriod = 2.736915, - Kernels = kernels375 + Kernels = kernel375 }, { Identifier = "Polydeuces", @@ -218,8 +219,8 @@ local otherGroup = { }, TrailColor = trailColor, OrbitPeriod = 2.736915, - Kernels = kernels393 - }, + Kernels = kernel393 + } } diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset index ef17b8ae46..df6150a831 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset @@ -1,6 +1,6 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') -local kernels375 = asset.require('../sat375').Kernels +local kernel = asset.require('../kernels').sat375 asset.request('./trail') @@ -20,7 +20,7 @@ local Rhea = { Type = "SpiceTranslation", Target = "RHEA", Observer = "SATURN BARYCENTER", - Kernels = kernels375 + Kernels = kernel }, Rotation = { Type = "SpiceRotation", diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset index d673879143..70b116dcd2 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset @@ -1,6 +1,6 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') -local kernels375 = asset.require('../sat375').Kernels +local kernel = asset.require('../kernels').sat375 @@ -13,7 +13,7 @@ local RheaTrail = { Type = "SpiceTranslation", Target = "RHEA", Observer = "SATURN BARYCENTER", - Kernels = kernels + Kernels = kernel }, Color = { 0.5, 0.3, 0.3 }, Period = 108.0 / 24.0, diff --git a/data/assets/scene/solarsystem/planets/saturn/sat319.asset b/data/assets/scene/solarsystem/planets/saturn/sat319.asset deleted file mode 100644 index e8c3aea782..0000000000 --- a/data/assets/scene/solarsystem/planets/saturn/sat319.asset +++ /dev/null @@ -1,8 +0,0 @@ -local Kernels = asset.syncedResource({ - Name = "Saturn Spice Kernels (sat319)", - Type = "TorrentSynchronization", - Identifier = "sat319", - Magnet = "magnet:?xt=urn:btih:826CC504021477388F4E981F9CE5F8370E6720FB&dn=sat319.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce" -}) - -asset.export("Kernels", Kernels .. '/sat319.bsp') diff --git a/data/assets/scene/solarsystem/planets/saturn/sat368.asset b/data/assets/scene/solarsystem/planets/saturn/sat368.asset deleted file mode 100644 index 4c4062c20d..0000000000 --- a/data/assets/scene/solarsystem/planets/saturn/sat368.asset +++ /dev/null @@ -1,8 +0,0 @@ -local Kernels = asset.syncedResource({ - Name = "Saturn Spice Kernels (sat368)", - Type = "TorrentSynchronization", - Identifier = "sat368", - Magnet = "magnet:?xt=urn:btih:D4DAFF94F8D2973D5561F082B4DF7F96B1949768&dn=sat368.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce" -}) - -asset.export("Kernels", Kernels .. '/sat368.bsp') diff --git a/data/assets/scene/solarsystem/planets/saturn/sat375.asset b/data/assets/scene/solarsystem/planets/saturn/sat375.asset deleted file mode 100644 index a55f2ed460..0000000000 --- a/data/assets/scene/solarsystem/planets/saturn/sat375.asset +++ /dev/null @@ -1,8 +0,0 @@ -local Kernels = asset.syncedResource({ - Name = "Saturn Spice Kernels (sat375)", - Type = "TorrentSynchronization", - Identifier = "sat375", - Magnet = "magnet:?xt=urn:btih:79083d2069df389e65d7688bb326c7aaf1953845&dn=sat375.bsp" -}) - -asset.export("Kernels", Kernels .. '/sat375.bsp') diff --git a/data/assets/scene/solarsystem/planets/saturn/sat393.asset b/data/assets/scene/solarsystem/planets/saturn/sat393.asset deleted file mode 100644 index 0ca49355a0..0000000000 --- a/data/assets/scene/solarsystem/planets/saturn/sat393.asset +++ /dev/null @@ -1,8 +0,0 @@ -local Kernels = asset.syncedResource({ - Name = "Saturn Spice Kernels (sat393)", - Type = "TorrentSynchronization", - Identifier = "sat393", - Magnet = "magnet:?xt=urn:btih:9336184E8C6E09D28D6037470B30471BBA65B2A5&dn=sat393.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce" -}) - -asset.export("Kernels", Kernels .. '/sat393.bsp') diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset index dbcc1147ca..8f899ff8f8 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset @@ -1,6 +1,6 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') -local kernels375 = asset.require('../sat375').Kernels +local kernel = asset.require('../kernels').sat375 asset.request('./trail') @@ -20,7 +20,7 @@ local Tethys = { Type = "SpiceTranslation", Target = "TETHYS", Observer = "SATURN BARYCENTER", - Kernels = kernels375 + Kernels = kernel }, Rotation = { Type = "SpiceRotation", diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset index 13a2cfce44..6bf002a440 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset @@ -1,6 +1,6 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') -local kernels375 = asset.require('../sat375').Kernels +local kernel = asset.require('../kernels').sat375 @@ -13,7 +13,7 @@ local TethysTrail = { Type = "SpiceTranslation", Target = "TETHYS", Observer = "SATURN BARYCENTER", - Kernels = kernels + Kernels = kernel }, Color = { 0.5, 0.3, 0.3 }, Period = 45.0 / 24.0, diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset index 0e90ce2f8c..9d871b1756 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset @@ -1,6 +1,6 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') -local kernels375 = asset.require('../sat375').Kernels +local kernel = asset.require('../kernels').sat375 asset.request('./trail') @@ -20,7 +20,7 @@ local Titan = { Type = "SpiceTranslation", Target = "TITAN", Observer = "SATURN BARYCENTER", - Kernels = kernels375 + Kernels = kernel }, Rotation = { Type = "SpiceRotation", diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset index 715c45ff74..ff45283ff3 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset @@ -1,6 +1,6 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') -local kernels375 = asset.require('../sat375').Kernels +local kernel = asset.require('../kernels').sat375 @@ -13,7 +13,7 @@ local TitanTrail = { Type = "SpiceTranslation", Target = "TITAN", Observer = "SATURN BARYCENTER", - Kernels = kernels + Kernels = kernel }, Color = { 0.5, 0.3, 0.3 }, Period = 16.0, diff --git a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset index 6b27fe5cd3..b14c7e01e8 100644 --- a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset @@ -1,7 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('./transforms') -local kernels091 = asset.require('./ura091').Kernels +local kernel = asset.require('./kernels').ura091 @@ -25,7 +25,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.335034, - Kernels = kernels091 + Kernels = kernel }, { Identifier = "Ophelia", @@ -41,7 +41,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.376400, - Kernels = kernels091 + Kernels = kernel }, { Identifier = "Bianca", @@ -57,7 +57,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.434579, - Kernels = kernels091 + Kernels = kernel }, { Identifier = "Cressida", @@ -73,7 +73,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.463570, - Kernels = kernels091 + Kernels = kernel }, { Identifier = "Desdemona", @@ -89,7 +89,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.473650, - Kernels = kernels091 + Kernels = kernel }, { Identifier = "Juliet", @@ -105,7 +105,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.493065, - Kernels = kernels091 + Kernels = kernel }, { Identifier = "Portia", @@ -121,7 +121,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.513196, - Kernels = kernels091 + Kernels = kernel }, { Identifier = "Rosalind", @@ -137,7 +137,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.558460, - Kernels = kernels091 + Kernels = kernel }, { Identifier = "Cupid", @@ -153,7 +153,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.618, - Kernels = kernels091 + Kernels = kernel }, { Identifier = "Belinda", @@ -169,7 +169,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.623527, - Kernels = kernels091 + Kernels = kernel }, { Identifier = "Perdita", @@ -185,7 +185,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.638, - Kernels = kernels091 + Kernels = kernel }, { Identifier = "Puck", @@ -201,7 +201,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.761833, - Kernels = kernels091 + Kernels = kernel }, { Identifier = "Mab", @@ -217,7 +217,7 @@ local innerMoons = { }, TrailColor = trailColor, OrbitPeriod = 0.923, - Kernels = kernels091 + Kernels = kernel } } diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset index d866dfbd7f..f72ebd7094 100644 --- a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset @@ -1,7 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('./transforms') -local kernels112 = asset.require('./ura112').Kernels +local kernel = asset.require('./kernels').ura112 @@ -25,7 +25,7 @@ local irregularMoons = { }, TrailColor = trailColor, OrbitPeriod = 1694.8, - Kernels = kernels112 + Kernels = kernel } } diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset index 9e1efdd062..40df42f66a 100644 --- a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset @@ -1,7 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('./transforms') -local kernels112 = asset.require('./ura112').Kernels +local kernel = asset.require('./kernels').ura112 @@ -25,7 +25,7 @@ local irregularMoons = { }, TrailColor = trailColor, OrbitPeriod = 266.56, - Kernels = kernels112 + Kernels = kernel }, { Identifier = "Caliban", @@ -41,7 +41,7 @@ local irregularMoons = { }, TrailColor = trailColor, OrbitPeriod = 579.50, - Kernels = kernels112 + Kernels = kernel }, { Identifier = "Stephano", @@ -57,7 +57,7 @@ local irregularMoons = { }, TrailColor = trailColor, OrbitPeriod = 676.50, - Kernels = kernels112 + Kernels = kernel }, { Identifier = "Trinculo", @@ -73,7 +73,7 @@ local irregularMoons = { }, TrailColor = trailColor, OrbitPeriod = 758.10, - Kernels = kernels112 + Kernels = kernel }, { Identifier = "Sycorax", @@ -89,7 +89,7 @@ local irregularMoons = { }, TrailColor = trailColor, OrbitPeriod = 1283.4, - Kernels = kernels112 + Kernels = kernel }, { Identifier = "Prospero", @@ -105,7 +105,7 @@ local irregularMoons = { }, TrailColor = trailColor, OrbitPeriod = 1992.8, - Kernels = kernels112 + Kernels = kernel }, { Identifier = "Setebos", @@ -121,7 +121,7 @@ local irregularMoons = { }, TrailColor = trailColor, OrbitPeriod = 2202.3, - Kernels = kernels112 + Kernels = kernel }, { Identifier = "Ferdinand", @@ -137,7 +137,7 @@ local irregularMoons = { }, TrailColor = trailColor, OrbitPeriod = 2823.4, - Kernels = kernels112 + Kernels = kernel } } diff --git a/data/assets/scene/solarsystem/planets/uranus/kernels.asset b/data/assets/scene/solarsystem/planets/uranus/kernels.asset new file mode 100644 index 0000000000..dafed7ee35 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/uranus/kernels.asset @@ -0,0 +1,10 @@ +local Kernels = asset.syncedResource({ + Name = "Uranus Spice Kernels", + Type = "HttpSynchronization", + Identifier = "uranus_kernels", + Version = 1 +}) + +asset.export("ura091", Kernels .. "/ura091-rocks-merge.bsp") +asset.export("ura111", Kernels .. "/ura111.bsp") +asset.export("ura112", Kernels .. "/ura112.bsp") diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset index a8d44f1514..628b850ad9 100644 --- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset @@ -1,7 +1,7 @@ local assetHelper = asset.require('util/asset_helper') local proceduralGlobes = asset.require('util/procedural_globe') local transforms = asset.require('./transforms') -local kernels111 = asset.require('./ura111').Kernels +local kernel = asset.require('./kernels').ura111 @@ -25,7 +25,7 @@ local majorMoons = { }, TrailColor = trailColor, OrbitPeriod = 1.413479, - Kernels = kernels111 + Kernels = kernel }, { Identifier = "Ariel", @@ -41,7 +41,7 @@ local majorMoons = { }, TrailColor = trailColor, OrbitPeriod = 2.520379, - Kernels = kernels111 + Kernels = kernel }, { Identifier = "Umbriel", @@ -57,7 +57,7 @@ local majorMoons = { }, TrailColor = trailColor, OrbitPeriod = 4.144177, - Kernels = kernels111 + Kernels = kernel }, { Identifier = "Titania", @@ -73,7 +73,7 @@ local majorMoons = { }, TrailColor = trailColor, OrbitPeriod = 8.705872, - Kernels = kernels111 + Kernels = kernel }, { Identifier = "Oberon", @@ -89,7 +89,7 @@ local majorMoons = { }, TrailColor = trailColor, OrbitPeriod = 13.463239, - Kernels = kernels111 + Kernels = kernel } } diff --git a/data/assets/scene/solarsystem/planets/uranus/ura091.asset b/data/assets/scene/solarsystem/planets/uranus/ura091.asset deleted file mode 100644 index eaf67fddd8..0000000000 --- a/data/assets/scene/solarsystem/planets/uranus/ura091.asset +++ /dev/null @@ -1,8 +0,0 @@ -local Kernels = asset.syncedResource({ - Name = "Uranus Spice Kernels (ura091)", - Type = "TorrentSynchronization", - Identifier = "ura091", - Magnet = "magnet:?xt=urn:btih:4A5CA79334D5C8AC6AF622247E27A6723B74CCFB&dn=ura091-rocks-merge.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce" -}) - -asset.export("Kernels", Kernels .. "/ura091-rocks-merge.bsp") diff --git a/data/assets/scene/solarsystem/planets/uranus/ura111.asset b/data/assets/scene/solarsystem/planets/uranus/ura111.asset deleted file mode 100644 index 665d0591a2..0000000000 --- a/data/assets/scene/solarsystem/planets/uranus/ura111.asset +++ /dev/null @@ -1,8 +0,0 @@ -local Kernels = asset.syncedResource({ - Name = "Uranus Spice Kernels (ura111)", - Type = "TorrentSynchronization", - Identifier = "ura111", - Magnet = "magnet:?xt=urn:btih:26C4903D1A12AE439480F31B45BAEB5781D2B305&dn=ura111.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce" -}) - -asset.export("Kernels", Kernels .. '/ura111.bsp') diff --git a/data/assets/scene/solarsystem/planets/uranus/ura112.asset b/data/assets/scene/solarsystem/planets/uranus/ura112.asset deleted file mode 100644 index 394f9a51e6..0000000000 --- a/data/assets/scene/solarsystem/planets/uranus/ura112.asset +++ /dev/null @@ -1,8 +0,0 @@ -local Kernels = asset.syncedResource({ - Name = "Uranus Spice Kernels (ura112)", - Type = "TorrentSynchronization", - Identifier = "ura112", - Magnet = "magnet:?xt=urn:btih:2DC230BFA2F6505A09BA3DAEF1D610BDEF95EEDB&dn=ura112.bsp&tr=udp%3a%2f%2ftracker.openbittorrent.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.publicbt.com%3a80%2fannounce&tr=udp%3a%2f%2ftracker.ccc.de%3a80%2fannounce" -}) - -asset.export("Kernels", Kernels .. '/ura112.bsp') diff --git a/include/openspace/util/httprequest.h b/include/openspace/util/httprequest.h index 4f39ddb0b1..ce4156c01d 100644 --- a/include/openspace/util/httprequest.h +++ b/include/openspace/util/httprequest.h @@ -108,6 +108,8 @@ public: void perform(RequestOptions opt); + const std::string& url() const; + private: void setReadyState(ReadyState state); @@ -171,6 +173,8 @@ public: virtual ~SyncHttpDownload() = default; void download(HttpRequest::RequestOptions opt); + const std::string& url() const; + protected: HttpRequest _httpRequest; }; @@ -184,6 +188,8 @@ public: void cancel(); void wait(); + const std::string& url() const; + protected: void download(HttpRequest::RequestOptions opt); diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp index bd5520823c..78a05cc9a1 100644 --- a/modules/base/dashboard/dashboarditemdistance.cpp +++ b/modules/base/dashboard/dashboarditemdistance.cpp @@ -438,7 +438,7 @@ void DashboardItemDistance::render(glm::vec2& penPosition) { *_font, penPosition, fmt::format( - "Distance from {} to {}: {} {}", + "Distance from {} to {}: {:f} {}", sourceInfo.second, destinationInfo.second, dist.first, dist.second ) ); diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp index 35f17a5100..da36bc7f03 100644 --- a/modules/sync/syncs/httpsynchronization.cpp +++ b/modules/sync/syncs/httpsynchronization.cpp @@ -274,11 +274,14 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) { "HTTPSynchronization", fmt::format("Error renaming file {} to {}", tempName, originalName) ); - failed = true; } } else { + LERRORC( + "HTTPSynchronization", + fmt::format("Error downloading file from URL {}", d->url()) + ); failed = true; } } diff --git a/openspace.cfg b/openspace.cfg index 735425063b..5ba1893cc5 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -35,12 +35,13 @@ SGCTConfig = sgct.config.single{} -- Sets the scene that is to be loaded by OpenSpace. A scene file is a description -- of all entities that will be visible during an instance of OpenSpace -Asset = "default" +-- Asset = "default" -- Asset = "default_full" -- Asset = "newhorizons" -- Asset = "rosetta" --- Asset = "osirisrex" +Asset = "osirisrex" -- Asset = "voyager" +-- Asset = "juno" -- These scripts are executed after the initialization of each scene, thus making -- it possible to have global overrides to default values or execute other scripts diff --git a/src/util/distanceconversion.cpp b/src/util/distanceconversion.cpp index f8bbc34182..3cdb3b27d9 100644 --- a/src/util/distanceconversion.cpp +++ b/src/util/distanceconversion.cpp @@ -29,6 +29,8 @@ namespace openspace { std::pair simplifyDistance(double meters, bool forceSingularForm) { + constexpr const double GraceFactor = 0.5; + const double metersVal = glm::abs(meters); if (metersVal == 0.0) { @@ -51,39 +53,39 @@ std::pair simplifyDistance(double meters, bool forceSingula return { val, (val == 1.0 || forceSingularForm) ? "millimeter" : "millimeters" }; } - if (metersVal > (1e9 * distanceconstants::Parsec)) { + if (metersVal > (1e9 * GraceFactor * distanceconstants::Parsec)) { const double val = meters / (1e9 * distanceconstants::Parsec); return { val, (val == 1.0 || forceSingularForm) ? "Gigaparsec" : "Gigaparsecs" }; } - else if (metersVal > (1e6 * distanceconstants::Parsec)) { + else if (metersVal > (1e6 * GraceFactor * distanceconstants::Parsec)) { const double val = meters / (1e6 * distanceconstants::Parsec); return { val, (val == 1.0 || forceSingularForm) ? "Megaparsec" : "Megaparsecs" }; } - else if (metersVal > (1e3 * distanceconstants::Parsec)) { + else if (metersVal > (1e3 * GraceFactor * distanceconstants::Parsec)) { const double val = meters / (1e3 * distanceconstants::Parsec); return { val, (val == 1.0 || forceSingularForm) ? "Kiloparsec" : "Kiloparsecs" }; } - else if (metersVal > distanceconstants::Parsec) { + else if (metersVal > GraceFactor * distanceconstants::Parsec) { const double val = meters / distanceconstants::Parsec; return { val, (val == 1.0 || forceSingularForm) ? "Parsec" : "Parsecs" }; } - else if (metersVal > distanceconstants::LightYear) { + else if (metersVal > GraceFactor * distanceconstants::LightYear) { const double val = meters / distanceconstants::LightYear; return { val, (val == 1.0 || forceSingularForm) ? "Lightyear" : "Lightyears" }; } - else if (metersVal > distanceconstants::LightMonth) { + else if (metersVal > GraceFactor * distanceconstants::LightMonth) { const double val = meters / distanceconstants::LightMonth; return { val, (val == 1.0 || forceSingularForm) ? "Lightmonth" : "Lightmonths" }; } - else if (metersVal > distanceconstants::LightDay) { + else if (metersVal > GraceFactor * distanceconstants::LightDay) { const double val = meters / distanceconstants::LightDay; return { val, (val == 1.0 || forceSingularForm) ? "Lightday" : "Lightdays" }; } - else if (metersVal > distanceconstants::LightHour) { + else if (metersVal > GraceFactor * distanceconstants::LightHour) { const double val = meters / distanceconstants::LightHour; return { val, (val == 1.0 || forceSingularForm) ? "Lighthour" : "Lighthours" }; } - else if (metersVal > distanceconstants::AstronomicalUnit) { + else if (metersVal > GraceFactor * distanceconstants::AstronomicalUnit) { return { meters / distanceconstants::AstronomicalUnit, "AU" }; } else { diff --git a/src/util/httprequest.cpp b/src/util/httprequest.cpp index c3cd0ede73..4699a630cc 100644 --- a/src/util/httprequest.cpp +++ b/src/util/httprequest.cpp @@ -151,6 +151,10 @@ void HttpRequest::setReadyState(openspace::HttpRequest::ReadyState state) { _onReadyStateChange(state); } +const std::string& HttpRequest::url() const { + return _url; +} + HttpDownload::HttpDownload() : _onProgress([](HttpRequest::Progress) { return true; }) {} void HttpDownload::onProgress(ProgressCallback progressCallback) { @@ -211,6 +215,10 @@ void SyncHttpDownload::download(HttpRequest::RequestOptions opt) { deinitDownload(); } +const std::string& SyncHttpDownload::url() const { + return _httpRequest.url(); +} + AsyncHttpDownload::AsyncHttpDownload(std::string url) : _httpRequest(std::move(url)) {} AsyncHttpDownload::AsyncHttpDownload(AsyncHttpDownload&& d) @@ -282,6 +290,10 @@ void AsyncHttpDownload::download(HttpRequest::RequestOptions opt) { deinitDownload(); } +const std::string& AsyncHttpDownload::url() const { + return _httpRequest.url(); +} + const std::vector& HttpMemoryDownload::downloadedData() const { return _downloadedData; }