mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-01 00:09:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update new horizons data files (kernels and textures)

Browse Source
This commit is contained in:
Alexander Bock
2017-08-17 09:36:05 -04:00
parent 621dd20f45
commit 7d3b0d7822
12 changed files with 63 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -118,3 +118,4 @@ data/spice/OsirisRexKernels
data/spice/plu055.bsp
data/spice/Rosetta
data/spice/sat375.bsp
data/spice/new_horizons/
data/scene/missions/newhorizons/newhorizons/NewHorizonsKernels.torrent
BIN
View File
Binary file not shown.
data/scene/missions/newhorizons/newhorizons/new_horizons_kernels.torrent
BIN
View File
Binary file not shown.
data/scene/missions/newhorizons/newhorizons/newhorizons.data
+1 -1
View File
@@ -4,7 +4,7 @@ return {
{ Identifier = "newhorizons_textures", Destination = "textures", Version = 2 }
},
TorrentFiles = {
{ File = "NewHorizonsKernels.torrent", Destination = "${SPICE}" },
{ File = "new_horizons_kernels.torrent", Destination = "${SPICE}" },
{ File = "jup260.bsp.torrent", Destination = "${SPICE}" }
}
}
data/scene/missions/newhorizons/newhorizons/newhorizons.mod
+27 -65
View File
@@ -1,71 +1,35 @@
if UseAccurateNewHorizonsKernels then
NewHorizonsKernels = {
"${SPICE}/nh_20170126/spk/nh_pred_20141201_20190301_od122.bsp",
"${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp",
"${SPICE}/nh_20170126/spk/NavPE_de433_od122.bsp",
NewHorizonsKernels = {
"${SPICE}/new_horizons/spk/nh_pred_20141201_20190301_od122.bsp",
"${SPICE}/new_horizons/spk/NavSE_plu047_od122.bsp",
"${SPICE}/new_horizons/spk/NavPE_de433_od122.bsp",
"${SPICE}/jup260.bsp",
"${SPICE}/jup260.bsp",
"${SPICE}/nh_20170126/ck/nh_scispi_2015_pred.bc",
"${SPICE}/nh_20170126/ck/nh_scispi_2015_recon.bc",
"${SPICE}/nh_20170126/ck/nh_lorri_wcs.bc",
"${SPICE}/nh_20170126/smithed_pc_and_sp/PLU_LORRI_ALL_161216.bc",
"${SPICE}/new_horizons/ck/nh_scispi_2015_pred.bc",
"${SPICE}/new_horizons/ck/nh_scispi_2015_recon.bc",
"${SPICE}/new_horizons/ck/nh_lorri_wcs.bc",
"${SPICE}/new_horizons/smithed_pc_and_sp/PLU_LORRI_ALL_161216.bc",
"${SPICE}/nh_20170126/sclk/new-horizons_1121.tsc",
"${SPICE}/new_horizons/sclk/new-horizons_1121.tsc",
"${SPICE}/nh_20170126/pck/nh_targets_v001.tpc",
"${SPICE}/nh_20170126/pck/nh_pcnh_005.tpc",
"${SPICE}/new_horizons/pck/nh_targets_v001.tpc",
"${SPICE}/new_horizons/pck/nh_pcnh_005.tpc",
"${SPICE}/nh_20170126/fk/nh_v220.tf",
"${SPICE}/nh_20170126/ik/nh_allinstruments_v002.ti",
"${SPICE}/nh_20170126/ik/nh_alice_v200.ti",
"${SPICE}/nh_20170126/ik/nh_lorri_v201.ti",
"${SPICE}/nh_20170126/ik/nh_pepssi_v110.ti",
"${SPICE}/nh_20170126/ik/nh_ralph_v100.ti",
"${SPICE}/nh_20170126/ik/nh_rex_v100.ti",
"${SPICE}/nh_20170126/ik/nh_sdc_v101.ti",
"${SPICE}/nh_20170126/ik/nh_swap_v100.ti",
"${SPICE}/nh_20170126/ik/nh_astr_v000.ti",
"${SPICE}/nh_20170126/ik/nh_fss_v000.ti",
"${SPICE}/nh_20170126/fk/nh_soc_misc_v001.tf",
"${SPICE}/nh_20170126/spk/nh_stars.bsp",
}
else
NewHorizonsKernels = {
--SCLK
"${SPICE}/NewHorizonsKernels/new_horizons_413.tsc",
"${SPICE}/NewHorizonsKernels/nhops_CORE_v9g_cdh2.bc",
"${SPICE}/NewHorizonsKernels/nh_ref_20080710_20160101_od059B.bsp",
"${SPICE}/de430_1850-2150.bsp",
-- CK
"${SPICE}/NewHorizonsKernels/merged_nhpc_2006_v011.bc",
"${SPICE}/NewHorizonsKernels/merged_nhpc_2007_v006.bc",
-- FK
"${SPICE}/NewHorizonsKernels/nh_v200.tf",
-- IK
"${SPICE}/NewHorizonsKernels/nh_alice_v110.ti",
"${SPICE}/NewHorizonsKernels/nh_lorri_v100.ti",
"${SPICE}/NewHorizonsKernels/nh_pepssi_v110.ti",
"${SPICE}/NewHorizonsKernels/nh_ralph_v100.ti",
"${SPICE}/NewHorizonsKernels/nh_rex_v100.ti",
"${SPICE}/NewHorizonsKernels/nh_sdc_v101.ti",
"${SPICE}/NewHorizonsKernels/nh_swap_v100.ti",
-- PCK
-- SPK
"${SPICE}/jup260.bsp",
"${SPICE}/NewHorizonsKernels/de413.bsp",
"${SPICE}/NewHorizonsKernels/nh_nep_ura_000.bsp",
"${SPICE}/NewHorizonsKernels/nh_recon_e2j_v1.bsp",
"${SPICE}/NewHorizonsKernels/nh_recon_j2sep07_prelimv1.bsp",
"${SPICE}/NewHorizonsKernels/sb_2002jf56_2.bsp",
"${SPICE}/NewHorizonsKernels/nh_plu017.bsp",
}
end
"${SPICE}/new_horizons/fk/nh_v220.tf",
"${SPICE}/new_horizons/ik/nh_allinstruments_v002.ti",
"${SPICE}/new_horizons/ik/nh_alice_v200.ti",
"${SPICE}/new_horizons/ik/nh_lorri_v201.ti",
"${SPICE}/new_horizons/ik/nh_pepssi_v110.ti",
"${SPICE}/new_horizons/ik/nh_ralph_v100.ti",
"${SPICE}/new_horizons/ik/nh_rex_v100.ti",
"${SPICE}/new_horizons/ik/nh_sdc_v101.ti",
"${SPICE}/new_horizons/ik/nh_swap_v100.ti",
"${SPICE}/new_horizons/ik/nh_astr_v000.ti",
"${SPICE}/new_horizons/ik/nh_fss_v000.ti",
"${SPICE}/new_horizons/fk/nh_soc_misc_v001.tf",
"${SPICE}/new_horizons/spk/nh_stars.bsp",
}
return {
{
@@ -87,8 +51,6 @@ return {
},
{
Name = "NewHorizons",
-- Parent = "PlutoBarycenter",
-- Parent = "JupiterBarycenter",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableModel",
data/scene/missions/newhorizons/pluto/charon/charon.data
+1 -1
View File
@@ -1,5 +1,5 @@
return {
FileRequest = {
{ Identifier = "charon_textures", Destination = "textures", Version = 2 }
{ Identifier = "charon_textures", Destination = "textures", Version = 3 }
},
}
data/scene/missions/newhorizons/pluto/charon/charon.mod
+10 -17
View File
@@ -1,22 +1,15 @@
local charon_radius = 6.035E5
if UseAccurateNewHorizonsKernels then
NewHorizonsKernels = {
"${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp",
"${SPICE}/nh_20170126/spk/NavPE_de433_od122.bsp",
}
else
NewHorizonsKernels = {
"${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
}
end
local Files = {
low = "textures/charon_highres.jpg",
med = "textures/charon_highres.jpg",
high = "textures/cpmap_cyl_HR_0e.jpg"
local NewHorizonsKernels = {
"${SPICE}/new_horizons/spk/NavSE_plu047_od122.bsp",
"${SPICE}/new_horizons/spk/NavPE_de433_od122.bsp",
}
local ColorTexture = Files[TextureResolution]
-- Loading the smaller version for higher compatability
-- if we have a good way to measure GPU memory, we can make this dynamic
local ColorTexture = "textures/NH_Charon_mosaic_8192.png"
local HeightTexture = "textures/NH_Charon_DTM_8192.png"
return {
-- CharonProjection module
@@ -32,7 +25,7 @@ return {
Segments = 100
},
ColorTexture = ColorTexture,
HeightTexture = "textures/cpdem-Mcolor2-MLorriCA-lr-5_ZMfs-cyl.jpg",
HeightTexture = HeightTexture,
Projection = {
Observer = "NEW HORIZONS",
Target = "CHARON",
data/scene/missions/newhorizons/pluto/hydra/hydra.mod
+6 -12
View File
@@ -1,14 +1,8 @@
local charon_radius = 0.53E5
local hydra_radius = 0.53E5
if UseAccurateNewHorizonsKernels then
NewHorizonsKernels = {
"${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp"
}
else
NewHorizonsKernels = {
"${SPICE}/NewHorizonsKernels/nh_p4p5_revised.bsp"
}
end
local NewHorizonsKernels = {
"${SPICE}/new_horizons/spk/NavSE_plu047_od122.bsp",
}
return {
-- Hydra module
@@ -19,10 +13,10 @@ return {
Type = "RenderablePlanet",
Frame = "IAU_PLUTO",
Body = "HYDRA",
Radius = charon_radius,
Radius = hydra_radius,
Geometry = {
Type = "SimpleSphere",
Radius = charon_radius,
Radius = hydra_radius,
Segments = 100
},
ColorTexture = "textures/gray.jpg",
data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod
+3 -9
View File
@@ -1,14 +1,8 @@
local kerberos_radius = 0.1E5
if UseAccurateNewHorizonsKernels then
NewHorizonsKernels = {
"${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp"
}
else
NewHorizonsKernels = {
"${SPICE}/NewHorizonsKernels/nh_p4p5_revised.bsp"
}
end
local NewHorizonsKernels = {
"${SPICE}/new_horizons/spk/NavSE_plu047_od122.bsp",
}
return {
-- Styx module
data/scene/missions/newhorizons/pluto/nix/nix.mod
+3 -9
View File
@@ -1,14 +1,8 @@
local nix_radius = 0.45E5
if UseAccurateNewHorizonsKernels then
NewHorizonsKernels = {
"${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp"
}
else
NewHorizonsKernels = {
"${SPICE}/NewHorizonsKernels/nh_p4p5_revised.bsp"
}
end
local NewHorizonsKernels = {
"${SPICE}/new_horizons/spk/NavSE_plu047_od122.bsp",
}
return {
-- Nix module
data/scene/missions/newhorizons/pluto/pluto/pluto.mod
+8 -17
View File
@@ -1,22 +1,13 @@
local pluto_radius = 1.173E6
if UseAccurateNewHorizonsKernels then
NewHorizonsKernels = {
"${SPICE}/nh_20170126/spk/NavPE_de433_od122.bsp",
"${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp"
}
else
NewHorizonsKernels = {
"${SPICE}/NewHorizonsKernels/nh_plu017.bsp"
}
end
local Files = {
low = "textures/pluto_large.jpg",
med = "textures/Shenk_180.jpg",
high = "textures/pmap_cyl_HR_LOR_lowres.jpg"
local NewHorizonsKernels = {
"${SPICE}/new_horizons/spk/NavPE_de433_od122.bsp",
"${SPICE}/new_horizons/spk/NavSE_plu047_od122.bsp"
}
local ColorTexture = Files[TextureResolution]
local ColorTexture = "textures/pluto.jpg"
-- local ColorTexture = "textures/NH_Pluto_mosaic_16384.png"
local HeightTexture = "textures/NH_Pluto_DTM_16384.png"
return {
-- Pluto barycenter module
@@ -45,7 +36,7 @@ return {
Segments = 100
},
ColorTexture = ColorTexture,
HeightTexture = "textures/pluto_shenk_heightmap.jpg",
HeightTexture = HeightTexture,
Projection = {
Sequence = "${OPENSPACE_DATA}/scene/missions/newhorizons/pluto/pluto/images",
EventFile = "${OPENSPACE_DATA}/scene/missions/newhorizons/pluto/pluto/assets/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt",
data/scene/missions/newhorizons/pluto/styx/styx.mod
+3 -9
View File
@@ -1,14 +1,8 @@
local styx_radius = 0.75E4
if UseAccurateNewHorizonsKernels then
NewHorizonsKernels = {
"${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp"
}
else
NewHorizonsKernels = {
"${SPICE}/NewHorizonsKernels/nh_p4p5_revised.bsp"
}
end
NewHorizonsKernels = {
"${SPICE}/new_horizons/spk/NavSE_plu047_od122.bsp"
}
return {
-- Styx module