Skip to content
GitLab
Commit 3c213fae authored by Alexander Bock's avatar Alexander Bock Committed by GitHub
Browse files

Merge pull request #371 from OpenSpace/misc/cleanup 

Misc/cleanup
parents 51be0629 e6613240
Hide whitespace changes
Inline Side-by-side
Showing
with 393 additions and 339 deletions
+393 -339
.gitignore
+ 7
- 8
View file @ 3c213fae
*~
*.swp
.DS_Store
.vscode
/bin/
/build/
/cache/
Thumbs.db
tmp/
/documentation
/doc
/documentation
/ext/SGCT
/logs
tmp/
Thumbs.db
*~
*.swp
*.gglsl
*.GhoulGenerated.glsl
*.OpenSpaceGenerated.glsl
......@@ -30,7 +30,6 @@ install_manifest.txt
.project
shaders/ABuffer/constants.hglsl
log.html
ScriptLog.txt
data/scene/atmosphereearth/textures
......@@ -118,4 +117,4 @@ data/spice/nh_kernels
data/spice/OsirisRexKernels
data/spice/plu055.bsp
data/spice/Rosetta
data/spice/sat375.bsp
\ No newline at end of file
data/spice/sat375.bsp
CMakeLists.txt
+ 2
- 2
View file @ 3c213fae
......@@ -28,9 +28,9 @@ project (OpenSpace)
message(STATUS "Generating OpenSpace project")
set(OPENSPACE_VERSION_MAJOR 0)
set(OPENSPACE_VERSION_MINOR 8)
set(OPENSPACE_VERSION_MINOR 9)
set(OPENSPACE_VERSION_PATCH 0)
set(OPENSPACE_VERSION_STRING "prerelease-13 (Earth Day)")
set(OPENSPACE_VERSION_STRING "prerelease-14 (Astronomy Live)")
set(OPENSPACE_BASE_DIR "${PROJECT_SOURCE_DIR}")
set(OPENSPACE_APPS_DIR "${OPENSPACE_BASE_DIR}/apps")
......
apps/Launcher/CMakeLists.txt
+ 4
- 1
View file @ 3c213fae
......@@ -29,7 +29,8 @@ if (WIN32)
set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/Launcher/openspace.rc)
endif ()
include (${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
include(${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
include(${OPENSPACE_CMAKE_EXT_DIR}/support_macros.cmake)
set(application_path ${OPENSPACE_APPS_DIR}/Launcher)
......@@ -65,6 +66,8 @@ add_executable(${APPLICATION_NAME} MACOSX_BUNDLE
${RESOURCE_FILES}
)
set_compile_settings(${APPLICATION_NAME})
target_link_libraries(${APPLICATION_NAME}
Qt5::Widgets
Qt5::Network
......
apps/OpenSpace/CMakeLists.txt
+ 3
- 0
View file @ 3c213fae
......@@ -23,6 +23,7 @@
##########################################################################################
include(${GHOUL_BASE_DIR}/support/cmake/CopySharedLibraries.cmake)
include(${OPENSPACE_CMAKE_EXT_DIR}/support_macros.cmake)
set(APPLICATION_NAME OpenSpace)
set(APPLICATION_LINK_TO_OPENSPACE ON)
......@@ -130,3 +131,5 @@ if (MSVC)
"/NODEFAULTLIB:LIBCMTD.lib /NODEFAULTLIB:LIBCMT.lib"
)
endif()
set_compile_settings(${APPLICATION_NAME})
apps/TaskRunner/CMakeLists.txt
+ 2
- 0
View file @ 3c213fae
......@@ -26,6 +26,7 @@ set(APPLICATION_NAME TaskRunner)
set(APPLICATION_LINK_TO_OPENSPACE ON)
include (${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
include(${OPENSPACE_CMAKE_EXT_DIR}/support_macros.cmake)
set(application_path ${OPENSPACE_APPS_DIR}/TaskRunner)
......@@ -37,3 +38,4 @@ add_executable(${APPLICATION_NAME} MACOSX_BUNDLE
${SOURCE_FILES}
)
set_compile_settings(${APPLICATION_NAME})
data/scene/missions/newhorizons/jupiter/callisto/callisto.mod
+ 4
- 1
View file @ 3c213fae
local callisto_radius = 1.8213E6
return {
-- Callisto module
{
......@@ -7,9 +9,10 @@ return {
Type = "RenderablePlanetProjection",
Frame = "IAU_CALLISTO",
Body = "CALLISTO",
Radius = callisto_radius,
Geometry = {
Type = "SimpleSphere",
Radius = 1.8213E6,
Radius = callisto_radius,
Segments = 100
},
Textures = {
......
data/scene/missions/newhorizons/jupiter/europa/europa.mod
+ 4
- 1
View file @ 3c213fae
local europa_radius = 1.8213E6
return {
-- Europa module
{
......@@ -7,9 +9,10 @@ return {
Type = "RenderablePlanetProjection",
Frame = "IAU_EUROPA",
Body = "EUROPA",
Radius = europa_radius,
Geometry = {
Type = "SimpleSphere",
Radius = 1.8213E6,
Radius = europa_radius,
Segments = 100
},
Textures = {
......
data/scene/missions/newhorizons/jupiter/ganymede/ganymede.mod
+ 4
- 1
View file @ 3c213fae
local ganymede_local = 1.8213E6
return {
-- Ganymede module
{
......@@ -7,9 +9,10 @@ return {
Type = "RenderablePlanetProjection",
Frame = "IAU_GANYMEDE",
Body = "GANYMEDE",
Radius = ganymede_local,
Geometry = {
Type = "SimpleSphere",
Radius = 1.8213E6,
Radius = ganymede_local,
Segments = 100
},
Textures = {
......
data/scene/missions/newhorizons/jupiter/io/io.mod
+ 5
- 2
View file @ 3c213fae
local io_radius = 1.8213E6
return {
-- Io module
{
......@@ -7,9 +9,10 @@ return {
Type = "RenderablePlanetProjection",
Frame = "IAU_IO",
Body = "IO",
Radius = io_radius,
Geometry = {
Type = "SimpleSphere",
Radius = 1.8213E6,
Radius = io_radius,
Segments = 100
},
Textures = {
......@@ -74,7 +77,7 @@ return {
Parent = "Io",
Renderable = {
Type = "RenderablePlane",
Size = {1.0, 7.4},
Size = 10^7.4,
Origin = "Center",
Billboard = true,
Texture = "textures/Io-Text.png",
......
data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod
+ 4
- 1
View file @ 3c213fae
local jupiter_local = 0.71492E8
return {
-- Jupiter barycenter module
{
......@@ -20,9 +22,10 @@ return {
Type = "RenderablePlanetProjection",
Frame = "IAU_JUPITER",
Body = "JUPITER",
Radius = jupiter_local,
Geometry = {
Type = "SimpleSphere",
Radius = 0.71492E8,
Radius = jupiter_local,
Segments = 200,
},
Textures = {
......
data/scene/missions/newhorizons/newhorizons/newhorizons.mod
+ 25
- 41
View file @ 3c213fae
if UseAccurateNewHorizonsKernels then
NewHorizonsKernels = {
-- SCLK
"${SPICE}/nh_kernels/sclk/new-horizons_0976.tsc",
-- "${SPICE}/NewHorizonsKernels/new_horizons_413.tsc",
"${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",
-- SPK
"${SPICE}/nh_kernels/spk/nh_pred_20141201_20190301_od122.bsp",
-- "${SPICE}/nh_kernels/spk/nh_pred_20120501_20160913_od093.bsp",
"${SPICE}/nh_kernels/spk/plu_all_mvi.spk",
"${SPICE}/jup260.bsp",
-- "${SPICE}/NewHorizonsKernels/de413.bsp",
-- CK
"${SPICE}/nh_kernels/ck/nh_scispi_2015_pred.bc",
"${SPICE}/nh_kernels/ck/nh_scispi_2015_recon.bc",
"${SPICE}/nh_kernels/ck/nh_lorri_wcs.bc",
"${SPICE}/nh_kernels/ck/plutonet_PS104.bc",
-- FK
"${SPICE}/nh_kernels/fk/nh_soc_misc_v001.tf",
"${SPICE}/nh_kernels/fk/nh_v220.tf",
"${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",
-- IK
"${SPICE}/nh_kernels/ik/nh_alice_v120.ti",
"${SPICE}/nh_kernels/ik/nh_allinstruments_v002.ti",
"${SPICE}/nh_kernels/ik/nh_astr_v000.ti",
"${SPICE}/nh_kernels/ik/nh_fss_v000.ti",
"${SPICE}/nh_kernels/ik/nh_lorri_v100.ti",
"${SPICE}/nh_kernels/ik/nh_pepssi_v110.ti",
"${SPICE}/nh_kernels/ik/nh_ralph_v100.ti",
"${SPICE}/nh_kernels/ik/nh_rex_v100.ti",
"${SPICE}/nh_kernels/ik/nh_sdc_v101.ti",
"${SPICE}/nh_kernels/ik/nh_swap_v100.ti",
"${SPICE}/nh_20170126/sclk/new-horizons_1121.tsc",
-- LSK
"${SPICE}/nh_kernels/lsk/naif0011.tls",
"${SPICE}/nh_20170126/pck/nh_targets_v001.tpc",
"${SPICE}/nh_20170126/pck/nh_pcnh_005.tpc",
-- PCK
"${SPICE}/nh_kernels/pck/nh_targets_v001.tpc",
"${SPICE}/nh_kernels/pck/pck00010.tpc",
"${SPICE}/nh_kernels/pck/nh_pcnh_002.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
......@@ -118,12 +108,6 @@ return {
Ghosting = false,
},
},
Transform = {
Scale = {
Type = "StaticScale",
Scale = 100
}
},
},
--NewHorizonsTrail module
--[[{
......
data/scene/missions/newhorizons/newhorizonsfov/newhorizonsfov.mod
+ 290
- 261
View file @ 3c213fae
local LorriOffset = { -6.626, -4.1, -3.23 }
local RalphOffset = { -6.9, -4.6, 8.7 }
local AliceOffset = { -7.9, -1.7, 8.3 }
local RexOffset = { 0, 0, 0 }
return {
-- NewHorizonsFov main module
{
{
Name = "NH_LORRI",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Textures = {
Type = "simple",
Color = "textures/glare_blue.png",
-- need to add different texture
},
Instrument = {
Color = { 0.8, 0.7, 0.7 },
Instrument = {
Name = "NH_LORRI",
Method = "ELLIPSOID",
Aberration = "NONE",
Aberration = "NONE"
},
PotentialTargets = {
"Pluto",
......@@ -24,281 +23,311 @@ return {
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
Transform = {
Translation = {
Type = "StaticTranslation",
Position = LorriOffset
}
}
},
-- NewHorizonsFov module NH_RALPH_LEISA
{
Name = "NH_RALPH_LEISA",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Textures = {
Type = "simple",
Color = "textures/glare_blue.png",
-- need to add different texture
},
Instrument = {
Name = "NH_RALPH_LEISA",
Method = "ELLIPSOID",
Aberration = "NONE",
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
{
Name = "NH_RALPH_LEISA",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Instrument = {
Name = "NH_RALPH_LEISA",
Aberration = "NONE"
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
Transform = {
Translation = {
Type = "StaticTranslation",
Position = RalphOffset
}
}
},
-- NewHorizonsFov module NH_RALPH_MVIC_PAN1
{
Name = "NH_RALPH_MVIC_PAN1",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Textures = {
Type = "simple",
Color = "textures/glare_blue.png",
-- need to add different texture
},
Instrument = {
Name = "NH_RALPH_MVIC_PAN1",
Method = "ELLIPSOID",
Aberration = "NONE",
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
-- NewHorizonsFov module NH_RALPH_MVIC_PAN1
{
Name = "NH_RALPH_MVIC_PAN1",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Instrument = {
Name = "NH_RALPH_MVIC_PAN1",
Aberration = "NONE"
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
-- NewHorizonsFov module NH_RALPH_MVIC_PAN2
{
Name = "NH_RALPH_MVIC_PAN2",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Textures = {
Type = "simple",
Color = "textures/glare_blue.png",
-- need to add different texture
},
Instrument = {
Name = "NH_RALPH_MVIC_PAN2",
Method = "ELLIPSOID",
Aberration = "NONE",
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
Transform = {
Translation = {
Type = "StaticTranslation",
Position = RalphOffset
}
}
},
-- NewHorizonsFov module NH_RALPH_MVIC_PAN2
{
Name = "NH_RALPH_MVIC_PAN2",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Instrument = {
Name = "NH_RALPH_MVIC_PAN2",
Aberration = "NONE"
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
-- NewHorizonsFov module NH_RALPH_MVIC_RED
{
Name = "NH_RALPH_MVIC_RED",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Textures = {
Type = "simple",
Color = "textures/glare_blue.png",
-- need to add different texture
},
Instrument = {
Name = "NH_RALPH_MVIC_RED",
Method = "ELLIPSOID",
Aberration = "NONE",
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
Transform = {
Translation = {
Type = "StaticTranslation",
Position = RalphOffset
}
}
},
-- NewHorizonsFov module NH_RALPH_MVIC_RED
{
Name = "NH_RALPH_MVIC_RED",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Instrument = {
Name = "NH_RALPH_MVIC_RED",
Aberration = "NONE"
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
-- NewHorizonsFov module NH_RALPH_MVIC_BLUE
{
Name = "NH_RALPH_MVIC_BLUE",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Textures = {
Type = "simple",
Color = "textures/glare_blue.png",
-- need to add different texture
},
Instrument = {
Name = "NH_RALPH_MVIC_BLUE",
Method = "ELLIPSOID",
Aberration = "NONE",
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
Transform = {
Translation = {
Type = "StaticTranslation",
Position = RalphOffset
}
}
},
-- NewHorizonsFov module NH_RALPH_MVIC_BLUE
{
Name = "NH_RALPH_MVIC_BLUE",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Instrument = {
Name = "NH_RALPH_MVIC_BLUE",
Aberration = "NONE"
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
-- NewHorizonsFov module NH_RALPH_MVIC_FT
{
Name = "NH_RALPH_MVIC_FT",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Textures = {
Type = "simple",
Color = "textures/glare_blue.png",
-- need to add different texture
},
Instrument = {
Name = "NH_RALPH_MVIC_FT",
Method = "ELLIPSOID",
Aberration = "NONE",
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
Transform = {
Translation = {
Type = "StaticTranslation",
Position = RalphOffset
}
}
},
-- NewHorizonsFov module NH_RALPH_MVIC_FT
{
Name = "NH_RALPH_MVIC_FT",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Instrument = {
Name = "NH_RALPH_MVIC_FT",
Aberration = "NONE"
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
-- NewHorizonsFov module NH_RALPH_MVIC_METHANE
{
Name = "NH_RALPH_MVIC_METHANE",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Textures = {
Type = "simple",
Color = "textures/glare_blue.png",
-- need to add different texture
},
Instrument = {
Name = "NH_RALPH_MVIC_METHANE",
Method = "ELLIPSOID",
Aberration = "NONE",
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
Transform = {
Translation = {
Type = "StaticTranslation",
Position = RalphOffset
}
}
},
-- NewHorizonsFov module NH_RALPH_MVIC_METHANE
{
Name = "NH_RALPH_MVIC_METHANE",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Instrument = {
Name = "NH_RALPH_MVIC_METHANE",
Aberration = "NONE"
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
-- NewHorizonsFov module NH_RALPH_MVIC_NIR
{
Name = "NH_RALPH_MVIC_NIR",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Textures = {
Type = "simple",
Color = "textures/glare_blue.png",
-- need to add different texture
},
Instrument = {
Name = "NH_RALPH_MVIC_NIR",
Method = "ELLIPSOID",
Aberration = "NONE",
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
Transform = {
Translation = {
Type = "StaticTranslation",
Position = RalphOffset
}
}
},
-- NewHorizonsFov module NH_RALPH_MVIC_NIR
{
Name = "NH_RALPH_MVIC_NIR",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Instrument = {
Name = "NH_RALPH_MVIC_NIR",
Aberration = "NONE"
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
-- NewHorizonsFov module NH_ALICE_AIRGLOW
{
Name = "NH_ALICE_AIRGLOW",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Textures = {
Type = "simple",
Color = "textures/glare_blue.png",
-- need to add different texture
},
Instrument = {
Name = "NH_ALICE_AIRGLOW",
Method = "ELLIPSOID",
Aberration = "NONE",
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
Transform = {
Translation = {
Type = "StaticTranslation",
Position = RalphOffset
}
}
},
-- NewHorizonsFov module NH_ALICE_AIRGLOW
{
Name = "NH_ALICE_AIRGLOW",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Instrument = {
Name = "NH_ALICE_AIRGLOW",
Aberration = "NONE"
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
-- NewHorizonsFov module NH_ALICE_SOC
{
Name = "NH_ALICE_SOC",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Textures = {
Type = "simple",
Color = "textures/glare_blue.png",
-- need to add different texture
},
Instrument = {
Name = "NH_ALICE_SOC",
Method = "ELLIPSOID",
Aberration = "NONE",
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
Transform = {
Translation = {
Type = "StaticTranslation",
Position = AliceOffset
}
}
},
-- NewHorizonsFov module NH_ALICE_SOC
{
Name = "NH_ALICE_SOC",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableFov",
Body = "NEW HORIZONS",
Frame = "NH_SPACECRAFT",
RGB = { 0.8, 0.7, 0.7 },
Instrument = {
Name = "NH_ALICE_SOC",
Aberration = "NONE"
},
PotentialTargets = {
"Pluto",
"Charon",
"Jupiter", "Io", "Europa", "Ganymede", "Callisto"
}
},
{
Name = "NH_REX",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableCrawlingLine",
Source = "NH_REX",
Target = "EARTH",
-- Body = "NEW HORIZONS",
Frame = "GALACTIC",
Color = { 1.0, 0.7, 0.0 },
Instrument = "NH_REX"
Transform = {
Translation = {
Type = "StaticTranslation",
Position = AliceOffset
},
}
},
-- Module NH_REX
{
Name = "NH_REX",
Parent = "NewHorizonsPosition",
Renderable = {
Type = "RenderableCrawlingLine",
Source = "NH_REX",
Target = "EARTH",
Instrument = "NH_REX",
Color = {
Start = { 1.0, 0.7, 0.0, 1.0},
End = {0.0, 0.0, 0.0, 0.0 }
}
},
Transform = {
Rotation = {
Type = "StaticRotation",
Rotation = {
0.0, 1.0, 0.0,
0.0, 0.0, 1.0,
1.0, 0.0, 0.0
}
},
Translation = {
Type = "StaticTranslation",
Position = RexOffset
}
}
}
\ No newline at end of file
}
}
data/scene/missions/newhorizons/pluto/charon/charon.mod
+ 8
- 4
View file @ 3c213fae
local charon_radius = 6.035E5
if UseAccurateNewHorizonsKernels then
NewHorizonsKernels = {
"${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
"${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp",
"${SPICE}/nh_20170126/spk/NavPE_de433_od122.bsp",
}
else
NewHorizonsKernels = {
......@@ -8,12 +11,12 @@ else
}
end
Files = {
local Files = {
low = "textures/charon_highres.jpg",
med = "textures/charon_highres.jpg",
high = "textures/cpmap_cyl_HR_0e.jpg"
}
ColorTexture = Files[TextureResolution]
local ColorTexture = Files[TextureResolution]
return {
-- CharonProjection module
......@@ -22,9 +25,10 @@ return {
Parent = "PlutoBarycenter",
Renderable = {
Type = "RenderablePlanetProjection",
Radius = charon_radius,
Geometry = {
Type = "SimpleSphere",
Radius = 6.035E5,
Radius = charon_radius,
Segments = 100
},
Textures = {
......
data/scene/missions/newhorizons/pluto/hydra/hydra.mod
+ 5
- 2
View file @ 3c213fae
local charon_radius = 0.53E5
if UseAccurateNewHorizonsKernels then
NewHorizonsKernels = {
"${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
"${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp"
}
else
NewHorizonsKernels = {
......@@ -17,9 +19,10 @@ return {
Type = "RenderablePlanet",
Frame = "IAU_PLUTO",
Body = "HYDRA",
Radius = charon_radius,
Geometry = {
Type = "SimpleSphere",
Radius = { 0.53 , 5 },
Radius = charon_radius,
Segments = 100
},
Textures = {
......
data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod
+ 5
- 2
View file @ 3c213fae
local kerberos_radius = 0.1E5
if UseAccurateNewHorizonsKernels then
NewHorizonsKernels = {
"${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
"${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp"
}
else
NewHorizonsKernels = {
......@@ -17,9 +19,10 @@ return {
Type = "RenderablePlanet",
Frame = "IAU_PLUTO",
Body = "KERBEROS",
Radius = kerberos_radius,
Geometry = {
Type = "SimpleSphere",
Radius = { 0.1 , 5 },
Radius = kerberos_radius,
Segments = 100
},
Textures = {
......
data/scene/missions/newhorizons/pluto/nix/nix.mod
+ 5
- 2
View file @ 3c213fae
local nix_radius = 0.45E5
if UseAccurateNewHorizonsKernels then
NewHorizonsKernels = {
"${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
"${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp"
}
else
NewHorizonsKernels = {
......@@ -17,9 +19,10 @@ return {
Type = "RenderablePlanet",
Frame = "IAU_PLUTO",
Body = "NIX",
Radius = nix_radius,
Geometry = {
Type = "SimpleSphere",
Radius = 0.45E5,
Radius = nix_radius,
Segments = 100
},
Textures = {
......
data/scene/missions/newhorizons/pluto/pluto/pluto.mod
+ 9
- 6
View file @ 3c213fae
local pluto_radius = 1.173E6
if UseAccurateNewHorizonsKernels then
NewHorizonsKernels = {
"${SPICE}/nh_kernels/spk/NavPE_de433_od122.bsp",
"${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
"${SPICE}/nh_20170126/spk/NavPE_de433_od122.bsp",
"${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp"
}
else
NewHorizonsKernels = {
......@@ -9,12 +11,12 @@ else
}
end
Files = {
local Files = {
low = "textures/pluto_large.jpg",
med = "textures/Shenk_180.jpg",
high = "textures/pmap_cyl_HR_LOR_lowres.jpg"
}
ColorTexture = Files[TextureResolution]
local ColorTexture = Files[TextureResolution]
return {
-- Pluto barycenter module
......@@ -36,9 +38,10 @@ return {
Parent = "PlutoBarycenter",
Renderable = {
Type = "RenderablePlanetProjection",
Radius = pluto_radius,
Geometry = {
Type = "SimpleSphere",
Radius = 1.173E6,
Radius = pluto_radius,
Segments = 100
},
Textures = {
......@@ -205,7 +208,7 @@ return {
Parent = "Pluto",
Renderable = {
Type = "RenderablePlane",
Size = {1.0, 6.4},
Size = 10.0^6.4,
Origin = "Center",
Billboard = true,
ProjectionListener = false,
......
data/scene/missions/newhorizons/pluto/styx/styx.mod
+ 5
- 2
View file @ 3c213fae
local styx_radius = 0.75E4
if UseAccurateNewHorizonsKernels then
NewHorizonsKernels = {
"${SPICE}/nh_kernels/spk/NavSE_plu047_od122.bsp"
"${SPICE}/nh_20170126/spk/NavSE_plu047_od122.bsp"
}
else
NewHorizonsKernels = {
......@@ -17,9 +19,10 @@ return {
Type = "RenderablePlanet",
Frame = "IAU_PLUTO",
Body = "STYX",
Radius = styx_radius,
Geometry = {
Type = "SimpleSphere",
Radius = 0.75E4,
Radius = styx_radius,
Segments = 100
},
Textures = {
......
data/scene/sun/sun.data
+ 1
- 1
View file @ 3c213fae
return {
FileRequest = {
{ Identifier = "sun_textures", Destination = "textures", Version = 1 }
{ Identifier = "sun_textures", Destination = "textures", Version = 3 }
},
}
\ No newline at end of file
ghoul @ c1daefdc
Compare 67827b14...c1daefdc
Subproject commit 67827b142e95122b66d58e7c402fe1a28a65631e
Subproject commit c1daefdce9a252d9048c4b9225f904cda3eb5f90
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

免费DevSecOps平台，让您的项目体验完整的DevSecOps流程，让项目更安全