diff --git a/.gitignore b/.gitignore index a39f0eb829..7b140e286b 100644 --- a/.gitignore +++ b/.gitignore @@ -55,8 +55,8 @@ data/scene/lodglobes/uranus/textures data/scene/lodglobes/venus/textures data/scene/mars/textures data/scene/mercury/textures -data/scene/milkyway/textures -data/scene/milkyway-eso/textures +data/scene/milkyway/digitaluniverse/textures +data/scene/milkyway/eso/textures data/scene/missions/dawn/ceres/textures data/scene/missions/dawn/dawn/obj data/scene/missions/dawn/dawn/textures @@ -98,12 +98,12 @@ data/scene/saturn/rhea/textures data/scene/saturn/saturn/textures data/scene/saturn/tethys/textures data/scene/saturn/titan/textures -data/scene/stars/colorbv.cmap -data/scene/stars/speck -data/scene/stars/textures -data/scene/stars-denver/denver_colorbv.cmap -data/scene/stars-denver/speck -data/scene/stars-denver/textures +data/scene/stars/digitaluniverse/colorbv.cmap +data/scene/stars/digitaluniverse/speck +data/scene/stars/digitaluniverse/textures +data/scene/stars/denver/denver_colorbv.cmap +data/scene/stars/denver/speck +data/scene/stars/denver/textures data/scene/sun/textures data/scene/uranus/textures data/scene/venus/textures diff --git a/CMakeLists.txt b/CMakeLists.txt index f9ee6ae66c..0f6773e6d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,9 +22,9 @@ # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # ########################################################################################## -cmake_minimum_required (VERSION 3.4 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8 FATAL_ERROR) -project (OpenSpace) +project(OpenSpace) message(STATUS "Generating OpenSpace project") set(OPENSPACE_VERSION_MAJOR 0) @@ -35,34 +35,210 @@ set(OPENSPACE_VERSION_STRING "prerelease-14 (Astronomy Live)") set(OPENSPACE_BASE_DIR "${PROJECT_SOURCE_DIR}") set(OPENSPACE_APPS_DIR "${OPENSPACE_BASE_DIR}/apps") set(OPENSPACE_EXT_DIR "${OPENSPACE_BASE_DIR}/ext") -set(OPENSPACE_MODULE_DIR "${OPENSPACE_BASE_DIR}/modules") set(OPENSPACE_CMAKE_EXT_DIR "${OPENSPACE_BASE_DIR}/support/cmake") set(GHOUL_BASE_DIR "${OPENSPACE_BASE_DIR}/ext/ghoul") -include(${OPENSPACE_CMAKE_EXT_DIR}/support_macros.cmake) include(${OPENSPACE_CMAKE_EXT_DIR}/module_common.cmake) -include(${GHOUL_BASE_DIR}/support/cmake/CopySharedLibraries.cmake) +include(${OPENSPACE_CMAKE_EXT_DIR}/global_variables.cmake) +include(${GHOUL_BASE_DIR}/support/cmake/copy_shared_libraries.cmake) +include(${OPENSPACE_CMAKE_EXT_DIR}/handle_applications.cmake) +include(${OPENSPACE_CMAKE_EXT_DIR}/handle_modules.cmake) -test_compiler_compatibility() -cleanup_project() -set_build_output_directories() +########################################################################################## +# Cleanup project # +########################################################################################## +set_property(GLOBAL PROPERTY USE_FOLDERS On) +set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER CMake) + +# Test compiler +if (MSVC AND (MSVC_VERSION LESS 1910)) + message(FATAL_ERROR "OpenSpace requires at least Visual Studio 2017.2") +endif () + +# Set build output directories +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${OPENSPACE_CMAKE_EXT_DIR}) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OPENSPACE_BASE_DIR}/bin) option(OPENSPACE_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF) include(src/CMakeLists.txt) -create_openspace_target() -add_external_dependencies() -handle_applications() + +########################################################################################## +# Add external dependencies # +########################################################################################## +# System libraries +if (APPLE) + target_include_directories(libOpenSpace PUBLIC "/Developer/Headers/FlatCarbon") + find_library(COREFOUNDATION_LIBRARY CoreFoundation) + find_library(CARBON_LIBRARY Carbon) + find_library(COCOA_LIBRARY Carbon) + find_library(APP_SERVICES_LIBRARY ApplicationServices) + mark_as_advanced(CARBON_LIBRARY COCOA_LIBRARY APP_SERVICES_LIBRARY) + target_link_libraries(libOpenSpace + ${CARBON_LIBRARY} + ${COREFOUNDATION_LIBRARY} + ${COCOA_LIBRARY} + ${APP_SERVICES_LIBRARY} + ) +endif() + +# Ghoul +add_subdirectory(${OPENSPACE_EXT_DIR}/ghoul) +target_link_libraries(libOpenSpace Ghoul) +set_property(TARGET Lua PROPERTY FOLDER "External") +set_property(TARGET lz4 PROPERTY FOLDER "External") + +# SGCT +set(SGCT_TEXT OFF CACHE BOOL "" FORCE) +set(SGCT_BUILD_CSHARP_PROJECTS OFF CACHE BOOL "" FORCE) +set(SGCT_LIGHT_ONLY ON CACHE BOOL "" FORCE) +set(SGCT_CUSTOMOUTPUTDIRS OFF CACHE BOOL "" FORCE) +set(JPEG_TURBO_WITH_SIMD OFF CACHE BOOL "" FORCE) + +add_subdirectory(${OPENSPACE_EXT_DIR}/sgct) +target_include_directories(libOpenSpace SYSTEM PUBLIC ${OPENSPACE_EXT_DIR}/sgct/include) +target_link_libraries( + libOpenSpace + sgct_light glew glfw png16_static quat tinyxml2static turbojpeg-static + vrpn + ${GLFW_LIBRARIES} +) + +set_property(TARGET sgct_light PROPERTY FOLDER "External") +if (TARGET glew) + set_property(TARGET glew PROPERTY FOLDER "External/SGCT") +endif () +if (TARGET glfw) + set_property(TARGET glfw PROPERTY FOLDER "External/SGCT") +endif () +if (TARGET png16_static) + set_property(TARGET png16_static PROPERTY FOLDER "External/SGCT") +endif () +if (TARGET quat) + set_property(TARGET quat PROPERTY FOLDER "External/SGCT") +endif () +if (TARGET simd) + set_property(TARGET simd PROPERTY FOLDER "External/SGCT") +endif () +if (TARGET tinyxml2static) + set_property(TARGET tinyxml2static PROPERTY FOLDER "External/SGCT") +endif () +if (TARGET turbojpeg-static) + set_property(TARGET turbojpeg-static PROPERTY FOLDER "External/SGCT") +endif () +if (TARGET vrpn) + set_property(TARGET vrpn PROPERTY FOLDER "External/SGCT") +endif () +if (TARGET zlibstatic) + set_property(TARGET zlibstatic PROPERTY FOLDER "External/SGCT") +endif () + +if (UNIX AND (NOT APPLE)) + target_link_libraries(libOpenSpace Xcursor Xinerama X11) +endif () + +# Spice +add_subdirectory(${OPENSPACE_EXT_DIR}/spice) +target_link_libraries(libOpenSpace Spice) +set_property(TARGET Spice PROPERTY FOLDER "External") + +# Curl +if (WIN32) + set(CURL_ROOT_DIR "${OPENSPACE_EXT_DIR}/curl") + target_include_directories(libOpenSpace SYSTEM PUBLIC ${CURL_ROOT_DIR}/include) + target_link_libraries(libOpenSpace ${CURL_ROOT_DIR}/lib/libcurl_imp.lib) + target_compile_definitions(libOpenSpace PUBLIC "OPENSPACE_CURL_ENABLED" "CURL_STATICLIB") +else () + find_package(CURL) + if (CURL_FOUND) + target_include_directories(libOpenSpace SYSTEM PUBLIC ${CURL_INCLUDE_DIRS}) + target_link_libraries(libOpenSpace ${CURL_LIBRARIES}) + target_compile_definitions(libOpenSpace PUBLIC "OPENSPACE_CURL_ENABLED") + endif () +endif() + +# Qt +# Unfortunately, we have to set this value manually; sigh +# In the future, if the Qt version is updated, just add to this variable ---abock +if (APPLE) + set(CMAKE_PREFIX_PATH + "~/Qt/5.6/clang_64/lib/cmake" + "~/Qt/5.7/clang_64/lib/cmake" + "~/Qt/5.8/clang_64/lib/cmake" + PARENT_SCOPE + ) +endif () if (MSVC) option(OPENSPACE_ENABLE_VLD "Enable the Visual Leak Detector" OFF) - handle_option_vld() + if (OPENSPACE_ENABLE_VLD) + target_compile_definitions(libOpenSpace PUBLIC "OPENSPACE_ENABLE_VLD") + target_link_libraries(libOpenSpace ${OPENSPACE_EXT_DIR}/vld/lib/vld.lib) + target_include_directories(libOpenSpace PUBLIC ${OPENSPACE_EXT_DIR}/vld) + endif () endif () + +########################################################################################## +# Tests # +########################################################################################## option(OPENSPACE_HAVE_TESTS "Activate the OpenSpace unit tests" ON) -handle_option_tests() +if (OPENSPACE_HAVE_TESTS) + if (NOT TARGET gtest) + set(BUILD_GTEST ON CACHE BOOL "") + set(BUILD_GMOCK OFF CACHE BOOL "") + set(gtest_force_shared_crt ON CACHE BOOL "") + add_subdirectory(${OPENSPACE_EXT_DIR}/ghoul/ext/googletest) + set_property(TARGET gtest PROPERTY FOLDER "External") + set_property(TARGET gtest_main PROPERTY FOLDER "External") + endif () -handle_internal_modules() -copy_dynamic_libraries() + file(GLOB_RECURSE OPENSPACE_TEST_FILES ${OPENSPACE_BASE_DIR}/tests/*.inl) + add_executable(OpenSpaceTest ${OPENSPACE_BASE_DIR}/tests/main.cpp ${OPENSPACE_TEST_FILES}) + target_include_directories(OpenSpaceTest PUBLIC + "${OPENSPACE_BASE_DIR}/include" + "${OPENSPACE_BASE_DIR}/tests" + "${OPENSPACE_EXT_DIR}/ghoul/ext/googletest/googletest/include" + ) + target_compile_definitions(OpenSpaceTest PUBLIC + "GHL_THROW_ON_ASSERT" + "GTEST_HAS_TR1_TUPLE=0" + ) + target_link_libraries(OpenSpaceTest gtest libOpenSpace) + + if (MSVC) + set_target_properties(OpenSpaceTest PROPERTIES LINK_FLAGS + "/NODEFAULTLIB:LIBCMTD.lib /NODEFAULTLIB:LIBCMT.lib" + ) + endif () + set_openspace_compile_settings(OpenSpaceTest) +endif (OPENSPACE_HAVE_TESTS) +if (TARGET GhoulTest) + if (NOT TARGET gtest) + set(BUILD_GTEST ON CACHE BOOL "") + set(BUILD_GMOCK OFF CACHE BOOL "") + set(gtest_force_shared_crt ON CACHE BOOL "") + add_subdirectory(${OPENSPACE_EXT_DIR}/ghoul/ext/googletest) + endif () + + set_property(TARGET gtest PROPERTY FOLDER "External") + set_property(TARGET GhoulTest PROPERTY FOLDER "Unit Tests") +endif () + +set(OPENSPACE_EXTERNAL_MODULES_PATHS "" CACHE STRING "List of external modules") +handle_modules("${OPENSPACE_BASE_DIR}/modules" "${OPENSPACE_EXTERNAL_MODULES_PATHS}") + +handle_applications() + +########################################################################################## +# Misc settings # +########################################################################################## +# Just in case, create the bin directory +add_custom_command( + TARGET libOpenSpace + PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} +) + +# Manage the CPack packaging include(${OPENSPACE_CMAKE_EXT_DIR}/packaging.cmake) diff --git a/Jenkinsfile b/Jenkinsfile index 6bec006822..4beec961ab 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,7 +26,9 @@ echo flags stage('Build') { parallel linux: { node('linux') { - timeout(time: 30, unit: 'MINUTES') { + timeout(time: 45, unit: 'MINUTES') { + + deleteDir() checkout scm sh 'git submodule update --init --recursive' sh ''' @@ -41,22 +43,27 @@ stage('Build') { }, windows: { node('windows') { - timeout(time: 30, unit: 'MINUTES') { - checkout scm - bat ''' - git submodule update --init --recursive - if not exist "build" mkdir "build" - cd build - cmake -G "Visual Studio 15 2017 Win64" .. ''' + - flags + ''' .. - msbuild.exe OpenSpace.sln /nologo /verbosity:minimal /m:2 /p:Configuration=Debug - ''' + timeout(time: 45, unit: 'MINUTES') { + // We specify the workspace directory manually to reduce the path length and thus try to avoid MSB3491 on Visual Studio + ws("C:/J/O/${env.BRANCH_NAME}") { + deleteDir() + checkout scm + bat ''' + git submodule update --init --recursive + if not exist "build" mkdir "build" + cd build + cmake -G "Visual Studio 15 2017 Win64" .. ''' + + flags + ''' .. + msbuild.exe OpenSpace.sln /nologo /verbosity:minimal /m:2 /p:Configuration=Debug + ''' + } } } }, osx: { node('osx') { - timeout(time: 30, unit: 'MINUTES') { + timeout(time: 45, unit: 'MINUTES') { + deleteDir() checkout scm sh 'git submodule update --init --recursive' sh ''' diff --git a/apps/Launcher/CMakeLists.txt b/apps/Launcher/CMakeLists.txt index 0b2cfba232..9974d554ff 100644 --- a/apps/Launcher/CMakeLists.txt +++ b/apps/Launcher/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2015 # +# Copyright (c) 2014-2017 # # # # Permission is hereby granted, free of charge, to any person obtaining a copy of this # # software and associated documentation files (the "Software"), to deal in the Software # @@ -22,64 +22,56 @@ # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # ######################################################################################### -set(APPLICATION_NAME Launcher) -set(APPLICATION_LINK_TO_OPENSPACE ON) - -if (WIN32) - set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/Launcher/openspace.rc) -endif () - +include(${OPENSPACE_CMAKE_EXT_DIR}/application_definition.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) set(SOURCE_FILES - ${application_path}/main.cpp - ${application_path}/infowidget.cpp - ${application_path}/mainwindow.cpp - ${application_path}/shortcutwidget.cpp - ${application_path}/syncwidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/infowidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/shortcutwidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/syncwidget.cpp ) set(HEADER_FILES - ${application_path}/infowidget.h - ${application_path}/mainwindow.h - ${application_path}/shortcutwidget.h - ${application_path}/syncwidget.h -) + ${CMAKE_CURRENT_SOURCE_DIR}/infowidget.h + ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow.h + ${CMAKE_CURRENT_SOURCE_DIR}/shortcutwidget.h + ${CMAKE_CURRENT_SOURCE_DIR}/syncwidget.h +) -find_package(Qt5Core REQUIRED) -find_package(Qt5Widgets REQUIRED) -find_package(Qt5Network REQUIRED) +find_package(Qt5 COMPONENTS Core Widgets Network REQUIRED) -set(MOC_FILES "") qt5_wrap_cpp(MOC_FILES ${HEADER_FILES}) -set(RESOURCE_FILES "") -qt5_add_resources(RESOURCE_FILES ${application_path}/files.qrc) +qt5_add_resources(RESOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/files.qrc) -add_executable(${APPLICATION_NAME} MACOSX_BUNDLE +create_new_application( + Launcher + MACOSX_BUNDLE ${SOURCE_FILES} ${HEADER_FILES} + ${OPENSPACE_APPS_DIR}/Launcher/openspace.rc ${MOC_FILES} - ${RESOURCE_FILE} ${RESOURCE_FILES} ) -set_compile_settings(${APPLICATION_NAME}) - -target_link_libraries(${APPLICATION_NAME} +target_link_libraries( + Launcher + libOpenSpace Qt5::Widgets Qt5::Network ) -#if (APPLE) -# INSTALL(CODE " -# include(BundleUtilities) -# fixup_bundle(\"${application_path}/bin/openspace/Debug/Launcher.app/Contents/MacOS/Launcher\" \"${application_path}/bin/openspace/Debug/TimelineView.app/Contents/plugins/platforms/libqcocoa.dylib\" \"\") -# " COMPONENT Runtime) -#endif () - +##### # Libtorrent -include_external_library(${APPLICATION_NAME} libtorrent ${application_path}/ext/libtorrent) -target_include_directories(${APPLICATION_NAME} SYSTEM PUBLIC ${application_path}/ext/libtorrent/include) +##### +include_external_library( + Launcher + libtorrent + ${CMAKE_CURRENT_SOURCE_DIR}/ext/libtorrent +) +target_include_directories( + Launcher + SYSTEM PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/ext/libtorrent/include +) diff --git a/apps/Launcher/include.cmake b/apps/Launcher/include.cmake new file mode 100644 index 0000000000..7ac26b6f4f --- /dev/null +++ b/apps/Launcher/include.cmake @@ -0,0 +1 @@ +set(DEFAULT_APPLICATION ON) diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt index a2c52bed76..f6929be081 100644 --- a/apps/OpenSpace/CMakeLists.txt +++ b/apps/OpenSpace/CMakeLists.txt @@ -22,20 +22,14 @@ # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # ########################################################################################## -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) - -if (WIN32) - set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc) -endif () +include(${GHOUL_BASE_DIR}/support/cmake/copy_shared_libraries.cmake) +include(${OPENSPACE_CMAKE_EXT_DIR}/application_definition.cmake) +include(${OPENSPACE_CMAKE_EXT_DIR}/global_variables.cmake) -######################## -# OpenVR section start # -######################## +##### +# OpenVR +##### option(OPENSPACE_OPENVR_SUPPORT "Build OpenSpace application with OpenVR support" OFF) if (OPENSPACE_OPENVR_SUPPORT) @@ -45,91 +39,79 @@ if (OPENSPACE_OPENVR_SUPPORT) set(SGCT_OPENVR_DEFINITIONS OPENVR_SUPPORT) - if(NOT SGCT_OPENVR_INCLUDE_DIRECTORY) - if( WIN32 ) + if (NOT SGCT_OPENVR_INCLUDE_DIRECTORY) + if (WIN32) find_path(SGCT_OPENVR_INCLUDE_DIRECTORY NAMES SGCTOpenVR.h - PATHS $ENV{SGCT_ROOT_DIR}/additional_includes/openvr ${OPENSPACE_EXT_DIR}/sgct/additional_includes/openvr NO_DEFAULT_PATH - REQUIRED) - else() + PATHS + $ENV{SGCT_ROOT_DIR}/additional_includes/openvr + ${OPENSPACE_EXT_DIR}/sgct/additional_includes/openvr + NO_DEFAULT_PATH + REQUIRED + ) + else () find_path(SGCT_OPENVR_INCLUDE_DIRECTORY NAMES SGCTOpenVR.h PATH_SUFFIXES SGCTOpenVR - PATHS $ENV{SGCT_ROOT_DIR}/additional_includes/openvr ${OPENSPACE_EXT_DIR}/sgct/additional_includes/openvr - REQUIRED) - endif() + PATHS + $ENV{SGCT_ROOT_DIR}/additional_includes/openvr + ${OPENSPACE_EXT_DIR}/sgct/additional_includes/openvr + REQUIRED + ) + endif () else() - set(SGCT_OPENVR_FILES ${SGCT_OPENVR_INCLUDE_DIRECTORY}/SGCTOpenVR.h ${SGCT_OPENVR_INCLUDE_DIRECTORY}/SGCTOpenVR.cpp) + set( + SGCT_OPENVR_FILES + ${SGCT_OPENVR_INCLUDE_DIRECTORY}/SGCTOpenVR.h + ${SGCT_OPENVR_INCLUDE_DIRECTORY}/SGCTOpenVR.cpp + ) endif() -else() - set(OPENVR_INCLUDE_DIRS "") - set(SGCT_OPENVR_INCLUDE_DIRECTORY "") - set(OPENVR_LIBRARY "") - set(SGCT_OPENVR_DEFINITIONS "") endif() -######################## -# OpenVR section end # -######################## -######################## -# Spout section start # -######################## +##### +# Spout +##### if (WIN32) option(OPENSPACE_SPOUT_SUPPORT "Build OpenSpace application with Spout support" OFF) endif () -set(SPOUT_INCLUDE_DIRS "") -set(SPOUT_LIBRARY "") -set(SPOUT_DEFINITIONS "") if (OPENSPACE_SPOUT_SUPPORT) - set(SPOUT_INCLUDE_DIRS ${OPENSPACE_APPS_DIR}/OpenSpace/ext/spout) - set(SPOUT_LIBRARY ${OPENSPACE_APPS_DIR}/OpenSpace/ext/spout/SpoutLibrary.lib) + set(SPOUT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/ext/spout) + set(SPOUT_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/ext/spout/SpoutLibrary.lib) set(SPOUT_DEFINITIONS "OPENSPACE_HAS_SPOUT") set(SGCT_SPOUT_SUPPORT ON CACHE BOOL "" FORCE) - endif () -######################## -# Spout section end # -######################## - -add_executable(${APPLICATION_NAME} - ${SGCT_OPENVR_FILES} - ${OPENSPACE_APPS_DIR}/OpenSpace/main.cpp - ${RESOURCE_FILE} -) if (OPENSPACE_SPOUT_SUPPORT) - ghl_copy_files( - ${APPLICATION_NAME} - ${OPENSPACE_APPS_DIR}/OpenSpace/ext/spout/SpoutLibrary.dll - ) + add_external_library_dependencies(${CMAKE_CURRENT_SOURCE_DIR}/ext/spout/SpoutLibrary.dll) endif () +create_new_application(OpenSpace + ${SGCT_OPENVR_FILES} + ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/openspace.rc +) + target_include_directories( - ${APPLICATION_NAME} PUBLIC - ${OPENSPACE_BASE_DIR}/include + OpenSpace PRIVATE ${OPENVR_INCLUDE_DIRS} ${SGCT_OPENVR_INCLUDE_DIRECTORY} ${SPOUT_INCLUDE_DIRS} ) -target_link_libraries(${APPLICATION_NAME} +target_link_libraries(OpenSpace libOpenSpace ${OPENVR_LIBRARY} ${SPOUT_LIBRARY} ) -target_compile_definitions(${APPLICATION_NAME} PUBLIC +target_compile_definitions(OpenSpace PRIVATE ${SGCT_OPENVR_DEFINITIONS} ${SPOUT_DEFINITIONS} ) if (MSVC) - target_link_libraries(${APPLICATION_NAME} Dbghelp.lib) - set_target_properties(${APPLICATION_NAME} PROPERTIES LINK_FLAGS - "/NODEFAULTLIB:LIBCMTD.lib /NODEFAULTLIB:LIBCMT.lib" - ) + # This library is used for being able to output the callstack if an exception escapes + target_link_libraries(OpenSpace Dbghelp.lib) endif() - -set_compile_settings(${APPLICATION_NAME}) diff --git a/apps/OpenSpace/include.cmake b/apps/OpenSpace/include.cmake new file mode 100644 index 0000000000..7ac26b6f4f --- /dev/null +++ b/apps/OpenSpace/include.cmake @@ -0,0 +1 @@ +set(DEFAULT_APPLICATION ON) diff --git a/apps/TaskRunner/CMakeLists.txt b/apps/TaskRunner/CMakeLists.txt index f05c53d6a9..aceb7cad88 100644 --- a/apps/TaskRunner/CMakeLists.txt +++ b/apps/TaskRunner/CMakeLists.txt @@ -1,41 +1,36 @@ -######################################################################################### -# # -# OpenSpace # -# # -# Copyright (c) 2014-2016 # -# # -# Permission is hereby granted, free of charge, to any person obtaining a copy of this # -# software and associated documentation files (the "Software"), to deal in the Software # -# without restriction, including without limitation the rights to use, copy, modify, # -# merge, publish, distribute, sublicense, and/or sell copies of the Software, and to # -# permit persons to whom the Software is furnished to do so, subject to the following # -# conditions: # -# # -# The above copyright notice and this permission notice shall be included in all copies # -# or substantial portions of the Software. # -# # -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, # -# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A # -# PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT # -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF # -# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE # -# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -######################################################################################### +########################################################################################## +# # +# OpenSpace # +# # +# Copyright (c) 2014-2017 # +# # +# Permission is hereby granted, free of charge, to any person obtaining a copy of this # +# software and associated documentation files (the "Software"), to deal in the Software # +# without restriction, including without limitation the rights to use, copy, modify, # +# merge, publish, distribute, sublicense, and/or sell copies of the Software, and to # +# permit persons to whom the Software is furnished to do so, subject to the following # +# conditions: # +# # +# The above copyright notice and this permission notice shall be included in all copies # +# or substantial portions of the Software. # +# # +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, # +# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A # +# PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT # +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF # +# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE # +# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # +########################################################################################## -set(APPLICATION_NAME TaskRunner) -set(APPLICATION_LINK_TO_OPENSPACE ON) +include(${OPENSPACE_CMAKE_EXT_DIR}/application_definition.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}/TaskRunner) - -set(SOURCE_FILES - ${application_path}/main.cpp +create_new_application( + TaskRunner + MACOSX_BUNDLE + ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ) -add_executable(${APPLICATION_NAME} MACOSX_BUNDLE - ${SOURCE_FILES} +target_link_libraries( + TaskRunner + libOpenSpace ) - -set_compile_settings(${APPLICATION_NAME}) diff --git a/apps/TimelineView/CMakeLists.txt b/apps/TimelineView/CMakeLists.txt index 4c12ca288a..58e331672f 100644 --- a/apps/TimelineView/CMakeLists.txt +++ b/apps/TimelineView/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2015 # +# Copyright (c) 2014-2017 # # # # Permission is hereby granted, free of charge, to any person obtaining a copy of this # # software and associated documentation files (the "Software"), to deal in the Software # @@ -22,6 +22,8 @@ # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # ######################################################################################### +include(${OPENSPACE_CMAKE_EXT_DIR}/application_definition.cmake) + set(APPLICATION_NAME TimelineView) set(APPLICATION_LINK_TO_OPENSPACE OFF) @@ -48,7 +50,7 @@ find_package(Qt5Network) set(MOC_FILES "") qt5_wrap_cpp(MOC_FILES ${HEADER_FILES}) -add_executable(${APPLICATION_NAME} MACOSX_BUNDLE ${SOURCE_FILES} ${HEADER_FILES} ${MOC_FILES}) +create_new_application(${APPLICATION_NAME} MACOSX_BUNDLE ${SOURCE_FILES} ${HEADER_FILES} ${MOC_FILES}) target_link_libraries(${APPLICATION_NAME} Qt5::Widgets diff --git a/data/scene/atmosphereearth.scene b/data/scene/atmosphereearth.scene new file mode 100644 index 0000000000..bbfaf10dd1 --- /dev/null +++ b/data/scene/atmosphereearth.scene @@ -0,0 +1,55 @@ +function preInitialization() + --[[ + The scripts in this function are executed after the scene is loaded but before the + scene elements have been initialized, thus they should be used to set the time at + which the scene should start and other settings that might determine initialization + critical objects. + ]]-- + + openspace.spice.loadKernel("${SPICE}/naif0012.tls") + openspace.spice.loadKernel("${SPICE}/pck00010.tpc") + + openspace.time.setTime(openspace.time.currentWallTime()) + dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua')) +end + +function postInitialization() + --[[ + The scripts in this function are executed after all objects in the scene have been + created and initialized, but before the first render call. This is the place to set + graphical settings for the renderables. + ]]-- + openspace.printInfo("Setting default values") + openspace.setPropertyValue("Sun.renderable.Enabled", false) + openspace.setPropertyValue("SunMarker.renderable.Enabled", true) + openspace.setPropertyValue("EarthMarker.renderable.enabled", true) + openspace.setPropertyValue("Constellation Bounds.renderable.Enabled", false) + + openspace.setPropertyValue("MilkyWay.renderable.Transparency", 0.55) + openspace.setPropertyValue("MilkyWay.renderable.Segments", 50) + + openspace.printInfo("Done setting default values") + + if openspace.modules.isLoaded("ISWA") then + openspace.iswa.addCdfFiles("${OPENSPACE_DATA}/cdflist.json"); + end +end + + +return { + ScenePath = ".", + CommonFolder = "common", + Camera = { + Focus = "Earth", + Position = {1, 0, 0}, + Rotation = {0.250635, -0.028751, 0.879269, 0.404030}, + }, + Modules = { + "sun", + "earth", + "stars/digitaluniverse", + -- "stars/denver", + "milkyway/digitaluniverse", + --"milkyway/eso", + } +} diff --git a/data/scene/lodglobes/arrows.png b/data/scene/common/textures/arrows.png similarity index 100% rename from data/scene/lodglobes/arrows.png rename to data/scene/common/textures/arrows.png diff --git a/data/scene/constellationbounds/constellationbounds.mod b/data/scene/constellationbounds/constellationbounds.mod index beb1295d26..fe5e3b2122 100644 --- a/data/scene/constellationbounds/constellationbounds.mod +++ b/data/scene/constellationbounds/constellationbounds.mod @@ -1,3 +1,8 @@ +local zodiacs = { + "Cancer", "Taurus", "Pisces", "Aries", "Libra", "Aquarius", "Capricornus", "Scorpius", + "Virgo", "Sagittarius", "Gemini", "Leo" +} + return { -- Stars module { @@ -6,7 +11,8 @@ return { Renderable = { Type = "RenderableConstellationBounds", File = "${OPENSPACE_DATA}/scene/constellationbounds/data/bound_20.dat", - ConstellationFile = "${OPENSPACE_DATA}/scene/constellationbounds/data/constellations.dat" + ConstellationFile = "${OPENSPACE_DATA}/scene/constellationbounds/data/constellations.dat", + -- ConstellationSelection = zodiacs }, Transform = { Rotation = { diff --git a/data/scene/dawn.scene b/data/scene/dawn.scene index a18bf0c916..6dddbc93fd 100644 --- a/data/scene/dawn.scene +++ b/data/scene/dawn.scene @@ -51,8 +51,10 @@ return { "uranus", "neptune", "pluto", - "stars", - "milkyway", + "stars/digitaluniverse", + -- "stars/denver", + "milkyway/digitaluniverse", + --"milkyway/eso", "missions/dawn" } } diff --git a/data/scene/default.scene b/data/scene/default.scene index b887f7de54..ab12d4bc64 100644 --- a/data/scene/default.scene +++ b/data/scene/default.scene @@ -1,3 +1,8 @@ +-- Add folders to this list that contain .info files describing HiRISE patches +local mars_folders = { + -- Add a folder here whose contents will be automatically added to the Mars globe +} + function preInitialization() --[[ The scripts in this function are executed after the scene is loaded but before the @@ -11,35 +16,76 @@ function preInitialization() openspace.time.setTime(openspace.time.currentWallTime()) dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua')) + + + -- Toggle night texture, shading, atmosphere and water + openspace.bindKey("s", + helper.property.invert('Earth.RenderableGlobe.Layers.NightLayers.Earth at Night 2012.Enabled') .. + helper.property.invert('Earth.RenderableGlobe.PerformShading') .. + helper.property.invert('Earth.RenderableGlobe.Atmosphere') .. + helper.property.invert('Earth.RenderableGlobe.Layers.WaterMasks.MODIS_Water_Mask.Enabled'), + "Toggle night texture, shading, atmosphere, and water for Earth." + ) + + -- Toggle background + openspace.bindKey("b", + helper.property.invert('MilkyWay.renderable.Enabled') .. + helper.property.invert('Stars.renderable.Enabled'), + "Toggle background (Stars and Milkyway)." + ) + + openspace.bindKey("g", + helper.property.invert('MilkyWay.renderable.Enabled') .. + helper.property.invert('Stars.renderable.Enabled') .. + helper.property.invert('Earth.RenderableGlobe.Layers.NightLayers.Earth at Night 2012.Enabled') .. + helper.property.invert('Earth.RenderableGlobe.PerformShading') .. + helper.property.invert('Mars.RenderableGlobe.PerformShading') .. + helper.property.invert('Earth.RenderableGlobe.Atmosphere') .. + helper.property.invert('Earth.RenderableGlobe.Layers.WaterMasks.MODIS_Water_Mask.Enabled') .. + helper.property.invert('Moon.RenderableGlobe.Enabled') .. + helper.property.invert('Sun.renderable.Enabled'), + "Toogles background and shading mode on the Earth and Mars alongside visibility of the Moon and the Sun" + ) + + openspace.bindKey("h", + "openspace.setPropertyValue('*Trail.renderable.Enabled', false)", + "Disables visibility of the trails" + ) end function postInitialization() - --[[ - The scripts in this function are executed after all objects in the scene have been - created and initialized, but before the first render call. This is the place to set - graphical settings for the renderables. - ]]-- - openspace.printInfo("Setting default values") - openspace.setPropertyValue("SunMarker.renderable.Enabled", false) - openspace.setPropertyValue("EarthMarker.renderable.Enabled", false) - openspace.setPropertyValue("Constellation Bounds.renderable.Enabled", false) - - openspace.setPropertyValue("MilkyWay.renderable.Transparency", 0.55) - openspace.setPropertyValue("MilkyWay.renderable.Segments", 50) - openspace.addVirtualProperty( "BoolProperty", "Show Trails", - "*Trail.renderable.enabled", + "*Trail.renderable.Enabled", "Disable or enable all trails of the scene at the same time", true, nil, nil ) - openspace.navigation.resetCameraDirection() + openspace.printInfo("Setting default values") + + openspace.setPropertyValue("SunGlare.renderable.Enabled", false) + openspace.setPropertyValue("SunMarker.renderable.Enabled", false) + + openspace.setPropertyValue("Constellation Bounds.renderable.Enabled", false) + + openspace.setPropertyValue("Earth.RenderableGlobe.Atmosphere", false) + openspace.setPropertyValue("Earth.RenderableGlobe.Debug.LevelByProjectedAreaElseDistance", false) + + openspace.setPropertyValue("Ecliptic Grid.renderable.Enabled", false) + openspace.setPropertyValue("Equatorial Grid.renderable.Enabled", false) + openspace.setPropertyValue("Galactic Grid.renderable.Enabled", false) + + openspace.globebrowsing.goToGeo(58.5877, 16.1924, 20000000) openspace.printInfo("Done setting default values") + + -- Add the HiRISE patches described at the top of this file + for _, file in pairs(mars_folders) do + openspace.globebrowsing.addBlendingLayersFromDirectory(file, "Mars") + end end @@ -48,23 +94,27 @@ return { CommonFolder = "common", Camera = { Focus = "Earth", - Position = {505370268486.696167, 1089706179272.719116, -890259148524.319458}, - Rotation = {0.250635, -0.028751, 0.879269, 0.404030}, + Position = {0, 0, 0}, + Rotation = {0.758797, 0.221490, -0.605693, -0.091135}, }, Modules = { "sun", "mercury", "venus", "earth", + "moon", "mars", "jupiter", "saturn", "uranus", "neptune", - "stars", - -- "stars-denver", - "milkyway", - --"milkyway-eso", + "stars/digitaluniverse", + -- "stars/denver", + "milkyway/digitaluniverse", + --"milkyway/eso", + -- "satellites" "constellationbounds", + "grids" } } + diff --git a/data/scene/batsrus/batsrus.mod b/data/scene/deprecated/batsrus/batsrus.mod similarity index 100% rename from data/scene/batsrus/batsrus.mod rename to data/scene/deprecated/batsrus/batsrus.mod diff --git a/data/scene/batsrus/psampler.glsl b/data/scene/deprecated/batsrus/psampler.glsl similarity index 100% rename from data/scene/batsrus/psampler.glsl rename to data/scene/deprecated/batsrus/psampler.glsl diff --git a/data/scene/batsrus/rhosampler.glsl b/data/scene/deprecated/batsrus/rhosampler.glsl similarity index 100% rename from data/scene/batsrus/rhosampler.glsl rename to data/scene/deprecated/batsrus/rhosampler.glsl diff --git a/data/scene/batsrus/transferfunctions/p.txt b/data/scene/deprecated/batsrus/transferfunctions/p.txt similarity index 100% rename from data/scene/batsrus/transferfunctions/p.txt rename to data/scene/deprecated/batsrus/transferfunctions/p.txt diff --git a/data/scene/batsrus/transferfunctions/rho.txt b/data/scene/deprecated/batsrus/transferfunctions/rho.txt similarity index 100% rename from data/scene/batsrus/transferfunctions/rho.txt rename to data/scene/deprecated/batsrus/transferfunctions/rho.txt diff --git a/data/scene/enlil/enlil.cl b/data/scene/deprecated/enlil/enlil.cl similarity index 100% rename from data/scene/enlil/enlil.cl rename to data/scene/deprecated/enlil/enlil.cl diff --git a/data/scene/enlil/enlil.mod b/data/scene/deprecated/enlil/enlil.mod similarity index 100% rename from data/scene/enlil/enlil.mod rename to data/scene/deprecated/enlil/enlil.mod diff --git a/data/scene/enlil/sampler.glsl b/data/scene/deprecated/enlil/sampler.glsl similarity index 100% rename from data/scene/enlil/sampler.glsl rename to data/scene/deprecated/enlil/sampler.glsl diff --git a/data/scene/enlil/transferfunctions/t1.txt b/data/scene/deprecated/enlil/transferfunctions/t1.txt similarity index 100% rename from data/scene/enlil/transferfunctions/t1.txt rename to data/scene/deprecated/enlil/transferfunctions/t1.txt diff --git a/data/scene/enlil/transferfunctions/t2.txt b/data/scene/deprecated/enlil/transferfunctions/t2.txt similarity index 100% rename from data/scene/enlil/transferfunctions/t2.txt rename to data/scene/deprecated/enlil/transferfunctions/t2.txt diff --git a/data/scene/enlilnh/enlilnh.mod b/data/scene/deprecated/enlilnh/enlilnh.mod similarity index 100% rename from data/scene/enlilnh/enlilnh.mod rename to data/scene/deprecated/enlilnh/enlilnh.mod diff --git a/data/scene/enlilnh/transferfunctions/fire.txt b/data/scene/deprecated/enlilnh/transferfunctions/fire.txt similarity index 100% rename from data/scene/enlilnh/transferfunctions/fire.txt rename to data/scene/deprecated/enlilnh/transferfunctions/fire.txt diff --git a/data/scene/flare/TSPTraversal_cs.glsl b/data/scene/deprecated/flare/TSPTraversal_cs.glsl similarity index 100% rename from data/scene/flare/TSPTraversal_cs.glsl rename to data/scene/deprecated/flare/TSPTraversal_cs.glsl diff --git a/data/scene/flare/TSPTraversal_fs.glsl b/data/scene/deprecated/flare/TSPTraversal_fs.glsl similarity index 100% rename from data/scene/flare/TSPTraversal_fs.glsl rename to data/scene/deprecated/flare/TSPTraversal_fs.glsl diff --git a/data/scene/flare/fire.txt b/data/scene/deprecated/flare/fire.txt similarity index 100% rename from data/scene/flare/fire.txt rename to data/scene/deprecated/flare/fire.txt diff --git a/data/scene/flare/flare.mod b/data/scene/deprecated/flare/flare.mod similarity index 100% rename from data/scene/flare/flare.mod rename to data/scene/deprecated/flare/flare.mod diff --git a/data/scene/flare/helpers_cs.hglsl b/data/scene/deprecated/flare/helpers_cs.hglsl similarity index 100% rename from data/scene/flare/helpers_cs.hglsl rename to data/scene/deprecated/flare/helpers_cs.hglsl diff --git a/data/scene/flare/passthrough_vs.glsl b/data/scene/deprecated/flare/passthrough_vs.glsl similarity index 100% rename from data/scene/flare/passthrough_vs.glsl rename to data/scene/deprecated/flare/passthrough_vs.glsl diff --git a/data/scene/flare/raycasterTSP_cs.glsl b/data/scene/deprecated/flare/raycasterTSP_cs.glsl similarity index 100% rename from data/scene/flare/raycasterTSP_cs.glsl rename to data/scene/deprecated/flare/raycasterTSP_cs.glsl diff --git a/data/scene/flare/raycasterTSP_fs.glsl b/data/scene/deprecated/flare/raycasterTSP_fs.glsl similarity index 100% rename from data/scene/flare/raycasterTSP_fs.glsl rename to data/scene/deprecated/flare/raycasterTSP_fs.glsl diff --git a/data/scene/iswa/cdf/fieldlines.json b/data/scene/deprecated/iswa/cdf/fieldlines.json similarity index 100% rename from data/scene/iswa/cdf/fieldlines.json rename to data/scene/deprecated/iswa/cdf/fieldlines.json diff --git a/data/scene/iswa/tfs/autumn.tf b/data/scene/deprecated/iswa/tfs/autumn.tf similarity index 100% rename from data/scene/iswa/tfs/autumn.tf rename to data/scene/deprecated/iswa/tfs/autumn.tf diff --git a/data/scene/iswa/tfs/blue.jpg b/data/scene/deprecated/iswa/tfs/blue.jpg similarity index 100% rename from data/scene/iswa/tfs/blue.jpg rename to data/scene/deprecated/iswa/tfs/blue.jpg diff --git a/data/scene/iswa/tfs/ccmc-cdf.tf b/data/scene/deprecated/iswa/tfs/ccmc-cdf.tf similarity index 100% rename from data/scene/iswa/tfs/ccmc-cdf.tf rename to data/scene/deprecated/iswa/tfs/ccmc-cdf.tf diff --git a/data/scene/iswa/tfs/colormap_autumn.png b/data/scene/deprecated/iswa/tfs/colormap_autumn.png similarity index 100% rename from data/scene/iswa/tfs/colormap_autumn.png rename to data/scene/deprecated/iswa/tfs/colormap_autumn.png diff --git a/data/scene/iswa/tfs/colormap_hot.jpg b/data/scene/deprecated/iswa/tfs/colormap_hot.jpg similarity index 100% rename from data/scene/iswa/tfs/colormap_hot.jpg rename to data/scene/deprecated/iswa/tfs/colormap_hot.jpg diff --git a/data/scene/iswa/tfs/colormap_hot.png b/data/scene/deprecated/iswa/tfs/colormap_hot.png similarity index 100% rename from data/scene/iswa/tfs/colormap_hot.png rename to data/scene/deprecated/iswa/tfs/colormap_hot.png diff --git a/data/scene/iswa/tfs/colormap_parula.jpg b/data/scene/deprecated/iswa/tfs/colormap_parula.jpg similarity index 100% rename from data/scene/iswa/tfs/colormap_parula.jpg rename to data/scene/deprecated/iswa/tfs/colormap_parula.jpg diff --git a/data/scene/iswa/tfs/colormap_parula.png b/data/scene/deprecated/iswa/tfs/colormap_parula.png similarity index 100% rename from data/scene/iswa/tfs/colormap_parula.png rename to data/scene/deprecated/iswa/tfs/colormap_parula.png diff --git a/data/scene/iswa/tfs/default.tf b/data/scene/deprecated/iswa/tfs/default.tf similarity index 100% rename from data/scene/iswa/tfs/default.tf rename to data/scene/deprecated/iswa/tfs/default.tf diff --git a/data/scene/iswa/tfs/green.jpg b/data/scene/deprecated/iswa/tfs/green.jpg similarity index 100% rename from data/scene/iswa/tfs/green.jpg rename to data/scene/deprecated/iswa/tfs/green.jpg diff --git a/data/scene/iswa/tfs/hot.tf b/data/scene/deprecated/iswa/tfs/hot.tf similarity index 100% rename from data/scene/iswa/tfs/hot.tf rename to data/scene/deprecated/iswa/tfs/hot.tf diff --git a/data/scene/iswa/tfs/parula.tf b/data/scene/deprecated/iswa/tfs/parula.tf similarity index 100% rename from data/scene/iswa/tfs/parula.tf rename to data/scene/deprecated/iswa/tfs/parula.tf diff --git a/data/scene/iswa/tfs/red.jpg b/data/scene/deprecated/iswa/tfs/red.jpg similarity index 100% rename from data/scene/iswa/tfs/red.jpg rename to data/scene/deprecated/iswa/tfs/red.jpg diff --git a/data/scene/iswa/tfs/rgb.tf b/data/scene/deprecated/iswa/tfs/rgb.tf similarity index 100% rename from data/scene/iswa/tfs/rgb.tf rename to data/scene/deprecated/iswa/tfs/rgb.tf diff --git a/data/scene/earth/earth.data b/data/scene/earth/earth.data deleted file mode 100644 index e168d4c8be..0000000000 --- a/data/scene/earth/earth.data +++ /dev/null @@ -1,5 +0,0 @@ -return { - FileRequest = { - { Identifier = "earth_textures", Destination = "textures", Version = 2 } - }, -} diff --git a/data/scene/earth/earth.mod b/data/scene/earth/earth.mod index ea349d40ce..8d53405b58 100644 --- a/data/scene/earth/earth.mod +++ b/data/scene/earth/earth.mod @@ -1,3 +1,6 @@ +--earthEllipsoid = {6378137.0, 6378137.0, 6356752.314245} -- Earth's radii +earthEllipsoid = {6378137.0, 6378137.0, 6378137.0} -- Earth's radii + return { -- Earth barycenter module { @@ -6,7 +9,7 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = "EARTH", + Target = "EARTH", Observer = "SUN", Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" } @@ -20,43 +23,9 @@ return { Rotation = { Type = "SpiceRotation", SourceFrame = "J2000", - DestinationFrame = "GALACTIC", + DestinationFrame = "GALACTIC" } - }, - }, - -- Earth module - { - Name = "Earth", - Parent = "EarthBarycenter", - Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_EARTH", - Body = "EARTH", - Geometry = { - Type = "SimpleSphere", - Radius = 6.3781365E6, - Segments = 100 - }, - Textures = { - Type = "simple", - Color = "textures/earth_bluemarble.jpg", - Night = "textures/earth_night.jpg", - Height = "textures/earth_bluemarble_height.jpg" - }, - }, - Tag = {"planet_solarSystem", "planet_terrestrial"}, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_EARTH", - DestinationFrame = "GALACTIC", - }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, - }, - GuiName = "/Solar/Planets/Earth" + } }, -- Earth Atmosphere { @@ -65,66 +34,85 @@ return { Renderable = { Type = "RenderableAtmosphere", Atmosphere = { - Type = "RenderablePlanet", + Type = "RenderableGlobe", -- Atmosphere radius in Km AtmosphereRadius = 6447.0, - PlanetRadius = 6356.752, + PlanetRadius = 6377.0, PlanetAverageGroundReflectance = 0.1, Rayleigh = { - Coefficients = { - -- Wavelengths are given in 10^-9m - Wavelengths = {680, 550, 440}, - -- Reflection coefficients are given in km^-1 - Scattering = {5.8E-3, 13.5E-3, 33.1E-3}, - -- In Rayleigh scattering, the coefficients of absorption and scattering are the same. - }, - -- Thichkness of atmosphere if its density were uniform, in Km - H_R = 8.0, + Coefficients = { + -- Wavelengths are given in 10^-9m + Wavelengths = {680, 550, 440}, + -- Reflection coefficients are given in km^-1 + Scattering = {5.8E-3, 13.5E-3, 33.1E-3}, + -- In Rayleigh scattering, the coefficients of absorption and scattering are the same. + }, + -- Thichkness of atmosphere if its density were uniform, in Km + H_R = 8.0, }, --[[ - Ozone = { - Coefficients = { - -- Extinction coefficients - Extinction = {3.426E-5, 8.298E-5, 0.356E-5} - }, - H_O = 8.0, - }, - ]]-- - -- Default - Mie = { + Ozone = { Coefficients = { - -- Reflection coefficients are given in km^-1 - Scattering = {4.0e-3, 4.0e-3, 4.0e-3}, - -- Extinction coefficients are a fraction of the Mie coefficients - Extinction = {4.0e-3/0.9, 4.0e-3/0.9, 4.0e-3/0.9} + -- Extinction coefficients + Extinction = {3.426, 8.298, 0.356} }, - -- Height scale (atmosphere thickness for constant density) in Km - H_M = 1.2, - -- Mie Phase Function Value (G e [-1.0, 1.0]. If G = 1.0, Mie phase function = Rayleigh Phase Function) - G = 0.85 - }, - Image = { - ToneMapping = jToneMapping, - Exposure = 0.4, - Gamma = 1.85, - }, - Debug = { - -- PreCalculatedTextureScale is a float from 1.0 to N, with N > 0.0 and N in Naturals (i.e., 1, 2, 3, 4, 5....) - PreCalculatedTextureScale = 1.0, - SaveCalculatedTextures = false, - }, + H_O = 8.0, + }, + ]] + -- Default + Mie = { + Coefficients = { + -- Reflection coefficients are given in km^-1 + Scattering = {4.0e-3, 4.0e-3, 4.0e-3}, + -- Extinction coefficients are a fraction of the Mie coefficients + Extinction = {4.0e-3/0.9, 4.0e-3/0.9, 4.0e-3/0.9} + }, + -- Height scale (atmosphere thickness for constant density) in Km + H_M = 1.2, + -- Mie Phase Function Value (G e [-1.0, 1.0]. If G = 1.0, Mie phase function = Rayleigh Phase Function) + G = 0.85 + }, + -- Clear Sky + -- Mie = { + -- Coefficients = { + -- Scattering = {20e-3, 20e-3, 20e-3}, + -- Extinction = 1.0/0.9, + -- } + -- H_M = 1.2, + -- G = 0.76, + -- }, + -- Cloudy + -- Mie = { + -- Coefficients = { + -- Scattering = {3e-3, 3e-3, 3e-3}, + -- Extinction = 1.0/0.9, + -- } + -- H_M = 3.0, + -- G = 0.65, + -- }, + Image = { + ToneMapping = jToneMapping, + Exposure = 0.4, + Background = 1.8, + Gamma = 1.85, + }, + Debug = { + -- PreCalculatedTextureScale is a float from 1.0 to N, with N > 0.0 and N in Naturals (i.e., 1, 2, 3, 4, 5....) + PreCalculatedTextureScale = 1.0, + SaveCalculatedTextures = false, + }, }, }, - }, + }, -- EarthTrail module - { + { Name = "EarthTrail", Parent = "SolarSystemBarycenter", Renderable = { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "EARTH", + Target = "EARTH", Observer = "SUN" }, Color = { 0.5, 0.8, 1.0 }, @@ -132,27 +120,177 @@ return { -- EndTime = "2017 JAN 01 12:00:00.000", -- SampleInterval = 3600 Period = 365.242, - Resolution = 1000, - Tag = {"planetTrail_solarSystem", "planetTrail_terrestrial"} + Resolution = 1000 }, - GuiName = "/Solar/EarthTrail", + Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" }, + GuiName = "/Solar/EarthTrail" }, - --[[ + -- RenderableGlobe module { - Name = "EarthMarker", - Parent = "Earth", - Renderable = { - Type = "RenderablePlane", - Size = 3.0E11, - Origin = "Center", - Billboard = true, - Texture = "textures/marker.png", - BlendMode = "Additive" + Name = "Earth", + Parent = "EarthBarycenter", + Transform = { + Rotation = { + Type = "SpiceRotation", + SourceFrame = "IAU_EARTH", + DestinationFrame = "GALACTIC", + } }, - Ephemeris = { - Type = "Static", - Position = {0, 0, 0, 5} + Tag = { "planet_solarSystem", "planet_terrestrial" }, + Renderable = { + Type = "RenderableGlobe", + Radii = earthEllipsoid, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "ESRI VIIRS Combo", + Type = "ByLevelTileLayer", + LevelTileProviders = { + { + MaxLevel = 3, + TileProvider = { + Name = "Temporal VIIRS SNPP", + Type = "TemporalTileLayer", + FilePath = "map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml", + PadTiles = false, + } + }, + { + MaxLevel = 22, + TileProvider = { + Name = "ESRI Imagery World 2D", + FilePath = "map_service_configs/ESRI/ESRI_Imagery_World_2D.wms", + PadTiles = false, + } + }, + }, + Enabled = true, + PadTiles = false, + Fallback = { + Name = "Blue Marble", + FilePath = "textures/earth_bluemarble.jpg", + Enabled = true, + } + }, + { + Name = "ESRI Imagery World 2D", + FilePath = "map_service_configs/ESRI/ESRI_Imagery_World_2D.wms", + }, + { + Name = "Temporal VIIRS SNPP", + Type = "TemporalTileLayer", + FilePath = "map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml", + }, + { + Name = "BMNG", + FilePath = "map_service_configs/Utah/Bmng.wms" + }, + { + Name = "Temporal_AMSR2_GCOM_W1_Sea_Ice_Concentration", + Type = "TemporalTileLayer", + FilePath = "map_service_configs/GIBS/Temporal_AMSR2_GCOM_W1_Sea_Ice_Concentration.xml", + }, + { + Name = "MODIS_Terra_Chlorophyll_A", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "MODIS_Terra_Chlorophyll_A", + "2013-07-02", + "Yesterday", + "1d", + "1km", + "png" + ) + }, + { + Name = "GHRSST_L4_G1SST_Sea_Surface_Temperature", + Type = "TemporalTileLayer", + FilePath = openspace.globebrowsing.createTemporalGibsGdalXml( + "GHRSST_L4_G1SST_Sea_Surface_Temperature", + "2010-06-21", + "Yesterday", + "1d", + "1km", + "png" + ) + }, + }, + NightLayers = { + { + Name = "Earth at Night 2012", + FilePath = "map_service_configs/GIBS/VIIRS_CityLights_2012.xml", + Enabled = true, + Settings = { + Opacity = 1.0, + Gamma = 1.5, + Multiplier = 15.0, + }, + Fallback = { + Name = "Earth Night", + FilePath = "textures/earth_night.jpg", + Enabled = true, + Settings = { + Opacity = 1.0, + Gamma = 1.5, + Multiplier = 15.0, + }, + } + }, + { + Name = "Temporal Earth at Night", + Type = "TemporalTileLayer", + FilePath = "map_service_configs/GIBS/Temporal_VIIRS_SNPP_DayNightBand_ENCC.xml" + } + }, + WaterMasks = { + { + Name = "MODIS_Water_Mask", + FilePath = "map_service_configs/GIBS/MODIS_Water_Mask.xml", + Enabled = true, + }, + { + Name = "GEBCO", + FilePath = "map_service_configs/Utah/Gebco.wms", + } + }, + Overlays = { + { + Name = "Coastlines", + FilePath = "map_service_configs/GIBS/Coastlines.xml", + }, + { + Name = "Reference_Features", + FilePath = "map_service_configs/GIBS/Reference_Features.xml", + }, + { + Name = "Reference_Labels", + FilePath = "map_service_configs/GIBS/Reference_Labels.xml", + }, + { + Name = "Tile Indices", + Type = "TileIndexTileLayer", + }, + { + Name = "Size Reference", + Type = "SizeReferenceTileLayer", + Radii = earthEllipsoid, + }, + }, + HeightLayers = { + { + Name = "Terrain tileset", + FilePath = "map_service_configs/ESRI/TERRAIN.wms", + Enabled = true, + TilePixelSize = 64, + Fallback = { + Name = "Earth Bluemarble Height", + FilePath = "textures/earth_bluemarble_height.jpg", + Enabled = true, + } + } + } + } } } - ]] } diff --git a/data/scene/lodglobes/earth/map_service_configs/ESRI/ESRI_Imagery_World_2D.wms b/data/scene/earth/map_service_configs/ESRI/ESRI_Imagery_World_2D.wms similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/ESRI/ESRI_Imagery_World_2D.wms rename to data/scene/earth/map_service_configs/ESRI/ESRI_Imagery_World_2D.wms diff --git a/data/scene/lodglobes/earth/map_service_configs/ESRI/TERRAIN.wms b/data/scene/earth/map_service_configs/ESRI/TERRAIN.wms similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/ESRI/TERRAIN.wms rename to data/scene/earth/map_service_configs/ESRI/TERRAIN.wms diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/Coastlines.xml b/data/scene/earth/map_service_configs/GIBS/Coastlines.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/Coastlines.xml rename to data/scene/earth/map_service_configs/GIBS/Coastlines.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/GIBS_Aqua_MODIS_true.xml b/data/scene/earth/map_service_configs/GIBS/GIBS_Aqua_MODIS_true.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/GIBS_Aqua_MODIS_true.xml rename to data/scene/earth/map_service_configs/GIBS/GIBS_Aqua_MODIS_true.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/MODIS_Terra_Brightness_Temp_Band31_Day.xml b/data/scene/earth/map_service_configs/GIBS/MODIS_Terra_Brightness_Temp_Band31_Day.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/MODIS_Terra_Brightness_Temp_Band31_Day.xml rename to data/scene/earth/map_service_configs/GIBS/MODIS_Terra_Brightness_Temp_Band31_Day.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/MODIS_Terra_CorrectedReflectance_TrueColor.xml b/data/scene/earth/map_service_configs/GIBS/MODIS_Terra_CorrectedReflectance_TrueColor.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/MODIS_Terra_CorrectedReflectance_TrueColor.xml rename to data/scene/earth/map_service_configs/GIBS/MODIS_Terra_CorrectedReflectance_TrueColor.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/MODIS_Water_Mask.xml b/data/scene/earth/map_service_configs/GIBS/MODIS_Water_Mask.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/MODIS_Water_Mask.xml rename to data/scene/earth/map_service_configs/GIBS/MODIS_Water_Mask.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/Reference_Features.xml b/data/scene/earth/map_service_configs/GIBS/Reference_Features.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/Reference_Features.xml rename to data/scene/earth/map_service_configs/GIBS/Reference_Features.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/Reference_Labels.xml b/data/scene/earth/map_service_configs/GIBS/Reference_Labels.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/Reference_Labels.xml rename to data/scene/earth/map_service_configs/GIBS/Reference_Labels.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/TERRA_CR_B143_2016-04-12.wms b/data/scene/earth/map_service_configs/GIBS/TERRA_CR_B143_2016-04-12.wms similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/TERRA_CR_B143_2016-04-12.wms rename to data/scene/earth/map_service_configs/GIBS/TERRA_CR_B143_2016-04-12.wms diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/Temporal_AMSR2_GCOM_W1_Sea_Ice_Concentration.xml b/data/scene/earth/map_service_configs/GIBS/Temporal_AMSR2_GCOM_W1_Sea_Ice_Concentration.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/Temporal_AMSR2_GCOM_W1_Sea_Ice_Concentration.xml rename to data/scene/earth/map_service_configs/GIBS/Temporal_AMSR2_GCOM_W1_Sea_Ice_Concentration.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/Temporal_Aqua_Orbit_Asc.xml b/data/scene/earth/map_service_configs/GIBS/Temporal_Aqua_Orbit_Asc.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/Temporal_Aqua_Orbit_Asc.xml rename to data/scene/earth/map_service_configs/GIBS/Temporal_Aqua_Orbit_Asc.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/Temporal_GHRSST_L4_MUR_Sea_Surface_Temperature.xml b/data/scene/earth/map_service_configs/GIBS/Temporal_GHRSST_L4_MUR_Sea_Surface_Temperature.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/Temporal_GHRSST_L4_MUR_Sea_Surface_Temperature.xml rename to data/scene/earth/map_service_configs/GIBS/Temporal_GHRSST_L4_MUR_Sea_Surface_Temperature.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml b/data/scene/earth/map_service_configs/GIBS/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml rename to data/scene/earth/map_service_configs/GIBS/Temporal_MODIS_Aqua_CorrectedReflectance_TrueColor.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/Temporal_MODIS_Terra_CorrectedReflectance_TrueColor.xml b/data/scene/earth/map_service_configs/GIBS/Temporal_MODIS_Terra_CorrectedReflectance_TrueColor.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/Temporal_MODIS_Terra_CorrectedReflectance_TrueColor.xml rename to data/scene/earth/map_service_configs/GIBS/Temporal_MODIS_Terra_CorrectedReflectance_TrueColor.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml b/data/scene/earth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml rename to data/scene/earth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_CorrectedReflectance_TrueColor.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_DayNightBand_ENCC.xml b/data/scene/earth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_DayNightBand_ENCC.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_DayNightBand_ENCC.xml rename to data/scene/earth/map_service_configs/GIBS/Temporal_VIIRS_SNPP_DayNightBand_ENCC.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/VIIRS_CityLights_2012.xml b/data/scene/earth/map_service_configs/GIBS/VIIRS_CityLights_2012.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/VIIRS_CityLights_2012.xml rename to data/scene/earth/map_service_configs/GIBS/VIIRS_CityLights_2012.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/GIBS/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml b/data/scene/earth/map_service_configs/GIBS/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/GIBS/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml rename to data/scene/earth/map_service_configs/GIBS/VIIRS_SNPP_CorrectedReflectance_TrueColor.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/Utah/Bmng.wms b/data/scene/earth/map_service_configs/Utah/Bmng.wms similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/Utah/Bmng.wms rename to data/scene/earth/map_service_configs/Utah/Bmng.wms diff --git a/data/scene/lodglobes/earth/map_service_configs/Utah/Gebco.wms b/data/scene/earth/map_service_configs/Utah/Gebco.wms similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/Utah/Gebco.wms rename to data/scene/earth/map_service_configs/Utah/Gebco.wms diff --git a/data/scene/lodglobes/earth/map_service_configs/other/ASTER_GDEM_Greyscale_Shaded_Relief.xml b/data/scene/earth/map_service_configs/other/ASTER_GDEM_Greyscale_Shaded_Relief.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/other/ASTER_GDEM_Greyscale_Shaded_Relief.xml rename to data/scene/earth/map_service_configs/other/ASTER_GDEM_Greyscale_Shaded_Relief.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/other/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml b/data/scene/earth/map_service_configs/other/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/other/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml rename to data/scene/earth/map_service_configs/other/Landsat_WELD_CorrectedReflectance_TrueColor_Global_Monthly_v3_STD_temporal.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/other/MLS_O3_46hPa_Day.xml b/data/scene/earth/map_service_configs/other/MLS_O3_46hPa_Day.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/other/MLS_O3_46hPa_Day.xml rename to data/scene/earth/map_service_configs/other/MLS_O3_46hPa_Day.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/other/OpenStreetMap.xml b/data/scene/earth/map_service_configs/other/OpenStreetMap.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/other/OpenStreetMap.xml rename to data/scene/earth/map_service_configs/other/OpenStreetMap.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/other/frmt_wms_virtualearth.xml b/data/scene/earth/map_service_configs/other/frmt_wms_virtualearth.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/other/frmt_wms_virtualearth.xml rename to data/scene/earth/map_service_configs/other/frmt_wms_virtualearth.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/other/noaa_rt.xml b/data/scene/earth/map_service_configs/other/noaa_rt.xml similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/other/noaa_rt.xml rename to data/scene/earth/map_service_configs/other/noaa_rt.xml diff --git a/data/scene/lodglobes/earth/map_service_configs/other/test.wms b/data/scene/earth/map_service_configs/other/test.wms similarity index 100% rename from data/scene/lodglobes/earth/map_service_configs/other/test.wms rename to data/scene/earth/map_service_configs/other/test.wms diff --git a/data/scene/fieldlines.scene b/data/scene/fieldlines.scene index b4936dc5d4..2a9da28b7c 100644 --- a/data/scene/fieldlines.scene +++ b/data/scene/fieldlines.scene @@ -49,11 +49,11 @@ return { "saturn", "uranus", "neptune", - "stars", "fieldlines", - -- "stars-denver", - "milkyway", - -- "milkyway-eso", + "stars/digitaluniverse", + -- "stars/denver", + "milkyway/digitaluniverse", + --"milkyway/eso", "constellationbounds", } } diff --git a/data/scene/globebrowsing.scene b/data/scene/globebrowsing.scene deleted file mode 100644 index 96ff9c3df9..0000000000 --- a/data/scene/globebrowsing.scene +++ /dev/null @@ -1,93 +0,0 @@ -function preInitialization() - --[[ - The scripts in this function are executed after the scene is loaded but before the - scene elements have been initialized, thus they should be used to set the time at - which the scene should start and other settings that might determine initialization - critical objects. - ]]-- - - openspace.spice.loadKernel("${SPICE}/naif0012.tls") - openspace.spice.loadKernel("${SPICE}/pck00010.tpc") - - -- For unit test - --openspace.time.setTime("2016 SEP 8 23:00:00.500") - --openspace.time.togglePause() - - openspace.time.setTime(openspace.time.currentWallTime()) - dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua')) - - - -- Toggle night texture, shading, atmosphere and water - openspace.bindKey("s", - helper.property.invert('Earth.RenderableGlobe.Layers.NightLayers.Earth at Night 2012.Enabled') .. - helper.property.invert('Earth.RenderableGlobe.PerformShading') .. - helper.property.invert('Earth.RenderableGlobe.Atmosphere') .. - helper.property.invert('Earth.RenderableGlobe.Layers.WaterMasks.MODIS_Water_Mask.Enabled'), - "Toggle night texture, shading, atmosphere, and water for Earth." - ) - - -- Toggle background - openspace.bindKey("b", - helper.property.invert('MilkyWay.renderable.Enabled') .. - helper.property.invert('Stars.renderable.Enabled'), - "Toggle background (Stars and Milkyway)." - ) - - openspace.bindKey("g", - "openspace.setInteractionMode('GlobeBrowsing')" .. - helper.property.invert('MilkyWay.renderable.Enabled') .. - helper.property.invert('Stars.renderable.Enabled') .. - helper.property.invert('Earth.RenderableGlobe.Layers.NightLayers.Earth at Night 2012.Enabled') .. - helper.property.invert('Earth.RenderableGlobe.PerformShading') .. - helper.property.invert('Mars.RenderableGlobe.PerformShading') .. - helper.property.invert('Earth.RenderableGlobe.Atmosphere') .. - helper.property.invert('Earth.RenderableGlobe.Layers.WaterMasks.MODIS_Water_Mask.Enabled') .. - helper.property.invert('Moon.RenderableGlobe.Enabled') .. - helper.property.invert('Sun.renderable.Enabled'), - "Toogles background and shading mode on the Earth and Mars alongside visibility of the Moon and the Sun" - ) - - openspace.bindKey("h", - "openspace.setPropertyValue('*Trail.renderable.Enabled', false)", - "Disables visibility of the trails" - ) -end - -function postInitialization() - openspace.printInfo("Setting default values") - - openspace.setPropertyValue("MilkyWay.renderable.Transparency", 0.55) - openspace.setPropertyValue("MilkyWay.renderable.Segments", 50) - - openspace.setPropertyValue("Sun.renderable.Enabled", true) - openspace.setPropertyValue("SunGlare.renderable.Enabled", false) - openspace.setPropertyValue("SunMarker.renderable.Enabled", false) - - openspace.setPropertyValue("Earth.RenderableGlobe.Atmosphere", true) - openspace.setPropertyValue("Earth.RenderableGlobe.Debug.LevelByProjectedAreaElseDistance", false) - openspace.setPropertyValue("Earth.RenderableGlobe.Layers.ColorLayers.BlendTileLevels", true) - - openspace.globebrowsing.goToGeo(0, 0, 20000000) - - openspace.printInfo("Done setting default values") -end - - -return { - ScenePath = ".", - CommonFolder = "common", - Camera = { - Focus = "Earth", - Position = {0, 0, 0}, - Rotation = {0.758797, 0.221490, -0.605693, -0.091135}, - }, - - Modules = { - "lodglobes", - "sun", - "stars", - "milkyway", - -- "satellites" - } -} - diff --git a/data/scene/grids/gridEcliptic/gridEcliptic.mod b/data/scene/grids/gridEcliptic/gridEcliptic.mod deleted file mode 100644 index ed4e7fb452..0000000000 --- a/data/scene/grids/gridEcliptic/gridEcliptic.mod +++ /dev/null @@ -1,17 +0,0 @@ -return { - -- SphericalGrid module - { - Name = "SphericalGrid", - Parent = "Root", - Renderable = { - Type = "RenderableSphericalGrid", - GridType = "ECLIPJ2000", - GridColor = { 0.4, 0.0, 0.0, 1}, - GridMatrix = { -0.05487554, 0.4941095, -0.8676661 , 0.0, - -0.9938214 , -0.1109906, -0.0003515167, 0.0, - -0.09647644, 0.8622859, 0.4971472 , 0.0, - 0.0 , 0.0 , 0.0 , 1.0 }, - GridSegments = 36, - } - } -} \ No newline at end of file diff --git a/data/scene/grids/gridEquatorial/gridEquatorial.mod b/data/scene/grids/gridEquatorial/gridEquatorial.mod deleted file mode 100644 index ccee24ccad..0000000000 --- a/data/scene/grids/gridEquatorial/gridEquatorial.mod +++ /dev/null @@ -1,17 +0,0 @@ -return { - -- SphericalGrid module - { - Name = "SphericalGrid", - Parent = "Root", - Renderable = { - Type = "RenderableSphericalGrid", - GridType = "ICRF", - GridColor = { 0.0, 0.0, 0.4, 1}, - GridMatrix = { -0.05487554, 0.4941095, -0.8676661, 0.0, - -0.8734371 , -0.4448296, -0.1980764, 0.0, - -0.483835 , 0.7469823, 0.4559838, 0.0, - 0.0 , 0.0 , 0.0 , 1.0 }, - GridSegments = 36, - } - } -} \ No newline at end of file diff --git a/data/scene/grids/gridGalactic/gridGalactic.mod b/data/scene/grids/gridGalactic/gridGalactic.mod deleted file mode 100644 index b27d939b6c..0000000000 --- a/data/scene/grids/gridGalactic/gridGalactic.mod +++ /dev/null @@ -1,17 +0,0 @@ -return { - -- gridGalactic module - { - Name = "gridGalactic", - Parent = "SolarSystem", - Renderable = { - Type = "RenderableSphericalGrid", - GridType = "GALACTIC", - GridColor = { 0.0, 0.4, 0.4, 1}, - GridMatrix = { 1.0, 0.0, 0.0, 0.0, - 0.0, 1.0, 0.0, 0.0, - 0.0, 0.0, 1.0, 0.0, - 0.0, 0.0, 0.0, 1.0 }, - GridSegments = 36, - } - } -} \ No newline at end of file diff --git a/data/scene/grids/grids.mod b/data/scene/grids/grids.mod new file mode 100644 index 0000000000..a9ec4af6a4 --- /dev/null +++ b/data/scene/grids/grids.mod @@ -0,0 +1,38 @@ +return { + -- SphericalGrid module + { + Name = "Ecliptic Grid", + Parent = "Root", + Renderable = { + Type = "RenderableSphericalGrid", + GridColor = { 0.75, 0.0, 0.0, 1.0}, + LineWidth = 0.75, + GridMatrix = { -0.05487554, 0.4941095, -0.8676661 , 0.0, + -0.9938214 , -0.1109906, -0.0003515167, 0.0, + -0.09647644, 0.8622859, 0.4971472 , 0.0, + 0.0 , 0.0 , 0.0 , 1.0 } + } + }, + { + Name = "Equatorial Grid", + Parent = "Root", + Renderable = { + Type = "RenderableSphericalGrid", + GridColor = { 0.0, 0.0, 0.75, 1.0}, + LineWidth = 0.75, + GridMatrix = { -0.05487554, 0.4941095, -0.8676661, 0.0, + -0.8734371 , -0.4448296, -0.1980764, 0.0, + -0.483835 , 0.7469823, 0.4559838, 0.0, + 0.0 , 0.0 , 0.0 , 1.0 } + } + }, + { + Name = "Galactic Grid", + Parent = "SolarSystem", + Renderable = { + Type = "RenderableSphericalGrid", + LineWidth = 0.75, + GridColor = { 0.0, 0.75, 0.75, 1.0} + } + } +} diff --git a/data/scene/juno.scene b/data/scene/juno.scene index f3fb214f73..69f68db08b 100755 --- a/data/scene/juno.scene +++ b/data/scene/juno.scene @@ -55,8 +55,10 @@ return { "saturn/saturn", "uranus", "neptune", - "stars", - "milkyway", + "stars/digitaluniverse", + -- "stars/denver", + "milkyway/digitaluniverse", + --"milkyway/eso", "missions/juno" } } diff --git a/data/scene/jupiter/callisto/callisto.mod b/data/scene/jupiter/callisto/callisto.mod index aa6122bd47..7ee86055fb 100644 --- a/data/scene/jupiter/callisto/callisto.mod +++ b/data/scene/jupiter/callisto/callisto.mod @@ -1,46 +1,38 @@ return { - -- Callisto module - { + -- RenderableGlobe module + { Name = "Callisto", Parent = "JupiterBarycenter", - Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_CALLISTO", -- should exist. - Body = "CALLISTO", - Geometry = { - Type = "SimpleSphere", - Radius = 2.631E6, - Segments = 100 - }, - Textures = { - Type = "simple", - Color = "textures/callisto.jpg", - }, - Atmosphere = { - Type = "Nishita", -- for example, values missing etc etc - MieFactor = 1.0, - MieColor = {1.0, 1.0, 1.0} - } - }, Transform = { - Translation = { - Type = "SpiceTranslation", - Body = "CALLISTO", - Observer = "JUPITER BARYCENTER", - Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp" - }, Rotation = { Type = "SpiceRotation", SourceFrame = "IAU_CALLISTO", - DestinationFrame = "IAU_JUPITER", - }, - Scale = { - Type = "StaticScale", - Scale = 1, + DestinationFrame = "GALACTIC", }, + Translation = { + Type = "SpiceTranslation", + Target = "CALLISTO", + Observer = "JUPITER BARYCENTER", + Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp" + } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 2410000, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Callisto Texture", + FilePath = "textures/callisto.jpg", + Enabled = true + } + } + } } }, - -- CallistoTrail module + + -- Trail module { Name = "CallistoTrail", Parent = "JupiterBarycenter", @@ -48,11 +40,11 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "CALLISTO", - Observer = "JUPITER BARYCENTER", + Target = "CALLISTO", + Observer = "JUPITER BARYCENTER" }, Color = { 0.4, 0.3, 0.01 }, - Period = 17, + Period = 17, Resolution = 1000 } } diff --git a/data/scene/jupiter/europa/europa.mod b/data/scene/jupiter/europa/europa.mod index fea16b4627..92f9177da0 100644 --- a/data/scene/jupiter/europa/europa.mod +++ b/data/scene/jupiter/europa/europa.mod @@ -1,42 +1,38 @@ return { - -- Europa module - { + -- RenderableGlobe module + { Name = "Europa", Parent = "JupiterBarycenter", - Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_EUROPA", -- should exist. - Body = "EUROPA", - Geometry = { - Type = "SimpleSphere", - Radius = 1.561E6, - Segments = 100 - }, - Textures = { - Type = "simple", - Color = "textures/europa.jpg", - }, - Atmosphere = { - Type = "Nishita", -- for example, values missing etc etc - MieFactor = 1.0, - MieColor = {1.0, 1.0, 1.0} - } - }, Transform = { - Translation = { - Type = "SpiceTranslation", - Body = "EUROPA", - Observer = "JUPITER BARYCENTER", - Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp" - }, Rotation = { Type = "SpiceRotation", SourceFrame = "IAU_EUROPA", - DestinationFrame = "IAU_JUPITER", - } + DestinationFrame = "GALACTIC", + }, + Translation = { + Type = "SpiceTranslation", + Target = "EUROPA", + Observer = "JUPITER BARYCENTER", + Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp" + }, + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 1560800, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Europa Texture", + FilePath = "textures/europa.jpg", + Enabled = true, + }, + }, + }, } }, - -- EuropaTrail module + + -- Trail module { Name = "EuropaTrail", Parent = "JupiterBarycenter", @@ -44,7 +40,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "EUROPA", + Target = "EUROPA", Observer = "JUPITER BARYCENTER", }, Color = { 0.5, 0.3, 0.3 }, diff --git a/data/scene/jupiter/ganymede/ganymede.mod b/data/scene/jupiter/ganymede/ganymede.mod index 16aa1c175a..61f048b368 100644 --- a/data/scene/jupiter/ganymede/ganymede.mod +++ b/data/scene/jupiter/ganymede/ganymede.mod @@ -1,46 +1,37 @@ return { - -- Ganymede module - { + -- RenderableGlobe module + { Name = "Ganymede", Parent = "JupiterBarycenter", - Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_GANYMEDE", -- should exist. - Body = "JUPITER BARYCENTER", - Geometry = { - Type = "SimpleSphere", - Radius = 2.631E6, - Segments = 100 - }, - Textures = { - Type = "simple", - Color = "textures/ganymede.jpg", - }, - Atmosphere = { - Type = "Nishita", -- for example, values missing etc etc - MieFactor = 1.0, - MieColor = {1.0, 1.0, 1.0} - } - }, Transform = { - Translation = { - Type = "SpiceTranslation", - Body = "GANYMEDE", - Observer = "JUPITER BARYCENTER", - Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp" - }, Rotation = { Type = "SpiceRotation", SourceFrame = "IAU_GANYMEDE", - DestinationFrame = "IAU_JUPITER", - }, - Scale = { - Type = "StaticScale", - Scale = 1, + DestinationFrame = "GALACTIC" }, + Translation = { + Type = "SpiceTranslation", + Target = "GANYMEDE", + Observer = "JUPITER BARYCENTER", + Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp" + } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 2631000, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Ganymede Texture", + FilePath = "textures/ganymede.jpg", + Enabled = true + } + } + } } }, - -- GanymedeTrail module + -- Trail module { Name = "GanymedeTrail", Parent = "JupiterBarycenter", @@ -48,8 +39,8 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "GANYMEDE", - Observer = "JUPITER BARYCENTER", + Target = "GANYMEDE", + Observer = "JUPITER BARYCENTER" }, Color = { 0.4, 0.3, 0.3 }, Period = 172 / 24, diff --git a/data/scene/jupiter/io/io.mod b/data/scene/jupiter/io/io.mod index 98e5e88e7f..70c265d266 100644 --- a/data/scene/jupiter/io/io.mod +++ b/data/scene/jupiter/io/io.mod @@ -1,46 +1,37 @@ return { - -- Io module - { + -- RenderableGlobe module + { Name = "Io", Parent = "JupiterBarycenter", - Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_IO", -- should exist. - Body = "IO", - Geometry = { - Type = "SimpleSphere", - Radius = 1.8213E6, - Segments = 100 - }, - Textures = { - Type = "simple", - Color = "textures/io.jpg", - }, - Atmosphere = { - Type = "Nishita", -- for example, values missing etc etc - MieFactor = 1.0, - MieColor = {1.0, 1.0, 1.0} - } - }, Transform = { - Translation = { - Type = "SpiceTranslation", - Body = "IO", - Observer = "JUPITER BARYCENTER", - Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp" - }, Rotation = { Type = "SpiceRotation", SourceFrame = "IAU_IO", - DestinationFrame = "IAU_JUPITER", + DestinationFrame = "GALACTIC" }, - Scale = { - Type = "StaticScale", - Scale = 1, + Translation = { + Type = "SpiceTranslation", + Target = "IO", + Observer = "JUPITER BARYCENTER", + Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp" }, + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 1821600, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Io Texture", + FilePath = "textures/io.jpg", + Enabled = true + } + } + } } }, - -- IoTrail module + -- Trail module { Name = "IoTrail", Parent = "JupiterBarycenter", @@ -48,8 +39,8 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "IO", - Observer = "JUPITER BARYCENTER", + Target = "IO", + Observer = "JUPITER BARYCENTER" }, Color = { 0.4, 0.4, 0.2 }, Period = 42 / 24, diff --git a/data/scene/jupiter/jupiter/jupiter.mod b/data/scene/jupiter/jupiter/jupiter.mod index f9030b25f1..c8e822b5af 100644 --- a/data/scene/jupiter/jupiter/jupiter.mod +++ b/data/scene/jupiter/jupiter/jupiter.mod @@ -1,58 +1,45 @@ return { - -- Jupiter barycenter module + -- Barycenter module { Name = "JupiterBarycenter", Parent = "SolarSystemBarycenter", Transform = { Translation = { Type = "SpiceTranslation", - Body = "JUPITER BARYCENTER", + Target = "JUPITER BARYCENTER", Observer = "SUN", Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - }, - }, + } + } }, - -- Jupiter module - { + -- RenderableGlobe module + { Name = "Jupiter", Parent = "JupiterBarycenter", - Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_JUPITER", - Body = "JUPITER BARYCENTER", - Geometry = { - Type = "SimpleSphere", - Radius = 0.71492E8, - Segments = 200 - }, - Textures = { - Type = "simple", - Color = "textures/jupiter.jpg", - }, - Atmosphere = { - Type = "Nishita", -- for example, values missing etc etc - MieFactor = 1.0, - MieColor = {1.0, 1.0, 1.0} - } - }, - Tag = "planet_solarSystem", Transform = { - Translation = { - Type = "StaticTranslation", - Position = {0, 0, 0}, -- jupiter is at its barycenter - }, Rotation = { Type = "SpiceRotation", SourceFrame = "IAU_JUPITER", - DestinationFrame = "ECLIPJ2000", + DestinationFrame = "GALACTIC" }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, - } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 71492000, 71492000, 66854000 }, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Jupiter Texture", + FilePath = "textures/jupiter.jpg", + Enabled = true + } + } + } + }, + Tag = { "planet_solarSystem", "planet_giants" }, }, - -- JupiterTrail module + -- Trail module { Name = "JupiterTrail", Parent = "SolarSystemBarycenter", @@ -60,13 +47,13 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "JUPITER BARYCENTER", - Observer = "SUN", + Target = "JUPITER BARYCENTER", + Observer = "SUN" }, Color = { 0.8, 0.7, 0.7 }, Period = 4330.595, - Resolution = 1000, + Resolution = 1000 }, - Tag = "planetTrail_solarSystem" + Tag = { "planetTrail_solarSystem", "planetTrail_giants" } } -} +} \ No newline at end of file diff --git a/data/scene/lodglobes/earth/earth.data b/data/scene/lodglobes/earth/earth.data deleted file mode 100644 index e168d4c8be..0000000000 --- a/data/scene/lodglobes/earth/earth.data +++ /dev/null @@ -1,5 +0,0 @@ -return { - FileRequest = { - { Identifier = "earth_textures", Destination = "textures", Version = 2 } - }, -} diff --git a/data/scene/lodglobes/jupiter/callisto/callisto.data b/data/scene/lodglobes/jupiter/callisto/callisto.data deleted file mode 100644 index 9c381ecce7..0000000000 --- a/data/scene/lodglobes/jupiter/callisto/callisto.data +++ /dev/null @@ -1,5 +0,0 @@ -return { - FileRequest = { - { Identifier = "callisto_textures", Destination = "textures", Version = 1 } - }, -} \ No newline at end of file diff --git a/data/scene/lodglobes/jupiter/callisto/callisto.mod b/data/scene/lodglobes/jupiter/callisto/callisto.mod deleted file mode 100644 index 302fc7a103..0000000000 --- a/data/scene/lodglobes/jupiter/callisto/callisto.mod +++ /dev/null @@ -1,54 +0,0 @@ -return { - -- RenderableGlobe module - { - Name = "Callisto", - Parent = "JupiterBarycenter", - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_CALLISTO", - DestinationFrame = "GALACTIC", - }, - Translation = { - Type = "SpiceTranslation", - Body = "CALLISTO", - Observer = "JUPITER BARYCENTER", - Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp" - }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, - }, - Renderable = { - Type = "RenderableGlobe", - Radii = {2631000, 2631000, 2631000}, - SegmentsPerPatch = 64, - Layers = { - ColorLayers = { - { - Name = "Callisto Texture", - FilePath = "textures/callisto.jpg", - Enabled = true, - }, - }, - }, - } - }, - -- Trail module - { - Name = "CallistoTrail", - Parent = "JupiterBarycenter", - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Body = "CALLISTO", - Observer = "JUPITER BARYCENTER", - }, - Color = { 0.4, 0.3, 0.01 }, - Period = 17, - Resolution = 1000 - } - } -} diff --git a/data/scene/lodglobes/jupiter/europa/europa.data b/data/scene/lodglobes/jupiter/europa/europa.data deleted file mode 100644 index 4364fcbc49..0000000000 --- a/data/scene/lodglobes/jupiter/europa/europa.data +++ /dev/null @@ -1,5 +0,0 @@ -return { - FileRequest = { - { Identifier = "europa_textures", Destination = "textures", Version = 1 } - }, -} \ No newline at end of file diff --git a/data/scene/lodglobes/jupiter/europa/europa.mod b/data/scene/lodglobes/jupiter/europa/europa.mod deleted file mode 100644 index d84d20d48d..0000000000 --- a/data/scene/lodglobes/jupiter/europa/europa.mod +++ /dev/null @@ -1,55 +0,0 @@ -return { - -- RenderableGlobe module - { - Name = "Europa", - Parent = "JupiterBarycenter", - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_EUROPA", - DestinationFrame = "GALACTIC", - }, - Translation = { - Type = "SpiceTranslation", - Body = "EUROPA", - Observer = "JUPITER BARYCENTER", - Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp" - }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, - }, - Renderable = { - Type = "RenderableGlobe", - Radii = {1561000, 1561000, 1561000}, - SegmentsPerPatch = 64, - Layers = { - ColorLayers = { - { - Name = "Europa Texture", - FilePath = "textures/europa.jpg", - Enabled = true, - }, - }, - }, - } - }, - - -- Trail module - { - Name = "EuropaTrail", - Parent = "JupiterBarycenter", - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Body = "EUROPA", - Observer = "JUPITER BARYCENTER", - }, - Color = { 0.5, 0.3, 0.3 }, - Period = 85 / 24, - Resolution = 1000 - } - } -} diff --git a/data/scene/lodglobes/jupiter/ganymede/ganymede.data b/data/scene/lodglobes/jupiter/ganymede/ganymede.data deleted file mode 100644 index 4ae2714582..0000000000 --- a/data/scene/lodglobes/jupiter/ganymede/ganymede.data +++ /dev/null @@ -1,5 +0,0 @@ -return { - FileRequest = { - { Identifier = "ganymede_textures", Destination = "textures", Version = 1 } - }, -} \ No newline at end of file diff --git a/data/scene/lodglobes/jupiter/ganymede/ganymede.mod b/data/scene/lodglobes/jupiter/ganymede/ganymede.mod deleted file mode 100644 index e37a193bb8..0000000000 --- a/data/scene/lodglobes/jupiter/ganymede/ganymede.mod +++ /dev/null @@ -1,54 +0,0 @@ -return { - -- RenderableGlobe module - { - Name = "Ganymede", - Parent = "JupiterBarycenter", - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_GANYMEDE", - DestinationFrame = "GALACTIC", - }, - Translation = { - Type = "SpiceTranslation", - Body = "GANYMEDE", - Observer = "JUPITER BARYCENTER", - Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp" - }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, - }, - Renderable = { - Type = "RenderableGlobe", - Radii = {2631000, 2631000, 2631000}, - SegmentsPerPatch = 64, - Layers = { - ColorLayers = { - { - Name = "Ganymede Texture", - FilePath = "textures/ganymede.jpg", - Enabled = true, - }, - }, - }, - } - }, - -- Trail module - { - Name = "GanymedeTrail", - Parent = "JupiterBarycenter", - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Body = "GANYMEDE", - Observer = "JUPITER BARYCENTER", - }, - Color = { 0.4, 0.3, 0.3 }, - Period = 172 / 24, - Resolution = 1000 - } - } -} diff --git a/data/scene/lodglobes/jupiter/io/io.data b/data/scene/lodglobes/jupiter/io/io.data deleted file mode 100644 index baca863e4b..0000000000 --- a/data/scene/lodglobes/jupiter/io/io.data +++ /dev/null @@ -1,5 +0,0 @@ -return { - FileRequest = { - { Identifier = "io_textures", Destination = "textures", Version = 1 } - }, -} \ No newline at end of file diff --git a/data/scene/lodglobes/jupiter/io/io.mod b/data/scene/lodglobes/jupiter/io/io.mod deleted file mode 100644 index 87dfc06b20..0000000000 --- a/data/scene/lodglobes/jupiter/io/io.mod +++ /dev/null @@ -1,54 +0,0 @@ -return { - -- RenderableGlobe module - { - Name = "Io", - Parent = "JupiterBarycenter", - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_IO", - DestinationFrame = "GALACTIC", - }, - Translation = { - Type = "SpiceTranslation", - Body = "IO", - Observer = "JUPITER BARYCENTER", - Kernels = "${OPENSPACE_DATA}/spice/jup260.bsp" - }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, - }, - Renderable = { - Type = "RenderableGlobe", - Radii = {1821300, 1821300, 1821300}, - SegmentsPerPatch = 64, - Layers = { - ColorLayers = { - { - Name = "Io Texture", - FilePath = "textures/io.jpg", - Enabled = true, - }, - }, - }, - } - }, - -- Trail module - { - Name = "IoTrail", - Parent = "JupiterBarycenter", - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Body = "IO", - Observer = "JUPITER BARYCENTER", - }, - Color = { 0.4, 0.4, 0.2 }, - Period = 42 / 24, - Resolution = 1000 - } - } -} diff --git a/data/scene/lodglobes/jupiter/jupiter/jup260.bsp.torrent b/data/scene/lodglobes/jupiter/jupiter/jup260.bsp.torrent deleted file mode 100644 index 0c82073d38..0000000000 Binary files a/data/scene/lodglobes/jupiter/jupiter/jup260.bsp.torrent and /dev/null differ diff --git a/data/scene/lodglobes/jupiter/jupiter/jupiter.data b/data/scene/lodglobes/jupiter/jupiter/jupiter.data deleted file mode 100644 index b22e81119b..0000000000 --- a/data/scene/lodglobes/jupiter/jupiter/jupiter.data +++ /dev/null @@ -1,8 +0,0 @@ -return { - FileRequest = { - { Identifier = "jupiter_textures", Destination = "textures", Version = 1 } - }, - TorrentFiles = { - { File = "jup260.bsp.torrent", Destination = "${SPICE}" }, - } -} \ No newline at end of file diff --git a/data/scene/lodglobes/jupiter/jupiter/jupiter.mod b/data/scene/lodglobes/jupiter/jupiter/jupiter.mod deleted file mode 100644 index 58dc65149d..0000000000 --- a/data/scene/lodglobes/jupiter/jupiter/jupiter.mod +++ /dev/null @@ -1,65 +0,0 @@ -return { - -- Barycenter module - { - Name = "JupiterBarycenter", - Parent = "SolarSystemBarycenter", - Transform = { - Translation = { - Type = "SpiceTranslation", - Body = "JUPITER BARYCENTER", - Observer = "SUN", - Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - }, - }, - }, - -- RenderableGlobe module - { - Name = "Jupiter", - Parent = "JupiterBarycenter", - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_JUPITER", - DestinationFrame = "GALACTIC", - }, - Translation = { - Type = "StaticTranslation", - Position = {0, 0, 0}, -- jupiter is at its barycenter - }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, - }, - Renderable = { - Type = "RenderableGlobe", - Radii = {71492000, 71492000, 66854000}, - SegmentsPerPatch = 64, - Layers = { - ColorLayers = { - { - Name = "Jupiter Texture", - FilePath = "textures/jupiter.jpg", - Enabled = true, - }, - }, - }, - } - }, - -- Trail module - { - Name = "JupiterTrail", - Parent = "SolarSystemBarycenter", - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Body = "JUPITER BARYCENTER", - Observer = "SUN", - }, - Color = { 0.8, 0.7, 0.7 }, - Period = 4330.595, - Resolution = 1000 - } - } -} \ No newline at end of file diff --git a/data/scene/lodglobes/mars/MAR063.BSP.torrent b/data/scene/lodglobes/mars/MAR063.BSP.torrent deleted file mode 100644 index 50cab2e6bf..0000000000 Binary files a/data/scene/lodglobes/mars/MAR063.BSP.torrent and /dev/null differ diff --git a/data/scene/lodglobes/mars/map_service_configs/MARS_Viking.xml b/data/scene/lodglobes/mars/map_service_configs/MARS_Viking.xml deleted file mode 100644 index 7197faf38e..0000000000 --- a/data/scene/lodglobes/mars/map_service_configs/MARS_Viking.xml +++ /dev/null @@ -1,10 +0,0 @@ - - http://webgis3.wr.usgs.gov/arcgis/rest/services/Mars_color/MapServer/WMTS/1.0.0/WMTSCapabilities.xml - - -180.0 - 90 - 180.0 - -90 - - 3 - \ No newline at end of file diff --git a/data/scene/lodglobes/mars/map_service_configs/MDIM21_color.xml b/data/scene/lodglobes/mars/map_service_configs/MDIM21_color.xml deleted file mode 100644 index caaa46437f..0000000000 --- a/data/scene/lodglobes/mars/map_service_configs/MDIM21_color.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - 1.3.0 - http://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/mars/mars_simp_cyl.map - EPSG:4326 - image/png - MDIM21_color - TRUE - - - -180.0 - 90.0 - 180.0 - -90.0 - 2048 - 1024 - bottom - - - \ No newline at end of file diff --git a/data/scene/lodglobes/mars/map_service_configs/Utah/ThemisIRDay.xml b/data/scene/lodglobes/mars/map_service_configs/Utah/ThemisIRDay.xml deleted file mode 100644 index 3b7641214b..0000000000 --- a/data/scene/lodglobes/mars/map_service_configs/Utah/ThemisIRDay.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - http://asgard.sci.utah.edu/Mars/ThemisIRDay/tile/${z}/${y}/${x} - - - -180.0 - 90.0 - 180.0 - -90.0 - 213390 - 106695 - 9 - top - - GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] - 256 - 256 - 1 - 10 - \ No newline at end of file diff --git a/data/scene/lodglobes/mars/map_service_configs/Utah/ThemisIRNight.xml b/data/scene/lodglobes/mars/map_service_configs/Utah/ThemisIRNight.xml deleted file mode 100644 index 3b7641214b..0000000000 --- a/data/scene/lodglobes/mars/map_service_configs/Utah/ThemisIRNight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - http://asgard.sci.utah.edu/Mars/ThemisIRDay/tile/${z}/${y}/${x} - - - -180.0 - 90.0 - 180.0 - -90.0 - 213390 - 106695 - 9 - top - - GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] - 256 - 256 - 1 - 10 - \ No newline at end of file diff --git a/data/scene/lodglobes/mars/mars.data b/data/scene/lodglobes/mars/mars.data deleted file mode 100644 index afaf7ab69d..0000000000 --- a/data/scene/lodglobes/mars/mars.data +++ /dev/null @@ -1,8 +0,0 @@ -return { - FileRequest = { - { Identifier = "mars_textures", Destination = "textures", Version = 1 } - }, - TorrentFiles = { - -- { File = "MAR063.BSP.torrent", Destination = "${SPICE}" } - } -} \ No newline at end of file diff --git a/data/scene/lodglobes/mercury/mercury.data b/data/scene/lodglobes/mercury/mercury.data deleted file mode 100644 index f2df36620b..0000000000 --- a/data/scene/lodglobes/mercury/mercury.data +++ /dev/null @@ -1,5 +0,0 @@ -return { - FileRequest = { - { Identifier = "mercury_textures", Destination = "textures", Version = 1 } - }, -} \ No newline at end of file diff --git a/data/scene/lodglobes/mercury/mercury.mod b/data/scene/lodglobes/mercury/mercury.mod deleted file mode 100644 index 531b855ba7..0000000000 --- a/data/scene/lodglobes/mercury/mercury.mod +++ /dev/null @@ -1,74 +0,0 @@ -return { - -- Barycenter module - { - Name = "MercuryBarycenter", - Parent = "SolarSystemBarycenter", - Transform = { - Translation = { - Type = "SpiceTranslation", - Body = "MERCURY", - Observer = "SUN", - Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - }, - }, - }, - -- RenderableGlobe module - { - Name = "Mercury", - Parent = "MercuryBarycenter", - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_MERCURY", - DestinationFrame = "GALACTIC", - }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, - }, - Renderable = { - Type = "RenderableGlobe", - Radii = {2439700, 2439700.0, 2439700.0}, - Frame = "IAU_MERCURY", - Body = "MERCURY", - - CameraMinHeight = 300, - InteractionDepthBelowEllipsoid = 0, -- Useful when having negative height map values - SegmentsPerPatch = 64, - Layers = { - ColorLayers = { - { - Name = "Simple Texture", - FilePath = "textures/mercury.jpg", - Enabled = true, - }, - { - Name = "Messenger_Mosaic", - FilePath = "map_service_configs/Utah/MessengerMosaic.wms" - }, - { - Name = "Messenger_MDIS", - FilePath = "map_service_configs/Utah/MessengerMDIS.wms" - } - }, - }, - }, - }, - -- Trail module - { - Name = "MercuryTrail", - Parent = "SolarSystemBarycenter", - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Body = "MERCURY", - Observer = "SUN", - }, - Color = {0.6, 0.5, 0.5 }, - Period = 87.968, - Resolution = 100 - } - } -} diff --git a/data/scene/lodglobes/moon/moon.data b/data/scene/lodglobes/moon/moon.data deleted file mode 100644 index f8c7094165..0000000000 --- a/data/scene/lodglobes/moon/moon.data +++ /dev/null @@ -1,5 +0,0 @@ -return { - FileRequest = { - { Identifier = "moon_textures", Destination = "textures", Version = 1 } - }, -} \ No newline at end of file diff --git a/data/scene/lodglobes/moon/moon.mod b/data/scene/lodglobes/moon/moon.mod deleted file mode 100644 index 1ddb3cf044..0000000000 --- a/data/scene/lodglobes/moon/moon.mod +++ /dev/null @@ -1,71 +0,0 @@ -return { - -- Moon module - { - Name = "Moon", - Parent = "EarthBarycenter", - Transform = { - Translation = { - Type = "SpiceTranslation", - Body = "MOON", - Observer = "EARTH BARYCENTER", - Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - }, - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_MOON", - DestinationFrame = "GALACTIC" - }, - }, - Renderable = { - Type = "RenderableGlobe", - Radii = {1738140, 1738140, 1735970}, -- Moons's radius - SegmentsPerPatch = 64, - Layers = { - ColorLayers = { - { - Name = "OnMoonColorGrayscale", - FilePath = "map_service_configs/OnMoonColor.xml", - Enabled = true, - }, - { - Name = "ClemUvvis", - FilePath = "map_service_configs/Utah/ClemUvvis.wms" - }, - { - Name = "Kaguya", - FilePath = "map_service_configs/Utah/Kaguya.wms" - }, - { - Name = "WAC", - FilePath = "map_service_configs/Utah/Wac.wms" - } - }, - HeightLayers = { - { - Name = "LolaDem", - FilePath = "map_service_configs/Utah/LolaDem.wms", - Enabled = true, - TilePixelSize = 64, - Settings = { Multiplier = 0.5 }, - } - }, - }, - } - }, - -- MoonTrail module - { - Name = "MoonTrail", - Parent = "EarthBarycenter", - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Body = "MOON", - Observer = "EARTH BARYCENTER", - }, - Color = { 0.5, 0.3, 0.3 }, - Period = 27, - Resolution = 1000 - }, - } -} diff --git a/data/scene/lodglobes/neptune/neptune.data b/data/scene/lodglobes/neptune/neptune.data deleted file mode 100644 index 60b294047e..0000000000 --- a/data/scene/lodglobes/neptune/neptune.data +++ /dev/null @@ -1,5 +0,0 @@ -return { - FileRequest = { - { Identifier = "neptune_textures", Destination = "textures", Version = 1 } - }, -} \ No newline at end of file diff --git a/data/scene/lodglobes/neptune/neptune.mod b/data/scene/lodglobes/neptune/neptune.mod deleted file mode 100644 index 99513e18bb..0000000000 --- a/data/scene/lodglobes/neptune/neptune.mod +++ /dev/null @@ -1,62 +0,0 @@ -return { - -- Barycenter module - { - Name = "NeptuneBarycenter", - Parent = "SolarSystemBarycenter", - Transform = { - Translation = { - Type = "SpiceTranslation", - Body = "NEPTUNE BARYCENTER", - Observer = "SUN", - Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - }, - }, - }, - -- RenderableGlobe module - { - Name = "Neptune", - Parent = "NeptuneBarycenter", - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_NEPTUNE", - DestinationFrame = "GALACTIC", - }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, - -- No translation, Neptune is in its barycenter - }, - Renderable = { - Type = "RenderableGlobe", - Radii = {24764000, 24764000, 24314000}, - SegmentsPerPatch = 64, - Layers = { - ColorLayers = { - { - Name = "Texture", - FilePath = "textures/neptune.jpg", - Enabled = true, - }, - }, - }, - }, - }, - -- Trail module - { - Name = "NeptuneTrail", - Parent = "SolarSystemBarycenter", - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Body = "NEPTUNE BARYCENTER", - Observer = "SUN", - }, - Color = {0.2, 0.5, 1.0 }, - Period = 60200, - Resolution = 1000 - }, - } -} diff --git a/data/scene/lodglobes/saturn/saturn.data b/data/scene/lodglobes/saturn/saturn.data deleted file mode 100644 index cf0748dfc1..0000000000 --- a/data/scene/lodglobes/saturn/saturn.data +++ /dev/null @@ -1,8 +0,0 @@ -return { - FileRequest = { - { Identifier = "saturn_textures", Destination = "textures", Version = 2 } - }, - TorrentFiles = { - { File = "sat375.bsp.torrent", Destination = "${SPICE}" }, - } -} \ No newline at end of file diff --git a/data/scene/lodglobes/saturn/saturn.mod b/data/scene/lodglobes/saturn/saturn.mod deleted file mode 100644 index dc1ef691eb..0000000000 --- a/data/scene/lodglobes/saturn/saturn.mod +++ /dev/null @@ -1,72 +0,0 @@ -return { - -- Barycenter module - { - Name = "SaturnBarycenter", - Parent = "SolarSystemBarycenter", - Transform = { - Translation = { - Type = "SpiceTranslation", - Body = "SATURN BARYCENTER", - Observer = "SUN", - Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - }, - }, - }, - -- RenderableGlobe module - { - Name = "Saturn", - Parent = "SaturnBarycenter", - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_SATURN", - DestinationFrame = "GALACTIC", - }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, - -- No translation, Saturn is in its barycenter - }, - Renderable = { - Type = "RenderableGlobe", - Radii = {60268000, 60268000, 54364000}, - SegmentsPerPatch = 64, - Layers = { - ColorLayers = { - { - Name = "Saturn Texture", - FilePath = "textures/saturn.jpg", - Enabled = true, - }, - }, - }, - }, - }, - { - Name = "SaturnRings", - Parent = "Saturn", - Renderable = { - Type = "RenderableRings", - Texture = "textures/saturn_rings.png", - Size = 140220000, - Offset = { 74500 / 140445.100671159, 1.0 } -- min / max extend - }, - }, - -- Trail module - { - Name = "SaturnTrail", - Parent = "SolarSystemBarycenter", - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Body = "SATURN BARYCENTER", - Observer = "SUN", - }, - Color = {0.85,0.75,0.51 }, - Period = 10746.94, - Resolution = 1000 - }, - } -} diff --git a/data/scene/lodglobes/uranus/uranus.data b/data/scene/lodglobes/uranus/uranus.data deleted file mode 100644 index 1260617597..0000000000 --- a/data/scene/lodglobes/uranus/uranus.data +++ /dev/null @@ -1,5 +0,0 @@ -return { - FileRequest = { - { Identifier = "uranus_textures", Destination = "textures", Version = 1 } - }, -} \ No newline at end of file diff --git a/data/scene/lodglobes/uranus/uranus.mod b/data/scene/lodglobes/uranus/uranus.mod deleted file mode 100644 index b8cda62a16..0000000000 --- a/data/scene/lodglobes/uranus/uranus.mod +++ /dev/null @@ -1,62 +0,0 @@ -return { - -- Barycenter module - { - Name = "UranusBarycenter", - Parent = "SolarSystemBarycenter", - Transform = { - Translation = { - Type = "SpiceTranslation", - Body = "URANUS BARYCENTER", - Observer = "SUN", - Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - }, - }, - }, - -- RenderableGlobe module - { - Name = "Uranus", - Parent = "UranusBarycenter", - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_URANUS", - DestinationFrame = "GALACTIC", - }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, - -- No translation, Uranus is in its barycenter - }, - Renderable = { - Type = "RenderableGlobe", - Radii = {25559000, 25559000, 24973000}, - SegmentsPerPatch = 64, - Layers = { - ColorLayers = { - { - Name = "Texture", - FilePath = "textures/uranus.jpg", - Enabled = true, - }, - }, - }, - }, - }, - -- Trail module - { - Name = "UranusTrail", - Parent = "SolarSystemBarycenter", - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Body = "URANUS BARYCENTER", - Observer = "SUN", - }, - Color = {0.60, 0.95, 1.00 }, - Period = 30588.740, - Resolution = 1000 - }, - } -} diff --git a/data/scene/lodglobes/venus/venus.data b/data/scene/lodglobes/venus/venus.data deleted file mode 100644 index 07753359f6..0000000000 --- a/data/scene/lodglobes/venus/venus.data +++ /dev/null @@ -1,5 +0,0 @@ -return { - FileRequest = { - { Identifier = "venus_textures", Destination = "textures", Version = 1 } - }, -} \ No newline at end of file diff --git a/data/scene/lodglobes/venus/venus.mod b/data/scene/lodglobes/venus/venus.mod deleted file mode 100644 index 285f88f466..0000000000 --- a/data/scene/lodglobes/venus/venus.mod +++ /dev/null @@ -1,67 +0,0 @@ -return { - -- Barycenter module - { - Name = "VenusBarycenter", - Parent = "SolarSystemBarycenter", - Transform = { - Translation = { - Type = "SpiceTranslation", - Body = "VENUS BARYCENTER", - Observer = "SUN", - Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - }, - }, - }, - -- RenderableGlobe module - { - Name = "Venus", - Parent = "VenusBarycenter", - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "IAU_VENUS", - DestinationFrame = "GALACTIC", - }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, - Translation = { - Type = "SpiceTranslation", - Body = "VENUS", - Observer = "VENUS BARYCENTER", - Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - }, - }, - Renderable = { - Type = "RenderableGlobe", - Radii = {6051900, 6051900, 6051800}, - SegmentsPerPatch = 64, - Layers = { - ColorLayers = { - { - Name = "Venus Texture", - FilePath = "textures/venus.jpg", - Enabled = true, - }, - }, - }, - }, - }, - -- Trail module - { - Name = "VenusTrail", - Parent = "SolarSystemBarycenter", - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Body = "VENUS BARYCENTER", - Observer = "SUN", - }, - Color = { 1.0, 0.5, 0.2 }, - Period = 224.695, - Resolution = 1000 - }, - } -} diff --git a/data/scene/mars/map_service_configs/AWS/CTX.wms b/data/scene/mars/map_service_configs/AWS/CTX.wms new file mode 100644 index 0000000000..46251f85e8 --- /dev/null +++ b/data/scene/mars/map_service_configs/AWS/CTX.wms @@ -0,0 +1,17 @@ + + + http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/CTX/tile/${z}/${y}/${x} + + + -180.0 90.0 + 180.0 -90.0 + 4194304 2097152 + 12 top + + GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] + 512 512 + 2 + 5 + 400,204,404 + true + diff --git a/data/scene/mars/map_service_configs/AWS/Mdim.wms b/data/scene/mars/map_service_configs/AWS/Mdim.wms new file mode 100644 index 0000000000..d795931273 --- /dev/null +++ b/data/scene/mars/map_service_configs/AWS/Mdim.wms @@ -0,0 +1,22 @@ + + + http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/Mdim/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 92160 + 46080 + 7 + top + + GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] + 360 + 360 + 3 + 10 + 400,204,404 + true + diff --git a/data/scene/mars/map_service_configs/AWS/Mola_Elevation.wms b/data/scene/mars/map_service_configs/AWS/Mola_Elevation.wms new file mode 100644 index 0000000000..b53bee4210 --- /dev/null +++ b/data/scene/mars/map_service_configs/AWS/Mola_Elevation.wms @@ -0,0 +1,23 @@ + + + http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/MolaElevation/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 46080 + 23040 + 6 + top + + GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] + 360 + 360 + 1 + Int16 + 10 + 400,204,404 + true + diff --git a/data/scene/mars/map_service_configs/AWS/Mola_PseudoColor.wms b/data/scene/mars/map_service_configs/AWS/Mola_PseudoColor.wms new file mode 100644 index 0000000000..2fad1a362a --- /dev/null +++ b/data/scene/mars/map_service_configs/AWS/Mola_PseudoColor.wms @@ -0,0 +1,22 @@ + + + http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/MolaPseudoColor/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 46080 + 23040 + 6 + top + + GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] + 360 + 360 + 3 + 10 + 400,204,404 + true + diff --git a/data/scene/mars/map_service_configs/AWS/Themis_IR_Day.wms b/data/scene/mars/map_service_configs/AWS/Themis_IR_Day.wms new file mode 100644 index 0000000000..041f46e04e --- /dev/null +++ b/data/scene/mars/map_service_configs/AWS/Themis_IR_Day.wms @@ -0,0 +1,22 @@ + + + http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/ThemisIRDay/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 213390 + 106695 + 9 + top + + GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] + 256 + 256 + 1 + 10 + 400,204,404 + true + diff --git a/data/scene/mars/map_service_configs/AWS/Themis_IR_Night.wms b/data/scene/mars/map_service_configs/AWS/Themis_IR_Night.wms new file mode 100644 index 0000000000..387e06efe5 --- /dev/null +++ b/data/scene/mars/map_service_configs/AWS/Themis_IR_Night.wms @@ -0,0 +1,22 @@ + + + http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mars/ThemisIRNight/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 213388 + 71130 + 9 + top + + GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] + 256 + 256 + 1 + 10 + 400,204,404 + true + diff --git a/data/scene/lodglobes/mars/map_service_configs/CTX_Mosaic.xml b/data/scene/mars/map_service_configs/LiU/CTX.xml similarity index 100% rename from data/scene/lodglobes/mars/map_service_configs/CTX_Mosaic.xml rename to data/scene/mars/map_service_configs/LiU/CTX.xml diff --git a/data/scene/lodglobes/mars/map_service_configs/Mola_Elevation.xml b/data/scene/mars/map_service_configs/LiU/Mola_Elevation.xml similarity index 100% rename from data/scene/lodglobes/mars/map_service_configs/Mola_Elevation.xml rename to data/scene/mars/map_service_configs/LiU/Mola_Elevation.xml diff --git a/data/scene/lodglobes/mars/map_service_configs/MARS_Viking_MDIM21.xml b/data/scene/mars/map_service_configs/MARS_Viking_MDIM21.xml similarity index 100% rename from data/scene/lodglobes/mars/map_service_configs/MARS_Viking_MDIM21.xml rename to data/scene/mars/map_service_configs/MARS_Viking_MDIM21.xml diff --git a/data/scene/lodglobes/mars/map_service_configs/Mars_MGS_MOLA_DEM.xml b/data/scene/mars/map_service_configs/Mars_MGS_MOLA_DEM.xml similarity index 100% rename from data/scene/lodglobes/mars/map_service_configs/Mars_MGS_MOLA_DEM.xml rename to data/scene/mars/map_service_configs/Mars_MGS_MOLA_DEM.xml diff --git a/data/scene/lodglobes/mars/map_service_configs/Utah/CTX_Mosaic.xml b/data/scene/mars/map_service_configs/Utah/CTX.xml similarity index 100% rename from data/scene/lodglobes/mars/map_service_configs/Utah/CTX_Mosaic.xml rename to data/scene/mars/map_service_configs/Utah/CTX.xml diff --git a/data/scene/lodglobes/mars/map_service_configs/Utah/Mdim.xml b/data/scene/mars/map_service_configs/Utah/Mdim.xml similarity index 100% rename from data/scene/lodglobes/mars/map_service_configs/Utah/Mdim.xml rename to data/scene/mars/map_service_configs/Utah/Mdim.xml diff --git a/data/scene/lodglobes/mars/map_service_configs/Utah/MolaCTX_Elevation.xml b/data/scene/mars/map_service_configs/Utah/MolaCTX_Elevation.xml similarity index 100% rename from data/scene/lodglobes/mars/map_service_configs/Utah/MolaCTX_Elevation.xml rename to data/scene/mars/map_service_configs/Utah/MolaCTX_Elevation.xml diff --git a/data/scene/lodglobes/mars/map_service_configs/Utah/Mola_Elevation.xml b/data/scene/mars/map_service_configs/Utah/Mola_Elevation.xml similarity index 100% rename from data/scene/lodglobes/mars/map_service_configs/Utah/Mola_Elevation.xml rename to data/scene/mars/map_service_configs/Utah/Mola_Elevation.xml diff --git a/data/scene/lodglobes/mars/map_service_configs/Utah/MolaPseudoColor.xml b/data/scene/mars/map_service_configs/Utah/Mola_PseudoColor.xml similarity index 100% rename from data/scene/lodglobes/mars/map_service_configs/Utah/MolaPseudoColor.xml rename to data/scene/mars/map_service_configs/Utah/Mola_PseudoColor.xml diff --git a/data/scene/mars/map_service_configs/Utah/Themis_IR_Day.xml b/data/scene/mars/map_service_configs/Utah/Themis_IR_Day.xml new file mode 100644 index 0000000000..a951c29e07 --- /dev/null +++ b/data/scene/mars/map_service_configs/Utah/Themis_IR_Day.xml @@ -0,0 +1,22 @@ + + + http://asgard.sci.utah.edu/Mars/ThemisIRDay/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 213390 + 106695 + 9 + top + + GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] + 256 + 256 + 1 + 10 + 400,204,404 + true + diff --git a/data/scene/mars/map_service_configs/Utah/Themis_IR_Night.xml b/data/scene/mars/map_service_configs/Utah/Themis_IR_Night.xml new file mode 100644 index 0000000000..7aee3a5b85 --- /dev/null +++ b/data/scene/mars/map_service_configs/Utah/Themis_IR_Night.xml @@ -0,0 +1,22 @@ + + + http://asgard.sci.utah.edu/Mars/ThemisIRNight/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 213390 + 106695 + 9 + top + + GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] + 256 + 256 + 1 + 10 + 400,204,404 + true + diff --git a/data/scene/mars/mars.mod b/data/scene/mars/mars.mod index e3b11debc8..6e7f240768 100644 --- a/data/scene/mars/mars.mod +++ b/data/scene/mars/mars.mod @@ -1,54 +1,194 @@ +--local marsEllipsoid = {3396190.0, 3396190.0, 3376200.0} +local marsEllipsoid = {3396190.0, 3396190.0, 3396190.0} + return { - -- Mars barycenter module + -- Barycenter module { Name = "MarsBarycenter", Parent = "SolarSystemBarycenter", Transform = { Translation = { Type = "SpiceTranslation", - Body = "MARS BARYCENTER", + Target = "MARS BARYCENTER", Observer = "SUN", Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" } } }, - -- Mars module + -- RenderableGlobe module { Name = "Mars", Parent = "MarsBarycenter", - Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_MARS", - Body = "MARS BARYCENTER", - Geometry = { - Type = "SimpleSphere", - Radius = 3.390E6, - Segments = 100 - }, - Textures = { - Type = "simple", - Color = "textures/mars.jpg", - }, - Atmosphere = { - Type = "Nishita", -- for example, values missing etc etc - MieFactor = 1.0, - MieColor = {1.0, 1.0, 1.0} - } - }, - Tag = {"planet_solarSystem", "planet_terrestrial"}, Transform = { Rotation = { Type = "SpiceRotation", SourceFrame = "IAU_MARS", - DestinationFrame = "GALACTIC", - }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, - } + DestinationFrame = "GALACTIC" + } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = marsEllipsoid, + SegmentsPerPatch = 90, + Layers = { + ColorLayers = { + { + Name = "Viking MDIM", + FilePath = "map_service_configs/MARS_Viking_MDIM21.xml", + Enabled = true, + Fallback = { + Name = "Mars Texture", + FilePath = "textures/mars.jpg", + Enabled = true, + }, + }, + -- Linköping University based servers + { + Name = "CTX Mosaic [LiU]", + FilePath = "map_service_configs/LiU/CTX.xml", + BlendMode = "Color" + }, + -- University of Utah based servers + { + Name = "CTX Mosaic [Utah]", + FilePath = "map_service_configs/Utah/CTX.xml", + BlendMode = "Color" + }, + { + Name = "MOLA Pseudo Color", + FilePath = "map_service_configs/Utah/Mola_PseudoColor.xml" + }, + { + Name = "Themis IR Day [Utah]", + FilePath = "map_service_configs/Utah/Themis_IR_Day.xml" + }, + { + Name = "Themis IR Night [Utah]", + FilePath = "map_service_configs/Utah/Themis_IR_Night.xml" + }, + { + Name = "Viking MDIM [Utah]", + FilePath = "map_service_configs/Utah/Mdim.xml" + }, + -- AWS based servers + { + Name = "CTX Mosaic [AWS]", + FilePath = "map_service_configs/AWS/CTX.wms", + BlendMode = "Color" + }, + { + Name = "Viking MDIM [AWS]", + FilePath = "map_service_configs/AWS/Mdim.wms" + }, + { + Name = "MOLA Pseudo Color [AWS]", + FilePath = "map_service_configs/AWS/Mola_PseudoColor.wms" + }, + { + Name = "Themis IR Day [AWS]", + FilePath = "map_service_configs/AWS/Themis_IR_Day.wms" + }, + { + Name = "Themis IR Night [AWS]", + FilePath = "map_service_configs/AWS/Themis_IR_Night.wms" + } + }, + Overlays = { + { + Type = "TileIndexTileLayer", + Name = "Indices" + }, + { + Type = "SizeReferenceTileLayer", + Name = "Size Reference", + Radii = marsEllipsoid + } + }, + HeightLayers = { + { + Name = "Mola Elevation", + FilePath = "map_service_configs/Mars_MGS_MOLA_DEM.xml", + Enabled = true, + TilePixelSize = 90 + }, + { + Name = "Mola Elevation [Europe]", + FilePath = "map_service_configs/LiU/Mola_Elevation.xml", + -- Enabled = true, + TilePixelSize = 90 + }, + { + Name = "Mola Elevation [Utah]", + FilePath = "map_service_configs/Utah/Mola_Elevation.xml", + TilePixelSize = 90 + }, + { + Name = "Mola Elevation [AWS]", + FilePath = "map_service_configs/AWS/Mola_Elevation.wms", + TilePixelSize = 90 + }, + } + } + }, + Tag = { "planet_solarSystem", "planet_terrestrial" }, }, - -- MarsTrail module + + -- Mars Atmosphere + { + Name = "MarsAtmosphere", + Parent = "Mars", + Renderable = { + Type = "RenderableAtmosphere", + Atmosphere = { + Type = "RenderableGlobe", + -- Atmosphere radius in Km + AtmosphereRadius = 3463.17495, + --PlanetRadius = 3396.19, + --PlanetRadius = 3393.0, + PlanetRadius = 3386.190, + PlanetAverageGroundReflectance = 0.1, + Rayleigh = { + Coefficients = { + -- Wavelengths are given in 10^-9m + Wavelengths = {680, 550, 440}, + -- Reflection coefficients are given in km^-1 + Scattering = {19.918E-3, 13.57E-3, 5.75E-3}, + -- In Rayleigh scattering, the coefficients of + -- absorption and scattering are the same. + }, + -- Thichkness of atmosphere if its density were uniform, in Km + H_R = 10.43979, + }, + -- Default + Mie = { + Coefficients = { + -- Reflection coefficients are given in km^-1 + Scattering = {53.61771e-3, 53.61771e-3, 53.61771e-3}, + -- Extinction coefficients are a fraction of the Scattering coefficients + Extinction = {53.61771e-3/0.98979, 53.61771e-3/0.98979, 53.61771e-3/0.98979} + }, + -- Mie Height scale (atmosphere thickness for constant density) in Km + H_M = 3.09526, + -- Mie Phase Function Value (G e [-1.0, 1.0]. + -- If G = 1.0, Mie phase function = Rayleigh Phase Function) + G = 0.85, + }, + Image = { + ToneMapping = jToneMapping, + Exposure = 0.4, + Background = 1.8, + Gamma = 1.85, + }, + Debug = { + -- PreCalculatedTextureScale is a float from 1.0 to N, with N > 0.0 and N in Naturals (i.e., 1, 2, 3, 4, 5....) + PreCalculatedTextureScale = 1.0, + SaveCalculatedTextures = false, + }, + }, + }, + }, + + -- Trail module { Name = "MarsTrail", Parent = "SolarSystemBarycenter", @@ -56,13 +196,13 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "MARS BARYCENTER", - Observer = "SUN", + Target = "MARS BARYCENTER", + Observer = "SUN" }, Color = { 0.814, 0.305, 0.220 }, Period = 686.973, - Resolution = 1000, - Tag = {"planetTrail_solarSystem", "planetTrail_terrestrial"} - } + Resolution = 1000 + }, + Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" } } } diff --git a/data/scene/lodglobes/mercury/map_service_configs/OnMercuryColor.xml b/data/scene/mercury/map_service_configs/AMNH/OnMercuryColor.xml similarity index 100% rename from data/scene/lodglobes/mercury/map_service_configs/OnMercuryColor.xml rename to data/scene/mercury/map_service_configs/AMNH/OnMercuryColor.xml diff --git a/data/scene/lodglobes/mercury/map_service_configs/OnMercuryElevationGaskell.xml b/data/scene/mercury/map_service_configs/AMNH/OnMercuryElevationGaskell.xml similarity index 100% rename from data/scene/lodglobes/mercury/map_service_configs/OnMercuryElevationGaskell.xml rename to data/scene/mercury/map_service_configs/AMNH/OnMercuryElevationGaskell.xml diff --git a/data/scene/lodglobes/mercury/map_service_configs/OnMercuryImage.xml b/data/scene/mercury/map_service_configs/AMNH/OnMercuryImage.xml similarity index 100% rename from data/scene/lodglobes/mercury/map_service_configs/OnMercuryImage.xml rename to data/scene/mercury/map_service_configs/AMNH/OnMercuryImage.xml diff --git a/data/scene/mercury/map_service_configs/AWS/MessengerMdis.wms b/data/scene/mercury/map_service_configs/AWS/MessengerMdis.wms new file mode 100644 index 0000000000..bafca5ca07 --- /dev/null +++ b/data/scene/mercury/map_service_configs/AWS/MessengerMdis.wms @@ -0,0 +1,20 @@ + + + http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mercury/MessengerMdis/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 61324 + 30662 + 7 + top + + GEOGCS["GCS_Mercury_2015",DATUM["D_Mercury_2015",SPHEROID["Mercury_2015",2439400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] + 256 + 256 + 1 + 10 + diff --git a/data/scene/mercury/map_service_configs/AWS/MessengerMosaic.wms b/data/scene/mercury/map_service_configs/AWS/MessengerMosaic.wms new file mode 100644 index 0000000000..89415f373e --- /dev/null +++ b/data/scene/mercury/map_service_configs/AWS/MessengerMosaic.wms @@ -0,0 +1,20 @@ + + + http://planetarydev-1803629091.us-west-2.elb.amazonaws.com/Mercury/MessengerMosaic/tile/${z}/${y}/${x} + + + -180.0 + 90.0 + 180.0 + -90.0 + 23054 + 11527 + 6 + top + + GEOGCS["GCS_Mercury_2015",DATUM["D_Mercury_2015",SPHEROID["Mercury_2015",2439400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]] + 256 + 256 + 3 + 10 + diff --git a/data/scene/lodglobes/mercury/map_service_configs/Utah/MessengerMdis.wms b/data/scene/mercury/map_service_configs/Utah/MessengerMdis.wms similarity index 100% rename from data/scene/lodglobes/mercury/map_service_configs/Utah/MessengerMdis.wms rename to data/scene/mercury/map_service_configs/Utah/MessengerMdis.wms diff --git a/data/scene/lodglobes/mercury/map_service_configs/Utah/MessengerMosaic.wms b/data/scene/mercury/map_service_configs/Utah/MessengerMosaic.wms similarity index 100% rename from data/scene/lodglobes/mercury/map_service_configs/Utah/MessengerMosaic.wms rename to data/scene/mercury/map_service_configs/Utah/MessengerMosaic.wms diff --git a/data/scene/mercury/mercury.data b/data/scene/mercury/mercury.data deleted file mode 100644 index f2df36620b..0000000000 --- a/data/scene/mercury/mercury.data +++ /dev/null @@ -1,5 +0,0 @@ -return { - FileRequest = { - { Identifier = "mercury_textures", Destination = "textures", Version = 1 } - }, -} \ No newline at end of file diff --git a/data/scene/mercury/mercury.mod b/data/scene/mercury/mercury.mod index 61d5c6ff8b..d510478baa 100644 --- a/data/scene/mercury/mercury.mod +++ b/data/scene/mercury/mercury.mod @@ -1,54 +1,62 @@ return { - -- Mercury barycenter module + -- Barycenter module { Name = "MercuryBarycenter", Parent = "SolarSystemBarycenter", Transform = { Translation = { Type = "SpiceTranslation", - Body = "MERCURY BARYCENTER", + Target = "MERCURY", Observer = "SUN", Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - }, + } } }, - -- Mercury module + -- RenderableGlobe module { Name = "Mercury", Parent = "MercuryBarycenter", - Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_MERCURY", - Body = "MERCURY", - Geometry = { - Type = "SimpleSphere", - Radius = 2.4397E6, - Segments = 100 - }, - Textures = { - Type = "simple", - Color = "textures/mercury.jpg", - }, - Atmosphere = { - Type = "Nishita", -- for example, values missing etc etc - MieFactor = 1.0, - MieColor = {1.0, 1.0, 1.0} - } - }, - Tag = {"planet_solarSystem", "planet_terrestrial"}, Transform = { Rotation = { Type = "SpiceRotation", SourceFrame = "IAU_MERCURY", - DestinationFrame = "ECLIPJ2000", - }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, - } + DestinationFrame = "GALACTIC" + } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = 2439700, + Frame = "IAU_MERCURY", + Body = "MERCURY", + CameraMinHeight = 300, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + -- University of Utah based servers + { + Name = "Messenger MDIS [Utah]", + FilePath = "map_service_configs/Utah/MessengerMDIS.wms", + Enabled = true + }, + { + Name = "Messenger Mosaic [Utah]", + FilePath = "map_service_configs/Utah/MessengerMosaic.wms" + }, + -- AWS based servers + { + Name = "Messenger MDIS [AWS]", + FilePath = "map_service_configs/AWS/MessengerMdis.wms", + }, + { + Name = "Messenger Mosaic [AWS]", + FilePath = "map_service_configs/AWS/MessengerMosaic.wms", + } + } + } + }, + Tag = { "planet_solarSystem", "planet_terrestrial" }, }, - -- MercuryTrail module + -- Trail module { Name = "MercuryTrail", Parent = "SolarSystemBarycenter", @@ -56,13 +64,13 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "MERCURY", + Target = "MERCURY", Observer = "SUN", }, Color = {0.6, 0.5, 0.5 }, Period = 87.968, - Resolution = 100, - Tag = {"planetTrail_solarSystem", "planetTrail_terrestrial"} - } + Resolution = 100 + }, + Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" } } } diff --git a/data/scene/milkyway/milkyway.data b/data/scene/milkyway/digitaluniverse/digitaluniverse.data similarity index 100% rename from data/scene/milkyway/milkyway.data rename to data/scene/milkyway/digitaluniverse/digitaluniverse.data diff --git a/data/scene/milkyway/milkyway.mod b/data/scene/milkyway/digitaluniverse/digitaluniverse.mod similarity index 100% rename from data/scene/milkyway/milkyway.mod rename to data/scene/milkyway/digitaluniverse/digitaluniverse.mod diff --git a/data/scene/milkyway-eso/milkyway-eso.data b/data/scene/milkyway/eso/eso.data similarity index 100% rename from data/scene/milkyway-eso/milkyway-eso.data rename to data/scene/milkyway/eso/eso.data diff --git a/data/scene/milkyway-eso/milkyway-eso.mod b/data/scene/milkyway/eso/eso.mod similarity index 100% rename from data/scene/milkyway-eso/milkyway-eso.mod rename to data/scene/milkyway/eso/eso.mod diff --git a/data/scene/missions/dawn/ceres/ceres.mod b/data/scene/missions/dawn/ceres/ceres.mod index 0c29ae852b..775b94dae8 100644 --- a/data/scene/missions/dawn/ceres/ceres.mod +++ b/data/scene/missions/dawn/ceres/ceres.mod @@ -13,10 +13,7 @@ return { Radius = 6.390E5, Segments = 100 }, - Textures = { - Type = "simple", - Color = "textures/gray.png", - }, + ColorTexture = "textures/gray.png", StartTime = "2010 JAN 01 00:00:00", EndTime = "2018 JAN 22 12:00:00" }, diff --git a/data/scene/missions/dawn/dawn/dawn.mod b/data/scene/missions/dawn/dawn/dawn.mod index 3d4a14e917..54aae8158d 100644 --- a/data/scene/missions/dawn/dawn/dawn.mod +++ b/data/scene/missions/dawn/dawn/dawn.mod @@ -11,10 +11,7 @@ return { Type = "MultiModelGeometry", GeometryFile = "${OPENSPACE_DATA}/scene/dawn/obj/mainbodydawn.obj", }, - Textures = { - Type = "simple", - Color = "textures/gray.png", - }, + ColorTexture = "textures/gray.png", Rotation = { Source = "DAWN_SPACECRAFT", Destination = "GALACTIC" @@ -634,10 +631,7 @@ return { Type = "MultiModelGeometry", GeometryFile = "${OPENSPACE_DATA}/scene/dawn/obj/solarpanelleft.obj", }, - Textures = { - Type = "simple", - Color = "textures/gray.png", - }, + ColorTexture = "textures/gray.png", Rotation = { Source = "DAWN_SA-Y", Destination = "GALACTIC" @@ -657,10 +651,7 @@ return { Type = "MultiModelGeometry", GeometryFile = "${OPENSPACE_DATA}/scene/dawn/obj/solarpanelright.obj", }, - Textures = { - Type = "simple", - Color = "textures/gray.png", - }, + ColorTexture = "textures/gray.png", Rotation = { Source = "DAWN_SA+Y", Destination = "GALACTIC" @@ -703,7 +694,7 @@ return { Type = "RenderableTrailTrajectory", Translation = { Type = "SpiceTranslation", - Body = "DAWN", + Target = "DAWN", Observer = "SUN", }, Color = { 0.7, 0.4, 0.9 }, diff --git a/data/scene/missions/dawn/vestaprojection/vestaprojection.mod b/data/scene/missions/dawn/vestaprojection/vestaprojection.mod index f0b8cc87b6..379d0272c2 100644 --- a/data/scene/missions/dawn/vestaprojection/vestaprojection.mod +++ b/data/scene/missions/dawn/vestaprojection/vestaprojection.mod @@ -11,9 +11,9 @@ return { Type = "MultiModelGeometry", GeometryFile = "${OPENSPACE_DATA}/scene/vestaprojection_2/obj/VestaComet_5000.obj", }, + ColorTexture = "textures/dummy.jpg", Textures = { Type = "simple", - Color = "textures/dummy.jpg", Project = "textures/projectMe.png", Default = "textures/defaultProj_backup.png" }, @@ -103,7 +103,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "VESTA", + Target = "VESTA", Observer = "SUN", }, Color = { 0.7, 0.8, 0.7 }, diff --git a/data/scene/missions/juno/juno/juno.mod b/data/scene/missions/juno/juno/juno.mod index 823c8f9339..8ef710ddcc 100644 --- a/data/scene/missions/juno/juno/juno.mod +++ b/data/scene/missions/juno/juno/juno.mod @@ -13,10 +13,7 @@ return { GeometryFile = "Juno.obj", Magnification = 4, }, - Textures = { - Type = "simple", - Color = "textures/gray.png", - }, + ColorTexture = "textures/gray.png", Rotation = { Source = "JUNO_SPACECRAFT", Destination = "GALACTIC", @@ -129,7 +126,7 @@ return { Type = "RenderableTrailTrajectory", Translation = { Type = "SpiceTranslation", - Body = "JUNO", + Target = "JUNO", Observer = "JUPITER BARYCENTER" }, Color = { 0.70, 0.50, 0.20 }, diff --git a/data/scene/missions/newhorizons/jupiter/callisto/callisto.mod b/data/scene/missions/newhorizons/jupiter/callisto/callisto.mod index 3a51e4c5bb..25facc74d4 100644 --- a/data/scene/missions/newhorizons/jupiter/callisto/callisto.mod +++ b/data/scene/missions/newhorizons/jupiter/callisto/callisto.mod @@ -15,9 +15,9 @@ return { Radius = callisto_radius, Segments = 100 }, + ColorTexture = "textures/callisto.jpg", Textures = { Type = "simple", - Color = "textures/callisto.jpg", Project = "textures/defaultProj.png", Sequencing = "true", }, @@ -45,7 +45,7 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = "CALLISTO", + Target = "CALLISTO", Observer = "JUPITER BARYCENTER", Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, @@ -88,7 +88,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "CALLISTO", + Target = "CALLISTO", Observer = "JUPITER BARYCENTER", }, Color = { 0.4, 0.3, 0.01 }, diff --git a/data/scene/missions/newhorizons/jupiter/europa/europa.mod b/data/scene/missions/newhorizons/jupiter/europa/europa.mod index 37a137fdb0..8d0fbe1039 100644 --- a/data/scene/missions/newhorizons/jupiter/europa/europa.mod +++ b/data/scene/missions/newhorizons/jupiter/europa/europa.mod @@ -15,9 +15,9 @@ return { Radius = europa_radius, Segments = 100 }, + ColorTexture = "textures/europa.jpg", Textures = { Type = "simple", - Color = "textures/europa.jpg", Project = "textures/defaultProj.png", Sequencing = "true", }, @@ -45,7 +45,7 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = "EUROPA", + Target = "EUROPA", Observer = "JUPITER BARYCENTER", Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, @@ -88,7 +88,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "EUROPA", + Target = "EUROPA", Observer = "JUPITER BARYCENTER", }, Color = { 0.5, 0.3, 0.3 }, diff --git a/data/scene/missions/newhorizons/jupiter/ganymede/ganymede.mod b/data/scene/missions/newhorizons/jupiter/ganymede/ganymede.mod index 9d16289f9b..fe5facac2b 100644 --- a/data/scene/missions/newhorizons/jupiter/ganymede/ganymede.mod +++ b/data/scene/missions/newhorizons/jupiter/ganymede/ganymede.mod @@ -15,9 +15,9 @@ return { Radius = ganymede_local, Segments = 100 }, + ColorTexture = "textures/ganymede.jpg", Textures = { Type = "simple", - Color = "textures/ganymede.jpg", Project = "textures/defaultProj.png", Sequencing = "true", }, @@ -45,7 +45,7 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = "GANYMEDE", + Target = "GANYMEDE", Observer = "JUPITER BARYCENTER", Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, @@ -82,7 +82,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "GANYMEDE", + Target = "GANYMEDE", Observer = "JUPITER BARYCENTER", }, Color = { 0.4, 0.3, 0.3 }, diff --git a/data/scene/missions/newhorizons/jupiter/io/io.mod b/data/scene/missions/newhorizons/jupiter/io/io.mod index 60ed022544..c8bc937554 100644 --- a/data/scene/missions/newhorizons/jupiter/io/io.mod +++ b/data/scene/missions/newhorizons/jupiter/io/io.mod @@ -15,9 +15,9 @@ return { Radius = io_radius, Segments = 100 }, + ColorTexture = "textures/io.jpg", Textures = { Type = "simple", - Color = "textures/io.jpg", Project = "textures/defaultProj.png", Sequencing = "true", }, @@ -45,7 +45,7 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = "IO", + Target = "IO", Observer = "JUPITER BARYCENTER", Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, @@ -98,7 +98,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "IO", + Target = "IO", Observer = "JUPITER BARYCENTER", }, Color = { 0.4, 0.4, 0.2 }, diff --git a/data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod b/data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod index f4fbe278f0..f611aa5542 100644 --- a/data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod +++ b/data/scene/missions/newhorizons/jupiter/jupiter/jupiter.mod @@ -8,7 +8,7 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = "JUPITER BARYCENTER", + Target = "JUPITER BARYCENTER", Observer = "SUN", Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, @@ -28,9 +28,9 @@ return { Radius = jupiter_local, Segments = 200, }, + ColorTexture = "textures/jupiterFlipped_low.jpg", Textures = { Type = "simple", - Color = "textures/jupiterFlipped_low.jpg", Project = "textures/lorriTest1.jpg", Sequencing = "true", }, @@ -125,7 +125,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "JUPITER BARYCENTER", + Target = "JUPITER BARYCENTER", Observer = "SUN", }, Color = { 0.8, 0.7, 0.7 }, diff --git a/data/scene/missions/newhorizons/newhorizons/newhorizons.mod b/data/scene/missions/newhorizons/newhorizons/newhorizons.mod index 3e00eac771..d15b46d79d 100644 --- a/data/scene/missions/newhorizons/newhorizons/newhorizons.mod +++ b/data/scene/missions/newhorizons/newhorizons/newhorizons.mod @@ -74,7 +74,7 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = "NEW HORIZONS", + Target = "NEW HORIZONS", Observer = "SUN", Kernels = NewHorizonsKernels }, @@ -98,10 +98,7 @@ return { GeometryFile = "models/NewHorizonsCleanModel.obj", -- Magnification = 4, }, - Textures = { - Type = "simple", - Color = "textures/NHTexture.jpg", - }, + ColorTexture = "textures/NHTexture.jpg", Shading = { PerformShading = true, Fadeable = false, @@ -145,9 +142,9 @@ return { GeometryFile = "models/Labels.obj", -- Magnification = 4, }, + ColorTexture = "textures/labels.png", Textures = { Type = "simple", - Color = "textures/labels.png", BumpMap = "textures/goldfoilbump.tif" }, Rotation = { @@ -168,7 +165,7 @@ return { Type = "RenderableTrailTrajectory", Translation = { Type = "SpiceTranslation", - Body = "NEW HORIZONS", + Target = "NEW HORIZONS", Observer = "PLUTO BARYCENTER" }, Color = { 1.0, 0.8, 0.4 }, diff --git a/data/scene/missions/newhorizons/pluto/charon/charon.mod b/data/scene/missions/newhorizons/pluto/charon/charon.mod index 1813547e25..2f611209cb 100644 --- a/data/scene/missions/newhorizons/pluto/charon/charon.mod +++ b/data/scene/missions/newhorizons/pluto/charon/charon.mod @@ -31,10 +31,8 @@ return { Radius = charon_radius, Segments = 100 }, - Textures = { - Color = ColorTexture, - Height = "textures/cpdem-Mcolor2-MLorriCA-lr-5_ZMfs-cyl.jpg", - }, + ColorTexture = ColorTexture, + HeightTexture = "textures/cpdem-Mcolor2-MLorriCA-lr-5_ZMfs-cyl.jpg", Projection = { Observer = "NEW HORIZONS", Target = "CHARON", @@ -60,7 +58,7 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = "CHARON", + Target = "CHARON", Observer = "PLUTO BARYCENTER", Kernels = NewHorizonsKernels }, @@ -99,7 +97,6 @@ return { Observer = "NEW HORIZONS", Body = "CHARON", BodyFrame = "IAU_CHARON", - MainFrame = "GALACTIC", Aberration = "NONE", }, }, @@ -111,7 +108,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "CHARON", + Target = "CHARON", Observer = "PLUTO BARYCENTER", }, Color = {0.00, 0.62, 1.00}, diff --git a/data/scene/missions/newhorizons/pluto/hydra/hydra.mod b/data/scene/missions/newhorizons/pluto/hydra/hydra.mod index 9418f4ceb4..b6d7101c42 100644 --- a/data/scene/missions/newhorizons/pluto/hydra/hydra.mod +++ b/data/scene/missions/newhorizons/pluto/hydra/hydra.mod @@ -25,15 +25,12 @@ return { Radius = charon_radius, Segments = 100 }, - Textures = { - Type = "simple", - Color = "textures/gray.jpg", - } + ColorTexture = "textures/gray.jpg", }, Transform = { Translation = { Type = "SpiceTranslation", - Body = "HYDRA", + Target = "HYDRA", Observer = "PLUTO BARYCENTER", Kernels = NewHorizonsKernels }, @@ -69,7 +66,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "HYDRA", + Target = "HYDRA", Observer = "PLUTO BARYCENTER", }, Color = {0.00, 0.62, 1.00}, diff --git a/data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod b/data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod index 9dab2c556f..f75c930f0d 100644 --- a/data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod +++ b/data/scene/missions/newhorizons/pluto/kerberos/kerberos.mod @@ -25,15 +25,12 @@ return { Radius = kerberos_radius, Segments = 100 }, - Textures = { - Type = "simple", - Color = "textures/gray.jpg", - } + ColorTexture = "textures/gray.jpg", }, Transform = { Translation = { Type = "SpiceTranslation", - Body = "KERBEROS", + Target = "KERBEROS", Observer = "PLUTO BARYCENTER", Kernels = NewHorizonsKernels }, @@ -69,7 +66,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "KERBEROS", + Target = "KERBEROS", Observer = "PLUTO BARYCENTER", }, Color = {0.00, 0.62, 1.00}, diff --git a/data/scene/missions/newhorizons/pluto/nix/nix.mod b/data/scene/missions/newhorizons/pluto/nix/nix.mod index 5ea9374cf0..f5c75c866f 100644 --- a/data/scene/missions/newhorizons/pluto/nix/nix.mod +++ b/data/scene/missions/newhorizons/pluto/nix/nix.mod @@ -25,15 +25,12 @@ return { Radius = nix_radius, Segments = 100 }, - Textures = { - Type = "simple", - Color = "textures/gray.jpg", - } + ColorTexture = "textures/gray.jpg", }, Transform = { Translation = { Type = "SpiceTranslation", - Body = "NIX", + Target = "NIX", Observer = "PLUTO BARYCENTER", Kernels = NewHorizonsKernels }, @@ -63,7 +60,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "NIX", + Target = "NIX", Observer = "PLUTO BARYCENTER", }, Color = {0.00, 0.62, 1.00}, diff --git a/data/scene/missions/newhorizons/pluto/pluto/pluto.mod b/data/scene/missions/newhorizons/pluto/pluto/pluto.mod index 4e54ff8b2a..5077ef65af 100644 --- a/data/scene/missions/newhorizons/pluto/pluto/pluto.mod +++ b/data/scene/missions/newhorizons/pluto/pluto/pluto.mod @@ -26,7 +26,7 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = "PLUTO BARYCENTER", + Target = "PLUTO BARYCENTER", Observer = "SUN", Kernels = NewHorizonsKernels }, @@ -44,10 +44,8 @@ return { Radius = pluto_radius, Segments = 100 }, - Textures = { - Color = ColorTexture, - Height = "textures/pluto_shenk_heightmap.jpg", - }, + ColorTexture = ColorTexture, + HeightTexture = "textures/pluto_shenk_heightmap.jpg", 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", @@ -159,7 +157,7 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = "PLUTO", + Target = "PLUTO", Observer = "PLUTO BARYCENTER", Kernels = NewHorizonsKernels }, @@ -231,7 +229,6 @@ return { Observer = "NEW HORIZONS", Body = "PLUTO", BodyFrame = "IAU_PLUTO", - MainFrame = "GALACTIC", Aberration = "NONE", }, }, @@ -243,7 +240,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "PLUTO", + Target = "PLUTO", Observer = "PLUTO BARYCENTER", }, Color = {0.00, 0.62, 1.00}, @@ -259,7 +256,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "PLUTO BARYCENTER", + Target = "PLUTO BARYCENTER", Observer = "SUN", }, Color = { 0.3, 0.7, 0.3 }, diff --git a/data/scene/missions/newhorizons/pluto/styx/styx.mod b/data/scene/missions/newhorizons/pluto/styx/styx.mod index da6e1bce05..3d157182e5 100644 --- a/data/scene/missions/newhorizons/pluto/styx/styx.mod +++ b/data/scene/missions/newhorizons/pluto/styx/styx.mod @@ -25,15 +25,12 @@ return { Radius = styx_radius, Segments = 100 }, - Textures = { - Type = "simple", - Color = "textures/gray.jpg", - } + ColorTexture = "textures/gray.jpg", }, Transform = { Translation = { Type = "SpiceTranslation", - Body = "STYX", + Target = "STYX", Observer = "PLUTO BARYCENTER", Kernels = NewHorizonsKernels }, @@ -70,7 +67,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "STYX", + Target = "STYX", Observer = "PLUTO BARYCENTER", }, Color = {0.00, 0.62, 1.00}, diff --git a/data/scene/missions/osirisrex/bennu/bennu.mod b/data/scene/missions/osirisrex/bennu/bennu.mod index d7718f66bb..ff099ce50e 100644 --- a/data/scene/missions/osirisrex/bennu/bennu.mod +++ b/data/scene/missions/osirisrex/bennu/bennu.mod @@ -10,7 +10,7 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = BENNU_BODY, + Target = BENNU_BODY, Observer = "SUN", }, }, @@ -100,7 +100,7 @@ return { Type = "RenderableTrailTrajectory", Translation = { Type = "SpiceTranslation", - Body = BENNU_BODY, + Target = BENNU_BODY, Observer = "SUN", }, Color = { 0.4, 0.0, 0.7}, diff --git a/data/scene/missions/osirisrex/osirisrex/osirisrex.mod b/data/scene/missions/osirisrex/osirisrex/osirisrex.mod index 12776ce226..8871183179 100644 --- a/data/scene/missions/osirisrex/osirisrex/osirisrex.mod +++ b/data/scene/missions/osirisrex/osirisrex/osirisrex.mod @@ -169,10 +169,7 @@ return { GeometryFile = "models/orx_base_resized_12_sep_2016.obj", Magnification = 0, }, - Textures = { - Type = "simple", - Color = "textures/osirisTex.png", - }, + ColorTexture = "textures/osirisTex.png", Shading = { PerformShading = true, Fadeable = false, @@ -182,7 +179,7 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = "OSIRIS-REX", + Target = "OSIRIS-REX", Observer = "SUN", Kernels = OsirisRexKernels }, @@ -204,10 +201,7 @@ return { GeometryFile = "models/orx_polycam_resized_12_sep_2016.obj", Magnification = 0, }, - Textures = { - Type = "simple", - Color = "textures/osirisTex.png", - }, + ColorTexture = "textures/osirisTex.png", Shading = { PerformShading = true, Fadeable = false, @@ -237,10 +231,7 @@ return { GeometryFile = "models/orx_rexis_resized_12_sep_2016.obj", Magnification = 0, }, - Textures = { - Type = "simple", - Color = "textures/osirisTex.png", - }, + ColorTexture = "textures/osirisTex.png", Shading = { PerformShading = true, Fadeable = false, @@ -345,7 +336,7 @@ return { Type = "RenderableTrailTrajectory", Translation = { Type = "SpiceTranslation", - Body = "OSIRIS-REX", + Target = "OSIRIS-REX", Frame = "IAU_EARTH", Observer = "EARTH", }, @@ -364,7 +355,7 @@ return { Type = "RenderableTrailTrajectory", Translation = { Type = "SpiceTranslation", - Body = "OSIRIS-REX", + Target = "OSIRIS-REX", Observer = "SUN", }, Color = { 0.2, 0.9, 0.2 }, @@ -382,7 +373,7 @@ return { Type = "RenderableTrailTrajectory", Translation = { Type = "SpiceTranslation", - Body = "OSIRIS-REX", + Target = "OSIRIS-REX", Observer = BENNU_BODY, }, Color = { 0.9, 0.2, 0.9 }, diff --git a/data/scene/missions/rosetta/67P/67P.mod b/data/scene/missions/rosetta/67P/67P.mod index a039c22b4d..ca06b45f03 100644 --- a/data/scene/missions/rosetta/67P/67P.mod +++ b/data/scene/missions/rosetta/67P/67P.mod @@ -6,7 +6,7 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = "CHURYUMOV-GERASIMENKO", + Target = "CHURYUMOV-GERASIMENKO", Observer = "SUN", }, }, @@ -22,10 +22,7 @@ return { GeometryFile = "obj/67P_rotated_5_130.obj", Magnification = 0, }, - Textures = { - Color = "textures/gray.jpg", - -- Color = "textures/may9_map.jpg", - }, + ColorTexture = "textures/gray.jpg", Projection = { Sequence = "rosettaimages", SequenceType = "image-sequence", @@ -90,7 +87,7 @@ return { Type = "RenderableTrailTrajectory", Translation = { Type = "SpiceTranslation", - Body = "CHURYUMOV-GERASIMENKO", + Target = "CHURYUMOV-GERASIMENKO", Observer = "SUN", }, Color = { 0.1, 0.9, 0.2 }, diff --git a/data/scene/missions/rosetta/rosetta/rosetta.mod b/data/scene/missions/rosetta/rosetta/rosetta.mod index 930a4941df..fecc927266 100644 --- a/data/scene/missions/rosetta/rosetta/rosetta.mod +++ b/data/scene/missions/rosetta/rosetta/rosetta.mod @@ -48,7 +48,7 @@ RosettaKernels = { "${OPENSPACE_DATA}/spice/Rosetta/PCK/ROS_CGS_RSOC_V03.TPC", } -RotationMatrix = { +local RotationMatrix = { 0, 1, 0, 0, 0, 1, 1, 0, 0 @@ -63,7 +63,7 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = "ROSETTA", + Target = "ROSETTA", Observer = "SUN", Kernels = RosettaKernels }, @@ -95,11 +95,8 @@ return { Type = "MultiModelGeometry", GeometryFile = "rosetta/black_foil.obj" }, - Textures = { - Type = "simple", - Color = "textures/foil_silver_ramp.png" - }, - Rotation = { ModelTransform = RotationMatrix } + ColorTexture = "textures/foil_silver_ramp.png", + ModelTransform = RotationMatrix } }, { @@ -112,11 +109,8 @@ return { Type = "MultiModelGeometry", GeometryFile = "rosetta/black_parts.obj" }, - Textures = { - Type = "simple", - Color = "textures/foil_silver_ramp.png" - }, - Rotation = { ModelTransform = RotationMatrix } + ColorTexture = "textures/foil_silver_ramp.png", + ModelTransform = RotationMatrix } }, { @@ -129,20 +123,9 @@ return { Type = "MultiModelGeometry", GeometryFile = "rosetta/dish.obj" }, - Textures = { - Type = "simple", - Color = "textures/dish_AO.png" - }, - Rotation = { ModelTransform = RotationMatrix } - + ColorTexture = "textures/dish_AO.png", + ModelTransform = RotationMatrix }, - -- Transform = { - -- Rotation = { - -- Type = "SpiceRotation", - -- SourceFrame = "-226071", -- ROS_HGA - -- DestinationFrame = "ROS_SPACECRAFT", - -- } - -- } }, { Name = "Rosetta_parts", @@ -154,12 +137,8 @@ return { Type = "MultiModelGeometry", GeometryFile = "rosetta/parts.obj" }, - Textures = { - Type = "simple", - Color = "textures/parts2_AO.png" - }, - Rotation = { ModelTransform = RotationMatrix } - + ColorTexture = "textures/parts2_AO.png", + ModelTransform = RotationMatrix } }, { @@ -172,12 +151,8 @@ return { Type = "MultiModelGeometry", GeometryFile = "rosetta/silver_foil.obj" }, - Textures = { - Type = "simple", - Color = "textures/foil_silver_ramp.png" - }, - Rotation = { ModelTransform = RotationMatrix } - + ColorTexture = "textures/foil_silver_ramp.png", + ModelTransform = RotationMatrix } }, { @@ -190,12 +165,8 @@ return { Type = "MultiModelGeometry", GeometryFile = "rosetta/vents.obj" }, - Textures = { - Type = "simple", - Color = "textures/tex_01.png" - }, - Rotation = { ModelTransform = RotationMatrix } - + ColorTexture = "textures/tex_01.png", + ModelTransform = RotationMatrix } }, { @@ -208,20 +179,9 @@ return { Type = "MultiModelGeometry", GeometryFile = "rosetta/wingA.obj" }, - Textures = { - Type = "simple", - Color = "textures/tex_01.png" - }, - Rotation = { ModelTransform = RotationMatrix } - + ColorTexture = "textures/tex_01.png", + ModelTransform = RotationMatrix }, - -- Transform = { - -- Rotation = { - -- Type = "SpiceRotation", - -- SourceFrame = "-226015", -- ROS_SA - -- DestinationFrame = "ROS_SPACECRAFT", - -- } - -- } }, { Name = "Rosetta_wing_b", @@ -233,12 +193,8 @@ return { Type = "MultiModelGeometry", GeometryFile = "rosetta/wingB.obj" }, - Textures = { - Type = "simple", - Color = "textures/tex_01.png" - }, - Rotation = { ModelTransform = RotationMatrix } - + ColorTexture = "textures/tex_01.png", + ModelTransform = RotationMatrix }, -- Transform = { -- Rotation = { @@ -258,12 +214,8 @@ return { Type = "MultiModelGeometry", GeometryFile = "rosetta/yellow_foil.obj" }, - Textures = { - Type = "simple", - Color = "textures/foil_gold_ramp.png" - }, - Rotation = { ModelTransform = RotationMatrix } - + ColorTexture = "textures/foil_gold_ramp.png", + ModelTransform = RotationMatrix } }, { @@ -274,7 +226,7 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = "PHILAE", + Target = "PHILAE", Observer = "CHURYUMOV-GERASIMENKO", Kernels = RosettaKernels }, @@ -300,12 +252,8 @@ return { Type = "MultiModelGeometry", GeometryFile = "rosetta/lander_foil.obj" }, - Textures = { - Type = "simple", - Color = "textures/foil_silver_ramp.png" - }, - Rotation = { ModelTransform = RotationMatrix } - + ColorTexture = "textures/foil_silver_ramp.png", + ModelTransform = RotationMatrix } }, { @@ -318,12 +266,8 @@ return { Type = "MultiModelGeometry", GeometryFile = "rosetta/lander_lids.obj" }, - Textures = { - Type = "simple", - Color = "textures/parts2_AO.png" - }, - Rotation = { ModelTransform = RotationMatrix } - + ColorTexture = "textures/parts2_AO.png", + ModelTransform = RotationMatrix } }, { @@ -336,12 +280,8 @@ return { Type = "MultiModelGeometry", GeometryFile = "rosetta/lander_parts.obj" }, - Textures = { - Type = "simple", - Color = "textures/foil_silver_ramp.png" - }, - Rotation = { ModelTransform = RotationMatrix } - + ColorTexture = "textures/foil_silver_ramp.png", + ModelTransform = RotationMatrix } }, { @@ -354,11 +294,8 @@ return { Type = "MultiModelGeometry", GeometryFile = "rosetta/lander_solarp.obj" }, - Textures = { - Type = "simple", - Color = "textures/tex_01.png" - }, - Rotation = { ModelTransform = RotationMatrix } + ColorTexture = "textures/tex_01.png", + ModelTransform = RotationMatrix } }, { @@ -368,7 +305,7 @@ return { Type = "RenderableTrailTrajectory", Translation = { Type = "SpiceTranslation", - Body = "ROSETTA", + Target = "ROSETTA", Observer = "CHURYUMOV-GERASIMENKO", }, Color = { 0.288, 0.375, 0.934 }, @@ -384,7 +321,7 @@ return { Type = "RenderableTrailTrajectory", Translation = { Type = "SpiceTranslation", - Body = "PHILAE", + Target = "PHILAE", Observer = "CHURYUMOV-GERASIMENKO", }, Color = { 0.8, 0.5, 1.0 }, diff --git a/data/scene/lodglobes/moon/map_service_configs/OnMoonColor.xml b/data/scene/moon/map_service_configs/OnMoonColor.xml similarity index 100% rename from data/scene/lodglobes/moon/map_service_configs/OnMoonColor.xml rename to data/scene/moon/map_service_configs/OnMoonColor.xml diff --git a/data/scene/lodglobes/moon/map_service_configs/OnMoonHeight.xml b/data/scene/moon/map_service_configs/OnMoonHeight.xml similarity index 100% rename from data/scene/lodglobes/moon/map_service_configs/OnMoonHeight.xml rename to data/scene/moon/map_service_configs/OnMoonHeight.xml diff --git a/data/scene/lodglobes/moon/map_service_configs/Utah/ClemUvvis.wms b/data/scene/moon/map_service_configs/Utah/ClemUvvis.wms similarity index 100% rename from data/scene/lodglobes/moon/map_service_configs/Utah/ClemUvvis.wms rename to data/scene/moon/map_service_configs/Utah/ClemUvvis.wms diff --git a/data/scene/lodglobes/moon/map_service_configs/Utah/Kaguya.wms b/data/scene/moon/map_service_configs/Utah/Kaguya.wms similarity index 100% rename from data/scene/lodglobes/moon/map_service_configs/Utah/Kaguya.wms rename to data/scene/moon/map_service_configs/Utah/Kaguya.wms diff --git a/data/scene/lodglobes/moon/map_service_configs/Utah/LolaClrShade.wms b/data/scene/moon/map_service_configs/Utah/LolaClrShade.wms similarity index 100% rename from data/scene/lodglobes/moon/map_service_configs/Utah/LolaClrShade.wms rename to data/scene/moon/map_service_configs/Utah/LolaClrShade.wms diff --git a/data/scene/lodglobes/moon/map_service_configs/Utah/LolaDem.wms b/data/scene/moon/map_service_configs/Utah/LolaDem.wms similarity index 100% rename from data/scene/lodglobes/moon/map_service_configs/Utah/LolaDem.wms rename to data/scene/moon/map_service_configs/Utah/LolaDem.wms diff --git a/data/scene/lodglobes/moon/map_service_configs/Utah/LolaShade.wms b/data/scene/moon/map_service_configs/Utah/LolaShade.wms similarity index 100% rename from data/scene/lodglobes/moon/map_service_configs/Utah/LolaShade.wms rename to data/scene/moon/map_service_configs/Utah/LolaShade.wms diff --git a/data/scene/lodglobes/moon/map_service_configs/Utah/UvvisHybrid.wms b/data/scene/moon/map_service_configs/Utah/UvvisHybrid.wms similarity index 100% rename from data/scene/lodglobes/moon/map_service_configs/Utah/UvvisHybrid.wms rename to data/scene/moon/map_service_configs/Utah/UvvisHybrid.wms diff --git a/data/scene/lodglobes/moon/map_service_configs/Utah/Wac.wms b/data/scene/moon/map_service_configs/Utah/Wac.wms similarity index 100% rename from data/scene/lodglobes/moon/map_service_configs/Utah/Wac.wms rename to data/scene/moon/map_service_configs/Utah/Wac.wms diff --git a/data/scene/moon/moon.data b/data/scene/moon/moon.data deleted file mode 100644 index f8c7094165..0000000000 --- a/data/scene/moon/moon.data +++ /dev/null @@ -1,5 +0,0 @@ -return { - FileRequest = { - { Identifier = "moon_textures", Destination = "textures", Version = 1 } - }, -} \ No newline at end of file diff --git a/data/scene/moon/moon.mod b/data/scene/moon/moon.mod index 534adf617c..2ed3aaddcf 100644 --- a/data/scene/moon/moon.mod +++ b/data/scene/moon/moon.mod @@ -1,46 +1,67 @@ return { -- Moon module - { + { Name = "Moon", Parent = "EarthBarycenter", - Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_MOON", - Body = "MOON", - Geometry = { - Type = "SimpleSphere", - Radius = 1.737E6, - Segments = 100 - }, - Shadow_Group = { - Source1 = { - Name = "Sun", - Radius = 696.3E6 - }, - Caster1 = { - Name = "Earth", - Radius = 6.371E6 - }, - }, - Textures = { - Type = "simple", - Color = "textures/Moon16K.dds", - --Color = "textures/moonmap4k.jpg", - }, - }, Transform = { Translation = { Type = "SpiceTranslation", - Body = "MOON", + Target = "MOON", Observer = "EARTH BARYCENTER", Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, Rotation = { Type = "SpiceRotation", SourceFrame = "IAU_MOON", - DestinationFrame = "ECLIPJ2000" - }, + DestinationFrame = "GALACTIC" + } }, + Renderable = { + Type = "RenderableGlobe", + Radii = 1738140, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + -- LMMP based servers + { + Name = "LRO WAC Mosaic [OnMoon]", + FilePath = "map_service_configs/OnMoonColor.xml", + Enabled = true, + }, + -- Utah based servers + { + Name = "ClemUvvis", + FilePath = "map_service_configs/Utah/ClemUvvis.wms" + }, + { + Name = "Kaguya", + FilePath = "map_service_configs/Utah/Kaguya.wms" + }, + { + Name = "WAC", + FilePath = "map_service_configs/Utah/Wac.wms" + } + }, + HeightLayers = { + -- LMMP based servers + -- { + -- Name = "Lunar Elevation [OnMoon]", + -- FilePath = "map_service_configs/OnMoonHeight.xml", + -- Enabled = true, + -- TilePixelSize = 64, + -- -- Settings = { Multiplier = 0.5 }, + -- }, + -- Utah based servers + { + Name = "LolaDem", + FilePath = "map_service_configs/Utah/LolaDem.wms", + Enabled = true, + TilePixelSize = 64, + Settings = { Multiplier = 0.5 }, + } + } + } + } }, -- MoonTrail module { @@ -50,12 +71,12 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "MOON", - Observer = "EARTH BARYCENTER", + Target = "MOON", + Observer = "EARTH BARYCENTER" }, Color = { 0.5, 0.3, 0.3 }, Period = 27, Resolution = 1000 - }, + } } } diff --git a/data/scene/neptune/neptune.mod b/data/scene/neptune/neptune.mod index 38e698c9ea..57448d3042 100644 --- a/data/scene/neptune/neptune.mod +++ b/data/scene/neptune/neptune.mod @@ -1,50 +1,46 @@ return { - -- Neptune barycenter module + -- Barycenter module { Name = "NeptuneBarycenter", Parent = "SolarSystemBarycenter", Transform = { Translation = { Type = "SpiceTranslation", - Body = "NEPTUNE BARYCENTER", + Target = "NEPTUNE BARYCENTER", Observer = "SUN", Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" } } }, - - -- Neptune module + -- RenderableGlobe module { Name = "Neptune", Parent = "NeptuneBarycenter", - Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_NEPTUNE", - Body = "NEPTUNE BARYCENTER", - Geometry = { - Type = "SimpleSphere", - Radius = 2.4622E7, - Segments = 100 - }, - Textures = { - Type = "simple", - Color = "textures/neptune.jpg", - } - }, - Tag = "planet_solarSystem", Transform = { Rotation = { Type = "SpiceRotation", SourceFrame = "IAU_NEPTUNE", DestinationFrame = "GALACTIC" - }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, - } + } + }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 24764000, 24764000, 24314000 }, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Texture", + FilePath = "textures/neptune.jpg", + Enabled = true + } + } + } + }, + Tag = { "planet_solarSystem", "planet_giants" }, + }, - -- NeptuneTrail module + -- Trail module { Name = "NeptuneTrail", Parent = "SolarSystemBarycenter", @@ -52,13 +48,13 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "NEPTUNE BARYCENTER", - Observer = "SUN", + Target = "NEPTUNE BARYCENTER", + Observer = "SUN" }, Color = {0.2, 0.5, 1.0 }, Period = 60200, - Resolution = 1000, - Tag = "planetTrail_solarSystem" - } + Resolution = 1000 + }, + Tag = { "planetTrail_solarSystem", "planetTrail_giants" } } } diff --git a/data/scene/newhorizons.scene b/data/scene/newhorizons.scene index 7dc39df870..267a88e5d5 100644 --- a/data/scene/newhorizons.scene +++ b/data/scene/newhorizons.scene @@ -16,7 +16,139 @@ function preInitialization() openspace.time.setTime("2015-07-14T10:05:00.00") - dofile(openspace.absPath('${SCRIPTS}/bind_keys_newhorizons.lua')) + -- Load the common helper functions + dofile(openspace.absPath('${SCRIPTS}/common.lua')) + + openspace.clearKeys() + helper.setCommonKeys() + helper.setDeltaTimeKeys({ + 1, 5, 10, 20, 40, 60, 120, 360, 540, 1080, + 2160, 4320, 8640 + }) + + openspace.bindKey( + "a", + "openspace.setPropertyValue('Interaction.origin', 'NewHorizons')", + "Sets the focus of the camera on 'NewHorizons'." + ) + openspace.bindKey( + "s", + "openspace.setPropertyValue('Interaction.origin', 'Pluto')", + "Sets the focus of the camera on 'Pluto'" + ) + openspace.bindKey( + "d", + "openspace.setPropertyValue('Interaction.origin', 'Charon')", + "Sets the focus of the camera on 'Charon'." + ) + openspace.bindKey( + "z", + "openspace.setPropertyValue('Interaction.origin', 'JupiterProjection')", + "Sets the focus of the camera on 'Jupiter'." + ) + openspace.bindKey( + "x", + "openspace.setPropertyValue('Interaction.origin', 'Europa')", + "Sets the focus of the camera on 'Europa'." + ) + + openspace.bindKey( + "F8", + "openspace.setPropertyValue('Pluto.renderable.ProjectionComponent.clearAllProjections', true);" .. + "openspace.setPropertyValue('Charon.renderable.ProjectionComponent.clearAllProjections', true);", + "Removes all image projections from Pluto and Charon." + ) + + openspace.bindKey( + "F9", + "openspace.time.setTime('2015-07-14T09:00:00.00');" .. + "openspace.setPropertyValue('Pluto.renderable.clearAllProjections', true);" .. + "openspace.setPropertyValue('Charon.renderable.clearAllProjections', true);", + "Jumps to the 14th of July 2015 at 0900 UTC and clears all projections." + ) + + openspace.bindKey( + "KP_8", + helper.property.increment('Pluto.renderable.heightExaggeration', 0.1), + "Increases the height map exaggeration on Pluto." + ) + openspace.bindKey( + "KP_2", + helper.property.decrement('Pluto.renderable.heightExaggeration', 0.1), + "Decreases the height map exaggeration on Pluto." + ) + openspace.bindKey( + "KP_9", + helper.property.increment('Charon.renderable.heightExaggeration', 2), + "Increases the height map exaggeration on Charon." + ) + openspace.bindKey( + "KP_3", + helper.property.decrement('Charon.renderable.heightExaggeration', 2), + "Decreases the height map exaggeration on Charon." + ) + + openspace.bindKey( + "q", + helper.property.invert('SunMarker.renderable.enabled'), + "Toggles the visibility of the text marking the location of the Sun." + ) + openspace.bindKey( + "e", + helper.property.invert('EarthMarker.renderable.enabled'), + "Toggles the visibility of the text marking the location of the Earth." + ) + openspace.bindKey( + "o", + helper.property.invert('PlutoTrail.renderable.enabled'), + "Toggles the visibility of the trail behind Pluto." + ) + + openspace.bindKey( + "j", + helper.renderable.toggle('PlutoText') .. helper.renderable.toggle('CharonText') .. + helper.renderable.toggle('HydraText') .. helper.renderable.toggle('NixText') .. + helper.renderable.toggle('KerberosText') .. helper.renderable.toggle('StyxText'), + "Toggles the visibility of the text labels of Pluto, Charon, Hydra, Nix, Kerberos, and Styx." + ) + + openspace.bindKey( + "l", + helper.property.invert('Labels.renderable.performFading'), + "Toggles the visibility of the labels for the New Horizons instruments." + ) + + openspace.bindKey("m", + helper.property.invert('NH_LORRI.renderable.solidDraw') .. + helper.property.invert('NH_RALPH_LEISA.renderable.solidDraw') .. + helper.property.invert('NH_RALPH_MVIC_PAN1.renderable.solidDraw') .. + helper.property.invert('NH_RALPH_MVIC_PAN2.renderable.solidDraw') .. + helper.property.invert('NH_RALPH_MVIC_RED.renderable.solidDraw') .. + helper.property.invert('NH_RALPH_MVIC_BLUE.renderable.solidDraw') .. + helper.property.invert('NH_RALPH_MVIC_FT.renderable.solidDraw') .. + helper.property.invert('NH_RALPH_MVIC_METHANE.renderable.solidDraw') .. + helper.property.invert('NH_RALPH_MVIC_NIR.renderable.solidDraw') .. + helper.property.invert('NH_ALICE_AIRGLOW.renderable.solidDraw') .. + helper.property.invert('NH_ALICE_SOC.renderable.solidDraw'), + "Draws the instrument field of views in a solid color or as lines." + ) + + openspace.bindKey( + "t", + helper.renderable.toggle('PlutoShadow') .. helper.renderable.toggle('CharonShadow'), + "Toggles the visibility of the shadow visualization of Pluto and Charon." + ) + + openspace.bindKey("p", + helper.property.invert('JupiterProjection.renderable.performProjection') .. + helper.property.invert('Io.renderable.performProjection') .. + helper.property.invert('Ganymede.renderable.performProjection') .. + helper.property.invert('Europa.renderable.performProjection') .. + helper.property.invert('Callisto.renderable.performProjection') .. + helper.property.invert('Pluto.renderable.performProjection') .. + helper.property.invert('Charon.renderable.performProjection'), + "Enables or disables the image projection on the different available objects." + ) end function postInitialization() @@ -56,10 +188,10 @@ return { "saturn/saturn", "uranus", "neptune", - "stars", - -- "stars-denver", - "milkyway", - -- "milkyway-eso", + "stars/digitaluniverse", + -- "stars/denver", + "milkyway/digitaluniverse", + --"milkyway/eso", "missions/newhorizons/pluto", "missions/newhorizons/jupiter", "missions/newhorizons/newhorizons", diff --git a/data/scene/osirisrex.scene b/data/scene/osirisrex.scene index b869051f7b..0902c47df5 100644 --- a/data/scene/osirisrex.scene +++ b/data/scene/osirisrex.scene @@ -12,13 +12,68 @@ function preInitialization() openspace.spice.loadKernel("${SPICE}/naif0012.tls") openspace.spice.loadKernel("${SPICE}/pck00010.tpc") - dofile(openspace.absPath('${SCRIPTS}/bind_keys_osirisrex.lua')) - --local startTime = "2019 APR 16 12:03:00.00" openspace.time.setTime("2016 SEP 8 23:00:00.500") - openspace.scriptScheduler.loadFile("${OPENSPACE_DATA}/scene/missions/osirisrex/scheduled_scripts.lua") + -- Load the common helper functions + dofile(openspace.absPath('${SCRIPTS}/common.lua')) + dofile(openspace.absPath('${SCRIPTS}/bind_common_keys.lua')) + -- Set focuses + openspace.bindKey( + "a", + "openspace.setPropertyValue('Interaction.origin', 'OsirisRex')", + "Sets the focus of the camera on 'Osiris Rex'." + ) + openspace.bindKey( + "s", + "openspace.setPropertyValue('Interaction.origin', 'BennuBarycenter')", + "Sets the focus of the camera on 'Bennu'." + ) + + openspace.bindKey( + "F6" , + "openspace.printInfo('Set time: Launch');openspace.time.setTime('2016 SEP 08 23:05:00');", + "Sets the time to the launch." + ) + openspace.bindKey( + "F7", + "openspace.printInfo('Set time: Gravity Assist');openspace.time.setTime('2017 SEP 22 15:00:00');", + "Sets the time to the Earth gravity assist." + ) + openspace.bindKey( + "F8", + "openspace.printInfo('Set time: Approach');openspace.time.setTime('2018-SEP-11 21:31:01.183');", + "Sets the time to the approach at Bennu." + ) + openspace.bindKey( + "F9", + "openspace.printInfo('Set time: Preliminary Survey');openspace.time.setTime('2018-NOV-20 01:13:12.183');", + "Sets the time to the preliminary survey of Bennu." + ) + openspace.bindKey( + "F10", + "openspace.printInfo('Set time: Orbital B');openspace.time.setTime('2019-APR-08 10:35:27.186');", + "Sets the time to the orbital B event." + ) + openspace.bindKey( + "F11", + "openspace.printInfo('Set time: Recon');openspace.time.setTime('2019-MAY-25 03:50:31.195');", + "Sets the time to the recon event." + ) + + openspace.bindKey( + "q", + helper.property.invert('SunMarker.renderable.enabled'), + "Toggles the visibility of the text marking the location of the Sun." + ) + openspace.bindKey( + "e", + helper.property.invert('EarthMarker.renderable.enabled'), + "Toggles the visibility of the text marking the location of the Earth." + ) + + openspace.scriptScheduler.loadFile("${OPENSPACE_DATA}/scene/missions/osirisrex/scheduled_scripts.lua") end function postInitialization() @@ -68,10 +123,10 @@ return { "saturn", "uranus", "neptune", - "stars", - -- "stars-denver", - "milkyway", - -- "milkyway-eso", + "stars/digitaluniverse", + -- "stars/denver", + "milkyway/digitaluniverse", + --"milkyway/eso", "missions/osirisrex", } } diff --git a/data/scene/pluto/pluto.data b/data/scene/pluto/pluto.data deleted file mode 100644 index db86c15f8c..0000000000 --- a/data/scene/pluto/pluto.data +++ /dev/null @@ -1,7 +0,0 @@ -return { - FileRequest = { - { Identifier = "charon_textures", Destination = "textures", Version = 1 }, - { Identifier = "pluto_textures", Destination = "textures", Version = 4 }, - { Identifier = "pluto_spice", Destination = "${SPICE}", Version = 1 } - } -} \ No newline at end of file diff --git a/data/scene/pluto/pluto.mod b/data/scene/pluto/pluto.mod deleted file mode 100644 index 27f540d731..0000000000 --- a/data/scene/pluto/pluto.mod +++ /dev/null @@ -1,140 +0,0 @@ -return { - -- Pluto barycenter module - { - Name = "PlutoBarycenter", - Parent = "SolarSystemBarycenter", - Transform = { - Translation = { - Type = "SpiceTranslation", - Body = "PLUTO BARYCENTER", - Observer = "SUN", - Kernels = { - "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp", - "${OPENSPACE_DATA}/spice/plu055.bsp", - } - } - } - }, - -- Pluto module - { - Name = "Pluto", - Parent = "PlutoBarycenter", - Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_PLUTO", - Body = "PLUTO", - Geometry = { - Type = "SimpleSphere", - Radius = 1.173E6, - Segments = 100 - }, - Textures = { - Type = "simple", - Color = "textures/pluto.jpg", - }, - Atmosphere = { - Type = "Nishita", -- for example, values missing etc etc - MieFactor = 1.0, - MieColor = {1.0, 1.0, 1.0} - } - }, - Transformation = { - Translation = { - Type = "SpiceTranslation", - Body = "PLUTO", - Observer = "PLUTO BARYCENTER", - Kernels = "${OPENSPACE_DATA}/spice/plu055.bsp", - }, - Rotation = { - Type = "Spice", - SourceFrame = "IAU_PLUTO", - DestinationFrame = "GALACTIC" - } - } - }, - { - Name = "Charon", - Parent = "PlutoBarycenter", - Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_CHARON", - Body = "CHARON", - Geometry = { - Type = "SimpleSphere", - Radius = 6.035E5, - Segments = 100 - }, - Textures = { - Type = "simple", - Color = "textures/gray.jpg", - }, - Atmosphere = { - Type = "Nishita", -- for example, values missing etc etc - MieFactor = 1.0, - MieColor = {1.0, 1.0, 1.0} - } - }, - Transformation = { - Translation = { - Type = "SpiceTranslation", - Body = "CHARON", - Observer = "PLUTO BARYCENTER", - Kernels = "${OPENSPACE_DATA}/spice/plu055.bsp", - }, - Rotation = { - Type = "Spice", - SourceFrame = "IAU_CHARON", - DestinationFrame = "GALACTIC" - } - } - }, - -- CharonTrail module - { - Name = "CharonTrail", - Parent = "PlutoBarycenter", - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Body = "CHARON", - Observer = "PLUTO BARYCENTER", - }, - Color = {0.00,0.62,1.00}, - Period = 6.38725, - Resolution = 1000, - }, - }, - -- PlutoTrail module - { - Name = "PlutoTrailSolarSystem", - Parent = "SolarSystemBarycenter", - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Body = "PLUTO BARYCENTER", - Observer = "SUN", - }, - Color = {0.58, 0.61, 1.00}, - Period = 247.92 * 365.242, - Resolution = 1000 - }, - GuiName = "/Solar/PlutoTrail" - }, - { - Name = "PlutoTrailPluto", - Parent = "PlutoBarycenter", - Renderable = { - Type = "RenderableTrailOrbit", - Translation = { - Type = "SpiceTranslation", - Body = "PLUTO", - Observer = "PLUTO BARYCENTER", - }, - Color = {0.58, 0.61, 1.00}, - Period = 6.38725, - Resolution = 1000 - }, - GuiName = "/Solar/PlutoTrail" - } -} diff --git a/data/scene/rosetta.scene b/data/scene/rosetta.scene index ce4c0213da..1c6727314c 100644 --- a/data/scene/rosetta.scene +++ b/data/scene/rosetta.scene @@ -18,7 +18,71 @@ function preInitialization() -- Shadow flyby -- openspace.time.setTime("2015-02-14T12:00:00.000") - dofile(openspace.absPath('${SCRIPTS}/bind_keys_rosetta.lua')) + -- Load the common helper functions + dofile(openspace.absPath('${SCRIPTS}/common.lua')) + + openspace.clearKeys() + helper.setCommonKeys() + + helper.setDeltaTimeKeys({ + 1, 5, 10, 20, 40, 90, 360, 720, 2880, 14400, + 28800, 57600, 115200, 230400, 460800, 921600, 1843200, 3686400, 7372800, 14745600 + }) + + openspace.bindKey( + "a", + "openspace.setPropertyValue('Interaction.origin', '67P')", + "Sets the focus of the camera on '67P'." + ) + openspace.bindKey( + "s", + "openspace.setPropertyValue('Interaction.origin', 'Rosetta')", + "Sets the focus of the camera on 'Rosetta'." + ) + + openspace.bindKey( + "F5", + "openspace.time.setTime('2014-08-01T03:05:18.101')", + "Jumps to the time of initial approach of Rosetta to 67P." + ) + openspace.bindKey( + "F6", + "openspace.time.setTime('2014-11-12T08:20:00.00')", + "Jumps to the time when the Philae lander is released." + ) + openspace.bindKey( + "F8", + "openspace.setPropertyValue('67P.renderable.ProjectionComponent.clearAllProjections', true)", + "Removes all image projections from 67P." + ) + + openspace.bindKey( + "i", + helper.renderable.toggle('ImagePlaneRosetta'), + "Toggles the visibility of the free floating image plane." + ) + openspace.bindKey( + "q", + helper.renderable.toggle('SunMarker'), + "Toggles the visibility of the text marking the location of the Sun." + ) + openspace.bindKey( + "e", + helper.renderable.toggle('JupiterTrail') .. helper.renderable.toggle('SaturnTrail') .. + helper.renderable.toggle('UranusTrail') .. helper.renderable.toggle('NeptuneTrail'), + "Toggles the visibility of all trails further from the Sun than 67P." + ) + openspace.bindKey( + "f", + helper.renderable.toggle('PhilaeTrail'), + "Toggles the visibility of Philae's trail." + ) + + openspace.bindKey( + "p", + helper.property.invert('67P.renderable.ProjectionComponent.performProjection'), + "Enables or disables the image projection on 67P." + ) end function postInitialization() @@ -58,8 +122,10 @@ return { "saturn/saturn", "uranus", -- "neptune", - "stars", - "milkyway", + "stars/digitaluniverse", + -- "stars/denver", + "milkyway/digitaluniverse", + --"milkyway/eso", "missions/rosetta", } } diff --git a/data/scene/satellites.scene b/data/scene/satellites.scene deleted file mode 100644 index 46cf989799..0000000000 --- a/data/scene/satellites.scene +++ /dev/null @@ -1,71 +0,0 @@ -function preInitialization() - --[[ - The scripts in this function are executed after the scene is loaded but before the - scene elements have been initialized, thus they should be used to set the time at - which the scene should start and other settings that might determine initialization - critical objects. - ]]-- - - openspace.spice.loadKernel("${SPICE}/naif0011.tls") - openspace.spice.loadKernel("${SPICE}/pck00010.tpc") - -- openspace.spice.loadKernel("${OPENSPACE_DATA}/spice/de430_1850-2150.bsp") - - openspace.time.setTime(openspace.time.currentWallTime()) - - --Test for vernal equinox time 2017 - --openspace.time.setTime("2017 MAR 20 10:28:30.500") - - dofile(openspace.absPath('${SCRIPTS}/bind_keys_satellites.lua')) -end - -function postInitialization() - --[[ - The scripts in this function are executed after all objects in the scene have been - created and initialized, but before the first render call. This is the place to set - graphical settings for the renderables. - ]]-- - openspace.printInfo("Setting default values") - openspace.setPropertyValue("SunMarker.renderable.Enabled", false) - openspace.setPropertyValue("SunGlare.renderable.Enabled", false) - openspace.setPropertyValue("MilkyWay.renderable.Enabled", false) - openspace.setPropertyValue("EarthMarker.renderable.Enabled", false) - openspace.setPropertyValue("EarthTrail.renderable.Enabled", false) - openspace.setPropertyValue("Earth.renderable.PerformShading", false) - - openspace.navigation.resetCameraDirection() - - openspace.printInfo("Done setting default values") - - if openspace.modules.isLoaded("ISWA") then - - openspace.iswa.addCdfFiles("${OPENSPACE_DATA}/cdflist.json"); - - --openspace.iswa.addCygnet(7); - - --openspace.iswa.addCygnet(-4,"Data","Gm"); - --openspace.iswa.addCygnet(-5,"Data","Gm"); - --openspace.iswa.addCygnet(-6,"Data","Gm"); - --openspace.iswa.addCygnet(-7,"Data","Gm"); - --openspace.iswa.addCygnet(-8,"Data","Gm"); - --openspace.iswa.addCygnet(-9,"Data","Gm"); - end -end - -return { - ScenePath = ".", - CommonFolder = "common", - Camera = { - Focus = "Earth", - Position = {-54343425747.129051, -73298476295.934555, 116584089130.590012}, - Rotation = {-0.078983, 0.830093, 0.014241, -0.551819}, - }, - Modules = { - --"satellites/earth", - "sun", - "earth", - -- "stars", - -- "milkyway", - "satellites" - } -} - diff --git a/data/scene/saturn/dione/dione.mod b/data/scene/saturn/dione/dione.mod index 477705ea2b..57517df105 100644 --- a/data/scene/saturn/dione/dione.mod +++ b/data/scene/saturn/dione/dione.mod @@ -3,22 +3,23 @@ return { Name = "Dione", Parent = "SaturnBarycenter", Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_DIONE", - Body = "DIONE", - Geometry = { - Type = "SimpleSphere", - Radius = 0.563E3, - Segments = 50 - }, - Textures = { - Color = "textures/dione.jpg" + Type = "RenderableGlobe", + Radii = 561400, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Dione Texture", + FilePath = "textures/dione.jpg", + Enabled = true + } + } } }, Transform = { Translation = { Type = "SpiceTranslation", - Body = "DIONE", + Target = "DIONE", Observer = "SATURN BARYCENTER", Kernels = "${OPENSPACE_DATA}/spice/sat375.bsp" }, @@ -36,7 +37,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "DIONE", + Target = "DIONE", Observer = "SATURN BARYCENTER", }, Color = { 0.5, 0.3, 0.3 }, @@ -44,4 +45,4 @@ return { Resolution = 1000 } } -} \ No newline at end of file +} diff --git a/data/scene/saturn/enceladus/enceladus.mod b/data/scene/saturn/enceladus/enceladus.mod index f49104d3ca..877ffd5ac1 100644 --- a/data/scene/saturn/enceladus/enceladus.mod +++ b/data/scene/saturn/enceladus/enceladus.mod @@ -3,22 +3,23 @@ return { Name = "Enceladus", Parent = "SaturnBarycenter", Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_ENCELADUS", - Body = "ENCELADUS", - Geometry = { - Type = "SimpleSphere", - Radius = 0.257E3, - Segments = 50 - }, - Textures = { - Color = "textures/enceladus.jpg" + Type = "RenderableGlobe", + Radii = 252000, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Enceladus Texture", + FilePath = "textures/enceladus.jpg", + Enabled = true + } + } } }, Transform = { Translation = { Type = "SpiceTranslation", - Body = "ENCELADUS", + Target = "ENCELADUS", Observer = "SATURN BARYCENTER", Kernels = "${OPENSPACE_DATA}/spice/sat375.bsp" }, @@ -36,7 +37,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "ENCELADUS", + Target = "ENCELADUS", Observer = "SATURN BARYCENTER", }, Color = { 0.5, 0.3, 0.3 }, @@ -44,4 +45,4 @@ return { Resolution = 1000 } } -} \ No newline at end of file +} diff --git a/data/scene/saturn/iapetus/iapetus.mod b/data/scene/saturn/iapetus/iapetus.mod index 0bcc6b8c38..077282c537 100644 --- a/data/scene/saturn/iapetus/iapetus.mod +++ b/data/scene/saturn/iapetus/iapetus.mod @@ -3,22 +3,23 @@ return { Name = "Iapetus", Parent = "SaturnBarycenter", Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_IAPETUS", - Body = "IAPETUS", - Geometry = { - Type = "SimpleSphere", - Radius = 0.746E3, - Segments = 50 - }, - Textures = { - Color = "textures/iapetus.jpg" + Type = "RenderableGlobe", + Radii = 734000, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Iapetus Texture", + FilePath = "textures/iapetus.jpg", + Enabled = true + } + } } }, Transform = { Translation = { Type = "SpiceTranslation", - Body = "IAPETUS", + Target = "IAPETUS", Observer = "SATURN BARYCENTER", Kernels = "${OPENSPACE_DATA}/spice/sat375.bsp" }, @@ -36,7 +37,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "IAPETUS", + Target = "IAPETUS", Observer = "SATURN BARYCENTER", }, Color = { 0.5, 0.3, 0.3 }, @@ -44,4 +45,4 @@ return { Resolution = 1000 } } -} \ No newline at end of file +} diff --git a/data/scene/saturn/mimas/mimas.mod b/data/scene/saturn/mimas/mimas.mod index 9f8e5242e6..3d4eb0bf4d 100644 --- a/data/scene/saturn/mimas/mimas.mod +++ b/data/scene/saturn/mimas/mimas.mod @@ -3,22 +3,23 @@ return { Name = "Mimas", Parent = "SaturnBarycenter", Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_MIMAS", - Body = "MIMAS", - Geometry = { - Type = "SimpleSphere", - Radius = 0.28E3, - Segments = 50 - }, - Textures = { - Color = "textures/mimas.jpg" + Type = "RenderableGlobe", + Radii = 198000, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Mimas Texture", + FilePath = "textures/mimas.jpg", + Enabled = true + } + } } }, Transform = { Translation = { Type = "SpiceTranslation", - Body = "MIMAS", + Target = "MIMAS", Observer = "SATURN BARYCENTER", Kernels = "${OPENSPACE_DATA}/spice/sat375.bsp" }, @@ -36,7 +37,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "MIMAS", + Target = "MIMAS", Observer = "SATURN BARYCENTER", }, Color = { 0.5, 0.3, 0.3 }, diff --git a/data/scene/saturn/rhea/rhea.mod b/data/scene/saturn/rhea/rhea.mod index 8bb6c61393..52e61ed44c 100644 --- a/data/scene/saturn/rhea/rhea.mod +++ b/data/scene/saturn/rhea/rhea.mod @@ -3,22 +3,23 @@ return { Name = "Rhea", Parent = "SaturnBarycenter", Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_RHEA", - Body = "RHEA", - Geometry = { - Type = "SimpleSphere", - Radius = 0.765E3, - Segments = 50 - }, - Textures = { - Color = "textures/rhea.jpg" + Type = "RenderableGlobe", + Radii = 765000, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Rhea Texture", + FilePath = "textures/rhea.jpg", + Enabled = true + } + } } }, Transform = { Translation = { Type = "SpiceTranslation", - Body = "RHEA", + Target = "RHEA", Observer = "SATURN BARYCENTER", Kernels = "${OPENSPACE_DATA}/spice/sat375.bsp" }, @@ -36,7 +37,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "RHEA", + Target = "RHEA", Observer = "SATURN BARYCENTER", }, Color = { 0.5, 0.3, 0.3 }, @@ -44,4 +45,4 @@ return { Resolution = 1000 } } -} \ No newline at end of file +} diff --git a/data/scene/saturn/saturn/saturn.mod b/data/scene/saturn/saturn/saturn.mod index 675910faab..f597dfcdb3 100644 --- a/data/scene/saturn/saturn/saturn.mod +++ b/data/scene/saturn/saturn/saturn.mod @@ -6,11 +6,11 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = "SATURN BARYCENTER", + Target = "SATURN BARYCENTER", Observer = "SUN", Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" } - }, + } }, -- Saturn module @@ -18,36 +18,27 @@ return { Name = "Saturn", Parent = "SaturnBarycenter", Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_SATURN", - Body = "SATURN BARYCENTER", - Geometry = { - Type = "SimpleSphere", - Radius = 5.8232E7, - Segments = 100 - }, - Textures = { - Type = "simple", - Color = "textures/saturn.jpg", - }, - Atmosphere = { - Type = "Nishita", -- for example, values missing etc etc - MieFactor = 1.0, - MieColor = {1.0, 1.0, 1.0} + Type = "RenderableGlobe", + Radii = { 60268000, 60268000, 54364000 }, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Saturn Texture", + FilePath = "textures/saturn.jpg", + Enabled = true + } + } } }, - Tag = "planet_solarSystem", + Tag = { "planet_solarSystem", "planet_giants" }, Transform = { Rotation = { Type = "SpiceRotation", SourceFrame = "IAU_SATURN", - DestinationFrame = "GALACTIC", - }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, - }, + DestinationFrame = "GALACTIC" + } + } }, { Name = "SaturnRings", @@ -57,9 +48,7 @@ return { Texture = "textures/saturn_rings.png", Size = 140220000, Offset = { 74500 / 140445.100671159, 1.0 } -- min / max extend - - }, - + } }, -- SaturnTrail module { @@ -69,13 +58,13 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "SATURN BARYCENTER", - Observer = "SUN", + Target = "SATURN BARYCENTER", + Observer = "SUN" }, Color = {0.85,0.75,0.51 }, Period = 10746.94, Resolution = 1000, - Tag = "planetTrail_solarSystem" }, + Tag = { "planetTrail_solarSystem", "planetTrail_giants" } } } diff --git a/data/scene/saturn/tethys/tethys.mod b/data/scene/saturn/tethys/tethys.mod index 8fe16fa3cd..c7c94548bc 100644 --- a/data/scene/saturn/tethys/tethys.mod +++ b/data/scene/saturn/tethys/tethys.mod @@ -3,22 +3,23 @@ return { Name = "Tethys", Parent = "SaturnBarycenter", Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_TETHYS", - Body = "TETHYS", - Geometry = { - Type = "SimpleSphere", - Radius = 0.538E3, - Segments = 50 - }, - Textures = { - Color = "textures/tethys.jpg" + Type = "RenderableGlobe", + Radii = 531100, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Tethys Texture", + FilePath = "textures/tethys.jpg", + Enabled = true + } + } } }, Transform = { Translation = { Type = "SpiceTranslation", - Body = "TETHYS", + Target = "TETHYS", Observer = "SATURN BARYCENTER", Kernels = "${OPENSPACE_DATA}/spice/sat375.bsp" }, @@ -36,7 +37,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "TETHYS", + Target = "TETHYS", Observer = "SATURN BARYCENTER", }, Color = { 0.5, 0.3, 0.3 }, @@ -44,4 +45,4 @@ return { Resolution = 1000 } } -} \ No newline at end of file +} diff --git a/data/scene/saturn/titan/titan.mod b/data/scene/saturn/titan/titan.mod index 12cc0d6034..47f20679c7 100644 --- a/data/scene/saturn/titan/titan.mod +++ b/data/scene/saturn/titan/titan.mod @@ -3,22 +3,23 @@ return { Name = "Titan", Parent = "SaturnBarycenter", Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_TITAN", - Body = "TITAN", - Geometry = { - Type = "SimpleSphere", - Radius = 0.2575E4, - Segments = 50 - }, - Textures = { - Color = "textures/titan.jpg" + Type = "RenderableGlobe", + Radii = 2576000, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Titan Texture", + FilePath = "textures/titan.jpg", + Enabled = true + } + } } - }, + }, Transform = { Translation = { Type = "SpiceTranslation", - Body = "TITAN", + Target = "TITAN", Observer = "SATURN BARYCENTER", Kernels = "${OPENSPACE_DATA}/spice/sat375.bsp" }, @@ -36,7 +37,7 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "TITAN", + Target = "TITAN", Observer = "SATURN BARYCENTER", }, Color = { 0.5, 0.3, 0.3 }, @@ -44,4 +45,4 @@ return { Resolution = 1000 } } -} \ No newline at end of file +} diff --git a/data/scene/stars-denver/stars-denver.data b/data/scene/stars/denver/denver.data similarity index 100% rename from data/scene/stars-denver/stars-denver.data rename to data/scene/stars/denver/denver.data diff --git a/data/scene/stars-denver/stars-denver.mod b/data/scene/stars/denver/denver.mod similarity index 100% rename from data/scene/stars-denver/stars-denver.mod rename to data/scene/stars/denver/denver.mod diff --git a/data/scene/stars/stars.data b/data/scene/stars/digitaluniverse/digitaluniverse.data similarity index 100% rename from data/scene/stars/stars.data rename to data/scene/stars/digitaluniverse/digitaluniverse.data diff --git a/data/scene/stars/stars.mod b/data/scene/stars/digitaluniverse/digitaluniverse.mod similarity index 100% rename from data/scene/stars/stars.mod rename to data/scene/stars/digitaluniverse/digitaluniverse.mod diff --git a/data/scene/sun/sun.mod b/data/scene/sun/sun.mod index 11b0e1516d..86d5516c68 100644 --- a/data/scene/sun/sun.mod +++ b/data/scene/sun/sun.mod @@ -24,16 +24,13 @@ return { Radius = 6.957E8, Segments = 100 }, - Textures = { - Type = "simple", - Color = "textures/sun.jpg", - }, + ColorTexture = "textures/sun.jpg", PerformShading = false, }, Transform = { Translation = { Type = "SpiceTranslation", - Body = "SUN", + Target = "SUN", Observer = "SSB", Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" }, @@ -59,7 +56,7 @@ return { Transform = { Translation = { Type = "SpiceTranslation", - Body = "SUN", + Target = "SUN", Observer = "SSB", Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" } diff --git a/data/scene/uranus/uranus.mod b/data/scene/uranus/uranus.mod index 28e4568118..648a60f943 100644 --- a/data/scene/uranus/uranus.mod +++ b/data/scene/uranus/uranus.mod @@ -1,56 +1,45 @@ return { - -- Uranus barycenter module + -- Barycenter module { Name = "UranusBarycenter", Parent = "SolarSystemBarycenter", Transform = { Translation = { Type = "SpiceTranslation", - Body = "URANUS BARYCENTER", + Target = "URANUS BARYCENTER", Observer = "SUN", Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - }, + } } }, - - -- Uranus module + -- RenderableGlobe module { Name = "Uranus", Parent = "UranusBarycenter", - Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_URANUS", - Body = "URANUS BARYCENTER", - Geometry = { - Type = "SimpleSphere", - Radius = 2.5362E7, - Segments = 100 - }, - Textures = { - Type = "simple", - Color = "textures/uranus.jpg", - }, - Atmosphere = { - Type = "Nishita", -- for example, values missing etc etc - MieFactor = 1.0, - MieColor = {1.0, 1.0, 1.0} - } - }, - Tag = "planet_solarSystem", Transform = { Rotation = { Type = "SpiceRotation", SourceFrame = "IAU_URANUS", - DestinationFrame = "ECLIPJ2000", - }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, + DestinationFrame = "GALACTIC" + } }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 25559000, 25559000, 24973000 }, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Texture", + FilePath = "textures/uranus.jpg", + Enabled = true + } + } + } + }, + Tag = { "planet_solarSystem", "planet_giants" } }, - - -- UranusTrail module + -- Trail module { Name = "UranusTrail", Parent = "SolarSystemBarycenter", @@ -58,13 +47,13 @@ return { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "URANUS BARYCENTER", - Observer = "SUN", + Target = "URANUS BARYCENTER", + Observer = "SUN" }, Color = {0.60, 0.95, 1.00 }, Period = 30588.740, - Resolution = 1000, - Tag = "planetTrail_solarSystem" - } + Resolution = 1000 + }, + Tag = { "planetTrail_solarSystem", "planetTrail_giants" } } } diff --git a/data/scene/venus/venus.mod b/data/scene/venus/venus.mod index 7badb32f9c..60a095ad9d 100644 --- a/data/scene/venus/venus.mod +++ b/data/scene/venus/venus.mod @@ -1,70 +1,65 @@ return { - -- Venus barycenter module + -- Barycenter module { Name = "VenusBarycenter", Parent = "SolarSystemBarycenter", Transform = { Translation = { Type = "SpiceTranslation", - Body = "VENUS BARYCENTER", + Target = "VENUS BARYCENTER", Observer = "SUN", Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" - }, + } } }, - - -- Venus module + -- RenderableGlobe module { Name = "Venus", Parent = "VenusBarycenter", - Renderable = { - Type = "RenderablePlanet", - Frame = "IAU_VENUS", - Body = "VENUS", - Geometry = { - Type = "SimpleSphere", - Radius = 3.760E6, - Segments = 100 - }, - Textures = { - Type = "simple", - Color = "textures/venus.jpg", - }, - Atmosphere = { - Type = "Nishita", -- for example, values missing etc etc - MieFactor = 1.0, - MieColor = {1.0, 1.0, 1.0} - } - }, - Tag = {"planet_solarSystem", "planet_terrestrial"}, Transform = { Rotation = { Type = "SpiceRotation", SourceFrame = "IAU_VENUS", DestinationFrame = "GALACTIC" }, - Scale = { - Type = "StaticScale", - Scale = 1, - }, + Translation = { + Type = "SpiceTranslation", + Target = "VENUS", + Observer = "VENUS BARYCENTER", + Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp" + } }, + Renderable = { + Type = "RenderableGlobe", + Radii = { 6051900, 6051900, 6051800 }, + SegmentsPerPatch = 64, + Layers = { + ColorLayers = { + { + Name = "Venus Texture", + FilePath = "textures/venus.jpg", + Enabled = true + } + } + } + }, + Tag = { "planet_solarSystem", "planet_terrestrial" }, }, - - -- VenusTrail module - { + -- Trail module + { Name = "VenusTrail", Parent = "SolarSystemBarycenter", Renderable = { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Body = "VENUS BARYCENTER", - Observer = "SUN", + Target = "VENUS BARYCENTER", + Observer = "SUN" }, Color = { 1.0, 0.5, 0.2 }, Period = 224.695, - Resolution = 1000, - Tag = {"planetTrail_solarSystem", "planetTrail_terrestrial"} - } + Resolution = 1000 + }, + Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" } } } diff --git a/data/web/common/style.css b/data/web/common/style.css index ac82e9fe77..f785e54ff7 100644 --- a/data/web/common/style.css +++ b/data/web/common/style.css @@ -57,6 +57,10 @@ font-size: 0.9em; } +.documentation-documentation { + font-size: 0.9em; +} + .documentation-container { font-size: 1.2em; } diff --git a/data/web/properties/property.hbs b/data/web/properties/property.hbs index b01807229d..7a0bd7a430 100644 --- a/data/web/properties/property.hbs +++ b/data/web/properties/property.hbs @@ -10,6 +10,7 @@

