diff --git a/CMakeLists.txt b/CMakeLists.txt index 238708027f..8b0b2f1362 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,8 +56,8 @@ set_property(GLOBAL PROPERTY USE_FOLDERS On) set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER CMake) mark_as_advanced(CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BUILD_TYPE CMAKE_DEBUG_POSTFIX - CMAKE_INSTALL_PREFIX CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET - CMAKE_OSX_SYSROOT CMAKE_RELEASE_POSTFIX) + CMAKE_INSTALL_PREFIX CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET + CMAKE_OSX_SYSROOT CMAKE_RELEASE_POSTFIX) # Set build output directories set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${OPENSPACE_CMAKE_EXT_DIR}) @@ -90,9 +90,9 @@ execute_process( RESULT_VARIABLE OPENSPACE_GIT_STATUS_RETURN ) if (NOT OPENSPACE_GIT_STATUS_RETURN EQUAL 0) - set(OPENSPACE_GIT_STATUS "uncomitted changes") + set(OPENSPACE_GIT_STATUS "uncommitted changes") else() - set(OPENSPACE_GIT_STATUS "") + set(OPENSPACE_GIT_STATUS "") endif() option(OPENSPACE_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF) @@ -105,15 +105,15 @@ include(src/CMakeLists.txt) # System libraries if (APPLE) begin_dependency("Core Libraries") - target_include_directories(openspace-core 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(openspace-core ${CARBON_LIBRARY} ${COREFOUNDATION_LIBRARY} - ${COCOA_LIBRARY} ${APP_SERVICES_LIBRARY}) - end_dependency() + target_include_directories(openspace-core 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(openspace-core ${CARBON_LIBRARY} ${COREFOUNDATION_LIBRARY} + ${COCOA_LIBRARY} ${APP_SERVICES_LIBRARY}) + end_dependency() endif() # Ghoul @@ -134,18 +134,17 @@ end_dependency() # Curl begin_dependency("CURL") if (WIN32) - set(CURL_ROOT_DIR "${OPENSPACE_EXT_DIR}/curl") - target_include_directories(openspace-core SYSTEM PUBLIC ${CURL_ROOT_DIR}/include) - target_link_libraries(openspace-core ${CURL_ROOT_DIR}/lib/libcurl.lib) - target_compile_definitions(openspace-core PUBLIC - "OPENSPACE_CURL_ENABLED" "CURL_STATICLIB") + set(CURL_ROOT_DIR "${OPENSPACE_EXT_DIR}/curl") + target_include_directories(openspace-core SYSTEM PUBLIC ${CURL_ROOT_DIR}/include) + target_link_libraries(openspace-core ${CURL_ROOT_DIR}/lib/libcurl.lib) + target_compile_definitions(openspace-core PUBLIC "OPENSPACE_CURL_ENABLED" "CURL_STATICLIB") else () - find_package(CURL) - if (CURL_FOUND) - target_include_directories(openspace-core SYSTEM PUBLIC ${CURL_INCLUDE_DIRS}) - target_link_libraries(openspace-core ${CURL_LIBRARIES}) - target_compile_definitions(openspace-core PUBLIC "OPENSPACE_CURL_ENABLED") - endif () + find_package(CURL) + if (CURL_FOUND) + target_include_directories(openspace-core SYSTEM PUBLIC ${CURL_INCLUDE_DIRS}) + target_link_libraries(openspace-core ${CURL_LIBRARIES}) + target_compile_definitions(openspace-core PUBLIC "OPENSPACE_CURL_ENABLED") + endif () endif() end_dependency() @@ -153,22 +152,26 @@ end_dependency() # 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" - ) + 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" + "~/Qt/5.9/clang_64/lib/cmake" + "~/Qt/5.10/clang_64/lib/cmake" + "~/Qt/5.11/clang_64/lib/cmake" + "~/Qt/5.12/clang_64/lib/cmake" + ) endif () if (MSVC) - option(OPENSPACE_ENABLE_VLD "Enable the Visual Leak Detector" OFF) - if (OPENSPACE_ENABLE_VLD) - begin_dependency("Visual Leak Detector") - target_compile_definitions(openspace-core PUBLIC "OPENSPACE_ENABLE_VLD") - target_link_libraries(openspace-core ${OPENSPACE_EXT_DIR}/vld/lib/vld.lib) - target_include_directories(openspace-core PUBLIC ${OPENSPACE_EXT_DIR}/vld) - end_dependency() - endif () + option(OPENSPACE_ENABLE_VLD "Enable the Visual Leak Detector" OFF) + if (OPENSPACE_ENABLE_VLD) + begin_dependency("Visual Leak Detector") + target_compile_definitions(openspace-core PUBLIC "OPENSPACE_ENABLE_VLD") + target_link_libraries(openspace-core ${OPENSPACE_EXT_DIR}/vld/lib/vld.lib) + target_include_directories(openspace-core PUBLIC ${OPENSPACE_EXT_DIR}/vld) + end_dependency() + endif () endif () @@ -177,29 +180,29 @@ endif () ########################################################################################## option(OPENSPACE_HAVE_TESTS "Activate the OpenSpace unit tests" ON) if (OPENSPACE_HAVE_TESTS) - include_gtest("${GHOUL_BASE_DIR}/ext/googletest") + include_gtest("${GHOUL_BASE_DIR}/ext/googletest") - file(GLOB_RECURSE OPENSPACE_TEST_FILES ${OPENSPACE_BASE_DIR}/tests/*.inl) - add_executable(OpenSpaceTest ${OPENSPACE_BASE_DIR}/tests/main.cpp ${OPENSPACE_TEST_FILES}) + 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_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 openspace-core) + + set_folder_location(OpenSpaceTest "Unit Tests") + + if (MSVC) + set_target_properties(OpenSpaceTest PROPERTIES LINK_FLAGS + "/NODEFAULTLIB:LIBCMTD.lib /NODEFAULTLIB:LIBCMT.lib" ) - target_compile_definitions(OpenSpaceTest PUBLIC - "GHL_THROW_ON_ASSERT" "GTEST_HAS_TR1_TUPLE=0" - ) - target_link_libraries(OpenSpaceTest gtest openspace-core) - - set_folder_location(OpenSpaceTest "Unit Tests") - - if (MSVC) - set_target_properties(OpenSpaceTest PROPERTIES LINK_FLAGS - "/NODEFAULTLIB:LIBCMTD.lib /NODEFAULTLIB:LIBCMT.lib" - ) - endif () - set_openspace_compile_settings(OpenSpaceTest) + endif () + set_openspace_compile_settings(OpenSpaceTest) endif (OPENSPACE_HAVE_TESTS) @@ -219,24 +222,24 @@ message(STATUS "") # Why not put these in the module's path? Because they do not have access to the # target as of July 2017, which is needed. if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT) - # wanted by CEF - set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE") + # wanted by CEF + set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE") - if (WIN32) - set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc) - endif () + if (WIN32) + set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc) + endif () - # Add the CEF binary distribution's cmake/ directory to the module path and - # find CEF to initialize it properly. - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBBROWSER_MODULE_PATH}/cmake") - include(webbrowser_helpers) + # Add the CEF binary distribution's cmake/ directory to the module path and + # find CEF to initialize it properly. + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBBROWSER_MODULE_PATH}/cmake") + include(webbrowser_helpers) - if (TARGET OpenSpaceTest) - set_cef_targets("${CEF_ROOT}" OpenSpaceTest) - run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}") - endif () + if (TARGET OpenSpaceTest) + set_cef_targets("${CEF_ROOT}" OpenSpaceTest) + run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}") + endif () elseif (OPENSPACE_MODULE_WEBBROWSER) - message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.") + message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.") endif () ########################################################################################## @@ -244,14 +247,14 @@ endif () ########################################################################################## option(OPENSPACE_WITH_ABUFFER_RENDERER "Compile ABuffer Renderer" OFF) if (OPENSPACE_WITH_ABUFFER_RENDERER) - target_compile_definitions(openspace-core PUBLIC "OPENSPACE_WITH_ABUFFER_RENDERER") + target_compile_definitions(openspace-core PUBLIC "OPENSPACE_WITH_ABUFFER_RENDERER") endif () # Just in case, create the bin directory add_custom_command( - TARGET openspace-core - PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} + TARGET openspace-core + PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ) # Manage the CPack packaging diff --git a/CREDITS.md b/CREDITS.md index f5138ee08d..9cf0a31725 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -1,30 +1,39 @@ +# Core Team Alexander Bock -Joakim Kilby Emil Axelsson -Eric Myers -Jonathas Costa -Matthew Territo -Gene Payne Kalle Bladin -Erik Sundén Micah Acinapura +Jonathas Costa +Joakim Kilby +Gene Payne +Erik Sundén +Eric Myers -Jonas Strandstedt -Hans-Christian Helltegen -Michal Marcinkowski -Anton Arbring -Tomas Forsyth Rosin -Erik Broberg -Michael Nilsson Sebastian Piwell +Erik Broberg +Jonas Strandstedt +Michal Marcinkowski +Jonathan Bosson +Michael Nilsson +Hans-Christian Helltegen +Anton Arbring +Oskar Carlbaum +Matthew Territo +Jonathan Grangien +Klas Eskilson +Tomas Forsyth Rosin Niclas Hultberg Rickard Lindtstedt Michael Sjöström Michael Novén -Oskar Carlbaum -Jonathan Bosson -Klas Eskilson Christoffer Särevall + +# Community Support +mingenuity +nealmcb +nbartzokas +mik3caprio +arfon Anteige noahdasanaike diff --git a/Jenkinsfile b/Jenkinsfile index 9f1ae501d1..f1e0474e83 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,88 +1,166 @@ -def modules = [ - "base", - "debugging", - "fieldlines", - "galaxy", - "globebrowsing", - "imgui", - "iswa", - "kameleon", - "kameleonvolume", - "multiresvolume", - "spacecraftinstruments", - "space", - "touch", - "toyvolume", - "volume" -]; +import groovy.io.FileType -def flags = "-DGHOUL_USE_DEVIL=OFF " +library('sharedSpace'); // jenkins-pipeline-lib -for (module in modules) { - flags += "-DOPENSPACE_MODULE_" + module.toUpperCase() + "=ON " -} -echo flags +def url = 'https://github.com/OpenSpace/OpenSpace'; +def branch = env.BRANCH_NAME; -stage('Build') { - parallel linux: { - node('linux') { - timeout(time: 90, unit: 'MINUTES') { - - deleteDir() - checkout scm - sh 'git submodule update --init --recursive' - sh ''' - mkdir -p build - cd build - cmake .. ''' + - flags + ''' .. - make -j4 OpenSpace GhoulTest OpenSpaceTest - ''' - } - } - }, - windows: { - node('windows') { - timeout(time: 90, unit: 'MINUTES') { - // We specify the workspace directory manually to reduce the path length and thus try to avoid MSB3491 on Visual Studio - ws("${env.JENKINS_BASE}/O/${env.BRANCH_NAME}/${env.BUILD_ID}") { - 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 /p:Configuration=Debug /target:OpenSpace /target:"Unit Tests"\\GhoulTest /target:"Unit Tests"\\OpenSpaceTest - ''' - } - } - } - }, - osx: { - node('osx') { - timeout(time: 90, unit: 'MINUTES') { - deleteDir() - checkout scm - sh 'git submodule update --init --recursive' - sh ''' - export PATH=${PATH}:/usr/local/bin:/Applications/CMake.app/Contents/bin - export CMAKE_BUILD_TOOL=/Applications/CMake.app/Contents/bin/CMake - srcDir=$PWD - if [ ! -d ${srcDir} ]; then - mkdir ${srcDir} - fi - if [ ! -d ${srcDir}/build ]; then - mkdir ${srcDir}/build - fi - cd ${srcDir}/build - /Applications/CMake.app/Contents/bin/cmake -G Xcode ${srcDir} .. ''' + - flags + ''' - xcodebuild -parallelizeTargets -jobs 4 -target OpenSpace -target GhoulTest -target OpenSpaceTest - ''' - } - } +@NonCPS +def readDir() { + def dirsl = []; + new File("${workspace}").eachDir() { + dirs -> println dirs.getName() + if (!dirs.getName().startsWith('.')) { + dirsl.add(dirs.getName()); } + } + return dirs; +} + +def moduleCMakeFlags() { + def modules = []; + // using new File doesn't work as it is not allowed in the sandbox + + if (isUnix()) { + modules = sh(returnStdout: true, script: 'ls -d modules/*').trim().split('\n'); + }; + else { + modules = bat(returnStdout: true, script: '@dir modules /b /ad /on').trim().split('\r\n'); + } + + // def dirs = readDir(); + // def currentDir = new File('.') + // def dirs = [] + // currentDir.eachFile FileType.DIRECTORIES, { + // dirs << it.name + // } + // def moduleFlags = [ + // 'atmosphere', + // 'base', + // // 'cefwebgui', + // 'debugging', + // 'digitaluniverse', + // 'fieldlines', + // 'fieldlinessequence', + // 'fitsfilereader', + // 'gaia', + // 'galaxy', + // 'globebrowsing', + // 'imgui', + // 'iswa', + // 'kameleon', + // 'kameleonvolume', + // 'multiresvolume', + // 'server', + // 'space', + // 'spacecraftinstruments', + // 'space', + // 'spout', + // 'sync', + // 'touch', + // 'toyvolume', + // 'volume', + // // 'webbrowser', + // // 'webgui' + // ]; + + def flags = ''; + for (module in modules) { + flags += "-D OPENSPACE_MODULE_${module.toUpperCase()}=ON " + } + return flags; +} + +// echo flags + +// +// Pipeline start +// + +parallel master: { + node('master') { + stage('master/scm') { + deleteDir(); + gitHelper.checkoutGit(url, branch); + helper.createDirectory('build'); + } + stage('master/cppcheck/create') { + sh 'cppcheck --enable=all --xml --xml-version=2 -i ext --suppressions-list=support/cppcheck/suppressions.txt include modules src tests 2> build/cppcheck.xml'; + } + stage('master/cloc/create') { + sh 'cloc --by-file --exclude-dir=build,data,ext --xml --out=build/cloc.xml --force-lang-def=support/cloc/langDef --quiet .'; + } + } +}, +linux: { + node('linux') { + stage('linux/scm') { + deleteDir() + gitHelper.checkoutGit(url, branch); + } + stage('linux/build') { + // Not sure why the linking of OpenSpaceTest takes so long + compileHelper.build(compileHelper.Make(), compileHelper.Gcc(), moduleCMakeFlags(), 'OpenSpace', 'build-all'); + } + stage('linux/warnings') { + compileHelper.recordCompileIssues(compileHelper.Gcc()); + } + stage('linux/test') { + // testHelper.runUnitTests('build/OpenSpaceTest'); + } + } // node('linux') +}, +windows: { + node('windows') { + ws("${env.JENKINS_BASE}/O/${env.BRANCH_NAME}/${env.BUILD_ID}") { + stage('windows/scm') { + deleteDir(); + gitHelper.checkoutGit(url, branch); + } + stage('windows/build') { + compileHelper.build(compileHelper.VisualStudio(), compileHelper.VisualStudio(), moduleCMakeFlags(), '', 'build-all'); + } + stage('windows/warnings') { + compileHelper.recordCompileIssues(compileHelper.VisualStudio()); + } + stage('windows/test') { + // Currently, the unit tests are failing on Windows + // testHelper.runUnitTests('bin\\Debug\\OpenSpaceTest') + } + } // node('windows') + } +}, +osx: { + node('osx') { + stage('osx/scm') { + deleteDir(); + gitHelper.checkoutGit(url, branch); + } + stage('osx/build') { + compileHelper.build(compileHelper.Xcode(), compileHelper.Clang(), moduleCMakeFlags(), '', 'build-all'); + } + stage('osx/warnings') { + compileHelper.recordCompileIssues(compileHelper.Clang()); + } + stage('osx/test') { + // Currently, the unit tests are crashing on OS X + // testHelper.runUnitTests('build/Debug/OpenSpaceTest') + } + } // node('osx') +} + +// +// Post-build actions +// +node('master') { + stage('master/cppcheck/publish') { + // publishCppcheck(pattern: 'build/cppcheck.xml'); + } + stage('master/cloc/publish') { + sloccountPublish(encoding: '', pattern: 'build/cloc.xml'); + } + stage('master/notifications') { + slackHelper.sendChangeSetSlackMessage(currentBuild); + } } diff --git a/LICENSE.md b/LICENSE.md index b82e897d9f..65a49a2e5b 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2014-2018 +Copyright (c) 2014-2019 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 diff --git a/apps/OpenSpace-MinVR/CMakeLists.txt b/apps/OpenSpace-MinVR/CMakeLists.txt index f03a46e18f..2a01ce4c0b 100644 --- a/apps/OpenSpace-MinVR/CMakeLists.txt +++ b/apps/OpenSpace-MinVR/CMakeLists.txt @@ -32,14 +32,14 @@ set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT ON CACHE BOOL "" FORCE) add_subdirectory(ext/minvr) create_new_application(OpenSpace-MinVR - ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/openspace.rc - ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns + ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/openspace.rc + ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns ) set_source_files_properties( - ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns - PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" + ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns + PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" ) target_include_directories(OpenSpace-MinVR PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ext/minvr/src) @@ -56,34 +56,34 @@ target_link_libraries(OpenSpace-MinVR libOpenSpace MinVR) # Why not put these in the module's path? Because they do not have access to the # target as of July 2017, which is needed. if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT) - # wanted by CEF - set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE") - - if (WIN32) - set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace-MinVR/openspace.rc) - endif () + # wanted by CEF + set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE") - # Add the CEF binary distribution's cmake/ directory to the module path and - # find CEF to initialize it properly. - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBBROWSER_MODULE_PATH}/cmake") - include(webbrowser_helpers) + if (WIN32) + set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace-MinVR/openspace.rc) + endif () - set_cef_targets("${CEF_ROOT}" OpenSpace-MinVR) - run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}") + # Add the CEF binary distribution's cmake/ directory to the module path and + # find CEF to initialize it properly. + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBBROWSER_MODULE_PATH}/cmake") + include(webbrowser_helpers) + + set_cef_targets("${CEF_ROOT}" OpenSpace-MinVR) + run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}") elseif (OPENSPACE_MODULE_WEBBROWSER) - message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.") + message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.") endif () if (OPENSPACE_MODULE_WEBGUI AND WEBGUI_MODULE_PATH) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBGUI_MODULE_PATH}/cmake") - include(webgui_helpers) - build_webgui_source(OpenSpace-MinVR) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBGUI_MODULE_PATH}/cmake") + include(webgui_helpers) + build_webgui_source(OpenSpace-MinVR) elseif(OPENSPACE_MODULE_WEBGUI) - message(WARNING "WebGui is configured to be included, but the web source could not be found. Try configuring CMake again.") + message(WARNING "WebGui is configured to be included, but the web source could not be found. Try configuring CMake again.") endif() # End Web Browser and Web gui if (MSVC) - # This library is used for being able to output the callstack if an exception escapes - target_link_libraries(OpenSpace-MinVR Dbghelp.lib) + # This library is used for being able to output the callstack if an exception escapes + target_link_libraries(OpenSpace-MinVR Dbghelp.lib) endif() diff --git a/apps/OpenSpace-MinVR/main.cpp b/apps/OpenSpace-MinVR/main.cpp index 4351aebada..b4cde8364e 100644 --- a/apps/OpenSpace-MinVR/main.cpp +++ b/apps/OpenSpace-MinVR/main.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt index 936ebb15b9..67b2975c50 100644 --- a/apps/OpenSpace/CMakeLists.txt +++ b/apps/OpenSpace/CMakeLists.txt @@ -33,71 +33,71 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/global_variables.cmake) option(OPENSPACE_OPENVR_SUPPORT "Build OpenSpace application with OpenVR support" OFF) if (OPENSPACE_OPENVR_SUPPORT) - begin_header("Dependency: OpenVR") - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${OPENSPACE_EXT_DIR}/sgct/cmake/modules/") + begin_header("Dependency: OpenVR") + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${OPENSPACE_EXT_DIR}/sgct/cmake/modules/") - find_package(OpenVR REQUIRED) + find_package(OpenVR REQUIRED) - set(SGCT_OPENVR_DEFINITIONS OPENVR_SUPPORT) - if (NOT SGCT_OPENVR_INCLUDE_DIRECTORY) - if (WIN32) - find_path(SGCT_OPENVR_INCLUDE_DIRECTORY - NAMES SGCTOpenVR.h - PATHS ${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 ${OPENSPACE_EXT_DIR}/sgct/additional_includes/openvr - REQUIRED - ) - endif () + set(SGCT_OPENVR_DEFINITIONS OPENVR_SUPPORT) + if (NOT SGCT_OPENVR_INCLUDE_DIRECTORY) + if (WIN32) + find_path(SGCT_OPENVR_INCLUDE_DIRECTORY + NAMES SGCTOpenVR.h + PATHS ${OPENSPACE_EXT_DIR}/sgct/additional_includes/openvr NO_DEFAULT_PATH + REQUIRED + ) else () - set(SGCT_OPENVR_FILES - ${SGCT_OPENVR_INCLUDE_DIRECTORY}/SGCTOpenVR.h - ${SGCT_OPENVR_INCLUDE_DIRECTORY}/SGCTOpenVR.cpp - ) + find_path(SGCT_OPENVR_INCLUDE_DIRECTORY + NAMES SGCTOpenVR.h + PATH_SUFFIXES SGCTOpenVR + PATHS ${OPENSPACE_EXT_DIR}/sgct/additional_includes/openvr + REQUIRED + ) endif () - end_header("Dependency: OpenVR") + else () + set(SGCT_OPENVR_FILES + ${SGCT_OPENVR_INCLUDE_DIRECTORY}/SGCTOpenVR.h + ${SGCT_OPENVR_INCLUDE_DIRECTORY}/SGCTOpenVR.cpp + ) + endif () + end_header("Dependency: OpenVR") endif() ##### # Spout ##### if (SGCT_SPOUT_SUPPORT AND NOT OPENSPACE_MODULE_SPOUT) - message(WARNING "Spout support from SGCT was requested, but OpenSpace Spout module was disabled") - message(STATUS "Enabling module as dependency") - set(OPENSPACE_MODULE_SPOUT ON CACHE BOOL "Build OPENSPACE_MODULE_SPOUTModule" FORCE) + message(WARNING "Spout support from SGCT was requested, but OpenSpace Spout module was disabled") + message(STATUS "Enabling module as dependency") + set(OPENSPACE_MODULE_SPOUT ON CACHE BOOL "Build OPENSPACE_MODULE_SPOUTModule" FORCE) endif () set(MACOSX_BUNDLE_ICON_FILE openspace.icns) create_new_application(OpenSpace - ${SGCT_OPENVR_FILES} - ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/openspace.rc - ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns + ${SGCT_OPENVR_FILES} + ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/openspace.rc + ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns ) set_source_files_properties( - ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns - PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" + ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns + PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" ) target_include_directories( - OpenSpace PRIVATE - ${OPENVR_INCLUDE_DIRS} - ${SGCT_OPENVR_INCLUDE_DIRECTORY} - ${SPOUT_INCLUDE_DIRS} + OpenSpace PRIVATE + ${OPENVR_INCLUDE_DIRS} + ${SGCT_OPENVR_INCLUDE_DIRECTORY} + ${SPOUT_INCLUDE_DIRS} ) target_link_libraries(OpenSpace openspace-core ${OPENVR_LIBRARY} ${SPOUT_LIBRARY}) target_compile_definitions(OpenSpace PRIVATE - ${SGCT_OPENVR_DEFINITIONS} - ${SPOUT_DEFINITIONS} + ${SGCT_OPENVR_DEFINITIONS} + ${SPOUT_DEFINITIONS} ) begin_header("Dependency: SGCT") @@ -111,22 +111,22 @@ set(JPEG_TURBO_WITH_SIMD OFF CACHE BOOL "" FORCE) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/sgct) target_include_directories(OpenSpace SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ext/sgct/include) target_link_libraries( - OpenSpace - sgct_light glew glfw png16_static quat tinyxml2static turbojpeg-static - vrpn - ${GLFW_LIBRARIES} + OpenSpace + sgct_light glew glfw png16_static quat tinyxml2static turbojpeg-static + vrpn ${GLFW_LIBRARIES} ) mark_as_advanced(EXECUTABLE_OUTPUT_PATH GLFW_BUILD_DOCS GLFW_BUILD_EXAMPLES - GLFW_BUILD_TESTS GLFW_INSTALL GLFW_USE_HYBRID_HPG GLFW_USE_OSMESA GLFW_VULKAN_STATIC - INSTALL_BIN_DIR INSTALL_INC_DIR INSTALL_LIB_DIR INSTALL_MAN_DIR INSTALL_PKGCONFIG_DIR - IOKIT_LIBRARY JPEG_TURBO_FORCE32bit JPEG_TURBO_WITH_12BIT JPEG_TURBO_WITH_ARITH_DEC - JPEG_TURBO_WITH_ARITH_ENC JPEG_TURBO_WITH_JPEG7 JPEG_TURBO_WITH_JPEG8 - JPEG_TURBO_WITH_MEM_SRCDST JPEG_TURBO_WITH_SIMD JPEG_TURBO_WITH_TURBOJPEG LIB_SUFFIX - LIBRARY_OUTPUT_PATH M_LIBRARY SGCT_BUILD_ALUT SGCT_BUILD_CSHARP_PROJECTS - SGCT_CUSTOMOUTPUTDIRS SGCT_DOXYGEN SGCT_DOXYGEN_QUIET SGCT_EXAMPLES SGCT_INSTALL - SGCT_LIGHT_ONLY SGCT_NO_EXTERNAL_LIBRARIES SGCT_SPOUT_SUPPORT SGCT_TEXT - SGCT_USE_MSVC_RUNTIMES USE_MSVC_RUNTIME_LIBRARY_DLL) + GLFW_BUILD_TESTS GLFW_INSTALL GLFW_USE_HYBRID_HPG GLFW_USE_OSMESA GLFW_VULKAN_STATIC + INSTALL_BIN_DIR INSTALL_INC_DIR INSTALL_LIB_DIR INSTALL_MAN_DIR INSTALL_PKGCONFIG_DIR + IOKIT_LIBRARY JPEG_TURBO_FORCE32bit JPEG_TURBO_WITH_12BIT JPEG_TURBO_WITH_ARITH_DEC + JPEG_TURBO_WITH_ARITH_ENC JPEG_TURBO_WITH_JPEG7 JPEG_TURBO_WITH_JPEG8 + JPEG_TURBO_WITH_MEM_SRCDST JPEG_TURBO_WITH_SIMD JPEG_TURBO_WITH_TURBOJPEG LIB_SUFFIX + LIBRARY_OUTPUT_PATH M_LIBRARY SGCT_BUILD_ALUT SGCT_BUILD_CSHARP_PROJECTS + SGCT_CUSTOMOUTPUTDIRS SGCT_DOXYGEN SGCT_DOXYGEN_QUIET SGCT_EXAMPLES SGCT_INSTALL + SGCT_LIGHT_ONLY SGCT_NO_EXTERNAL_LIBRARIES SGCT_SPOUT_SUPPORT SGCT_TEXT + SGCT_USE_MSVC_RUNTIMES USE_MSVC_RUNTIME_LIBRARY_DLL +) set_folder_location(sgct_light "External") set_folder_location(glew "External/SGCT") @@ -141,7 +141,7 @@ set_folder_location(zlibstatic "External/SGCT") set_folder_location(miniziplibstatic "External/SGCT") if (UNIX AND (NOT APPLE)) - target_link_libraries(OpenSpace Xcursor Xinerama X11) + target_link_libraries(OpenSpace Xcursor Xinerama X11) endif () end_header("Dependency: SGCT") @@ -151,27 +151,27 @@ end_header("Dependency: SGCT") # Why not put these in the module's path? Because they do not have access to the # target as of July 2017, which is needed. if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT) - # wanted by CEF - set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE") - - if (WIN32) - set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc) - endif () + # wanted by CEF + set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE") - # Add the CEF binary distribution's cmake/ directory to the module path and - # find CEF to initialize it properly. - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBBROWSER_MODULE_PATH}/cmake") - include(webbrowser_helpers) + if (WIN32) + set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc) + endif () - set_cef_targets("${CEF_ROOT}" OpenSpace) - run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}") + # Add the CEF binary distribution's cmake/ directory to the module path and + # find CEF to initialize it properly. + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBBROWSER_MODULE_PATH}/cmake") + include(webbrowser_helpers) + + set_cef_targets("${CEF_ROOT}" OpenSpace) + run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}") elseif (OPENSPACE_MODULE_WEBBROWSER) - message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.") + message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.") endif () if (MSVC) - begin_header("Dependency: Dbghelp") - # This library is used for being able to output the callstack if an exception escapes - target_link_libraries(OpenSpace Dbghelp.lib) - end_header() + begin_header("Dependency: Dbghelp") + # This library is used for being able to output the callstack if an exception escapes + target_link_libraries(OpenSpace Dbghelp.lib) + end_header() endif () diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp index 57484252fc..60bfc6c299 100644 --- a/apps/OpenSpace/main.cpp +++ b/apps/OpenSpace/main.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/apps/Sync/CMakeLists.txt b/apps/Sync/CMakeLists.txt index 9c5d883745..70f604042f 100644 --- a/apps/Sync/CMakeLists.txt +++ b/apps/Sync/CMakeLists.txt @@ -25,16 +25,16 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/application_definition.cmake) set_source_files_properties( - ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns - PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" + ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns + PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" ) set(MACOSX_BUNDLE_ICON_FILE openspace.icns) create_new_application(Sync MACOSX_BUNDLE - ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/openspace.rc - ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns + ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/openspace.rc + ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns ) target_link_libraries(Sync openspace-core) @@ -43,20 +43,20 @@ target_link_libraries(Sync openspace-core) # Why not put these in the module's path? Because they do not have access to the # target as of July 2017, which is needed. if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT) - # wanted by CEF - set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE") + # wanted by CEF + set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE") - if (WIN32) - set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc) - endif () + if (WIN32) + set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc) + endif () - # Add the CEF binary distribution's cmake/ directory to the module path and - # find CEF to initialize it properly. - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBBROWSER_MODULE_PATH}/cmake") - include(webbrowser_helpers) + # Add the CEF binary distribution's cmake/ directory to the module path and + # find CEF to initialize it properly. + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBBROWSER_MODULE_PATH}/cmake") + include(webbrowser_helpers) - set_cef_targets("${CEF_ROOT}" Sync) - run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}") + set_cef_targets("${CEF_ROOT}" Sync) + run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}") elseif (OPENSPACE_MODULE_WEBBROWSER) - message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.") + message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.") endif () diff --git a/apps/Sync/main.cpp b/apps/Sync/main.cpp index 9b38745161..8661f900af 100644 --- a/apps/Sync/main.cpp +++ b/apps/Sync/main.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/apps/TaskRunner/CMakeLists.txt b/apps/TaskRunner/CMakeLists.txt index 6845978ac2..213099071a 100644 --- a/apps/TaskRunner/CMakeLists.txt +++ b/apps/TaskRunner/CMakeLists.txt @@ -25,16 +25,16 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/application_definition.cmake) set_source_files_properties( - ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns - PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" + ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns + PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" ) set(MACOSX_BUNDLE_ICON_FILE openspace.icns) create_new_application(TaskRunner MACOSX_BUNDLE - ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/openspace.rc - ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns + ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/openspace.rc + ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns ) target_link_libraries(TaskRunner openspace-core) @@ -43,20 +43,20 @@ target_link_libraries(TaskRunner openspace-core) # Why not put these in the module's path? Because they do not have access to the # target as of July 2017, which is needed. if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT) - # wanted by CEF - set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE") + # wanted by CEF + set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE") - if (WIN32) - set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc) - endif () + if (WIN32) + set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc) + endif () - # Add the CEF binary distribution's cmake/ directory to the module path and - # find CEF to initialize it properly. - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBBROWSER_MODULE_PATH}/cmake") - include(webbrowser_helpers) + # Add the CEF binary distribution's cmake/ directory to the module path and + # find CEF to initialize it properly. + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBBROWSER_MODULE_PATH}/cmake") + include(webbrowser_helpers) - set_cef_targets("${CEF_ROOT}" TaskRunner) - run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}") + set_cef_targets("${CEF_ROOT}" TaskRunner) + run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}") elseif (OPENSPACE_MODULE_WEBBROWSER) - message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.") + message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.") endif () diff --git a/apps/TaskRunner/main.cpp b/apps/TaskRunner/main.cpp index fe6f1ce3da..c7b89253c5 100644 --- a/apps/TaskRunner/main.cpp +++ b/apps/TaskRunner/main.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/apps/TimelineView/CMakeLists.txt b/apps/TimelineView/CMakeLists.txt index a4e0bf7705..0d38b6412d 100644 --- a/apps/TimelineView/CMakeLists.txt +++ b/apps/TimelineView/CMakeLists.txt @@ -28,20 +28,21 @@ set(APPLICATION_NAME TimelineView) set(APPLICATION_LINK_TO_OPENSPACE OFF) set(SOURCE_FILES - ${OPENSPACE_APPS_DIR}/TimelineView/main.cpp - ${OPENSPACE_APPS_DIR}/TimelineView/mainwindow.cpp - ${OPENSPACE_APPS_DIR}/TimelineView/configurationwidget.cpp - ${OPENSPACE_APPS_DIR}/TimelineView/informationwidget.cpp - ${OPENSPACE_APPS_DIR}/TimelineView/controlwidget.cpp - ${OPENSPACE_APPS_DIR}/TimelineView/timelinewidget.cpp + ${OPENSPACE_APPS_DIR}/TimelineView/main.cpp + ${OPENSPACE_APPS_DIR}/TimelineView/mainwindow.cpp + ${OPENSPACE_APPS_DIR}/TimelineView/configurationwidget.cpp + ${OPENSPACE_APPS_DIR}/TimelineView/informationwidget.cpp + ${OPENSPACE_APPS_DIR}/TimelineView/controlwidget.cpp + ${OPENSPACE_APPS_DIR}/TimelineView/timelinewidget.cpp ) set(HEADER_FILES - ${OPENSPACE_APPS_DIR}/TimelineView/mainwindow.h - ${OPENSPACE_APPS_DIR}/TimelineView/configurationwidget.h - ${OPENSPACE_APPS_DIR}/TimelineView/informationwidget.h - ${OPENSPACE_APPS_DIR}/TimelineView/controlwidget.h - ${OPENSPACE_APPS_DIR}/TimelineView/timelinewidget.h + ${OPENSPACE_APPS_DIR}/TimelineView/mainwindow.h + ${OPENSPACE_APPS_DIR}/TimelineView/configurationwidget.h + ${OPENSPACE_APPS_DIR}/TimelineView/controlwidget.h + ${OPENSPACE_APPS_DIR}/TimelineView/informationwidget.h + ${OPENSPACE_APPS_DIR}/TimelineView/mainwindow.h + ${OPENSPACE_APPS_DIR}/TimelineView/timelinewidget.h ) find_package(Qt5Widgets) @@ -52,10 +53,7 @@ qt5_wrap_cpp(MOC_FILES ${HEADER_FILES}) create_new_application(${APPLICATION_NAME} MACOSX_BUNDLE ${SOURCE_FILES} ${HEADER_FILES} ${MOC_FILES}) -target_link_libraries(${APPLICATION_NAME} - Qt5::Widgets - Qt5::Network -) +target_link_libraries(${APPLICATION_NAME} Qt5::Widgets Qt5::Network) #if (APPLE) # INSTALL(CODE " diff --git a/apps/TimelineView/common.h b/apps/TimelineView/common.h index bed9b80006..e10eb25822 100644 --- a/apps/TimelineView/common.h +++ b/apps/TimelineView/common.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/apps/TimelineView/configurationwidget.cpp b/apps/TimelineView/configurationwidget.cpp index f96e29ad39..d7833c6125 100644 --- a/apps/TimelineView/configurationwidget.cpp +++ b/apps/TimelineView/configurationwidget.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/apps/TimelineView/configurationwidget.h b/apps/TimelineView/configurationwidget.h index ecb20046e3..23e3600daa 100644 --- a/apps/TimelineView/configurationwidget.h +++ b/apps/TimelineView/configurationwidget.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/apps/TimelineView/controlwidget.cpp b/apps/TimelineView/controlwidget.cpp index e25da89769..29125e8752 100644 --- a/apps/TimelineView/controlwidget.cpp +++ b/apps/TimelineView/controlwidget.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/apps/TimelineView/controlwidget.h b/apps/TimelineView/controlwidget.h index 571142aa7b..7d0017a28b 100644 --- a/apps/TimelineView/controlwidget.h +++ b/apps/TimelineView/controlwidget.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/apps/TimelineView/informationwidget.cpp b/apps/TimelineView/informationwidget.cpp index 0965f3d23f..f866ad1b28 100644 --- a/apps/TimelineView/informationwidget.cpp +++ b/apps/TimelineView/informationwidget.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/apps/TimelineView/informationwidget.h b/apps/TimelineView/informationwidget.h index 4826946424..a19ee41fb8 100644 --- a/apps/TimelineView/informationwidget.h +++ b/apps/TimelineView/informationwidget.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/apps/TimelineView/main.cpp b/apps/TimelineView/main.cpp index 72cab84afa..79bd875cec 100644 --- a/apps/TimelineView/main.cpp +++ b/apps/TimelineView/main.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/apps/TimelineView/mainwindow.cpp b/apps/TimelineView/mainwindow.cpp index cb32a185ec..e7241f80a2 100644 --- a/apps/TimelineView/mainwindow.cpp +++ b/apps/TimelineView/mainwindow.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/apps/TimelineView/mainwindow.h b/apps/TimelineView/mainwindow.h index 94f5a1d362..550c075bee 100644 --- a/apps/TimelineView/mainwindow.h +++ b/apps/TimelineView/mainwindow.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/apps/TimelineView/timelinewidget.cpp b/apps/TimelineView/timelinewidget.cpp index 9716999482..f529663eb1 100644 --- a/apps/TimelineView/timelinewidget.cpp +++ b/apps/TimelineView/timelinewidget.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/apps/TimelineView/timelinewidget.h b/apps/TimelineView/timelinewidget.h index 5e2745ac6c..e5fcc440c0 100644 --- a/apps/TimelineView/timelinewidget.h +++ b/apps/TimelineView/timelinewidget.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/apps/Wormhole/CMakeLists.txt b/apps/Wormhole/CMakeLists.txt index a3c27dd29b..0a919ab4f6 100644 --- a/apps/Wormhole/CMakeLists.txt +++ b/apps/Wormhole/CMakeLists.txt @@ -25,18 +25,17 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/application_definition.cmake) set_source_files_properties( - ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns - PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" + ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns + PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" ) set(MACOSX_BUNDLE_ICON_FILE openspace.icns) create_new_application( - Wormhole - MACOSX_BUNDLE - ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/openspace.rc - ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns + Wormhole MACOSX_BUNDLE + ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/openspace.rc + ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns ) target_link_libraries(Wormhole openspace-core) @@ -45,20 +44,20 @@ target_link_libraries(Wormhole openspace-core) # Why not put these in the module's path? Because they do not have access to the # target as of July 2017, which is needed. if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT) - # wanted by CEF - set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE") + # wanted by CEF + set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE") - if (WIN32) - set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc) - endif () + if (WIN32) + set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc) + endif () - # Add the CEF binary distribution's cmake/ directory to the module path and - # find CEF to initialize it properly. - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBBROWSER_MODULE_PATH}/cmake") - include(webbrowser_helpers) + # Add the CEF binary distribution's cmake/ directory to the module path and + # find CEF to initialize it properly. + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBBROWSER_MODULE_PATH}/cmake") + include(webbrowser_helpers) - set_cef_targets("${CEF_ROOT}" Wormhole) - run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}") + set_cef_targets("${CEF_ROOT}" Wormhole) + run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}") elseif (OPENSPACE_MODULE_WEBBROWSER) - message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.") + message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.") endif () diff --git a/apps/Wormhole/main.cpp b/apps/Wormhole/main.cpp index 0e948ceb54..029ee407cb 100644 --- a/apps/Wormhole/main.cpp +++ b/apps/Wormhole/main.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/ext/ghoul b/ext/ghoul index a257709d73..509141a049 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit a257709d73c9f6ff5b9af538b3eb71bc0e8bb4d3 +Subproject commit 509141a04937e5cf0adc879e59129ac1322b76c8 diff --git a/include/openspace/documentation/core_registration.h b/include/openspace/documentation/core_registration.h index 4ec44a8461..a433bfd517 100644 --- a/include/openspace/documentation/core_registration.h +++ b/include/openspace/documentation/core_registration.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/documentation/documentation.h b/include/openspace/documentation/documentation.h index 725a446fca..089e19d776 100644 --- a/include/openspace/documentation/documentation.h +++ b/include/openspace/documentation/documentation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h index d3f9639616..c0d6d6d7ee 100644 --- a/include/openspace/documentation/documentationengine.h +++ b/include/openspace/documentation/documentationengine.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/documentation/documentationgenerator.h b/include/openspace/documentation/documentationgenerator.h index 5d5572f740..92fd1cd910 100644 --- a/include/openspace/documentation/documentationgenerator.h +++ b/include/openspace/documentation/documentationgenerator.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/documentation/verifier.h b/include/openspace/documentation/verifier.h index bf832aae37..07b6194d77 100644 --- a/include/openspace/documentation/verifier.h +++ b/include/openspace/documentation/verifier.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/documentation/verifier.inl b/include/openspace/documentation/verifier.inl index 60e591a5bc..c0863127b5 100644 --- a/include/openspace/documentation/verifier.inl +++ b/include/openspace/documentation/verifier.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h index ce47681226..7868fd9db4 100644 --- a/include/openspace/engine/configuration.h +++ b/include/openspace/engine/configuration.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/engine/downloadmanager.h b/include/openspace/engine/downloadmanager.h index 36e21950c9..8e5e02483e 100644 --- a/include/openspace/engine/downloadmanager.h +++ b/include/openspace/engine/downloadmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/engine/globals.h b/include/openspace/engine/globals.h index 0cb2327489..9d55621446 100644 --- a/include/openspace/engine/globals.h +++ b/include/openspace/engine/globals.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/engine/globalscallbacks.h b/include/openspace/engine/globalscallbacks.h index 414a7c471b..99ed78b1d4 100644 --- a/include/openspace/engine/globalscallbacks.h +++ b/include/openspace/engine/globalscallbacks.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/engine/logfactory.h b/include/openspace/engine/logfactory.h index e76b749ee3..d596e1d88a 100644 --- a/include/openspace/engine/logfactory.h +++ b/include/openspace/engine/logfactory.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/engine/moduleengine.h b/include/openspace/engine/moduleengine.h index a5663130c8..06ebd45c07 100644 --- a/include/openspace/engine/moduleengine.h +++ b/include/openspace/engine/moduleengine.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/engine/moduleengine.inl b/include/openspace/engine/moduleengine.inl index e2f734332e..45b10014d6 100644 --- a/include/openspace/engine/moduleengine.inl +++ b/include/openspace/engine/moduleengine.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h index f9c9c9a204..35beace12d 100644 --- a/include/openspace/engine/openspaceengine.h +++ b/include/openspace/engine/openspaceengine.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/engine/syncengine.h b/include/openspace/engine/syncengine.h index 93f6677405..49934315fc 100644 --- a/include/openspace/engine/syncengine.h +++ b/include/openspace/engine/syncengine.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/engine/virtualpropertymanager.h b/include/openspace/engine/virtualpropertymanager.h index 7cc74f80f1..d7479a6ffb 100644 --- a/include/openspace/engine/virtualpropertymanager.h +++ b/include/openspace/engine/virtualpropertymanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/engine/windowdelegate.h b/include/openspace/engine/windowdelegate.h index d1d463c20e..89f3f46d31 100644 --- a/include/openspace/engine/windowdelegate.h +++ b/include/openspace/engine/windowdelegate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/camerainteractionstates.h b/include/openspace/interaction/camerainteractionstates.h index d0364f9652..edf5e9614f 100644 --- a/include/openspace/interaction/camerainteractionstates.h +++ b/include/openspace/interaction/camerainteractionstates.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/delayedvariable.h b/include/openspace/interaction/delayedvariable.h index dab326c01b..88dbb6938c 100644 --- a/include/openspace/interaction/delayedvariable.h +++ b/include/openspace/interaction/delayedvariable.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/delayedvariable.inl b/include/openspace/interaction/delayedvariable.inl index ef6352ead8..cbd32d63da 100644 --- a/include/openspace/interaction/delayedvariable.inl +++ b/include/openspace/interaction/delayedvariable.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/externinteraction.h b/include/openspace/interaction/externinteraction.h index 32238f4fc2..6d9c10af36 100644 --- a/include/openspace/interaction/externinteraction.h +++ b/include/openspace/interaction/externinteraction.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/inputdevicestates.h b/include/openspace/interaction/inputdevicestates.h index 41f5c6e4f1..46b200181d 100644 --- a/include/openspace/interaction/inputdevicestates.h +++ b/include/openspace/interaction/inputdevicestates.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/inputstate.h b/include/openspace/interaction/inputstate.h index 4c91dd5e86..3442e47866 100644 --- a/include/openspace/interaction/inputstate.h +++ b/include/openspace/interaction/inputstate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/interpolator.h b/include/openspace/interaction/interpolator.h index d9ef5825e8..b2f79a9e55 100644 --- a/include/openspace/interaction/interpolator.h +++ b/include/openspace/interaction/interpolator.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/interpolator.inl b/include/openspace/interaction/interpolator.inl index 8c1de633e8..d17741ea96 100644 --- a/include/openspace/interaction/interpolator.inl +++ b/include/openspace/interaction/interpolator.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/joystickcamerastates.h b/include/openspace/interaction/joystickcamerastates.h index a9ebf23514..965d0e16e6 100644 --- a/include/openspace/interaction/joystickcamerastates.h +++ b/include/openspace/interaction/joystickcamerastates.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/joystickinputstate.h b/include/openspace/interaction/joystickinputstate.h index 099ac75400..1a1b2a07ad 100644 --- a/include/openspace/interaction/joystickinputstate.h +++ b/include/openspace/interaction/joystickinputstate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/keybindingmanager.h b/include/openspace/interaction/keybindingmanager.h index 0da24f860c..967f2c0f2e 100644 --- a/include/openspace/interaction/keybindingmanager.h +++ b/include/openspace/interaction/keybindingmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/keyframenavigator.h b/include/openspace/interaction/keyframenavigator.h index 7818881429..a241815c2c 100644 --- a/include/openspace/interaction/keyframenavigator.h +++ b/include/openspace/interaction/keyframenavigator.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/mousecamerastates.h b/include/openspace/interaction/mousecamerastates.h index 6e45af34df..bd2917dec5 100644 --- a/include/openspace/interaction/mousecamerastates.h +++ b/include/openspace/interaction/mousecamerastates.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/navigationhandler.h b/include/openspace/interaction/navigationhandler.h index f4de2d21ca..3ab99cd0e9 100644 --- a/include/openspace/interaction/navigationhandler.h +++ b/include/openspace/interaction/navigationhandler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/orbitalnavigator.h b/include/openspace/interaction/orbitalnavigator.h index b625dd68d0..2182b0890d 100644 --- a/include/openspace/interaction/orbitalnavigator.h +++ b/include/openspace/interaction/orbitalnavigator.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/sessionrecording.h b/include/openspace/interaction/sessionrecording.h index a89bf2e618..ce56e4a0bf 100644 --- a/include/openspace/interaction/sessionrecording.h +++ b/include/openspace/interaction/sessionrecording.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/sessionrecording.inl b/include/openspace/interaction/sessionrecording.inl index 70fef838fa..c26f12df88 100644 --- a/include/openspace/interaction/sessionrecording.inl +++ b/include/openspace/interaction/sessionrecording.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/shortcutmanager.h b/include/openspace/interaction/shortcutmanager.h index e918530966..e08f4c708f 100644 --- a/include/openspace/interaction/shortcutmanager.h +++ b/include/openspace/interaction/shortcutmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/interaction/touchbar.h b/include/openspace/interaction/touchbar.h index 7020475891..beae46641d 100644 --- a/include/openspace/interaction/touchbar.h +++ b/include/openspace/interaction/touchbar.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/json.h b/include/openspace/json.h index 4af4d7a02e..5acf454641 100644 --- a/include/openspace/json.h +++ b/include/openspace/json.h @@ -1,9 +1,8 @@ /***************************************************************************************** * * - * GHOUL * - * General Helpful Open Utility Library * + * OpenSpace * * * - * Copyright (c) 2012-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/mission/mission.h b/include/openspace/mission/mission.h index c0568a189d..0cd8b73974 100644 --- a/include/openspace/mission/mission.h +++ b/include/openspace/mission/mission.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/mission/missionmanager.h b/include/openspace/mission/missionmanager.h index fa7f60e711..4be9762d74 100644 --- a/include/openspace/mission/missionmanager.h +++ b/include/openspace/mission/missionmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/network/messagestructures.h b/include/openspace/network/messagestructures.h index 3d8b05cb90..d1e60f7bb3 100644 --- a/include/openspace/network/messagestructures.h +++ b/include/openspace/network/messagestructures.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/network/networkengine.h b/include/openspace/network/networkengine.h index ab411b4c9d..1e0d774760 100644 --- a/include/openspace/network/networkengine.h +++ b/include/openspace/network/networkengine.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/network/parallelconnection.h b/include/openspace/network/parallelconnection.h index 8ffde33598..bffa3c9626 100644 --- a/include/openspace/network/parallelconnection.h +++ b/include/openspace/network/parallelconnection.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/network/parallelpeer.h b/include/openspace/network/parallelpeer.h index 5a028a2d1a..b34d4bcea2 100644 --- a/include/openspace/network/parallelpeer.h +++ b/include/openspace/network/parallelpeer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/network/parallelserver.h b/include/openspace/network/parallelserver.h index 7f5d83a3f6..6cf0b1b1f5 100644 --- a/include/openspace/network/parallelserver.h +++ b/include/openspace/network/parallelserver.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/performance/performancelayout.h b/include/openspace/performance/performancelayout.h index b31540134f..7eb6b69f1c 100644 --- a/include/openspace/performance/performancelayout.h +++ b/include/openspace/performance/performancelayout.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/performance/performancemanager.h b/include/openspace/performance/performancemanager.h index c0eca8f6a7..86ffc9dd92 100644 --- a/include/openspace/performance/performancemanager.h +++ b/include/openspace/performance/performancemanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/performance/performancemeasurement.h b/include/openspace/performance/performancemeasurement.h index c0f1dfa9c4..0c762449d1 100644 --- a/include/openspace/performance/performancemeasurement.h +++ b/include/openspace/performance/performancemeasurement.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/binaryproperty.h b/include/openspace/properties/binaryproperty.h index 443216c6c3..84a684bf98 100644 --- a/include/openspace/properties/binaryproperty.h +++ b/include/openspace/properties/binaryproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/dmat2property.h b/include/openspace/properties/matrix/dmat2property.h index ee54db9469..2b11e012dc 100644 --- a/include/openspace/properties/matrix/dmat2property.h +++ b/include/openspace/properties/matrix/dmat2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/dmat2x3property.h b/include/openspace/properties/matrix/dmat2x3property.h index 6fbf13b9ea..9fdeee4f7d 100644 --- a/include/openspace/properties/matrix/dmat2x3property.h +++ b/include/openspace/properties/matrix/dmat2x3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/dmat2x4property.h b/include/openspace/properties/matrix/dmat2x4property.h index 0df2ff57cf..310234a21d 100644 --- a/include/openspace/properties/matrix/dmat2x4property.h +++ b/include/openspace/properties/matrix/dmat2x4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/dmat3property.h b/include/openspace/properties/matrix/dmat3property.h index 47c7140c0c..1f355bc91f 100644 --- a/include/openspace/properties/matrix/dmat3property.h +++ b/include/openspace/properties/matrix/dmat3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/dmat3x2property.h b/include/openspace/properties/matrix/dmat3x2property.h index c2298a831d..406114d809 100644 --- a/include/openspace/properties/matrix/dmat3x2property.h +++ b/include/openspace/properties/matrix/dmat3x2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/dmat3x4property.h b/include/openspace/properties/matrix/dmat3x4property.h index d55e126afd..450c075702 100644 --- a/include/openspace/properties/matrix/dmat3x4property.h +++ b/include/openspace/properties/matrix/dmat3x4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/dmat4property.h b/include/openspace/properties/matrix/dmat4property.h index 0d606a4f7a..9c93bda9e9 100644 --- a/include/openspace/properties/matrix/dmat4property.h +++ b/include/openspace/properties/matrix/dmat4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/dmat4x2property.h b/include/openspace/properties/matrix/dmat4x2property.h index 016024f8fd..ac4a421f5c 100644 --- a/include/openspace/properties/matrix/dmat4x2property.h +++ b/include/openspace/properties/matrix/dmat4x2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/dmat4x3property.h b/include/openspace/properties/matrix/dmat4x3property.h index 934dbbdc8e..66cd49f667 100644 --- a/include/openspace/properties/matrix/dmat4x3property.h +++ b/include/openspace/properties/matrix/dmat4x3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/mat2property.h b/include/openspace/properties/matrix/mat2property.h index b41b84b059..cc8bb9254d 100644 --- a/include/openspace/properties/matrix/mat2property.h +++ b/include/openspace/properties/matrix/mat2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/mat2x3property.h b/include/openspace/properties/matrix/mat2x3property.h index edb18e0e60..dc51ae3b95 100644 --- a/include/openspace/properties/matrix/mat2x3property.h +++ b/include/openspace/properties/matrix/mat2x3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/mat2x4property.h b/include/openspace/properties/matrix/mat2x4property.h index ba201d0ae2..79a0ebca3b 100644 --- a/include/openspace/properties/matrix/mat2x4property.h +++ b/include/openspace/properties/matrix/mat2x4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/mat3property.h b/include/openspace/properties/matrix/mat3property.h index 2d95590c31..1dfccfcad9 100644 --- a/include/openspace/properties/matrix/mat3property.h +++ b/include/openspace/properties/matrix/mat3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/mat3x2property.h b/include/openspace/properties/matrix/mat3x2property.h index a25d9b8da9..63d8f35e97 100644 --- a/include/openspace/properties/matrix/mat3x2property.h +++ b/include/openspace/properties/matrix/mat3x2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/mat3x4property.h b/include/openspace/properties/matrix/mat3x4property.h index bdef63d29c..0e86c22fcb 100644 --- a/include/openspace/properties/matrix/mat3x4property.h +++ b/include/openspace/properties/matrix/mat3x4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/mat4property.h b/include/openspace/properties/matrix/mat4property.h index ebd1ad84dd..28467cae7c 100644 --- a/include/openspace/properties/matrix/mat4property.h +++ b/include/openspace/properties/matrix/mat4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/mat4x2property.h b/include/openspace/properties/matrix/mat4x2property.h index 2d176f3342..dda6c83965 100644 --- a/include/openspace/properties/matrix/mat4x2property.h +++ b/include/openspace/properties/matrix/mat4x2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/matrix/mat4x3property.h b/include/openspace/properties/matrix/mat4x3property.h index ea3462e7d0..c624b67c50 100644 --- a/include/openspace/properties/matrix/mat4x3property.h +++ b/include/openspace/properties/matrix/mat4x3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/numericalproperty.h b/include/openspace/properties/numericalproperty.h index fb6c75d271..046658143e 100644 --- a/include/openspace/properties/numericalproperty.h +++ b/include/openspace/properties/numericalproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/numericalproperty.inl b/include/openspace/properties/numericalproperty.inl index 4a6554aac1..186b493126 100644 --- a/include/openspace/properties/numericalproperty.inl +++ b/include/openspace/properties/numericalproperty.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/optionproperty.h b/include/openspace/properties/optionproperty.h index a9d90332c2..25c13c77ff 100644 --- a/include/openspace/properties/optionproperty.h +++ b/include/openspace/properties/optionproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/property.h b/include/openspace/properties/property.h index 0c6e15aace..6d7bbc3d3f 100644 --- a/include/openspace/properties/property.h +++ b/include/openspace/properties/property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/propertydelegate.h b/include/openspace/properties/propertydelegate.h index 74cde6614f..4af67d8723 100644 --- a/include/openspace/properties/propertydelegate.h +++ b/include/openspace/properties/propertydelegate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/propertydelegate.inl b/include/openspace/properties/propertydelegate.inl index 3071470c1e..11ddd9d8d1 100644 --- a/include/openspace/properties/propertydelegate.inl +++ b/include/openspace/properties/propertydelegate.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/propertyowner.h b/include/openspace/properties/propertyowner.h index 8a5a8f7d6e..47d1c0ae93 100644 --- a/include/openspace/properties/propertyowner.h +++ b/include/openspace/properties/propertyowner.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/scalar/boolproperty.h b/include/openspace/properties/scalar/boolproperty.h index 3fac9004c1..16428bf95d 100644 --- a/include/openspace/properties/scalar/boolproperty.h +++ b/include/openspace/properties/scalar/boolproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/scalar/charproperty.h b/include/openspace/properties/scalar/charproperty.h index fc5e622aa3..4bf7e3b6e2 100644 --- a/include/openspace/properties/scalar/charproperty.h +++ b/include/openspace/properties/scalar/charproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/scalar/doubleproperty.h b/include/openspace/properties/scalar/doubleproperty.h index bb245ee522..bbb38258c1 100644 --- a/include/openspace/properties/scalar/doubleproperty.h +++ b/include/openspace/properties/scalar/doubleproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/scalar/floatproperty.h b/include/openspace/properties/scalar/floatproperty.h index b9ffbabdad..3b06e60d9e 100644 --- a/include/openspace/properties/scalar/floatproperty.h +++ b/include/openspace/properties/scalar/floatproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/scalar/intproperty.h b/include/openspace/properties/scalar/intproperty.h index b638be49ba..48e16324fb 100644 --- a/include/openspace/properties/scalar/intproperty.h +++ b/include/openspace/properties/scalar/intproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/scalar/longdoubleproperty.h b/include/openspace/properties/scalar/longdoubleproperty.h index da7c272b98..c842da0da9 100644 --- a/include/openspace/properties/scalar/longdoubleproperty.h +++ b/include/openspace/properties/scalar/longdoubleproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/scalar/longlongproperty.h b/include/openspace/properties/scalar/longlongproperty.h index 37177a4264..5853792f30 100644 --- a/include/openspace/properties/scalar/longlongproperty.h +++ b/include/openspace/properties/scalar/longlongproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/scalar/longproperty.h b/include/openspace/properties/scalar/longproperty.h index 1201c749f5..f328f8a6eb 100644 --- a/include/openspace/properties/scalar/longproperty.h +++ b/include/openspace/properties/scalar/longproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/scalar/shortproperty.h b/include/openspace/properties/scalar/shortproperty.h index aefcaa95cf..1d332900d2 100644 --- a/include/openspace/properties/scalar/shortproperty.h +++ b/include/openspace/properties/scalar/shortproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/scalar/signedcharproperty.h b/include/openspace/properties/scalar/signedcharproperty.h index 0f652064e1..667ba9bf62 100644 --- a/include/openspace/properties/scalar/signedcharproperty.h +++ b/include/openspace/properties/scalar/signedcharproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/scalar/ucharproperty.h b/include/openspace/properties/scalar/ucharproperty.h index c7aaaf9b35..5cdcd1f2d5 100644 --- a/include/openspace/properties/scalar/ucharproperty.h +++ b/include/openspace/properties/scalar/ucharproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/scalar/uintproperty.h b/include/openspace/properties/scalar/uintproperty.h index 846bd4d071..bc6865ab4f 100644 --- a/include/openspace/properties/scalar/uintproperty.h +++ b/include/openspace/properties/scalar/uintproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/scalar/ulonglongproperty.h b/include/openspace/properties/scalar/ulonglongproperty.h index 81a542a91c..dcb638550a 100644 --- a/include/openspace/properties/scalar/ulonglongproperty.h +++ b/include/openspace/properties/scalar/ulonglongproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/scalar/ulongproperty.h b/include/openspace/properties/scalar/ulongproperty.h index 1305adf9b5..e9667ce0f7 100644 --- a/include/openspace/properties/scalar/ulongproperty.h +++ b/include/openspace/properties/scalar/ulongproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/scalar/ushortproperty.h b/include/openspace/properties/scalar/ushortproperty.h index 695152c6ac..861e855dc2 100644 --- a/include/openspace/properties/scalar/ushortproperty.h +++ b/include/openspace/properties/scalar/ushortproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/scalar/wcharproperty.h b/include/openspace/properties/scalar/wcharproperty.h index f484a4034a..07bc68ef76 100644 --- a/include/openspace/properties/scalar/wcharproperty.h +++ b/include/openspace/properties/scalar/wcharproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/selectionproperty.h b/include/openspace/properties/selectionproperty.h index 5350dcc4e7..f0ea9f0eaf 100644 --- a/include/openspace/properties/selectionproperty.h +++ b/include/openspace/properties/selectionproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/stringlistproperty.h b/include/openspace/properties/stringlistproperty.h index 37a34c5206..98a38e0617 100644 --- a/include/openspace/properties/stringlistproperty.h +++ b/include/openspace/properties/stringlistproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/stringproperty.h b/include/openspace/properties/stringproperty.h index 05b7438256..d3e12051b5 100644 --- a/include/openspace/properties/stringproperty.h +++ b/include/openspace/properties/stringproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/templateproperty.h b/include/openspace/properties/templateproperty.h index 5ec246b627..f04af496d3 100644 --- a/include/openspace/properties/templateproperty.h +++ b/include/openspace/properties/templateproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/templateproperty.inl b/include/openspace/properties/templateproperty.inl index f75984141f..72d92843b2 100644 --- a/include/openspace/properties/templateproperty.inl +++ b/include/openspace/properties/templateproperty.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/triggerproperty.h b/include/openspace/properties/triggerproperty.h index a7d619cc53..485564e9aa 100644 --- a/include/openspace/properties/triggerproperty.h +++ b/include/openspace/properties/triggerproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/vector/bvec2property.h b/include/openspace/properties/vector/bvec2property.h index 0de18ee23e..bdc158a4fc 100644 --- a/include/openspace/properties/vector/bvec2property.h +++ b/include/openspace/properties/vector/bvec2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/vector/bvec3property.h b/include/openspace/properties/vector/bvec3property.h index 1cf918a8e1..724bf1cce4 100644 --- a/include/openspace/properties/vector/bvec3property.h +++ b/include/openspace/properties/vector/bvec3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/vector/bvec4property.h b/include/openspace/properties/vector/bvec4property.h index d7af8bd2f0..4958f4889e 100644 --- a/include/openspace/properties/vector/bvec4property.h +++ b/include/openspace/properties/vector/bvec4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/vector/dvec2property.h b/include/openspace/properties/vector/dvec2property.h index 7a4998df5d..20385dda18 100644 --- a/include/openspace/properties/vector/dvec2property.h +++ b/include/openspace/properties/vector/dvec2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/vector/dvec3property.h b/include/openspace/properties/vector/dvec3property.h index ab283b5beb..7adff33d3e 100644 --- a/include/openspace/properties/vector/dvec3property.h +++ b/include/openspace/properties/vector/dvec3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/vector/dvec4property.h b/include/openspace/properties/vector/dvec4property.h index 3c03a71048..2784a3899f 100644 --- a/include/openspace/properties/vector/dvec4property.h +++ b/include/openspace/properties/vector/dvec4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/vector/ivec2property.h b/include/openspace/properties/vector/ivec2property.h index a4169b70c6..2a02500f04 100644 --- a/include/openspace/properties/vector/ivec2property.h +++ b/include/openspace/properties/vector/ivec2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/vector/ivec3property.h b/include/openspace/properties/vector/ivec3property.h index 9e6ee7c752..b652fe8f68 100644 --- a/include/openspace/properties/vector/ivec3property.h +++ b/include/openspace/properties/vector/ivec3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/vector/ivec4property.h b/include/openspace/properties/vector/ivec4property.h index f577e41e5d..cca0031147 100644 --- a/include/openspace/properties/vector/ivec4property.h +++ b/include/openspace/properties/vector/ivec4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/vector/uvec2property.h b/include/openspace/properties/vector/uvec2property.h index 460db28f0b..3acaeb9df7 100644 --- a/include/openspace/properties/vector/uvec2property.h +++ b/include/openspace/properties/vector/uvec2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/vector/uvec3property.h b/include/openspace/properties/vector/uvec3property.h index d835a518a1..724b1f2723 100644 --- a/include/openspace/properties/vector/uvec3property.h +++ b/include/openspace/properties/vector/uvec3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/vector/uvec4property.h b/include/openspace/properties/vector/uvec4property.h index 9c6e0644da..4b7ff01146 100644 --- a/include/openspace/properties/vector/uvec4property.h +++ b/include/openspace/properties/vector/uvec4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/vector/vec2property.h b/include/openspace/properties/vector/vec2property.h index 48b9c08654..c58f47d36c 100644 --- a/include/openspace/properties/vector/vec2property.h +++ b/include/openspace/properties/vector/vec2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/vector/vec3property.h b/include/openspace/properties/vector/vec3property.h index 877506c158..b36779c70a 100644 --- a/include/openspace/properties/vector/vec3property.h +++ b/include/openspace/properties/vector/vec3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/properties/vector/vec4property.h b/include/openspace/properties/vector/vec4property.h index 190ce70117..09e429483c 100644 --- a/include/openspace/properties/vector/vec4property.h +++ b/include/openspace/properties/vector/vec4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/query/query.h b/include/openspace/query/query.h index 7680e86f3d..a9584485af 100644 --- a/include/openspace/query/query.h +++ b/include/openspace/query/query.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/abufferrenderer.h b/include/openspace/rendering/abufferrenderer.h index ae799eb4b3..b160cfcedb 100644 --- a/include/openspace/rendering/abufferrenderer.h +++ b/include/openspace/rendering/abufferrenderer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/dashboard.h b/include/openspace/rendering/dashboard.h index a908ce5fe9..9101721805 100644 --- a/include/openspace/rendering/dashboard.h +++ b/include/openspace/rendering/dashboard.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/dashboarditem.h b/include/openspace/rendering/dashboarditem.h index a02573a5e5..8814ae712b 100644 --- a/include/openspace/rendering/dashboarditem.h +++ b/include/openspace/rendering/dashboarditem.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/deferredcaster.h b/include/openspace/rendering/deferredcaster.h index 9d5af7eef7..7a1dfc5c18 100644 --- a/include/openspace/rendering/deferredcaster.h +++ b/include/openspace/rendering/deferredcaster.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/deferredcasterlistener.h b/include/openspace/rendering/deferredcasterlistener.h index 2ceca2241f..37cfb3e9ca 100644 --- a/include/openspace/rendering/deferredcasterlistener.h +++ b/include/openspace/rendering/deferredcasterlistener.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/deferredcastermanager.h b/include/openspace/rendering/deferredcastermanager.h index 45210218a7..4348f04456 100644 --- a/include/openspace/rendering/deferredcastermanager.h +++ b/include/openspace/rendering/deferredcastermanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/framebufferrenderer.h b/include/openspace/rendering/framebufferrenderer.h index 2334b2d47b..386060d7c8 100644 --- a/include/openspace/rendering/framebufferrenderer.h +++ b/include/openspace/rendering/framebufferrenderer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/helper.h b/include/openspace/rendering/helper.h index 0edfc50850..834f26ff05 100644 --- a/include/openspace/rendering/helper.h +++ b/include/openspace/rendering/helper.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/loadingscreen.h b/include/openspace/rendering/loadingscreen.h index 8e1c0dce97..453d12a460 100644 --- a/include/openspace/rendering/loadingscreen.h +++ b/include/openspace/rendering/loadingscreen.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/luaconsole.h b/include/openspace/rendering/luaconsole.h index 9505155d8f..e4c02ee9c3 100644 --- a/include/openspace/rendering/luaconsole.h +++ b/include/openspace/rendering/luaconsole.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/raycasterlistener.h b/include/openspace/rendering/raycasterlistener.h index 1863a35f9c..382e9553ed 100644 --- a/include/openspace/rendering/raycasterlistener.h +++ b/include/openspace/rendering/raycasterlistener.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/raycastermanager.h b/include/openspace/rendering/raycastermanager.h index 5f779e1317..683dbe236b 100644 --- a/include/openspace/rendering/raycastermanager.h +++ b/include/openspace/rendering/raycastermanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/renderable.h b/include/openspace/rendering/renderable.h index 463809dc6e..33e0282fce 100644 --- a/include/openspace/rendering/renderable.h +++ b/include/openspace/rendering/renderable.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h index 6254e51615..b1a5d0c878 100644 --- a/include/openspace/rendering/renderengine.h +++ b/include/openspace/rendering/renderengine.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/renderer.h b/include/openspace/rendering/renderer.h index 8ae5130954..6afcc4cd14 100644 --- a/include/openspace/rendering/renderer.h +++ b/include/openspace/rendering/renderer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h index d76a483058..773387baef 100644 --- a/include/openspace/rendering/screenspacerenderable.h +++ b/include/openspace/rendering/screenspacerenderable.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/transferfunction.h b/include/openspace/rendering/transferfunction.h index 990ee279fe..b0f02acf21 100644 --- a/include/openspace/rendering/transferfunction.h +++ b/include/openspace/rendering/transferfunction.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/volume.h b/include/openspace/rendering/volume.h index bf2ae688ab..4be0a807c1 100644 --- a/include/openspace/rendering/volume.h +++ b/include/openspace/rendering/volume.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/rendering/volumeraycaster.h b/include/openspace/rendering/volumeraycaster.h index 446a630401..f8ed000553 100644 --- a/include/openspace/rendering/volumeraycaster.h +++ b/include/openspace/rendering/volumeraycaster.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scene/asset.h b/include/openspace/scene/asset.h index 46af70369b..edc6eda3fc 100644 --- a/include/openspace/scene/asset.h +++ b/include/openspace/scene/asset.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scene/assetlistener.h b/include/openspace/scene/assetlistener.h index 0151ca8650..d864717b44 100644 --- a/include/openspace/scene/assetlistener.h +++ b/include/openspace/scene/assetlistener.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scene/assetloader.h b/include/openspace/scene/assetloader.h index 80e4cf1097..49fda6ac13 100644 --- a/include/openspace/scene/assetloader.h +++ b/include/openspace/scene/assetloader.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scene/assetmanager.h b/include/openspace/scene/assetmanager.h index 7bd57b7588..c29b4a9ec1 100644 --- a/include/openspace/scene/assetmanager.h +++ b/include/openspace/scene/assetmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scene/lightsource.h b/include/openspace/scene/lightsource.h index f591c2eb9c..dc06f5552f 100644 --- a/include/openspace/scene/lightsource.h +++ b/include/openspace/scene/lightsource.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scene/rotation.h b/include/openspace/scene/rotation.h index c76cf1ef85..78843a80ee 100644 --- a/include/openspace/scene/rotation.h +++ b/include/openspace/scene/rotation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scene/scale.h b/include/openspace/scene/scale.h index 20a9c81fce..b1481b2aec 100644 --- a/include/openspace/scene/scale.h +++ b/include/openspace/scene/scale.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h index 7a99b5c7d0..98d95aaca6 100644 --- a/include/openspace/scene/scene.h +++ b/include/openspace/scene/scene.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h index 24af772eee..7240107596 100644 --- a/include/openspace/scene/scenegraphnode.h +++ b/include/openspace/scene/scenegraphnode.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scene/sceneinitializer.h b/include/openspace/scene/sceneinitializer.h index 3f63cb20c1..2dd30fc6a3 100644 --- a/include/openspace/scene/sceneinitializer.h +++ b/include/openspace/scene/sceneinitializer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scene/scenelicense.h b/include/openspace/scene/scenelicense.h index c9b4f9d811..d2a6e9a822 100644 --- a/include/openspace/scene/scenelicense.h +++ b/include/openspace/scene/scenelicense.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scene/scenelicensewriter.h b/include/openspace/scene/scenelicensewriter.h index a82883b828..af46d44342 100644 --- a/include/openspace/scene/scenelicensewriter.h +++ b/include/openspace/scene/scenelicensewriter.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scene/timeframe.h b/include/openspace/scene/timeframe.h index 9d709fb9f4..41044f63b8 100644 --- a/include/openspace/scene/timeframe.h +++ b/include/openspace/scene/timeframe.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scene/translation.h b/include/openspace/scene/translation.h index 93a2f0f30e..da506d0f56 100644 --- a/include/openspace/scene/translation.h +++ b/include/openspace/scene/translation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scripting/lualibrary.h b/include/openspace/scripting/lualibrary.h index 5c91a95d13..4c2ff7c663 100644 --- a/include/openspace/scripting/lualibrary.h +++ b/include/openspace/scripting/lualibrary.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h index 2e003c5d4d..5f3f4fce9f 100644 --- a/include/openspace/scripting/scriptengine.h +++ b/include/openspace/scripting/scriptengine.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scripting/scriptscheduler.h b/include/openspace/scripting/scriptscheduler.h index d5e9db6d89..9a93cc986c 100644 --- a/include/openspace/scripting/scriptscheduler.h +++ b/include/openspace/scripting/scriptscheduler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/scripting/systemcapabilitiesbinding.h b/include/openspace/scripting/systemcapabilitiesbinding.h index abe25d17fd..a81c7281f9 100644 --- a/include/openspace/scripting/systemcapabilitiesbinding.h +++ b/include/openspace/scripting/systemcapabilitiesbinding.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/blockplaneintersectiongeometry.h b/include/openspace/util/blockplaneintersectiongeometry.h index 5d85848324..9f3d787d05 100644 --- a/include/openspace/util/blockplaneintersectiongeometry.h +++ b/include/openspace/util/blockplaneintersectiongeometry.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/boxgeometry.h b/include/openspace/util/boxgeometry.h index 40a86d1ae5..6f694cae2b 100644 --- a/include/openspace/util/boxgeometry.h +++ b/include/openspace/util/boxgeometry.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/camera.h b/include/openspace/util/camera.h index f40448ab8d..fb78c1becd 100644 --- a/include/openspace/util/camera.h +++ b/include/openspace/util/camera.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/concurrentjobmanager.h b/include/openspace/util/concurrentjobmanager.h index f407e407a2..effd5497a2 100644 --- a/include/openspace/util/concurrentjobmanager.h +++ b/include/openspace/util/concurrentjobmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/concurrentjobmanager.inl b/include/openspace/util/concurrentjobmanager.inl index 3b94e117d1..14588f215c 100644 --- a/include/openspace/util/concurrentjobmanager.inl +++ b/include/openspace/util/concurrentjobmanager.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/concurrentqueue.h b/include/openspace/util/concurrentqueue.h index 03d71d7f76..dedaad7c5c 100644 --- a/include/openspace/util/concurrentqueue.h +++ b/include/openspace/util/concurrentqueue.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/concurrentqueue.inl b/include/openspace/util/concurrentqueue.inl index c601c8c5cb..3392bd7cac 100644 --- a/include/openspace/util/concurrentqueue.inl +++ b/include/openspace/util/concurrentqueue.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/distanceconstants.h b/include/openspace/util/distanceconstants.h index d432a96819..104f14c97e 100644 --- a/include/openspace/util/distanceconstants.h +++ b/include/openspace/util/distanceconstants.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/distanceconversion.h b/include/openspace/util/distanceconversion.h index 16a528c3d3..7a2e2e7ceb 100644 --- a/include/openspace/util/distanceconversion.h +++ b/include/openspace/util/distanceconversion.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/factorymanager.h b/include/openspace/util/factorymanager.h index 46a525256f..1bdc5202c2 100644 --- a/include/openspace/util/factorymanager.h +++ b/include/openspace/util/factorymanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/factorymanager.inl b/include/openspace/util/factorymanager.inl index 4e0f44b586..bdb85d82c3 100644 --- a/include/openspace/util/factorymanager.inl +++ b/include/openspace/util/factorymanager.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/histogram.h b/include/openspace/util/histogram.h index 20ce121c2d..268ad86f4a 100644 --- a/include/openspace/util/histogram.h +++ b/include/openspace/util/histogram.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/httprequest.h b/include/openspace/util/httprequest.h index 1c6013cecc..eb3e345a24 100644 --- a/include/openspace/util/httprequest.h +++ b/include/openspace/util/httprequest.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/job.h b/include/openspace/util/job.h index bdbcf8377b..f7946eaf4a 100644 --- a/include/openspace/util/job.h +++ b/include/openspace/util/job.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/keys.h b/include/openspace/util/keys.h index aee3490345..8b6057c6f6 100644 --- a/include/openspace/util/keys.h +++ b/include/openspace/util/keys.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/mouse.h b/include/openspace/util/mouse.h index fbb1c3ca4d..8e9803afc5 100644 --- a/include/openspace/util/mouse.h +++ b/include/openspace/util/mouse.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/openspacemodule.h b/include/openspace/util/openspacemodule.h index f2d2dd51ca..8de0407c82 100644 --- a/include/openspace/util/openspacemodule.h +++ b/include/openspace/util/openspacemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/powerscaledcoordinate.h b/include/openspace/util/powerscaledcoordinate.h index c23209b1d5..896097f52b 100644 --- a/include/openspace/util/powerscaledcoordinate.h +++ b/include/openspace/util/powerscaledcoordinate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/powerscaledscalar.h b/include/openspace/util/powerscaledscalar.h index 5ea9209784..362e8dddc8 100644 --- a/include/openspace/util/powerscaledscalar.h +++ b/include/openspace/util/powerscaledscalar.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/powerscaledsphere.h b/include/openspace/util/powerscaledsphere.h index 98c7e4e8ba..44488c8c64 100644 --- a/include/openspace/util/powerscaledsphere.h +++ b/include/openspace/util/powerscaledsphere.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/progressbar.h b/include/openspace/util/progressbar.h index d06524dbe7..293401e83c 100644 --- a/include/openspace/util/progressbar.h +++ b/include/openspace/util/progressbar.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/resourcesynchronization.h b/include/openspace/util/resourcesynchronization.h index c7d42e623b..a7e4bcf367 100644 --- a/include/openspace/util/resourcesynchronization.h +++ b/include/openspace/util/resourcesynchronization.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/screenlog.h b/include/openspace/util/screenlog.h index 4087b48894..29d4890872 100644 --- a/include/openspace/util/screenlog.h +++ b/include/openspace/util/screenlog.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h index 55abb8f14a..8aab7b6094 100644 --- a/include/openspace/util/spicemanager.h +++ b/include/openspace/util/spicemanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/syncable.h b/include/openspace/util/syncable.h index 00c30d5551..762546fdcb 100644 --- a/include/openspace/util/syncable.h +++ b/include/openspace/util/syncable.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/syncbuffer.h b/include/openspace/util/syncbuffer.h index 1ee6fdf2b3..bba450e870 100644 --- a/include/openspace/util/syncbuffer.h +++ b/include/openspace/util/syncbuffer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/syncbuffer.inl b/include/openspace/util/syncbuffer.inl index 270138c548..0ea2ab3d61 100644 --- a/include/openspace/util/syncbuffer.inl +++ b/include/openspace/util/syncbuffer.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/syncdata.h b/include/openspace/util/syncdata.h index 20d624079d..1e2022d2fb 100644 --- a/include/openspace/util/syncdata.h +++ b/include/openspace/util/syncdata.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/syncdata.inl b/include/openspace/util/syncdata.inl index 5c60cfd101..9352b56334 100644 --- a/include/openspace/util/syncdata.inl +++ b/include/openspace/util/syncdata.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/synchronizationwatcher.h b/include/openspace/util/synchronizationwatcher.h index 0f3295e751..46cc9c2b23 100644 --- a/include/openspace/util/synchronizationwatcher.h +++ b/include/openspace/util/synchronizationwatcher.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/task.h b/include/openspace/util/task.h index 5004d561bd..97cbd32b7d 100644 --- a/include/openspace/util/task.h +++ b/include/openspace/util/task.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/taskloader.h b/include/openspace/util/taskloader.h index 99b419359d..e484aa65d1 100644 --- a/include/openspace/util/taskloader.h +++ b/include/openspace/util/taskloader.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/threadpool.h b/include/openspace/util/threadpool.h index 9d6f0c299b..de91dd9863 100644 --- a/include/openspace/util/threadpool.h +++ b/include/openspace/util/threadpool.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/time.h b/include/openspace/util/time.h index 4b79eca530..aa8cf2e4c0 100644 --- a/include/openspace/util/time.h +++ b/include/openspace/util/time.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/timeconversion.h b/include/openspace/util/timeconversion.h index 4b614f7cd3..19f5f1e984 100644 --- a/include/openspace/util/timeconversion.h +++ b/include/openspace/util/timeconversion.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/timeline.h b/include/openspace/util/timeline.h index f2949d8b7c..b47d9cf4e3 100644 --- a/include/openspace/util/timeline.h +++ b/include/openspace/util/timeline.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/timeline.inl b/include/openspace/util/timeline.inl index 4e4c3006dc..79ccf4c51a 100644 --- a/include/openspace/util/timeline.inl +++ b/include/openspace/util/timeline.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/timemanager.h b/include/openspace/util/timemanager.h index 7957173413..3182ab12a0 100644 --- a/include/openspace/util/timemanager.h +++ b/include/openspace/util/timemanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/timerange.h b/include/openspace/util/timerange.h index ceaa220ec8..47e40ccbb9 100644 --- a/include/openspace/util/timerange.h +++ b/include/openspace/util/timerange.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/transformationmanager.h b/include/openspace/util/transformationmanager.h index 77efaf5179..50066f601e 100644 --- a/include/openspace/util/transformationmanager.h +++ b/include/openspace/util/transformationmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/include/openspace/util/updatestructures.h b/include/openspace/util/updatestructures.h index 839ba1ba6c..3f19c6959f 100644 --- a/include/openspace/util/updatestructures.h +++ b/include/openspace/util/updatestructures.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/CMakeLists.txt b/modules/atmosphere/CMakeLists.txt index 13e8c2ae4e..4cb7e5ebbe 100644 --- a/modules/atmosphere/CMakeLists.txt +++ b/modules/atmosphere/CMakeLists.txt @@ -37,40 +37,40 @@ set(SOURCE_FILES source_group("Source Files" FILES ${SOURCE_FILES}) set(SHADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/atmosphere_common.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/atmosphere_deferred_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/atmosphere_deferred_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaE_calc_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaE_calc_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaJ_calc_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaJ_calc_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaJ_calc_gs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_calc_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_calc_gs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_calc_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_sup_calc_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_sup_calc_gs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_sup_calc_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_calc_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_calc_gs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_calc_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_sup_calc_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_sup_calc_gs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_sup_calc_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_calc_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_calc_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_final_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_final_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_sup_calc_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_sup_calc_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/transmittance_calc_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/transmittance_calc_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/atmosphere_common.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/atmosphere_deferred_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/atmosphere_deferred_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaE_calc_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaE_calc_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaJ_calc_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaJ_calc_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaJ_calc_gs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_calc_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_calc_gs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_calc_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_sup_calc_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_sup_calc_gs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_sup_calc_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_calc_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_calc_gs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_calc_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_sup_calc_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_sup_calc_gs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_sup_calc_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_calc_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_calc_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_final_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_final_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_sup_calc_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_sup_calc_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/transmittance_calc_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/transmittance_calc_fs.glsl ) source_group("Shader Files" FILES ${SHADER_FILES}) create_new_module( - "Atmosphere" - atmosphere_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} + "Atmosphere" + atmosphere_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} ) diff --git a/modules/atmosphere/atmospheremodule.cpp b/modules/atmosphere/atmospheremodule.cpp index 14d8f4cb4e..2d56790860 100644 --- a/modules/atmosphere/atmospheremodule.cpp +++ b/modules/atmosphere/atmospheremodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/atmospheremodule.h b/modules/atmosphere/atmospheremodule.h index e66485f29e..f7100dd181 100644 --- a/modules/atmosphere/atmospheremodule.h +++ b/modules/atmosphere/atmospheremodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp index 8ae5ff6d1e..5eaef72764 100644 --- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp +++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/atmosphere/rendering/atmospheredeferredcaster.h index 1a838651aa..6c0af90d37 100644 --- a/modules/atmosphere/rendering/atmospheredeferredcaster.h +++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp index 6bae40f3aa..159d9bb0f2 100644 --- a/modules/atmosphere/rendering/renderableatmosphere.cpp +++ b/modules/atmosphere/rendering/renderableatmosphere.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/rendering/renderableatmosphere.h b/modules/atmosphere/rendering/renderableatmosphere.h index 3fa3493b36..d86f068ca7 100644 --- a/modules/atmosphere/rendering/renderableatmosphere.h +++ b/modules/atmosphere/rendering/renderableatmosphere.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/atmosphere_common.glsl b/modules/atmosphere/shaders/atmosphere_common.glsl index ecc0413ac0..8be26b6e53 100644 --- a/modules/atmosphere/shaders/atmosphere_common.glsl +++ b/modules/atmosphere/shaders/atmosphere_common.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl index f3de0b64b2..8aec9d0c7b 100644 --- a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl +++ b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl index 76fae77721..52cd01cb6e 100644 --- a/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl +++ b/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/deltaE_calc_fs.glsl b/modules/atmosphere/shaders/deltaE_calc_fs.glsl index ce445632c9..b845c2ae67 100644 --- a/modules/atmosphere/shaders/deltaE_calc_fs.glsl +++ b/modules/atmosphere/shaders/deltaE_calc_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/deltaE_calc_vs.glsl b/modules/atmosphere/shaders/deltaE_calc_vs.glsl index b379e97bfe..a85594b7d2 100644 --- a/modules/atmosphere/shaders/deltaE_calc_vs.glsl +++ b/modules/atmosphere/shaders/deltaE_calc_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/deltaJ_calc_fs.glsl b/modules/atmosphere/shaders/deltaJ_calc_fs.glsl index 80f02f1862..56114090c8 100644 --- a/modules/atmosphere/shaders/deltaJ_calc_fs.glsl +++ b/modules/atmosphere/shaders/deltaJ_calc_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/deltaJ_calc_gs.glsl b/modules/atmosphere/shaders/deltaJ_calc_gs.glsl index eb98fa1059..bc9987eab3 100644 --- a/modules/atmosphere/shaders/deltaJ_calc_gs.glsl +++ b/modules/atmosphere/shaders/deltaJ_calc_gs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/deltaJ_calc_vs.glsl b/modules/atmosphere/shaders/deltaJ_calc_vs.glsl index b379e97bfe..a85594b7d2 100644 --- a/modules/atmosphere/shaders/deltaJ_calc_vs.glsl +++ b/modules/atmosphere/shaders/deltaJ_calc_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/deltaS_calc_fs.glsl b/modules/atmosphere/shaders/deltaS_calc_fs.glsl index 1f66741387..ea2151793b 100644 --- a/modules/atmosphere/shaders/deltaS_calc_fs.glsl +++ b/modules/atmosphere/shaders/deltaS_calc_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/deltaS_calc_gs.glsl b/modules/atmosphere/shaders/deltaS_calc_gs.glsl index eb98fa1059..bc9987eab3 100644 --- a/modules/atmosphere/shaders/deltaS_calc_gs.glsl +++ b/modules/atmosphere/shaders/deltaS_calc_gs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/deltaS_calc_vs.glsl b/modules/atmosphere/shaders/deltaS_calc_vs.glsl index b379e97bfe..a85594b7d2 100644 --- a/modules/atmosphere/shaders/deltaS_calc_vs.glsl +++ b/modules/atmosphere/shaders/deltaS_calc_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl b/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl index 0fc114328c..9625840f45 100644 --- a/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl +++ b/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/deltaS_sup_calc_gs.glsl b/modules/atmosphere/shaders/deltaS_sup_calc_gs.glsl index 15b4964390..c9ca35e88c 100644 --- a/modules/atmosphere/shaders/deltaS_sup_calc_gs.glsl +++ b/modules/atmosphere/shaders/deltaS_sup_calc_gs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/deltaS_sup_calc_vs.glsl b/modules/atmosphere/shaders/deltaS_sup_calc_vs.glsl index 7cb84d0439..3988002d04 100644 --- a/modules/atmosphere/shaders/deltaS_sup_calc_vs.glsl +++ b/modules/atmosphere/shaders/deltaS_sup_calc_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/inScattering_calc_fs.glsl b/modules/atmosphere/shaders/inScattering_calc_fs.glsl index f93fd6c304..87fe562553 100644 --- a/modules/atmosphere/shaders/inScattering_calc_fs.glsl +++ b/modules/atmosphere/shaders/inScattering_calc_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/inScattering_calc_gs.glsl b/modules/atmosphere/shaders/inScattering_calc_gs.glsl index 93935134c4..c3bcf0c6fe 100644 --- a/modules/atmosphere/shaders/inScattering_calc_gs.glsl +++ b/modules/atmosphere/shaders/inScattering_calc_gs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/inScattering_calc_vs.glsl b/modules/atmosphere/shaders/inScattering_calc_vs.glsl index b379e97bfe..a85594b7d2 100644 --- a/modules/atmosphere/shaders/inScattering_calc_vs.glsl +++ b/modules/atmosphere/shaders/inScattering_calc_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl b/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl index e07de3be1d..0cb4290902 100644 --- a/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl +++ b/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/inScattering_sup_calc_gs.glsl b/modules/atmosphere/shaders/inScattering_sup_calc_gs.glsl index 15b4964390..c9ca35e88c 100644 --- a/modules/atmosphere/shaders/inScattering_sup_calc_gs.glsl +++ b/modules/atmosphere/shaders/inScattering_sup_calc_gs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/inScattering_sup_calc_vs.glsl b/modules/atmosphere/shaders/inScattering_sup_calc_vs.glsl index 7cb84d0439..3988002d04 100644 --- a/modules/atmosphere/shaders/inScattering_sup_calc_vs.glsl +++ b/modules/atmosphere/shaders/inScattering_sup_calc_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/irradiance_calc_fs.glsl b/modules/atmosphere/shaders/irradiance_calc_fs.glsl index 7042c6bddd..fe14612948 100644 --- a/modules/atmosphere/shaders/irradiance_calc_fs.glsl +++ b/modules/atmosphere/shaders/irradiance_calc_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/irradiance_calc_vs.glsl b/modules/atmosphere/shaders/irradiance_calc_vs.glsl index b379e97bfe..a85594b7d2 100644 --- a/modules/atmosphere/shaders/irradiance_calc_vs.glsl +++ b/modules/atmosphere/shaders/irradiance_calc_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/irradiance_final_fs.glsl b/modules/atmosphere/shaders/irradiance_final_fs.glsl index a0800fc507..33b17b126f 100644 --- a/modules/atmosphere/shaders/irradiance_final_fs.glsl +++ b/modules/atmosphere/shaders/irradiance_final_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/irradiance_final_vs.glsl b/modules/atmosphere/shaders/irradiance_final_vs.glsl index e266156549..84a3c2750e 100644 --- a/modules/atmosphere/shaders/irradiance_final_vs.glsl +++ b/modules/atmosphere/shaders/irradiance_final_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl b/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl index cdf31ca38c..e381d2e6f2 100644 --- a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl +++ b/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/irradiance_sup_calc_vs.glsl b/modules/atmosphere/shaders/irradiance_sup_calc_vs.glsl index b379e97bfe..a85594b7d2 100644 --- a/modules/atmosphere/shaders/irradiance_sup_calc_vs.glsl +++ b/modules/atmosphere/shaders/irradiance_sup_calc_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/transmittance_calc_fs.glsl b/modules/atmosphere/shaders/transmittance_calc_fs.glsl index 411565b06c..2eebbfa582 100644 --- a/modules/atmosphere/shaders/transmittance_calc_fs.glsl +++ b/modules/atmosphere/shaders/transmittance_calc_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/atmosphere/shaders/transmittance_calc_vs.glsl b/modules/atmosphere/shaders/transmittance_calc_vs.glsl index 6e457a03e6..9927f4b026 100644 --- a/modules/atmosphere/shaders/transmittance_calc_vs.glsl +++ b/modules/atmosphere/shaders/transmittance_calc_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt index 98829cd19b..de4b747968 100644 --- a/modules/base/CMakeLists.txt +++ b/modules/base/CMakeLists.txt @@ -25,116 +25,116 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemangle.h - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemdate.h - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemdistance.h - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemframerate.h - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemmission.h - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemparallelconnection.h - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditempropertyvalue.h - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemsimulationincrement.h - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemspacing.h - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemvelocity.h - ${CMAKE_CURRENT_SOURCE_DIR}/lightsource/cameralightsource.h - ${CMAKE_CURRENT_SOURCE_DIR}/lightsource/scenegraphlightsource.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/modelgeometry.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/multimodelgeometry.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableboxgrid.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablecartesianaxes.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodel.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplane.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimagelocal.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimageonline.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesphere.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesphericalgrid.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrail.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailorbit.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailtrajectory.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspacedashboard.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceframebuffer.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimagelocal.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimageonline.h - ${CMAKE_CURRENT_SOURCE_DIR}/translation/luatranslation.h - ${CMAKE_CURRENT_SOURCE_DIR}/translation/statictranslation.h - ${CMAKE_CURRENT_SOURCE_DIR}/rotation/constantrotation.h - ${CMAKE_CURRENT_SOURCE_DIR}/rotation/fixedrotation.h - ${CMAKE_CURRENT_SOURCE_DIR}/rotation/luarotation.h - ${CMAKE_CURRENT_SOURCE_DIR}/rotation/staticrotation.h - ${CMAKE_CURRENT_SOURCE_DIR}/scale/luascale.h - ${CMAKE_CURRENT_SOURCE_DIR}/scale/staticscale.h - ${CMAKE_CURRENT_SOURCE_DIR}/scale/timedependentscale.h - ${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeinterval.h - ${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeunion.h + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemangle.h + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemdate.h + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemdistance.h + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemframerate.h + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemmission.h + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemparallelconnection.h + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditempropertyvalue.h + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemsimulationincrement.h + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemspacing.h + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemvelocity.h + ${CMAKE_CURRENT_SOURCE_DIR}/lightsource/cameralightsource.h + ${CMAKE_CURRENT_SOURCE_DIR}/lightsource/scenegraphlightsource.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/modelgeometry.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/multimodelgeometry.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableboxgrid.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablecartesianaxes.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodel.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplane.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimagelocal.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimageonline.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesphere.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesphericalgrid.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrail.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailorbit.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailtrajectory.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspacedashboard.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceframebuffer.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimagelocal.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimageonline.h + ${CMAKE_CURRENT_SOURCE_DIR}/translation/luatranslation.h + ${CMAKE_CURRENT_SOURCE_DIR}/translation/statictranslation.h + ${CMAKE_CURRENT_SOURCE_DIR}/rotation/constantrotation.h + ${CMAKE_CURRENT_SOURCE_DIR}/rotation/fixedrotation.h + ${CMAKE_CURRENT_SOURCE_DIR}/rotation/luarotation.h + ${CMAKE_CURRENT_SOURCE_DIR}/rotation/staticrotation.h + ${CMAKE_CURRENT_SOURCE_DIR}/scale/luascale.h + ${CMAKE_CURRENT_SOURCE_DIR}/scale/staticscale.h + ${CMAKE_CURRENT_SOURCE_DIR}/scale/timedependentscale.h + ${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeinterval.h + ${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeunion.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemangle.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemdate.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemdistance.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemframerate.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemmission.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemparallelconnection.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditempropertyvalue.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemsimulationincrement.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemspacing.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemvelocity.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/lightsource/cameralightsource.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/lightsource/scenegraphlightsource.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/modelgeometry.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/multimodelgeometry.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableboxgrid.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablecartesianaxes.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodel.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplane.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimagelocal.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimageonline.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesphere.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesphericalgrid.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrail.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailorbit.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailtrajectory.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspacedashboard.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceframebuffer.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimagelocal.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimageonline.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/translation/luatranslation.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/translation/statictranslation.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rotation/constantrotation.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rotation/fixedrotation.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rotation/luarotation.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rotation/staticrotation.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/scale/luascale.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/scale/staticscale.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/scale/timedependentscale.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeinterval.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeunion.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemangle.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemdate.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemdistance.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemframerate.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemmission.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemparallelconnection.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditempropertyvalue.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemsimulationincrement.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemspacing.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemvelocity.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/lightsource/cameralightsource.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/lightsource/scenegraphlightsource.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/modelgeometry.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/multimodelgeometry.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableboxgrid.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablecartesianaxes.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplane.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimagelocal.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimageonline.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesphere.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesphericalgrid.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrail.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailorbit.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailtrajectory.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspacedashboard.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceframebuffer.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimagelocal.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimageonline.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/translation/luatranslation.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/translation/statictranslation.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rotation/constantrotation.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rotation/fixedrotation.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rotation/luarotation.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rotation/staticrotation.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/scale/luascale.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/scale/staticscale.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/scale/timedependentscale.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeinterval.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeunion.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) set(SHADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/axes_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/axes_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/grid_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/grid_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/imageplane_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/imageplane_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/model_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/model_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/plane_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/plane_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderabletrail_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderabletrail_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/screenspace_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/screenspace_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/sphere_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/sphere_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/axes_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/axes_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/grid_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/grid_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/imageplane_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/imageplane_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/model_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/model_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/plane_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/plane_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderabletrail_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderabletrail_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/screenspace_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/screenspace_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/sphere_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/sphere_vs.glsl ) source_group("Shader Files" FILES ${SHADER_FILES}) create_new_module( - "Base" - base_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} + "Base" + base_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} ) diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp index 186149a215..ead6089797 100644 --- a/modules/base/basemodule.cpp +++ b/modules/base/basemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/basemodule.h b/modules/base/basemodule.h index c1160e213a..ceeca7da28 100644 --- a/modules/base/basemodule.h +++ b/modules/base/basemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp index ac618d491a..26493dc763 100644 --- a/modules/base/dashboard/dashboarditemangle.cpp +++ b/modules/base/dashboard/dashboarditemangle.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemangle.h b/modules/base/dashboard/dashboarditemangle.h index e613656019..40f39a0fcb 100644 --- a/modules/base/dashboard/dashboarditemangle.h +++ b/modules/base/dashboard/dashboarditemangle.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemdate.cpp b/modules/base/dashboard/dashboarditemdate.cpp index 06f38b8d97..3bfbadf2f8 100644 --- a/modules/base/dashboard/dashboarditemdate.cpp +++ b/modules/base/dashboard/dashboarditemdate.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemdate.h b/modules/base/dashboard/dashboarditemdate.h index 80d7d4082e..560b59f730 100644 --- a/modules/base/dashboard/dashboarditemdate.h +++ b/modules/base/dashboard/dashboarditemdate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp index bf29c963b0..584026d554 100644 --- a/modules/base/dashboard/dashboarditemdistance.cpp +++ b/modules/base/dashboard/dashboarditemdistance.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemdistance.h b/modules/base/dashboard/dashboarditemdistance.h index aa56eb8b0d..e55bb57bcf 100644 --- a/modules/base/dashboard/dashboarditemdistance.h +++ b/modules/base/dashboard/dashboarditemdistance.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp index 910a0f5890..c9218afdbe 100644 --- a/modules/base/dashboard/dashboarditemframerate.cpp +++ b/modules/base/dashboard/dashboarditemframerate.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemframerate.h b/modules/base/dashboard/dashboarditemframerate.h index 21ac3132d9..4cf7990a47 100644 --- a/modules/base/dashboard/dashboarditemframerate.h +++ b/modules/base/dashboard/dashboarditemframerate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemmission.cpp b/modules/base/dashboard/dashboarditemmission.cpp index f066e7a180..4d07252d65 100644 --- a/modules/base/dashboard/dashboarditemmission.cpp +++ b/modules/base/dashboard/dashboarditemmission.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemmission.h b/modules/base/dashboard/dashboarditemmission.h index 9f051daff9..91e27bb107 100644 --- a/modules/base/dashboard/dashboarditemmission.h +++ b/modules/base/dashboard/dashboarditemmission.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemparallelconnection.cpp b/modules/base/dashboard/dashboarditemparallelconnection.cpp index 9fc9dff40a..f4d57aa515 100644 --- a/modules/base/dashboard/dashboarditemparallelconnection.cpp +++ b/modules/base/dashboard/dashboarditemparallelconnection.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemparallelconnection.h b/modules/base/dashboard/dashboarditemparallelconnection.h index a00ea83eaf..2e1976066e 100644 --- a/modules/base/dashboard/dashboarditemparallelconnection.h +++ b/modules/base/dashboard/dashboarditemparallelconnection.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditempropertyvalue.cpp b/modules/base/dashboard/dashboarditempropertyvalue.cpp index a959ccf02b..a05322c468 100644 --- a/modules/base/dashboard/dashboarditempropertyvalue.cpp +++ b/modules/base/dashboard/dashboarditempropertyvalue.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditempropertyvalue.h b/modules/base/dashboard/dashboarditempropertyvalue.h index 1c853ce40a..373f86e284 100644 --- a/modules/base/dashboard/dashboarditempropertyvalue.h +++ b/modules/base/dashboard/dashboarditempropertyvalue.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.cpp b/modules/base/dashboard/dashboarditemsimulationincrement.cpp index 3edaeabebe..4e7093bcc3 100644 --- a/modules/base/dashboard/dashboarditemsimulationincrement.cpp +++ b/modules/base/dashboard/dashboarditemsimulationincrement.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.h b/modules/base/dashboard/dashboarditemsimulationincrement.h index 3502bc3bf7..35134dc4db 100644 --- a/modules/base/dashboard/dashboarditemsimulationincrement.h +++ b/modules/base/dashboard/dashboarditemsimulationincrement.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemspacing.cpp b/modules/base/dashboard/dashboarditemspacing.cpp index c7815adb6d..3124cea06a 100644 --- a/modules/base/dashboard/dashboarditemspacing.cpp +++ b/modules/base/dashboard/dashboarditemspacing.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemspacing.h b/modules/base/dashboard/dashboarditemspacing.h index 0fe939cbd0..5eb23c9751 100644 --- a/modules/base/dashboard/dashboarditemspacing.h +++ b/modules/base/dashboard/dashboarditemspacing.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemvelocity.cpp b/modules/base/dashboard/dashboarditemvelocity.cpp index e6d225b321..a6cf5f03f4 100644 --- a/modules/base/dashboard/dashboarditemvelocity.cpp +++ b/modules/base/dashboard/dashboarditemvelocity.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/dashboard/dashboarditemvelocity.h b/modules/base/dashboard/dashboarditemvelocity.h index b36f1a8a69..6a7d5ae5a1 100644 --- a/modules/base/dashboard/dashboarditemvelocity.h +++ b/modules/base/dashboard/dashboarditemvelocity.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/lightsource/cameralightsource.cpp b/modules/base/lightsource/cameralightsource.cpp index 9b6647bade..be7d6974a8 100644 --- a/modules/base/lightsource/cameralightsource.cpp +++ b/modules/base/lightsource/cameralightsource.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/lightsource/cameralightsource.h b/modules/base/lightsource/cameralightsource.h index ac40415ed0..312d23b201 100644 --- a/modules/base/lightsource/cameralightsource.h +++ b/modules/base/lightsource/cameralightsource.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/lightsource/scenegraphlightsource.cpp b/modules/base/lightsource/scenegraphlightsource.cpp index c4b9ad55f3..905524ca17 100644 --- a/modules/base/lightsource/scenegraphlightsource.cpp +++ b/modules/base/lightsource/scenegraphlightsource.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/lightsource/scenegraphlightsource.h b/modules/base/lightsource/scenegraphlightsource.h index ce96004708..e4d6b7a602 100644 --- a/modules/base/lightsource/scenegraphlightsource.h +++ b/modules/base/lightsource/scenegraphlightsource.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/modelgeometry.cpp b/modules/base/rendering/modelgeometry.cpp index 90662a28a0..bbd4a1873b 100644 --- a/modules/base/rendering/modelgeometry.cpp +++ b/modules/base/rendering/modelgeometry.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/modelgeometry.h b/modules/base/rendering/modelgeometry.h index 993c957b80..0535052703 100644 --- a/modules/base/rendering/modelgeometry.h +++ b/modules/base/rendering/modelgeometry.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/multimodelgeometry.cpp b/modules/base/rendering/multimodelgeometry.cpp index 62f4e7a889..c59a815ea5 100644 --- a/modules/base/rendering/multimodelgeometry.cpp +++ b/modules/base/rendering/multimodelgeometry.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/multimodelgeometry.h b/modules/base/rendering/multimodelgeometry.h index 14306b7879..2b26169ccd 100644 --- a/modules/base/rendering/multimodelgeometry.h +++ b/modules/base/rendering/multimodelgeometry.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderableboxgrid.cpp b/modules/base/rendering/renderableboxgrid.cpp index 2342905f4f..0ea998333f 100644 --- a/modules/base/rendering/renderableboxgrid.cpp +++ b/modules/base/rendering/renderableboxgrid.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderableboxgrid.h b/modules/base/rendering/renderableboxgrid.h index 1deb095f79..e74f82e1fd 100644 --- a/modules/base/rendering/renderableboxgrid.h +++ b/modules/base/rendering/renderableboxgrid.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderablecartesianaxes.cpp b/modules/base/rendering/renderablecartesianaxes.cpp index 283a80924b..841923c5ba 100644 --- a/modules/base/rendering/renderablecartesianaxes.cpp +++ b/modules/base/rendering/renderablecartesianaxes.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderablecartesianaxes.h b/modules/base/rendering/renderablecartesianaxes.h index 9444461180..bd090c1055 100644 --- a/modules/base/rendering/renderablecartesianaxes.h +++ b/modules/base/rendering/renderablecartesianaxes.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp index b0a936449f..1fe14e48f7 100644 --- a/modules/base/rendering/renderablemodel.cpp +++ b/modules/base/rendering/renderablemodel.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderablemodel.h b/modules/base/rendering/renderablemodel.h index 9a015d02a5..d6e8a3e9d1 100644 --- a/modules/base/rendering/renderablemodel.h +++ b/modules/base/rendering/renderablemodel.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp index b662d6c619..277c9ccd0a 100644 --- a/modules/base/rendering/renderableplane.cpp +++ b/modules/base/rendering/renderableplane.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderableplane.h b/modules/base/rendering/renderableplane.h index 1b8accaf3b..184d3f637a 100644 --- a/modules/base/rendering/renderableplane.h +++ b/modules/base/rendering/renderableplane.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp index 978c109a64..26d86967ba 100644 --- a/modules/base/rendering/renderableplaneimagelocal.cpp +++ b/modules/base/rendering/renderableplaneimagelocal.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderableplaneimagelocal.h b/modules/base/rendering/renderableplaneimagelocal.h index 817876ec62..f207bdba7c 100644 --- a/modules/base/rendering/renderableplaneimagelocal.h +++ b/modules/base/rendering/renderableplaneimagelocal.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderableplaneimageonline.cpp b/modules/base/rendering/renderableplaneimageonline.cpp index 58d97e94cf..6b33c315d1 100644 --- a/modules/base/rendering/renderableplaneimageonline.cpp +++ b/modules/base/rendering/renderableplaneimageonline.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderableplaneimageonline.h b/modules/base/rendering/renderableplaneimageonline.h index 832fadfdfa..616fb526c3 100644 --- a/modules/base/rendering/renderableplaneimageonline.h +++ b/modules/base/rendering/renderableplaneimageonline.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp index 141720fc0c..5077999c20 100644 --- a/modules/base/rendering/renderablesphere.cpp +++ b/modules/base/rendering/renderablesphere.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderablesphere.h b/modules/base/rendering/renderablesphere.h index 1f435cc9db..468fb5b7e8 100644 --- a/modules/base/rendering/renderablesphere.h +++ b/modules/base/rendering/renderablesphere.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderablesphericalgrid.cpp b/modules/base/rendering/renderablesphericalgrid.cpp index 6e10760404..8fb5c1491b 100644 --- a/modules/base/rendering/renderablesphericalgrid.cpp +++ b/modules/base/rendering/renderablesphericalgrid.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderablesphericalgrid.h b/modules/base/rendering/renderablesphericalgrid.h index 71c0a79ddb..47b6b1f203 100644 --- a/modules/base/rendering/renderablesphericalgrid.h +++ b/modules/base/rendering/renderablesphericalgrid.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp index 7d2c7aba4f..03c36fc0e4 100644 --- a/modules/base/rendering/renderabletrail.cpp +++ b/modules/base/rendering/renderabletrail.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderabletrail.h b/modules/base/rendering/renderabletrail.h index a12813832c..1bd1e802c8 100644 --- a/modules/base/rendering/renderabletrail.h +++ b/modules/base/rendering/renderabletrail.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp index 2cc3283946..79d8cec649 100644 --- a/modules/base/rendering/renderabletrailorbit.cpp +++ b/modules/base/rendering/renderabletrailorbit.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderabletrailorbit.h b/modules/base/rendering/renderabletrailorbit.h index e94ece27a2..62228454d7 100644 --- a/modules/base/rendering/renderabletrailorbit.h +++ b/modules/base/rendering/renderabletrailorbit.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp index 2c6091b55e..54f51f1c27 100644 --- a/modules/base/rendering/renderabletrailtrajectory.cpp +++ b/modules/base/rendering/renderabletrailtrajectory.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/renderabletrailtrajectory.h b/modules/base/rendering/renderabletrailtrajectory.h index bab9fcd79e..3f2311bc35 100644 --- a/modules/base/rendering/renderabletrailtrajectory.h +++ b/modules/base/rendering/renderabletrailtrajectory.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp index 18bec7b85b..9f271d350c 100644 --- a/modules/base/rendering/screenspacedashboard.cpp +++ b/modules/base/rendering/screenspacedashboard.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/screenspacedashboard.h b/modules/base/rendering/screenspacedashboard.h index 2880573b4b..ad7763cd27 100644 --- a/modules/base/rendering/screenspacedashboard.h +++ b/modules/base/rendering/screenspacedashboard.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp index d2b54915a9..3761e9458c 100644 --- a/modules/base/rendering/screenspaceframebuffer.cpp +++ b/modules/base/rendering/screenspaceframebuffer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/screenspaceframebuffer.h b/modules/base/rendering/screenspaceframebuffer.h index 441d0739cd..e1919e0f5f 100644 --- a/modules/base/rendering/screenspaceframebuffer.h +++ b/modules/base/rendering/screenspaceframebuffer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp index cb369324f8..a0751cf9f0 100644 --- a/modules/base/rendering/screenspaceimagelocal.cpp +++ b/modules/base/rendering/screenspaceimagelocal.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/screenspaceimagelocal.h b/modules/base/rendering/screenspaceimagelocal.h index 39bd4fe89e..e5a1ce8ec9 100644 --- a/modules/base/rendering/screenspaceimagelocal.h +++ b/modules/base/rendering/screenspaceimagelocal.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/screenspaceimageonline.cpp b/modules/base/rendering/screenspaceimageonline.cpp index df07281059..83026445cc 100644 --- a/modules/base/rendering/screenspaceimageonline.cpp +++ b/modules/base/rendering/screenspaceimageonline.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/screenspaceimageonline.h b/modules/base/rendering/screenspaceimageonline.h index ecd98fd15c..1b23306692 100644 --- a/modules/base/rendering/screenspaceimageonline.h +++ b/modules/base/rendering/screenspaceimageonline.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rendering/wavefrontgeometry.cpp b/modules/base/rendering/wavefrontgeometry.cpp deleted file mode 100644 index b8cc63c7ab..0000000000 --- a/modules/base/rendering/wavefrontgeometry.cpp +++ /dev/null @@ -1,133 +0,0 @@ -/***************************************************************************************** - * * - * OpenSpace * - * * - * Copyright (c) 2014-2018 * - * * - * 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. * - ****************************************************************************************/ - -#include - -#include "ghoul/logging/logmanager.h" -#include - -namespace { - static const std::string _loggerCat = "WavefrontGeometry"; -} - -namespace openspace { -namespace modelgeometry { - -WavefrontGeometry::WavefrontGeometry(const ghoul::Dictionary& dictionary) - : ModelGeometry(dictionary) -{ - loadObj(_file); -} - -bool WavefrontGeometry::initialize(Renderable* parent) { - bool success = ModelGeometry::initialize(parent); - return success; -} - -void WavefrontGeometry::deinitialize() { - ModelGeometry::deinitialize(); -} - -bool WavefrontGeometry::loadModel(const std::string& filename) { - std::vector shapes; - std::vector materials; - std::string err; - bool success = tinyobj::LoadObj( - shapes, - materials, - err, - filename.c_str(), - filename.c_str() - ); - - if (!success) { - LERROR(err); - return false; - } - - if (shapes.size() > 1) { - LWARNING("Loading models with more than one shape is currently untested"); - } - - size_t totalSizeIndex = 0; - size_t totalSizeVertex = 0; - for (int i = 0; i < shapes.size(); ++i) { - totalSizeIndex += shapes[i].mesh.indices.size(); - totalSizeVertex += shapes[i].mesh.positions.size(); - - if (shapes[i].mesh.positions.size() != shapes[i].mesh.normals.size()) - LERROR( - "#positions (" << shapes[i].mesh.positions.size() << ")" - " != #normals (" << shapes[i].mesh.normals.size() - ); - } - - _vertices.resize(totalSizeVertex); - std::memset(_vertices.data(), 0, _vertices.size() * sizeof(Vertex)); - _indices.resize(totalSizeIndex); - std::memset(_indices.data(), 0, _indices.size() * sizeof(int)); - - // We add all shapes of the model into the same vertex array, one after the other - // The _shapeCounts array stores for each shape, how many vertices that shape has - size_t currentPosition = 0; - size_t p = 0; - psc tmp; - for (int i = 0; i < shapes.size(); ++i) { - for (int j = 0; j < shapes[i].mesh.positions.size() / 3; ++j) { - tmp = PowerScaledCoordinate::CreatePowerScaledCoordinate( - shapes[i].mesh.positions[3 * j + 0], - shapes[i].mesh.positions[3 * j + 1], - shapes[i].mesh.positions[3 * j + 2] - ); - - _vertices[j + currentPosition].location[0] = tmp[0]; - _vertices[j + currentPosition].location[1] = tmp[1]; - _vertices[j + currentPosition].location[2] = tmp[2]; - _vertices[j + currentPosition].location[3] = tmp[3]; - - _vertices[j + currentPosition].normal[0] = shapes[i].mesh.normals[3 * j + 0]; - _vertices[j + currentPosition].normal[1] = shapes[i].mesh.normals[3 * j + 1]; - _vertices[j + currentPosition].normal[2] = shapes[i].mesh.normals[3 * j + 2]; - - if (2 * j + 1 < shapes[i].mesh.texcoords.size()) { - _vertices[j + currentPosition].tex[0] = shapes[i].mesh.texcoords[2*j + 0]; - _vertices[j + currentPosition].tex[1] = shapes[i].mesh.texcoords[2*j + 1]; - } - } - currentPosition += shapes[i].mesh.positions.size() / 3; - - std::copy( - shapes[i].mesh.indices.begin(), - shapes[i].mesh.indices.end(), - _indices.begin() + p - ); - p += shapes[i].mesh.indices.size(); - } - - return true; -} - - -} // namespace modelgeometry -} // namespace openspace diff --git a/modules/base/rendering/wavefrontgeometry.h b/modules/base/rendering/wavefrontgeometry.h deleted file mode 100644 index 5848aa689b..0000000000 --- a/modules/base/rendering/wavefrontgeometry.h +++ /dev/null @@ -1,51 +0,0 @@ -/***************************************************************************************** - * * - * OpenSpace * - * * - * Copyright (c) 2014-2018 * - * * - * 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. * - ****************************************************************************************/ - -#ifndef __OPENSPACE_MODULE_BASE___WAVEFRONTGEOMETRY___H__ -#define __OPENSPACE_MODULE_BASE___WAVEFRONTGEOMETRY___H__ - -#include - -namespace openspace { - -class RenderableModel; -class RenderableModelProjection; - -namespace modelgeometry { - - class WavefrontGeometry : public ModelGeometry { - public: - WavefrontGeometry(const ghoul::Dictionary& dictionary); - - bool initialize(Renderable* parent) override; - void deinitialize() override; - - private: - bool loadModel(const std::string& filename); - }; - -} // namespace modelgeometry -} // namespace openspace - -#endif // __OPENSPACE_MODULE_BASE___WAVEFRONTGEOMETRY___H__ diff --git a/modules/base/rotation/constantrotation.cpp b/modules/base/rotation/constantrotation.cpp index 1369cd31c3..d79577c5d9 100644 --- a/modules/base/rotation/constantrotation.cpp +++ b/modules/base/rotation/constantrotation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rotation/constantrotation.h b/modules/base/rotation/constantrotation.h index d9c74e8098..bf887fea4c 100644 --- a/modules/base/rotation/constantrotation.h +++ b/modules/base/rotation/constantrotation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rotation/fixedrotation.cpp b/modules/base/rotation/fixedrotation.cpp index f7ec1bb3fb..7015ae14f4 100644 --- a/modules/base/rotation/fixedrotation.cpp +++ b/modules/base/rotation/fixedrotation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rotation/fixedrotation.h b/modules/base/rotation/fixedrotation.h index 23055a9c72..2f8b6b2858 100644 --- a/modules/base/rotation/fixedrotation.h +++ b/modules/base/rotation/fixedrotation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp index 01249b7389..77035c21fb 100644 --- a/modules/base/rotation/luarotation.cpp +++ b/modules/base/rotation/luarotation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rotation/luarotation.h b/modules/base/rotation/luarotation.h index 5fa1ac7967..032ee20c33 100644 --- a/modules/base/rotation/luarotation.h +++ b/modules/base/rotation/luarotation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rotation/staticrotation.cpp b/modules/base/rotation/staticrotation.cpp index 8e91ca1798..1b1c9c9a20 100644 --- a/modules/base/rotation/staticrotation.cpp +++ b/modules/base/rotation/staticrotation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/rotation/staticrotation.h b/modules/base/rotation/staticrotation.h index 9174508f16..9394631650 100644 --- a/modules/base/rotation/staticrotation.h +++ b/modules/base/rotation/staticrotation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/scale/luascale.cpp b/modules/base/scale/luascale.cpp index 33cd1affd1..8ed69aac29 100644 --- a/modules/base/scale/luascale.cpp +++ b/modules/base/scale/luascale.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/scale/luascale.h b/modules/base/scale/luascale.h index e434b924e5..e24f6d0a14 100644 --- a/modules/base/scale/luascale.h +++ b/modules/base/scale/luascale.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/scale/staticscale.cpp b/modules/base/scale/staticscale.cpp index 2250909aa8..6a3e6251dc 100644 --- a/modules/base/scale/staticscale.cpp +++ b/modules/base/scale/staticscale.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/scale/staticscale.h b/modules/base/scale/staticscale.h index 6d56351ed9..5557bbaca2 100644 --- a/modules/base/scale/staticscale.h +++ b/modules/base/scale/staticscale.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/scale/timedependentscale.cpp b/modules/base/scale/timedependentscale.cpp index 431412bbd9..4c0ed6812a 100644 --- a/modules/base/scale/timedependentscale.cpp +++ b/modules/base/scale/timedependentscale.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/scale/timedependentscale.h b/modules/base/scale/timedependentscale.h index fd15da85ad..ef0d782a51 100644 --- a/modules/base/scale/timedependentscale.h +++ b/modules/base/scale/timedependentscale.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/shaders/axes_fs.glsl b/modules/base/shaders/axes_fs.glsl index 1dcf78e416..7435730021 100644 --- a/modules/base/shaders/axes_fs.glsl +++ b/modules/base/shaders/axes_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/shaders/axes_vs.glsl b/modules/base/shaders/axes_vs.glsl index b20e90f8e2..60a723f819 100644 --- a/modules/base/shaders/axes_vs.glsl +++ b/modules/base/shaders/axes_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/shaders/grid_fs.glsl b/modules/base/shaders/grid_fs.glsl index 89dd564e57..ee5466bc80 100644 --- a/modules/base/shaders/grid_fs.glsl +++ b/modules/base/shaders/grid_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/shaders/grid_vs.glsl b/modules/base/shaders/grid_vs.glsl index 12292acd1b..5153c1f2c4 100644 --- a/modules/base/shaders/grid_vs.glsl +++ b/modules/base/shaders/grid_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/shaders/imageplane_fs.glsl b/modules/base/shaders/imageplane_fs.glsl index 4562d61474..a8e81ab9a8 100644 --- a/modules/base/shaders/imageplane_fs.glsl +++ b/modules/base/shaders/imageplane_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/shaders/imageplane_vs.glsl b/modules/base/shaders/imageplane_vs.glsl index 4ad51f9e55..0962157b38 100644 --- a/modules/base/shaders/imageplane_vs.glsl +++ b/modules/base/shaders/imageplane_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/shaders/model_fs.glsl b/modules/base/shaders/model_fs.glsl index 59a5a59509..d507183856 100644 --- a/modules/base/shaders/model_fs.glsl +++ b/modules/base/shaders/model_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/shaders/model_vs.glsl b/modules/base/shaders/model_vs.glsl index 0c1c036c5d..86c93858fa 100644 --- a/modules/base/shaders/model_vs.glsl +++ b/modules/base/shaders/model_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/shaders/plane_fs.glsl b/modules/base/shaders/plane_fs.glsl index 20e48b82fd..fe5a75d45a 100644 --- a/modules/base/shaders/plane_fs.glsl +++ b/modules/base/shaders/plane_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/shaders/plane_vs.glsl b/modules/base/shaders/plane_vs.glsl index 565c294e1a..a341672fa4 100644 --- a/modules/base/shaders/plane_vs.glsl +++ b/modules/base/shaders/plane_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/shaders/renderabletrail_fs.glsl b/modules/base/shaders/renderabletrail_fs.glsl index df8778fe70..9266fd2978 100644 --- a/modules/base/shaders/renderabletrail_fs.glsl +++ b/modules/base/shaders/renderabletrail_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/shaders/renderabletrail_vs.glsl b/modules/base/shaders/renderabletrail_vs.glsl index b77c9f7dd8..49af45b2ce 100644 --- a/modules/base/shaders/renderabletrail_vs.glsl +++ b/modules/base/shaders/renderabletrail_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/shaders/screenspace_fs.glsl b/modules/base/shaders/screenspace_fs.glsl index 5ad37e4cbe..4f88ec4be0 100644 --- a/modules/base/shaders/screenspace_fs.glsl +++ b/modules/base/shaders/screenspace_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/shaders/screenspace_vs.glsl b/modules/base/shaders/screenspace_vs.glsl index 213abe1c01..594cc5ad1b 100644 --- a/modules/base/shaders/screenspace_vs.glsl +++ b/modules/base/shaders/screenspace_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/shaders/sphere_fs.glsl b/modules/base/shaders/sphere_fs.glsl index e536a60184..e41037caa6 100644 --- a/modules/base/shaders/sphere_fs.glsl +++ b/modules/base/shaders/sphere_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/shaders/sphere_vs.glsl b/modules/base/shaders/sphere_vs.glsl index 4c52f6b21c..718f1b5748 100644 --- a/modules/base/shaders/sphere_vs.glsl +++ b/modules/base/shaders/sphere_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/timeframe/timeframeinterval.cpp b/modules/base/timeframe/timeframeinterval.cpp index b778502a2e..f24268f3fd 100644 --- a/modules/base/timeframe/timeframeinterval.cpp +++ b/modules/base/timeframe/timeframeinterval.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/timeframe/timeframeinterval.h b/modules/base/timeframe/timeframeinterval.h index 375266c7e0..e386063141 100644 --- a/modules/base/timeframe/timeframeinterval.h +++ b/modules/base/timeframe/timeframeinterval.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/timeframe/timeframeunion.cpp b/modules/base/timeframe/timeframeunion.cpp index 2fcad46663..4a01054c5b 100644 --- a/modules/base/timeframe/timeframeunion.cpp +++ b/modules/base/timeframe/timeframeunion.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/timeframe/timeframeunion.h b/modules/base/timeframe/timeframeunion.h index 1f45f8dc92..679835c7f4 100644 --- a/modules/base/timeframe/timeframeunion.h +++ b/modules/base/timeframe/timeframeunion.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp index 5d64991066..e16f486b70 100644 --- a/modules/base/translation/luatranslation.cpp +++ b/modules/base/translation/luatranslation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/translation/luatranslation.h b/modules/base/translation/luatranslation.h index dfdf019fdb..14f1836afa 100644 --- a/modules/base/translation/luatranslation.h +++ b/modules/base/translation/luatranslation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/translation/statictranslation.cpp b/modules/base/translation/statictranslation.cpp index e6673914c2..a52abb34a7 100644 --- a/modules/base/translation/statictranslation.cpp +++ b/modules/base/translation/statictranslation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/base/translation/statictranslation.h b/modules/base/translation/statictranslation.h index a1df192ae7..4b832d618c 100644 --- a/modules/base/translation/statictranslation.h +++ b/modules/base/translation/statictranslation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/cefwebgui/CMakeLists.txt b/modules/cefwebgui/CMakeLists.txt index 65ad8312e8..cd728ae7b2 100644 --- a/modules/cefwebgui/CMakeLists.txt +++ b/modules/cefwebgui/CMakeLists.txt @@ -23,27 +23,28 @@ ########################################################################################## include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) + set(CEFWEBGUI_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "CEFWEBGUI_MODULE_PATH") set(CEFWEBGUI_SOURCE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/web CACHE INTERNAL "CEFWEBGUI_MODULE_PATH") set(OPENSPACE_HEADER_FILES - cefwebguimodule.h - include/guirenderhandler.h - include/guikeyboardhandler.h - ) + cefwebguimodule.h + include/guirenderhandler.h + include/guikeyboardhandler.h +) source_group("Header Files" FILES ${OPENSPACE_HEADER_FILES}) set(OPENSPACE_SOURCE_FILES - cefwebguimodule.cpp - src/guirenderhandler.cpp - src/guikeyboardhandler.cpp - ) + cefwebguimodule.cpp + src/guirenderhandler.cpp + src/guikeyboardhandler.cpp +) source_group("Source Files" FILES ${OPENSPACE_SOURCE_FILES}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) create_new_module( - CefWebGui - cefwebgui_module - ${OPENSPACE_HEADER_FILES} ${OPENSPACE_SOURCE_FILES} + CefWebGui + cefwebgui_module + ${OPENSPACE_HEADER_FILES} ${OPENSPACE_SOURCE_FILES} ) diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp index 37cd95a7d1..af79c0f9f2 100644 --- a/modules/cefwebgui/cefwebguimodule.cpp +++ b/modules/cefwebgui/cefwebguimodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/cefwebgui/cefwebguimodule.h b/modules/cefwebgui/cefwebguimodule.h index f2960a15bc..6296ebd314 100644 --- a/modules/cefwebgui/cefwebguimodule.h +++ b/modules/cefwebgui/cefwebguimodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/cefwebgui/include/guikeyboardhandler.h b/modules/cefwebgui/include/guikeyboardhandler.h index 34344e172c..ecd2f05d19 100644 --- a/modules/cefwebgui/include/guikeyboardhandler.h +++ b/modules/cefwebgui/include/guikeyboardhandler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/cefwebgui/include/guirenderhandler.h b/modules/cefwebgui/include/guirenderhandler.h index 3f3f6cec2d..203ccf3eb9 100644 --- a/modules/cefwebgui/include/guirenderhandler.h +++ b/modules/cefwebgui/include/guirenderhandler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/cefwebgui/src/guikeyboardhandler.cpp b/modules/cefwebgui/src/guikeyboardhandler.cpp index 7d853addf2..4c562bfec7 100644 --- a/modules/cefwebgui/src/guikeyboardhandler.cpp +++ b/modules/cefwebgui/src/guikeyboardhandler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/cefwebgui/src/guirenderhandler.cpp b/modules/cefwebgui/src/guirenderhandler.cpp index 0f7f8d47b6..bf2099d697 100644 --- a/modules/cefwebgui/src/guirenderhandler.cpp +++ b/modules/cefwebgui/src/guirenderhandler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/debugging/CMakeLists.txt b/modules/debugging/CMakeLists.txt index 183dde2c9a..382ea0b1dc 100644 --- a/modules/debugging/CMakeLists.txt +++ b/modules/debugging/CMakeLists.txt @@ -25,27 +25,27 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabledebugplane.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/debugrenderer.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabledebugplane.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/debugrenderer.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabledebugplane.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/debugrenderer.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabledebugplane.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/debugrenderer.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) set(SHADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/debugshader_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/debugshader_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/debugshader_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/debugshader_fs.glsl ) source_group("Shader Files" FILES ${SHADER_FILES}) create_new_module( - "Debugging" - debugging_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} + "Debugging" + debugging_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} ) diff --git a/modules/debugging/debuggingmodule.cpp b/modules/debugging/debuggingmodule.cpp index af41de37d4..99e76a18f1 100644 --- a/modules/debugging/debuggingmodule.cpp +++ b/modules/debugging/debuggingmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/debugging/debuggingmodule.h b/modules/debugging/debuggingmodule.h index a74534a60e..27b26d8d18 100644 --- a/modules/debugging/debuggingmodule.h +++ b/modules/debugging/debuggingmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/debugging/rendering/debugrenderer.cpp b/modules/debugging/rendering/debugrenderer.cpp index e3f31b6cfe..6ffad6fd57 100644 --- a/modules/debugging/rendering/debugrenderer.cpp +++ b/modules/debugging/rendering/debugrenderer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/debugging/rendering/debugrenderer.h b/modules/debugging/rendering/debugrenderer.h index 2a84f88a36..cfdd1ea48b 100644 --- a/modules/debugging/rendering/debugrenderer.h +++ b/modules/debugging/rendering/debugrenderer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/debugging/rendering/debugshader_fs.glsl b/modules/debugging/rendering/debugshader_fs.glsl index 0bcc8faf54..17a6ba023c 100644 --- a/modules/debugging/rendering/debugshader_fs.glsl +++ b/modules/debugging/rendering/debugshader_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/debugging/rendering/debugshader_vs.glsl b/modules/debugging/rendering/debugshader_vs.glsl index 7a5aeaf5da..6302b41b06 100644 --- a/modules/debugging/rendering/debugshader_vs.glsl +++ b/modules/debugging/rendering/debugshader_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/debugging/rendering/renderabledebugplane.cpp b/modules/debugging/rendering/renderabledebugplane.cpp index f1701e27d1..b16860cef8 100644 --- a/modules/debugging/rendering/renderabledebugplane.cpp +++ b/modules/debugging/rendering/renderabledebugplane.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/debugging/rendering/renderabledebugplane.h b/modules/debugging/rendering/renderabledebugplane.h index 4976be3c07..971df23bcd 100644 --- a/modules/debugging/rendering/renderabledebugplane.h +++ b/modules/debugging/rendering/renderabledebugplane.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/CMakeLists.txt b/modules/digitaluniverse/CMakeLists.txt index 8c2ca6c144..d5f5d119b0 100644 --- a/modules/digitaluniverse/CMakeLists.txt +++ b/modules/digitaluniverse/CMakeLists.txt @@ -41,28 +41,28 @@ set(SOURCE_FILES source_group("Source Files" FILES ${SOURCE_FILES}) set(SHADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/pointssprite_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/pointssprite_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/points_sprite_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/points_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/points_gs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/points_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboard_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboard_gs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboard_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboardpolygon_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboardpolygon_gs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboardpolygon_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/dumesh_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/dumesh_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/plane_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/plane_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/pointssprite_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/pointssprite_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/points_sprite_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/points_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/points_gs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/points_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboard_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboard_gs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboard_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboardpolygon_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboardpolygon_gs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboardpolygon_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/dumesh_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/dumesh_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/plane_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/plane_fs.glsl ) source_group("Shader Files" FILES ${SHADER_FILES}) create_new_module( - "DigitalUniverse" - digitaluniverse_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} + "DigitalUniverse" + digitaluniverse_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} ) diff --git a/modules/digitaluniverse/digitaluniversemodule.cpp b/modules/digitaluniverse/digitaluniversemodule.cpp index d41365795a..7cebee2399 100644 --- a/modules/digitaluniverse/digitaluniversemodule.cpp +++ b/modules/digitaluniverse/digitaluniversemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/digitaluniversemodule.h b/modules/digitaluniverse/digitaluniversemodule.h index 74b9e652b3..dffa1914b9 100644 --- a/modules/digitaluniverse/digitaluniversemodule.h +++ b/modules/digitaluniverse/digitaluniversemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp index 7514f85ac7..9e8c1ac6fb 100644 --- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp +++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.h b/modules/digitaluniverse/rendering/renderablebillboardscloud.h index e822305fb7..d0980ad486 100644 --- a/modules/digitaluniverse/rendering/renderablebillboardscloud.h +++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp index f5b7fe3a83..2e59ecd81f 100644 --- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp +++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.h b/modules/digitaluniverse/rendering/renderabledumeshes.h index 57e1728f0b..321df6f87a 100644 --- a/modules/digitaluniverse/rendering/renderabledumeshes.h +++ b/modules/digitaluniverse/rendering/renderabledumeshes.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp index d5ea484389..e191d76582 100644 --- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp +++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.h b/modules/digitaluniverse/rendering/renderableplanescloud.h index 18c081e45e..ddde9e6023 100644 --- a/modules/digitaluniverse/rendering/renderableplanescloud.h +++ b/modules/digitaluniverse/rendering/renderableplanescloud.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/rendering/renderablepoints.cpp b/modules/digitaluniverse/rendering/renderablepoints.cpp index 22a21e3212..befe656857 100644 --- a/modules/digitaluniverse/rendering/renderablepoints.cpp +++ b/modules/digitaluniverse/rendering/renderablepoints.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/rendering/renderablepoints.h b/modules/digitaluniverse/rendering/renderablepoints.h index 1a8b63f325..f4d2711c97 100644 --- a/modules/digitaluniverse/rendering/renderablepoints.h +++ b/modules/digitaluniverse/rendering/renderablepoints.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/shaders/billboard_fs.glsl b/modules/digitaluniverse/shaders/billboard_fs.glsl index f399ebed70..bd5761bdc1 100644 --- a/modules/digitaluniverse/shaders/billboard_fs.glsl +++ b/modules/digitaluniverse/shaders/billboard_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/shaders/billboard_gs.glsl b/modules/digitaluniverse/shaders/billboard_gs.glsl index a252051069..36a5dda0da 100644 --- a/modules/digitaluniverse/shaders/billboard_gs.glsl +++ b/modules/digitaluniverse/shaders/billboard_gs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/shaders/billboard_vs.glsl b/modules/digitaluniverse/shaders/billboard_vs.glsl index 8065466a64..fe427a978e 100644 --- a/modules/digitaluniverse/shaders/billboard_vs.glsl +++ b/modules/digitaluniverse/shaders/billboard_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/shaders/billboardpolygon_fs.glsl b/modules/digitaluniverse/shaders/billboardpolygon_fs.glsl index 712f6f193e..7c76866961 100644 --- a/modules/digitaluniverse/shaders/billboardpolygon_fs.glsl +++ b/modules/digitaluniverse/shaders/billboardpolygon_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl b/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl index db86419b3a..9d7243239e 100644 --- a/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl +++ b/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/shaders/billboardpolygon_vs.glsl b/modules/digitaluniverse/shaders/billboardpolygon_vs.glsl index 6e457a03e6..9927f4b026 100644 --- a/modules/digitaluniverse/shaders/billboardpolygon_vs.glsl +++ b/modules/digitaluniverse/shaders/billboardpolygon_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/shaders/dumesh_fs.glsl b/modules/digitaluniverse/shaders/dumesh_fs.glsl index cf5e2f230a..f6192f68ff 100644 --- a/modules/digitaluniverse/shaders/dumesh_fs.glsl +++ b/modules/digitaluniverse/shaders/dumesh_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/shaders/dumesh_vs.glsl b/modules/digitaluniverse/shaders/dumesh_vs.glsl index 8cebedd32a..3e2bed3fcf 100644 --- a/modules/digitaluniverse/shaders/dumesh_vs.glsl +++ b/modules/digitaluniverse/shaders/dumesh_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/shaders/plane_fs.glsl b/modules/digitaluniverse/shaders/plane_fs.glsl index fc7b7b3fbb..41bf693217 100644 --- a/modules/digitaluniverse/shaders/plane_fs.glsl +++ b/modules/digitaluniverse/shaders/plane_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/shaders/plane_vs.glsl b/modules/digitaluniverse/shaders/plane_vs.glsl index c0c7545b53..7a25575a0b 100644 --- a/modules/digitaluniverse/shaders/plane_vs.glsl +++ b/modules/digitaluniverse/shaders/plane_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/shaders/points_fs.glsl b/modules/digitaluniverse/shaders/points_fs.glsl index 8213222819..97dbfe371d 100644 --- a/modules/digitaluniverse/shaders/points_fs.glsl +++ b/modules/digitaluniverse/shaders/points_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/shaders/points_gs.glsl b/modules/digitaluniverse/shaders/points_gs.glsl index f25ff20af9..612161fd76 100644 --- a/modules/digitaluniverse/shaders/points_gs.glsl +++ b/modules/digitaluniverse/shaders/points_gs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/shaders/points_sprite_fs.glsl b/modules/digitaluniverse/shaders/points_sprite_fs.glsl index e3166f2156..c2f6c9952d 100644 --- a/modules/digitaluniverse/shaders/points_sprite_fs.glsl +++ b/modules/digitaluniverse/shaders/points_sprite_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/shaders/points_vs.glsl b/modules/digitaluniverse/shaders/points_vs.glsl index 7a04e83ca0..e765942f17 100644 --- a/modules/digitaluniverse/shaders/points_vs.glsl +++ b/modules/digitaluniverse/shaders/points_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/shaders/pointssprite_fs.glsl b/modules/digitaluniverse/shaders/pointssprite_fs.glsl index c0b51c198d..ff54c1253e 100644 --- a/modules/digitaluniverse/shaders/pointssprite_fs.glsl +++ b/modules/digitaluniverse/shaders/pointssprite_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/digitaluniverse/shaders/pointssprite_vs.glsl b/modules/digitaluniverse/shaders/pointssprite_vs.glsl index ce8db4e2f7..7d6318a258 100644 --- a/modules/digitaluniverse/shaders/pointssprite_vs.glsl +++ b/modules/digitaluniverse/shaders/pointssprite_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlines/CMakeLists.txt b/modules/fieldlines/CMakeLists.txt index fb386608fb..7bfcaf2c08 100644 --- a/modules/fieldlines/CMakeLists.txt +++ b/modules/fieldlines/CMakeLists.txt @@ -25,25 +25,25 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefieldlines.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefieldlines.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefieldlines.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefieldlines.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) set(SHADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fieldline_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fieldline_gs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fieldline_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fieldline_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fieldline_gs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fieldline_vs.glsl ) source_group("Shader Files" FILES ${SHADER_FILES}) create_new_module( - "Fieldlines" - fieldlines_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} + "Fieldlines" + fieldlines_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} ) diff --git a/modules/fieldlines/fieldlinesmodule.cpp b/modules/fieldlines/fieldlinesmodule.cpp index f876c01a41..5ddcbed1bf 100644 --- a/modules/fieldlines/fieldlinesmodule.cpp +++ b/modules/fieldlines/fieldlinesmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlines/fieldlinesmodule.h b/modules/fieldlines/fieldlinesmodule.h index 3f9f7be460..b9ffe0e845 100644 --- a/modules/fieldlines/fieldlinesmodule.h +++ b/modules/fieldlines/fieldlinesmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp index 2707f5a232..fec84ed88b 100644 --- a/modules/fieldlines/rendering/renderablefieldlines.cpp +++ b/modules/fieldlines/rendering/renderablefieldlines.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlines/rendering/renderablefieldlines.h b/modules/fieldlines/rendering/renderablefieldlines.h index 03c8dba17e..690e50343e 100644 --- a/modules/fieldlines/rendering/renderablefieldlines.h +++ b/modules/fieldlines/rendering/renderablefieldlines.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlines/shaders/fieldline_fs.glsl b/modules/fieldlines/shaders/fieldline_fs.glsl index ec8d7b5ea7..c76f07490c 100644 --- a/modules/fieldlines/shaders/fieldline_fs.glsl +++ b/modules/fieldlines/shaders/fieldline_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlines/shaders/fieldline_gs.glsl b/modules/fieldlines/shaders/fieldline_gs.glsl index fc4d168db0..cb55a36d0f 100644 --- a/modules/fieldlines/shaders/fieldline_gs.glsl +++ b/modules/fieldlines/shaders/fieldline_gs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlines/shaders/fieldline_vs.glsl b/modules/fieldlines/shaders/fieldline_vs.glsl index 388578a7eb..8c566324ec 100644 --- a/modules/fieldlines/shaders/fieldline_vs.glsl +++ b/modules/fieldlines/shaders/fieldline_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlinessequence/CMakeLists.txt b/modules/fieldlinessequence/CMakeLists.txt index c17e1937a8..773a428c3f 100644 --- a/modules/fieldlinessequence/CMakeLists.txt +++ b/modules/fieldlinessequence/CMakeLists.txt @@ -25,29 +25,29 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefieldlinessequence.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/fieldlinesstate.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/commons.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/kameleonfieldlinehelper.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefieldlinessequence.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/fieldlinesstate.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/commons.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/kameleonfieldlinehelper.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefieldlinessequence.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/fieldlinesstate.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/commons.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/kameleonfieldlinehelper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefieldlinessequence.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/fieldlinesstate.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/commons.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/kameleonfieldlinehelper.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) set(SHADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fieldlinessequence_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fieldlinessequence_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fieldlinessequence_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fieldlinessequence_fs.glsl ) source_group("Shader Files" FILES ${SHADER_FILES}) create_new_module( - "FieldlinesSequence" - fieldlinessequence_module - ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} + "FieldlinesSequence" + fieldlinessequence_module + ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} ) diff --git a/modules/fieldlinessequence/fieldlinessequencemodule.cpp b/modules/fieldlinessequence/fieldlinessequencemodule.cpp index 1fd78b3964..fc9e763ee0 100644 --- a/modules/fieldlinessequence/fieldlinessequencemodule.cpp +++ b/modules/fieldlinessequence/fieldlinessequencemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlinessequence/fieldlinessequencemodule.h b/modules/fieldlinessequence/fieldlinessequencemodule.h index 647a4d8b51..6143273a86 100644 --- a/modules/fieldlinessequence/fieldlinessequencemodule.h +++ b/modules/fieldlinessequence/fieldlinessequencemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp index 8903e16684..1afc04feab 100644 --- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp +++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h index c4c174e6e3..77a2263045 100644 --- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h +++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl b/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl index 8877501e38..4ffe5a3679 100644 --- a/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl +++ b/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl b/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl index 98f18d61ec..822c401516 100644 --- a/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl +++ b/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlinessequence/util/commons.cpp b/modules/fieldlinessequence/util/commons.cpp index 48bce4d610..032be6107d 100644 --- a/modules/fieldlinessequence/util/commons.cpp +++ b/modules/fieldlinessequence/util/commons.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlinessequence/util/commons.h b/modules/fieldlinessequence/util/commons.h index 9fde3fe9cc..095dcdfc30 100644 --- a/modules/fieldlinessequence/util/commons.h +++ b/modules/fieldlinessequence/util/commons.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlinessequence/util/fieldlinesstate.cpp b/modules/fieldlinessequence/util/fieldlinesstate.cpp index cce890eb6e..6377b4d648 100644 --- a/modules/fieldlinessequence/util/fieldlinesstate.cpp +++ b/modules/fieldlinessequence/util/fieldlinesstate.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlinessequence/util/fieldlinesstate.h b/modules/fieldlinessequence/util/fieldlinesstate.h index f7c7199861..7011c0547e 100644 --- a/modules/fieldlinessequence/util/fieldlinesstate.h +++ b/modules/fieldlinessequence/util/fieldlinesstate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp index e462d44e7b..7bacdebb00 100644 --- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp +++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.h b/modules/fieldlinessequence/util/kameleonfieldlinehelper.h index 753245ec41..2c53f524b9 100644 --- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.h +++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fitsfilereader/CMakeLists.txt b/modules/fitsfilereader/CMakeLists.txt index 27befc12ae..46e0c43125 100644 --- a/modules/fitsfilereader/CMakeLists.txt +++ b/modules/fitsfilereader/CMakeLists.txt @@ -26,22 +26,22 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) include(${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/fitsfilereadermodule.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/fitsfilereader.h + ${CMAKE_CURRENT_SOURCE_DIR}/fitsfilereadermodule.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/fitsfilereader.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/fitsfilereadermodule.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/fitsfilereader.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/fitsfilereadermodule.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/fitsfilereader.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) create_new_module( - "FitsFileReader" - fitsfilereader - ${HEADER_FILES} - ${SOURCE_FILES} + "FitsFileReader" + fitsfilereader + ${HEADER_FILES} + ${SOURCE_FILES} ) # Set root directories for external libraries. @@ -57,6 +57,5 @@ set_folder_location(cfitsio "External") add_subdirectory(${CCFITS_ROOT_DIR}) set_folder_location(CCfits "External") - -TARGET_INCLUDE_DIRECTORIES(${MODULE_NAME} SYSTEM PUBLIC ${INCLUDES_FOR_TARGET}) -TARGET_LINK_LIBRARIES(${MODULE_NAME} CCfits) +target_include_directories(${MODULE_NAME} SYSTEM PUBLIC ${INCLUDES_FOR_TARGET}) +target_link_libraries(${MODULE_NAME} PRIVATE CCfits) diff --git a/modules/fitsfilereader/fitsfilereadermodule.cpp b/modules/fitsfilereader/fitsfilereadermodule.cpp index 1e3e27a904..3aeb83f509 100644 --- a/modules/fitsfilereader/fitsfilereadermodule.cpp +++ b/modules/fitsfilereader/fitsfilereadermodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fitsfilereader/fitsfilereadermodule.h b/modules/fitsfilereader/fitsfilereadermodule.h index e4698ba54d..7eb7467ceb 100644 --- a/modules/fitsfilereader/fitsfilereadermodule.h +++ b/modules/fitsfilereader/fitsfilereadermodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fitsfilereader/include/fitsfilereader.h b/modules/fitsfilereader/include/fitsfilereader.h index 18b98cfbdd..3ec05c1c3c 100644 --- a/modules/fitsfilereader/include/fitsfilereader.h +++ b/modules/fitsfilereader/include/fitsfilereader.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/fitsfilereader/src/fitsfilereader.cpp b/modules/fitsfilereader/src/fitsfilereader.cpp index 9a105f1519..980d6473aa 100644 --- a/modules/fitsfilereader/src/fitsfilereader.cpp +++ b/modules/fitsfilereader/src/fitsfilereader.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/CMakeLists.txt b/modules/gaia/CMakeLists.txt index e83e55bc08..fdef0ffbf5 100644 --- a/modules/gaia/CMakeLists.txt +++ b/modules/gaia/CMakeLists.txt @@ -25,47 +25,47 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/gaiamodule.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablegaiastars.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/octreemanager.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/octreeculler.h - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readfilejob.h - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readfitstask.h - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readspecktask.h - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/constructoctreetask.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/gaiaoptions.h + ${CMAKE_CURRENT_SOURCE_DIR}/gaiamodule.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablegaiastars.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/octreemanager.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/octreeculler.h + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readfilejob.h + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readfitstask.h + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readspecktask.h + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/constructoctreetask.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/gaiaoptions.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/gaiamodule.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablegaiastars.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/octreemanager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/octreeculler.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readfilejob.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readfitstask.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readspecktask.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/constructoctreetask.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/gaiamodule.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablegaiastars.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/octreemanager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/octreeculler.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readfilejob.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readfitstask.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readspecktask.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/constructoctreetask.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) set(SHADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_vbo_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_ssbo_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_billboard_nofbo_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_billboard_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_billboard_ge.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_point_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_point_ge.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_tonemapping_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_tonemapping_point_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_tonemapping_billboard_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_vbo_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_ssbo_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_billboard_nofbo_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_billboard_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_billboard_ge.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_point_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_point_ge.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_tonemapping_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_tonemapping_point_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_tonemapping_billboard_fs.glsl ) source_group("Shader Files" FILES ${SHADER_FILES}) create_new_module( - "Gaia" - gaia - STATIC - ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} + "Gaia" + gaia + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} ) diff --git a/modules/gaia/gaiamodule.cpp b/modules/gaia/gaiamodule.cpp index 99351f89ea..0c2f233199 100644 --- a/modules/gaia/gaiamodule.cpp +++ b/modules/gaia/gaiamodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/gaiamodule.h b/modules/gaia/gaiamodule.h index 038bd8660c..1a5befc41c 100644 --- a/modules/gaia/gaiamodule.h +++ b/modules/gaia/gaiamodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/rendering/gaiaoptions.h b/modules/gaia/rendering/gaiaoptions.h index f6beab2e1b..219d8b2104 100644 --- a/modules/gaia/rendering/gaiaoptions.h +++ b/modules/gaia/rendering/gaiaoptions.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/rendering/octreeculler.cpp b/modules/gaia/rendering/octreeculler.cpp index 04df883c77..8a1bb32f05 100644 --- a/modules/gaia/rendering/octreeculler.cpp +++ b/modules/gaia/rendering/octreeculler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/rendering/octreeculler.h b/modules/gaia/rendering/octreeculler.h index 4800eda85f..46025a0aab 100644 --- a/modules/gaia/rendering/octreeculler.h +++ b/modules/gaia/rendering/octreeculler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/rendering/octreemanager.cpp b/modules/gaia/rendering/octreemanager.cpp index d6462292e8..63efa73a43 100644 --- a/modules/gaia/rendering/octreemanager.cpp +++ b/modules/gaia/rendering/octreemanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/rendering/octreemanager.h b/modules/gaia/rendering/octreemanager.h index d8d4b3fe85..1d5fbb502e 100644 --- a/modules/gaia/rendering/octreemanager.h +++ b/modules/gaia/rendering/octreemanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp index 2debb39862..cb7522f99d 100644 --- a/modules/gaia/rendering/renderablegaiastars.cpp +++ b/modules/gaia/rendering/renderablegaiastars.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/rendering/renderablegaiastars.h b/modules/gaia/rendering/renderablegaiastars.h index 816f5a1435..2583b80a52 100644 --- a/modules/gaia/rendering/renderablegaiastars.h +++ b/modules/gaia/rendering/renderablegaiastars.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/shaders/gaia_billboard_fs.glsl b/modules/gaia/shaders/gaia_billboard_fs.glsl index d97a7cb99a..cf19477232 100644 --- a/modules/gaia/shaders/gaia_billboard_fs.glsl +++ b/modules/gaia/shaders/gaia_billboard_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/shaders/gaia_billboard_ge.glsl b/modules/gaia/shaders/gaia_billboard_ge.glsl index 08a2b4cc72..498df41df8 100644 --- a/modules/gaia/shaders/gaia_billboard_ge.glsl +++ b/modules/gaia/shaders/gaia_billboard_ge.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl b/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl index caeff99ac1..477a24a3ea 100644 --- a/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl +++ b/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/shaders/gaia_point_fs.glsl b/modules/gaia/shaders/gaia_point_fs.glsl index e32071e956..35e77c28fc 100644 --- a/modules/gaia/shaders/gaia_point_fs.glsl +++ b/modules/gaia/shaders/gaia_point_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/shaders/gaia_point_ge.glsl b/modules/gaia/shaders/gaia_point_ge.glsl index 59c253ed9c..da23cf0cff 100644 --- a/modules/gaia/shaders/gaia_point_ge.glsl +++ b/modules/gaia/shaders/gaia_point_ge.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/shaders/gaia_ssbo_vs.glsl b/modules/gaia/shaders/gaia_ssbo_vs.glsl index 9977566b04..95fa3d99dd 100644 --- a/modules/gaia/shaders/gaia_ssbo_vs.glsl +++ b/modules/gaia/shaders/gaia_ssbo_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl b/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl index cdfe6c3cd7..1643a261ea 100644 --- a/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl +++ b/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl b/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl index 89d091c223..965f735b49 100644 --- a/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl +++ b/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/shaders/gaia_tonemapping_vs.glsl b/modules/gaia/shaders/gaia_tonemapping_vs.glsl index 97e3a86a3a..89f1175b56 100644 --- a/modules/gaia/shaders/gaia_tonemapping_vs.glsl +++ b/modules/gaia/shaders/gaia_tonemapping_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/shaders/gaia_vbo_vs.glsl b/modules/gaia/shaders/gaia_vbo_vs.glsl index fcb0abe114..25bc51f9c0 100644 --- a/modules/gaia/shaders/gaia_vbo_vs.glsl +++ b/modules/gaia/shaders/gaia_vbo_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/tasks/constructoctreetask.cpp b/modules/gaia/tasks/constructoctreetask.cpp index 4263675243..7af1fc746e 100644 --- a/modules/gaia/tasks/constructoctreetask.cpp +++ b/modules/gaia/tasks/constructoctreetask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/tasks/constructoctreetask.h b/modules/gaia/tasks/constructoctreetask.h index ce31454c01..2954aea07c 100644 --- a/modules/gaia/tasks/constructoctreetask.h +++ b/modules/gaia/tasks/constructoctreetask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/tasks/readfilejob.cpp b/modules/gaia/tasks/readfilejob.cpp index 9d7292c030..c3357ad362 100644 --- a/modules/gaia/tasks/readfilejob.cpp +++ b/modules/gaia/tasks/readfilejob.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/tasks/readfilejob.h b/modules/gaia/tasks/readfilejob.h index b6742881a3..f615e80ff2 100644 --- a/modules/gaia/tasks/readfilejob.h +++ b/modules/gaia/tasks/readfilejob.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/tasks/readfitstask.cpp b/modules/gaia/tasks/readfitstask.cpp index 07d1eb2d0c..8572f64078 100644 --- a/modules/gaia/tasks/readfitstask.cpp +++ b/modules/gaia/tasks/readfitstask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/tasks/readfitstask.h b/modules/gaia/tasks/readfitstask.h index 1a917633b9..bd97e3d0be 100644 --- a/modules/gaia/tasks/readfitstask.h +++ b/modules/gaia/tasks/readfitstask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/tasks/readspecktask.cpp b/modules/gaia/tasks/readspecktask.cpp index aa9600fb36..1665ef0963 100644 --- a/modules/gaia/tasks/readspecktask.cpp +++ b/modules/gaia/tasks/readspecktask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/gaia/tasks/readspecktask.h b/modules/gaia/tasks/readspecktask.h index 8ea14c5416..3a5cd097ff 100644 --- a/modules/gaia/tasks/readspecktask.h +++ b/modules/gaia/tasks/readspecktask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/galaxy/CMakeLists.txt b/modules/galaxy/CMakeLists.txt index 90efd399f4..f1bed8c93a 100644 --- a/modules/galaxy/CMakeLists.txt +++ b/modules/galaxy/CMakeLists.txt @@ -25,26 +25,26 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/galaxymodule.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/galaxyraycaster.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablegalaxy.h - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/milkywayconversiontask.h - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/milkywaypointsconversiontask.h + ${CMAKE_CURRENT_SOURCE_DIR}/galaxymodule.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/galaxyraycaster.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablegalaxy.h + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/milkywayconversiontask.h + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/milkywaypointsconversiontask.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/galaxymodule.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/galaxyraycaster.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablegalaxy.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/milkywayconversiontask.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/milkywaypointsconversiontask.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/galaxymodule.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/galaxyraycaster.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablegalaxy.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/milkywayconversiontask.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/milkywaypointsconversiontask.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) create_new_module( - "Galaxy" - galaxy - STATIC - ${HEADER_FILES} ${SOURCE_FILES} + "Galaxy" + galaxy + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ) diff --git a/modules/galaxy/galaxymodule.cpp b/modules/galaxy/galaxymodule.cpp index 0faf1a227a..63695821bd 100644 --- a/modules/galaxy/galaxymodule.cpp +++ b/modules/galaxy/galaxymodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/galaxy/galaxymodule.h b/modules/galaxy/galaxymodule.h index 1a24ed420f..1a7e6a3e1a 100644 --- a/modules/galaxy/galaxymodule.h +++ b/modules/galaxy/galaxymodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/galaxy/rendering/galaxyraycaster.cpp b/modules/galaxy/rendering/galaxyraycaster.cpp index 193ad4f5ca..cc218de91f 100644 --- a/modules/galaxy/rendering/galaxyraycaster.cpp +++ b/modules/galaxy/rendering/galaxyraycaster.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/galaxy/rendering/galaxyraycaster.h b/modules/galaxy/rendering/galaxyraycaster.h index c758858811..8337874c1a 100644 --- a/modules/galaxy/rendering/galaxyraycaster.h +++ b/modules/galaxy/rendering/galaxyraycaster.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp index bdd1f4a551..e4a589eac0 100644 --- a/modules/galaxy/rendering/renderablegalaxy.cpp +++ b/modules/galaxy/rendering/renderablegalaxy.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/galaxy/rendering/renderablegalaxy.h b/modules/galaxy/rendering/renderablegalaxy.h index b221f5f989..3132524ad8 100644 --- a/modules/galaxy/rendering/renderablegalaxy.h +++ b/modules/galaxy/rendering/renderablegalaxy.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/galaxy/tasks/milkywayconversiontask.cpp b/modules/galaxy/tasks/milkywayconversiontask.cpp index 0f8e825527..dd6c59cc7e 100644 --- a/modules/galaxy/tasks/milkywayconversiontask.cpp +++ b/modules/galaxy/tasks/milkywayconversiontask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/galaxy/tasks/milkywayconversiontask.h b/modules/galaxy/tasks/milkywayconversiontask.h index 216357c12d..0fefa0eb2b 100644 --- a/modules/galaxy/tasks/milkywayconversiontask.h +++ b/modules/galaxy/tasks/milkywayconversiontask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp index f445813dbb..53f487bf23 100644 --- a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp +++ b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/galaxy/tasks/milkywaypointsconversiontask.h b/modules/galaxy/tasks/milkywaypointsconversiontask.h index 81c5036160..7b54632167 100644 --- a/modules/galaxy/tasks/milkywaypointsconversiontask.h +++ b/modules/galaxy/tasks/milkywaypointsconversiontask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/CMakeLists.txt b/modules/globebrowsing/CMakeLists.txt index 685edd58a8..82b005e216 100644 --- a/modules/globebrowsing/CMakeLists.txt +++ b/modules/globebrowsing/CMakeLists.txt @@ -25,115 +25,115 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/globebrowsingmodule.h + ${CMAKE_CURRENT_SOURCE_DIR}/globebrowsingmodule.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/asynctiledataprovider.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/basictypes.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/dashboarditemglobelocation.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/ellipsoid.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/gdalwrapper.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/geodeticpatch.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/globetranslation.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/gpulayergroup.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/layer.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/layeradjustment.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/layergroup.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/layergroupid.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/layermanager.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/layerrendersettings.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/lrucache.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/lrucache.inl - ${CMAKE_CURRENT_SOURCE_DIR}/src/lruthreadpool.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/lruthreadpool.inl - ${CMAKE_CURRENT_SOURCE_DIR}/src/memoryawaretilecache.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/prioritizingconcurrentjobmanager.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/prioritizingconcurrentjobmanager.inl - ${CMAKE_CURRENT_SOURCE_DIR}/src/rawtile.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/rawtiledatareader.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/renderableglobe.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/skirtedgrid.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/tileindex.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/tileloadjob.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/tileprovider.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/tiletextureinitdata.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/timequantizer.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/asynctiledataprovider.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/basictypes.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/dashboarditemglobelocation.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/ellipsoid.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/gdalwrapper.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/geodeticpatch.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/globetranslation.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/gpulayergroup.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/layer.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/layeradjustment.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/layergroup.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/layergroupid.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/layermanager.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/layerrendersettings.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/lrucache.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/lrucache.inl + ${CMAKE_CURRENT_SOURCE_DIR}/src/lruthreadpool.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/lruthreadpool.inl + ${CMAKE_CURRENT_SOURCE_DIR}/src/memoryawaretilecache.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/prioritizingconcurrentjobmanager.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/prioritizingconcurrentjobmanager.inl + ${CMAKE_CURRENT_SOURCE_DIR}/src/rawtile.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/rawtiledatareader.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/renderableglobe.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/skirtedgrid.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/tileindex.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/tileloadjob.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/tileprovider.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/tiletextureinitdata.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/timequantizer.h ) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/globebrowsingmodule.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/globebrowsingmodule_lua.inl + ${CMAKE_CURRENT_SOURCE_DIR}/globebrowsingmodule.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/globebrowsingmodule_lua.inl - ${CMAKE_CURRENT_SOURCE_DIR}/src/asynctiledataprovider.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/dashboarditemglobelocation.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/ellipsoid.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/gdalwrapper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/geodeticpatch.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/globetranslation.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/gpulayergroup.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/layer.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/layeradjustment.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/layergroup.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/layergroupid.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/layermanager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/layerrendersettings.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/memoryawaretilecache.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/rawtile.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/rawtiledatareader.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/renderableglobe.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/skirtedgrid.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/tileindex.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/tileloadjob.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/tileprovider.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/tiletextureinitdata.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/timequantizer.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/asynctiledataprovider.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/dashboarditemglobelocation.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/ellipsoid.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/gdalwrapper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/geodeticpatch.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/globetranslation.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/gpulayergroup.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/layer.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/layeradjustment.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/layergroup.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/layergroupid.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/layermanager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/layerrendersettings.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/memoryawaretilecache.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/rawtile.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/rawtiledatareader.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/renderableglobe.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/skirtedgrid.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/tileindex.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/tileloadjob.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/tileprovider.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/tiletextureinitdata.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/timequantizer.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) set(SHADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/blending.hglsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/globalrenderer_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/localrenderer_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderer_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/texturetilemapping.hglsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/tile.hglsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/tileheight.hglsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/tilevertexskirt.hglsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/blending.hglsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/globalrenderer_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/localrenderer_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderer_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/texturetilemapping.hglsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/tile.hglsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/tileheight.hglsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/tilevertexskirt.hglsl ) source_group("Shader Files" FILES ${SHADER_FILES}) create_new_module( - "GlobeBrowsing" - globebrowsing_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} + "GlobeBrowsing" + globebrowsing_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} ) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gdal_data DESTINATION modules/globebrowsing) if (WIN32) - target_include_directories( - openspace-module-globebrowsing - SYSTEM PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/include - ) + target_include_directories( + openspace-module-globebrowsing + SYSTEM PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/include + ) - target_link_libraries( - openspace-module-globebrowsing - ${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/lib/gdal_i.lib - ) - register_external_libraries("${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/lib/gdal203.dll") + target_link_libraries( + openspace-module-globebrowsing + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/lib/gdal_i.lib + ) + register_external_libraries("${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/lib/gdal203.dll") else (WIN32) - find_package(GDAL REQUIRED) + find_package(GDAL REQUIRED) - target_include_directories( - openspace-module-globebrowsing - SYSTEM PUBLIC - ${GDAL_INCLUDE_DIR} - ) + target_include_directories( + openspace-module-globebrowsing + SYSTEM PUBLIC + ${GDAL_INCLUDE_DIR} + ) - target_link_libraries(openspace-module-globebrowsing ${GDAL_LIBRARY}) - - mark_as_advanced(GDAL_CONFIG GDAL_INCLUDE_DIR GDAL_LIBRARY) + target_link_libraries(openspace-module-globebrowsing PRIVATE ${GDAL_LIBRARY}) + mark_as_advanced(GDAL_CONFIG GDAL_INCLUDE_DIR GDAL_LIBRARY) endif () # WIN32 diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp index c614dc86d0..739d714841 100644 --- a/modules/globebrowsing/globebrowsingmodule.cpp +++ b/modules/globebrowsing/globebrowsingmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/globebrowsingmodule.h b/modules/globebrowsing/globebrowsingmodule.h index b5981d5361..34899d5557 100644 --- a/modules/globebrowsing/globebrowsingmodule.h +++ b/modules/globebrowsing/globebrowsingmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl index f9192e5777..4e082524e1 100644 --- a/modules/globebrowsing/globebrowsingmodule_lua.inl +++ b/modules/globebrowsing/globebrowsingmodule_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/shaders/blending.hglsl b/modules/globebrowsing/shaders/blending.hglsl index 338a74ede3..ed63e61461 100644 --- a/modules/globebrowsing/shaders/blending.hglsl +++ b/modules/globebrowsing/shaders/blending.hglsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/shaders/globalrenderer_vs.glsl b/modules/globebrowsing/shaders/globalrenderer_vs.glsl index 24a1f6cbcb..fc0ec6620a 100644 --- a/modules/globebrowsing/shaders/globalrenderer_vs.glsl +++ b/modules/globebrowsing/shaders/globalrenderer_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/shaders/localrenderer_vs.glsl b/modules/globebrowsing/shaders/localrenderer_vs.glsl index 764d3411ea..7a2e661320 100644 --- a/modules/globebrowsing/shaders/localrenderer_vs.glsl +++ b/modules/globebrowsing/shaders/localrenderer_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/shaders/renderer_fs.glsl b/modules/globebrowsing/shaders/renderer_fs.glsl index 0446156bf8..388f1f1fb6 100644 --- a/modules/globebrowsing/shaders/renderer_fs.glsl +++ b/modules/globebrowsing/shaders/renderer_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/shaders/texturetilemapping.hglsl b/modules/globebrowsing/shaders/texturetilemapping.hglsl index a83e129446..24820242c7 100644 --- a/modules/globebrowsing/shaders/texturetilemapping.hglsl +++ b/modules/globebrowsing/shaders/texturetilemapping.hglsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/shaders/tile.hglsl b/modules/globebrowsing/shaders/tile.hglsl index 7b37bafe8d..ceb779fe46 100644 --- a/modules/globebrowsing/shaders/tile.hglsl +++ b/modules/globebrowsing/shaders/tile.hglsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/shaders/tileheight.hglsl b/modules/globebrowsing/shaders/tileheight.hglsl index 3722b481f0..1d7c275997 100644 --- a/modules/globebrowsing/shaders/tileheight.hglsl +++ b/modules/globebrowsing/shaders/tileheight.hglsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/shaders/tilevertexskirt.hglsl b/modules/globebrowsing/shaders/tilevertexskirt.hglsl index c31d9c8b0c..a2ae1f5163 100644 --- a/modules/globebrowsing/shaders/tilevertexskirt.hglsl +++ b/modules/globebrowsing/shaders/tilevertexskirt.hglsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/asynctiledataprovider.cpp b/modules/globebrowsing/src/asynctiledataprovider.cpp index 7273ab967a..7dc6c5cde0 100644 --- a/modules/globebrowsing/src/asynctiledataprovider.cpp +++ b/modules/globebrowsing/src/asynctiledataprovider.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/asynctiledataprovider.h b/modules/globebrowsing/src/asynctiledataprovider.h index 3ae67142a2..7576170cb1 100644 --- a/modules/globebrowsing/src/asynctiledataprovider.h +++ b/modules/globebrowsing/src/asynctiledataprovider.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/basictypes.h b/modules/globebrowsing/src/basictypes.h index b54e4188da..e4fce70c48 100644 --- a/modules/globebrowsing/src/basictypes.h +++ b/modules/globebrowsing/src/basictypes.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.cpp b/modules/globebrowsing/src/dashboarditemglobelocation.cpp index e8fd9fb70f..86ab30d9e0 100644 --- a/modules/globebrowsing/src/dashboarditemglobelocation.cpp +++ b/modules/globebrowsing/src/dashboarditemglobelocation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.h b/modules/globebrowsing/src/dashboarditemglobelocation.h index f04040e9a6..a4528a81d3 100644 --- a/modules/globebrowsing/src/dashboarditemglobelocation.h +++ b/modules/globebrowsing/src/dashboarditemglobelocation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/ellipsoid.cpp b/modules/globebrowsing/src/ellipsoid.cpp index 4954cf162b..7cb68b4c05 100644 --- a/modules/globebrowsing/src/ellipsoid.cpp +++ b/modules/globebrowsing/src/ellipsoid.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/ellipsoid.h b/modules/globebrowsing/src/ellipsoid.h index 3a0c83edd9..20eb0b29ae 100644 --- a/modules/globebrowsing/src/ellipsoid.h +++ b/modules/globebrowsing/src/ellipsoid.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/gdalwrapper.cpp b/modules/globebrowsing/src/gdalwrapper.cpp index c40b65ce7e..b70fb514e9 100644 --- a/modules/globebrowsing/src/gdalwrapper.cpp +++ b/modules/globebrowsing/src/gdalwrapper.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/gdalwrapper.h b/modules/globebrowsing/src/gdalwrapper.h index 427bc230a4..24ffd4431c 100644 --- a/modules/globebrowsing/src/gdalwrapper.h +++ b/modules/globebrowsing/src/gdalwrapper.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/geodeticpatch.cpp b/modules/globebrowsing/src/geodeticpatch.cpp index 89225577ba..5caf972989 100644 --- a/modules/globebrowsing/src/geodeticpatch.cpp +++ b/modules/globebrowsing/src/geodeticpatch.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/geodeticpatch.h b/modules/globebrowsing/src/geodeticpatch.h index 7d307070e1..c4c9f1f257 100644 --- a/modules/globebrowsing/src/geodeticpatch.h +++ b/modules/globebrowsing/src/geodeticpatch.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/globetranslation.cpp b/modules/globebrowsing/src/globetranslation.cpp index 8cab831e81..6c4a5ea2c9 100644 --- a/modules/globebrowsing/src/globetranslation.cpp +++ b/modules/globebrowsing/src/globetranslation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/globetranslation.h b/modules/globebrowsing/src/globetranslation.h index 0486497a32..7fbd943b7b 100644 --- a/modules/globebrowsing/src/globetranslation.h +++ b/modules/globebrowsing/src/globetranslation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/gpulayergroup.cpp b/modules/globebrowsing/src/gpulayergroup.cpp index cdd745ad9b..ab581bbd70 100644 --- a/modules/globebrowsing/src/gpulayergroup.cpp +++ b/modules/globebrowsing/src/gpulayergroup.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/gpulayergroup.h b/modules/globebrowsing/src/gpulayergroup.h index 637236ca32..471a9080e8 100644 --- a/modules/globebrowsing/src/gpulayergroup.h +++ b/modules/globebrowsing/src/gpulayergroup.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp index b47daea44a..52e69b7731 100644 --- a/modules/globebrowsing/src/layer.cpp +++ b/modules/globebrowsing/src/layer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/layer.h b/modules/globebrowsing/src/layer.h index fd90b52aab..4658468b90 100644 --- a/modules/globebrowsing/src/layer.h +++ b/modules/globebrowsing/src/layer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/layeradjustment.cpp b/modules/globebrowsing/src/layeradjustment.cpp index 7a51e51721..e529c544ed 100644 --- a/modules/globebrowsing/src/layeradjustment.cpp +++ b/modules/globebrowsing/src/layeradjustment.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/layeradjustment.h b/modules/globebrowsing/src/layeradjustment.h index 3217eb4b89..eefa79c047 100644 --- a/modules/globebrowsing/src/layeradjustment.h +++ b/modules/globebrowsing/src/layeradjustment.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp index d849fb162d..f6088e8869 100644 --- a/modules/globebrowsing/src/layergroup.cpp +++ b/modules/globebrowsing/src/layergroup.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/layergroup.h b/modules/globebrowsing/src/layergroup.h index be4d77ada1..923cef7011 100644 --- a/modules/globebrowsing/src/layergroup.h +++ b/modules/globebrowsing/src/layergroup.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/layergroupid.cpp b/modules/globebrowsing/src/layergroupid.cpp index 02953b78ba..69f8163939 100644 --- a/modules/globebrowsing/src/layergroupid.cpp +++ b/modules/globebrowsing/src/layergroupid.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/layergroupid.h b/modules/globebrowsing/src/layergroupid.h index ccee165d64..ea363420a4 100644 --- a/modules/globebrowsing/src/layergroupid.h +++ b/modules/globebrowsing/src/layergroupid.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/layermanager.cpp b/modules/globebrowsing/src/layermanager.cpp index 2bd565ea9f..0f442d8bcf 100644 --- a/modules/globebrowsing/src/layermanager.cpp +++ b/modules/globebrowsing/src/layermanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/layermanager.h b/modules/globebrowsing/src/layermanager.h index 059b9add37..de7fbb4c62 100644 --- a/modules/globebrowsing/src/layermanager.h +++ b/modules/globebrowsing/src/layermanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/layerrendersettings.cpp b/modules/globebrowsing/src/layerrendersettings.cpp index 06f8787e36..b876a52c4a 100644 --- a/modules/globebrowsing/src/layerrendersettings.cpp +++ b/modules/globebrowsing/src/layerrendersettings.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/layerrendersettings.h b/modules/globebrowsing/src/layerrendersettings.h index 7fd042ac69..99c688683a 100644 --- a/modules/globebrowsing/src/layerrendersettings.h +++ b/modules/globebrowsing/src/layerrendersettings.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/lrucache.h b/modules/globebrowsing/src/lrucache.h index a53de0bcd1..382534e418 100644 --- a/modules/globebrowsing/src/lrucache.h +++ b/modules/globebrowsing/src/lrucache.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/lrucache.inl b/modules/globebrowsing/src/lrucache.inl index a5bb3d28f1..188cd7d0d5 100644 --- a/modules/globebrowsing/src/lrucache.inl +++ b/modules/globebrowsing/src/lrucache.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/lruthreadpool.h b/modules/globebrowsing/src/lruthreadpool.h index 47777df450..e2ee9da954 100644 --- a/modules/globebrowsing/src/lruthreadpool.h +++ b/modules/globebrowsing/src/lruthreadpool.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/lruthreadpool.inl b/modules/globebrowsing/src/lruthreadpool.inl index b1c39fe9b4..1690ddb88a 100644 --- a/modules/globebrowsing/src/lruthreadpool.inl +++ b/modules/globebrowsing/src/lruthreadpool.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/memoryawaretilecache.cpp b/modules/globebrowsing/src/memoryawaretilecache.cpp index 4449b91493..fc833dcaef 100644 --- a/modules/globebrowsing/src/memoryawaretilecache.cpp +++ b/modules/globebrowsing/src/memoryawaretilecache.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/memoryawaretilecache.h b/modules/globebrowsing/src/memoryawaretilecache.h index 29beb51eb3..ae043ccce4 100644 --- a/modules/globebrowsing/src/memoryawaretilecache.h +++ b/modules/globebrowsing/src/memoryawaretilecache.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h index cd25bd0914..fc8fb5fd56 100644 --- a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h +++ b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl index 9690e6a4e6..9fcc65ba3d 100644 --- a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl +++ b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/rawtile.cpp b/modules/globebrowsing/src/rawtile.cpp index 2906db5367..9ac964de28 100644 --- a/modules/globebrowsing/src/rawtile.cpp +++ b/modules/globebrowsing/src/rawtile.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/rawtile.h b/modules/globebrowsing/src/rawtile.h index 95c48231e9..2e2142d721 100644 --- a/modules/globebrowsing/src/rawtile.h +++ b/modules/globebrowsing/src/rawtile.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp index fdc3d4d8f4..81db49f526 100644 --- a/modules/globebrowsing/src/rawtiledatareader.cpp +++ b/modules/globebrowsing/src/rawtiledatareader.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/rawtiledatareader.h b/modules/globebrowsing/src/rawtiledatareader.h index 2f374b06d0..12a51a3fc3 100644 --- a/modules/globebrowsing/src/rawtiledatareader.h +++ b/modules/globebrowsing/src/rawtiledatareader.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp index 4e76d27bc0..f4a1e6b7a0 100644 --- a/modules/globebrowsing/src/renderableglobe.cpp +++ b/modules/globebrowsing/src/renderableglobe.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/renderableglobe.h b/modules/globebrowsing/src/renderableglobe.h index 0719840234..c0cea8aae9 100644 --- a/modules/globebrowsing/src/renderableglobe.h +++ b/modules/globebrowsing/src/renderableglobe.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/skirtedgrid.cpp b/modules/globebrowsing/src/skirtedgrid.cpp index 1c35d2c283..eaa50fc279 100644 --- a/modules/globebrowsing/src/skirtedgrid.cpp +++ b/modules/globebrowsing/src/skirtedgrid.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/skirtedgrid.h b/modules/globebrowsing/src/skirtedgrid.h index 486302612a..c07419ea52 100644 --- a/modules/globebrowsing/src/skirtedgrid.h +++ b/modules/globebrowsing/src/skirtedgrid.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/tileindex.cpp b/modules/globebrowsing/src/tileindex.cpp index 2ec8b010ae..2999b95616 100644 --- a/modules/globebrowsing/src/tileindex.cpp +++ b/modules/globebrowsing/src/tileindex.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/tileindex.h b/modules/globebrowsing/src/tileindex.h index 8a892f75cd..841b0e57cc 100644 --- a/modules/globebrowsing/src/tileindex.h +++ b/modules/globebrowsing/src/tileindex.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/tileloadjob.cpp b/modules/globebrowsing/src/tileloadjob.cpp index 8bbbd3a1df..d45868ffd7 100644 --- a/modules/globebrowsing/src/tileloadjob.cpp +++ b/modules/globebrowsing/src/tileloadjob.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/tileloadjob.h b/modules/globebrowsing/src/tileloadjob.h index 65da1859d3..35b22ad03c 100644 --- a/modules/globebrowsing/src/tileloadjob.h +++ b/modules/globebrowsing/src/tileloadjob.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/tileprovider.cpp b/modules/globebrowsing/src/tileprovider.cpp index 720a832452..0fe168fd78 100644 --- a/modules/globebrowsing/src/tileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/tileprovider.h b/modules/globebrowsing/src/tileprovider.h index f3d9c1e904..c367638374 100644 --- a/modules/globebrowsing/src/tileprovider.h +++ b/modules/globebrowsing/src/tileprovider.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/tiletextureinitdata.cpp b/modules/globebrowsing/src/tiletextureinitdata.cpp index 1917029f12..0791c282a7 100644 --- a/modules/globebrowsing/src/tiletextureinitdata.cpp +++ b/modules/globebrowsing/src/tiletextureinitdata.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/tiletextureinitdata.h b/modules/globebrowsing/src/tiletextureinitdata.h index 9beaeebd1f..6eee193c17 100644 --- a/modules/globebrowsing/src/tiletextureinitdata.h +++ b/modules/globebrowsing/src/tiletextureinitdata.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/timequantizer.cpp b/modules/globebrowsing/src/timequantizer.cpp index 0e774cc437..102ade1661 100644 --- a/modules/globebrowsing/src/timequantizer.cpp +++ b/modules/globebrowsing/src/timequantizer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/globebrowsing/src/timequantizer.h b/modules/globebrowsing/src/timequantizer.h index aabbebf98d..c59c17913d 100644 --- a/modules/globebrowsing/src/timequantizer.h +++ b/modules/globebrowsing/src/timequantizer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/CMakeLists.txt b/modules/imgui/CMakeLists.txt index 2e92065fc2..2ac5d9318f 100644 --- a/modules/imgui/CMakeLists.txt +++ b/modules/imgui/CMakeLists.txt @@ -27,60 +27,60 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) # include(GenerateExportHeader) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/include/gui.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/guiassetcomponent.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/guicomponent.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/guifilepathcomponent.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/guiglobebrowsingcomponent.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/guihelpcomponent.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/guijoystickcomponent.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/guimissioncomponent.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/guiperformancecomponent.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/guiparallelcomponent.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/guipropertycomponent.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/guishortcutscomponent.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/guispacetimecomponent.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/guiiswacomponent.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/imgui_include.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/renderproperties.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/gui.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/guiassetcomponent.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/guicomponent.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/guifilepathcomponent.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/guiglobebrowsingcomponent.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/guihelpcomponent.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/guijoystickcomponent.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/guimissioncomponent.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/guiperformancecomponent.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/guiparallelcomponent.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/guipropertycomponent.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/guishortcutscomponent.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/guispacetimecomponent.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/guiiswacomponent.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/imgui_include.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/renderproperties.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/src/gui.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guiassetcomponent.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guicomponent.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guifilepathcomponent.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guiglobebrowsingcomponent.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guihelpcomponent.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guijoystickcomponent.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guimissioncomponent.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guiperformancecomponent.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guiparallelcomponent.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guipropertycomponent.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guishortcutscomponent.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guispacetimecomponent.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/guiiswacomponent.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/renderproperties.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/gui.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guiassetcomponent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guicomponent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guifilepathcomponent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guiglobebrowsingcomponent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guihelpcomponent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guijoystickcomponent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guimissioncomponent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guiperformancecomponent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guiparallelcomponent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guipropertycomponent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guishortcutscomponent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guispacetimecomponent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/guiiswacomponent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/renderproperties.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) set(SHADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gui_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gui_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gui_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gui_vs.glsl ) source_group("Shader Files" FILES ${SHADER_FILES}) # set(openspace-module-imgui_LIBRARY_MODE SHARED) create_new_module( - "ImGUI" - imgui_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} + "ImGUI" + imgui_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} ) -include_external_library(${imgui_module} Imgui ${CMAKE_CURRENT_SOURCE_DIR}/ext/imgui) +include_external_library(${imgui_module} PRIVATE Imgui ${CMAKE_CURRENT_SOURCE_DIR}/ext/imgui) # generate_export_header(${imgui_module} EXPORT_FILE_NAME ${CMAKE_BINARY_DIR}/_generated/include/imgui_export.h) diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp index f0d38e11aa..7fbfb57113 100644 --- a/modules/imgui/imguimodule.cpp +++ b/modules/imgui/imguimodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/imguimodule.h b/modules/imgui/imguimodule.h index 06cc4b9e48..1210d5ccab 100644 --- a/modules/imgui/imguimodule.h +++ b/modules/imgui/imguimodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/include/gui.h b/modules/imgui/include/gui.h index 8fc344f152..60b6851062 100644 --- a/modules/imgui/include/gui.h +++ b/modules/imgui/include/gui.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/include/guiassetcomponent.h b/modules/imgui/include/guiassetcomponent.h index 666dc35e43..349d4d44be 100644 --- a/modules/imgui/include/guiassetcomponent.h +++ b/modules/imgui/include/guiassetcomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/include/guicomponent.h b/modules/imgui/include/guicomponent.h index b553812ff3..eaefc95196 100644 --- a/modules/imgui/include/guicomponent.h +++ b/modules/imgui/include/guicomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/include/guifilepathcomponent.h b/modules/imgui/include/guifilepathcomponent.h index 2968dd75a7..9de1b1a421 100644 --- a/modules/imgui/include/guifilepathcomponent.h +++ b/modules/imgui/include/guifilepathcomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/include/guiglobebrowsingcomponent.h b/modules/imgui/include/guiglobebrowsingcomponent.h index 4554c9c354..a9ebde2fb7 100644 --- a/modules/imgui/include/guiglobebrowsingcomponent.h +++ b/modules/imgui/include/guiglobebrowsingcomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/include/guihelpcomponent.h b/modules/imgui/include/guihelpcomponent.h index 4147c39157..389dd4990e 100644 --- a/modules/imgui/include/guihelpcomponent.h +++ b/modules/imgui/include/guihelpcomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/include/guiiswacomponent.h b/modules/imgui/include/guiiswacomponent.h index eef3fbe38f..2218df3e7d 100644 --- a/modules/imgui/include/guiiswacomponent.h +++ b/modules/imgui/include/guiiswacomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/include/guijoystickcomponent.h b/modules/imgui/include/guijoystickcomponent.h index 9b891d00e9..3c441f8e69 100644 --- a/modules/imgui/include/guijoystickcomponent.h +++ b/modules/imgui/include/guijoystickcomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/include/guimissioncomponent.h b/modules/imgui/include/guimissioncomponent.h index cdfb3954cb..74da16a211 100644 --- a/modules/imgui/include/guimissioncomponent.h +++ b/modules/imgui/include/guimissioncomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/include/guiparallelcomponent.h b/modules/imgui/include/guiparallelcomponent.h index 612833d503..bd3430070e 100644 --- a/modules/imgui/include/guiparallelcomponent.h +++ b/modules/imgui/include/guiparallelcomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/include/guiperformancecomponent.h b/modules/imgui/include/guiperformancecomponent.h index 4e952a8aca..21e122463e 100644 --- a/modules/imgui/include/guiperformancecomponent.h +++ b/modules/imgui/include/guiperformancecomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/include/guipropertycomponent.h b/modules/imgui/include/guipropertycomponent.h index 9db1ea7b4a..fc027ee6a0 100644 --- a/modules/imgui/include/guipropertycomponent.h +++ b/modules/imgui/include/guipropertycomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/include/guishortcutscomponent.h b/modules/imgui/include/guishortcutscomponent.h index 6eb2840819..47b4981378 100644 --- a/modules/imgui/include/guishortcutscomponent.h +++ b/modules/imgui/include/guishortcutscomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/include/guispacetimecomponent.h b/modules/imgui/include/guispacetimecomponent.h index 8ce0edd5a7..1106527e08 100644 --- a/modules/imgui/include/guispacetimecomponent.h +++ b/modules/imgui/include/guispacetimecomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/include/guitimecomponent.h b/modules/imgui/include/guitimecomponent.h deleted file mode 100644 index eb3564bcad..0000000000 --- a/modules/imgui/include/guitimecomponent.h +++ /dev/null @@ -1,41 +0,0 @@ -/***************************************************************************************** - * * - * OpenSpace * - * * - * Copyright (c) 2014-2018 * - * * - * 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. * - ****************************************************************************************/ - -#ifndef __OPENSPACE_MODULE_IMGUI___GUITIMECOMPONENT___H__ -#define __OPENSPACE_MODULE_IMGUI___GUITIMECOMPONENT___H__ - -#include - -namespace openspace::gui { - -class GuiTimeComponent : public GuiComponent { -public: - GuiTimeComponent(); - - void render() override; -}; - -} // namespace openspace::gui - -#endif // __OPENSPACE_MODULE_IMGUI___GUITIMECOMPONENT___H__ diff --git a/modules/imgui/include/imgui_include.h b/modules/imgui/include/imgui_include.h index 736ab48e3d..6f56cd6d9f 100644 --- a/modules/imgui/include/imgui_include.h +++ b/modules/imgui/include/imgui_include.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/include/renderproperties.h b/modules/imgui/include/renderproperties.h index d09a0a8fe4..dc4250447b 100644 --- a/modules/imgui/include/renderproperties.h +++ b/modules/imgui/include/renderproperties.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/shaders/gui_fs.glsl b/modules/imgui/shaders/gui_fs.glsl index 5b1a256961..fb94e65bea 100644 --- a/modules/imgui/shaders/gui_fs.glsl +++ b/modules/imgui/shaders/gui_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/shaders/gui_vs.glsl b/modules/imgui/shaders/gui_vs.glsl index 6bc4a17b52..6f80ed5e57 100644 --- a/modules/imgui/shaders/gui_vs.glsl +++ b/modules/imgui/shaders/gui_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/src/gui.cpp b/modules/imgui/src/gui.cpp index 5070129ff7..51088e6abf 100644 --- a/modules/imgui/src/gui.cpp +++ b/modules/imgui/src/gui.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/src/guiassetcomponent.cpp b/modules/imgui/src/guiassetcomponent.cpp index 56f7e8d412..ffdcd71391 100644 --- a/modules/imgui/src/guiassetcomponent.cpp +++ b/modules/imgui/src/guiassetcomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/src/guicomponent.cpp b/modules/imgui/src/guicomponent.cpp index 51dc248720..d21bc821d1 100644 --- a/modules/imgui/src/guicomponent.cpp +++ b/modules/imgui/src/guicomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/src/guifilepathcomponent.cpp b/modules/imgui/src/guifilepathcomponent.cpp index 9a5d83e8b0..10471ed4da 100644 --- a/modules/imgui/src/guifilepathcomponent.cpp +++ b/modules/imgui/src/guifilepathcomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/src/guiglobebrowsingcomponent.cpp b/modules/imgui/src/guiglobebrowsingcomponent.cpp index 4302cffb0c..0fb53b1357 100644 --- a/modules/imgui/src/guiglobebrowsingcomponent.cpp +++ b/modules/imgui/src/guiglobebrowsingcomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/src/guihelpcomponent.cpp b/modules/imgui/src/guihelpcomponent.cpp index 543546be03..ed41f57160 100644 --- a/modules/imgui/src/guihelpcomponent.cpp +++ b/modules/imgui/src/guihelpcomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/src/guiiswacomponent.cpp b/modules/imgui/src/guiiswacomponent.cpp index 17a543151d..83fe276dfa 100644 --- a/modules/imgui/src/guiiswacomponent.cpp +++ b/modules/imgui/src/guiiswacomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/src/guijoystickcomponent.cpp b/modules/imgui/src/guijoystickcomponent.cpp index f550dc3d7b..0db1b8f501 100644 --- a/modules/imgui/src/guijoystickcomponent.cpp +++ b/modules/imgui/src/guijoystickcomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/src/guimissioncomponent.cpp b/modules/imgui/src/guimissioncomponent.cpp index 3274d5d4c5..0bbc912af8 100644 --- a/modules/imgui/src/guimissioncomponent.cpp +++ b/modules/imgui/src/guimissioncomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/src/guiorigincomponent.cpp b/modules/imgui/src/guiorigincomponent.cpp deleted file mode 100644 index fe1913f32c..0000000000 --- a/modules/imgui/src/guiorigincomponent.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/***************************************************************************************** - * * - * OpenSpace * - * * - * Copyright (c) 2014-2018 * - * * - * 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. * - ****************************************************************************************/ - -#include - -#include - -#include -#include -#include -#include -#include - -#include - -namespace openspace::gui { - -GuiOriginComponent::GuiOriginComponent() - : GuiComponent("Origin") -{} - -void GuiOriginComponent::render() { - SceneGraphNode* currentFocus = OsEng.navigationHandler().focusNode(); - - std::vector nodes = - OsEng.renderEngine().scene()->allSceneGraphNodes(); - - std::sort( - nodes.begin(), - nodes.end(), - [](SceneGraphNode* lhs, SceneGraphNode* rhs) { - return lhs->name() < rhs->name(); - } - ); - std::string nodeNames = ""; - for (SceneGraphNode* n : nodes) { - nodeNames += n->name() + '\0'; - } - - auto iCurrentFocus = std::find(nodes.begin(), nodes.end(), currentFocus); - if (!nodes.empty()) { - // Only check if we found the current focus node if we have any nodes at all - // only then it would be a real error - ghoul_assert(iCurrentFocus != nodes.end(), "Focus node not found"); - } - int currentPosition = static_cast(std::distance(nodes.begin(), iCurrentFocus)); - - bool hasChanged = ImGui::Combo("Origin", ¤tPosition, nodeNames.c_str()); - if (hasChanged) { - OsEng.scriptEngine().queueScript( - "openspace.setPropertyValue('NavigationHandler.Origin', '" + - nodes[currentPosition]->name() + "');", - scripting::ScriptEngine::RemoteScripting::Yes - ); - } -} - -} // namespace openspace::gui diff --git a/modules/imgui/src/guiparallelcomponent.cpp b/modules/imgui/src/guiparallelcomponent.cpp index c2e36dc3e4..6e2b9b8343 100644 --- a/modules/imgui/src/guiparallelcomponent.cpp +++ b/modules/imgui/src/guiparallelcomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/src/guiperformancecomponent.cpp b/modules/imgui/src/guiperformancecomponent.cpp index 7a40cebcfa..9f900daf20 100644 --- a/modules/imgui/src/guiperformancecomponent.cpp +++ b/modules/imgui/src/guiperformancecomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/src/guipropertycomponent.cpp b/modules/imgui/src/guipropertycomponent.cpp index 0763a401ca..8a6475bb59 100644 --- a/modules/imgui/src/guipropertycomponent.cpp +++ b/modules/imgui/src/guipropertycomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/src/guishortcutscomponent.cpp b/modules/imgui/src/guishortcutscomponent.cpp index 8b717209f4..02681b8f3e 100644 --- a/modules/imgui/src/guishortcutscomponent.cpp +++ b/modules/imgui/src/guishortcutscomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/src/guispacetimecomponent.cpp b/modules/imgui/src/guispacetimecomponent.cpp index f1ee09af91..59a3b914d0 100644 --- a/modules/imgui/src/guispacetimecomponent.cpp +++ b/modules/imgui/src/guispacetimecomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/imgui/src/guitimecomponent.cpp b/modules/imgui/src/guitimecomponent.cpp deleted file mode 100644 index a845afc45c..0000000000 --- a/modules/imgui/src/guitimecomponent.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/***************************************************************************************** - * * - * OpenSpace * - * * - * Copyright (c) 2014-2018 * - * * - * 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. * - ****************************************************************************************/ - -#include - -#include - -#include -#include -#include - -namespace openspace::gui { - -GuiTimeComponent::GuiTimeComponent() : GuiComponent("Time") {} - -void GuiTimeComponent::render() { - float deltaTime = static_cast(OsEng.timeManager().time().deltaTime()); - - bool changed = ImGui::SliderFloat("Delta Time", &deltaTime, -50000.f, 50000.f); - if (changed) { - OsEng.scriptEngine().queueScript( - "openspace.time.setDeltaTime(" + std::to_string(deltaTime) + ")", - scripting::ScriptEngine::RemoteScripting::Yes - ); - } -} - -} // namespace openspace gui diff --git a/modules/imgui/src/renderproperties.cpp b/modules/imgui/src/renderproperties.cpp index 4e0f1f62b5..c82b82d6b1 100644 --- a/modules/imgui/src/renderproperties.cpp +++ b/modules/imgui/src/renderproperties.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/CMakeLists.txt b/modules/iswa/CMakeLists.txt index e35a3ce470..50d8aa82b4 100644 --- a/modules/iswa/CMakeLists.txt +++ b/modules/iswa/CMakeLists.txt @@ -25,57 +25,58 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/util/iswamanager.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessor.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessortext.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessorjson.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessorkameleon.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswacygnet.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/dataplane.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/textureplane.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/kameleonplane.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/datasphere.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspacecygnet.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswabasegroup.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswadatagroup.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswakameleongroup.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/texturecygnet.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/datacygnet.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/datacygnet.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/dataplane.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/datasphere.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/kameleonplane.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswabasegroup.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswacygnet.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswadatagroup.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswakameleongroup.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspacecygnet.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/texturecygnet.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/textureplane.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessor.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessorjson.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessorkameleon.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessortext.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/iswamanager.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/iswamanager_lua.inl ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/util/iswamanager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessor.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessortext.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessorjson.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessorkameleon.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswacygnet.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/dataplane.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/textureplane.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/kameleonplane.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/datasphere.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspacecygnet.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswabasegroup.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswadatagroup.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswakameleongroup.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/texturecygnet.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/datacygnet.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessor.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessorjson.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessorkameleon.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessortext.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/iswamanager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/datacygnet.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/dataplane.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/datasphere.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswabasegroup.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswacygnet.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswadatagroup.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswakameleongroup.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/kameleonplane.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspacecygnet.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/texturecygnet.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/textureplane.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) set(SHADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/dataplane_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/dataplane_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/textureplane_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/textureplane_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/dataplane_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/dataplane_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/textureplane_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/textureplane_vs.glsl ) source_group("Shader Files" FILES ${SHADER_FILES}) create_new_module( - "Iswa" - iswa_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} + "Iswa" + iswa_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} ) diff --git a/modules/iswa/iswamodule.cpp b/modules/iswa/iswamodule.cpp index 7699a8452b..8c51807954 100644 --- a/modules/iswa/iswamodule.cpp +++ b/modules/iswa/iswamodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/iswamodule.h b/modules/iswa/iswamodule.h index e8f1d1a038..1348d46c79 100644 --- a/modules/iswa/iswamodule.h +++ b/modules/iswa/iswamodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/datacygnet.cpp b/modules/iswa/rendering/datacygnet.cpp index 2604cc6574..9f4d7d3f73 100644 --- a/modules/iswa/rendering/datacygnet.cpp +++ b/modules/iswa/rendering/datacygnet.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/datacygnet.h b/modules/iswa/rendering/datacygnet.h index dcf0cd63cd..5a92ad3f62 100644 --- a/modules/iswa/rendering/datacygnet.h +++ b/modules/iswa/rendering/datacygnet.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/dataplane.cpp b/modules/iswa/rendering/dataplane.cpp index f493c91e27..f7d073b9f6 100644 --- a/modules/iswa/rendering/dataplane.cpp +++ b/modules/iswa/rendering/dataplane.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/dataplane.h b/modules/iswa/rendering/dataplane.h index e535927a94..48976eae00 100644 --- a/modules/iswa/rendering/dataplane.h +++ b/modules/iswa/rendering/dataplane.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/datasphere.cpp b/modules/iswa/rendering/datasphere.cpp index ad28f7186f..90f00aa37e 100644 --- a/modules/iswa/rendering/datasphere.cpp +++ b/modules/iswa/rendering/datasphere.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/datasphere.h b/modules/iswa/rendering/datasphere.h index d980cbb37f..2ec89762ea 100644 --- a/modules/iswa/rendering/datasphere.h +++ b/modules/iswa/rendering/datasphere.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/iswabasegroup.cpp b/modules/iswa/rendering/iswabasegroup.cpp index 7df02b20e5..69a9b5da4a 100644 --- a/modules/iswa/rendering/iswabasegroup.cpp +++ b/modules/iswa/rendering/iswabasegroup.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/iswabasegroup.h b/modules/iswa/rendering/iswabasegroup.h index 6837262da8..d937bed105 100644 --- a/modules/iswa/rendering/iswabasegroup.h +++ b/modules/iswa/rendering/iswabasegroup.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp index a85f7d2488..d86b2f3930 100644 --- a/modules/iswa/rendering/iswacygnet.cpp +++ b/modules/iswa/rendering/iswacygnet.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/iswacygnet.h b/modules/iswa/rendering/iswacygnet.h index 42f5dbf0b6..cf557fb91d 100644 --- a/modules/iswa/rendering/iswacygnet.h +++ b/modules/iswa/rendering/iswacygnet.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/iswadatagroup.cpp b/modules/iswa/rendering/iswadatagroup.cpp index 35c0b65f39..72946899a3 100644 --- a/modules/iswa/rendering/iswadatagroup.cpp +++ b/modules/iswa/rendering/iswadatagroup.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/iswadatagroup.h b/modules/iswa/rendering/iswadatagroup.h index e6345bd11e..49d6cf1e06 100644 --- a/modules/iswa/rendering/iswadatagroup.h +++ b/modules/iswa/rendering/iswadatagroup.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/iswakameleongroup.cpp b/modules/iswa/rendering/iswakameleongroup.cpp index b3f44562b3..f490655786 100644 --- a/modules/iswa/rendering/iswakameleongroup.cpp +++ b/modules/iswa/rendering/iswakameleongroup.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/iswakameleongroup.h b/modules/iswa/rendering/iswakameleongroup.h index 84c5e2fba8..8c3718ec37 100644 --- a/modules/iswa/rendering/iswakameleongroup.h +++ b/modules/iswa/rendering/iswakameleongroup.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/kameleonplane.cpp b/modules/iswa/rendering/kameleonplane.cpp index e3bfbaa1c6..7261cd4f3b 100644 --- a/modules/iswa/rendering/kameleonplane.cpp +++ b/modules/iswa/rendering/kameleonplane.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/kameleonplane.h b/modules/iswa/rendering/kameleonplane.h index e99b8bbe83..fa358c8cc7 100644 --- a/modules/iswa/rendering/kameleonplane.h +++ b/modules/iswa/rendering/kameleonplane.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/screenspacecygnet.cpp b/modules/iswa/rendering/screenspacecygnet.cpp index 0bca650328..588aaa2cfc 100644 --- a/modules/iswa/rendering/screenspacecygnet.cpp +++ b/modules/iswa/rendering/screenspacecygnet.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/screenspacecygnet.h b/modules/iswa/rendering/screenspacecygnet.h index 470fead2ac..d01fc0f322 100644 --- a/modules/iswa/rendering/screenspacecygnet.h +++ b/modules/iswa/rendering/screenspacecygnet.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/texturecygnet.cpp b/modules/iswa/rendering/texturecygnet.cpp index 2c1a4fe9e8..d99ff5748c 100644 --- a/modules/iswa/rendering/texturecygnet.cpp +++ b/modules/iswa/rendering/texturecygnet.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/texturecygnet.h b/modules/iswa/rendering/texturecygnet.h index d9cebeeac5..2828b9368d 100644 --- a/modules/iswa/rendering/texturecygnet.h +++ b/modules/iswa/rendering/texturecygnet.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/textureplane.cpp b/modules/iswa/rendering/textureplane.cpp index 0ef9e7293a..d69ad983ba 100644 --- a/modules/iswa/rendering/textureplane.cpp +++ b/modules/iswa/rendering/textureplane.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/rendering/textureplane.h b/modules/iswa/rendering/textureplane.h index 0069c57985..1c9eb0020b 100644 --- a/modules/iswa/rendering/textureplane.h +++ b/modules/iswa/rendering/textureplane.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/shaders/dataplane_fs.glsl b/modules/iswa/shaders/dataplane_fs.glsl index fad718b891..a8686eb91d 100644 --- a/modules/iswa/shaders/dataplane_fs.glsl +++ b/modules/iswa/shaders/dataplane_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/shaders/dataplane_vs.glsl b/modules/iswa/shaders/dataplane_vs.glsl index 23afb7ec87..a46e392573 100644 --- a/modules/iswa/shaders/dataplane_vs.glsl +++ b/modules/iswa/shaders/dataplane_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/shaders/textureplane_fs.glsl b/modules/iswa/shaders/textureplane_fs.glsl index 99e7b277f1..1fa664e9b1 100644 --- a/modules/iswa/shaders/textureplane_fs.glsl +++ b/modules/iswa/shaders/textureplane_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/shaders/textureplane_vs.glsl b/modules/iswa/shaders/textureplane_vs.glsl index 14e9fb9197..78b1a70fb8 100644 --- a/modules/iswa/shaders/textureplane_vs.glsl +++ b/modules/iswa/shaders/textureplane_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/util/dataprocessor.cpp b/modules/iswa/util/dataprocessor.cpp index 172e8990b7..5a13372f3a 100644 --- a/modules/iswa/util/dataprocessor.cpp +++ b/modules/iswa/util/dataprocessor.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/util/dataprocessor.h b/modules/iswa/util/dataprocessor.h index 44b87b427b..db64deb316 100644 --- a/modules/iswa/util/dataprocessor.h +++ b/modules/iswa/util/dataprocessor.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/util/dataprocessorjson.cpp b/modules/iswa/util/dataprocessorjson.cpp index 942a14b2e1..c37bc852bb 100644 --- a/modules/iswa/util/dataprocessorjson.cpp +++ b/modules/iswa/util/dataprocessorjson.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/util/dataprocessorjson.h b/modules/iswa/util/dataprocessorjson.h index 498e288baa..d4f111fe5f 100644 --- a/modules/iswa/util/dataprocessorjson.h +++ b/modules/iswa/util/dataprocessorjson.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/util/dataprocessorkameleon.cpp b/modules/iswa/util/dataprocessorkameleon.cpp index 9e66353091..84971479c1 100644 --- a/modules/iswa/util/dataprocessorkameleon.cpp +++ b/modules/iswa/util/dataprocessorkameleon.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/util/dataprocessorkameleon.h b/modules/iswa/util/dataprocessorkameleon.h index c9ed949c37..9e8d20ca72 100644 --- a/modules/iswa/util/dataprocessorkameleon.h +++ b/modules/iswa/util/dataprocessorkameleon.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/util/dataprocessortext.cpp b/modules/iswa/util/dataprocessortext.cpp index f839eb546e..4f93a580b0 100644 --- a/modules/iswa/util/dataprocessortext.cpp +++ b/modules/iswa/util/dataprocessortext.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/util/dataprocessortext.h b/modules/iswa/util/dataprocessortext.h index fed5b1aaef..9e03e59569 100644 --- a/modules/iswa/util/dataprocessortext.h +++ b/modules/iswa/util/dataprocessortext.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp index ca1a371888..d680b77edf 100644 --- a/modules/iswa/util/iswamanager.cpp +++ b/modules/iswa/util/iswamanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/util/iswamanager.h b/modules/iswa/util/iswamanager.h index 146065d76c..a8f90e8a7e 100644 --- a/modules/iswa/util/iswamanager.h +++ b/modules/iswa/util/iswamanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/iswa/util/iswamanager_lua.inl b/modules/iswa/util/iswamanager_lua.inl index 512a781b3e..f54cfb0dbf 100644 --- a/modules/iswa/util/iswamanager_lua.inl +++ b/modules/iswa/util/iswamanager_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleon/CMakeLists.txt b/modules/kameleon/CMakeLists.txt index ca747f470e..a5b77fc8d9 100644 --- a/modules/kameleon/CMakeLists.txt +++ b/modules/kameleon/CMakeLists.txt @@ -26,61 +26,62 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) include(${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/include/kameleonwrapper.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/kameleonhelper.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/kameleonwrapper.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/kameleonhelper.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/src/kameleonwrapper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/kameleonhelper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/kameleonwrapper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/kameleonhelper.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) create_new_module( - "Kameleon" - kameleon_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} + "Kameleon" + kameleon_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ) - option(KAMELEON_LIBRARY_ONLY "Build with Kameleon as library only" ON) - if (WIN32) - option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF) - else () - option(BUILD_SHARED_LIBS "Build Shared Libraries" ON) - endif () - mark_as_advanced(BUILD_SHARED_LIBS) # Change to set instead of option - option(KAMELEON_USE_HDF5 "Kameleon use HDF5" OFF) - set(KAMELEON_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/kameleon) - set(KAMELEON_INCLUDES ${KAMELEON_ROOT_DIR}/src) - add_subdirectory(${KAMELEON_ROOT_DIR}) - target_include_directories(${kameleon_module} SYSTEM PUBLIC ${KAMELEON_INCLUDES}) - target_link_libraries(${kameleon_module} ccmc) - mark_as_advanced(CDF_BUILD_ZLIB CDF_INCLUDES CDF_LIBRARY CDF_USE_STATIC_LIBS - CDF_USE_ZLIB HDF5_DIR HDF5_USE_STATIC_LIBRARIES KAMELEON_LIBRARY_ONLY - KAMELEON_USE_HDF5) +option(KAMELEON_LIBRARY_ONLY "Build with Kameleon as library only" ON) +if (WIN32) + option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF) +else () + option(BUILD_SHARED_LIBS "Build Shared Libraries" ON) +endif () +mark_as_advanced(BUILD_SHARED_LIBS) # Change to set instead of option +option(KAMELEON_USE_HDF5 "Kameleon use HDF5" OFF) +set(KAMELEON_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/kameleon) +set(KAMELEON_INCLUDES ${KAMELEON_ROOT_DIR}/src) +add_subdirectory(${KAMELEON_ROOT_DIR}) +target_include_directories(${kameleon_module} SYSTEM PUBLIC ${KAMELEON_INCLUDES}) +target_link_libraries(${kameleon_module} PRIVATE ccmc) +mark_as_advanced(CDF_BUILD_ZLIB CDF_INCLUDES CDF_LIBRARY CDF_USE_STATIC_LIBS + CDF_USE_ZLIB HDF5_DIR HDF5_USE_STATIC_LIBRARIES KAMELEON_LIBRARY_ONLY KAMELEON_USE_HDF5 +) - if (GHOUL_DISABLE_EXTERNAL_WARNINGS) - if (MSVC) - target_compile_options(ccmc PRIVATE "/W0" "/MP") - target_compile_definitions(ccmc PRIVATE "_SCL_SECURE_NO_WARNINGS") - else () - target_compile_options(ccmc PRIVATE "-w") - endif () - endif () - set_folder_location(ccmc "External") - if (TARGET cdf) - if (GHOUL_DISABLE_EXTERNAL_WARNINGS) - if (MSVC) - target_compile_options(cdf PRIVATE "/W0" "/MP") - target_compile_definitions(cdf PRIVATE "_SCL_SECURE_NO_WARNINGS") - else () - target_compile_options(cdf PRIVATE "-w") - endif () - endif () - set_folder_location(cdf "External") +if (GHOUL_DISABLE_EXTERNAL_WARNINGS) + if (MSVC) + target_compile_options(ccmc PRIVATE "/W0" "/MP") + target_compile_definitions(ccmc PRIVATE "_SCL_SECURE_NO_WARNINGS") + else () + target_compile_options(ccmc PRIVATE "-w") + endif () +endif () +set_folder_location(ccmc "External") +if (TARGET cdf) + if (GHOUL_DISABLE_EXTERNAL_WARNINGS) + if (MSVC) + target_compile_options(cdf PRIVATE "/W0" "/MP") + target_compile_definitions(cdf PRIVATE "_SCL_SECURE_NO_WARNINGS") + else () + target_compile_options(cdf PRIVATE "-w") endif () + endif () + set_folder_location(cdf "External") +endif () + # Boost find_package(Boost REQUIRED) target_include_directories(openspace-module-kameleon SYSTEM PUBLIC ${Boost_INCLUDE_DIRS}) diff --git a/modules/kameleon/include/kameleonhelper.h b/modules/kameleon/include/kameleonhelper.h index d16dd6d040..490d0e0180 100644 --- a/modules/kameleon/include/kameleonhelper.h +++ b/modules/kameleon/include/kameleonhelper.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleon/include/kameleonwrapper.h b/modules/kameleon/include/kameleonwrapper.h index b3b5bedd1f..1965a3cae5 100644 --- a/modules/kameleon/include/kameleonwrapper.h +++ b/modules/kameleon/include/kameleonwrapper.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleon/kameleonmodule.cpp b/modules/kameleon/kameleonmodule.cpp index d44a91fbd5..fcaaaa10d3 100644 --- a/modules/kameleon/kameleonmodule.cpp +++ b/modules/kameleon/kameleonmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleon/kameleonmodule.h b/modules/kameleon/kameleonmodule.h index ea8a7e16f4..2260a12dfd 100644 --- a/modules/kameleon/kameleonmodule.h +++ b/modules/kameleon/kameleonmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleon/src/kameleonhelper.cpp b/modules/kameleon/src/kameleonhelper.cpp index e6fde82711..03a9148759 100644 --- a/modules/kameleon/src/kameleonhelper.cpp +++ b/modules/kameleon/src/kameleonhelper.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp index d509336acb..5baced7e1b 100644 --- a/modules/kameleon/src/kameleonwrapper.cpp +++ b/modules/kameleon/src/kameleonwrapper.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleonvolume/CMakeLists.txt b/modules/kameleonvolume/CMakeLists.txt index fc291736c1..a9ae620f08 100644 --- a/modules/kameleonvolume/CMakeLists.txt +++ b/modules/kameleonvolume/CMakeLists.txt @@ -43,8 +43,8 @@ set(SOURCE_FILES source_group("Source Files" FILES ${SOURCE_FILES}) create_new_module( - "KameleonVolume" - kameleonvolume_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} + "KameleonVolume" + kameleonvolume_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ) diff --git a/modules/kameleonvolume/kameleonvolumemodule.cpp b/modules/kameleonvolume/kameleonvolumemodule.cpp index 4bc1dac91d..7e6c7404a6 100644 --- a/modules/kameleonvolume/kameleonvolumemodule.cpp +++ b/modules/kameleonvolume/kameleonvolumemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleonvolume/kameleonvolumemodule.h b/modules/kameleonvolume/kameleonvolumemodule.h index e8cf693ba6..72911e9d1d 100644 --- a/modules/kameleonvolume/kameleonvolumemodule.h +++ b/modules/kameleonvolume/kameleonvolumemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleonvolume/kameleonvolumereader.cpp b/modules/kameleonvolume/kameleonvolumereader.cpp index 507de9a3ca..e63ddc9f46 100644 --- a/modules/kameleonvolume/kameleonvolumereader.cpp +++ b/modules/kameleonvolume/kameleonvolumereader.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleonvolume/kameleonvolumereader.h b/modules/kameleonvolume/kameleonvolumereader.h index 5755c85f03..c514f4178b 100644 --- a/modules/kameleonvolume/kameleonvolumereader.h +++ b/modules/kameleonvolume/kameleonvolumereader.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp index a414fc48dd..7055a10fe9 100644 --- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp +++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.h b/modules/kameleonvolume/rendering/renderablekameleonvolume.h index d589248e32..a626758151 100644 --- a/modules/kameleonvolume/rendering/renderablekameleonvolume.h +++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp index 38f756dd5b..2515549927 100644 --- a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp +++ b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleonvolume/tasks/kameleondocumentationtask.h b/modules/kameleonvolume/tasks/kameleondocumentationtask.h index 9ba9980479..d3ae0119e1 100644 --- a/modules/kameleonvolume/tasks/kameleondocumentationtask.h +++ b/modules/kameleonvolume/tasks/kameleondocumentationtask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp index 821a1e4f1b..dae730be44 100644 --- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp +++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h index 8bc9350810..b7aeb1ac2e 100644 --- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h +++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp index b19c1b1727..01d007394c 100644 --- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp +++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h index 3976c3099f..f2bc3095d0 100644 --- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h +++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/CMakeLists.txt b/modules/multiresvolume/CMakeLists.txt index 6686486264..75fdbe029d 100644 --- a/modules/multiresvolume/CMakeLists.txt +++ b/modules/multiresvolume/CMakeLists.txt @@ -25,45 +25,45 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/atlasmanager.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickmanager.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickselector.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickcover.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickselection.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/multiresvolumeraycaster.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/shenbrickselector.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/tfbrickselector.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/localtfbrickselector.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simpletfbrickselector.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemultiresvolume.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/tsp.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/histogrammanager.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/errorhistogrammanager.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/localerrorhistogrammanager.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/atlasmanager.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickmanager.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickselector.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickcover.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickselection.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/multiresvolumeraycaster.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/shenbrickselector.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/tfbrickselector.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/localtfbrickselector.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simpletfbrickselector.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemultiresvolume.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/tsp.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/histogrammanager.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/errorhistogrammanager.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/localerrorhistogrammanager.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/atlasmanager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickcover.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickmanager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickselection.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/multiresvolumeraycaster.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/shenbrickselector.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/tfbrickselector.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/localtfbrickselector.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simpletfbrickselector.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemultiresvolume.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/tsp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/histogrammanager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/errorhistogrammanager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/localerrorhistogrammanager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/atlasmanager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickcover.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickmanager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickselection.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/multiresvolumeraycaster.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/shenbrickselector.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/tfbrickselector.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/localtfbrickselector.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simpletfbrickselector.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemultiresvolume.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/tsp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/histogrammanager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/errorhistogrammanager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/localerrorhistogrammanager.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) create_new_module( - "MultiresVolume" - multiresvolume_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} + "MultiresVolume" + multiresvolume_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ) diff --git a/modules/multiresvolume/multiresvolumemodule.cpp b/modules/multiresvolume/multiresvolumemodule.cpp index 14175dac5b..c31fa2f8d0 100644 --- a/modules/multiresvolume/multiresvolumemodule.cpp +++ b/modules/multiresvolume/multiresvolumemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/multiresvolumemodule.h b/modules/multiresvolume/multiresvolumemodule.h index ed5d93bc0e..09c0af042b 100644 --- a/modules/multiresvolume/multiresvolumemodule.h +++ b/modules/multiresvolume/multiresvolumemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/atlasmanager.cpp b/modules/multiresvolume/rendering/atlasmanager.cpp index b47a96db5d..be6efac18e 100644 --- a/modules/multiresvolume/rendering/atlasmanager.cpp +++ b/modules/multiresvolume/rendering/atlasmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/atlasmanager.h b/modules/multiresvolume/rendering/atlasmanager.h index 68b76ee692..8a01dcad96 100644 --- a/modules/multiresvolume/rendering/atlasmanager.h +++ b/modules/multiresvolume/rendering/atlasmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/brickcover.cpp b/modules/multiresvolume/rendering/brickcover.cpp index f0ac79212a..eeae57c526 100644 --- a/modules/multiresvolume/rendering/brickcover.cpp +++ b/modules/multiresvolume/rendering/brickcover.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/brickcover.h b/modules/multiresvolume/rendering/brickcover.h index 3991781abf..c2b6f95640 100644 --- a/modules/multiresvolume/rendering/brickcover.h +++ b/modules/multiresvolume/rendering/brickcover.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/brickmanager.cpp b/modules/multiresvolume/rendering/brickmanager.cpp index e79730a6fd..4e1e690073 100644 --- a/modules/multiresvolume/rendering/brickmanager.cpp +++ b/modules/multiresvolume/rendering/brickmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/brickmanager.h b/modules/multiresvolume/rendering/brickmanager.h index e8580fdbd3..2a1145af27 100644 --- a/modules/multiresvolume/rendering/brickmanager.h +++ b/modules/multiresvolume/rendering/brickmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/brickselection.cpp b/modules/multiresvolume/rendering/brickselection.cpp index d126e6b352..6c432d5654 100644 --- a/modules/multiresvolume/rendering/brickselection.cpp +++ b/modules/multiresvolume/rendering/brickselection.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/brickselection.h b/modules/multiresvolume/rendering/brickselection.h index 9d7dfe852a..f858d08faf 100644 --- a/modules/multiresvolume/rendering/brickselection.h +++ b/modules/multiresvolume/rendering/brickselection.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/brickselector.h b/modules/multiresvolume/rendering/brickselector.h index b86762e2c8..ba3a26aec2 100644 --- a/modules/multiresvolume/rendering/brickselector.h +++ b/modules/multiresvolume/rendering/brickselector.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/errorhistogrammanager.cpp b/modules/multiresvolume/rendering/errorhistogrammanager.cpp index 1cfc3de1ad..e0482b5b02 100644 --- a/modules/multiresvolume/rendering/errorhistogrammanager.cpp +++ b/modules/multiresvolume/rendering/errorhistogrammanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/errorhistogrammanager.h b/modules/multiresvolume/rendering/errorhistogrammanager.h index 3ce4113996..587fc528c4 100644 --- a/modules/multiresvolume/rendering/errorhistogrammanager.h +++ b/modules/multiresvolume/rendering/errorhistogrammanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/histogrammanager.cpp b/modules/multiresvolume/rendering/histogrammanager.cpp index decc217143..19570cf602 100644 --- a/modules/multiresvolume/rendering/histogrammanager.cpp +++ b/modules/multiresvolume/rendering/histogrammanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/histogrammanager.h b/modules/multiresvolume/rendering/histogrammanager.h index 13951bd4c5..483db4843b 100644 --- a/modules/multiresvolume/rendering/histogrammanager.h +++ b/modules/multiresvolume/rendering/histogrammanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp index 3f2d89187c..1e00fde6b9 100644 --- a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp +++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/localerrorhistogrammanager.h b/modules/multiresvolume/rendering/localerrorhistogrammanager.h index 8f360cc6c5..ee30754386 100644 --- a/modules/multiresvolume/rendering/localerrorhistogrammanager.h +++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/localtfbrickselector.cpp b/modules/multiresvolume/rendering/localtfbrickselector.cpp index f75a8ee92f..0ed51a881b 100644 --- a/modules/multiresvolume/rendering/localtfbrickselector.cpp +++ b/modules/multiresvolume/rendering/localtfbrickselector.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/localtfbrickselector.h b/modules/multiresvolume/rendering/localtfbrickselector.h index 632f045c8a..1f31fc9161 100644 --- a/modules/multiresvolume/rendering/localtfbrickselector.h +++ b/modules/multiresvolume/rendering/localtfbrickselector.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp index 8c65973526..41c27b8e7c 100644 --- a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp +++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/multiresvolumeraycaster.h b/modules/multiresvolume/rendering/multiresvolumeraycaster.h index 5a05d879fe..9d7c78f512 100644 --- a/modules/multiresvolume/rendering/multiresvolumeraycaster.h +++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp index 21deca02bf..3fad696506 100644 --- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp +++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.h b/modules/multiresvolume/rendering/renderablemultiresvolume.h index 6a3d432404..d3504820fc 100644 --- a/modules/multiresvolume/rendering/renderablemultiresvolume.h +++ b/modules/multiresvolume/rendering/renderablemultiresvolume.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/shenbrickselector.cpp b/modules/multiresvolume/rendering/shenbrickselector.cpp index ce7f341e05..cfd99802ce 100644 --- a/modules/multiresvolume/rendering/shenbrickselector.cpp +++ b/modules/multiresvolume/rendering/shenbrickselector.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/shenbrickselector.h b/modules/multiresvolume/rendering/shenbrickselector.h index ee47ca545f..09c098c2d8 100644 --- a/modules/multiresvolume/rendering/shenbrickselector.h +++ b/modules/multiresvolume/rendering/shenbrickselector.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/simpletfbrickselector.cpp b/modules/multiresvolume/rendering/simpletfbrickselector.cpp index 4c2b05ff5e..e7b8013842 100644 --- a/modules/multiresvolume/rendering/simpletfbrickselector.cpp +++ b/modules/multiresvolume/rendering/simpletfbrickselector.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/simpletfbrickselector.h b/modules/multiresvolume/rendering/simpletfbrickselector.h index 209122a9e7..fadce37ea2 100644 --- a/modules/multiresvolume/rendering/simpletfbrickselector.h +++ b/modules/multiresvolume/rendering/simpletfbrickselector.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/tfbrickselector.cpp b/modules/multiresvolume/rendering/tfbrickselector.cpp index 060ddfc67e..b3700341e2 100644 --- a/modules/multiresvolume/rendering/tfbrickselector.cpp +++ b/modules/multiresvolume/rendering/tfbrickselector.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/tfbrickselector.h b/modules/multiresvolume/rendering/tfbrickselector.h index 9a1299bad6..c7d19fb3dc 100644 --- a/modules/multiresvolume/rendering/tfbrickselector.h +++ b/modules/multiresvolume/rendering/tfbrickselector.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/tsp.cpp b/modules/multiresvolume/rendering/tsp.cpp index bee20b7219..ce5286cbe2 100644 --- a/modules/multiresvolume/rendering/tsp.cpp +++ b/modules/multiresvolume/rendering/tsp.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/multiresvolume/rendering/tsp.h b/modules/multiresvolume/rendering/tsp.h index 8ab3691dff..3194acfbd3 100644 --- a/modules/multiresvolume/rendering/tsp.h +++ b/modules/multiresvolume/rendering/tsp.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/CMakeLists.txt b/modules/server/CMakeLists.txt index 08132818cc..ca749b3885 100644 --- a/modules/server/CMakeLists.txt +++ b/modules/server/CMakeLists.txt @@ -26,47 +26,47 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) set(HEADER_FILES - servermodule.h - include/connection.h - include/connectionpool.h - include/jsonconverters.h - include/serverinterface.h - include/topics/authorizationtopic.h - include/topics/bouncetopic.h - include/topics/getpropertytopic.h - include/topics/luascripttopic.h - include/topics/setpropertytopic.h - include/topics/shortcuttopic.h - include/topics/subscriptiontopic.h - include/topics/timetopic.h - include/topics/topic.h - include/topics/triggerpropertytopic.h - include/topics/versiontopic.h + servermodule.h + include/connection.h + include/connectionpool.h + include/jsonconverters.h + include/serverinterface.h + include/topics/authorizationtopic.h + include/topics/bouncetopic.h + include/topics/getpropertytopic.h + include/topics/luascripttopic.h + include/topics/setpropertytopic.h + include/topics/shortcuttopic.h + include/topics/subscriptiontopic.h + include/topics/timetopic.h + include/topics/topic.h + include/topics/triggerpropertytopic.h + include/topics/versiontopic.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - servermodule.cpp - src/connection.cpp - src/connectionpool.cpp - src/jsonconverters.cpp - src/serverinterface.cpp - src/topics/authorizationtopic.cpp - src/topics/bouncetopic.cpp - src/topics/getpropertytopic.cpp - src/topics/luascripttopic.cpp - src/topics/setpropertytopic.cpp - src/topics/shortcuttopic.cpp - src/topics/subscriptiontopic.cpp - src/topics/timetopic.cpp - src/topics/topic.cpp - src/topics/triggerpropertytopic.cpp - src/topics/versiontopic.cpp + servermodule.cpp + src/connection.cpp + src/connectionpool.cpp + src/jsonconverters.cpp + src/serverinterface.cpp + src/topics/authorizationtopic.cpp + src/topics/bouncetopic.cpp + src/topics/getpropertytopic.cpp + src/topics/luascripttopic.cpp + src/topics/setpropertytopic.cpp + src/topics/shortcuttopic.cpp + src/topics/subscriptiontopic.cpp + src/topics/timetopic.cpp + src/topics/topic.cpp + src/topics/triggerpropertytopic.cpp + src/topics/versiontopic.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) create_new_module( - "Server" - server_module - ${HEADER_FILES} ${SOURCE_FILES} + "Server" + server_module + ${HEADER_FILES} ${SOURCE_FILES} ) diff --git a/modules/server/include/connection.h b/modules/server/include/connection.h index b67653310a..a2587ebbf2 100644 --- a/modules/server/include/connection.h +++ b/modules/server/include/connection.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/include/connectionpool.h b/modules/server/include/connectionpool.h index f53ebd3769..9eac2d5bbf 100644 --- a/modules/server/include/connectionpool.h +++ b/modules/server/include/connectionpool.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/include/jsonconverters.h b/modules/server/include/jsonconverters.h index 84e855dd72..72cce8d49a 100644 --- a/modules/server/include/jsonconverters.h +++ b/modules/server/include/jsonconverters.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/include/serverinterface.h b/modules/server/include/serverinterface.h index eeac3aacf6..fd6a4ad26e 100644 --- a/modules/server/include/serverinterface.h +++ b/modules/server/include/serverinterface.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/include/topics/authorizationtopic.h b/modules/server/include/topics/authorizationtopic.h index b8ae341199..1bbdaab625 100644 --- a/modules/server/include/topics/authorizationtopic.h +++ b/modules/server/include/topics/authorizationtopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/include/topics/bouncetopic.h b/modules/server/include/topics/bouncetopic.h index f5e76acd19..517fc4957d 100644 --- a/modules/server/include/topics/bouncetopic.h +++ b/modules/server/include/topics/bouncetopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/include/topics/getpropertytopic.h b/modules/server/include/topics/getpropertytopic.h index 58c7960e48..3a51329897 100644 --- a/modules/server/include/topics/getpropertytopic.h +++ b/modules/server/include/topics/getpropertytopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/include/topics/luascripttopic.h b/modules/server/include/topics/luascripttopic.h index 305d4e5bbb..ecff03e434 100644 --- a/modules/server/include/topics/luascripttopic.h +++ b/modules/server/include/topics/luascripttopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/include/topics/setpropertytopic.h b/modules/server/include/topics/setpropertytopic.h index 0982e48411..a6bd37a400 100644 --- a/modules/server/include/topics/setpropertytopic.h +++ b/modules/server/include/topics/setpropertytopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/include/topics/shortcuttopic.h b/modules/server/include/topics/shortcuttopic.h index 721d7a0d44..65aecdeb6f 100644 --- a/modules/server/include/topics/shortcuttopic.h +++ b/modules/server/include/topics/shortcuttopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/include/topics/subscriptiontopic.h b/modules/server/include/topics/subscriptiontopic.h index 46a80818cf..69174e6fab 100644 --- a/modules/server/include/topics/subscriptiontopic.h +++ b/modules/server/include/topics/subscriptiontopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/include/topics/timetopic.h b/modules/server/include/topics/timetopic.h index 8473f1ecb5..7ace2db1fa 100644 --- a/modules/server/include/topics/timetopic.h +++ b/modules/server/include/topics/timetopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/include/topics/topic.h b/modules/server/include/topics/topic.h index 536100ec30..79ffa63a96 100644 --- a/modules/server/include/topics/topic.h +++ b/modules/server/include/topics/topic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/include/topics/triggerpropertytopic.h b/modules/server/include/topics/triggerpropertytopic.h index 6de572ba48..be1146a95d 100644 --- a/modules/server/include/topics/triggerpropertytopic.h +++ b/modules/server/include/topics/triggerpropertytopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/include/topics/versiontopic.h b/modules/server/include/topics/versiontopic.h index 7238f33eaf..0cf3e39bd8 100644 --- a/modules/server/include/topics/versiontopic.h +++ b/modules/server/include/topics/versiontopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/servermodule.cpp b/modules/server/servermodule.cpp index 33a805b591..9be0afda7f 100644 --- a/modules/server/servermodule.cpp +++ b/modules/server/servermodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/servermodule.h b/modules/server/servermodule.h index 529355ed47..4af9746928 100644 --- a/modules/server/servermodule.h +++ b/modules/server/servermodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/src/connection.cpp b/modules/server/src/connection.cpp index 9fdc542b78..ca2330307a 100644 --- a/modules/server/src/connection.cpp +++ b/modules/server/src/connection.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/src/connectionpool.cpp b/modules/server/src/connectionpool.cpp index 67c49a9c5a..59229f869d 100644 --- a/modules/server/src/connectionpool.cpp +++ b/modules/server/src/connectionpool.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/src/jsonconverters.cpp b/modules/server/src/jsonconverters.cpp index 20e3ad2012..5175443ea9 100644 --- a/modules/server/src/jsonconverters.cpp +++ b/modules/server/src/jsonconverters.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp index 31f0add5ec..161a0ba1e7 100644 --- a/modules/server/src/serverinterface.cpp +++ b/modules/server/src/serverinterface.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/src/topics/authorizationtopic.cpp b/modules/server/src/topics/authorizationtopic.cpp index 3781b0cc3d..215f0176dd 100644 --- a/modules/server/src/topics/authorizationtopic.cpp +++ b/modules/server/src/topics/authorizationtopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/src/topics/bouncetopic.cpp b/modules/server/src/topics/bouncetopic.cpp index 5720d3504d..07e4b1c24f 100644 --- a/modules/server/src/topics/bouncetopic.cpp +++ b/modules/server/src/topics/bouncetopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/src/topics/getpropertytopic.cpp b/modules/server/src/topics/getpropertytopic.cpp index 01daa0039c..ae0e5bc6a8 100644 --- a/modules/server/src/topics/getpropertytopic.cpp +++ b/modules/server/src/topics/getpropertytopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/src/topics/luascripttopic.cpp b/modules/server/src/topics/luascripttopic.cpp index f5ff7545d9..f81a425c3a 100644 --- a/modules/server/src/topics/luascripttopic.cpp +++ b/modules/server/src/topics/luascripttopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/src/topics/setpropertytopic.cpp b/modules/server/src/topics/setpropertytopic.cpp index 6f4c0af556..b2aac239e8 100644 --- a/modules/server/src/topics/setpropertytopic.cpp +++ b/modules/server/src/topics/setpropertytopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/src/topics/shortcuttopic.cpp b/modules/server/src/topics/shortcuttopic.cpp index f500d30f1c..8649aa2458 100644 --- a/modules/server/src/topics/shortcuttopic.cpp +++ b/modules/server/src/topics/shortcuttopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/src/topics/subscriptiontopic.cpp b/modules/server/src/topics/subscriptiontopic.cpp index 93a3b435f3..3ec9e3bfb6 100644 --- a/modules/server/src/topics/subscriptiontopic.cpp +++ b/modules/server/src/topics/subscriptiontopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/src/topics/timetopic.cpp b/modules/server/src/topics/timetopic.cpp index 1f1641fb86..17302c7bf6 100644 --- a/modules/server/src/topics/timetopic.cpp +++ b/modules/server/src/topics/timetopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/src/topics/topic.cpp b/modules/server/src/topics/topic.cpp index d49212031e..10be414a58 100644 --- a/modules/server/src/topics/topic.cpp +++ b/modules/server/src/topics/topic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/src/topics/triggerpropertytopic.cpp b/modules/server/src/topics/triggerpropertytopic.cpp index b86d5b3f68..3fefa62ef5 100644 --- a/modules/server/src/topics/triggerpropertytopic.cpp +++ b/modules/server/src/topics/triggerpropertytopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/server/src/topics/versiontopic.cpp b/modules/server/src/topics/versiontopic.cpp index ad7d64f86b..762eada181 100644 --- a/modules/server/src/topics/versiontopic.cpp +++ b/modules/server/src/topics/versiontopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/CMakeLists.txt b/modules/space/CMakeLists.txt index d17204258a..107c86614b 100644 --- a/modules/space/CMakeLists.txt +++ b/modules/space/CMakeLists.txt @@ -25,57 +25,57 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/planetgeometry.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableconstellationbounds.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanet.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablerings.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablestars.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.h - ${CMAKE_CURRENT_SOURCE_DIR}/translation/keplertranslation.h - ${CMAKE_CURRENT_SOURCE_DIR}/translation/spicetranslation.h - ${CMAKE_CURRENT_SOURCE_DIR}/translation/tletranslation.h - ${CMAKE_CURRENT_SOURCE_DIR}/translation/horizonstranslation.h - ${CMAKE_CURRENT_SOURCE_DIR}/rotation/spicerotation.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/planetgeometry.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableconstellationbounds.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanet.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablerings.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablestars.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.h + ${CMAKE_CURRENT_SOURCE_DIR}/translation/keplertranslation.h + ${CMAKE_CURRENT_SOURCE_DIR}/translation/spicetranslation.h + ${CMAKE_CURRENT_SOURCE_DIR}/translation/tletranslation.h + ${CMAKE_CURRENT_SOURCE_DIR}/translation/horizonstranslation.h + ${CMAKE_CURRENT_SOURCE_DIR}/rotation/spicerotation.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/planetgeometry.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableconstellationbounds.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanet.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablerings.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablestars.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/translation/keplertranslation.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/translation/spicetranslation.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/translation/tletranslation.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/translation/horizonstranslation.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rotation/spicerotation.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/planetgeometry.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableconstellationbounds.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanet.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablerings.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablestars.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/translation/keplertranslation.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/translation/spicetranslation.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/translation/tletranslation.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/translation/horizonstranslation.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rotation/spicerotation.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) set(SHADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/constellationbounds_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/constellationbounds_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/nighttexture_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/nighttexture_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderableplanet_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderableplanet_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/rings_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/rings_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/shadow_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/shadow_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/shadow_nighttexture_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/shadow_nighttexture_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/star_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/star_ge.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/star_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/constellationbounds_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/constellationbounds_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/nighttexture_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/nighttexture_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderableplanet_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderableplanet_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/rings_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/rings_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/shadow_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/shadow_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/shadow_nighttexture_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/shadow_nighttexture_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/star_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/star_ge.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/star_vs.glsl ) source_group("Shader Files" FILES ${SHADER_FILES}) create_new_module( - "Space" - space_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} + "Space" + space_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} ) diff --git a/modules/space/rendering/planetgeometry.cpp b/modules/space/rendering/planetgeometry.cpp index e840fc8918..0f0c7cbef5 100644 --- a/modules/space/rendering/planetgeometry.cpp +++ b/modules/space/rendering/planetgeometry.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/rendering/planetgeometry.h b/modules/space/rendering/planetgeometry.h index 0e84f1c75f..9ba1259302 100644 --- a/modules/space/rendering/planetgeometry.h +++ b/modules/space/rendering/planetgeometry.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp index 94cfb978a3..e95b101ea8 100644 --- a/modules/space/rendering/renderableconstellationbounds.cpp +++ b/modules/space/rendering/renderableconstellationbounds.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/rendering/renderableconstellationbounds.h b/modules/space/rendering/renderableconstellationbounds.h index 135daa5dd3..67c8e73080 100644 --- a/modules/space/rendering/renderableconstellationbounds.h +++ b/modules/space/rendering/renderableconstellationbounds.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/rendering/renderableplanet.cpp b/modules/space/rendering/renderableplanet.cpp index ece72d4ac0..affe22e95b 100644 --- a/modules/space/rendering/renderableplanet.cpp +++ b/modules/space/rendering/renderableplanet.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/rendering/renderableplanet.h b/modules/space/rendering/renderableplanet.h index 05390a8a1c..ff40289dee 100644 --- a/modules/space/rendering/renderableplanet.h +++ b/modules/space/rendering/renderableplanet.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp index 9f9a3d58b1..c360ca597d 100644 --- a/modules/space/rendering/renderablerings.cpp +++ b/modules/space/rendering/renderablerings.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/rendering/renderablerings.h b/modules/space/rendering/renderablerings.h index 77e964ca3d..ef0120fa12 100644 --- a/modules/space/rendering/renderablerings.h +++ b/modules/space/rendering/renderablerings.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp index 09060984cb..7d18dd0b8f 100644 --- a/modules/space/rendering/renderablestars.cpp +++ b/modules/space/rendering/renderablestars.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/rendering/renderablestars.h b/modules/space/rendering/renderablestars.h index 1f6c6491b0..ed6f64c889 100644 --- a/modules/space/rendering/renderablestars.h +++ b/modules/space/rendering/renderablestars.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/rendering/simplespheregeometry.cpp b/modules/space/rendering/simplespheregeometry.cpp index 84045a56b6..d02bd1c493 100644 --- a/modules/space/rendering/simplespheregeometry.cpp +++ b/modules/space/rendering/simplespheregeometry.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/rendering/simplespheregeometry.h b/modules/space/rendering/simplespheregeometry.h index db4d3c8fa5..8148ec052e 100644 --- a/modules/space/rendering/simplespheregeometry.h +++ b/modules/space/rendering/simplespheregeometry.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp index d4c6afc89c..5cfb950a32 100644 --- a/modules/space/rotation/spicerotation.cpp +++ b/modules/space/rotation/spicerotation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/rotation/spicerotation.h b/modules/space/rotation/spicerotation.h index 34595ce633..b65d4da424 100644 --- a/modules/space/rotation/spicerotation.h +++ b/modules/space/rotation/spicerotation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/shaders/constellationbounds_fs.glsl b/modules/space/shaders/constellationbounds_fs.glsl index 157cf8eed2..2e9e0e0eb0 100644 --- a/modules/space/shaders/constellationbounds_fs.glsl +++ b/modules/space/shaders/constellationbounds_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/shaders/constellationbounds_vs.glsl b/modules/space/shaders/constellationbounds_vs.glsl index 8771a19f73..ddeea42820 100644 --- a/modules/space/shaders/constellationbounds_vs.glsl +++ b/modules/space/shaders/constellationbounds_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/shaders/nighttexture_fs.glsl b/modules/space/shaders/nighttexture_fs.glsl index 5c99a06731..dd926efba9 100644 --- a/modules/space/shaders/nighttexture_fs.glsl +++ b/modules/space/shaders/nighttexture_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/shaders/nighttexture_vs.glsl b/modules/space/shaders/nighttexture_vs.glsl index ae79663634..3ea0d1e9d8 100644 --- a/modules/space/shaders/nighttexture_vs.glsl +++ b/modules/space/shaders/nighttexture_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/shaders/renderableplanet_fs.glsl b/modules/space/shaders/renderableplanet_fs.glsl index 2b36d2f898..0c2d70b3cc 100644 --- a/modules/space/shaders/renderableplanet_fs.glsl +++ b/modules/space/shaders/renderableplanet_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/shaders/renderableplanet_vs.glsl b/modules/space/shaders/renderableplanet_vs.glsl index b10e225e22..2cf37c2eee 100644 --- a/modules/space/shaders/renderableplanet_vs.glsl +++ b/modules/space/shaders/renderableplanet_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/shaders/rings_fs.glsl b/modules/space/shaders/rings_fs.glsl index 05ea7fdd5a..f7d6bf02dd 100644 --- a/modules/space/shaders/rings_fs.glsl +++ b/modules/space/shaders/rings_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/shaders/rings_vs.glsl b/modules/space/shaders/rings_vs.glsl index ce3a4eb0bd..48d1c077ea 100644 --- a/modules/space/shaders/rings_vs.glsl +++ b/modules/space/shaders/rings_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/shaders/shadow_fs.glsl b/modules/space/shaders/shadow_fs.glsl index 6c2fff33f6..ffdc877ad7 100644 --- a/modules/space/shaders/shadow_fs.glsl +++ b/modules/space/shaders/shadow_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/shaders/shadow_nighttexture_fs.glsl b/modules/space/shaders/shadow_nighttexture_fs.glsl index 45788b3ef2..8155c8c8d4 100644 --- a/modules/space/shaders/shadow_nighttexture_fs.glsl +++ b/modules/space/shaders/shadow_nighttexture_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/shaders/shadow_nighttexture_vs.glsl b/modules/space/shaders/shadow_nighttexture_vs.glsl index 2aa3a0c77a..f191378e68 100644 --- a/modules/space/shaders/shadow_nighttexture_vs.glsl +++ b/modules/space/shaders/shadow_nighttexture_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/shaders/shadow_vs.glsl b/modules/space/shaders/shadow_vs.glsl index 0ac0e2bbf1..e26e9e3514 100644 --- a/modules/space/shaders/shadow_vs.glsl +++ b/modules/space/shaders/shadow_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/shaders/star_fs.glsl b/modules/space/shaders/star_fs.glsl index 8e8c5e67d3..60c4e8f749 100644 --- a/modules/space/shaders/star_fs.glsl +++ b/modules/space/shaders/star_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/shaders/star_ge.glsl b/modules/space/shaders/star_ge.glsl index b6fc81b941..15f4adf06f 100644 --- a/modules/space/shaders/star_ge.glsl +++ b/modules/space/shaders/star_ge.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/shaders/star_vs.glsl b/modules/space/shaders/star_vs.glsl index 37040bd3c4..24d2f600ed 100644 --- a/modules/space/shaders/star_vs.glsl +++ b/modules/space/shaders/star_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/spacemodule.cpp b/modules/space/spacemodule.cpp index 4293b44e8e..bf95c08672 100644 --- a/modules/space/spacemodule.cpp +++ b/modules/space/spacemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/spacemodule.h b/modules/space/spacemodule.h index 7b6544a2ae..bd5aedff70 100644 --- a/modules/space/spacemodule.h +++ b/modules/space/spacemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/translation/horizonstranslation.cpp b/modules/space/translation/horizonstranslation.cpp index 7605d4c431..e50d284047 100644 --- a/modules/space/translation/horizonstranslation.cpp +++ b/modules/space/translation/horizonstranslation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/translation/horizonstranslation.h b/modules/space/translation/horizonstranslation.h index 9a7d699a24..6bd1a21860 100644 --- a/modules/space/translation/horizonstranslation.h +++ b/modules/space/translation/horizonstranslation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/translation/keplertranslation.cpp b/modules/space/translation/keplertranslation.cpp index 75037dc8d7..cc9eba42a2 100644 --- a/modules/space/translation/keplertranslation.cpp +++ b/modules/space/translation/keplertranslation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/translation/keplertranslation.h b/modules/space/translation/keplertranslation.h index 5c9407eabc..762c95c29e 100644 --- a/modules/space/translation/keplertranslation.h +++ b/modules/space/translation/keplertranslation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/translation/spicetranslation.cpp b/modules/space/translation/spicetranslation.cpp index 88ac606a15..90bf8d3afe 100644 --- a/modules/space/translation/spicetranslation.cpp +++ b/modules/space/translation/spicetranslation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/translation/spicetranslation.h b/modules/space/translation/spicetranslation.h index 28011b6f5e..031faa57a6 100644 --- a/modules/space/translation/spicetranslation.h +++ b/modules/space/translation/spicetranslation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/translation/tletranslation.cpp b/modules/space/translation/tletranslation.cpp index aa7af14ff3..47403bf5cf 100644 --- a/modules/space/translation/tletranslation.cpp +++ b/modules/space/translation/tletranslation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/space/translation/tletranslation.h b/modules/space/translation/tletranslation.h index dcd40de285..6d2dadfca6 100644 --- a/modules/space/translation/tletranslation.h +++ b/modules/space/translation/tletranslation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/CMakeLists.txt b/modules/spacecraftinstruments/CMakeLists.txt index 41026054e4..849f02fb6c 100644 --- a/modules/spacecraftinstruments/CMakeLists.txt +++ b/modules/spacecraftinstruments/CMakeLists.txt @@ -25,71 +25,69 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditeminstruments.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablecrawlingline.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefov.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneprojection.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanetprojection.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableshadowcylinder.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodelprojection.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/decoder.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/hongkangparser.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/instrumenttimesparser.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/image.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/imagesequencer.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/instrumentdecoder.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/labelparser.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/projectioncomponent.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/scannerdecoder.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/sequenceparser.h - ${CMAKE_CURRENT_SOURCE_DIR}/util/targetdecoder.h + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditeminstruments.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablecrawlingline.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefov.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneprojection.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanetprojection.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableshadowcylinder.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodelprojection.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/decoder.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/hongkangparser.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/instrumenttimesparser.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/image.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/imagesequencer.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/instrumentdecoder.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/labelparser.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/projectioncomponent.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/scannerdecoder.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/sequenceparser.h + ${CMAKE_CURRENT_SOURCE_DIR}/util/targetdecoder.h ) - - source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditeminstruments.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablecrawlingline.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefov.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneprojection.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanetprojection.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableshadowcylinder.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodelprojection.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/decoder.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/hongkangparser.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/instrumenttimesparser.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/imagesequencer.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/instrumentdecoder.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/labelparser.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/projectioncomponent.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/scannerdecoder.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/sequenceparser.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/util/targetdecoder.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditeminstruments.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablecrawlingline.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefov.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneprojection.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanetprojection.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableshadowcylinder.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodelprojection.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/decoder.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/hongkangparser.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/instrumenttimesparser.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/imagesequencer.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/instrumentdecoder.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/labelparser.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/projectioncomponent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/scannerdecoder.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/sequenceparser.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/util/targetdecoder.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) set(SHADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/crawlingline_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/crawlingline_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fov_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fov_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderableModel_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderableModel_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderableModelProjection_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderableModelProjection_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderablePlanet_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderablePlanet_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderablePlanetProjection_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderablePlanetProjection_vs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/terminatorshadow_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/terminatorshadow_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/crawlingline_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/crawlingline_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fov_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fov_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderableModel_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderableModel_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderableModelProjection_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderableModelProjection_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderablePlanet_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderablePlanet_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderablePlanetProjection_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderablePlanetProjection_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/terminatorshadow_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/terminatorshadow_vs.glsl ) source_group("Shader Files" FILES ${SHADER_FILES}) create_new_module( - "SpacecraftInstruments" - spacecraftinstruments_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} + "SpacecraftInstruments" + spacecraftinstruments_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} ) diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp index f6c2133e34..095efefae5 100644 --- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp +++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h index 8ace6a6dd3..c5d896ec14 100644 --- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h +++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp index a7f8f54681..041350091d 100644 --- a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp +++ b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/rendering/renderablecrawlingline.h b/modules/spacecraftinstruments/rendering/renderablecrawlingline.h index d3b347e6f5..7f554345d1 100644 --- a/modules/spacecraftinstruments/rendering/renderablecrawlingline.h +++ b/modules/spacecraftinstruments/rendering/renderablecrawlingline.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp index 80a414ce87..ab4e0696e9 100644 --- a/modules/spacecraftinstruments/rendering/renderablefov.cpp +++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/rendering/renderablefov.h b/modules/spacecraftinstruments/rendering/renderablefov.h index c18573e92c..0c0c8fe725 100644 --- a/modules/spacecraftinstruments/rendering/renderablefov.h +++ b/modules/spacecraftinstruments/rendering/renderablefov.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp index 9348632bf8..dc306d2a76 100644 --- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.h b/modules/spacecraftinstruments/rendering/renderablemodelprojection.h index 1129e06899..f311ae065f 100644 --- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.h +++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp index ede68f199a..48508ce2f8 100644 --- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.h b/modules/spacecraftinstruments/rendering/renderableplaneprojection.h index bb76969200..c68dfc18e9 100644 --- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.h +++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp index 67df17050f..a3c3b06053 100644 --- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.h b/modules/spacecraftinstruments/rendering/renderableplanetprojection.h index 90842409d3..c8c1f133c8 100644 --- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.h +++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp index fd5762277a..ad61c96356 100644 --- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp +++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h index ce820f9d76..f63646c719 100644 --- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h +++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl b/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl index 9e3888cc49..3dda8a23ff 100644 --- a/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl +++ b/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl b/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl index bd769dad9d..3a07e8ff7c 100644 --- a/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl +++ b/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/shaders/fov_fs.glsl b/modules/spacecraftinstruments/shaders/fov_fs.glsl index 968fecdcfc..8320989fb6 100644 --- a/modules/spacecraftinstruments/shaders/fov_fs.glsl +++ b/modules/spacecraftinstruments/shaders/fov_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/shaders/fov_vs.glsl b/modules/spacecraftinstruments/shaders/fov_vs.glsl index fada593117..633fcf53bf 100644 --- a/modules/spacecraftinstruments/shaders/fov_vs.glsl +++ b/modules/spacecraftinstruments/shaders/fov_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl b/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl index c47960db4d..de9dfd610c 100644 --- a/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl +++ b/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl index b24ef3752f..efb7869f6e 100644 --- a/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl +++ b/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl b/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl index 44651a2b20..2d688f003b 100644 --- a/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl +++ b/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl index 23f326eaf3..fd106e5457 100644 --- a/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl +++ b/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl index ebabde3704..c3513ad40a 100644 --- a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl +++ b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl index 16692b264f..9f38a64d1d 100644 --- a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl +++ b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl index ff58aa917b..e5e384d88b 100644 --- a/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl +++ b/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl index 9da9b299a6..656a7c77c7 100644 --- a/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl +++ b/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl b/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl index 0157fc6f54..ca7c77ff31 100644 --- a/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl +++ b/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl b/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl index 86d7803afd..685a9c8270 100644 --- a/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl +++ b/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp index 64aa589e6e..3e2bf6847a 100644 --- a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp +++ b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h index 0727b4ea61..d05fefe8c5 100644 --- a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h +++ b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/decoder.cpp b/modules/spacecraftinstruments/util/decoder.cpp index 903fcec21e..5cb019ee9e 100644 --- a/modules/spacecraftinstruments/util/decoder.cpp +++ b/modules/spacecraftinstruments/util/decoder.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/decoder.h b/modules/spacecraftinstruments/util/decoder.h index bf602923d7..a6633b281c 100644 --- a/modules/spacecraftinstruments/util/decoder.h +++ b/modules/spacecraftinstruments/util/decoder.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/hongkangparser.cpp b/modules/spacecraftinstruments/util/hongkangparser.cpp index 140883e1c3..351f2d54fb 100644 --- a/modules/spacecraftinstruments/util/hongkangparser.cpp +++ b/modules/spacecraftinstruments/util/hongkangparser.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/hongkangparser.h b/modules/spacecraftinstruments/util/hongkangparser.h index d035a551dc..37696d3e73 100644 --- a/modules/spacecraftinstruments/util/hongkangparser.h +++ b/modules/spacecraftinstruments/util/hongkangparser.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/image.h b/modules/spacecraftinstruments/util/image.h index 57b77e38d9..c94747fe26 100644 --- a/modules/spacecraftinstruments/util/image.h +++ b/modules/spacecraftinstruments/util/image.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/imagesequencer.cpp b/modules/spacecraftinstruments/util/imagesequencer.cpp index 5d0f881fdb..15465a5aa3 100644 --- a/modules/spacecraftinstruments/util/imagesequencer.cpp +++ b/modules/spacecraftinstruments/util/imagesequencer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/imagesequencer.h b/modules/spacecraftinstruments/util/imagesequencer.h index 445a831806..fb792e6d91 100644 --- a/modules/spacecraftinstruments/util/imagesequencer.h +++ b/modules/spacecraftinstruments/util/imagesequencer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/instrumentdecoder.cpp b/modules/spacecraftinstruments/util/instrumentdecoder.cpp index cbbce2b568..a2685894e1 100644 --- a/modules/spacecraftinstruments/util/instrumentdecoder.cpp +++ b/modules/spacecraftinstruments/util/instrumentdecoder.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/instrumentdecoder.h b/modules/spacecraftinstruments/util/instrumentdecoder.h index 25cd672ef7..de4dd7c862 100644 --- a/modules/spacecraftinstruments/util/instrumentdecoder.h +++ b/modules/spacecraftinstruments/util/instrumentdecoder.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp index b48f2df3e1..fc872e0ffe 100644 --- a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp +++ b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.h b/modules/spacecraftinstruments/util/instrumenttimesparser.h index 7be6d78463..f8326f086e 100644 --- a/modules/spacecraftinstruments/util/instrumenttimesparser.h +++ b/modules/spacecraftinstruments/util/instrumenttimesparser.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/labelparser.cpp b/modules/spacecraftinstruments/util/labelparser.cpp index fd83d8e28a..726393a263 100644 --- a/modules/spacecraftinstruments/util/labelparser.cpp +++ b/modules/spacecraftinstruments/util/labelparser.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/labelparser.h b/modules/spacecraftinstruments/util/labelparser.h index 6fec3593be..017fdc2444 100644 --- a/modules/spacecraftinstruments/util/labelparser.h +++ b/modules/spacecraftinstruments/util/labelparser.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp index 4e73793010..990af24184 100644 --- a/modules/spacecraftinstruments/util/projectioncomponent.cpp +++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/projectioncomponent.h b/modules/spacecraftinstruments/util/projectioncomponent.h index 3e47565c06..19f9d927af 100644 --- a/modules/spacecraftinstruments/util/projectioncomponent.h +++ b/modules/spacecraftinstruments/util/projectioncomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/scannerdecoder.cpp b/modules/spacecraftinstruments/util/scannerdecoder.cpp index c90ef4685e..7d4b748845 100644 --- a/modules/spacecraftinstruments/util/scannerdecoder.cpp +++ b/modules/spacecraftinstruments/util/scannerdecoder.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/scannerdecoder.h b/modules/spacecraftinstruments/util/scannerdecoder.h index 0a3e21b700..6e15ef4982 100644 --- a/modules/spacecraftinstruments/util/scannerdecoder.h +++ b/modules/spacecraftinstruments/util/scannerdecoder.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/sequenceparser.cpp b/modules/spacecraftinstruments/util/sequenceparser.cpp index 4f04f6716b..2eda0c1563 100644 --- a/modules/spacecraftinstruments/util/sequenceparser.cpp +++ b/modules/spacecraftinstruments/util/sequenceparser.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/sequenceparser.h b/modules/spacecraftinstruments/util/sequenceparser.h index 60398ba087..fada30e731 100644 --- a/modules/spacecraftinstruments/util/sequenceparser.h +++ b/modules/spacecraftinstruments/util/sequenceparser.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/targetdecoder.cpp b/modules/spacecraftinstruments/util/targetdecoder.cpp index 6bf1ddd122..9d7f7cb752 100644 --- a/modules/spacecraftinstruments/util/targetdecoder.cpp +++ b/modules/spacecraftinstruments/util/targetdecoder.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spacecraftinstruments/util/targetdecoder.h b/modules/spacecraftinstruments/util/targetdecoder.h index ce28e3c0a9..b617577f65 100644 --- a/modules/spacecraftinstruments/util/targetdecoder.h +++ b/modules/spacecraftinstruments/util/targetdecoder.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spout/CMakeLists.txt b/modules/spout/CMakeLists.txt index f22ae4b8ed..8a9c7c3722 100644 --- a/modules/spout/CMakeLists.txt +++ b/modules/spout/CMakeLists.txt @@ -40,14 +40,14 @@ source_group("Source Files" FILES ${SOURCE_FILES}) set(SGCT_SPOUT_SUPPORT ON CACHE BOOL "" FORCE) create_new_module( - "Spout" - spout_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} + "Spout" + spout_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ) target_include_directories(openspace-module-spout SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ext/spout) -target_link_libraries(openspace-module-spout ${CMAKE_CURRENT_SOURCE_DIR}/ext/spout/SpoutLibrary.lib) +target_link_libraries(openspace-module-spout PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ext/spout/SpoutLibrary.lib) register_external_libraries("${CMAKE_CURRENT_SOURCE_DIR}/ext/spout/SpoutLibrary.dll") target_compile_definitions(openspace-module-spout PUBLIC "OPENSPACE_HAS_SPOUT") diff --git a/modules/spout/renderableplanespout.cpp b/modules/spout/renderableplanespout.cpp index 7f54f529ca..f3c2eb2dac 100644 --- a/modules/spout/renderableplanespout.cpp +++ b/modules/spout/renderableplanespout.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spout/renderableplanespout.h b/modules/spout/renderableplanespout.h index 42f1cf542e..0df8dda2fc 100644 --- a/modules/spout/renderableplanespout.h +++ b/modules/spout/renderableplanespout.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spout/screenspacespout.cpp b/modules/spout/screenspacespout.cpp index 9d699affbc..5d8f23f430 100644 --- a/modules/spout/screenspacespout.cpp +++ b/modules/spout/screenspacespout.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spout/screenspacespout.h b/modules/spout/screenspacespout.h index 33b01fe86c..4c8e06b529 100644 --- a/modules/spout/screenspacespout.h +++ b/modules/spout/screenspacespout.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spout/spoutlibrary.h b/modules/spout/spoutlibrary.h index be93ca42d1..22cae4105f 100644 --- a/modules/spout/spoutlibrary.h +++ b/modules/spout/spoutlibrary.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spout/spoutmodule.cpp b/modules/spout/spoutmodule.cpp index 2f128696d3..b6853726b7 100644 --- a/modules/spout/spoutmodule.cpp +++ b/modules/spout/spoutmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/spout/spoutmodule.h b/modules/spout/spoutmodule.h index 4c1958a0d6..b2b9c95cdb 100644 --- a/modules/spout/spoutmodule.h +++ b/modules/spout/spoutmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/sync/CMakeLists.txt b/modules/sync/CMakeLists.txt index ed9897fe97..28fde9802a 100644 --- a/modules/sync/CMakeLists.txt +++ b/modules/sync/CMakeLists.txt @@ -27,32 +27,32 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) option(OPENSPACE_MODULE_SYNC_USE_LIBTORRENT "Use libtorrent" OFF) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/syncmodule.h - ${CMAKE_CURRENT_SOURCE_DIR}/syncs/httpsynchronization.h - ${CMAKE_CURRENT_SOURCE_DIR}/syncs/urlsynchronization.h - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/syncassettask.h + ${CMAKE_CURRENT_SOURCE_DIR}/syncmodule.h + ${CMAKE_CURRENT_SOURCE_DIR}/syncs/httpsynchronization.h + ${CMAKE_CURRENT_SOURCE_DIR}/syncs/urlsynchronization.h + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/syncassettask.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/syncmodule.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/syncs/httpsynchronization.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/syncs/urlsynchronization.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/syncassettask.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/syncmodule.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/syncs/httpsynchronization.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/syncs/urlsynchronization.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/syncassettask.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) if (OPENSPACE_MODULE_SYNC_USE_LIBTORRENT) - set(HEADER_FILES - ${HEADER_FILES} - ${CMAKE_CURRENT_SOURCE_DIR}/torrentclient.h - ${CMAKE_CURRENT_SOURCE_DIR}/syncs/torrentsynchronization.h - ) - set(SOURCE_FILES - ${SOURCE_FILES} - ${CMAKE_CURRENT_SOURCE_DIR}/torrentclient.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/syncs/torrentsynchronization.cpp - ) + set(HEADER_FILES + ${HEADER_FILES} + ${CMAKE_CURRENT_SOURCE_DIR}/torrentclient.h + ${CMAKE_CURRENT_SOURCE_DIR}/syncs/torrentsynchronization.h + ) + set(SOURCE_FILES + ${SOURCE_FILES} + ${CMAKE_CURRENT_SOURCE_DIR}/torrentclient.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/syncs/torrentsynchronization.cpp + ) endif () @@ -63,26 +63,27 @@ create_new_module("Sync" sync_module ${HEADER_FILES} ${SOURCE_FILES}) ##### if (OPENSPACE_MODULE_SYNC_USE_LIBTORRENT) - set(Boost_USE_STATIC_LIBS ON) - set(Boost_USE_MULTITHREADED ON) - set(LIBTORRENT_encryption OFF CACHE BOOL "Use OpenSSL Encryption" FORCE) - set(LIBTORRENT_shared OFF CACHE BOOL "Use Libtorrent as shared library" FORCE) + set(Boost_USE_STATIC_LIBS ON) + set(Boost_USE_MULTITHREADED ON) + set(LIBTORRENT_encryption OFF CACHE BOOL "Use OpenSSL Encryption" FORCE) + set(LIBTORRENT_shared OFF CACHE BOOL "Use Libtorrent as shared library" FORCE) - include_external_library( - ${sync_module} - torrent-rasterbar - ${CMAKE_CURRENT_SOURCE_DIR}/ext/libtorrent + include_external_library( + ${sync_module} + torrent-rasterbar + ${CMAKE_CURRENT_SOURCE_DIR}/ext/libtorrent + ) + target_include_directories( + ${sync_module} + SYSTEM PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/ext/libtorrent/include + ) + + target_compile_definitions(openspace-module-sync PUBLIC SYNC_USE_LIBTORRENT) + + mark_as_advanced(LIBTORRENT_build_examples LIBTORRENT_build_tests + LIBTORRENT_deprecated-functions LIBTORRENT_dht LIBTORRENT_encryption + LIBTORRENT_exceptions LIBTORRENT_exceptions LIBTORRENT_libiconv + LIBTORRENT_logging LIBTORRENT_shared LIBTORRENT_static_runtime ) - target_include_directories( - ${sync_module} - SYSTEM PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/ext/libtorrent/include - ) - - target_compile_definitions(openspace-module-sync PUBLIC SYNC_USE_LIBTORRENT) - - mark_as_advanced(LIBTORRENT_build_examples LIBTORRENT_build_tests - LIBTORRENT_deprecated-functions LIBTORRENT_dht LIBTORRENT_encryption - LIBTORRENT_exceptions LIBTORRENT_exceptions LIBTORRENT_libiconv - LIBTORRENT_logging LIBTORRENT_shared LIBTORRENT_static_runtime) endif () # OPENSPACE_MODULE_SYNC_USE_LIBTORRENT \ No newline at end of file diff --git a/modules/sync/syncmodule.cpp b/modules/sync/syncmodule.cpp index e4a0b2e9c8..791254a3cd 100644 --- a/modules/sync/syncmodule.cpp +++ b/modules/sync/syncmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/sync/syncmodule.h b/modules/sync/syncmodule.h index a173201b03..eef18e8b72 100644 --- a/modules/sync/syncmodule.h +++ b/modules/sync/syncmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp index 23944e4ce9..0149d5a280 100644 --- a/modules/sync/syncs/httpsynchronization.cpp +++ b/modules/sync/syncs/httpsynchronization.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/sync/syncs/httpsynchronization.h b/modules/sync/syncs/httpsynchronization.h index 818c8b8b05..d5474698e6 100644 --- a/modules/sync/syncs/httpsynchronization.h +++ b/modules/sync/syncs/httpsynchronization.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/sync/syncs/torrentsynchronization.cpp b/modules/sync/syncs/torrentsynchronization.cpp index cf33af2087..2f3bfd1485 100644 --- a/modules/sync/syncs/torrentsynchronization.cpp +++ b/modules/sync/syncs/torrentsynchronization.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/sync/syncs/torrentsynchronization.h b/modules/sync/syncs/torrentsynchronization.h index 551827bb9f..98f9811f4e 100644 --- a/modules/sync/syncs/torrentsynchronization.h +++ b/modules/sync/syncs/torrentsynchronization.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp index 0d7cd0bbdd..ecb2e71f5b 100644 --- a/modules/sync/syncs/urlsynchronization.cpp +++ b/modules/sync/syncs/urlsynchronization.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/sync/syncs/urlsynchronization.h b/modules/sync/syncs/urlsynchronization.h index ef49426065..b3e6ce4a98 100644 --- a/modules/sync/syncs/urlsynchronization.h +++ b/modules/sync/syncs/urlsynchronization.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/sync/tasks/syncassettask.cpp b/modules/sync/tasks/syncassettask.cpp index 83899d8c22..24e54289f5 100644 --- a/modules/sync/tasks/syncassettask.cpp +++ b/modules/sync/tasks/syncassettask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/sync/tasks/syncassettask.h b/modules/sync/tasks/syncassettask.h index 7451bd6cd3..aa5236e480 100644 --- a/modules/sync/tasks/syncassettask.h +++ b/modules/sync/tasks/syncassettask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/sync/torrentclient.cpp b/modules/sync/torrentclient.cpp index f8232f1194..e2379f9c67 100644 --- a/modules/sync/torrentclient.cpp +++ b/modules/sync/torrentclient.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/sync/torrentclient.h b/modules/sync/torrentclient.h index e03eb01498..e633e24fdf 100644 --- a/modules/sync/torrentclient.h +++ b/modules/sync/torrentclient.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/touch/CMakeLists.txt b/modules/touch/CMakeLists.txt index c1ad29dac7..35929a64b4 100644 --- a/modules/touch/CMakeLists.txt +++ b/modules/touch/CMakeLists.txt @@ -25,35 +25,34 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/ext/levmarq.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/tuioear.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/touchinteraction.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/touchmarker.h + ${CMAKE_CURRENT_SOURCE_DIR}/ext/levmarq.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/tuioear.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/touchinteraction.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/touchmarker.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/ext/levmarq.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/tuioear.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/touchinteraction.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/touchmarker.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ext/levmarq.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/tuioear.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/touchinteraction.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/touchmarker.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) set(SHADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/marker_fs.glsl - ${CMAKE_CURRENT_SOURCE_DIR}/shaders/marker_vs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/marker_fs.glsl + ${CMAKE_CURRENT_SOURCE_DIR}/shaders/marker_vs.glsl ) source_group("Shader Files" FILES ${SHADER_FILES}) create_new_module( - "Touch" - touch_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} + "Touch" + touch_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} ) -include_external_library(${touch_module} libTUIO11 ${CMAKE_CURRENT_SOURCE_DIR}/ext) +include_external_library(${touch_module} PUBLIC libTUIO11 ${CMAKE_CURRENT_SOURCE_DIR}/ext) disable_external_warnings_for_file(${CMAKE_CURRENT_SOURCE_DIR}/ext/levmarq.cpp) - diff --git a/modules/touch/include/touchinteraction.h b/modules/touch/include/touchinteraction.h index 7e28f4b49a..0d9942184c 100644 --- a/modules/touch/include/touchinteraction.h +++ b/modules/touch/include/touchinteraction.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/touch/include/touchmarker.h b/modules/touch/include/touchmarker.h index 3661270b7f..ab2488b830 100644 --- a/modules/touch/include/touchmarker.h +++ b/modules/touch/include/touchmarker.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/touch/include/tuioear.h b/modules/touch/include/tuioear.h index 9121744fe2..3e8625c82e 100644 --- a/modules/touch/include/tuioear.h +++ b/modules/touch/include/tuioear.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/touch/shaders/marker_fs.glsl b/modules/touch/shaders/marker_fs.glsl index 2e5bd3c40a..bb19807bc2 100644 --- a/modules/touch/shaders/marker_fs.glsl +++ b/modules/touch/shaders/marker_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/touch/shaders/marker_vs.glsl b/modules/touch/shaders/marker_vs.glsl index 2c98210784..b1af43080a 100644 --- a/modules/touch/shaders/marker_vs.glsl +++ b/modules/touch/shaders/marker_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp index 7525a4a297..45f4faf2dd 100644 --- a/modules/touch/src/touchinteraction.cpp +++ b/modules/touch/src/touchinteraction.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/touch/src/touchmarker.cpp b/modules/touch/src/touchmarker.cpp index 41693ef4cd..c6f4d5af9e 100644 --- a/modules/touch/src/touchmarker.cpp +++ b/modules/touch/src/touchmarker.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/touch/src/tuioear.cpp b/modules/touch/src/tuioear.cpp index ebf4455e53..4ba8c7e24b 100644 --- a/modules/touch/src/tuioear.cpp +++ b/modules/touch/src/tuioear.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/touch/touchmodule.cpp b/modules/touch/touchmodule.cpp index 0ebf0c2498..0ea302d3ea 100644 --- a/modules/touch/touchmodule.cpp +++ b/modules/touch/touchmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/touch/touchmodule.h b/modules/touch/touchmodule.h index 654f1f84e8..b916c00318 100644 --- a/modules/touch/touchmodule.h +++ b/modules/touch/touchmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/toyvolume/CMakeLists.txt b/modules/toyvolume/CMakeLists.txt index 72d534f985..12dbf7d302 100644 --- a/modules/toyvolume/CMakeLists.txt +++ b/modules/toyvolume/CMakeLists.txt @@ -37,8 +37,8 @@ set(SOURCE_FILES source_group("Source Files" FILES ${SOURCE_FILES}) create_new_module( - "ToyVolume" - toyvolume_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} + "ToyVolume" + toyvolume_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ) diff --git a/modules/toyvolume/rendering/renderabletoyvolume.cpp b/modules/toyvolume/rendering/renderabletoyvolume.cpp index 1a6457d64d..ccb5018780 100644 --- a/modules/toyvolume/rendering/renderabletoyvolume.cpp +++ b/modules/toyvolume/rendering/renderabletoyvolume.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/toyvolume/rendering/renderabletoyvolume.h b/modules/toyvolume/rendering/renderabletoyvolume.h index 44f5bb326a..8c1b0a36e0 100644 --- a/modules/toyvolume/rendering/renderabletoyvolume.h +++ b/modules/toyvolume/rendering/renderabletoyvolume.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.cpp b/modules/toyvolume/rendering/toyvolumeraycaster.cpp index 3bf05fe414..0e6e7c73cc 100644 --- a/modules/toyvolume/rendering/toyvolumeraycaster.cpp +++ b/modules/toyvolume/rendering/toyvolumeraycaster.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.h b/modules/toyvolume/rendering/toyvolumeraycaster.h index 491f827843..69ea90a422 100644 --- a/modules/toyvolume/rendering/toyvolumeraycaster.h +++ b/modules/toyvolume/rendering/toyvolumeraycaster.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/toyvolume/toyvolumemodule.cpp b/modules/toyvolume/toyvolumemodule.cpp index 40d0551639..9198ffb599 100644 --- a/modules/toyvolume/toyvolumemodule.cpp +++ b/modules/toyvolume/toyvolumemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/toyvolume/toyvolumemodule.h b/modules/toyvolume/toyvolumemodule.h index a76bb6af18..a134415a49 100644 --- a/modules/toyvolume/toyvolumemodule.h +++ b/modules/toyvolume/toyvolumemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/CMakeLists.txt b/modules/volume/CMakeLists.txt index 6c9d7c8bc5..fc090bd969 100644 --- a/modules/volume/CMakeLists.txt +++ b/modules/volume/CMakeLists.txt @@ -25,58 +25,58 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/envelope.h - ${CMAKE_CURRENT_SOURCE_DIR}/rawvolume.h - ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumemetadata.h - ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumereader.h - ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumewriter.h - ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.h - ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.inl - ${CMAKE_CURRENT_SOURCE_DIR}/transferfunction.h - ${CMAKE_CURRENT_SOURCE_DIR}/transferfunctionhandler.h - ${CMAKE_CURRENT_SOURCE_DIR}/transferfunctionproperty.h - ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumemetadata.h - ${CMAKE_CURRENT_SOURCE_DIR}/lrucache.h - ${CMAKE_CURRENT_SOURCE_DIR}/lrucache.inl - ${CMAKE_CURRENT_SOURCE_DIR}/linearlrucache.h - ${CMAKE_CURRENT_SOURCE_DIR}/linearlrucache.inl - ${CMAKE_CURRENT_SOURCE_DIR}/volumegridtype.h - ${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.h - ${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.inl - ${CMAKE_CURRENT_SOURCE_DIR}/volumeutils.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletimevaryingvolume.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/basicvolumeraycaster.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/volumeclipplane.h - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/volumeclipplanes.h - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/generaterawvolumetask.h + ${CMAKE_CURRENT_SOURCE_DIR}/envelope.h + ${CMAKE_CURRENT_SOURCE_DIR}/rawvolume.h + ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumemetadata.h + ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumereader.h + ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumewriter.h + ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.h + ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.inl + ${CMAKE_CURRENT_SOURCE_DIR}/transferfunction.h + ${CMAKE_CURRENT_SOURCE_DIR}/transferfunctionhandler.h + ${CMAKE_CURRENT_SOURCE_DIR}/transferfunctionproperty.h + ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumemetadata.h + ${CMAKE_CURRENT_SOURCE_DIR}/lrucache.h + ${CMAKE_CURRENT_SOURCE_DIR}/lrucache.inl + ${CMAKE_CURRENT_SOURCE_DIR}/linearlrucache.h + ${CMAKE_CURRENT_SOURCE_DIR}/linearlrucache.inl + ${CMAKE_CURRENT_SOURCE_DIR}/volumegridtype.h + ${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.h + ${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.inl + ${CMAKE_CURRENT_SOURCE_DIR}/volumeutils.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletimevaryingvolume.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/basicvolumeraycaster.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/volumeclipplane.h + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/volumeclipplanes.h + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/generaterawvolumetask.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - ${CMAKE_CURRENT_SOURCE_DIR}/envelope.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rawvolume.inl - ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumemetadata.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumereader.inl - ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumewriter.inl - ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.inl - ${CMAKE_CURRENT_SOURCE_DIR}/transferfunction.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/transferfunctionhandler.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/transferfunctionproperty.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.inl - ${CMAKE_CURRENT_SOURCE_DIR}/volumegridtype.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/volumeutils.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletimevaryingvolume.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/basicvolumeraycaster.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/volumeclipplane.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/rendering/volumeclipplanes.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tasks/generaterawvolumetask.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/envelope.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rawvolume.inl + ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumemetadata.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumereader.inl + ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumewriter.inl + ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.inl + ${CMAKE_CURRENT_SOURCE_DIR}/transferfunction.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/transferfunctionhandler.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/transferfunctionproperty.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.inl + ${CMAKE_CURRENT_SOURCE_DIR}/volumegridtype.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/volumeutils.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletimevaryingvolume.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/basicvolumeraycaster.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/volumeclipplane.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/rendering/volumeclipplanes.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/generaterawvolumetask.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) create_new_module( - "Volume" - volume_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} + "Volume" + volume_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES} ) diff --git a/modules/volume/envelope.cpp b/modules/volume/envelope.cpp index 6c75c61d1a..ab20149807 100644 --- a/modules/volume/envelope.cpp +++ b/modules/volume/envelope.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/envelope.h b/modules/volume/envelope.h index 7293bc4d5e..7cff391236 100644 --- a/modules/volume/envelope.h +++ b/modules/volume/envelope.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/linearlrucache.h b/modules/volume/linearlrucache.h index 980d420277..eda2318b7f 100644 --- a/modules/volume/linearlrucache.h +++ b/modules/volume/linearlrucache.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/linearlrucache.inl b/modules/volume/linearlrucache.inl index 7c4f6594c2..3548a15216 100644 --- a/modules/volume/linearlrucache.inl +++ b/modules/volume/linearlrucache.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/lrucache.h b/modules/volume/lrucache.h index 840cfef11c..10270e7dfa 100644 --- a/modules/volume/lrucache.h +++ b/modules/volume/lrucache.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/lrucache.inl b/modules/volume/lrucache.inl index 00c92af0f2..7ff175caba 100644 --- a/modules/volume/lrucache.inl +++ b/modules/volume/lrucache.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/rawvolume.h b/modules/volume/rawvolume.h index 4838510848..b759b59af9 100644 --- a/modules/volume/rawvolume.h +++ b/modules/volume/rawvolume.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/rawvolume.inl b/modules/volume/rawvolume.inl index 2040aff878..f6001ed741 100644 --- a/modules/volume/rawvolume.inl +++ b/modules/volume/rawvolume.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/rawvolumemetadata.cpp b/modules/volume/rawvolumemetadata.cpp index 7f7eaf684c..62d2d7ad52 100644 --- a/modules/volume/rawvolumemetadata.cpp +++ b/modules/volume/rawvolumemetadata.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/rawvolumemetadata.h b/modules/volume/rawvolumemetadata.h index a7a88d8a97..7e01ad1fa6 100644 --- a/modules/volume/rawvolumemetadata.h +++ b/modules/volume/rawvolumemetadata.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/rawvolumereader.h b/modules/volume/rawvolumereader.h index 9778e8dd7c..c8d0bd0b94 100644 --- a/modules/volume/rawvolumereader.h +++ b/modules/volume/rawvolumereader.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/rawvolumereader.inl b/modules/volume/rawvolumereader.inl index 4042b7deaf..836e9c7e5b 100644 --- a/modules/volume/rawvolumereader.inl +++ b/modules/volume/rawvolumereader.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/rawvolumewriter.h b/modules/volume/rawvolumewriter.h index 3865eea835..55b0221a81 100644 --- a/modules/volume/rawvolumewriter.h +++ b/modules/volume/rawvolumewriter.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/rawvolumewriter.inl b/modules/volume/rawvolumewriter.inl index 51ec4b1923..b8a3188e2a 100644 --- a/modules/volume/rawvolumewriter.inl +++ b/modules/volume/rawvolumewriter.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/rendering/basicvolumeraycaster.cpp b/modules/volume/rendering/basicvolumeraycaster.cpp index ec4dada150..f81912cfeb 100644 --- a/modules/volume/rendering/basicvolumeraycaster.cpp +++ b/modules/volume/rendering/basicvolumeraycaster.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/rendering/basicvolumeraycaster.h b/modules/volume/rendering/basicvolumeraycaster.h index e2cbf79dd3..1ab5c1ffaa 100644 --- a/modules/volume/rendering/basicvolumeraycaster.h +++ b/modules/volume/rendering/basicvolumeraycaster.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp index 73235d5dad..ffe7bd5034 100644 --- a/modules/volume/rendering/renderabletimevaryingvolume.cpp +++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/rendering/renderabletimevaryingvolume.h b/modules/volume/rendering/renderabletimevaryingvolume.h index 380b059b6f..3451110de6 100644 --- a/modules/volume/rendering/renderabletimevaryingvolume.h +++ b/modules/volume/rendering/renderabletimevaryingvolume.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/rendering/volumeclipplane.cpp b/modules/volume/rendering/volumeclipplane.cpp index b6c528ae43..ec147ce590 100644 --- a/modules/volume/rendering/volumeclipplane.cpp +++ b/modules/volume/rendering/volumeclipplane.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/rendering/volumeclipplane.h b/modules/volume/rendering/volumeclipplane.h index 9d8682461a..a20139fbd7 100644 --- a/modules/volume/rendering/volumeclipplane.h +++ b/modules/volume/rendering/volumeclipplane.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/rendering/volumeclipplanes.cpp b/modules/volume/rendering/volumeclipplanes.cpp index b04e5dba3f..d5a162820f 100644 --- a/modules/volume/rendering/volumeclipplanes.cpp +++ b/modules/volume/rendering/volumeclipplanes.cpp @@ -3,7 +3,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/rendering/volumeclipplanes.h b/modules/volume/rendering/volumeclipplanes.h index 345beef1cf..ef0d8624fd 100644 --- a/modules/volume/rendering/volumeclipplanes.h +++ b/modules/volume/rendering/volumeclipplanes.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/tasks/generaterawvolumetask.cpp b/modules/volume/tasks/generaterawvolumetask.cpp index 882bbdac68..ea64003e33 100644 --- a/modules/volume/tasks/generaterawvolumetask.cpp +++ b/modules/volume/tasks/generaterawvolumetask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/tasks/generaterawvolumetask.h b/modules/volume/tasks/generaterawvolumetask.h index 9b2466001b..f41b5d0fc6 100644 --- a/modules/volume/tasks/generaterawvolumetask.h +++ b/modules/volume/tasks/generaterawvolumetask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/textureslicevolumereader.h b/modules/volume/textureslicevolumereader.h index 701472b4e3..452fa93f71 100644 --- a/modules/volume/textureslicevolumereader.h +++ b/modules/volume/textureslicevolumereader.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/textureslicevolumereader.inl b/modules/volume/textureslicevolumereader.inl index 344a93dfe9..641edd8f6f 100644 --- a/modules/volume/textureslicevolumereader.inl +++ b/modules/volume/textureslicevolumereader.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/transferfunction.cpp b/modules/volume/transferfunction.cpp index 99d57b379f..878287cbc0 100644 --- a/modules/volume/transferfunction.cpp +++ b/modules/volume/transferfunction.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/transferfunction.h b/modules/volume/transferfunction.h index 23b8a047d2..d273304139 100644 --- a/modules/volume/transferfunction.h +++ b/modules/volume/transferfunction.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/transferfunctionhandler.cpp b/modules/volume/transferfunctionhandler.cpp index d5028f62b0..9e06d4c76e 100644 --- a/modules/volume/transferfunctionhandler.cpp +++ b/modules/volume/transferfunctionhandler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/transferfunctionhandler.h b/modules/volume/transferfunctionhandler.h index aa6357105a..3a0d78ff0c 100644 --- a/modules/volume/transferfunctionhandler.h +++ b/modules/volume/transferfunctionhandler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/transferfunctionproperty.cpp b/modules/volume/transferfunctionproperty.cpp index 9ac0cb8ea4..4089b32eca 100644 --- a/modules/volume/transferfunctionproperty.cpp +++ b/modules/volume/transferfunctionproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/transferfunctionproperty.h b/modules/volume/transferfunctionproperty.h index 9754e4ee6b..bc401a9014 100644 --- a/modules/volume/transferfunctionproperty.h +++ b/modules/volume/transferfunctionproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/volumegridtype.cpp b/modules/volume/volumegridtype.cpp index 85c793fbae..13a69d285c 100644 --- a/modules/volume/volumegridtype.cpp +++ b/modules/volume/volumegridtype.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/volumegridtype.h b/modules/volume/volumegridtype.h index b963162890..d984a52418 100644 --- a/modules/volume/volumegridtype.h +++ b/modules/volume/volumegridtype.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/volumemodule.cpp b/modules/volume/volumemodule.cpp index e6b71877d5..efb010b329 100644 --- a/modules/volume/volumemodule.cpp +++ b/modules/volume/volumemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/volumemodule.h b/modules/volume/volumemodule.h index b7e2fb3bfa..58876a6a88 100644 --- a/modules/volume/volumemodule.h +++ b/modules/volume/volumemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/volumesampler.h b/modules/volume/volumesampler.h index de00597978..6bbb65e173 100644 --- a/modules/volume/volumesampler.h +++ b/modules/volume/volumesampler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/volumesampler.inl b/modules/volume/volumesampler.inl index 2b37becb69..d3a8d22b90 100644 --- a/modules/volume/volumesampler.inl +++ b/modules/volume/volumesampler.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/volumeutils.cpp b/modules/volume/volumeutils.cpp index d1ddfcee76..1353f8f0cb 100644 --- a/modules/volume/volumeutils.cpp +++ b/modules/volume/volumeutils.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/volume/volumeutils.h b/modules/volume/volumeutils.h index cdf7946ca1..3c1a2c3d27 100644 --- a/modules/volume/volumeutils.h +++ b/modules/volume/volumeutils.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/CMakeLists.txt b/modules/webbrowser/CMakeLists.txt index 682d469a63..2f464991ab 100644 --- a/modules/webbrowser/CMakeLists.txt +++ b/modules/webbrowser/CMakeLists.txt @@ -70,8 +70,8 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/cmake/patch/cmake/cef_variables.cmake DEST # CEF does not provide RelWithDebInfo libs, so we use the ones without Debug information file(COPY ${CEF_ROOT}/Release/ - DESTINATION ${CEF_ROOT}/RelWithDebInfo - FILES_MATCHING PATTERN * + DESTINATION ${CEF_ROOT}/RelWithDebInfo + FILES_MATCHING PATTERN * ) ########################################################################################## @@ -91,17 +91,17 @@ mark_as_advanced(CEF_DEBUG_INFO_FLAG USE_ATL USE_OFFICIAL_BUILD_SANDBOX USE_SAND # Add CEF client files set(WEBBROWSER_SOURCES - webbrowsermodule.cpp - src/browserclient.cpp - src/eventhandler.cpp - src/webbrowserapp.cpp - src/defaultbrowserlauncher.cpp + webbrowsermodule.cpp + src/browserclient.cpp + src/eventhandler.cpp + src/webbrowserapp.cpp + src/defaultbrowserlauncher.cpp ) set(WEBBROWSER_SOURCES_WINDOWS - OpenSpace.exe.manifest - cef_webgui.rc - resource.h - simple_handler_win.cc + OpenSpace.exe.manifest + cef_webgui.rc + resource.h + simple_handler_win.cc ) APPEND_PLATFORM_SOURCES(WEBBROWSER_SOURCES) APPEND_PLATFORM_SOURCES(WEBBROWSER_RESOURCES_SOURCES) @@ -115,20 +115,20 @@ set(WEBBROWSER_HELPER_SOURCES_WINDOWS src/processhelperwindows.cpp) APPEND_PLATFORM_SOURCES(WEBBROWSER_HELPER_SOURCES) set(WEBBROWSER_RESOURCES_MAC_SOURCES_MACOSX - mac/Info.plist - mac/webgui.icns + mac/Info.plist + mac/webgui.icns ) APPEND_PLATFORM_SOURCES(WEBBROWSER_RESOURCES_MAC_SOURCES) set(WEBBROWSER_RESOURCES_MAC_ENGLISH_LPROJ_SRCS_MACOSX - mac/English.lproj/InfoPlist.strings - mac/English.lproj/MainMenu.xib + mac/English.lproj/InfoPlist.strings + mac/English.lproj/MainMenu.xib ) APPEND_PLATFORM_SOURCES(WEBBROWSER_RESOURCES_MAC_ENGLISH_LPROJ_SRCS) set(WEBBROWSER_RESOURCES_SRCS - ${WEBBROWSER_RESOURCES_MAC_SOURCES} - ${WEBBROWSER_RESOURCES_MAC_ENGLISH_LPROJ_SRCS} + ${WEBBROWSER_RESOURCES_MAC_SOURCES} + ${WEBBROWSER_RESOURCES_MAC_ENGLISH_LPROJ_SRCS} ) # place helper in separate executable @@ -139,74 +139,74 @@ set(CEF_HELPER_TARGET "openspace_web_helper" CACHE INTERNAL "CEF_HELPER_TARGET") # if(OS_MACOSX) - # set global CEF helper app target - set(CEF_HELPER_APP "${CEF_TARGET_OUT_DIR}/${CEF_HELPER_TARGET}.app" CACHE INTERNAL "CEF_HELPER_APP") + # set global CEF helper app target + set(CEF_HELPER_APP "${CEF_TARGET_OUT_DIR}/${CEF_HELPER_TARGET}.app" CACHE INTERNAL "CEF_HELPER_APP") - # Helper executable target. - add_executable(${CEF_HELPER_TARGET} MACOSX_BUNDLE ${WEBBROWSER_HELPER_SOURCES}) - SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_HELPER_TARGET}) - add_cef_logical_target("libcef_lib" "${CEF_LIB_DEBUG}" "${CEF_LIB_RELEASE}") - add_dependencies(${CEF_HELPER_TARGET} libcef_dll_wrapper) - target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS}) - set_target_properties(${CEF_HELPER_TARGET} PROPERTIES - MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/mac/helper-Info.plist - ) + # Helper executable target. + add_executable(${CEF_HELPER_TARGET} MACOSX_BUNDLE ${WEBBROWSER_HELPER_SOURCES}) + SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_HELPER_TARGET}) + add_cef_logical_target("libcef_lib" "${CEF_LIB_DEBUG}" "${CEF_LIB_RELEASE}") + add_dependencies(${CEF_HELPER_TARGET} libcef_dll_wrapper) + target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS}) + set_target_properties(${CEF_HELPER_TARGET} PROPERTIES + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/mac/helper-Info.plist + ) - # Fix the framework rpath in the helper executable. - FIX_MACOSX_HELPER_FRAMEWORK_RPATH(${CEF_HELPER_TARGET}) + # Fix the framework rpath in the helper executable. + FIX_MACOSX_HELPER_FRAMEWORK_RPATH(${CEF_HELPER_TARGET}) endif() if (OS_WINDOWS) - message(STATUS "Setting up WebBrowser CEF helper executable: ${CEF_HELPER_TARGET}") - set_openspace_cef_target_out_dir() - add_executable(${CEF_HELPER_TARGET} ${WEBBROWSER_HELPER_SOURCES}) - SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_HELPER_TARGET}) - add_dependencies(${CEF_HELPER_TARGET} libcef_dll_wrapper) - # Logical target used to link the libcef library. - add_cef_logical_target("libcef_lib" "${CEF_LIB_DEBUG}" "${CEF_LIB_RELEASE}") - target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS}) - # Add the custom manifest files to the executable. - add_windows_cef_manifest("${CEF_TARGET_OUT_DIR}" "${WEBBROWSER_MODULE_PATH}" "${CEF_HELPER_TARGET}" "exe") + message(STATUS "Setting up WebBrowser CEF helper executable: ${CEF_HELPER_TARGET}") + set_openspace_cef_target_out_dir() + add_executable(${CEF_HELPER_TARGET} ${WEBBROWSER_HELPER_SOURCES}) + SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_HELPER_TARGET}) + add_dependencies(${CEF_HELPER_TARGET} libcef_dll_wrapper) + # Logical target used to link the libcef library. + add_cef_logical_target("libcef_lib" "${CEF_LIB_DEBUG}" "${CEF_LIB_RELEASE}") + target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS}) + # Add the custom manifest files to the executable. + add_windows_cef_manifest("${CEF_TARGET_OUT_DIR}" "${WEBBROWSER_MODULE_PATH}" "${CEF_HELPER_TARGET}" "exe") endif (OS_WINDOWS) ########################################################################################## # Create OpenSpace module. set(HEADER_FILES - webbrowsermodule.h - include/webrenderhandler.h - include/webkeyboardhandler.h - include/browserclient.h - include/screenspacebrowser.h - include/browserinstance.h - include/eventhandler.h - include/webbrowserapp.h - include/defaultbrowserlauncher.h - include/cefhost.h + webbrowsermodule.h + include/webrenderhandler.h + include/webkeyboardhandler.h + include/browserclient.h + include/screenspacebrowser.h + include/browserinstance.h + include/eventhandler.h + include/webbrowserapp.h + include/defaultbrowserlauncher.h + include/cefhost.h ) source_group("Header Files" FILES ${HEADER_FILES}) set(SOURCE_FILES - webbrowsermodule.cpp - src/webrenderhandler.cpp - src/webkeyboardhandler.cpp - src/browserclient.cpp - src/screenspacebrowser.cpp - src/browserinstance.cpp - src/eventhandler.cpp - src/webbrowserapp.cpp - src/defaultbrowserlauncher.cpp - src/cefhost.cpp + webbrowsermodule.cpp + src/webrenderhandler.cpp + src/webkeyboardhandler.cpp + src/browserclient.cpp + src/screenspacebrowser.cpp + src/browserinstance.cpp + src/eventhandler.cpp + src/webbrowserapp.cpp + src/defaultbrowserlauncher.cpp + src/cefhost.cpp ) source_group("Source Files" FILES ${SOURCE_FILES}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) create_new_module( - ${WEBBROWSER_MODULE_NAME} - webbrowser_module - STATIC - ${HEADER_FILES} ${SOURCE_FILES} + ${WEBBROWSER_MODULE_NAME} + webbrowser_module + STATIC + ${HEADER_FILES} ${SOURCE_FILES} ) set_folder_location(libcef_dll_wrapper "Helper") diff --git a/modules/webbrowser/include/browserclient.h b/modules/webbrowser/include/browserclient.h index 9839023fc2..482709f66b 100644 --- a/modules/webbrowser/include/browserclient.h +++ b/modules/webbrowser/include/browserclient.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/include/browserinstance.h b/modules/webbrowser/include/browserinstance.h index a4f4f8d59b..38d440ef1e 100644 --- a/modules/webbrowser/include/browserinstance.h +++ b/modules/webbrowser/include/browserinstance.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/include/cefhost.h b/modules/webbrowser/include/cefhost.h index 47f805f0fa..dbad16105f 100644 --- a/modules/webbrowser/include/cefhost.h +++ b/modules/webbrowser/include/cefhost.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/include/defaultbrowserlauncher.h b/modules/webbrowser/include/defaultbrowserlauncher.h index e8e1f87041..39aa93c171 100644 --- a/modules/webbrowser/include/defaultbrowserlauncher.h +++ b/modules/webbrowser/include/defaultbrowserlauncher.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/include/eventhandler.h b/modules/webbrowser/include/eventhandler.h index 006c13211d..70b5d1ebcc 100644 --- a/modules/webbrowser/include/eventhandler.h +++ b/modules/webbrowser/include/eventhandler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/include/screenspacebrowser.h b/modules/webbrowser/include/screenspacebrowser.h index be248483b1..41b4a2eb0b 100644 --- a/modules/webbrowser/include/screenspacebrowser.h +++ b/modules/webbrowser/include/screenspacebrowser.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/include/webbrowserapp.h b/modules/webbrowser/include/webbrowserapp.h index 63f292854d..b334a05788 100644 --- a/modules/webbrowser/include/webbrowserapp.h +++ b/modules/webbrowser/include/webbrowserapp.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/include/webkeyboardhandler.h b/modules/webbrowser/include/webkeyboardhandler.h index 2e609145a1..b11785ea0a 100644 --- a/modules/webbrowser/include/webkeyboardhandler.h +++ b/modules/webbrowser/include/webkeyboardhandler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/include/webrenderhandler.h b/modules/webbrowser/include/webrenderhandler.h index 60b587efb7..e7d446d1a2 100644 --- a/modules/webbrowser/include/webrenderhandler.h +++ b/modules/webbrowser/include/webrenderhandler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/src/browserclient.cpp b/modules/webbrowser/src/browserclient.cpp index 05c6ceb7d4..6c87cc770b 100644 --- a/modules/webbrowser/src/browserclient.cpp +++ b/modules/webbrowser/src/browserclient.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/src/browserinstance.cpp b/modules/webbrowser/src/browserinstance.cpp index 792e2e0321..abefab4f20 100644 --- a/modules/webbrowser/src/browserinstance.cpp +++ b/modules/webbrowser/src/browserinstance.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * @@ -50,7 +50,7 @@ BrowserInstance::BrowserInstance(WebRenderHandler* renderer, CefWindowInfo windowInfo; const bool renderTransparent = true; - windowInfo.SetAsWindowless(nullptr, renderTransparent); + windowInfo.SetAsWindowless(0, renderTransparent); CefBrowserSettings browserSettings; browserSettings.windowless_frame_rate = 60; diff --git a/modules/webbrowser/src/cefhost.cpp b/modules/webbrowser/src/cefhost.cpp index 5279d8132b..3620112607 100644 --- a/modules/webbrowser/src/cefhost.cpp +++ b/modules/webbrowser/src/cefhost.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/src/defaultbrowserlauncher.cpp b/modules/webbrowser/src/defaultbrowserlauncher.cpp index 23a2c41c9c..93376b2a87 100644 --- a/modules/webbrowser/src/defaultbrowserlauncher.cpp +++ b/modules/webbrowser/src/defaultbrowserlauncher.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/src/eventhandler.cpp b/modules/webbrowser/src/eventhandler.cpp index a551da8c68..1f612dba0f 100644 --- a/modules/webbrowser/src/eventhandler.cpp +++ b/modules/webbrowser/src/eventhandler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/src/processhelpermac.cpp b/modules/webbrowser/src/processhelpermac.cpp index e4b013c8ca..dc386f32ad 100644 --- a/modules/webbrowser/src/processhelpermac.cpp +++ b/modules/webbrowser/src/processhelpermac.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/src/processhelperwindows.cpp b/modules/webbrowser/src/processhelperwindows.cpp index 98c7cce615..4b925519c7 100644 --- a/modules/webbrowser/src/processhelperwindows.cpp +++ b/modules/webbrowser/src/processhelperwindows.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp index f9e2e9e688..494b101a8d 100644 --- a/modules/webbrowser/src/screenspacebrowser.cpp +++ b/modules/webbrowser/src/screenspacebrowser.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/src/webbrowserapp.cpp b/modules/webbrowser/src/webbrowserapp.cpp index bc377a710e..6ccfaefaf5 100644 --- a/modules/webbrowser/src/webbrowserapp.cpp +++ b/modules/webbrowser/src/webbrowserapp.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/src/webkeyboardhandler.cpp b/modules/webbrowser/src/webkeyboardhandler.cpp index bfd4056293..3f2adb9aa3 100644 --- a/modules/webbrowser/src/webkeyboardhandler.cpp +++ b/modules/webbrowser/src/webkeyboardhandler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/src/webrenderhandler.cpp b/modules/webbrowser/src/webrenderhandler.cpp index 2a5739a003..e901839bc7 100644 --- a/modules/webbrowser/src/webrenderhandler.cpp +++ b/modules/webbrowser/src/webrenderhandler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp index d85f452c48..6c7e6ec855 100644 --- a/modules/webbrowser/webbrowsermodule.cpp +++ b/modules/webbrowser/webbrowsermodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webbrowser/webbrowsermodule.h b/modules/webbrowser/webbrowsermodule.h index 0d8274413d..8fb9c1f3d3 100644 --- a/modules/webbrowser/webbrowsermodule.h +++ b/modules/webbrowser/webbrowsermodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webgui/CMakeLists.txt b/modules/webgui/CMakeLists.txt index d20643c3bd..1c68572560 100644 --- a/modules/webgui/CMakeLists.txt +++ b/modules/webgui/CMakeLists.txt @@ -26,13 +26,13 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(WEBGUI_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "WEBGUI_MODULE_PATH") set(OPENSPACE_HEADER_FILES - webguimodule.h - ) + webguimodule.h +) source_group("Header Files" FILES ${OPENSPACE_HEADER_FILES}) set(OPENSPACE_SOURCE_FILES - webguimodule.cpp - ) + webguimodule.cpp +) source_group("Source Files" FILES ${OPENSPACE_SOURCE_FILES}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -46,8 +46,8 @@ include(nodejs_support) DownloadNodeJs("${NODEJS_VERSION}" "${CMAKE_CURRENT_SOURCE_DIR}/ext/nodejs") create_new_module( - WebGui - webgui_module - STATIC - ${OPENSPACE_HEADER_FILES} ${OPENSPACE_SOURCE_FILES} + WebGui + webgui_module + STATIC + ${OPENSPACE_HEADER_FILES} ${OPENSPACE_SOURCE_FILES} ) diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp index 0ec8e3283a..47f9ea7672 100644 --- a/modules/webgui/webguimodule.cpp +++ b/modules/webgui/webguimodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/modules/webgui/webguimodule.h b/modules/webgui/webguimodule.h index 8e6de28a80..1f721b0193 100644 --- a/modules/webgui/webguimodule.h +++ b/modules/webgui/webguimodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0d459108ff..a7d3d12785 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,401 +25,406 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/set_openspace_compile_settings.cmake) set(OPENSPACE_SOURCE - ${OPENSPACE_BASE_DIR}/src/openspace.cpp - ${OPENSPACE_BASE_DIR}/src/documentation/core_registration.cpp - ${OPENSPACE_BASE_DIR}/src/documentation/documentation.cpp - ${OPENSPACE_BASE_DIR}/src/documentation/documentationengine.cpp - ${OPENSPACE_BASE_DIR}/src/documentation/documentationgenerator.cpp - ${OPENSPACE_BASE_DIR}/src/documentation/verifier.cpp - ${OPENSPACE_BASE_DIR}/src/engine/configuration.cpp - ${OPENSPACE_BASE_DIR}/src/engine/configuration_doc.inl - ${OPENSPACE_BASE_DIR}/src/engine/downloadmanager.cpp - ${OPENSPACE_BASE_DIR}/src/engine/globals.cpp - ${OPENSPACE_BASE_DIR}/src/engine/globalscallbacks.cpp - ${OPENSPACE_BASE_DIR}/src/engine/logfactory.cpp - ${OPENSPACE_BASE_DIR}/src/engine/moduleengine.cpp - ${OPENSPACE_BASE_DIR}/src/engine/moduleengine_lua.inl - ${OPENSPACE_BASE_DIR}/src/engine/openspaceengine.cpp - ${OPENSPACE_BASE_DIR}/src/engine/syncengine.cpp - ${OPENSPACE_BASE_DIR}/src/engine/virtualpropertymanager.cpp - ${OPENSPACE_BASE_DIR}/src/interaction/camerainteractionstates.cpp - ${OPENSPACE_BASE_DIR}/src/interaction/inputstate.cpp - ${OPENSPACE_BASE_DIR}/src/interaction/joystickinputstate.cpp - ${OPENSPACE_BASE_DIR}/src/interaction/joystickcamerastates.cpp - ${OPENSPACE_BASE_DIR}/src/interaction/keybindingmanager.cpp - ${OPENSPACE_BASE_DIR}/src/interaction/keybindingmanager_lua.inl - ${OPENSPACE_BASE_DIR}/src/interaction/keyframenavigator.cpp - ${OPENSPACE_BASE_DIR}/src/interaction/navigationhandler.cpp - ${OPENSPACE_BASE_DIR}/src/interaction/navigationhandler_lua.inl - ${OPENSPACE_BASE_DIR}/src/interaction/mousecamerastates.cpp - ${OPENSPACE_BASE_DIR}/src/interaction/orbitalnavigator.cpp - ${OPENSPACE_BASE_DIR}/src/interaction/externinteraction.cpp - ${OPENSPACE_BASE_DIR}/src/interaction/sessionrecording.cpp - ${OPENSPACE_BASE_DIR}/src/interaction/sessionrecording_lua.inl - ${OPENSPACE_BASE_DIR}/src/interaction/shortcutmanager.cpp - ${OPENSPACE_BASE_DIR}/src/interaction/shortcutmanager_lua.inl - ${OPENSPACE_BASE_DIR}/src/mission/mission.cpp - ${OPENSPACE_BASE_DIR}/src/mission/missionmanager.cpp - ${OPENSPACE_BASE_DIR}/src/mission/missionmanager_lua.inl - ${OPENSPACE_BASE_DIR}/src/network/networkengine.cpp - ${OPENSPACE_BASE_DIR}/src/network/parallelconnection.cpp - ${OPENSPACE_BASE_DIR}/src/network/parallelpeer.cpp - ${OPENSPACE_BASE_DIR}/src/network/parallelpeer_lua.inl - ${OPENSPACE_BASE_DIR}/src/network/parallelserver.cpp - ${OPENSPACE_BASE_DIR}/src/performance/performancemeasurement.cpp - ${OPENSPACE_BASE_DIR}/src/performance/performancelayout.cpp - ${OPENSPACE_BASE_DIR}/src/performance/performancemanager.cpp - ${OPENSPACE_BASE_DIR}/src/properties/binaryproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/optionproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/propertyowner.cpp - ${OPENSPACE_BASE_DIR}/src/properties/selectionproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/stringproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/stringlistproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/triggerproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat2property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat2x3property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat2x4property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat3x2property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat3property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat3x4property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat4x2property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat4x3property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat4property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat2property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat2x3property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat2x4property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat3x2property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat3property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat3x4property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat4x2property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat4x3property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat4property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/scalar/boolproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/scalar/charproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/scalar/doubleproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/scalar/floatproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/scalar/intproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/scalar/longdoubleproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/scalar/longlongproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/scalar/longproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/scalar/shortproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/scalar/signedcharproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/scalar/ucharproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/scalar/uintproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/scalar/ulonglongproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/scalar/ulongproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/scalar/ushortproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/scalar/wcharproperty.cpp - ${OPENSPACE_BASE_DIR}/src/properties/vector/bvec2property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/vector/bvec3property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/vector/bvec4property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/vector/dvec2property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/vector/dvec3property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/vector/dvec4property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/vector/ivec2property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/vector/ivec3property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/vector/ivec4property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/vector/uvec2property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/vector/uvec3property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/vector/uvec4property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/vector/vec2property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/vector/vec3property.cpp - ${OPENSPACE_BASE_DIR}/src/properties/vector/vec4property.cpp - ${OPENSPACE_BASE_DIR}/src/query/query.cpp - ${OPENSPACE_BASE_DIR}/src/rendering/abufferrenderer.cpp - ${OPENSPACE_BASE_DIR}/src/rendering/dashboard.cpp - ${OPENSPACE_BASE_DIR}/src/rendering/dashboard_lua.inl - ${OPENSPACE_BASE_DIR}/src/rendering/dashboarditem.cpp - ${OPENSPACE_BASE_DIR}/src/rendering/framebufferrenderer.cpp - ${OPENSPACE_BASE_DIR}/src/rendering/deferredcastermanager.cpp - ${OPENSPACE_BASE_DIR}/src/rendering/helper.cpp - ${OPENSPACE_BASE_DIR}/src/rendering/loadingscreen.cpp - ${OPENSPACE_BASE_DIR}/src/rendering/luaconsole.cpp - ${OPENSPACE_BASE_DIR}/src/rendering/raycastermanager.cpp - ${OPENSPACE_BASE_DIR}/src/rendering/renderable.cpp - ${OPENSPACE_BASE_DIR}/src/rendering/renderengine.cpp - ${OPENSPACE_BASE_DIR}/src/rendering/renderengine_lua.inl - ${OPENSPACE_BASE_DIR}/src/rendering/screenspacerenderable.cpp - ${OPENSPACE_BASE_DIR}/src/rendering/transferfunction.cpp - ${OPENSPACE_BASE_DIR}/src/rendering/volumeraycaster.cpp - ${OPENSPACE_BASE_DIR}/src/scene/asset.cpp - ${OPENSPACE_BASE_DIR}/src/scene/assetloader.cpp - ${OPENSPACE_BASE_DIR}/src/scene/assetloader_lua.inl - ${OPENSPACE_BASE_DIR}/src/scene/assetmanager.cpp - ${OPENSPACE_BASE_DIR}/src/scene/assetmanager_lua.inl - ${OPENSPACE_BASE_DIR}/src/scene/lightsource.cpp - ${OPENSPACE_BASE_DIR}/src/scene/rotation.cpp - ${OPENSPACE_BASE_DIR}/src/scene/scale.cpp - ${OPENSPACE_BASE_DIR}/src/scene/scene.cpp - ${OPENSPACE_BASE_DIR}/src/scene/scene_lua.inl - ${OPENSPACE_BASE_DIR}/src/scene/sceneinitializer.cpp - ${OPENSPACE_BASE_DIR}/src/scene/scenelicense.cpp - ${OPENSPACE_BASE_DIR}/src/scene/scenelicensewriter.cpp - ${OPENSPACE_BASE_DIR}/src/scene/scenegraphnode.cpp - ${OPENSPACE_BASE_DIR}/src/scene/scenegraphnode_doc.inl - ${OPENSPACE_BASE_DIR}/src/scene/timeframe.cpp - ${OPENSPACE_BASE_DIR}/src/scene/translation.cpp - ${OPENSPACE_BASE_DIR}/src/scripting/lualibrary.cpp - ${OPENSPACE_BASE_DIR}/src/scripting/scriptengine.cpp - ${OPENSPACE_BASE_DIR}/src/scripting/scriptengine_lua.inl - ${OPENSPACE_BASE_DIR}/src/scripting/scriptscheduler.cpp - ${OPENSPACE_BASE_DIR}/src/scripting/scriptscheduler_lua.inl - ${OPENSPACE_BASE_DIR}/src/scripting/systemcapabilitiesbinding.cpp - ${OPENSPACE_BASE_DIR}/src/util/blockplaneintersectiongeometry.cpp - ${OPENSPACE_BASE_DIR}/src/util/boxgeometry.cpp - ${OPENSPACE_BASE_DIR}/src/util/camera.cpp - ${OPENSPACE_BASE_DIR}/src/util/distanceconversion.cpp - ${OPENSPACE_BASE_DIR}/src/util/factorymanager.cpp - ${OPENSPACE_BASE_DIR}/src/util/httprequest.cpp - ${OPENSPACE_BASE_DIR}/src/util/keys.cpp - ${OPENSPACE_BASE_DIR}/src/util/openspacemodule.cpp - ${OPENSPACE_BASE_DIR}/src/util/powerscaledcoordinate.cpp - ${OPENSPACE_BASE_DIR}/src/util/powerscaledscalar.cpp - ${OPENSPACE_BASE_DIR}/src/util/powerscaledsphere.cpp - ${OPENSPACE_BASE_DIR}/src/util/progressbar.cpp - ${OPENSPACE_BASE_DIR}/src/util/resourcesynchronization.cpp - ${OPENSPACE_BASE_DIR}/src/util/screenlog.cpp - ${OPENSPACE_BASE_DIR}/src/util/spicemanager.cpp - ${OPENSPACE_BASE_DIR}/src/util/spicemanager_lua.inl - ${OPENSPACE_BASE_DIR}/src/util/syncbuffer.cpp - ${OPENSPACE_BASE_DIR}/src/util/synchronizationwatcher.cpp - ${OPENSPACE_BASE_DIR}/src/util/histogram.cpp - ${OPENSPACE_BASE_DIR}/src/util/task.cpp - ${OPENSPACE_BASE_DIR}/src/util/taskloader.cpp - ${OPENSPACE_BASE_DIR}/src/util/threadpool.cpp - ${OPENSPACE_BASE_DIR}/src/util/time.cpp - ${OPENSPACE_BASE_DIR}/src/util/timeconversion.cpp - ${OPENSPACE_BASE_DIR}/src/util/timeline.cpp - ${OPENSPACE_BASE_DIR}/src/util/timemanager.cpp - ${OPENSPACE_BASE_DIR}/src/util/time_lua.inl - ${OPENSPACE_BASE_DIR}/src/util/timerange.cpp - ${OPENSPACE_BASE_DIR}/src/util/transformationmanager.cpp + ${OPENSPACE_BASE_DIR}/src/openspace.cpp + ${OPENSPACE_BASE_DIR}/src/documentation/core_registration.cpp + ${OPENSPACE_BASE_DIR}/src/documentation/documentation.cpp + ${OPENSPACE_BASE_DIR}/src/documentation/documentationengine.cpp + ${OPENSPACE_BASE_DIR}/src/documentation/documentationgenerator.cpp + ${OPENSPACE_BASE_DIR}/src/documentation/verifier.cpp + ${OPENSPACE_BASE_DIR}/src/engine/configuration.cpp + ${OPENSPACE_BASE_DIR}/src/engine/configuration_doc.inl + ${OPENSPACE_BASE_DIR}/src/engine/downloadmanager.cpp + ${OPENSPACE_BASE_DIR}/src/engine/globals.cpp + ${OPENSPACE_BASE_DIR}/src/engine/globalscallbacks.cpp + ${OPENSPACE_BASE_DIR}/src/engine/logfactory.cpp + ${OPENSPACE_BASE_DIR}/src/engine/moduleengine.cpp + ${OPENSPACE_BASE_DIR}/src/engine/moduleengine_lua.inl + ${OPENSPACE_BASE_DIR}/src/engine/openspaceengine.cpp + ${OPENSPACE_BASE_DIR}/src/engine/openspaceengine_lua.inl + ${OPENSPACE_BASE_DIR}/src/engine/syncengine.cpp + ${OPENSPACE_BASE_DIR}/src/engine/virtualpropertymanager.cpp + ${OPENSPACE_BASE_DIR}/src/interaction/camerainteractionstates.cpp + ${OPENSPACE_BASE_DIR}/src/interaction/inputstate.cpp + ${OPENSPACE_BASE_DIR}/src/interaction/inputdevicestates.cpp + ${OPENSPACE_BASE_DIR}/src/interaction/joystickinputstate.cpp + ${OPENSPACE_BASE_DIR}/src/interaction/joystickcamerastates.cpp + ${OPENSPACE_BASE_DIR}/src/interaction/keybindingmanager.cpp + ${OPENSPACE_BASE_DIR}/src/interaction/keybindingmanager_lua.inl + ${OPENSPACE_BASE_DIR}/src/interaction/keyframenavigator.cpp + ${OPENSPACE_BASE_DIR}/src/interaction/navigationhandler.cpp + ${OPENSPACE_BASE_DIR}/src/interaction/navigationhandler_lua.inl + ${OPENSPACE_BASE_DIR}/src/interaction/mousecamerastates.cpp + ${OPENSPACE_BASE_DIR}/src/interaction/orbitalnavigator.cpp + ${OPENSPACE_BASE_DIR}/src/interaction/externinteraction.cpp + ${OPENSPACE_BASE_DIR}/src/interaction/sessionrecording.cpp + ${OPENSPACE_BASE_DIR}/src/interaction/sessionrecording_lua.inl + ${OPENSPACE_BASE_DIR}/src/interaction/shortcutmanager.cpp + ${OPENSPACE_BASE_DIR}/src/interaction/shortcutmanager_lua.inl + ${OPENSPACE_BASE_DIR}/src/mission/mission.cpp + ${OPENSPACE_BASE_DIR}/src/mission/missionmanager.cpp + ${OPENSPACE_BASE_DIR}/src/mission/missionmanager_lua.inl + ${OPENSPACE_BASE_DIR}/src/network/networkengine.cpp + ${OPENSPACE_BASE_DIR}/src/network/parallelconnection.cpp + ${OPENSPACE_BASE_DIR}/src/network/parallelpeer.cpp + ${OPENSPACE_BASE_DIR}/src/network/parallelpeer_lua.inl + ${OPENSPACE_BASE_DIR}/src/network/parallelserver.cpp + ${OPENSPACE_BASE_DIR}/src/performance/performancemeasurement.cpp + ${OPENSPACE_BASE_DIR}/src/performance/performancelayout.cpp + ${OPENSPACE_BASE_DIR}/src/performance/performancemanager.cpp + ${OPENSPACE_BASE_DIR}/src/properties/binaryproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/optionproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/propertyowner.cpp + ${OPENSPACE_BASE_DIR}/src/properties/selectionproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/stringproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/stringlistproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/triggerproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat2property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat2x3property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat2x4property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat3x2property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat3property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat3x4property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat4x2property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat4x3property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat4property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat2property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat2x3property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat2x4property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat3x2property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat3property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat3x4property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat4x2property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat4x3property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat4property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/scalar/boolproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/scalar/charproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/scalar/doubleproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/scalar/floatproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/scalar/intproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/scalar/longdoubleproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/scalar/longlongproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/scalar/longproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/scalar/shortproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/scalar/signedcharproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/scalar/ucharproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/scalar/uintproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/scalar/ulonglongproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/scalar/ulongproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/scalar/ushortproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/scalar/wcharproperty.cpp + ${OPENSPACE_BASE_DIR}/src/properties/vector/bvec2property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/vector/bvec3property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/vector/bvec4property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/vector/dvec2property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/vector/dvec3property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/vector/dvec4property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/vector/ivec2property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/vector/ivec3property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/vector/ivec4property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/vector/uvec2property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/vector/uvec3property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/vector/uvec4property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/vector/vec2property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/vector/vec3property.cpp + ${OPENSPACE_BASE_DIR}/src/properties/vector/vec4property.cpp + ${OPENSPACE_BASE_DIR}/src/query/query.cpp + ${OPENSPACE_BASE_DIR}/src/rendering/abufferrenderer.cpp + ${OPENSPACE_BASE_DIR}/src/rendering/dashboard.cpp + ${OPENSPACE_BASE_DIR}/src/rendering/dashboard_lua.inl + ${OPENSPACE_BASE_DIR}/src/rendering/dashboarditem.cpp + ${OPENSPACE_BASE_DIR}/src/rendering/framebufferrenderer.cpp + ${OPENSPACE_BASE_DIR}/src/rendering/deferredcastermanager.cpp + ${OPENSPACE_BASE_DIR}/src/rendering/helper.cpp + ${OPENSPACE_BASE_DIR}/src/rendering/loadingscreen.cpp + ${OPENSPACE_BASE_DIR}/src/rendering/luaconsole.cpp + ${OPENSPACE_BASE_DIR}/src/rendering/raycastermanager.cpp + ${OPENSPACE_BASE_DIR}/src/rendering/renderable.cpp + ${OPENSPACE_BASE_DIR}/src/rendering/renderengine.cpp + ${OPENSPACE_BASE_DIR}/src/rendering/renderengine_lua.inl + ${OPENSPACE_BASE_DIR}/src/rendering/screenspacerenderable.cpp + ${OPENSPACE_BASE_DIR}/src/rendering/transferfunction.cpp + ${OPENSPACE_BASE_DIR}/src/rendering/volumeraycaster.cpp + ${OPENSPACE_BASE_DIR}/src/scene/asset.cpp + ${OPENSPACE_BASE_DIR}/src/scene/assetloader.cpp + ${OPENSPACE_BASE_DIR}/src/scene/assetloader_lua.inl + ${OPENSPACE_BASE_DIR}/src/scene/assetmanager.cpp + ${OPENSPACE_BASE_DIR}/src/scene/assetmanager_lua.inl + ${OPENSPACE_BASE_DIR}/src/scene/lightsource.cpp + ${OPENSPACE_BASE_DIR}/src/scene/rotation.cpp + ${OPENSPACE_BASE_DIR}/src/scene/scale.cpp + ${OPENSPACE_BASE_DIR}/src/scene/scene.cpp + ${OPENSPACE_BASE_DIR}/src/scene/scene_lua.inl + ${OPENSPACE_BASE_DIR}/src/scene/sceneinitializer.cpp + ${OPENSPACE_BASE_DIR}/src/scene/scenelicense.cpp + ${OPENSPACE_BASE_DIR}/src/scene/scenelicensewriter.cpp + ${OPENSPACE_BASE_DIR}/src/scene/scenegraphnode.cpp + ${OPENSPACE_BASE_DIR}/src/scene/scenegraphnode_doc.inl + ${OPENSPACE_BASE_DIR}/src/scene/timeframe.cpp + ${OPENSPACE_BASE_DIR}/src/scene/translation.cpp + ${OPENSPACE_BASE_DIR}/src/scripting/lualibrary.cpp + ${OPENSPACE_BASE_DIR}/src/scripting/scriptengine.cpp + ${OPENSPACE_BASE_DIR}/src/scripting/scriptengine_lua.inl + ${OPENSPACE_BASE_DIR}/src/scripting/scriptscheduler.cpp + ${OPENSPACE_BASE_DIR}/src/scripting/scriptscheduler_lua.inl + ${OPENSPACE_BASE_DIR}/src/scripting/systemcapabilitiesbinding.cpp + ${OPENSPACE_BASE_DIR}/src/util/blockplaneintersectiongeometry.cpp + ${OPENSPACE_BASE_DIR}/src/util/boxgeometry.cpp + ${OPENSPACE_BASE_DIR}/src/util/camera.cpp + ${OPENSPACE_BASE_DIR}/src/util/distanceconversion.cpp + ${OPENSPACE_BASE_DIR}/src/util/factorymanager.cpp + ${OPENSPACE_BASE_DIR}/src/util/httprequest.cpp + ${OPENSPACE_BASE_DIR}/src/util/keys.cpp + ${OPENSPACE_BASE_DIR}/src/util/openspacemodule.cpp + ${OPENSPACE_BASE_DIR}/src/util/powerscaledcoordinate.cpp + ${OPENSPACE_BASE_DIR}/src/util/powerscaledscalar.cpp + ${OPENSPACE_BASE_DIR}/src/util/powerscaledsphere.cpp + ${OPENSPACE_BASE_DIR}/src/util/progressbar.cpp + ${OPENSPACE_BASE_DIR}/src/util/resourcesynchronization.cpp + ${OPENSPACE_BASE_DIR}/src/util/screenlog.cpp + ${OPENSPACE_BASE_DIR}/src/util/spicemanager.cpp + ${OPENSPACE_BASE_DIR}/src/util/spicemanager_lua.inl + ${OPENSPACE_BASE_DIR}/src/util/syncbuffer.cpp + ${OPENSPACE_BASE_DIR}/src/util/synchronizationwatcher.cpp + ${OPENSPACE_BASE_DIR}/src/util/histogram.cpp + ${OPENSPACE_BASE_DIR}/src/util/task.cpp + ${OPENSPACE_BASE_DIR}/src/util/taskloader.cpp + ${OPENSPACE_BASE_DIR}/src/util/threadpool.cpp + ${OPENSPACE_BASE_DIR}/src/util/time.cpp + ${OPENSPACE_BASE_DIR}/src/util/timeconversion.cpp + ${OPENSPACE_BASE_DIR}/src/util/timeline.cpp + ${OPENSPACE_BASE_DIR}/src/util/timemanager.cpp + ${OPENSPACE_BASE_DIR}/src/util/time_lua.inl + ${OPENSPACE_BASE_DIR}/src/util/timerange.cpp + ${OPENSPACE_BASE_DIR}/src/util/transformationmanager.cpp ) if (APPLE) - set(OPENSPACE_SOURCE - ${OPENSPACE_SOURCE} - ${OPENSPACE_BASE_DIR}/src/interaction/touchbar.mm - ) + set(OPENSPACE_SOURCE + ${OPENSPACE_SOURCE} + ${OPENSPACE_BASE_DIR}/src/interaction/touchbar.mm + ) endif () set(OPENSPACE_HEADER - ${OPENSPACE_BASE_DIR}/include/openspace/documentation/core_registration.h - ${OPENSPACE_BASE_DIR}/include/openspace/documentation/documentation.h - ${OPENSPACE_BASE_DIR}/include/openspace/documentation/documentationengine.h - ${OPENSPACE_BASE_DIR}/include/openspace/documentation/documentationgenerator.h - ${OPENSPACE_BASE_DIR}/include/openspace/documentation/verifier.h - ${OPENSPACE_BASE_DIR}/include/openspace/documentation/verifier.inl - ${OPENSPACE_BASE_DIR}/include/openspace/engine/configuration.h - ${OPENSPACE_BASE_DIR}/include/openspace/engine/downloadmanager.h - ${OPENSPACE_BASE_DIR}/include/openspace/engine/globals.h - ${OPENSPACE_BASE_DIR}/include/openspace/engine/globalscallbacks.h - ${OPENSPACE_BASE_DIR}/include/openspace/engine/logfactory.h - ${OPENSPACE_BASE_DIR}/include/openspace/engine/moduleengine.h - ${OPENSPACE_BASE_DIR}/include/openspace/engine/moduleengine.inl - ${OPENSPACE_BASE_DIR}/include/openspace/engine/openspaceengine.h - ${OPENSPACE_BASE_DIR}/include/openspace/engine/syncengine.h - ${OPENSPACE_BASE_DIR}/include/openspace/engine/virtualpropertymanager.h - ${OPENSPACE_BASE_DIR}/include/openspace/engine/windowdelegate.h - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/delayedvariable.h - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/delayedvariable.inl - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/camerainteractionstates.h - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/inputstate.h - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/interpolator.h - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/interpolator.inl - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/joystickinputstate.h - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/joystickcamerastates.h - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/keybindingmanager.h - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/keyframenavigator.h - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/mousecamerastates.h - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/navigationhandler.h - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/orbitalnavigator.h - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/externinteraction.h - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/sessionrecording.h - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/shortcutmanager.h - ${OPENSPACE_BASE_DIR}/include/openspace/mission/mission.h - ${OPENSPACE_BASE_DIR}/include/openspace/mission/missionmanager.h - ${OPENSPACE_BASE_DIR}/include/openspace/network/networkengine.h - ${OPENSPACE_BASE_DIR}/include/openspace/network/parallelconnection.h - ${OPENSPACE_BASE_DIR}/include/openspace/network/parallelpeer.h - ${OPENSPACE_BASE_DIR}/include/openspace/network/parallelserver.h - ${OPENSPACE_BASE_DIR}/include/openspace/network/messagestructures.h - ${OPENSPACE_BASE_DIR}/include/openspace/performance/performancemeasurement.h - ${OPENSPACE_BASE_DIR}/include/openspace/performance/performancelayout.h - ${OPENSPACE_BASE_DIR}/include/openspace/performance/performancemanager.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/binaryproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/numericalproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/numericalproperty.inl - ${OPENSPACE_BASE_DIR}/include/openspace/properties/optionproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/propertydelegate.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/propertydelegate.inl - ${OPENSPACE_BASE_DIR}/include/openspace/properties/propertyowner.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/selectionproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/stringproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/stringlistproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/templateproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/templateproperty.inl - ${OPENSPACE_BASE_DIR}/include/openspace/properties/triggerproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat2property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat2x3property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat2x4property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat3x2property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat3property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat3x4property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat4x2property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat4x3property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat4property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat2property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat2x3property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat2x4property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat3x2property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat3property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat3x4property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat4x2property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat4x3property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat4property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/boolproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/charproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/doubleproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/floatproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/intproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/longdoubleproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/longlongproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/longproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/shortproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/signedcharproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/ucharproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/uintproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/ulonglongproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/ulongproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/ushortproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/wcharproperty.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/bvec2property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/bvec3property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/bvec4property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/dvec2property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/dvec3property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/dvec4property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/ivec2property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/ivec3property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/ivec4property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/uvec2property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/uvec3property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/uvec4property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/vec2property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/vec3property.h - ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/vec4property.h - ${OPENSPACE_BASE_DIR}/include/openspace/query/query.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/abufferrenderer.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/dashboard.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/dashboarditem.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/framebufferrenderer.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/deferredcasterlistener.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/deferredcastermanager.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/loadingscreen.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/luaconsole.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/helper.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/raycasterlistener.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/raycastermanager.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderable.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderer.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderengine.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/volume.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/screenspacerenderable.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/deferredcaster.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/volumeraycaster.h - ${OPENSPACE_BASE_DIR}/include/openspace/rendering/transferfunction.h - ${OPENSPACE_BASE_DIR}/include/openspace/scene/asset.h - ${OPENSPACE_BASE_DIR}/include/openspace/scene/assetlistener.h - ${OPENSPACE_BASE_DIR}/include/openspace/scene/assetloader.h - ${OPENSPACE_BASE_DIR}/include/openspace/scene/assetmanager.h - ${OPENSPACE_BASE_DIR}/include/openspace/scene/lightsource.h - ${OPENSPACE_BASE_DIR}/include/openspace/scene/rotation.h - ${OPENSPACE_BASE_DIR}/include/openspace/scene/scale.h - ${OPENSPACE_BASE_DIR}/include/openspace/scene/scene.h - ${OPENSPACE_BASE_DIR}/include/openspace/scene/sceneinitializer.h - ${OPENSPACE_BASE_DIR}/include/openspace/scene/scenelicense.h - ${OPENSPACE_BASE_DIR}/include/openspace/scene/scenelicensewriter.h - ${OPENSPACE_BASE_DIR}/include/openspace/scene/scenegraphnode.h - ${OPENSPACE_BASE_DIR}/include/openspace/scene/timeframe.h - ${OPENSPACE_BASE_DIR}/include/openspace/scene/translation.h - ${OPENSPACE_BASE_DIR}/include/openspace/scripting/lualibrary.h - ${OPENSPACE_BASE_DIR}/include/openspace/scripting/scriptengine.h - ${OPENSPACE_BASE_DIR}/include/openspace/scripting/scriptscheduler.h - ${OPENSPACE_BASE_DIR}/include/openspace/scripting/systemcapabilitiesbinding.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/blockplaneintersectiongeometry.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/boxgeometry.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/camera.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/concurrentjobmanager.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/concurrentjobmanager.inl - ${OPENSPACE_BASE_DIR}/include/openspace/util/concurrentqueue.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/concurrentqueue.inl - ${OPENSPACE_BASE_DIR}/include/openspace/util/distanceconstants.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/distanceconversion.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/factorymanager.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/factorymanager.inl - ${OPENSPACE_BASE_DIR}/include/openspace/util/httprequest.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/job.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/keys.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/mouse.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/openspacemodule.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/powerscaledcoordinate.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/powerscaledscalar.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/powerscaledsphere.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/progressbar.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/resourcesynchronization.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/screenlog.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/spicemanager.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/syncable.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/syncbuffer.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/syncbuffer.inl - ${OPENSPACE_BASE_DIR}/include/openspace/util/syncdata.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/syncdata.inl - ${OPENSPACE_BASE_DIR}/include/openspace/util/synchronizationwatcher.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/task.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/taskloader.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/time.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/timeconversion.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/timeline.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/timeline.inl - ${OPENSPACE_BASE_DIR}/include/openspace/util/timemanager.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/timerange.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/updatestructures.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/transformationmanager.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/threadpool.h - ${OPENSPACE_BASE_DIR}/include/openspace/util/histogram.h + ${OPENSPACE_BASE_DIR}/include/openspace/json.h + ${OPENSPACE_BASE_DIR}/include/openspace/documentation/core_registration.h + ${OPENSPACE_BASE_DIR}/include/openspace/documentation/documentation.h + ${OPENSPACE_BASE_DIR}/include/openspace/documentation/documentationengine.h + ${OPENSPACE_BASE_DIR}/include/openspace/documentation/documentationgenerator.h + ${OPENSPACE_BASE_DIR}/include/openspace/documentation/verifier.h + ${OPENSPACE_BASE_DIR}/include/openspace/documentation/verifier.inl + ${OPENSPACE_BASE_DIR}/include/openspace/engine/configuration.h + ${OPENSPACE_BASE_DIR}/include/openspace/engine/downloadmanager.h + ${OPENSPACE_BASE_DIR}/include/openspace/engine/globals.h + ${OPENSPACE_BASE_DIR}/include/openspace/engine/globalscallbacks.h + ${OPENSPACE_BASE_DIR}/include/openspace/engine/logfactory.h + ${OPENSPACE_BASE_DIR}/include/openspace/engine/moduleengine.h + ${OPENSPACE_BASE_DIR}/include/openspace/engine/moduleengine.inl + ${OPENSPACE_BASE_DIR}/include/openspace/engine/openspaceengine.h + ${OPENSPACE_BASE_DIR}/include/openspace/engine/syncengine.h + ${OPENSPACE_BASE_DIR}/include/openspace/engine/virtualpropertymanager.h + ${OPENSPACE_BASE_DIR}/include/openspace/engine/windowdelegate.h + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/delayedvariable.h + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/delayedvariable.inl + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/camerainteractionstates.h + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/inputdevicestates.h + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/inputstate.h + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/interpolator.h + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/interpolator.inl + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/joystickinputstate.h + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/joystickcamerastates.h + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/keybindingmanager.h + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/keyframenavigator.h + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/mousecamerastates.h + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/navigationhandler.h + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/orbitalnavigator.h + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/externinteraction.h + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/sessionrecording.h + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/sessionrecording.inl + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/shortcutmanager.h + ${OPENSPACE_BASE_DIR}/include/openspace/mission/mission.h + ${OPENSPACE_BASE_DIR}/include/openspace/mission/missionmanager.h + ${OPENSPACE_BASE_DIR}/include/openspace/network/networkengine.h + ${OPENSPACE_BASE_DIR}/include/openspace/network/parallelconnection.h + ${OPENSPACE_BASE_DIR}/include/openspace/network/parallelpeer.h + ${OPENSPACE_BASE_DIR}/include/openspace/network/parallelserver.h + ${OPENSPACE_BASE_DIR}/include/openspace/network/messagestructures.h + ${OPENSPACE_BASE_DIR}/include/openspace/performance/performancemeasurement.h + ${OPENSPACE_BASE_DIR}/include/openspace/performance/performancelayout.h + ${OPENSPACE_BASE_DIR}/include/openspace/performance/performancemanager.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/binaryproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/numericalproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/numericalproperty.inl + ${OPENSPACE_BASE_DIR}/include/openspace/properties/optionproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/propertydelegate.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/propertydelegate.inl + ${OPENSPACE_BASE_DIR}/include/openspace/properties/propertyowner.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/selectionproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/stringproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/stringlistproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/templateproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/templateproperty.inl + ${OPENSPACE_BASE_DIR}/include/openspace/properties/triggerproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat2property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat2x3property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat2x4property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat3x2property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat3property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat3x4property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat4x2property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat4x3property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat4property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat2property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat2x3property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat2x4property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat3x2property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat3property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat3x4property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat4x2property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat4x3property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat4property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/boolproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/charproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/doubleproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/floatproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/intproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/longdoubleproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/longlongproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/longproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/shortproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/signedcharproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/ucharproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/uintproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/ulonglongproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/ulongproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/ushortproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/wcharproperty.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/bvec2property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/bvec3property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/bvec4property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/dvec2property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/dvec3property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/dvec4property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/ivec2property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/ivec3property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/ivec4property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/uvec2property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/uvec3property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/uvec4property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/vec2property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/vec3property.h + ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/vec4property.h + ${OPENSPACE_BASE_DIR}/include/openspace/query/query.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/abufferrenderer.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/dashboard.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/dashboarditem.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/framebufferrenderer.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/deferredcasterlistener.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/deferredcastermanager.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/loadingscreen.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/luaconsole.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/helper.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/raycasterlistener.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/raycastermanager.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderable.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderer.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderengine.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/volume.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/screenspacerenderable.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/deferredcaster.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/volumeraycaster.h + ${OPENSPACE_BASE_DIR}/include/openspace/rendering/transferfunction.h + ${OPENSPACE_BASE_DIR}/include/openspace/scene/asset.h + ${OPENSPACE_BASE_DIR}/include/openspace/scene/assetlistener.h + ${OPENSPACE_BASE_DIR}/include/openspace/scene/assetloader.h + ${OPENSPACE_BASE_DIR}/include/openspace/scene/assetmanager.h + ${OPENSPACE_BASE_DIR}/include/openspace/scene/lightsource.h + ${OPENSPACE_BASE_DIR}/include/openspace/scene/rotation.h + ${OPENSPACE_BASE_DIR}/include/openspace/scene/scale.h + ${OPENSPACE_BASE_DIR}/include/openspace/scene/scene.h + ${OPENSPACE_BASE_DIR}/include/openspace/scene/sceneinitializer.h + ${OPENSPACE_BASE_DIR}/include/openspace/scene/scenelicense.h + ${OPENSPACE_BASE_DIR}/include/openspace/scene/scenelicensewriter.h + ${OPENSPACE_BASE_DIR}/include/openspace/scene/scenegraphnode.h + ${OPENSPACE_BASE_DIR}/include/openspace/scene/timeframe.h + ${OPENSPACE_BASE_DIR}/include/openspace/scene/translation.h + ${OPENSPACE_BASE_DIR}/include/openspace/scripting/lualibrary.h + ${OPENSPACE_BASE_DIR}/include/openspace/scripting/scriptengine.h + ${OPENSPACE_BASE_DIR}/include/openspace/scripting/scriptscheduler.h + ${OPENSPACE_BASE_DIR}/include/openspace/scripting/systemcapabilitiesbinding.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/blockplaneintersectiongeometry.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/boxgeometry.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/camera.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/concurrentjobmanager.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/concurrentjobmanager.inl + ${OPENSPACE_BASE_DIR}/include/openspace/util/concurrentqueue.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/concurrentqueue.inl + ${OPENSPACE_BASE_DIR}/include/openspace/util/distanceconstants.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/distanceconversion.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/factorymanager.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/factorymanager.inl + ${OPENSPACE_BASE_DIR}/include/openspace/util/httprequest.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/job.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/keys.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/mouse.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/openspacemodule.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/powerscaledcoordinate.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/powerscaledscalar.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/powerscaledsphere.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/progressbar.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/resourcesynchronization.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/screenlog.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/spicemanager.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/syncable.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/syncbuffer.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/syncbuffer.inl + ${OPENSPACE_BASE_DIR}/include/openspace/util/syncdata.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/syncdata.inl + ${OPENSPACE_BASE_DIR}/include/openspace/util/synchronizationwatcher.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/task.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/taskloader.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/time.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/timeconversion.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/timeline.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/timeline.inl + ${OPENSPACE_BASE_DIR}/include/openspace/util/timemanager.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/timerange.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/updatestructures.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/transformationmanager.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/threadpool.h + ${OPENSPACE_BASE_DIR}/include/openspace/util/histogram.h ) if (APPLE) - set(OPENSPACE_HEADER - ${OPENSPACE_HEADER} - ${OPENSPACE_BASE_DIR}/include/openspace/interaction/touchbar.h - ) + set(OPENSPACE_HEADER + ${OPENSPACE_HEADER} + ${OPENSPACE_BASE_DIR}/include/openspace/interaction/touchbar.h + ) endif () # Place files into source groups foreach (file ${OPENSPACE_SOURCE} ${OPENSPACE_HEADER}) - # Remove prefixes from the files - set(original_file ${file}) - string(REPLACE "${OPENSPACE_BASE_DIR}/src/" "" file ${file}) - string(REPLACE "${OPENSPACE_BASE_DIR}/include/openspace/" "" file ${file}) - get_filename_component(directory ${file} DIRECTORY) - if (NOT directory STREQUAL "") - # Visual Studio wants '\' for the path separator - string(REPLACE "/" "\\" directory ${directory}) + # Remove prefixes from the files + set(original_file ${file}) + string(REPLACE "${OPENSPACE_BASE_DIR}/src/" "" file ${file}) + string(REPLACE "${OPENSPACE_BASE_DIR}/include/openspace/" "" file ${file}) + get_filename_component(directory ${file} DIRECTORY) + if (NOT directory STREQUAL "") + # Visual Studio wants '\' for the path separator + string(REPLACE "/" "\\" directory ${directory}) - # It looks nicer if the directory starts with a capital letter - # First extract the first letter, make it upper case and then reassemble the name - string(SUBSTRING ${directory} 0 1 FIRST_LETTER) - string(TOUPPER ${FIRST_LETTER} FIRST_LETTER) - string(REGEX REPLACE "^.(.*)" "${FIRST_LETTER}\\1" directory "${directory}") + # It looks nicer if the directory starts with a capital letter + # First extract the first letter, make it upper case and then reassemble the name + string(SUBSTRING ${directory} 0 1 FIRST_LETTER) + string(TOUPPER ${FIRST_LETTER} FIRST_LETTER) + string(REGEX REPLACE "^.(.*)" "${FIRST_LETTER}\\1" directory "${directory}") - source_group("${directory}" FILES ${original_file}) - else () - source_group("" FILES ${original_file}) - endif () + source_group("${directory}" FILES ${original_file}) + else () + source_group("" FILES ${original_file}) + endif () endforeach () ########################################################################################## @@ -427,28 +432,29 @@ endforeach () ########################################################################################## add_library(openspace-core STATIC ${OPENSPACE_HEADER} ${OPENSPACE_SOURCE}) target_include_directories(openspace-core PUBLIC - # In order to be able to include openspace-core files - ${OPENSPACE_BASE_DIR}/include - # In order to be able to include module files - ${OPENSPACE_BASE_DIR} - # In order to be able to include the module_registration file - ${CMAKE_BINARY_DIR}/_generated/include) - -configure_file( - ${OPENSPACE_CMAKE_EXT_DIR}/openspace_header.template - ${CMAKE_BINARY_DIR}/_generated/include/openspace/openspace.h - @ONLY IMMEDIATE + # In order to be able to include openspace-core files + ${OPENSPACE_BASE_DIR}/include + # In order to be able to include module files + ${OPENSPACE_BASE_DIR} + # In order to be able to include the module_registration file + ${CMAKE_BINARY_DIR}/_generated/include ) configure_file( - ${OPENSPACE_CMAKE_EXT_DIR}/commit.template - ${OPENSPACE_BASE_DIR}/COMMIT.md - @ONLY IMMEDIATE + ${OPENSPACE_CMAKE_EXT_DIR}/openspace_header.template + ${CMAKE_BINARY_DIR}/_generated/include/openspace/openspace.h + @ONLY IMMEDIATE +) + +configure_file( + ${OPENSPACE_CMAKE_EXT_DIR}/commit.template + ${OPENSPACE_BASE_DIR}/COMMIT.md + @ONLY IMMEDIATE ) if (APPLE) - find_library(APPKIT_LIBRARY AppKit REQUIRED) - target_link_libraries(openspace-core ${APPKIT_LIBRARY}) + find_library(APPKIT_LIBRARY AppKit REQUIRED) + target_link_libraries(openspace-core ${APPKIT_LIBRARY}) endif () set_openspace_compile_settings(openspace-core) diff --git a/src/documentation/core_registration.cpp b/src/documentation/core_registration.cpp index dc47ca16ed..610ddbed84 100644 --- a/src/documentation/core_registration.cpp +++ b/src/documentation/core_registration.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/documentation/documentation.cpp b/src/documentation/documentation.cpp index 6b0c81f71f..cfd5e5db9c 100644 --- a/src/documentation/documentation.cpp +++ b/src/documentation/documentation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp index 4a1477a840..fc68608828 100644 --- a/src/documentation/documentationengine.cpp +++ b/src/documentation/documentationengine.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/documentation/documentationgenerator.cpp b/src/documentation/documentationgenerator.cpp index 7e4fc3199d..cedce29ba3 100644 --- a/src/documentation/documentationgenerator.cpp +++ b/src/documentation/documentationgenerator.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/documentation/verifier.cpp b/src/documentation/verifier.cpp index 8c0251ca79..801aedc9a8 100644 --- a/src/documentation/verifier.cpp +++ b/src/documentation/verifier.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp index 3ce4aa2c1a..cb2038692c 100644 --- a/src/engine/configuration.cpp +++ b/src/engine/configuration.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/engine/configuration_doc.inl b/src/engine/configuration_doc.inl index 2f92091b2c..ca3d2e1b73 100644 --- a/src/engine/configuration_doc.inl +++ b/src/engine/configuration_doc.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp index c633e61d8b..5025b2e85e 100644 --- a/src/engine/downloadmanager.cpp +++ b/src/engine/downloadmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/engine/globals.cpp b/src/engine/globals.cpp index 6d173dfa95..586ab40cd4 100644 --- a/src/engine/globals.cpp +++ b/src/engine/globals.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/engine/globalscallbacks.cpp b/src/engine/globalscallbacks.cpp index da64e6b45e..00ad0f6a1b 100644 --- a/src/engine/globalscallbacks.cpp +++ b/src/engine/globalscallbacks.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/engine/logfactory.cpp b/src/engine/logfactory.cpp index 30da9abb00..ea78160cd5 100644 --- a/src/engine/logfactory.cpp +++ b/src/engine/logfactory.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/engine/moduleengine.cpp b/src/engine/moduleengine.cpp index dbf1848a99..8ab8bf14d5 100644 --- a/src/engine/moduleengine.cpp +++ b/src/engine/moduleengine.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/engine/moduleengine_lua.inl b/src/engine/moduleengine_lua.inl index d57f345f3e..067e9ef92f 100644 --- a/src/engine/moduleengine_lua.inl +++ b/src/engine/moduleengine_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index dd5b4ea4b1..2498b7cdfe 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl index cdf1d390d1..95d6f500cd 100644 --- a/src/engine/openspaceengine_lua.inl +++ b/src/engine/openspaceengine_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/engine/syncengine.cpp b/src/engine/syncengine.cpp index 8dfb74907b..f1b35d1f06 100644 --- a/src/engine/syncengine.cpp +++ b/src/engine/syncengine.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/engine/virtualpropertymanager.cpp b/src/engine/virtualpropertymanager.cpp index 1ee75a185b..3c76900b45 100644 --- a/src/engine/virtualpropertymanager.cpp +++ b/src/engine/virtualpropertymanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/camerainteractionstates.cpp b/src/interaction/camerainteractionstates.cpp index ae0af29f03..41f7469035 100644 --- a/src/interaction/camerainteractionstates.cpp +++ b/src/interaction/camerainteractionstates.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/externinteraction.cpp b/src/interaction/externinteraction.cpp index b3455fcd58..cac61e8bbc 100644 --- a/src/interaction/externinteraction.cpp +++ b/src/interaction/externinteraction.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/inputdevicestates.cpp b/src/interaction/inputdevicestates.cpp index 9b1f05e8a7..24de0e38d8 100644 --- a/src/interaction/inputdevicestates.cpp +++ b/src/interaction/inputdevicestates.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/inputstate.cpp b/src/interaction/inputstate.cpp index 42d08e3896..82e2c6e763 100644 --- a/src/interaction/inputstate.cpp +++ b/src/interaction/inputstate.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/joystickcamerastates.cpp b/src/interaction/joystickcamerastates.cpp index 65c8f539fc..fdbcfea7ad 100644 --- a/src/interaction/joystickcamerastates.cpp +++ b/src/interaction/joystickcamerastates.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/joystickinputstate.cpp b/src/interaction/joystickinputstate.cpp index 463c4f6a2c..3e02ae7fb8 100644 --- a/src/interaction/joystickinputstate.cpp +++ b/src/interaction/joystickinputstate.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/keybindingmanager.cpp b/src/interaction/keybindingmanager.cpp index 3ce077797f..529527a678 100644 --- a/src/interaction/keybindingmanager.cpp +++ b/src/interaction/keybindingmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/keybindingmanager_lua.inl b/src/interaction/keybindingmanager_lua.inl index 0e713cd272..58b30e26d7 100644 --- a/src/interaction/keybindingmanager_lua.inl +++ b/src/interaction/keybindingmanager_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/keyframenavigator.cpp b/src/interaction/keyframenavigator.cpp index 75087f4e74..e54f302420 100644 --- a/src/interaction/keyframenavigator.cpp +++ b/src/interaction/keyframenavigator.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/mousecamerastates.cpp b/src/interaction/mousecamerastates.cpp index cabd802a9f..394f95e42a 100644 --- a/src/interaction/mousecamerastates.cpp +++ b/src/interaction/mousecamerastates.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/navigationhandler.cpp b/src/interaction/navigationhandler.cpp index 71bcaa1fd5..44b5dc9f43 100644 --- a/src/interaction/navigationhandler.cpp +++ b/src/interaction/navigationhandler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/navigationhandler_lua.inl b/src/interaction/navigationhandler_lua.inl index 6abe5b1d9e..f2affeeea7 100644 --- a/src/interaction/navigationhandler_lua.inl +++ b/src/interaction/navigationhandler_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/orbitalnavigator.cpp b/src/interaction/orbitalnavigator.cpp index d1180302da..bef2d45491 100644 --- a/src/interaction/orbitalnavigator.cpp +++ b/src/interaction/orbitalnavigator.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp index e48a516efd..dc29a58c5d 100644 --- a/src/interaction/sessionrecording.cpp +++ b/src/interaction/sessionrecording.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/sessionrecording_lua.inl b/src/interaction/sessionrecording_lua.inl index 6f5072dca6..fc77a3d170 100644 --- a/src/interaction/sessionrecording_lua.inl +++ b/src/interaction/sessionrecording_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/shortcutmanager.cpp b/src/interaction/shortcutmanager.cpp index 2b8843d4a7..50df7febf2 100644 --- a/src/interaction/shortcutmanager.cpp +++ b/src/interaction/shortcutmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/interaction/shortcutmanager_lua.inl b/src/interaction/shortcutmanager_lua.inl index 3cefd3a80a..7a99227a46 100644 --- a/src/interaction/shortcutmanager_lua.inl +++ b/src/interaction/shortcutmanager_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/mission/mission.cpp b/src/mission/mission.cpp index f29bd2d155..e7c7bf0b9f 100644 --- a/src/mission/mission.cpp +++ b/src/mission/mission.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/mission/missionmanager.cpp b/src/mission/missionmanager.cpp index 2f94ac202d..4f28426bcc 100644 --- a/src/mission/missionmanager.cpp +++ b/src/mission/missionmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/mission/missionmanager_lua.inl b/src/mission/missionmanager_lua.inl index 650383270e..da954fa57a 100644 --- a/src/mission/missionmanager_lua.inl +++ b/src/mission/missionmanager_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/network/networkengine.cpp b/src/network/networkengine.cpp index ecf300c2aa..6022af5288 100644 --- a/src/network/networkengine.cpp +++ b/src/network/networkengine.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp index 47fafecdf9..a04759fc75 100644 --- a/src/network/parallelconnection.cpp +++ b/src/network/parallelconnection.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp index d288aae0da..7d80255cc1 100644 --- a/src/network/parallelpeer.cpp +++ b/src/network/parallelpeer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/network/parallelpeer_lua.inl b/src/network/parallelpeer_lua.inl index 2ecc52f4f0..0e7b833905 100644 --- a/src/network/parallelpeer_lua.inl +++ b/src/network/parallelpeer_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/network/parallelserver.cpp b/src/network/parallelserver.cpp index f2514f604a..fcdc357f0c 100644 --- a/src/network/parallelserver.cpp +++ b/src/network/parallelserver.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/openspace.cpp b/src/openspace.cpp index efd4c58140..439608d025 100644 --- a/src/openspace.cpp +++ b/src/openspace.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/performance/performancelayout.cpp b/src/performance/performancelayout.cpp index 9a9e3d9e87..3712f6cd74 100644 --- a/src/performance/performancelayout.cpp +++ b/src/performance/performancelayout.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/performance/performancemanager.cpp b/src/performance/performancemanager.cpp index 7832b689bb..e4075bf055 100644 --- a/src/performance/performancemanager.cpp +++ b/src/performance/performancemanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/performance/performancemeasurement.cpp b/src/performance/performancemeasurement.cpp index 73e9d93710..b1bc8aac37 100644 --- a/src/performance/performancemeasurement.cpp +++ b/src/performance/performancemeasurement.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/binaryproperty.cpp b/src/properties/binaryproperty.cpp index 3ebb294761..a2e8480e9b 100644 --- a/src/properties/binaryproperty.cpp +++ b/src/properties/binaryproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/dmat2property.cpp b/src/properties/matrix/dmat2property.cpp index a0a0c2d41a..224aaf4428 100644 --- a/src/properties/matrix/dmat2property.cpp +++ b/src/properties/matrix/dmat2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/dmat2x3property.cpp b/src/properties/matrix/dmat2x3property.cpp index b4b4b2c208..c1e2009e18 100644 --- a/src/properties/matrix/dmat2x3property.cpp +++ b/src/properties/matrix/dmat2x3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/dmat2x4property.cpp b/src/properties/matrix/dmat2x4property.cpp index ad540ab2e9..939a97f74e 100644 --- a/src/properties/matrix/dmat2x4property.cpp +++ b/src/properties/matrix/dmat2x4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/dmat3property.cpp b/src/properties/matrix/dmat3property.cpp index b8faca40ec..59b55fd400 100644 --- a/src/properties/matrix/dmat3property.cpp +++ b/src/properties/matrix/dmat3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/dmat3x2property.cpp b/src/properties/matrix/dmat3x2property.cpp index a63ae69422..52e650044d 100644 --- a/src/properties/matrix/dmat3x2property.cpp +++ b/src/properties/matrix/dmat3x2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/dmat3x4property.cpp b/src/properties/matrix/dmat3x4property.cpp index 0333549309..71435a3093 100644 --- a/src/properties/matrix/dmat3x4property.cpp +++ b/src/properties/matrix/dmat3x4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/dmat4property.cpp b/src/properties/matrix/dmat4property.cpp index 636b0ec302..6cd428cbde 100644 --- a/src/properties/matrix/dmat4property.cpp +++ b/src/properties/matrix/dmat4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/dmat4x2property.cpp b/src/properties/matrix/dmat4x2property.cpp index 0ed55c80be..2f45f93557 100644 --- a/src/properties/matrix/dmat4x2property.cpp +++ b/src/properties/matrix/dmat4x2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/dmat4x3property.cpp b/src/properties/matrix/dmat4x3property.cpp index c8d02d8e0c..ed81fd5fa2 100644 --- a/src/properties/matrix/dmat4x3property.cpp +++ b/src/properties/matrix/dmat4x3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/mat2property.cpp b/src/properties/matrix/mat2property.cpp index 13d7317942..c039952c15 100644 --- a/src/properties/matrix/mat2property.cpp +++ b/src/properties/matrix/mat2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/mat2x3property.cpp b/src/properties/matrix/mat2x3property.cpp index 4f6278f7ca..3d60b3d820 100644 --- a/src/properties/matrix/mat2x3property.cpp +++ b/src/properties/matrix/mat2x3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/mat2x4property.cpp b/src/properties/matrix/mat2x4property.cpp index b89857dcbf..6dddb7a278 100644 --- a/src/properties/matrix/mat2x4property.cpp +++ b/src/properties/matrix/mat2x4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/mat3property.cpp b/src/properties/matrix/mat3property.cpp index 5ee53a2a9c..8740ffb76f 100644 --- a/src/properties/matrix/mat3property.cpp +++ b/src/properties/matrix/mat3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/mat3x2property.cpp b/src/properties/matrix/mat3x2property.cpp index f1a00d095f..973083299f 100644 --- a/src/properties/matrix/mat3x2property.cpp +++ b/src/properties/matrix/mat3x2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/mat3x4property.cpp b/src/properties/matrix/mat3x4property.cpp index 70d9fafeef..dada996339 100644 --- a/src/properties/matrix/mat3x4property.cpp +++ b/src/properties/matrix/mat3x4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/mat4property.cpp b/src/properties/matrix/mat4property.cpp index 33dddd50f9..a35ea00a13 100644 --- a/src/properties/matrix/mat4property.cpp +++ b/src/properties/matrix/mat4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/mat4x2property.cpp b/src/properties/matrix/mat4x2property.cpp index 451a38e176..de9c7a795d 100644 --- a/src/properties/matrix/mat4x2property.cpp +++ b/src/properties/matrix/mat4x2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/matrix/mat4x3property.cpp b/src/properties/matrix/mat4x3property.cpp index af5545d27f..6858e9d7d4 100644 --- a/src/properties/matrix/mat4x3property.cpp +++ b/src/properties/matrix/mat4x3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/optionproperty.cpp b/src/properties/optionproperty.cpp index 6dd285677d..e30bfd1acf 100644 --- a/src/properties/optionproperty.cpp +++ b/src/properties/optionproperty.cpp @@ -3,7 +3,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/property.cpp b/src/properties/property.cpp index 3ccc641c35..863ddc3515 100644 --- a/src/properties/property.cpp +++ b/src/properties/property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp index 2b89953a85..c2773a63e8 100644 --- a/src/properties/propertyowner.cpp +++ b/src/properties/propertyowner.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/scalar/boolproperty.cpp b/src/properties/scalar/boolproperty.cpp index 23d0fc7716..d2b56ee07c 100644 --- a/src/properties/scalar/boolproperty.cpp +++ b/src/properties/scalar/boolproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/scalar/charproperty.cpp b/src/properties/scalar/charproperty.cpp index 930aa62e4f..a4798023a9 100644 --- a/src/properties/scalar/charproperty.cpp +++ b/src/properties/scalar/charproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/scalar/doubleproperty.cpp b/src/properties/scalar/doubleproperty.cpp index 546e1be79d..fc48aeb82b 100644 --- a/src/properties/scalar/doubleproperty.cpp +++ b/src/properties/scalar/doubleproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/scalar/floatproperty.cpp b/src/properties/scalar/floatproperty.cpp index bad590036a..ee58214d65 100644 --- a/src/properties/scalar/floatproperty.cpp +++ b/src/properties/scalar/floatproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/scalar/intproperty.cpp b/src/properties/scalar/intproperty.cpp index b29514fbb5..d83370d838 100644 --- a/src/properties/scalar/intproperty.cpp +++ b/src/properties/scalar/intproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/scalar/longdoubleproperty.cpp b/src/properties/scalar/longdoubleproperty.cpp index 2267ba2c8b..71d11d4434 100644 --- a/src/properties/scalar/longdoubleproperty.cpp +++ b/src/properties/scalar/longdoubleproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/scalar/longlongproperty.cpp b/src/properties/scalar/longlongproperty.cpp index be84a4b020..19a6821469 100644 --- a/src/properties/scalar/longlongproperty.cpp +++ b/src/properties/scalar/longlongproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/scalar/longproperty.cpp b/src/properties/scalar/longproperty.cpp index 3031273ba3..85061bc48d 100644 --- a/src/properties/scalar/longproperty.cpp +++ b/src/properties/scalar/longproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/scalar/shortproperty.cpp b/src/properties/scalar/shortproperty.cpp index 0ad991ff83..b7019c66a4 100644 --- a/src/properties/scalar/shortproperty.cpp +++ b/src/properties/scalar/shortproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/scalar/signedcharproperty.cpp b/src/properties/scalar/signedcharproperty.cpp index 34c4d2e97d..691326ae5a 100644 --- a/src/properties/scalar/signedcharproperty.cpp +++ b/src/properties/scalar/signedcharproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/scalar/ucharproperty.cpp b/src/properties/scalar/ucharproperty.cpp index fbde3fa7f3..6f9ca4fbb0 100644 --- a/src/properties/scalar/ucharproperty.cpp +++ b/src/properties/scalar/ucharproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/scalar/uintproperty.cpp b/src/properties/scalar/uintproperty.cpp index 5e0ac45096..9eda1fc85c 100644 --- a/src/properties/scalar/uintproperty.cpp +++ b/src/properties/scalar/uintproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/scalar/ulonglongproperty.cpp b/src/properties/scalar/ulonglongproperty.cpp index bbd24a8a34..fb99dcd30d 100644 --- a/src/properties/scalar/ulonglongproperty.cpp +++ b/src/properties/scalar/ulonglongproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/scalar/ulongproperty.cpp b/src/properties/scalar/ulongproperty.cpp index 76b762b401..dd1cc46f96 100644 --- a/src/properties/scalar/ulongproperty.cpp +++ b/src/properties/scalar/ulongproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/scalar/ushortproperty.cpp b/src/properties/scalar/ushortproperty.cpp index 27fe0cbda6..3f812f6531 100644 --- a/src/properties/scalar/ushortproperty.cpp +++ b/src/properties/scalar/ushortproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/scalar/wcharproperty.cpp b/src/properties/scalar/wcharproperty.cpp index 07c78317b1..f96f49d79c 100644 --- a/src/properties/scalar/wcharproperty.cpp +++ b/src/properties/scalar/wcharproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/selectionproperty.cpp b/src/properties/selectionproperty.cpp index 68a6571471..e305d110bd 100644 --- a/src/properties/selectionproperty.cpp +++ b/src/properties/selectionproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/stringlistproperty.cpp b/src/properties/stringlistproperty.cpp index 189dbfed59..2d42973cab 100644 --- a/src/properties/stringlistproperty.cpp +++ b/src/properties/stringlistproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/stringproperty.cpp b/src/properties/stringproperty.cpp index 6f6e067908..f7ff265942 100644 --- a/src/properties/stringproperty.cpp +++ b/src/properties/stringproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/triggerproperty.cpp b/src/properties/triggerproperty.cpp index 170c231ade..ef6adfbe8e 100644 --- a/src/properties/triggerproperty.cpp +++ b/src/properties/triggerproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/vector/bvec2property.cpp b/src/properties/vector/bvec2property.cpp index 7000b4c199..13895c5562 100644 --- a/src/properties/vector/bvec2property.cpp +++ b/src/properties/vector/bvec2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/vector/bvec3property.cpp b/src/properties/vector/bvec3property.cpp index b99f4eab67..5e20d06299 100644 --- a/src/properties/vector/bvec3property.cpp +++ b/src/properties/vector/bvec3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/vector/bvec4property.cpp b/src/properties/vector/bvec4property.cpp index 62b5648d94..d9c33cbdf8 100644 --- a/src/properties/vector/bvec4property.cpp +++ b/src/properties/vector/bvec4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/vector/dvec2property.cpp b/src/properties/vector/dvec2property.cpp index 1dd6a06f63..fbf8ee3559 100644 --- a/src/properties/vector/dvec2property.cpp +++ b/src/properties/vector/dvec2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/vector/dvec3property.cpp b/src/properties/vector/dvec3property.cpp index 55ce51f39d..fa8c0abc99 100644 --- a/src/properties/vector/dvec3property.cpp +++ b/src/properties/vector/dvec3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/vector/dvec4property.cpp b/src/properties/vector/dvec4property.cpp index afd5b2170a..a28b64e84a 100644 --- a/src/properties/vector/dvec4property.cpp +++ b/src/properties/vector/dvec4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/vector/ivec2property.cpp b/src/properties/vector/ivec2property.cpp index 2d7d55323b..cb2b82073c 100644 --- a/src/properties/vector/ivec2property.cpp +++ b/src/properties/vector/ivec2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/vector/ivec3property.cpp b/src/properties/vector/ivec3property.cpp index b9f13aebca..1f5f0bac9e 100644 --- a/src/properties/vector/ivec3property.cpp +++ b/src/properties/vector/ivec3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/vector/ivec4property.cpp b/src/properties/vector/ivec4property.cpp index cf0170d2b8..123278ffac 100644 --- a/src/properties/vector/ivec4property.cpp +++ b/src/properties/vector/ivec4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/vector/uvec2property.cpp b/src/properties/vector/uvec2property.cpp index 350c929a47..0e681a7dfa 100644 --- a/src/properties/vector/uvec2property.cpp +++ b/src/properties/vector/uvec2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/vector/uvec3property.cpp b/src/properties/vector/uvec3property.cpp index 9ae85b445b..ce921c1e92 100644 --- a/src/properties/vector/uvec3property.cpp +++ b/src/properties/vector/uvec3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/vector/uvec4property.cpp b/src/properties/vector/uvec4property.cpp index a71aeb2801..b7e2efbb75 100644 --- a/src/properties/vector/uvec4property.cpp +++ b/src/properties/vector/uvec4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/vector/vec2property.cpp b/src/properties/vector/vec2property.cpp index ee257c8ffa..cb442bdd61 100644 --- a/src/properties/vector/vec2property.cpp +++ b/src/properties/vector/vec2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/vector/vec3property.cpp b/src/properties/vector/vec3property.cpp index 26395dd40d..157c5209cd 100644 --- a/src/properties/vector/vec3property.cpp +++ b/src/properties/vector/vec3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/properties/vector/vec4property.cpp b/src/properties/vector/vec4property.cpp index 554f0b922a..7de76627cf 100644 --- a/src/properties/vector/vec4property.cpp +++ b/src/properties/vector/vec4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/query/query.cpp b/src/query/query.cpp index bc94fb8722..cb929f3892 100644 --- a/src/query/query.cpp +++ b/src/query/query.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/rendering/abufferrenderer.cpp b/src/rendering/abufferrenderer.cpp index a3c56fb98d..5fbd5c9e46 100644 --- a/src/rendering/abufferrenderer.cpp +++ b/src/rendering/abufferrenderer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/rendering/dashboard.cpp b/src/rendering/dashboard.cpp index ba2c9bb4aa..01ac1eb417 100644 --- a/src/rendering/dashboard.cpp +++ b/src/rendering/dashboard.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/rendering/dashboard_lua.inl b/src/rendering/dashboard_lua.inl index 7b2500d6b6..a6544c6af6 100644 --- a/src/rendering/dashboard_lua.inl +++ b/src/rendering/dashboard_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/rendering/dashboarditem.cpp b/src/rendering/dashboarditem.cpp index 4ac070596d..d7ee5306cd 100644 --- a/src/rendering/dashboarditem.cpp +++ b/src/rendering/dashboarditem.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/rendering/deferredcastermanager.cpp b/src/rendering/deferredcastermanager.cpp index 223d6c28be..1af53f4f6d 100644 --- a/src/rendering/deferredcastermanager.cpp +++ b/src/rendering/deferredcastermanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp index 7b5502cc3b..d3392bb292 100644 --- a/src/rendering/framebufferrenderer.cpp +++ b/src/rendering/framebufferrenderer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/rendering/helper.cpp b/src/rendering/helper.cpp index 4db66fc3c1..fe4a2e5eb1 100644 --- a/src/rendering/helper.cpp +++ b/src/rendering/helper.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp index 929cf963f8..3131769f0b 100644 --- a/src/rendering/loadingscreen.cpp +++ b/src/rendering/loadingscreen.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp index a8a180d8c0..d4c02f3a16 100644 --- a/src/rendering/luaconsole.cpp +++ b/src/rendering/luaconsole.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/rendering/raycastermanager.cpp b/src/rendering/raycastermanager.cpp index 3a8f1dd621..aec3271629 100644 --- a/src/rendering/raycastermanager.cpp +++ b/src/rendering/raycastermanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp index b06b884b17..f9a67dbda3 100644 --- a/src/rendering/renderable.cpp +++ b/src/rendering/renderable.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index afc25b2751..24a6c8882f 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/rendering/renderengine_lua.inl b/src/rendering/renderengine_lua.inl index 63af288d65..bc50584331 100644 --- a/src/rendering/renderengine_lua.inl +++ b/src/rendering/renderengine_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp index b5f0c6b86d..b29744be24 100644 --- a/src/rendering/screenspacerenderable.cpp +++ b/src/rendering/screenspacerenderable.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/rendering/transferfunction.cpp b/src/rendering/transferfunction.cpp index 5d610f457c..c201a392dc 100644 --- a/src/rendering/transferfunction.cpp +++ b/src/rendering/transferfunction.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/rendering/volumeraycaster.cpp b/src/rendering/volumeraycaster.cpp index 2340f58fda..17d13627c0 100644 --- a/src/rendering/volumeraycaster.cpp +++ b/src/rendering/volumeraycaster.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/asset.cpp b/src/scene/asset.cpp index aacc974cd2..c4c5f98e5c 100644 --- a/src/scene/asset.cpp +++ b/src/scene/asset.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/assetloader.cpp b/src/scene/assetloader.cpp index 88c8daa8b0..fc9b686411 100644 --- a/src/scene/assetloader.cpp +++ b/src/scene/assetloader.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/assetloader_lua.inl b/src/scene/assetloader_lua.inl index 8703318847..6a34477fd2 100644 --- a/src/scene/assetloader_lua.inl +++ b/src/scene/assetloader_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp index ee58ada3d5..1f98f7bcb5 100644 --- a/src/scene/assetmanager.cpp +++ b/src/scene/assetmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/assetmanager_lua.inl b/src/scene/assetmanager_lua.inl index 4397d560b5..138d60e0c2 100644 --- a/src/scene/assetmanager_lua.inl +++ b/src/scene/assetmanager_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/lightsource.cpp b/src/scene/lightsource.cpp index b7cae1c1c9..95881efa2e 100644 --- a/src/scene/lightsource.cpp +++ b/src/scene/lightsource.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/rotation.cpp b/src/scene/rotation.cpp index c6809fb180..9173fd5097 100644 --- a/src/scene/rotation.cpp +++ b/src/scene/rotation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/scale.cpp b/src/scene/scale.cpp index 4f6acb8d75..b9475b6fa3 100644 --- a/src/scene/scale.cpp +++ b/src/scene/scale.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp index 0785604346..b3e722898f 100644 --- a/src/scene/scene.cpp +++ b/src/scene/scene.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl index a7494138e3..35439abc30 100644 --- a/src/scene/scene_lua.inl +++ b/src/scene/scene_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp index 54b23f89ce..b4cfc710c7 100644 --- a/src/scene/scenegraphnode.cpp +++ b/src/scene/scenegraphnode.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/scenegraphnode_doc.inl b/src/scene/scenegraphnode_doc.inl index d5dec95d3d..9850908d07 100644 --- a/src/scene/scenegraphnode_doc.inl +++ b/src/scene/scenegraphnode_doc.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/sceneinitializer.cpp b/src/scene/sceneinitializer.cpp index a1ed44669d..9b22f1c714 100644 --- a/src/scene/sceneinitializer.cpp +++ b/src/scene/sceneinitializer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/scenelicense.cpp b/src/scene/scenelicense.cpp index f5d2d626ae..4c476ef046 100644 --- a/src/scene/scenelicense.cpp +++ b/src/scene/scenelicense.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/scenelicensewriter.cpp b/src/scene/scenelicensewriter.cpp index 3e169b3080..a9ff92d1e0 100644 --- a/src/scene/scenelicensewriter.cpp +++ b/src/scene/scenelicensewriter.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/timeframe.cpp b/src/scene/timeframe.cpp index 4efed887bc..78fd729e96 100644 --- a/src/scene/timeframe.cpp +++ b/src/scene/timeframe.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scene/translation.cpp b/src/scene/translation.cpp index 9b7228abab..925935b22c 100644 --- a/src/scene/translation.cpp +++ b/src/scene/translation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scripting/lualibrary.cpp b/src/scripting/lualibrary.cpp index f0731c4da6..37feeaa931 100644 --- a/src/scripting/lualibrary.cpp +++ b/src/scripting/lualibrary.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp index 03e93c5b32..d6914bfcba 100644 --- a/src/scripting/scriptengine.cpp +++ b/src/scripting/scriptengine.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl index 1d2b7873b1..ce3ef4ccb1 100644 --- a/src/scripting/scriptengine_lua.inl +++ b/src/scripting/scriptengine_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scripting/scriptscheduler.cpp b/src/scripting/scriptscheduler.cpp index 728821e2d0..1731f9a9e6 100644 --- a/src/scripting/scriptscheduler.cpp +++ b/src/scripting/scriptscheduler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scripting/scriptscheduler_lua.inl b/src/scripting/scriptscheduler_lua.inl index 87e1839839..ebf517ce47 100644 --- a/src/scripting/scriptscheduler_lua.inl +++ b/src/scripting/scriptscheduler_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/scripting/systemcapabilitiesbinding.cpp b/src/scripting/systemcapabilitiesbinding.cpp index 3b455bc063..ce773010a4 100644 --- a/src/scripting/systemcapabilitiesbinding.cpp +++ b/src/scripting/systemcapabilitiesbinding.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/blockplaneintersectiongeometry.cpp b/src/util/blockplaneintersectiongeometry.cpp index 184bd3f977..835c893dac 100644 --- a/src/util/blockplaneintersectiongeometry.cpp +++ b/src/util/blockplaneintersectiongeometry.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/boxgeometry.cpp b/src/util/boxgeometry.cpp index 84ab715087..4cf098fd82 100644 --- a/src/util/boxgeometry.cpp +++ b/src/util/boxgeometry.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/camera.cpp b/src/util/camera.cpp index 192071c9de..41cbc3500a 100644 --- a/src/util/camera.cpp +++ b/src/util/camera.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/distanceconversion.cpp b/src/util/distanceconversion.cpp index 349764cc8f..d654253fd5 100644 --- a/src/util/distanceconversion.cpp +++ b/src/util/distanceconversion.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/factorymanager.cpp b/src/util/factorymanager.cpp index fc716e2603..5b626c0cdb 100644 --- a/src/util/factorymanager.cpp +++ b/src/util/factorymanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/histogram.cpp b/src/util/histogram.cpp index d0265e2e91..2af9cfb75f 100644 --- a/src/util/histogram.cpp +++ b/src/util/histogram.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/httprequest.cpp b/src/util/httprequest.cpp index d3d0f30876..dbc21a5c46 100644 --- a/src/util/httprequest.cpp +++ b/src/util/httprequest.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/keys.cpp b/src/util/keys.cpp index 1dbfe04592..e69dd4f7b0 100644 --- a/src/util/keys.cpp +++ b/src/util/keys.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp index 65621c74ff..9d1fba9a37 100644 --- a/src/util/openspacemodule.cpp +++ b/src/util/openspacemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/powerscaledcoordinate.cpp b/src/util/powerscaledcoordinate.cpp index 986ec354a0..9c5ac81d0c 100644 --- a/src/util/powerscaledcoordinate.cpp +++ b/src/util/powerscaledcoordinate.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/powerscaledscalar.cpp b/src/util/powerscaledscalar.cpp index f5e5e81d54..7aa766b485 100644 --- a/src/util/powerscaledscalar.cpp +++ b/src/util/powerscaledscalar.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/powerscaledsphere.cpp b/src/util/powerscaledsphere.cpp index 52245bf0e3..09ffc11f24 100644 --- a/src/util/powerscaledsphere.cpp +++ b/src/util/powerscaledsphere.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/progressbar.cpp b/src/util/progressbar.cpp index 0f47d4199f..f8ebcd053a 100644 --- a/src/util/progressbar.cpp +++ b/src/util/progressbar.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/resourcesynchronization.cpp b/src/util/resourcesynchronization.cpp index bb4e6621ec..31fcde9b7b 100644 --- a/src/util/resourcesynchronization.cpp +++ b/src/util/resourcesynchronization.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/screenlog.cpp b/src/util/screenlog.cpp index 16123e3b47..aaf3440046 100644 --- a/src/util/screenlog.cpp +++ b/src/util/screenlog.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp index dd2d1aa6ca..9aa2e51803 100644 --- a/src/util/spicemanager.cpp +++ b/src/util/spicemanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/spicemanager_lua.inl b/src/util/spicemanager_lua.inl index ef079f3f27..3cdc589ec5 100644 --- a/src/util/spicemanager_lua.inl +++ b/src/util/spicemanager_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/syncbuffer.cpp b/src/util/syncbuffer.cpp index e69dcead5a..93ad822357 100644 --- a/src/util/syncbuffer.cpp +++ b/src/util/syncbuffer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/synchronizationwatcher.cpp b/src/util/synchronizationwatcher.cpp index 5894169c05..4f8675f6cc 100644 --- a/src/util/synchronizationwatcher.cpp +++ b/src/util/synchronizationwatcher.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/task.cpp b/src/util/task.cpp index 57afddf364..363c920c52 100644 --- a/src/util/task.cpp +++ b/src/util/task.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/taskloader.cpp b/src/util/taskloader.cpp index e3bdf97de3..84e664f2bb 100644 --- a/src/util/taskloader.cpp +++ b/src/util/taskloader.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/threadpool.cpp b/src/util/threadpool.cpp index 4e52e792ca..235d5fb52f 100644 --- a/src/util/threadpool.cpp +++ b/src/util/threadpool.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/time.cpp b/src/util/time.cpp index 3f74ac250d..f84e69482e 100644 --- a/src/util/time.cpp +++ b/src/util/time.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl index 18855df007..9a197065e8 100644 --- a/src/util/time_lua.inl +++ b/src/util/time_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/timeconversion.cpp b/src/util/timeconversion.cpp index 9e691f5e6f..5fd120d889 100644 --- a/src/util/timeconversion.cpp +++ b/src/util/timeconversion.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/timeline.cpp b/src/util/timeline.cpp index 4bd2019a82..4af59c0248 100644 --- a/src/util/timeline.cpp +++ b/src/util/timeline.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp index 735ed87e72..bd698d518d 100644 --- a/src/util/timemanager.cpp +++ b/src/util/timemanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/timerange.cpp b/src/util/timerange.cpp index 9da3b51978..d60e3c21c9 100644 --- a/src/util/timerange.cpp +++ b/src/util/timerange.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/src/util/transformationmanager.cpp b/src/util/transformationmanager.cpp index b002c54941..9312d6da49 100644 --- a/src/util/transformationmanager.cpp +++ b/src/util/transformationmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/support/cmake/module_definition.cmake b/support/cmake/module_definition.cmake index d9391f5a6e..98e66ca1dd 100644 --- a/support/cmake/module_definition.cmake +++ b/support/cmake/module_definition.cmake @@ -103,7 +103,7 @@ endfunction () # External dependencies are found using the find_package function and then linked function (handle_module_dependencies target_name module_name) # We always want to link against Ghoul and the core library - target_link_libraries(${library_name} Ghoul openspace-core) + target_link_libraries(${library_name} PRIVATE Ghoul openspace-core) if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include.cmake") include(${CMAKE_CURRENT_SOURCE_DIR}/include.cmake) @@ -112,7 +112,7 @@ function (handle_module_dependencies target_name module_name) foreach (dep ${OPENSPACE_DEPENDENCIES}) create_library_name(${dep} dep_library) message(STATUS "Link: ${target_name} <- ${dep_library}") - target_link_libraries(${target_name} ${dep_library}) + target_link_libraries(${target_name} PRIVATE ${dep_library}) endforeach () # Handle external dependencies @@ -123,7 +123,7 @@ function (handle_module_dependencies target_name module_name) ${${dep_upper}_INCLUDE_DIR} ${${dep_upper}_INCLUDE_DIRS} ) message(STATUS "Link: ${target_name} <- ${${dep_upper}_LIBRARIES}") - target_link_libraries(${target_name} ${${dep_upper}_LIBRARIES}) + target_link_libraries(${target_name} PRIVATE ${${dep_upper}_LIBRARIES}) endforeach () endif () endfunction () diff --git a/support/coding/check_style_guide.py b/support/coding/check_style_guide.py index 7914125588..8a71a07495 100644 --- a/support/coding/check_style_guide.py +++ b/support/coding/check_style_guide.py @@ -57,7 +57,7 @@ import os import re import sys -current_year = '2018' +current_year = '2019' is_strict_mode = False is_silent_mode = False diff --git a/tests/main.cpp b/tests/main.cpp index 4cda6b7e09..b5c3cd717f 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/regression/517.inl b/tests/regression/517.inl index cf28d26f79..8ffeea5e4f 100644 --- a/tests/regression/517.inl +++ b/tests/regression/517.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_angle.inl b/tests/test_angle.inl index 1dbc6a32b6..be4dcf5e1e 100644 --- a/tests/test_angle.inl +++ b/tests/test_angle.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_assetloader.inl b/tests/test_assetloader.inl index 6daa6ff887..545c7aae9a 100644 --- a/tests/test_assetloader.inl +++ b/tests/test_assetloader.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_chunknode.inl b/tests/test_chunknode.inl index aac781dcad..114f256a82 100644 --- a/tests/test_chunknode.inl +++ b/tests/test_chunknode.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_common.inl b/tests/test_common.inl index af781a25a5..62dd62ba43 100644 --- a/tests/test_common.inl +++ b/tests/test_common.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_concurrentjobmanager.inl b/tests/test_concurrentjobmanager.inl index 0e6a5e9af6..9814702794 100644 --- a/tests/test_concurrentjobmanager.inl +++ b/tests/test_concurrentjobmanager.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_concurrentqueue.inl b/tests/test_concurrentqueue.inl index 72ec9bd303..cab11de5a2 100644 --- a/tests/test_concurrentqueue.inl +++ b/tests/test_concurrentqueue.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_documentation.inl b/tests/test_documentation.inl index a16f4807b9..10c6b3b0ee 100644 --- a/tests/test_documentation.inl +++ b/tests/test_documentation.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_ellipsoid.inl b/tests/test_ellipsoid.inl index 70282fae2b..05c283da28 100644 --- a/tests/test_ellipsoid.inl +++ b/tests/test_ellipsoid.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_gdalwms.inl b/tests/test_gdalwms.inl index 163bda0797..50b7dec7ec 100644 --- a/tests/test_gdalwms.inl +++ b/tests/test_gdalwms.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_iswamanager.inl b/tests/test_iswamanager.inl index a8142417ee..8275b485d3 100644 --- a/tests/test_iswamanager.inl +++ b/tests/test_iswamanager.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_latlonpatch.inl b/tests/test_latlonpatch.inl index bcbda9c095..73156dafeb 100644 --- a/tests/test_latlonpatch.inl +++ b/tests/test_latlonpatch.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_lrucache.inl b/tests/test_lrucache.inl index c42efbf6cd..457217234e 100644 --- a/tests/test_lrucache.inl +++ b/tests/test_lrucache.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_luaconversions.inl b/tests/test_luaconversions.inl index 69ffab3800..ca5fef1627 100644 --- a/tests/test_luaconversions.inl +++ b/tests/test_luaconversions.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_optionproperty.inl b/tests/test_optionproperty.inl index 5c87671a28..8fd3a913ca 100644 --- a/tests/test_optionproperty.inl +++ b/tests/test_optionproperty.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_patchcoverageprovider.inl b/tests/test_patchcoverageprovider.inl index 0f05f36a76..54b68fb3a1 100644 --- a/tests/test_patchcoverageprovider.inl +++ b/tests/test_patchcoverageprovider.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_powerscalecoordinates.inl b/tests/test_powerscalecoordinates.inl index a58a678b46..fb8bf5074d 100644 --- a/tests/test_powerscalecoordinates.inl +++ b/tests/test_powerscalecoordinates.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_rawvolumeio.inl b/tests/test_rawvolumeio.inl index 6674953c6c..f68e3a0ce1 100644 --- a/tests/test_rawvolumeio.inl +++ b/tests/test_rawvolumeio.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_screenspaceimage.inl b/tests/test_screenspaceimage.inl index 3b66ca6e5f..e2bdb5cb37 100644 --- a/tests/test_screenspaceimage.inl +++ b/tests/test_screenspaceimage.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_scriptscheduler.inl b/tests/test_scriptscheduler.inl index 24ef3b76ab..a12b363b05 100644 --- a/tests/test_scriptscheduler.inl +++ b/tests/test_scriptscheduler.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_spicemanager.inl b/tests/test_spicemanager.inl index 437a69aacc..e2949b024d 100644 --- a/tests/test_spicemanager.inl +++ b/tests/test_spicemanager.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_temporaltileprovider.inl b/tests/test_temporaltileprovider.inl index cdd6420ec1..d58f2ce6a8 100644 --- a/tests/test_temporaltileprovider.inl +++ b/tests/test_temporaltileprovider.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 * diff --git a/tests/test_timeline.inl b/tests/test_timeline.inl index dda1dc91e1..61f3e600d6 100644 --- a/tests/test_timeline.inl +++ b/tests/test_timeline.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2018 * + * Copyright (c) 2014-2019 * * * * 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 *