From a0e5fe34fea684e085f549e6331d04c8db6e1ffc Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Mon, 6 Jun 2016 00:49:09 +0200 Subject: [PATCH] Use more fine-grained texture specification for Pluto and Charon --- data/scene/newhorizons.scene | 4 +++- data/scene/newhorizons/pluto/charon/charon.mod | 11 ++++++----- data/scene/newhorizons/pluto/pluto/pluto.mod | 13 +++++++------ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/data/scene/newhorizons.scene b/data/scene/newhorizons.scene index bc0d07db16..6512ec8948 100644 --- a/data/scene/newhorizons.scene +++ b/data/scene/newhorizons.scene @@ -1,5 +1,7 @@ UseAccurateNewHorizonsKernels = false -UseHighResolutionTextures = false +-- TextureResolution = "low" +TextureResolution = "med" +-- TextureResolution = "high" function preInitialization() --[[ diff --git a/data/scene/newhorizons/pluto/charon/charon.mod b/data/scene/newhorizons/pluto/charon/charon.mod index 212760d979..674cb55892 100644 --- a/data/scene/newhorizons/pluto/charon/charon.mod +++ b/data/scene/newhorizons/pluto/charon/charon.mod @@ -8,11 +8,12 @@ else } end -if UseHighResolutionTextures then - ColorTexture = "textures/cpmap_cyl_HR_0e.jpg" -else - ColorTexture = "textures/charon_highres.jpg" -end +Files = { + low = "textures/charon_highres.jpg", + med = "textures/charon_highres.jpg", + high = "textures/cpmap_cyl_HR_0e.jpg" +} +ColorTexture = Files[TextureResolution] return { -- CharonProjection module diff --git a/data/scene/newhorizons/pluto/pluto/pluto.mod b/data/scene/newhorizons/pluto/pluto/pluto.mod index aed21e333f..4f71b1c04c 100644 --- a/data/scene/newhorizons/pluto/pluto/pluto.mod +++ b/data/scene/newhorizons/pluto/pluto/pluto.mod @@ -9,11 +9,12 @@ else } end -if UseHighResolutionTextures then - ColorTexture = "textures/pmap_cyl_HR_LOR_lowres.jpg" -else - ColorTexture = "textures/Shenk_180.jpg" -end +Files = { + low = "textures/pluto_large.jpg", + med = "textures/Shenk_180.jpg", + high = "textures/pmap_cyl_HR_LOR_lowres.jpg" +} +ColorTexture = Files[TextureResolution] return { -- Pluto barycenter module @@ -49,7 +50,7 @@ return { Sequencing = "true" }, Projection = { - Sequence = "${OPENSPACE_DATA}/scene/newhorizons/pluto/pluto/images", + Sequence = "${OPENSPACE_DATA}/scene/newhorizons/pluto/pluto/full_images", EventFile = "${OPENSPACE_DATA}/scene/newhorizons/pluto/pluto/assets/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt", SequenceType = "hybrid", Observer = "NEW HORIZONS",