{{fullyQualifiedId}} copy

+

{{description}}

diff --git a/ext/ghoul b/ext/ghoul index 1fc3d1f78d..3238a6c280 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 1fc3d1f78dfd9227ee0068f388f96ea6b1b7bf9f +Subproject commit 3238a6c280738a6568c02182c9d759533ead09e2 diff --git a/include/openspace/documentation/documentation.h b/include/openspace/documentation/documentation.h index 852b8faa9b..1bc33344e3 100644 --- a/include/openspace/documentation/documentation.h +++ b/include/openspace/documentation/documentation.h @@ -37,7 +37,6 @@ namespace ghoul { class Dictionary; } namespace openspace::documentation { using Optional = ghoul::Boolean; -using Exhaustive = ghoul::Boolean; /** * The TestResult structure returns the information from the #testSpecification method. It @@ -162,7 +161,7 @@ struct DocumentationEntry { * \pre \p verifier must not be nullptr */ DocumentationEntry(std::string key, std::shared_ptr verifier, - std::string doc = "", Optional optional = Optional::No); + Optional optional, std::string doc = ""); /** * The constructor for a DocumentationEntry describing a \p key in a Documentation. @@ -185,8 +184,8 @@ struct DocumentationEntry { * \pre \p key must not be empty * \pre \p verifier must not be nullptr */ - DocumentationEntry(std::string key, Verifier* verifier, std::string doc = "", - Optional optional = Optional::No); + DocumentationEntry(std::string key, Verifier* verifier, Optional optional, + std::string doc = ""); /// The key that is described by this DocumentationEntry std::string key; @@ -204,11 +203,8 @@ struct DocumentationEntry { * used to impose restrictions on keys and values and determine whether a given * ghoul::Dictionary adheres to these specifications (see #testSpecification and * #testSpecificationAndThrow methods). Each Documentation consists of a human-readable - * \c name, a list of DocumentationEntry%s that each describe a single key value, and a - * flag whether these entries are Exhaustive or not. If a Documentation is Exhaustive, a - * ghoul::Dictionary that contains additional keys will fail the specification, whereas a - * non-exhaustive Documentation allow for other (potentially non used) keys. The most - * convenient way of creating a Documentation is by using nested initializer lists: + * \c name, and a list of DocumentationEntry%s that each describe a single key value. The + * most convenient way of creating a Documentation is by using nested initializer lists: *\verbatim Documentation doc = { "Documentation for an arbitrary dictionary", @@ -216,9 +212,8 @@ Documentation doc = { { "key1", new IntVerifier, "Documentation key1", Optional::Yes }, { "key2", new FloatVerifier, "Documentation key2" }, { "key3", new StringVerifier } - }, - Exhaustive::Yes -+; + } +}; \endverbatim * * If multiple DocumentationEntries cover the same key, they are all evaluated for that @@ -236,31 +231,23 @@ struct Documentation { * Documentation%s to reference this entry * \param entries A list of DocumentationEntry%s that describe the individual keys for * this entrie Documentation - * \param exhaustive Determines whether the \p entries are an exhaustive specification - * of the object or whether additional, potentially unused, keys are allowed */ - Documentation(std::string name, std::string id, DocumentationEntries entries = {}, - Exhaustive exhaustive = Exhaustive::No); + Documentation(std::string name, std::string id, DocumentationEntries entries = {}); /** * Creates a Documentation with a human-readable \p name. * \param name The human-readable name of this Documentation * \param entries A list of DocumentationEntry%s that describe the individual keys for * this entrie Documentation - * \param exhaustive Determines whether the \p entries are an exhaustive specification - * of the object or whether additional, potentially unused, keys are allowed */ - Documentation(std::string name, DocumentationEntries entries = {}, - Exhaustive exhaustive = Exhaustive::No); + Documentation(std::string name, DocumentationEntries entries = {}); /** * Creates a Documentation. * \param entries A list of DocumentationEntry%s that describe the individual keys for * this entrie Documentation - * \param exhaustive Determines whether the \p entries are an exhaustive specification - * of the object or whether additional, potentially unused, keys are allowed */ - Documentation(DocumentationEntries entries = {}, Exhaustive exhaustive = Exhaustive::No); + Documentation(DocumentationEntries entries = {}); /// The human-readable name of the Documentation std::string name; @@ -268,8 +255,6 @@ struct Documentation { std::string id; /// A list of specifications that are describing this Documentation DocumentationEntries entries; - /// A flag to say wheter the DocumentationEntries are an exhaustive description - Exhaustive exhaustive; }; /** diff --git a/include/openspace/documentation/verifier.h b/include/openspace/documentation/verifier.h index d82681b0e7..0ef07dfc98 100644 --- a/include/openspace/documentation/verifier.h +++ b/include/openspace/documentation/verifier.h @@ -170,12 +170,8 @@ struct TableVerifier : public TemplateVerifier { * \param documentationEntries The DocumentationEntry%s that are used to recursively * test the ghoul::Dictionary that is contained inside. If this list is empty, only a * type check is performed - * \param exhaustive Whether the DocumentationEntry%s contained in - * \p documentationEntries completely describe the contained table or whether - * additional keys are allowed */ - TableVerifier(std::vector documentationEntries = {}, - Exhaustive exhaustive = Exhaustive::No); + TableVerifier(std::vector documentationEntries = {}); /** * Checks whether the \p key%'s value is a table (= ghoul::Dictionary) and (if @@ -197,9 +193,6 @@ struct TableVerifier : public TemplateVerifier { /// The documentations passed in the constructor std::vector documentations; - /// Flag that specifies whether the TableVerifier::documentation exhaustively - /// describes the table or whether additional keys are allowed - Exhaustive exhaustive; }; /** @@ -433,7 +426,7 @@ struct LessVerifier : public OperatorVerifier> { using OperatorVerifier>::OperatorVerifier; - std::string documentation() const; + std::string documentation() const override; using OperatorVerifier>::value; }; diff --git a/include/openspace/documentation/verifier.inl b/include/openspace/documentation/verifier.inl index eef0247b73..9ace596fb3 100644 --- a/include/openspace/documentation/verifier.inl +++ b/include/openspace/documentation/verifier.inl @@ -38,14 +38,14 @@ TestResult TemplateVerifier::operator()(const ghoul::Dictionary& dict, const std::string& key) const { if (dict.hasKeyAndValue(key)) { - return { true, {} }; + return { true, {}, {} }; } else { if (dict.hasKey(key)) { - return { false, { { key, TestResult::Offense::Reason::WrongType } } }; + return { false, { { key, TestResult::Offense::Reason::WrongType } }, {} }; } else { - return { false, { { key, TestResult::Offense::Reason::MissingKey } } }; + return { false, { { key, TestResult::Offense::Reason::MissingKey } }, {} }; } } } @@ -116,8 +116,8 @@ std::string Matrix4x4Verifier::type() const { } template -OperatorVerifier::OperatorVerifier(typename T::Type value) - : value(std::move(value)) +OperatorVerifier::OperatorVerifier(typename T::Type val) + : value(std::move(val)) {} template @@ -127,10 +127,10 @@ TestResult OperatorVerifier::operator()(const ghoul::Dictionary& di TestResult res = T::operator()(dict, key); if (res.success) { if (Operator()(dict.value(key), value)) { - return { true, {} }; + return { true, {}, {} }; } else { - return { false, { { key, TestResult::Offense::Reason::Verification }}}; + return { false, { { key, TestResult::Offense::Reason::Verification } }, {} }; } } else { @@ -169,8 +169,8 @@ std::string UnequalVerifier::documentation() const { } template -InListVerifier::InListVerifier(std::vector values) - : values(std::move(values)) +InListVerifier::InListVerifier(std::vector vals) + : values(std::move(vals)) {} template @@ -184,10 +184,10 @@ TestResult InListVerifier::operator()(const ghoul::Dictionary& dict, auto it = std::find(values.begin(), values.end(), value); if (it != values.end()) { - return { true, {} }; + return { true, {}, {} }; } else { - return { false, { { key, TestResult::Offense::Reason::Verification } } }; + return { false, { { key, TestResult::Offense::Reason::Verification } }, {} }; } } else { @@ -215,8 +215,8 @@ std::string InListVerifier::documentation() const { } template -NotInListVerifier::NotInListVerifier(std::vector values) - : values(std::move(values)) +NotInListVerifier::NotInListVerifier(std::vector vals) + : values(std::move(vals)) {} template @@ -230,10 +230,10 @@ TestResult NotInListVerifier::operator()(const ghoul::Dictionary& dict, auto it = std::find(values.begin(), values.end(), value); if (it == values.end()) { - return { true, {} }; + return { true, {}, {} }; } else { - return { false, { { key, TestResult::Offense::Reason::Verification } } }; + return { false, { { key, TestResult::Offense::Reason::Verification } }, {} }; } } else { @@ -261,9 +261,9 @@ std::string NotInListVerifier::documentation() const { } template -InRangeVerifier::InRangeVerifier(typename T::Type lower, typename T::Type upper) - : lower(std::move(lower)) - , upper(std::move(upper)) +InRangeVerifier::InRangeVerifier(typename T::Type l, typename T::Type u) + : lower(std::move(l)) + , upper(std::move(u)) { ghoul_assert(lower <= upper, "lower must be smaller or equal to upper"); } @@ -277,10 +277,10 @@ TestResult InRangeVerifier::operator()(const ghoul::Dictionary& dict, typename T::Type val = dict.value(key); if (val >= lower && val <= upper) { - return { true, {} }; + return { true, {}, {} }; } else { - return { false, { { key, TestResult::Offense::Reason::Verification } } }; + return { false, { { key, TestResult::Offense::Reason::Verification } }, {} }; } } else { @@ -295,9 +295,9 @@ std::string InRangeVerifier::documentation() const { } template -NotInRangeVerifier::NotInRangeVerifier(typename T::Type lower, typename T::Type upper) - : lower(std::move(lower)) - , upper(std::move(upper)) +NotInRangeVerifier::NotInRangeVerifier(typename T::Type l, typename T::Type u) + : lower(std::move(l)) + , upper(std::move(u)) { ghoul_assert(lower <= upper, "lower must be smaller or equal to upper"); } @@ -310,10 +310,10 @@ TestResult NotInRangeVerifier::operator()(const ghoul::Dictionary& dict, typename T::Type val = dict.value(key); if (val >= lower && val <= upper) { - return { false, { { key, TestResult::Offense::Reason::Verification } } }; + return { false, { { key, TestResult::Offense::Reason::Verification } }, {} }; } else { - return { true, {} }; + return { true, {}, {} }; } } else { @@ -329,10 +329,10 @@ std::string NotInRangeVerifier::documentation() const { template -AnnotationVerifier::AnnotationVerifier(std::string annotation) - : annotation(std::move(annotation)) +AnnotationVerifier::AnnotationVerifier(std::string a) + : annotation(std::move(a)) { - ghoul_assert(!this->annotation.empty(), "Annotation must not be empty"); + ghoul_assert(!annotation.empty(), "Annotation must not be empty"); } template diff --git a/include/openspace/engine/moduleengine.h b/include/openspace/engine/moduleengine.h index 7c1e39392b..f7c18d2b16 100644 --- a/include/openspace/engine/moduleengine.h +++ b/include/openspace/engine/moduleengine.h @@ -90,8 +90,8 @@ public: template ModuleSubClass* module() const { auto it = std::find_if(_modules.begin(), _modules.end(), - [](const std::unique_ptr& module) { - return module->name() == ModuleSubClass::Name; + [](const std::unique_ptr& m) { + return m->name() == ModuleSubClass::Name; }); if (it != _modules.end()) { return dynamic_cast(it->get()); diff --git a/include/openspace/interaction/interpolator.inl b/include/openspace/interaction/interpolator.inl index e1a0b324c1..2f0479f79f 100644 --- a/include/openspace/interaction/interpolator.inl +++ b/include/openspace/interaction/interpolator.inl @@ -30,14 +30,15 @@ namespace openspace::interaction { template Interpolator::Interpolator() -: _transferFunction([](float t){ return t; }) -, _t(0.0) -, _interpolationTime(1.0) {}; + : _transferFunction([](float t){ return t; }) + , _t(0.0) + , _interpolationTime(1.0) +{} template void Interpolator::start() { _t = 0.0; -}; +} template void Interpolator::end() { diff --git a/include/openspace/interaction/keybindingmanager.h b/include/openspace/interaction/keybindingmanager.h index 6d64273d92..8d66788195 100644 --- a/include/openspace/interaction/keybindingmanager.h +++ b/include/openspace/interaction/keybindingmanager.h @@ -75,8 +75,6 @@ private: std::string generateJson() const override; - bool _cameraUpdatedFromScript = false; - std::multimap _keyLua; }; diff --git a/include/openspace/interaction/orbitalnavigator.h b/include/openspace/interaction/orbitalnavigator.h index eaf3c6277c..07e380b6aa 100644 --- a/include/openspace/interaction/orbitalnavigator.h +++ b/include/openspace/interaction/orbitalnavigator.h @@ -64,14 +64,21 @@ private: glm::dquat globalRotation; }; - // Properties - properties::BoolProperty _rollFriction; - properties::BoolProperty _rotationalFriction; - properties::BoolProperty _zoomFriction; + struct Friction : public properties::PropertyOwner { + Friction(); + + properties::BoolProperty roll; + properties::BoolProperty rotational; + properties::BoolProperty zoom; + + properties::FloatProperty friction; + }; + + Friction _friction; + properties::FloatProperty _followFocusNodeRotationDistance; properties::FloatProperty _minimumAllowedDistance; properties::FloatProperty _sensitivity; - properties::FloatProperty _motionLag; MouseStates _mouseStates; @@ -90,11 +97,9 @@ private: * from the global to the current total rotation so that * cameraRotation = globalRotation * localRotation. */ - CameraRotationDecomposition decomposeCameraRotation( - const glm::dvec3& cameraPosition, - const glm::dquat& cameraRotation, - const glm::dvec3& cameraLookUp, - const glm::dvec3& cameraViewDirection); + CameraRotationDecomposition decomposeCameraRotation(const glm::dvec3& cameraPosition, + const glm::dquat& cameraRotation, const glm::dvec3& cameraLookUp, + const glm::dvec3& cameraViewDirection); /* * Perform a camera roll on the local camera rotation diff --git a/include/openspace/network/messagestructures.h b/include/openspace/network/messagestructures.h index 6104ce1abd..e200630526 100644 --- a/include/openspace/network/messagestructures.h +++ b/include/openspace/network/messagestructures.h @@ -28,7 +28,7 @@ #include #include -#include +//#include #include diff --git a/include/openspace/performance/performancemanager.h b/include/openspace/performance/performancemanager.h index ddc85bdce0..30094f1075 100644 --- a/include/openspace/performance/performancemanager.h +++ b/include/openspace/performance/performancemanager.h @@ -72,6 +72,7 @@ public: bool loggingEnabled() const; PerformanceLayout* performanceData(); + private: bool _doPerformanceMeasurements; bool _loggingEnabled; diff --git a/include/openspace/properties/matrix/dmat2property.h b/include/openspace/properties/matrix/dmat2property.h index 28e4f575d5..1f44864010 100644 --- a/include/openspace/properties/matrix/dmat2property.h +++ b/include/openspace/properties/matrix/dmat2property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(DMat2Property, glm::dmat2x2); +REGISTER_NUMERICALPROPERTY_HEADER(DMat2Property, glm::dmat2x2) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/dmat2x3property.h b/include/openspace/properties/matrix/dmat2x3property.h index 615958219a..5e6a88c143 100644 --- a/include/openspace/properties/matrix/dmat2x3property.h +++ b/include/openspace/properties/matrix/dmat2x3property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(DMat2x3Property, glm::dmat2x3); +REGISTER_NUMERICALPROPERTY_HEADER(DMat2x3Property, glm::dmat2x3) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/dmat2x4property.h b/include/openspace/properties/matrix/dmat2x4property.h index 793e78edf3..c1c72f21c9 100644 --- a/include/openspace/properties/matrix/dmat2x4property.h +++ b/include/openspace/properties/matrix/dmat2x4property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(DMat2x4Property, glm::dmat2x4); +REGISTER_NUMERICALPROPERTY_HEADER(DMat2x4Property, glm::dmat2x4) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/dmat3property.h b/include/openspace/properties/matrix/dmat3property.h index 56100acab5..c02c7b7abf 100644 --- a/include/openspace/properties/matrix/dmat3property.h +++ b/include/openspace/properties/matrix/dmat3property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(DMat3Property, glm::dmat3x3); +REGISTER_NUMERICALPROPERTY_HEADER(DMat3Property, glm::dmat3x3) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/dmat3x2property.h b/include/openspace/properties/matrix/dmat3x2property.h index 799c56fc0b..b0566802f0 100644 --- a/include/openspace/properties/matrix/dmat3x2property.h +++ b/include/openspace/properties/matrix/dmat3x2property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(DMat3x2Property, glm::dmat3x2); +REGISTER_NUMERICALPROPERTY_HEADER(DMat3x2Property, glm::dmat3x2) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/dmat3x4property.h b/include/openspace/properties/matrix/dmat3x4property.h index 118645dbc0..9430f54881 100644 --- a/include/openspace/properties/matrix/dmat3x4property.h +++ b/include/openspace/properties/matrix/dmat3x4property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(DMat3x4Property, glm::dmat3x4); +REGISTER_NUMERICALPROPERTY_HEADER(DMat3x4Property, glm::dmat3x4) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/dmat4property.h b/include/openspace/properties/matrix/dmat4property.h index 1e309587e0..a2f22cc3bc 100644 --- a/include/openspace/properties/matrix/dmat4property.h +++ b/include/openspace/properties/matrix/dmat4property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(DMat4Property, glm::dmat4x4); +REGISTER_NUMERICALPROPERTY_HEADER(DMat4Property, glm::dmat4x4) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/dmat4x2property.h b/include/openspace/properties/matrix/dmat4x2property.h index f944f7bc60..5cb10b9789 100644 --- a/include/openspace/properties/matrix/dmat4x2property.h +++ b/include/openspace/properties/matrix/dmat4x2property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(DMat4x2Property, glm::dmat4x2); +REGISTER_NUMERICALPROPERTY_HEADER(DMat4x2Property, glm::dmat4x2) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/dmat4x3property.h b/include/openspace/properties/matrix/dmat4x3property.h index 54fa7e9eb3..11019ee2a3 100644 --- a/include/openspace/properties/matrix/dmat4x3property.h +++ b/include/openspace/properties/matrix/dmat4x3property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(DMat4x3Property, glm::dmat4x3); +REGISTER_NUMERICALPROPERTY_HEADER(DMat4x3Property, glm::dmat4x3) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/mat2property.h b/include/openspace/properties/matrix/mat2property.h index c691616f50..833e7b387e 100644 --- a/include/openspace/properties/matrix/mat2property.h +++ b/include/openspace/properties/matrix/mat2property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(Mat2Property, glm::mat2x2); +REGISTER_NUMERICALPROPERTY_HEADER(Mat2Property, glm::mat2x2) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/mat2x3property.h b/include/openspace/properties/matrix/mat2x3property.h index ca318af60c..8ee5d229a9 100644 --- a/include/openspace/properties/matrix/mat2x3property.h +++ b/include/openspace/properties/matrix/mat2x3property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(Mat2x3Property, glm::mat2x3); +REGISTER_NUMERICALPROPERTY_HEADER(Mat2x3Property, glm::mat2x3) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/mat2x4property.h b/include/openspace/properties/matrix/mat2x4property.h index e5eb8e0a8e..c8c4d1c636 100644 --- a/include/openspace/properties/matrix/mat2x4property.h +++ b/include/openspace/properties/matrix/mat2x4property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(Mat2x4Property, glm::mat2x4); +REGISTER_NUMERICALPROPERTY_HEADER(Mat2x4Property, glm::mat2x4) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/mat3property.h b/include/openspace/properties/matrix/mat3property.h index 419846f9d4..19c90d602c 100644 --- a/include/openspace/properties/matrix/mat3property.h +++ b/include/openspace/properties/matrix/mat3property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(Mat3Property, glm::mat3x3); +REGISTER_NUMERICALPROPERTY_HEADER(Mat3Property, glm::mat3x3) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/mat3x2property.h b/include/openspace/properties/matrix/mat3x2property.h index 2753bb5962..aac5b68d31 100644 --- a/include/openspace/properties/matrix/mat3x2property.h +++ b/include/openspace/properties/matrix/mat3x2property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(Mat3x2Property, glm::mat3x2); +REGISTER_NUMERICALPROPERTY_HEADER(Mat3x2Property, glm::mat3x2) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/mat3x4property.h b/include/openspace/properties/matrix/mat3x4property.h index cb1a6156b9..31523c6422 100644 --- a/include/openspace/properties/matrix/mat3x4property.h +++ b/include/openspace/properties/matrix/mat3x4property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(Mat3x4Property, glm::mat3x4); +REGISTER_NUMERICALPROPERTY_HEADER(Mat3x4Property, glm::mat3x4) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/mat4property.h b/include/openspace/properties/matrix/mat4property.h index bff8de9669..7c80f4196a 100644 --- a/include/openspace/properties/matrix/mat4property.h +++ b/include/openspace/properties/matrix/mat4property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(Mat4Property, glm::mat4x4); +REGISTER_NUMERICALPROPERTY_HEADER(Mat4Property, glm::mat4x4) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/mat4x2property.h b/include/openspace/properties/matrix/mat4x2property.h index b5b38b92fb..ce45ae0570 100644 --- a/include/openspace/properties/matrix/mat4x2property.h +++ b/include/openspace/properties/matrix/mat4x2property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(Mat4x2Property, glm::mat4x2); +REGISTER_NUMERICALPROPERTY_HEADER(Mat4x2Property, glm::mat4x2) } // namespace openspace::properties diff --git a/include/openspace/properties/matrix/mat4x3property.h b/include/openspace/properties/matrix/mat4x3property.h index 9c01ccf656..3324b3cb1f 100644 --- a/include/openspace/properties/matrix/mat4x3property.h +++ b/include/openspace/properties/matrix/mat4x3property.h @@ -31,7 +31,7 @@ namespace openspace::properties { -REGISTER_NUMERICALPROPERTY_HEADER(Mat4x3Property, glm::mat4x3); +REGISTER_NUMERICALPROPERTY_HEADER(Mat4x3Property, glm::mat4x3) } // namespace openspace::properties diff --git a/include/openspace/properties/numericalproperty.h b/include/openspace/properties/numericalproperty.h index 8e5bc6cb23..25abe7a01b 100644 --- a/include/openspace/properties/numericalproperty.h +++ b/include/openspace/properties/numericalproperty.h @@ -60,7 +60,7 @@ protected: static const std::string MaximumValueKey; static const std::string SteppingValueKey; - std::string generateAdditionalDescription() const; + std::string generateAdditionalDescription() const override; T _minimumValue; T _maximumValue; diff --git a/include/openspace/properties/numericalproperty.inl b/include/openspace/properties/numericalproperty.inl index 0c524a3b0c..51ce94f827 100644 --- a/include/openspace/properties/numericalproperty.inl +++ b/include/openspace/properties/numericalproperty.inl @@ -27,7 +27,7 @@ namespace openspace::properties { #define REGISTER_NUMERICALPROPERTY_HEADER(CLASS_NAME, TYPE) \ - typedef NumericalProperty CLASS_NAME; \ + using CLASS_NAME = NumericalProperty; \ \ template <> \ std::string PropertyDelegate>::className(); \ @@ -80,7 +80,7 @@ namespace openspace::properties { template <> \ template <> \ TYPE PropertyDelegate>::fromString(std::string value, \ - bool& success); \ + bool& success); \ \ template <> \ template <> \ @@ -149,16 +149,16 @@ namespace openspace::properties { \ template <> \ template <> \ - TYPE PropertyDelegate>::fromLuaValue( \ - lua_State* state, bool& success) \ + TYPE PropertyDelegate>::fromLuaValue(lua_State* state, \ + bool& success) \ { \ - return PropertyDelegate>::fromLuaValue(state, \ - success); \ + return PropertyDelegate>::fromLuaValue( \ + state, success); \ } \ \ template <> \ template <> \ - bool PropertyDelegate>::toLuaValue(lua_State * state, \ + bool PropertyDelegate>::toLuaValue(lua_State* state, \ TYPE value) \ { \ return TO_LUA_LAMBDA_EXPRESSION(state, value); \ @@ -166,7 +166,7 @@ namespace openspace::properties { \ template <> \ template <> \ - bool PropertyDelegate>::toLuaValue(lua_State * state, \ + bool PropertyDelegate>::toLuaValue(lua_State* state, \ TYPE value) \ { \ return PropertyDelegate>::toLuaValue(state, value); \ @@ -195,10 +195,12 @@ namespace openspace::properties { template <> \ template <> \ TYPE PropertyDelegate>::fromString(std::string value, \ - bool& success) \ + bool& success) \ { \ - return PropertyDelegate>::fromString(value, \ - success); \ + return PropertyDelegate>::fromString( \ + value, \ + success \ + ); \ } \ \ template <> \ @@ -278,8 +280,7 @@ std::string NumericalProperty::className() const { } template -bool NumericalProperty::setLuaValue(lua_State* state) -{ +bool NumericalProperty::setLuaValue(lua_State* state) { bool success = false; T value = PropertyDelegate>::template fromLuaValue( state, success @@ -290,8 +291,7 @@ bool NumericalProperty::setLuaValue(lua_State* state) } template -bool NumericalProperty::getLuaValue(lua_State* state) const -{ +bool NumericalProperty::getLuaValue(lua_State* state) const { bool success = PropertyDelegate>::template toLuaValue( state, TemplateProperty::_value ); diff --git a/include/openspace/properties/optionproperty.h b/include/openspace/properties/optionproperty.h index 1f57f4e98f..b465c33039 100644 --- a/include/openspace/properties/optionproperty.h +++ b/include/openspace/properties/optionproperty.h @@ -125,7 +125,7 @@ public: private: static const std::string OptionsKey; - std::string generateAdditionalDescription() const; + std::string generateAdditionalDescription() const override; /// The list of options which have been registered with this OptionProperty std::vector