diff --git a/CITATION.cff b/CITATION.cff new file mode 100644 index 0000000000..10993db4e4 --- /dev/null +++ b/CITATION.cff @@ -0,0 +1,73 @@ +cff-version: 1.2.0 +message: "If you use this software, please cite it as below." +authors: +- family-names: "Bock" + given-names: "Alexander" + orcid: "https://orcid.org/0000-0002-2849-6146" +- family-names: "Axelsson" + given-names: "Emil" +- family-names: "Costa" + given-names: "Jonathas" + orcid: "https://orcid.org/0000-0002-5008-5685" +- family-names: "Payne" + given-names: "Gene" + orcid: "https://orcid.org/0000-0001-8022-4781" +- family-names: "Acinapura" + given-names: "Micah" +- family-names: "Trakinski" + given-names: "Vivian" +- family-names: "Emmart" + given-names: "Carter" +- family-names: "Silva" + given-names: "Claudio" + orcid: "https://orcid.org/0000-0003-2452-2295" +- family-names: "Hansen" + given-names: "Charles" + orcid: "https://orcid.org/0000-0002-8480-2152" +- family-names: "Ynnerman" + given-names: "Anders" + orcid: "https://orcid.org/0000-0002-9466-9826" +title: "OpenSpace" +version: 0.18.2 +doi: 10.1109/TVCG.2019.2934259 +date-released: 2022-12-24 +url: "https://github.com/OpenSpace/OpenSpace" +preferred-citation: + scope: "If you use this software, please cite it as below" + type: article + authors: + - family-names: "Bock" + given-names: "Alexander" + orcid: "https://orcid.org/0000-0002-2849-6146" + - family-names: "Axelsson" + given-names: "Emil" + - family-names: "Costa" + given-names: "Jonathas" + orcid: "https://orcid.org/0000-0002-5008-5685" + - family-names: "Payne" + given-names: "Gene" + orcid: "https://orcid.org/0000-0001-8022-4781" + - family-names: "Acinapura" + given-names: "Micah" + - family-names: "Trakinski" + given-names: "Vivian" + - family-names: "Emmart" + given-names: "Carter" + - family-names: "Silva" + given-names: "Claudio" + orcid: "https://orcid.org/0000-0003-2452-2295" + - family-names: "Hansen" + given-names: "Charles" + orcid: "https://orcid.org/0000-0002-8480-2152" + - family-names: "Ynnerman" + given-names: "Anders" + orcid: "https://orcid.org/0000-0002-9466-9826" + doi: 10.1109/TVCG.2019.2934259 + journal: "IEEE Transactions on Visualization and Computer Graphics" + month: 1 + start: 633 + end: 642 + title: "OpenSpace: A System for Astrographics" + issue: 1 + volume: 26 + year: 2020 diff --git a/CMakeLists.txt b/CMakeLists.txt index 1694b170b1..c35dfa48b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, to any person obtaining a copy of this # # software and associated documentation files (the "Software"), to deal in the Software # @@ -28,9 +28,9 @@ cmake_policy(SET CMP0120 NEW) project(OpenSpace) set(OPENSPACE_VERSION_MAJOR 0) -set(OPENSPACE_VERSION_MINOR 18) +set(OPENSPACE_VERSION_MINOR 19) set(OPENSPACE_VERSION_PATCH 0) -set(OPENSPACE_VERSION_STRING "Beta-11") +set(OPENSPACE_VERSION_STRING "") set(OPENSPACE_BASE_DIR "${PROJECT_SOURCE_DIR}") set(OPENSPACE_CMAKE_EXT_DIR "${OPENSPACE_BASE_DIR}/support/cmake") diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index e38b6a04d6..f8489b2b7a 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -27,7 +27,7 @@ Project maintainers have the right and responsibility to remove, edit, or reject This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at alexander.bock@me.com or vivian@amnh.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at alex@openspaceproject.com or vivian@amnh.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. diff --git a/LICENSE.md b/LICENSE.md index 93395f8f71..7c377d85c8 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2014-2022 +Copyright (c) 2014-2023 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software @@ -15,4 +15,4 @@ 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. \ No newline at end of file +OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index b3ac1f86ab..25a841efb1 100644 --- a/README.md +++ b/README.md @@ -45,3 +45,6 @@ Requirements for compiling are: Feel free to create issues for missing features, bug reports, or compile problems or contact us via [email](mailto:openspace@amnh.org?subject=OpenSpace:). Regarding any issues, you are very welcome on our [Slack support channel](https://openspacesupport.slack.com) to which you can freely [sign-up](https://join.slack.com/t/openspacesupport/shared_invite/zt-37niq6y9-T0JaCIk4UoFLI4VF5U9Vsw). ![Image](https://github.com/OpenSpace/openspace.github.io/raw/master/assets/images/himalaya-nkpg-dome.jpg) + +# License +The contents of this repository is under an [MIT license](https://github.com/OpenSpace/OpenSpace/blob/master/LICENSE.md). diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt index 1b1607a35b..d28a99f874 100644 --- a/apps/CMakeLists.txt +++ b/apps/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of 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/main.cpp b/apps/OpenSpace-MinVR/main.cpp index 34c62a86e5..6b43cfa748 100644 --- a/apps/OpenSpace-MinVR/main.cpp +++ b/apps/OpenSpace-MinVR/main.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 b8677938df..9dd334e0f9 100644 --- a/apps/OpenSpace/CMakeLists.txt +++ b/apps/OpenSpace/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of 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/ext/launcher/CMakeLists.txt b/apps/OpenSpace/ext/launcher/CMakeLists.txt index 1c85bd7569..c31f3087db 100644 --- a/apps/OpenSpace/ext/launcher/CMakeLists.txt +++ b/apps/OpenSpace/ext/launcher/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of 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/ext/launcher/include/filesystemaccess.h b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h index 7f7d562275..9db6b4d972 100644 --- a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h +++ b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/launcherwindow.h b/apps/OpenSpace/ext/launcher/include/launcherwindow.h index 1008964744..2f1ca6b732 100644 --- a/apps/OpenSpace/ext/launcher/include/launcherwindow.h +++ b/apps/OpenSpace/ext/launcher/include/launcherwindow.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/profile/actiondialog.h b/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h index bb15076196..b71af7cbb7 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h +++ b/apps/OpenSpace/ext/launcher/include/profile/actiondialog.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -100,6 +100,8 @@ private: QPushButton* removeButton = nullptr; QDialogButtonBox* saveButtons = nullptr; } _keybindingWidgets; + + QDialogButtonBox* _mainButtons = nullptr; }; #endif // __OPENSPACE_UI_LAUNCHER___ACTIONDIALOG___H__ diff --git a/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h index ff6631dec6..7382c12280 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h +++ b/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/profile/assetedit.h b/apps/OpenSpace/ext/launcher/include/profile/assetedit.h index d4f4ecad3b..01d976a3c4 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/assetedit.h +++ b/apps/OpenSpace/ext/launcher/include/profile/assetedit.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/profile/assetsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h index 9d2fb4a9eb..85714b26bb 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h +++ b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/profile/assettreeitem.h b/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h index 18d62f12c6..0e1055bcbc 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h +++ b/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/profile/assettreemodel.h b/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h index 610f824468..6103897deb 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h +++ b/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/profile/cameradialog.h b/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h index 3834e60045..d600f67f0f 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h +++ b/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/profile/deltatimesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h index e6a7fb0e91..3766dd2337 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h +++ b/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/profile/horizonsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h index 373410edce..8f8dec8c60 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h +++ b/apps/OpenSpace/ext/launcher/include/profile/horizonsdialog.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/profile/line.h b/apps/OpenSpace/ext/launcher/include/profile/line.h index 7ab499602c..4f51297604 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/line.h +++ b/apps/OpenSpace/ext/launcher/include/profile/line.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/profile/marknodesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h index 754af7b82a..22d2c5cafd 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h +++ b/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/profile/metadialog.h b/apps/OpenSpace/ext/launcher/include/profile/metadialog.h index 280b7ebc9d..a496605a81 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/metadialog.h +++ b/apps/OpenSpace/ext/launcher/include/profile/metadialog.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/profile/modulesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h index c70f14e8d3..f334a786dd 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h +++ b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/profile/profileedit.h b/apps/OpenSpace/ext/launcher/include/profile/profileedit.h index 547ee7db6f..3eeb7a32f3 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/profileedit.h +++ b/apps/OpenSpace/ext/launcher/include/profile/profileedit.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/profile/propertiesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h index 74e13c03a7..e1dc6ab511 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h +++ b/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/profile/scriptlogdialog.h b/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h index 6e9726fc44..c8a1218647 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h +++ b/apps/OpenSpace/ext/launcher/include/profile/scriptlogdialog.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby 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,6 +50,7 @@ private: QListWidget* _scriptlogList = nullptr; QLineEdit* _filter = nullptr; QPushButton* _reloadFile = nullptr; + std::string _scriptLogFile; std::vector _scripts; }; diff --git a/apps/OpenSpace/ext/launcher/include/profile/timedialog.h b/apps/OpenSpace/ext/launcher/include/profile/timedialog.h index 978c3bfc96..89fd0349e4 100644 --- a/apps/OpenSpace/ext/launcher/include/profile/timedialog.h +++ b/apps/OpenSpace/ext/launcher/include/profile/timedialog.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/sgctedit/displaywindowunion.h b/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h index 67ba2d2054..ea64258da9 100644 --- a/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h +++ b/apps/OpenSpace/ext/launcher/include/sgctedit/displaywindowunion.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/sgctedit/monitorbox.h b/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h index 7fd0aef0bd..c8f080fc24 100644 --- a/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h +++ b/apps/OpenSpace/ext/launcher/include/sgctedit/monitorbox.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -81,10 +81,10 @@ private: std::vector _monitorDimensionsScaled; std::array _windowRendering = { - QRectF{ 0.f, 0.f, 0.f, 0.f }, - QRectF{ 0.f, 0.f, 0.f, 0.f }, - QRectF{ 0.f, 0.f, 0.f, 0.f }, - QRectF{ 0.f, 0.f, 0.f, 0.f } + QRectF(0.f, 0.f, 0.f, 0.f), + QRectF(0.f, 0.f, 0.f, 0.f), + QRectF(0.f, 0.f, 0.f, 0.f), + QRectF(0.f, 0.f, 0.f, 0.f) }; int _nWindows = 1; const std::array _colorsForWindows; diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h b/apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h index c4a1be0cb9..5e4f62d370 100644 --- a/apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h +++ b/apps/OpenSpace/ext/launcher/include/sgctedit/orientationdialog.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/sgctedit/settingswidget.h b/apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h index 208da42673..1ff9fd8578 100644 --- a/apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h +++ b/apps/OpenSpace/ext/launcher/include/sgctedit/settingswidget.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -63,7 +63,7 @@ public: bool showUiOnFirstWindow() const; private: - sgct::quat _orientationValue = { 0.f, 0.f, 0.f, 0.f }; + sgct::quat _orientationValue = sgct::quat(0.f, 0.f, 0.f, 0.f); QCheckBox* _checkBoxVsync = nullptr; QCheckBox* _showUiOnFirstWindow = nullptr; }; diff --git a/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h b/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h index a9f40fdab0..b3a0e7983d 100644 --- a/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h +++ b/apps/OpenSpace/ext/launcher/include/sgctedit/sgctedit.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/include/sgctedit/windowcontrol.h b/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h index d8a8c7f0be..71f155823c 100644 --- a/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h +++ b/apps/OpenSpace/ext/launcher/include/sgctedit/windowcontrol.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/src/filesystemaccess.cpp b/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp index db4ef759f6..e48303b9b9 100644 --- a/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp +++ b/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp index e30340f275..9c428b52e0 100644 --- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp +++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -158,7 +158,7 @@ namespace { std::ofstream outFile; try { outFile.open(path, std::ofstream::out); - sgct::config::GeneratorVersion genEntry = { + sgct::config::GeneratorVersion genEntry = sgct::config::GeneratorVersion{ "OpenSpace", OPENSPACE_VERSION_MAJOR, OPENSPACE_VERSION_MINOR diff --git a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp index 4e7fdfb890..14c3174cbe 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/actiondialog.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -97,9 +97,9 @@ void ActionDialog::createWidgets() { // *----------------------*---------------*----------------* // | [+] [-] | | | Row 14 // *----------------------*---------------*----------------* - // |=======================================================| Row 14 + // |=======================================================| Row 16 // *----------------------*---------------*----------------* - // | | | Row 15 + // | | | Row 17 // *----------------------*---------------*----------------* QGridLayout* layout = new QGridLayout(this); @@ -113,18 +113,18 @@ void ActionDialog::createWidgets() { clearKeybindingFields(); layout->addWidget(new Line, 16, 0, 1, 3); - - QDialogButtonBox* buttonBox = new QDialogButtonBox; - buttonBox->setStandardButtons(QDialogButtonBox::Save | QDialogButtonBox::Cancel); + + _mainButtons = new QDialogButtonBox; + _mainButtons->setStandardButtons(QDialogButtonBox::Save | QDialogButtonBox::Cancel); QObject::connect( - buttonBox, &QDialogButtonBox::accepted, + _mainButtons, &QDialogButtonBox::accepted, this, &ActionDialog::applyChanges ); QObject::connect( - buttonBox, &QDialogButtonBox::rejected, + _mainButtons, &QDialogButtonBox::rejected, this, &ActionDialog::reject ); - layout->addWidget(buttonBox, 17, 2, Qt::AlignRight); + layout->addWidget(_mainButtons, 17, 2, Qt::AlignRight); } void ActionDialog::createActionWidgets(QGridLayout* layout) { @@ -523,12 +523,19 @@ void ActionDialog::actionSelected() { _actionWidgets.addButton->setEnabled(false); _actionWidgets.removeButton->setEnabled(true); _actionWidgets.saveButtons->setEnabled(true); + if (_mainButtons) { + _mainButtons->setEnabled(false); + } } else { // No action selected _actionWidgets.addButton->setEnabled(true); _actionWidgets.removeButton->setEnabled(false); _actionWidgets.saveButtons->setEnabled(false); + //Keybinding panel must also be in valid state to re-enable main start button + if (_mainButtons && !_keybindingWidgets.saveButtons->isEnabled()) { + _mainButtons->setEnabled(true); + } } } @@ -587,7 +594,11 @@ void ActionDialog::actionSaved() { action->name = _actionWidgets.name->text().toStdString(); - action->guiPath = _actionWidgets.guiPath->text().toStdString(); + std::string guiPath = _actionWidgets.guiPath->text().toStdString(); + if (!guiPath.starts_with('/')) { + guiPath = "/" + guiPath; + } + action->guiPath = guiPath; action->documentation = _actionWidgets.documentation->text().toStdString(); action->isLocal = _actionWidgets.isLocal->isChecked(); action->script = _actionWidgets.script->toPlainText().toStdString(); @@ -705,12 +716,19 @@ void ActionDialog::keybindingSelected() { _keybindingWidgets.saveButtons->button(QDialogButtonBox::Save)->setEnabled( _keybindingWidgets.key->currentIndex() > 0 ); + if (_mainButtons) { + _mainButtons->setEnabled(false); + } } else { // No keybinding selected _keybindingWidgets.addButton->setEnabled(true); _keybindingWidgets.removeButton->setEnabled(false); _keybindingWidgets.saveButtons->setEnabled(false); + //Action panel must also be in valid state to re-enable main start button + if (_mainButtons && !_actionWidgets.saveButtons->isEnabled()) { + _mainButtons->setEnabled(true); + } } } @@ -719,6 +737,16 @@ void ActionDialog::keybindingActionSelected(int) { } void ActionDialog::keybindingSaved() { + if (_keybindingWidgets.key->currentIndex() == -1) { + QMessageBox::critical(this, "Missing key", "Key must have an assignment"); + return; + } + //A selection can be made from the combo box without typing text, but selecting from + //the combo will fill the text, so using the text box as criteria covers both cases. + if (_keybindingWidgets.actionText->text().isEmpty()) { + QMessageBox::critical(this, "Missing action", "Key action must not be empty"); + return; + } Profile::Keybinding* keybinding = selectedKeybinding(); ghoul_assert(keybinding, "There must be a selected keybinding at this point"); @@ -758,5 +786,11 @@ void ActionDialog::clearKeybindingFields() { } void ActionDialog::keybindingRejected() { + bool isKeyEmpty = (_keybindingsData.back().key.key == Key::Unknown); + bool isActionEmpty = _keybindingsData.back().action.empty(); + if (isKeyEmpty || isActionEmpty) { + delete _keybindingWidgets.list->takeItem(_keybindingWidgets.list->count() - 1); + _keybindingsData.erase(_keybindingsData.begin() + _keybindingsData.size() - 1); + } clearKeybindingFields(); } diff --git a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp index 63c8ead4dc..90d50a4fb1 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/src/profile/assetedit.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp index cf95c26231..0fb0de2345 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/assetedit.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp index f1b14d65cd..897b7c2e5f 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/src/profile/assettreeitem.cpp b/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp index 793c5ec523..d68dc2d249 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/src/profile/assettreemodel.cpp b/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp index ff9107abd1..467a61437c 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -156,7 +156,10 @@ void AssetTreeModel::importModelData(const std::string& assetBasePath, std::string assetList = assets.useQtFileSystemModelToTraverseDir(assetBasePath); assetList += assets.useQtFileSystemModelToTraverseDir(userAssetBasePath, true); std::istringstream iss(assetList); - ImportElement rootElem = { "", 0, false }; + ImportElement rootElem = { + .line = "", + .level = 0, + }; if (importGetNextLine(rootElem, iss)) { importInsertItem(iss, _rootItem.get(), rootElem, 0); diff --git a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp index 754c34149d..fdcf33ea8d 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -384,11 +384,11 @@ void CameraDialog::approved() { !_navState.upY->text().isEmpty() && !_navState.upZ->text().isEmpty()) { - glm::dvec3 u = { + glm::dvec3 u = glm::dvec3( _navState.upX->text().toDouble(), _navState.upY->text().toDouble(), _navState.upZ->text().toDouble() - }; + ); nav.up = u; } else { diff --git a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp index fd1f88690a..8b20e26989 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/src/profile/horizonsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp index d10250b064..d47e31338c 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/src/profile/line.cpp b/apps/OpenSpace/ext/launcher/src/profile/line.cpp index d822113349..1b9bf42e8a 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/line.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/line.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/src/profile/marknodesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp index a81c4fa5ee..ea2aeec8e3 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/src/profile/metadialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp index 61a8c23157..5158df2029 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/src/profile/modulesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp index 0c40d3089f..cd345d04f4 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -37,7 +37,11 @@ using namespace openspace; namespace { - const Profile::Module Blank = { "", "", "" }; + const Profile::Module Blank = { + .name = "", + .loadedInstruction = std::nullopt, + .notLoadedInstruction = std::nullopt + }; } // namespace ModulesDialog::ModulesDialog(QWidget* parent, diff --git a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp index 17b5fd21b3..da72404dc5 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -184,9 +184,8 @@ void ProfileEdit::createWidgets(const std::string& profileName) { QGridLayout* container = new QGridLayout; container->setColumnStretch(1, 1); - _keybindingsLabel = new QLabel("Keybindings"); + _keybindingsLabel = new QLabel("Actions & Keybindings"); _keybindingsLabel->setObjectName("heading"); - _keybindingsLabel->setWordWrap(true); container->addWidget(_keybindingsLabel, 0, 0); QPushButton* keybindingsProperties = new QPushButton("Edit"); @@ -345,7 +344,9 @@ void ProfileEdit::initSummaryTextForEachCategory() { QString::fromStdString(summarizeProperties(_profile.properties)) ); - _keybindingsLabel->setText(labelText(_profile.keybindings.size(), "Keybindings")); + _keybindingsLabel->setText( + labelText(_profile.keybindings.size(), "Actions & Keybindings") + ); _keybindingsEdit->setText(QString::fromStdString( summarizeKeybindings(_profile.keybindings, _profile.actions) )); diff --git a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp index 17b56745cb..4ada1a6408 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/src/profile/scriptlogdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp index b1b5c4db3c..0089fd518d 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -41,6 +42,7 @@ ScriptlogDialog::ScriptlogDialog(QWidget* parent) : QDialog(parent) + , _scriptLogFile(openspace::global::configuration->scriptLog) { setWindowTitle("Scriptlog"); createWidgets(); @@ -63,10 +65,31 @@ void ScriptlogDialog::createWidgets() { QGridLayout* layout = new QGridLayout(this); { QLabel* heading = new QLabel(QString::fromStdString(fmt::format( - "Choose commands from \"{}\"", openspace::global::configuration->scriptLog + "Choose commands from \"{}\"", _scriptLogFile ))); heading->setObjectName("heading"); layout->addWidget(heading, 0, 0, 1, 2); + + QPushButton* open = new QPushButton; + open->setIcon(open->style()->standardIcon(QStyle::SP_FileIcon)); + connect( + open, &QPushButton::clicked, + [this, heading]() { + QString file = QFileDialog::getOpenFileName( + this, + "Select log file", + "", + "*.txt" + ); + _scriptLogFile = file.toStdString(); + + heading->setText(QString::fromStdString(fmt::format( + "Choose commands from \"{}\"", _scriptLogFile + ))); + loadScriptFile(); + } + ); + layout->addWidget(open, 0, 1, Qt::AlignRight); } _filter = new QLineEdit; @@ -100,7 +123,9 @@ void ScriptlogDialog::createWidgets() { } void ScriptlogDialog::loadScriptFile() { - std::string log = absPath(openspace::global::configuration->scriptLog).string(); + _scripts.clear(); + + std::string log = absPath(_scriptLogFile).string(); QFile file(QString::fromStdString(log)); if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { QTextStream in(&file); diff --git a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp index befc0ea2ca..63557a3dcd 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/src/sgctedit/displaywindowunion.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp index e08b11b5ad..0f420d9de1 100644 --- a/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp +++ b/apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -49,7 +49,8 @@ void DisplayWindowUnion::createWidgets(int nMaxWindows, { // Add all window controls (some will be hidden from GUI initially) for (int i = 0; i < nMaxWindows; ++i) { - const int monitorNumForThisWindow = (nMaxWindows > 3 && i >= 2) ? 1 : 0; + const int monitorNumForThisWindow = + (monitorResolutions.size() > 1 && i >= 2) ? 1 : 0; WindowControl* ctrl = new WindowControl( monitorNumForThisWindow, diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp index cf96e07307..ebb1b80c0c 100644 --- a/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp +++ b/apps/OpenSpace/ext/launcher/src/sgctedit/monitorbox.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -31,7 +31,7 @@ namespace { constexpr int WindowOpacity = 170; QRectF computeUnion(const std::vector& monitorResolutions) { - QRectF res = { 0.f, 0.f, 0.f, 0.f }; + QRectF res = QRectF(0.f, 0.f, 0.f, 0.f); for (const QRect& m : monitorResolutions) { res |= m; } @@ -145,12 +145,12 @@ void MonitorBox::paintEvent(QPaintEvent*) { void MonitorBox::windowDimensionsChanged(unsigned int mIdx, unsigned int wIdx, const QRectF& newDimensions) { - _windowRendering[wIdx] = { + _windowRendering[wIdx] = QRectF( _monitorDimensionsScaled[mIdx].x() + newDimensions.left() * _monitorScaleFactor, _monitorDimensionsScaled[mIdx].y() + newDimensions.top() * _monitorScaleFactor, newDimensions.width() * _monitorScaleFactor, newDimensions.height() * _monitorScaleFactor - }; + ); update(); } diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp index e3f4a9f982..008281d863 100644 --- a/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/sgctedit/orientationdialog.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/src/sgctedit/settingswidget.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp index 2a57223b09..99ee2a9f6a 100644 --- a/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp +++ b/apps/OpenSpace/ext/launcher/src/sgctedit/settingswidget.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/ext/launcher/src/sgctedit/sgctedit.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp index 2f5eae4166..f4ec6f5888 100644 --- a/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp +++ b/apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -39,7 +39,7 @@ #include namespace { - constexpr QRect MonitorWidgetSize = { 0, 0, 500, 500 }; + constexpr QRect MonitorWidgetSize = QRect(0, 0, 500, 500); constexpr int MaxNumberWindows = 4; // Returns true if the windows are not ordered correctly. 'Correct' in this means that @@ -48,10 +48,10 @@ namespace { // https://github.com/OpenSpace/OpenSpace/issues/507 // is fixed bool hasWindowIssues(const sgct::config::Cluster& cluster) { - sgct::ivec2 size = { + sgct::ivec2 size = sgct::ivec2( std::numeric_limits::max(), std::numeric_limits::max() - }; + ); for (const sgct::config::Window& window : cluster.nodes.front().windows) { if (window.size.x <= size.x && window.size.y <= size.y) { size = window.size; @@ -96,7 +96,7 @@ void SgctEdit::createWidgets(const std::vector& monitorSizes) { QBoxLayout* layout = new QVBoxLayout(this); layout->setSizeConstraint(QLayout::SetFixedSize); - sgct::quat orientation = { 0.f, 0.f, 0.f, 0.f }; + sgct::quat orientation = sgct::quat(0.f, 0.f, 0.f, 0.f); if (_cluster.scene.has_value() && _cluster.scene->orientation.has_value()) { orientation = *_cluster.scene->orientation; } @@ -283,7 +283,7 @@ sgct::config::Cluster SgctEdit::generateConfiguration() const { sgct::config::User user; user.eyeSeparation = 0.065f; - user.position = { 0.f, 0.f, 4.f }; + user.position = sgct::vec3(0.f, 0.f, 4.f); cluster.users = { user }; return cluster; diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp index 27c9cf99ff..b1bdd0b3ae 100644 --- a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp +++ b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -52,10 +52,10 @@ namespace { }; constexpr std::array DefaultWindowSizes = { - QRectF{ 50.f, 50.f, 1280.f, 720.f }, - QRectF{ 150.f, 150.f, 1280.f, 720.f }, - QRectF{ 50.f, 50.f, 1280.f, 720.f }, - QRectF{ 150.f, 150.f, 1280.f, 720.f } + QRectF(50.f, 50.f, 1280.f, 720.f), + QRectF(150.f, 150.f, 1280.f, 720.f), + QRectF(50.f, 50.f, 1280.f, 720.f), + QRectF(150.f, 150.f, 1280.f, 720.f) }; constexpr int LineEditWidthFixedWindowSize = 50; @@ -707,17 +707,17 @@ sgct::config::Projections WindowControl::generateProjectionInformation() const { sgct::config::Window WindowControl::generateWindowInformation() const { sgct::config::Window window; - window.size = { _sizeX->text().toInt(), _sizeY->text().toInt() }; + window.size = sgct::ivec2(_sizeX->text().toInt(), _sizeY->text().toInt()); QRect resolution = _monitorResolutions[_monitor->currentIndex()]; - window.pos = { + window.pos = sgct::ivec2( resolution.x() + _offsetX->text().toInt(), resolution.y() + _offsetY->text().toInt() - }; + ); sgct::config::Viewport vp; vp.isTracked = true; - vp.position = { 0.f, 0.f }; - vp.size = { 1.f, 1.f }; + vp.position = sgct::vec2(0.f, 0.f); + vp.size = sgct::vec2(1.f, 1.f); vp.projection = generateProjectionInformation(); window.viewports.push_back(vp); diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index f48a48307f..704742c4c1 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit f48a48307fa76c0ec9a9db0423ae417cf301f76f +Subproject commit 704742c4c10254fa5d8415b1aab6e0b673aa1ab6 diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp index 3ef64126fc..d012932ca5 100644 --- a/apps/OpenSpace/main.cpp +++ b/apps/OpenSpace/main.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -912,7 +913,9 @@ void setSgctDelegateFunctions() { sgctDelegate.setHorizFieldOfView = [](float hFovDeg) { ZoneScoped - Engine::instance().windows().front()->setHorizFieldOfView(hFovDeg); + for (std::unique_ptr const& w : Engine::instance().windows()) { + w->setHorizFieldOfView(hFovDeg); + } }; #ifdef WIN32 sgctDelegate.getNativeWindowHandle = [](size_t windowIndex) -> void* { @@ -1106,7 +1109,7 @@ int main(int argc, char* argv[]) { "current working directory" )); - parser.addCommand(std::make_unique>( + parser.addCommand(std::make_unique>( commandlineArguments.configurationOverride, "--config", "-c", "Provides the ability to pass arbitrary Lua code to the application that will be " "evaluated after the configuration file has been loaded but before the other " @@ -1179,10 +1182,14 @@ int main(int argc, char* argv[]) { // Loading configuration from disk LDEBUG("Loading configuration from disk"); + std::string override; + for (const std::string& arg : commandlineArguments.configurationOverride) { + override += arg + ";"; + } *global::configuration = configuration::loadConfigurationFromFile( configurationFilePath.string(), size, - commandlineArguments.configurationOverride + override ); // Determining SGCT configuration file diff --git a/apps/Sync/main.cpp b/apps/Sync/main.cpp index 255c587ee0..2de95d3440 100644 --- a/apps/Sync/main.cpp +++ b/apps/Sync/main.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/main.cpp b/apps/TaskRunner/main.cpp index 663e27140d..bc4190f4f6 100644 --- a/apps/TaskRunner/main.cpp +++ b/apps/TaskRunner/main.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/data/assets/base.asset b/data/assets/base.asset index ba2735a083..5d304ca709 100644 --- a/data/assets/base.asset +++ b/data/assets/base.asset @@ -4,10 +4,6 @@ asset.require("./base_blank") --- Modules and component settings -asset.require("modules/exoplanets/exoplanets") -asset.require("modules/skybrowser/skybrowser") - -- Specifying which other assets should be loaded in this scene asset.require("scene/solarsystem/sun/sun") asset.require("scene/solarsystem/sun/glare") diff --git a/data/assets/base_blank.asset b/data/assets/base_blank.asset index ddd8ebe9ed..00611bc658 100644 --- a/data/assets/base_blank.asset +++ b/data/assets/base_blank.asset @@ -1,7 +1,5 @@ -- This is a blank scene that that just sets up the default menus/dasboard/keys, etc. -local propertyHelper = asset.require("util/property_helper") - -- Specifying which other assets should be loaded in this scene asset.require("spice/base") @@ -18,6 +16,11 @@ asset.require("util/dpiscaling") -- Load the images required for the launcher to show up asset.require("util/launcher_images") +-- Modules and component settings +asset.require("modules/exoplanets/exoplanets") +asset.require("modules/skybrowser/skybrowser") + + asset.onInitialize(function () webGui.setCefRoute("onscreen") openspace.setDefaultGuiSorting() diff --git a/data/assets/customization/localbookmarks.csv b/data/assets/customization/localbookmarks.csv index 138adef2cf..d12976e610 100644 --- a/data/assets/customization/localbookmarks.csv +++ b/data/assets/customization/localbookmarks.csv @@ -1,2 +1,2 @@ Group (optional),Name (required),Globe (optional),Lat (required if globe),Lon (required if globe),Altitude (optional if globe),x (required if not globe),y (required if not globe),z (required if not globe),Scale (optional),LineWidth (optional) -NASA,Kenedy Space Center,Earth,28.6658276,-80.70282839,,,,,, +NASA,Kennedy Space Center,Earth,28.6658276,-80.70282839,,,,,, diff --git a/data/assets/educational/scale/eiffeltower.asset b/data/assets/educational/scale/eiffeltower.asset index 226a41b6d5..097da8f3b5 100644 --- a/data/assets/educational/scale/eiffeltower.asset +++ b/data/assets/educational/scale/eiffeltower.asset @@ -65,12 +65,36 @@ local updatePositionAction = { IsLocal = false } +local resetPositionAction = { + Identifier = "os.reset_eiffel_tower", + Name = "Reset Eiffel Tower position", + Command = [[ + -- same position as above + local lat = 48.85824 + local lon = 2.29448 + local globe = ']] .. earthAsset.Earth.Identifier .. [[' + openspace.setParent('eiffelTower', globe) + openspace.setPropertyValueSingle('Scene.eiffelTower.Translation.Globe', globe); + openspace.setPropertyValueSingle('Scene.eiffelTower.Translation.Latitude', lat); + openspace.setPropertyValueSingle('Scene.eiffelTower.Translation.Longitude', lon); + openspace.setPropertyValueSingle('Scene.eiffelTower.Rotation.Globe', globe); + openspace.setPropertyValueSingle('Scene.eiffelTower.Rotation.Latitude', lat); + openspace.setPropertyValueSingle('Scene.eiffelTower.Rotation.Longitude', lon); + ]], + Documentation = "Updates the Eiffel Tower position based on the globe location of the camera", + GuiPath = "/Scale Objects", + IsLocal = false +} + + asset.onInitialize(function() openspace.addSceneGraphNode(eiffelTower) openspace.action.registerAction(updatePositionAction) + openspace.action.registerAction(resetPositionAction) end) asset.onDeinitialize(function() + openspace.action.removeAction(resetPositionAction) openspace.action.removeAction(updatePositionAction) openspace.removeSceneGraphNode(eiffelTower) end) diff --git a/data/assets/examples/dashboarditems.asset b/data/assets/examples/dashboarditems.asset index 045e0d21f7..a5216dbb19 100644 --- a/data/assets/examples/dashboarditems.asset +++ b/data/assets/examples/dashboarditems.asset @@ -58,6 +58,11 @@ local elapsed_time = { ReferenceTime = "2022-10-12 12:00:00" } +local input_state = { + Type = "DashboardItemInputState", + Identifier = "InputState" +} + asset.onInitialize(function() openspace.dashboard.addDashboardItem(angle) openspace.dashboard.addDashboardItem(date) @@ -68,9 +73,11 @@ asset.onInitialize(function() openspace.dashboard.addDashboardItem(mission) openspace.dashboard.addDashboardItem(property_value) openspace.dashboard.addDashboardItem(elapsed_time) + openspace.dashboard.addDashboardItem(input_state) end) asset.onDeinitialize(function() + openspace.dashboard.removeDashboardItem(input_state) openspace.dashboard.removeDashboardItem(elapsed_time) openspace.dashboard.removeDashboardItem(property_value) openspace.dashboard.removeDashboardItem(mission) diff --git a/data/assets/examples/modelshader/model_fs.glsl b/data/assets/examples/modelshader/model_fs.glsl index b79b1bb406..be9f2558fc 100644 --- a/data/assets/examples/modelshader/model_fs.glsl +++ b/data/assets/examples/modelshader/model_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/data/assets/examples/modelshader/model_vs.glsl b/data/assets/examples/modelshader/model_vs.glsl index 1f99ad904e..8413d4f4c1 100644 --- a/data/assets/examples/modelshader/model_vs.glsl +++ b/data/assets/examples/modelshader/model_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/data/assets/global/localbookmarks.asset b/data/assets/global/localbookmarks.asset index 9800bb4bbc..781614d7da 100644 --- a/data/assets/global/localbookmarks.asset +++ b/data/assets/global/localbookmarks.asset @@ -5,13 +5,15 @@ local nodes = bookmarkHelper.getBookmarks("Local Bookmarks", "${ASSETS}/customiz asset.onInitialize(function() for _, n in ipairs(nodes) do - openspace.addSceneGraphNode(n) + pcall(openspace.addSceneGraphNode, n) end end) asset.onDeinitialize(function() for _, n in ipairs(nodes) do - openspace.removeSceneGraphNode(n) + if openspace.hasSceneGraphNode(n.Identifier) then + openspace.removeSceneGraphNode(n) + end end end) diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset index 1ad5e83126..97ae62244f 100644 --- a/data/assets/scene/digitaluniverse/grids.asset +++ b/data/assets/scene/digitaluniverse/grids.asset @@ -17,9 +17,10 @@ local speck = asset.syncedResource({ Name = "Grids Speck Files", Type = "HttpSynchronization", Identifier = "digitaluniverse_grids_speck", - Version = 2 + Version = 3 }) +local lightHour = 1.0792528488E12 local lightDay = 2.59020684E13 local lightMonth = 7.771E14 local lightYear = 9.4605284E15 @@ -236,6 +237,37 @@ local galacticLabels = { } } +local plane1lh = { + Identifier = "1lhGrid", + Parent = transforms.SolarSystemBarycenter.Name, + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = eclipticRotationMatrix + } + }, + Renderable = { + Type = "RenderableGrid", + Enabled = false, + Labels = { + File = speck .. "1lh.label", + Color = { 0.0, 0.2, 0.5 }, + Size = 9.5, + MinMaxSize = { 0, 30 }, + Unit = "Km" + }, + Opacity = 0.4, + Color = { 0.1, 0.5, 0.6 }, + LineWidth = 2.0, + Segments = { 20, 20 }, + Size = { 2*lightHour, 2*lightHour } + }, + GUI = { + Name = "1lh Grid", + Path = "/Other/Grids" + } +} + local plane1ld = { Identifier = "1ldGrid", Parent = transforms.SolarSystemBarycenter.Name, @@ -585,7 +617,7 @@ local plane20Gly = { local nodes = { radio, oort, ecliptic, eclipticLabels, equatorial, equatorialLabels, - galactic, galacticLabels, plane1ld, plane1lm, plane1ly, plane10ly, + galactic, galacticLabels, plane1lh, plane1ld, plane1lm, plane1ly, plane10ly, plane100ly, plane1kly, plane10kly, plane100kly, plane1Mly, plane10Mly, plane100Mly, plane20Gly } diff --git a/data/assets/scene/digitaluniverse/milkyway.asset b/data/assets/scene/digitaluniverse/milkyway.asset index 93c9efb353..4f17197c00 100644 --- a/data/assets/scene/digitaluniverse/milkyway.asset +++ b/data/assets/scene/digitaluniverse/milkyway.asset @@ -31,7 +31,7 @@ local plane = { }, GUI = { Name = "Milky Way Galaxy Image", - Path = "/Universe/Galaxies", + Path = "/Milky Way", Description = [[Census: 1 image. DU Version 2.2.
The exterior view of the Milky Way is simply a two-dimensional image. The image is that of NGC 1232, a galaxy thought to resemble our Milky Way. The image has been properly sized diff --git a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset index be5978a829..5346301b1b 100644 --- a/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset +++ b/data/assets/scene/digitaluniverse/milkyway_arm_labels.asset @@ -31,7 +31,7 @@ local plane = { }, GUI = { Name = "Milky Way Arms Labels", - Path = "/Universe/Galaxies", + Path = "/Milky Way", Description = [[Census: 1 image. DU Version: 1.2. This image contains labels for the Milky Way's spiral arms. We label them in this manner ("hard coding" the labels into an image rather than having native labels) so that they can retain diff --git a/data/assets/scene/milkyway/gaia/apogee.asset b/data/assets/scene/milkyway/gaia/apogee.asset index f36e400df5..bec4709de4 100644 --- a/data/assets/scene/milkyway/gaia/apogee.asset +++ b/data/assets/scene/milkyway/gaia/apogee.asset @@ -34,7 +34,7 @@ local gaia_abundance_apogee = { ColorRange = { { -0.8, 0.6 } }, -- ShapeTexture = textures .. "disc.png", ColorMap = colormaps .. "colorbv.cmap", - OtherDataColorMap = colormaps .. "RainbowGradient.cmap", + OtherDataColorMap = colormaps .. "rainbowgradient.cmap", StaticFilter = -9999, StaticFilterReplacement = 0.0, DataMapping = { diff --git a/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset b/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset index b83394f81e..357723674f 100644 --- a/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset +++ b/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset @@ -5,12 +5,16 @@ local gaia618Destination = asset.syncedResource({ Name = "Gaia DR2 618M Octree", Type = "HttpSynchronization", Identifier = "gaia_stars_618M_octree", - Version = 1 + Version = 1, + Unzip = { + UnzipFiles = true, + Destination = "data" + } }) local gaia618DestinationExtracted = gaia618Destination .. "data"; -- Download the full DR2 dataset with 24 values per star (preprocessed with theReadFitsTask (gaia_read.task) into 8 binary files). --- From these files new subsets can be created with the ConstructOctreeTask (gaia_octree.task). +-- From these files new subsets can be created with the ConstructOctreeTask (gaia_octree.task). -- Total size of download is 151 GB. local gaiaFull = asset.syncedResource({ Name = "Gaia DR2 Full Raw", @@ -19,13 +23,6 @@ local gaiaFull = asset.syncedResource({ Version = 1 }) -asset.onInitialize(function() - if not openspace.directoryExists(gaia618DestinationExtracted) then - openspace.printInfo("Extracted Gaia dataset") - openspace.unzipFile(gaia618Destination .. "DR2_full_Octree[50kSPN,500dist]_50,50.zip", gaia618DestinationExtracted, true) - end -end) - asset.export("GaiaDR2_618M", gaia618DestinationExtracted) asset.export("GaiaFullDataset", gaiaFull) diff --git a/data/assets/scene/milkyway/gaia/galah.asset b/data/assets/scene/milkyway/gaia/galah.asset index 1b00d53a21..aa879fae3b 100644 --- a/data/assets/scene/milkyway/gaia/galah.asset +++ b/data/assets/scene/milkyway/gaia/galah.asset @@ -33,7 +33,7 @@ local gaia_abundance_galah = { ColorOption = "Other Data", OtherData = "FeH", ColorMap = colormaps .. "colorbv.cmap", - OtherDataColorMap = colormaps .. "RainbowGradient.cmap", + OtherDataColorMap = colormaps .. "rainbowgradient.cmap", ColorRange = { { -0.8, 0.6 } }, StaticFilter = -9999, StaticFilterReplacement = 0.0, diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset index 39f60d681e..bb1fcc84a0 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset @@ -50,11 +50,38 @@ local Charon = { } } +local CharonLabel = { + Identifier = "CharonLabel", + Parent = Charon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Charon", + FontSize = 70.0, + Size = 6.0, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Mm", + FadeDistances = { 250.0, 500.0 }, + FadeWidths = { 150.0, 250.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = "Charon Label", + Path = "/Solar System/Dwarf Planets/Pluto/Moons", + Description = "Label for Pluto's moon Charon" + } +} + asset.onInitialize(function() openspace.addSceneGraphNode(Charon) + openspace.addSceneGraphNode(CharonLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(CharonLabel) openspace.removeSceneGraphNode(Charon) end) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset index 7a3f994a6a..f78c88fe79 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/hydra.asset @@ -52,12 +52,39 @@ local HydraTrail = { } } +local HydraLabel = { + Identifier = "HydraLabel", + Parent = Hydra.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Hydra", + FontSize = 70.0, + Size = 6.0, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Mm", + FadeDistances = { 250.0, 1000.0 }, + FadeWidths = { 150.0, 500.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = "Cheron Label", + Path = "/Solar System/Dwarf Planets/Pluto/Moons", + Description = "Label for Pluto's moon Hydra" + } +} + asset.onInitialize(function() openspace.addSceneGraphNode(Hydra) openspace.addSceneGraphNode(HydraTrail) + openspace.addSceneGraphNode(HydraLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(HydraLabel) openspace.removeSceneGraphNode(HydraTrail) openspace.removeSceneGraphNode(Hydra) end) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset index 1d9adb8736..b10d3575c3 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/kerberos.asset @@ -51,12 +51,39 @@ local KerberosTrail = { } } +local KerberosLabel = { + Identifier = "KerberosLabel", + Parent = Kerberos.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Kerberos", + FontSize = 70.0, + Size = 6.0, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Mm", + FadeDistances = { 250.0, 1000.0 }, + FadeWidths = { 150.0, 500.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = "Cheron Label", + Path = "/Solar System/Dwarf Planets/Pluto/Moons", + Description = "Label for Pluto's moon Kerberos" + } +} + asset.onInitialize(function() openspace.addSceneGraphNode(Kerberos) openspace.addSceneGraphNode(KerberosTrail) + openspace.addSceneGraphNode(KerberosLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(KerberosLabel) openspace.removeSceneGraphNode(KerberosTrail) openspace.removeSceneGraphNode(Kerberos) end) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset index a1f1715e1d..928ae5b498 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/nix.asset @@ -51,12 +51,39 @@ local NixTrail = { } } +local NixLabel = { + Identifier = "NixLabel", + Parent = Nix.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Nix", + FontSize = 70.0, + Size = 6.0, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Mm", + FadeDistances = { 250.0, 1000.0 }, + FadeWidths = { 150.0, 500.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = "Cheron Label", + Path = "/Solar System/Dwarf Planets/Pluto/Moons", + Description = "Label for Pluto's moon Nix" + } +} + asset.onInitialize(function() openspace.addSceneGraphNode(Nix) openspace.addSceneGraphNode(NixTrail) + openspace.addSceneGraphNode(NixLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(NixLabel) openspace.removeSceneGraphNode(NixTrail) openspace.removeSceneGraphNode(Nix) end) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset index 9503ffd8e2..0e7f122c95 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/minor/styx.asset @@ -50,12 +50,39 @@ local StyxTrail = { } } +local StyxLabel = { + Identifier = "StyxLabel", + Parent = Styx.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Styx", + FontSize = 70.0, + Size = 6.0, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Mm", + FadeDistances = { 250.0, 1000.0 }, + FadeWidths = { 150.0, 500.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = "Cheron Label", + Path = "/Solar System/Dwarf Planets/Pluto/Moons", + Description = "Label for Pluto's moon Styx" + } +} + asset.onInitialize(function() openspace.addSceneGraphNode(Styx) openspace.addSceneGraphNode(StyxTrail) + openspace.addSceneGraphNode(StyxLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(StyxLabel) openspace.removeSceneGraphNode(StyxTrail) openspace.removeSceneGraphNode(Styx) end) diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset index 6489f9b3f9..f9a8c5e4eb 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset @@ -57,10 +57,14 @@ local PlutoLabel = { Type = "RenderableLabel", Text = "Pluto", FontSize = 70.0, - Size = 9.05, + Size = 9.10, MinMaxSize = { 1, 100 }, BlendMode = "Additive", - OrientationOption = "Camera View Direction" + OrientationOption = "Camera View Direction", + EnableFading = true, + FadeUnit = "au", + FadeDistances = { 2.0, 120.0 }, + FadeWidths = { 1.0, 150.0 } }, Tag = { "solarsystem_labels" }, GUI = { diff --git a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset index b472140ac4..d64a2cdacf 100644 --- a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset +++ b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_batsrus.asset @@ -12,9 +12,16 @@ local fieldlineData = asset.syncedResource({ Name = "Fieldlines Data BATSRUS", Type = "HttpSynchronization", Identifier = "sun_earth_event_july_2012-batsrus", - Version = 1 + Version = 1, + UnzipFiles = true }) +local unzippedDataDestination = { + openClosed = fieldlineData .. "magnetic_fieldlines-open_closed", + velocityFlow = fieldlineData .. "velocity_flowlines-upstream", + asherStatic = fieldlineData .. "ashers_static_seeds" +} + local loop = { Documentation = "Sets time to start of data, sets higher delta time and loops back from start, when at end of data", GuiPath = "2012July", @@ -30,12 +37,6 @@ local batsrusCurrentColorTable = transferFunctions .. "batsrus_current2.txt" local batsrusVelocityColorTable = transferFunctions .. "batsrus_velocity.txt" local batsrusTopologyColorTable = transferFunctions .. "batsrus_topology.txt" -local unzippedDataDestination = { - openClosed = fieldlineData .. "magnetic_fieldlines-open_closed", - velocityFlow = fieldlineData .. "velocity_flowlines-upstream", - asherStatic = fieldlineData .. "ashers_static_seeds" -} - local colorRanges = { { 0, 100000000 }, { 0, 60 }, @@ -131,19 +132,6 @@ local BatsrusAsherStaticSeedsFlowLines = { asset.onInitialize(function () openspace.action.registerAction(loop) - if not openspace.directoryExists(unzippedDataDestination.openClosed) then - openspace.printInfo("Extracting " .. "Fieldlines from Batsrus model of 2012 event") - openspace.unzipFile(fieldlineData .. "magnetic_fieldlines-open_closed.zip", unzippedDataDestination.openClosed, true) - end - if not openspace.directoryExists(unzippedDataDestination.velocityFlow) then - openspace.printInfo("Extracting " .. "Fieldlines from Batsrus model of 2012 event") - openspace.unzipFile(fieldlineData .. "velocity_flowlines-upstream.zip", unzippedDataDestination.velocityFlow, true) - end - if not openspace.directoryExists(unzippedDataDestination.asherStatic) then - openspace.printInfo("Extracting " .. "Fieldlines from Batsrus model of 2012 event") - openspace.unzipFile(fieldlineData .. "ashers_static_seeds.zip", unzippedDataDestination.asherStatic, true) - end - openspace.addSceneGraphNode(BatsrusJ12OpenClosed) openspace.addSceneGraphNode(BatsrusJ12FlowLines) openspace.addSceneGraphNode(BatsrusAsherStaticSeedsFlowLines) diff --git a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_enlil.asset b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_enlil.asset index 65ffe33a0b..879251595a 100644 --- a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_enlil.asset +++ b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_enlil.asset @@ -8,11 +8,12 @@ local transferFunctions = asset.syncedResource({ Version = 1 }) -local fieldlineData = asset.syncedResource({ +local fieldlineData = asset.syncedResource({ Name = "Fieldlines Data ENLIL", Type = "HttpSynchronization", Identifier = "sun_earth_event_july_2012-enlil", - Version = 1 + Version = 1, + UnzipFiles = true }) local loop = { @@ -187,31 +188,6 @@ local ENLILStereoA = { asset.onInitialize(function () openspace.action.registerAction(loop) - if not openspace.directoryExists(unzippedDataDestination.EqPlane011AU1) then - openspace.printInfo("Extracting " .. "Fieldlines from ENLIL model of 2012 event") - openspace.unzipFile(fieldlineData .. "011AU_eq_plane_1.zip", unzippedDataDestination.EqPlane011AU1, true) - end - if not openspace.directoryExists(unzippedDataDestination.EqPlane011AU2) then - openspace.printInfo("Extracting " .. "Fieldlines from ENLIL model of 2012 event") - openspace.unzipFile(fieldlineData .. "011AU_eq_plane_2.zip", unzippedDataDestination.EqPlane011AU2, true) - end - if not openspace.directoryExists(unzippedDataDestination.Lat4011AU1) then - openspace.printInfo("Extracting " .. "Fieldlines from ENLIL model of 2012 event") - openspace.unzipFile(fieldlineData .. "011AU_lat4_1.zip", unzippedDataDestination.Lat4011AU1, true) - end - if not openspace.directoryExists(unzippedDataDestination.Lat4011AU2) then - openspace.printInfo("Extracting " .. "Fieldlines from ENLIL model of 2012 event") - openspace.unzipFile(fieldlineData .. "011AU_lat4_2.zip", unzippedDataDestination.Lat4011AU2, true) - end - if not openspace.directoryExists(unzippedDataDestination.Earth) then - openspace.printInfo("Extracting " .. "Fieldlines from ENLIL model of 2012 event") - openspace.unzipFile(fieldlineData .. "earth.zip", unzippedDataDestination.Earth, true) - end - if not openspace.directoryExists(unzippedDataDestination.StereoA) then - openspace.printInfo("Extracting " .. "Fieldlines from ENLIL model of 2012 event") - openspace.unzipFile(fieldlineData .. "stereoa.zip", unzippedDataDestination.StereoA, true) - end - openspace.addSceneGraphNode(ENLILSliceEqPlane11AU1) openspace.addSceneGraphNode(ENLILSliceEqPlane11AU2) openspace.addSceneGraphNode(ENLILSliceLat411AU1) diff --git a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset index fd3305fc0d..3a7119b376 100644 --- a/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset +++ b/data/assets/scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines_pfss.asset @@ -11,7 +11,8 @@ local fieldlineData = asset.syncedResource({ Name = "Fieldlines Data PFSS", Type = "HttpSynchronization", Identifier = "sun_earth_event_july_2012-pfss", - Version = 1 + Version = 1, + UnzipFiles = true }) local darkenSun = { @@ -64,11 +65,6 @@ local PFSS = { asset.onInitialize(function () openspace.action.registerAction(darkenSun) - if not openspace.directoryExists(PFSSPaths.SolarSoft) then - openspace.printInfo("Extracting " .. "Fieldlines from PFSS model of 2012 event") - openspace.unzipFile(fieldlineData .. "leilas_solar_soft.zip", PFSSPaths.SolarSoft, true) - end - openspace.addSceneGraphNode(PFSS) -- openspace.setPropertyValueSingle("Scene.FL_PFSS.Renderable.FlowEnabled", true) diff --git a/data/assets/scene/solarsystem/missions/jwst/jwst.asset b/data/assets/scene/solarsystem/missions/jwst/jwst.asset index 77ae6df0d6..b8a03fa668 100644 --- a/data/assets/scene/solarsystem/missions/jwst/jwst.asset +++ b/data/assets/scene/solarsystem/missions/jwst/jwst.asset @@ -2,6 +2,8 @@ local sun = asset.require("scene/solarsystem/sun/sun") local sunTransforms = asset.require("scene/solarsystem/sun/transforms") local transforms = asset.require("./transforms") asset.require("spice/base") +asset.require("scene/solarsystem/planets/earth/layers/colorlayers/terra_modis_temporal") +asset.require("scene/solarsystem/planets/earth/layers/colorlayers/esri_viirs_combo") local models = asset.syncedResource({ Name = "JWST Model", diff --git a/data/assets/scene/solarsystem/missions/jwst/point_jwst.asset b/data/assets/scene/solarsystem/missions/jwst/point_jwst.asset index 15a985153c..e03c257fc8 100644 --- a/data/assets/scene/solarsystem/missions/jwst/point_jwst.asset +++ b/data/assets/scene/solarsystem/missions/jwst/point_jwst.asset @@ -1,3 +1,5 @@ +asset.require("./jwst") + local point_jwst = { Identifier = "event.jwst.point", Name = "Point JWST", diff --git a/data/assets/scene/solarsystem/missions/jwst/timelapse.asset b/data/assets/scene/solarsystem/missions/jwst/timelapse.asset index 8ebc3c0956..d0c6737aa7 100644 --- a/data/assets/scene/solarsystem/missions/jwst/timelapse.asset +++ b/data/assets/scene/solarsystem/missions/jwst/timelapse.asset @@ -1,4 +1,6 @@ asset.require("spice/base") -- openspace.time.advancedTime depends on SPICE +asset.require("scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012") +asset.require("scene/solarsystem/planets/earth/atmosphere") -- Function to advance a time stamp in the given number of days, hours, minutes and -- seconds. returns the new time stamp diff --git a/data/assets/scene/solarsystem/missions/jwst/transforms.asset b/data/assets/scene/solarsystem/missions/jwst/transforms.asset index 95e3637ed1..edda98ec4f 100644 --- a/data/assets/scene/solarsystem/missions/jwst/transforms.asset +++ b/data/assets/scene/solarsystem/missions/jwst/transforms.asset @@ -1,6 +1,7 @@ local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms") local sunTransforms = asset.require("scene/solarsystem/sun/transforms") asset.require("spice/base") +asset.require("scene/solarsystem/planets/earth/lagrange_points/L2") local kernels = asset.syncedResource({ Name = "JWST Kernel", @@ -78,8 +79,12 @@ local JWSTRotation = { } } --- Reparent the JWSTPosition node when the data changes at 25 Jan 2022 +-- Reparent the JWSTPosition node when the data changes asset.onInitialize(function() + openspace.addSceneGraphNode(JWSTPosition) + openspace.addSceneGraphNode(JWSTRotation) + + -- Set correct parent during run-time openspace.scriptScheduler.loadScheduledScript( detachTime, [[openspace.setParent("JWSTPosition", "EarthCenter")]], @@ -95,8 +100,15 @@ asset.onInitialize(function() 1 -- Not default group, never clear this script ) - openspace.addSceneGraphNode(JWSTPosition) - openspace.addSceneGraphNode(JWSTRotation) + -- Set correct parent at the start + local now = openspace.time.currentTime(); + if now < openspace.time.convertTime(detachTime) then + openspace.setParent("JWSTPosition", "EarthIAU") + elseif now > openspace.time.convertTime(L2orbitInsertionTime) then + openspace.setParent("JWSTPosition", "L2") + else + openspace.setParent("JWSTPosition", "EarthCenter") + end end) asset.onDeinitialize(function() diff --git a/data/assets/scene/solarsystem/missions/rosetta/67p.asset b/data/assets/scene/solarsystem/missions/rosetta/67p.asset index da18a50436..b548f18445 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/67p.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/67p.asset @@ -20,10 +20,11 @@ local images = asset.syncedResource({ Name = "Rosetta Images", Type = "HttpSynchronization", Identifier = "rosettaimages", - Version = 2 + Version = 2, + UnzipFiles = true }) -local imagesDestination = images .. "images" +local imagesDestination = images .. "images_v1_v2" local Barycenter = { Identifier = "67PBarycenter", @@ -70,7 +71,7 @@ local Comet67P = { Spice = { "ROS_NAVCAM-A" } } }, - Target = { + Target = { Read = { "TARGET_NAME", "INSTRUMENT_HOST_NAME", @@ -130,15 +131,6 @@ local Trail67P = { } } -asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting Rosetta images") - openspace.unzipFile(images .. "images_v1_v2.zip", imagesDestination, true) - end -end) - - - asset.onInitialize(function() openspace.addSceneGraphNode(Barycenter) openspace.addSceneGraphNode(Comet67P) diff --git a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset index 268215e9e4..9b6b7561d4 100644 --- a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset +++ b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset @@ -1,5 +1,6 @@ local transforms = asset.require("./earth") - +asset.require("scene/solarsystem/sun/sun") +asset.require("./moon/moon") -- local earthEllipsoid = { 6378137.0, 6378137.0, 6356752.314245 } diff --git a/data/assets/scene/solarsystem/planets/earth/default_layers.asset b/data/assets/scene/solarsystem/planets/earth/default_layers.asset index a92d9f2ca4..812ff4446f 100644 --- a/data/assets/scene/solarsystem/planets/earth/default_layers.asset +++ b/data/assets/scene/solarsystem/planets/earth/default_layers.asset @@ -2,7 +2,6 @@ asset.require("./layers/colorlayers/blue_marble", false) asset.require("./layers/colorlayers/esri_viirs_combo", true) asset.require("./layers/colorlayers/esri_world_imagery", false) -asset.require("./layers/colorlayers/esri_imagery_world_2D", false) asset.require("./layers/colorlayers/viirs_snpp_temporal", false) asset.require("./layers/colorlayers/aqua_modis_temporal", false) asset.require("./layers/colorlayers/terra_modis_temporal", false) @@ -10,7 +9,6 @@ asset.require("./layers/colorlayers/bmng_utah", false) asset.require("./layers/colorlayers/bmng_sweden", false) asset.require("./layers/colorlayers/amsr2_gcom_w1_sea_ice_concentration_temporal", false) asset.require("./layers/colorlayers/modis_terra_chlorophyll_a_temporal", false) -asset.require("./layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal", false) asset.require("./layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal", false) -- Height layers diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset index 3c94a4a630..a34c21e45f 100644 --- a/data/assets/scene/solarsystem/planets/earth/earth.asset +++ b/data/assets/scene/solarsystem/planets/earth/earth.asset @@ -56,14 +56,14 @@ local EarthLabel = { Type = "RenderableLabel", Text = "Earth", FontSize = 70.0, - Size = 8.77, - MinMaxSize = { 1, 100 }, + Size = 8.50, + MinMaxSize = { 1, 50 }, OrientationOption = "Camera View Direction", BlendMode = "Additive", EnableFading = true, FadeUnit = "au", - FadeDistances = { 1.5, 15.0 }, - FadeWidths = { 1.0, 25.0 } + FadeDistances = { 1.5, 30.0 }, + FadeWidths = { 1.0, 40.0 } }, Tag = { "solarsystem_labels" }, GUI = { diff --git a/data/assets/scene/solarsystem/planets/earth/grids.asset b/data/assets/scene/solarsystem/planets/earth/grids.asset new file mode 100644 index 0000000000..5ad7739003 --- /dev/null +++ b/data/assets/scene/solarsystem/planets/earth/grids.asset @@ -0,0 +1,88 @@ +local transforms = asset.require("./transforms") + +local eclipticRotationMatrix = { + -0.05487554, 0.4941095, -0.8676661, + -0.9938214 , -0.1109906, -0.0003515167, + -0.09647644, 0.8622859, 0.4971472 +} + +local lightSecond = 299792458 +local lightMinute = 1.798754748E10 + +local plane1lsec = { + Identifier = "1lsecGrid", + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = eclipticRotationMatrix + }, + Translation = { + Type = "SpiceTranslation", + Target = "EARTH BARYCENTER", + Observer = "SSB" + } + }, + Renderable = { + Type = "RenderableGrid", + Enabled = false, + Opacity = 0.4, + Color = { 0.1, 0.5, 0.6 }, + LineWidth = 2.0, + Segments = { 20, 20 }, + Size = { 2*lightSecond, 2*lightSecond } + }, + GUI = { + Name = "1lsec Grid", + Path = "/Solar System/Planets/Earth" + } +} + +local plane1lmin = { + Identifier = "1lminGrid", + Transform = { + Rotation = { + Type = "StaticRotation", + Rotation = eclipticRotationMatrix + }, + Translation = { + Type = "SpiceTranslation", + Target = "EARTH BARYCENTER", + Observer = "SSB" + } + }, + Renderable = { + Type = "RenderableGrid", + Enabled = false, + Opacity = 0.4, + Color = { 0.1, 0.5, 0.6 }, + LineWidth = 2.0, + Segments = { 20, 20 }, + Size = { 2*lightMinute, 2*lightMinute } + }, + GUI = { + Name = "1lmin Grid", + Path = "/Solar System/Planets/Earth" + } +} + +asset.onInitialize(function() + openspace.addSceneGraphNode(plane1lsec) + openspace.addSceneGraphNode(plane1lmin) +end) + +asset.onDeinitialize(function() + openspace.removeSceneGraphNode(plane1lmin) + openspace.removeSceneGraphNode(plane1lsec) +end) + +asset.export(plane1lsec) +asset.export(plane1lmin) + + +asset.meta = { + Name = "Earth Grid", + Version = "1.0", + Description = [[Grids that are useful to show distances around Earth]], + Author = "OpenSpace Team", + License = "MIT license" +} diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset index 9f97bb8603..bae8099049 100644 --- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset +++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset @@ -1,4 +1,5 @@ local transforms = asset.require("scene/solarsystem/sun/transforms") +asset.require("scene/solarsystem/sun/sun") asset.require("spice/base") local circle = asset.syncedResource({ diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset deleted file mode 100644 index 4fca4e1ccc..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.asset +++ /dev/null @@ -1,38 +0,0 @@ -local globeIdentifier = asset.require("../../earth").Earth.Identifier - -local layer = { - Identifier = "ESRI_Imagery_World_2D", - Name = "ESRI Imagery World 2D", - Enabled = asset.enabled, - FilePath = asset.localResource("esri_imagery_world_2D.wms"), - Description = [[This map presents low-resolution imagery for the world and - high-resolution imagery for the United States and other metropolitan areas around - the world. The map includes NASA Blue Marble: Next Generation 500m resolution - imagery at small scales (above 1:1,000,000), i-cubed 15m eSAT imagery at - medium-to-large scales (down to 1:70,000) for the world, and USGS 15m Landsat - imagery for Antarctica. It also includes 1m i-cubed Nationwide Select imagery for - the continental United States, and GeoEye IKONOS 1m resolution imagery for Hawaii, - parts of Alaska, and several hundred metropolitan areas around the world. - (Description from URL)]], -} - -asset.onInitialize(function() - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.onDeinitialize(function() - openspace.globebrowsing.deleteLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) - - - -asset.meta = { - Name = "ESRI Imagery World 2D", - Version = "1.1", - Description = "Older 2D imager map layer for Earth. This layer is hosted by ESRI", - Author = "ESRI", - URL = "https://www.arcgis.com/home/item.html?id=21b4ba14d9e5472d97afcbb819f7368e", - License = "Esri Master License Agreement" -} diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.wms b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.wms deleted file mode 100644 index ed9f9b6905..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_imagery_world_2D.wms +++ /dev/null @@ -1,17 +0,0 @@ - - - http://services.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer/tile/${z}/${y}/${x} - - - 15 - 2 - 1 - top - - EPSG:4326 - 512 - 512 - 3 - 5 - 5 - diff --git a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset b/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset deleted file mode 100644 index 9bd2aba398..0000000000 --- a/data/assets/scene/solarsystem/planets/earth/layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temporal.asset +++ /dev/null @@ -1,46 +0,0 @@ -local globeIdentifier = asset.require("../../earth").Earth.Identifier - -local layer = { - Identifier = "GHRSST_L4_G1SST_Sea_Surface_Temperature_Temporal", - Name = "GHRSST L4 G1SST Sea Surface Temperature (Temporal)", - Enabled = asset.enabled, - Type = "TemporalTileLayer", - Mode = "Prototyped", - Prototyped = { - Time = { - Start = "2010-06-21", - End = "2019-12-08" - }, - TemporalResolution = "1d", - TimeFormat = "YYYY-MM-DD", - Prototype = openspace.globebrowsing.createTemporalGibsGdalXml( - "GHRSST_L4_G1SST_Sea_Surface_Temperature", - "1km", - "png" - ) - }, - Description = [[Temporal coverage: 21 June 2010 - 08 December 2019. The imagery - resolution is 1 km, and the temporal resolution is daily]], - Author = "NASA EOSDIS Global Imagery Browse Services" -} - -asset.onInitialize(function() - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.onDeinitialize(function() - openspace.globebrowsing.deleteLayer(globeIdentifier, "ColorLayers", layer) -end) - -asset.export("layer", layer) - - - -asset.meta = { - Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)", - Version = "1.1", - Description = "GIBS hosted layer", - Author = "NASA EOSDIS Global Imagery Browse Services", - URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs", - License = "NASA" -} diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset index d199cf365b..d2f6ff416d 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset @@ -56,11 +56,39 @@ local Moon = { } } +local MoonLabel = { + Identifier = "MoonLabel", + Parent = Moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Moon", + FontSize = 70.0, + Size = 6.0, + MinMaxSize = { 1, 40 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 0.4, 10.0 }, + FadeWidths = { 0.1, 10.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = "Moon Label", + Path = "/Solar System/Planets/Earth/Moon", + Description = "Label for Earth's Moon" + } +} + + asset.onInitialize(function() openspace.addSceneGraphNode(Moon) + openspace.addSceneGraphNode(MoonLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(MoonLabel) openspace.removeSceneGraphNode(Moon) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset index 7af26e1795..bb2b4858f3 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2000_carbon_monoxide.asset @@ -19,17 +19,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "1024", Description = Description } @@ -44,11 +43,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "1024.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset index 17ded1f6a1..f1dff71e2f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2004_ir_hurricane.asset @@ -19,11 +19,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -31,7 +30,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2048", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "cylir_%Y%m%d_%H%M.jpg" @@ -40,11 +39,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset index fbcb85af6f..aba44b0628 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-grayir.asset @@ -15,11 +15,11 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -27,7 +27,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "images", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "ir_combined_%Y%m%d_%H%M.jpg" @@ -36,27 +36,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-2.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-3.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-4.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-5.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-6.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-7.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-8.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-9.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-10.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-11.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-12.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-13.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-14.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-15.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-16.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-17.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset index 79c90ca903..bc2d528355 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/2005_hurricane-wvsst.asset @@ -15,11 +15,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -27,7 +26,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2048", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "GI-WV-%y%j-%H%M.jpg" @@ -36,11 +35,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset index 84389d5ae9..eb241306d9 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon.asset @@ -23,17 +23,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048_png", Description = Description } @@ -48,11 +47,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048_png.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset index 8a7ac3c32a..ecbb32888b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_blackcarbon_and_sulfate.asset @@ -23,17 +23,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048_png", Description = Description } @@ -48,11 +47,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048_png.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar); end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset index a9ea2b7ff8..fb664c9cf6 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aerosol_sulfate.asset @@ -23,17 +23,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048_png", Description = Description } @@ -48,11 +47,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048_png.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset index 49d9debbaa..ec194a78e3 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/airtraffic.asset @@ -18,28 +18,21 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "images", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-2.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-3.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset index 301da9640a..174f57e5be 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/all_sats.asset @@ -23,26 +23,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset index 344fa32c28..5b80b36783 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/aqua_swath.asset @@ -22,29 +22,21 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "images", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-2.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-3.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-4.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset index f2ebf764d2..950b1daf4a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/carbonflux.asset @@ -21,26 +21,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2160", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2160.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset index 6984ab053c..ec79ecde4f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/co_gmd.asset @@ -22,11 +22,11 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -34,7 +34,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "images", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "co_field_extended_%Y%m%d%H%M.png" @@ -54,16 +54,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "3600-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "3600-2.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "3600-3.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "3600-4.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "3600-5.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "3600-6.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset index 859e72322b..4114ccf02a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fim_chem.asset @@ -18,17 +18,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "composite", Description = Description } @@ -43,11 +42,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "composite.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset index bbe8ef5659..3af8fcc1f5 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fossil_fuel.asset @@ -25,11 +25,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -37,7 +36,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "3100", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "%Y%m%d_fossil.png" @@ -56,11 +55,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "3100.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset index 7ca6db9f51..93b5c48b1d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/fukushima.asset @@ -17,17 +17,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2054", Description = Description } @@ -42,11 +41,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2054.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset index 959e92104a..ea649d5083 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_sat.asset @@ -21,26 +21,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset index 487326c916..a85e3ac642 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/geo_scan.asset @@ -21,26 +21,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset index 8ea792b000..d79df07034 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/giss_temp_anom.asset @@ -14,17 +14,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2012", Description = Description } @@ -39,11 +38,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2012.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset index e4bdbaccba..1850480c67 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-insolation.asset @@ -17,11 +17,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -29,7 +28,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "1440", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "CERES_INSOL_M_%Y-%m.PNG" @@ -49,11 +48,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "1440.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset index 88c23bfea6..8bc1159d17 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/globe-rainfall.asset @@ -17,11 +17,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -29,7 +28,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "1440", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "TRMM_3B43M_%Y-%m.PNG" @@ -49,11 +48,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "1440.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset index 4c2997756a..54bb95eaaa 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/harvey-clouds_precip.asset @@ -17,11 +17,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -29,7 +28,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "combined_image_%Y%m%d_%H%M.jpg" @@ -57,11 +56,6 @@ local colorbar_snow = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar_rain) openspace.addScreenSpaceRenderable(colorbar_snow) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset index 37a49fdc14..248062de86 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017.asset @@ -20,11 +20,11 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -32,7 +32,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "images", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "linear_rgb_cyl_%Y%m%d_%H%M.jpg" @@ -41,14 +41,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-2.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-3.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-4.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset index c04b51bf35..86304ec6c8 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/hurricane_season_2017_wvsst.asset @@ -20,11 +20,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -32,7 +31,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2048", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "wvsst-%y%j-%H.jpg" @@ -41,11 +40,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset index 031f589cca..cf1ce51565 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/isaac.asset @@ -18,7 +18,8 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) local radarDestination = syncedDirectory .. "radar" @@ -53,16 +54,6 @@ local layer_sat = { } asset.onInitialize(function() - if not openspace.directoryExists(radarDestination) then - openspace.printInfo("Extracting " .. Name .. " Radar") - openspace.unzipFile(syncedDirectory .. "radar.zip", radarDestination, true) - end - - if not openspace.directoryExists(satDestination) then - openspace.printInfo("Extracting " .. Name .. " Sat") - openspace.unzipFile(syncedDirectory .. "sat.zip", satDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer_radar) openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer_sat) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset index 8cbbda2744..187fb0a5de 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/land_temp.asset @@ -17,11 +17,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -29,7 +28,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "cyl_%Y_%m.jpg" @@ -38,11 +37,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset index 600921d83b..1af3e30986 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/ltg_vaisala.asset @@ -22,11 +22,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -34,7 +33,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2160", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "%Y_%m-1.png" @@ -54,11 +53,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2160.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset index dab84eb9cc..a613108f15 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nasa_sats.asset @@ -20,26 +20,21 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset index efdf5da97f..bfe46e141b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-carbon.asset @@ -17,17 +17,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048", Description = Description } @@ -43,11 +42,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset index cf60320943..7795309db1 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-chem.asset @@ -17,11 +17,11 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -29,7 +29,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "images", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "chem_%Y-%m-%d_%H-%M.png" @@ -48,36 +48,6 @@ local legend = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4000-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-2.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-3.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-4.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-5.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-6.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-7.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-8.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-9.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-10.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-11.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-12.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-13.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-14.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-15.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-16.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-17.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-18.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-19.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-20.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-21.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-22.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-23.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-24.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-25.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-26.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(legend) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset index dae59b5af0..fc01a8fca4 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/nccs_models-winds.asset @@ -17,11 +17,11 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -29,7 +29,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "images", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "winds_%Y-%m-%d_%H-%M.png" @@ -38,36 +38,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4000-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-2.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-3.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-4.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-5.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-6.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-7.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-8.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-9.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-10.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-11.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-12.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-13.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-14.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-15.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-16.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-17.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-18.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-19.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-20.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-21.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-22.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-23.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-24.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-25.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4000-26.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset index 41b267cacc..bb3b05422b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/no2_omsi.asset @@ -18,11 +18,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -30,7 +29,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2880", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "NO2monthlymean_%Y%m.png" @@ -49,11 +48,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2880.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset index f9e19f22e8..37622bc66c 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/pclim.asset @@ -15,17 +15,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "raw", Description = Description } @@ -40,11 +39,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "raw.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset index aeac12056c..734b2e1056 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/poes_sat.asset @@ -18,11 +18,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -30,7 +29,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2048", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "poes_cover_%Y%j%H%M.jpg" @@ -39,11 +38,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset index 133d6e668d..1edd0805c4 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-antarctic.asset @@ -29,17 +29,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048", Description = Description } @@ -55,11 +54,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset index ecbcd2b59b..217006ca80 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-elnino.asset @@ -29,17 +29,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048", Description = Description } @@ -55,11 +54,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset index c28b4e7658..f04f2c0f7a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/reanalysis-hurricane.asset @@ -29,17 +29,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048_png", Description = Description } @@ -55,11 +54,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048_png.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset index 2a82899eac..e299abd1e4 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sandy.asset @@ -13,11 +13,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -25,7 +24,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "linear_rgb_cyl_%Y%m%d_%H%M.jpg" @@ -34,11 +33,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset index ab563ae299..0d209090b8 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/sunsync_sat.asset @@ -18,11 +18,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -30,7 +29,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2048", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "sunsync_%Y%j%H%M.jpg" @@ -39,11 +38,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset index 66427a29ff..34eb1f46be 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/temp_anom.asset @@ -21,11 +21,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -33,7 +32,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096_new", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "ANOM.yearly.%Y.color.png" @@ -53,11 +52,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096_new.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset index 5b2e6097ef..da4470c343 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan-wvsst.asset @@ -15,17 +15,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048", Description = Description } @@ -38,11 +37,6 @@ local track = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", track) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset index 6f86b1b3ff..a68a83c6b2 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/typhoon_haiyan.asset @@ -15,11 +15,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -27,7 +26,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2048", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "linear_rgb_cyl_%Y%m%d_%H%M.jpg" @@ -44,11 +43,6 @@ local track = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", track) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset index fe1bb42efe..d0f55350f4 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/atmosphere/volcano_ash.asset @@ -21,26 +21,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2992", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2992.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset index 5329f988e4..93b124ce9f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/birds.asset @@ -15,17 +15,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "birds", Description = Description } @@ -40,11 +39,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "birds.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset index ab4d833181..b09748ae78 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo.asset @@ -16,11 +16,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -28,7 +27,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "5400", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "world.%Y%m.3x5400x2700.jpg" @@ -37,11 +36,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "5400.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset index 8088450677..415e6fe533 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-blue_marble_topo_bathy.asset @@ -16,11 +16,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -28,7 +27,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "5400", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "world.topo.bathy.%Y%m.3x5400x2700.jpg" @@ -37,11 +36,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "5400.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset index d9cd63d453..f3a39fec25 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-nightlights.asset @@ -22,31 +22,21 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "images", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-2.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-3.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-4.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-5.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-6.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset index 12f561159a..28c7a33ee1 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/blue_marble-seasonal_blue_marble.asset @@ -17,11 +17,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -29,7 +28,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "world%Y%jx4kx2k.jpg" @@ -38,11 +37,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset index ab2a765a58..41c74dfb12 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-global.asset @@ -15,25 +15,19 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer_images = { Identifier = Identifier, Name = Name, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer_images) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset index 64914979dc..304b944e92 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-mississippi.asset @@ -15,26 +15,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset index 007f0cb78d..94f821bc31 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/dams-yangtze.asset @@ -15,26 +15,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset index 0f18bfa9da..6ec4e40dcf 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-06z_only.asset @@ -17,11 +17,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -29,7 +28,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2048", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "daynite_%Y%j%H%M.jpg" @@ -38,11 +37,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset index 1c2c9c6b18..bd8bf08784 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-full_year.asset @@ -17,11 +17,11 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -29,7 +29,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "images", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "daynite_%Y%j%H%M.jpg" @@ -38,13 +38,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "2048-2.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "2048-3.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset index faef9a24cb..2f683d0290 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/day_night-oneday.asset @@ -17,26 +17,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset index 6d90ee58c8..8546c329ff 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquake-1980_1995_quakes.asset @@ -24,17 +24,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "1024", Description = Description } @@ -72,11 +71,6 @@ local quakebar_combined = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "1024.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(legend) openspace.addScreenSpaceRenderable(quakebar) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset index fc107e4c5c..4317e62749 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earthquakes_and_eruptions.asset @@ -17,17 +17,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } @@ -42,11 +41,6 @@ local legend = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(legend) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset index 3d72539e6d..5f00be7b5f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnetic_lines.asset @@ -22,11 +22,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -34,7 +33,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "%Y.png" @@ -43,11 +42,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset index 1b55868ee8..2b8ca3b2a3 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/earths_magnetism_magnets.asset @@ -22,11 +22,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -34,7 +33,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "%Y.png" @@ -43,11 +42,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset index 632e29d266..ed5ae36e9b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire.asset @@ -20,11 +20,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -32,7 +31,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "firemap.%Y%j-%Y%j.4096x2048.png" @@ -41,11 +40,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset index b2ab9d82f2..b8c4b83d86 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/fire_veg.asset @@ -19,17 +19,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048", Description = Description } @@ -54,11 +53,6 @@ local colorbar_veg = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar_fire) openspace.addScreenSpaceRenderable(colorbar_veg) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset index 288a8105b3..ceacbfb3a3 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/global_vegetation.asset @@ -16,10 +16,11 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images/" +local imagesDestination = syncedDirectory .. "4096" local colorbarDestination = syncedDirectory .. "colorbar/" local background1layer = { @@ -65,16 +66,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name .. " Images") - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - - if not openspace.directoryExists(colorbarDestination) then - openspace.printInfo("Extracting " .. Name .. " Colorbar") - openspace.unzipFile(syncedDirectory .. "colorbar.zip", colorbarDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", background1layer) openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", background2layer) openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset index 0ef301c115..7765a7a5f5 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/hot_topo.asset @@ -23,29 +23,21 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "images", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-2.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-3.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-4.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset index 3e6a9ba483..713dbb4134 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/irsat_nightlights.asset @@ -17,26 +17,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset index b7b754190d..c778c7ee0a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/japan_quake.asset @@ -17,17 +17,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048", Description = Description } @@ -42,11 +41,6 @@ local legend = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(legend) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset index 5bd6447901..f4e66c7e4b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/koppen_climate-koppen_1901_2100.asset @@ -17,17 +17,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } @@ -53,11 +52,6 @@ local legend1 = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(legend) openspace.addScreenSpaceRenderable(legend1) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset index b057b71768..f1075852b4 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-animation.asset @@ -22,17 +22,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "3600", Description = Description } @@ -48,11 +47,6 @@ local label = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "3600.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(label) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset index 2d0c160537..d2cb3939b5 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_cover-slideshow.asset @@ -22,7 +22,8 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) local labelsDestination = syncedDirectory .. "labels/" @@ -71,11 +72,6 @@ local labels = { } asset.onInitialize(function() - if not openspace.directoryExists(labelsDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "labels.zip", labelsDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) for _,v in ipairs(labels) do diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset index 2018d1c049..14c252b305 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/land_ratio.asset @@ -12,26 +12,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset index d6e8cf82d3..cdb09e2f87 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/magnetic_declination.asset @@ -16,11 +16,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -28,7 +27,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096", -- @TODO: This dataset is not using equirectangular projection, so it will look -- strange on the planet right now @@ -45,11 +44,6 @@ asset.onInitialize(function() "will look strange when projected onto the spherical Earth" ) - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset index 94065a393a..75375705a7 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/paleo_map.asset @@ -21,10 +21,11 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" +local imagesDestination = syncedDirectory .. "3600" local layers_names = { "Map01a_PALEOMAP_PaleoAtlas_000", @@ -144,11 +145,6 @@ local legend = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "3600.zip", imagesDestination, true) - end - for i,v in ipairs(layers) do openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", v) end diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset index 2d34fc16bc..9c6e5b4ff3 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/plate_movement.asset @@ -24,17 +24,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } @@ -51,11 +50,6 @@ local age_scale = { asset.onInitialize(function () - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(age_scale) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset index 16705873b9..c43add6891 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/river_discharge_2010.asset @@ -15,17 +15,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } @@ -41,11 +40,6 @@ local colorbar = { asset.onInitialize(function () - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset index c5b9847191..2c7185c9ff 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/seismic_waves-1994northridge.asset @@ -18,10 +18,11 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" +local imagesDestination = syncedDirectory .. "2048" local pipsDestination = syncedDirectory .. "pips" local layer_base = { @@ -58,16 +59,6 @@ local pips = { } asset.onInitialize(function () - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name .. " Images") - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - - if not openspace.directoryExists(pipsDestination) then - openspace.printInfo("Extracting " .. Name .. " Pips") - openspace.unzipFile(syncedDirectory .. "pips.zip", pipsDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer_base) openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer_stations) openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer_images) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset index 65367f7370..32cb8d89ab 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/land/surface_temperature.asset @@ -18,17 +18,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } @@ -55,11 +54,6 @@ local colorbar2 = { } asset.onInitialize(function () - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) openspace.addScreenSpaceRenderable(colorbar2) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset index 26122d2887..0d288e5553 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/bm10000.asset @@ -40,26 +40,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset index fe9dcb5ff9..c4f15e3f43 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/gfdl_seaice.asset @@ -23,17 +23,17 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "images", Description = Description } @@ -48,13 +48,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-2.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-3.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset index cc9848d9c3..f201debe91 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-a1b.asset @@ -20,17 +20,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4095", Description = Description } @@ -47,11 +46,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4095.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset index dcc1ed6590..1f23bcfeb7 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-ccsm-b1.asset @@ -20,17 +20,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4095", Description = Description } @@ -47,11 +46,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4095.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset index d8c9be216e..3a70c3e9e1 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-a1b.asset @@ -20,17 +20,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4095", Description = Description } @@ -47,11 +46,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4095.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset index 8177afaf90..2117986946 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-gfdl-b1.asset @@ -20,17 +20,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4095", Description = Description } @@ -47,11 +46,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4095.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset index df194e5d5b..d4a430bebb 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-a1b.asset @@ -20,17 +20,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4095", Description = Description } @@ -47,11 +46,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4095.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset index 623bfcd31e..af34b58ce0 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ipcc_temp-had-b1.asset @@ -20,17 +20,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4095", Description = Description } @@ -47,11 +46,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4095.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset index ebec3e4f25..4fbebf94f8 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga26.asset @@ -12,11 +12,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -24,7 +23,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "GA26.yearly.%Y.color.png" @@ -44,11 +43,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset index 4f9068f7d7..6a6e80255b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga45.asset @@ -12,11 +12,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -24,7 +23,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "GA45.yearly.%Y.color.png" @@ -44,11 +43,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset index af36426261..8c3ae46b11 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga60.asset @@ -12,11 +12,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -24,7 +23,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "GA60.yearly.%Y.color.png" @@ -44,11 +43,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset index 4ed7ed7a82..7d3693fe06 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/rcp-ga85.asset @@ -12,11 +12,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -24,7 +23,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "GA85.yearly.%Y.color.png" @@ -44,11 +43,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset index 438aa10e9c..813080144f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-a1b.asset @@ -22,11 +22,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -34,7 +33,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2100", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "000_%Y_1_A1B_HQ.png" @@ -53,11 +52,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2100.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset index 96fc5cb29c..44629cb2c6 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/models/ukmet-e1.asset @@ -21,11 +21,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -33,7 +32,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2100", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "000_%Y_1_E1_HQ.png" @@ -52,11 +51,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2100.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset index 21aba0f031..57d612c5c5 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/2009_ice_animation.asset @@ -21,17 +21,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } @@ -66,11 +65,6 @@ local colorbar_2009_iceconcentration = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar_2007_2009) openspace.addScreenSpaceRenderable(colorbar_2008_minimum) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset index 5f6f49541e..c0db0daade 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/animal_tracking.asset @@ -18,11 +18,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -30,7 +29,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "TOPPMOVIE.%Y-%m-%d.png" @@ -49,11 +48,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset index 63a38c129c..931edc6763 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_tracks.asset @@ -20,17 +20,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } @@ -45,11 +44,6 @@ local buoy = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(buoy) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset index 202540b1dc..9068118a45 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/argo_buoy_waterfall.asset @@ -20,26 +20,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset index 70e3d2ec52..570157016e 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/atl_turtle.asset @@ -20,11 +20,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -32,7 +31,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2048", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "turtle-migration-%y%j-%H%M.jpg" @@ -41,11 +40,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset index b27f5cca80..0b738716d2 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/chlorophyll_model.asset @@ -20,17 +20,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "3232", Description = Description } @@ -47,11 +46,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "3232.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset index 9e88eb4d52..bdc3683ca3 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-gray_land.asset @@ -22,17 +22,17 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "images", Description = Description } @@ -47,17 +47,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-2.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-3.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-4.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-5.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-6.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-7.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset index 810642faba..b82f17f143 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ecco2_sst-veg_land.asset @@ -22,17 +22,17 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "images", Description = Description } @@ -47,19 +47,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-2.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-3.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-4.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-5.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-6.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-7.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-8.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-9.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset index 304b2298a0..780d52d8a9 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-black_background.asset @@ -16,11 +16,11 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -28,7 +28,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "images", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "GFDL_CM2p4_SSTctl_%Y.png" @@ -48,12 +48,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048_png-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "2048_png-2.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset index b432810438..b0319d9fb3 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/gfdl_sst-land_background.asset @@ -16,11 +16,11 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -28,7 +28,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "images", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "GFDL_CM2p4_SSTctl_%Y.png" @@ -48,14 +48,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048_png-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "2048_png-2.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "2048_png-3.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "2048_png-4.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset index 1e8ca9a876..d9682f9efb 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/greenland_melt.asset @@ -20,11 +20,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -32,7 +31,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2048", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "dav19_%Y.jpg" @@ -41,11 +40,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset index 6e134e579e..b82e4f6d04 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/japan_tsunami_waves.asset @@ -23,26 +23,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset index 43f99a0d21..0db5e13cbb 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/loggerheadseaturtletracks.asset @@ -20,26 +20,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset index 6186d46d25..41c1ae1585 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_947293.asset @@ -19,11 +19,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -31,7 +30,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2048", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "NOAA-turtle-S947293-%y%j-%H%M.jpg" @@ -40,11 +39,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset index 5c0aeb1f1f..d0d97a48c9 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/mexico_turtles_958002.asset @@ -19,11 +19,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -31,7 +30,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2048", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "NOAA-turtle-S958002-%y%j-%H%M.jpg" @@ -40,11 +39,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset index b5d890a9a0..bae9167481 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/modis_sst.asset @@ -18,26 +18,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset index 91e7c5012b..22b3d502be 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_speed.asset @@ -18,26 +18,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4000", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4000.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset index d82b4d5e4e..2acb9ecbc1 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/nasa_sst.asset @@ -16,26 +16,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4000", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4000.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset index 8fca9fb50e..a7d415ecf9 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-co2_flux.asset @@ -15,11 +15,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, @@ -28,7 +27,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "images", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "CO2F.yearly.%Y.color.png" @@ -47,11 +46,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "images.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset index 97c28ec6de..243c092d3f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-ph.asset @@ -18,11 +18,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -30,7 +29,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "images", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "ACID.yearly.%Y.color.png" @@ -49,11 +48,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "images.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset index d97a124c31..3564726ea0 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_acid-saturation.asset @@ -23,11 +23,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -35,7 +34,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "images", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "ARAG.yearly.%Y.color.png" @@ -62,11 +61,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "images.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", reefs) openspace.addScreenSpaceRenderable(colorbar) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset index 2697673efb..27412e8b7d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_depths_temp.asset @@ -18,11 +18,12 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" -local imagesByDepthDestination = syncedDirectory .. "bydepth" +local imagesDestination = syncedDirectory .. "4096" +local imagesByDepthDestination = syncedDirectory .. "4096_by_depth" local layer = { Identifier = Identifier, @@ -53,16 +54,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - - if not openspace.directoryExists(imagesByDepthDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096_by_depth.zip", imagesByDepthDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset index d261ebaf04..5b26039281 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/ocean_drain-gray.asset @@ -16,26 +16,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset index 435ad94e1c..0a07d9bbd9 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pac_turtle.asset @@ -18,11 +18,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -30,7 +29,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2048", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "pac-turtle-migration-%y%j-%H%M.jpg" @@ -39,11 +38,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset index 6ae998bea9..a9e41ea914 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/phytoplankton.asset @@ -22,17 +22,17 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "images", Description = Description } @@ -47,17 +47,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-2.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-3.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-4.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-5.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-6.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-7.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset index 8e4d61a4c4..0e1764b50d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/pr_tsunami.asset @@ -19,26 +19,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset index f01ce6ea49..a14298c2c2 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_level.asset @@ -24,26 +24,20 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4000", Description = Description } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4000.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset index 4db3e77319..0c9a8fb74c 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sea_surface_height_anomaly.asset @@ -19,17 +19,17 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "images", Description = Description } @@ -45,13 +45,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "8192-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "8192-2.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "8192-3.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset index 5fd156abd1..09fc36f549 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seaice_monthly.asset @@ -18,11 +18,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -30,7 +29,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "sibt1850_seaice_extent_%Y%M%H_sos.png" @@ -39,11 +38,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset index 109122f344..86d5b8dd7d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-land_background.asset @@ -13,17 +13,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } @@ -38,11 +37,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset index 3a5d47d741..8cbed7808b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-no_holes.asset @@ -14,17 +14,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "2048", Description = Description } @@ -39,11 +38,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset index 2401d7cbb9..97f5ceb458 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/seawifs-polar_holes.asset @@ -14,17 +14,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4320_png", Description = Description } @@ -39,11 +38,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4320_png.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset index 9a67e649bc..65565f084d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/shark.asset @@ -19,11 +19,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -31,7 +30,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "2048", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "shark-migration-%y%j-%H%M.jpg" @@ -40,11 +39,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "2048.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset index 5778b346dc..3cd8b360a4 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sss.asset @@ -17,17 +17,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } @@ -42,11 +41,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset index 8e030e7386..23619d282f 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/sst_1980_1999.asset @@ -19,11 +19,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -31,7 +30,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "cyl_%Y_%m_%d.jpg" @@ -40,11 +39,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset index 8d5ad10920..70bd6a1fc2 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vector_winds.asset @@ -19,17 +19,17 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true, + UnzipFilesDestination = "images" }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "images", Description = Description } @@ -44,12 +44,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096-1.zip", imagesDestination, true) - openspace.unzipFile(syncedDirectory .. "4096-2.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset index 82643e8ae9..717a67efea 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vent_discoveries_animation.asset @@ -16,11 +16,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -28,7 +27,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "new", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "vents_%Y.png" @@ -37,11 +36,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "new.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset index 8790ea411b..7589c4164b 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/vorticity.asset @@ -17,17 +17,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "frames", Description = Description } @@ -42,11 +41,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "frames.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset index b1c99ce719..0a57ed360d 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_2012.asset @@ -14,17 +14,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } @@ -39,11 +38,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset index 80408cf903..25ea12e63a 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_katrina.asset @@ -16,17 +16,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } @@ -41,11 +40,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset index fededbb87b..9a4bf42a56 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_height_sandy.asset @@ -16,17 +16,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } @@ -41,11 +40,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset index 393de3b8d7..e2659c7b0e 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/waves-wave_power_2012.asset @@ -14,17 +14,16 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, Enabled = asset.enabled, Type = "ImageSequenceTileLayer", - FolderPath = imagesDestination, + FolderPath = syncedDirectory .. "4096", Description = Description } @@ -39,11 +38,6 @@ local colorbar = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) openspace.addScreenSpaceRenderable(colorbar) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset index 867f64e106..db42698543 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-10day_seaice.asset @@ -20,11 +20,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -32,7 +31,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096_png", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "nt_monthext_%Y%m%d-%Y%m%d_n07_sos.png" @@ -41,11 +40,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096_png.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset index f3e75f2327..adb39f8b5e 100644 --- a/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset +++ b/data/assets/scene/solarsystem/planets/earth/noaa-sos/oceans/weeklyseaice-sept_seaice.asset @@ -28,11 +28,10 @@ local syncedDirectory = asset.syncedResource({ Name = Name, Type = "HttpSynchronization", Identifier = Identifier, - Version = 1 + Version = 1, + UnzipFiles = true }) -local imagesDestination = syncedDirectory .. "images" - local layer = { Identifier = Identifier, Name = Name, @@ -40,7 +39,7 @@ local layer = { Type = "TemporalTileLayer", Mode = "Folder", Folder = { - Folder = imagesDestination, + Folder = syncedDirectory .. "4096", -- See https://en.cppreference.com/w/cpp/io/manip/get_time for an explanation of the -- time formatting string Format = "nt_monthext_%Y%m%d-%Y%m%d_n07_sos.png" @@ -49,11 +48,6 @@ local layer = { } asset.onInitialize(function() - if not openspace.directoryExists(imagesDestination) then - openspace.printInfo("Extracting " .. Name) - openspace.unzipFile(syncedDirectory .. "4096.zip", imagesDestination, true) - end - openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer) end) diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset index e8fc60e900..d5523fc067 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset @@ -20,6 +20,7 @@ local omm = asset.syncedResource({ local issPosition = { Identifier = "ISSPosition", Parent = transforms.EarthInertial.Identifier, + BoundingSphere = 54.5, -- half the width Transform = { Translation = { Type = "GPTranslation", diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset index 478552b38b..6f038f0fa0 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset @@ -52,11 +52,38 @@ local Callisto = { } } +local CallistoLabel = { + Identifier = "CallistoLabel", + Parent = Callisto.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Callisto", + FontSize = 70.0, + Size = 6.0, + MinMaxSize = { 1, 40 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 1.0, 10.0 }, + FadeWidths = { 0.5, 10.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = "Callisto Label", + Path = "/Solar System/Planets/Jupiter/Moons", + Description = "Label for Jupiter's moon Callisto" + } +} + asset.onInitialize(function() openspace.addSceneGraphNode(Callisto) + openspace.addSceneGraphNode(CallistoLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(CallistoLabel) openspace.removeSceneGraphNode(Callisto) end) diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset index b380c5626e..002cce3765 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset @@ -51,11 +51,38 @@ local Europa = { } } +local EuropaLabel = { + Identifier = "EuropaLabel", + Parent = Europa.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Europa", + FontSize = 70.0, + Size = 6.0, + MinMaxSize = { 1, 40 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 1.0, 10.0 }, + FadeWidths = { 0.5, 10.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = "Europa Label", + Path = "/Solar System/Planets/Jupiter/Moons", + Description = "Label for Jupiter's moon Europa" + } +} + asset.onInitialize(function() openspace.addSceneGraphNode(Europa) + openspace.addSceneGraphNode(EuropaLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(EuropaLabel) openspace.removeSceneGraphNode(Europa) end) diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset index c10a19156b..40fad40f2c 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset @@ -51,11 +51,39 @@ local Ganymede = { } } +local GanymedeLabel = { + Identifier = "GanymedeLabel", + Parent = Ganymede.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Ganymede", + FontSize = 70.0, + Size = 6.0, + MinMaxSize = { 1, 40 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 1.0, 10.0 }, + FadeWidths = { 0.5, 10.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = "Ganymede Label", + Path = "/Solar System/Planets/Jupiter/Moons", + Description = "Label for Jupiter's moon Ganymede" + } +} + + asset.onInitialize(function() openspace.addSceneGraphNode(Ganymede) + openspace.addSceneGraphNode(GanymedeLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(GanymedeLabel) openspace.removeSceneGraphNode(Ganymede) end) diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset index 2818bd060d..ff28967ee9 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset @@ -51,11 +51,40 @@ local Io = { } } + +local IoLabel = { + Identifier = "IoLabel", + Parent = Io.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Io", + FontSize = 70.0, + Size = 6.0, + MinMaxSize = { 1, 40 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 1.0, 10.0 }, + FadeWidths = { 0.5, 10.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = "Io Label", + Path = "/Solar System/Planets/Jupiter/Moons", + Description = "Label for Jupiter's moon Io" + } +} + + asset.onInitialize(function() openspace.addSceneGraphNode(Io) + openspace.addSceneGraphNode(IoLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(IoLabel) openspace.removeSceneGraphNode(Io) end) diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset index 2a3cbb7392..c01e8ca6ef 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset @@ -48,10 +48,14 @@ local JupiterLabel = { Type = "RenderableLabel", Text = "Jupiter", FontSize = 70.0, - Size = 8.77, - MinMaxSize = { 1, 100 }, + Size = 8.75, + MinMaxSize = { 1, 50 }, OrientationOption = "Camera View Direction", - BlendMode = "Additive" + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "au", + FadeDistances = { 3.0, 40.0 }, + FadeWidths = { 1.0, 60.0 } }, Tag = { "solarsystem_labels" }, GUI = { diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset index bf1ad9950d..57b1e28372 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset @@ -207,22 +207,62 @@ local anankeGroup = { } } +-- Generate all moon labels +local moon_labels = {} + +for i, moon in ipairs(anankeGroup) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 7.1, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 1.5, 90.0 }, + FadeWidths = { 0.5, 90.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Jupiter/Moons", + Description = "Label for Jupiter's moon " .. moonName .. " (Ananke group)" + } + } +end + + local nodes = proceduralGlobes.createGlobes(anankeGroup) asset.onInitialize(function() - for i, node in ipairs(nodes) do + for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moonlabel in ipairs(moon_labels) do + openspace.addSceneGraphNode(moonlabel) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end end) -for i, node in ipairs(nodes) do - asset.export( node) +for _, node in ipairs(nodes) do + asset.export(node) end diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset index 99b971a635..0a39412b0d 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset @@ -275,21 +275,63 @@ local carmeGroup = { } } + +-- Generate labels for each moon +local moon_labels = {} + +for i, moon in ipairs(carmeGroup) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 7.1, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 2.0, 125.0 }, + FadeWidths = { 0.5, 50.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Jupiter/Moons", + Description = "Label for Jupiter's moon " .. moonName .. " (Carme group)" + } + } +end + + + local nodes = proceduralGlobes.createGlobes(carmeGroup) asset.onInitialize(function() - for i, node in ipairs(nodes) do + for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moonlabel in ipairs(moon_labels) do + openspace.addSceneGraphNode(moonlabel) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end end) -for i, node in ipairs(nodes) do +for _, node in ipairs(nodes) do asset.export(node) end diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset index 2be789af96..dfd8d7d069 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset @@ -35,21 +35,87 @@ local carpoGroup = { } } +-- Generate labels for each moon +local moon_labels = {} + +for i, moon in ipairs(carpoGroup) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 7.1, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 1.0, 100.0 }, + FadeWidths = { 0.0, 100.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Jupiter/Moons", + Description = "Label for Jupiter's moon " .. moonName .. " (Carpo group)" + } + } + + -- 'Hacky' solution to case where the main label gets culled on approach due to its onscreen size. + -- We need the size of the original label to be big as it needs to be legible from long distances when focusing on Jupiter. + moon_labels[i+1] = { + Identifier = moon.Identifier .. "LabelNear", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 5.5, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 0.2, 1.0 }, + FadeWidths = { 0.1, 0.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label (Near)", + Path = "/Solar System/Planets/Jupiter/Moons", + Description = "Transitional Label for close-range viewing of " .. moonName .. " (Carpo group)" + } + } +end + local nodes = proceduralGlobes.createGlobes(carpoGroup) -asset.onInitialize(function() - for i, node in ipairs(nodes) do +asset.onInitialize(function() + for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moonlabel in ipairs(moon_labels) do + openspace.addSceneGraphNode(moonlabel) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end end) -for i, node in ipairs(nodes) do +for _, node in ipairs(nodes) do asset.export(node) end diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset index 4882ede8e7..5a4ce45db9 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset @@ -104,21 +104,60 @@ local himaliaGroup = { } } +-- Generate labels for each moon +local moon_labels = {} + +for i, moon in ipairs(himaliaGroup) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 7.1, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 1.0, 120.0 }, + FadeWidths = { 1.0, 120.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Jupiter/Moons", + Description = "Label for Jupiter's moon " .. moonName .. " (Himalia group)" + } + } +end + local nodes = proceduralGlobes.createGlobes(himaliaGroup) asset.onInitialize(function() - for i, node in ipairs(nodes) do + for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moonlabel in ipairs(moon_labels) do + openspace.addSceneGraphNode(moonlabel) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end end) -for i, node in ipairs(nodes) do +for _, node in ipairs(nodes) do asset.export(node) end diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset index d5029a8329..22ba7c7df1 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset @@ -86,21 +86,64 @@ local innerMoons = { } } +-- Generate labels for each moon +local moon_labels = {} + +for i, moon in ipairs(innerMoons) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 50.0, + Size = 5.6, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 0.1, 3.0 }, + FadeWidths = { 0.1, 3.0 }, + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Jupiter/Moons", + Description = "Label for Jupiter's moon " .. moonName .. " (inner group)" + } + } +end + + local nodes = proceduralGlobes.createGlobes(innerMoons) + asset.onInitialize(function() - for i, node in ipairs(nodes) do + for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moonlabel in ipairs(moon_labels) do + openspace.addSceneGraphNode(moonlabel) + end end) + asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end end) -for i, node in ipairs(nodes) do + +for _, node in ipairs(nodes) do asset.export(node) end diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset index 8d20858b11..d47e7cb08d 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset @@ -162,21 +162,61 @@ local otherGroups = { } } +-- Generate labels for each moon +local moon_labels = {} + +for i, moon in ipairs(otherGroups) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 7.1, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 1.0, 150.0 }, + FadeWidths = { 1.0, 50.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Jupiter/Moons", + Description = "Label for Jupiter's moon " .. moonName .. " (other groups)" + } + } +end + + local nodes = proceduralGlobes.createGlobes(otherGroups) asset.onInitialize(function() - for i, node in ipairs(nodes) do + for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moonlabel in ipairs(moon_labels) do + openspace.addSceneGraphNode(moonlabel) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end end) -for i, node in ipairs(nodes) do +for _, node in ipairs(nodes) do asset.export(node) end diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset index 450391d773..6e78f38342 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset @@ -350,8 +350,7 @@ local pasiphaeGroup = { Identifier = parentIdentifier, Spice = parentSpice }, - -- sic: The Identifier in the SPICE kernel is wrong - Spice = "MAGACLITE", + Spice = "MEGACLITE", Radii = { 5000, 5000, 5000 }, Tags = tags, TrailTags = trailTags, @@ -364,21 +363,61 @@ local pasiphaeGroup = { } } +-- Generate labels for each moon +local moon_labels = {} + +for i, moon in ipairs(pasiphaeGroup) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 7.1, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 1.5, 140.0 }, + FadeWidths = { 0.5, 50.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Jupiter/Moons", + Description = "Label for Jupiter's moon " .. moonName .. " (Pasiphae group)" + } + } +end + + local nodes = proceduralGlobes.createGlobes(pasiphaeGroup) asset.onInitialize(function() - for i, node in ipairs(nodes) do + for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moonlabel in ipairs(moon_labels) do + openspace.addSceneGraphNode(moonlabel) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end end) -for i, node in ipairs(nodes) do +for _, node in ipairs(nodes) do asset.export(node) end diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset index c68b1c4518..1442f47a6f 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset @@ -34,21 +34,60 @@ local themistoGroup = { } } +-- Generate labels for each moon +local moon_labels = {} + +for i, moon in ipairs(themistoGroup) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 7.1, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 1.5, 120.0 }, + FadeWidths = { 0.5, 50.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Jupiter/Moons", + Description = "Label for Jupiter's moon " .. moonName .. " (Themisto group)" + } + } +end + local nodes = proceduralGlobes.createGlobes(themistoGroup) asset.onInitialize(function() - for i, node in ipairs(nodes) do + for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moonlabel in ipairs(moon_labels) do + openspace.addSceneGraphNode(moonlabel) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end end) -for i, node in ipairs(nodes) do +for _, node in ipairs(nodes) do asset.export(node) end diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset index 3ddce078d8..0ba2b7f20b 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars.asset @@ -61,8 +61,8 @@ local MarsLabel = { Type = "RenderableLabel", Text = "Mars", FontSize = 70.0, - Size = 8.66, - MinMaxSize = { 1, 100 }, + Size = 8.50, + MinMaxSize = { 1, 50 }, OrientationOption = "Camera View Direction", BlendMode = "Additive", TransformationMatrix = { @@ -71,6 +71,10 @@ local MarsLabel = { 0.0, 0.0, 1.0, 1.0E7, 0.0, 0.0, 0.0, 1.0 }, + EnableFading = true, + FadeUnit = "au", + FadeDistances = { 1.5, 40.0 }, + FadeWidths = { 1.0, 50.0 } }, Tag = { "solarsystem_labels" }, GUI = { diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset index fae852e832..9fa4b8db34 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset @@ -19,6 +19,7 @@ local kernels = asset.syncedResource({ local Deimos = { Identifier = "Deimos", Parent = transforms.MarsBarycenter.Identifier, + InteractionSphere = 8000, Transform = { Rotation = { Type = "SpiceRotation", @@ -76,12 +77,41 @@ local DeimosTrail = { } } + +local DeimosLabel = { + Identifier = "DeimosLabel", + Parent = Deimos.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Deimos", + FontSize = 70.0, + Size = 5.0, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Mm", + FadeDistances = { 50.0, 1000.0 }, + FadeWidths = { 50.0, 2000.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = "Deimos Label", + Path = "/Solar System/Planets/Mars/Moons", + Description = "Label for Mars' moon Deimos" + } +} + + asset.onInitialize(function() openspace.addSceneGraphNode(Deimos) openspace.addSceneGraphNode(DeimosTrail) + openspace.addSceneGraphNode(DeimosLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(DeimosLabel) openspace.removeSceneGraphNode(DeimosTrail) openspace.removeSceneGraphNode(Deimos) end) diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset index 3e874ed09a..e60a490a23 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset @@ -20,6 +20,7 @@ local kernels = asset.syncedResource({ local Phobos = { Identifier = "Phobos", Parent = transforms.MarsBarycenter.Identifier, + InteractionSphere = 15000, Transform = { Rotation = { Type = "SpiceRotation", @@ -78,12 +79,39 @@ local PhobosTrail = { } } +local PhobosLabel = { + Identifier = "PhobosLabel", + Parent = Phobos.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Phobos", + FontSize = 70.0, + Size = 5.0, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Mm", + FadeDistances = { 30.0, 1000.0 }, + FadeWidths = { 30.0, 2000.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = "Phobos Label", + Path = "/Solar System/Planets/Mars/Moons", + Description = "Label for Mars' moon Phobos" + } +} + asset.onInitialize(function() openspace.addSceneGraphNode(Phobos) openspace.addSceneGraphNode(PhobosTrail) + openspace.addSceneGraphNode(PhobosLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(PhobosLabel) openspace.removeSceneGraphNode(PhobosTrail) openspace.removeSceneGraphNode(Phobos) end) diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset index 63c091d29a..ca5e1e7def 100644 --- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset +++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset @@ -59,10 +59,14 @@ local MercuryLabel = { Type = "RenderableLabel", Text = "Mercury", FontSize = 70.0, - Size = 8.46, - MinMaxSize = { 1, 100 }, + Size = 8.5, + MinMaxSize = { 1, 40 }, OrientationOption = "Camera View Direction", - BlendMode = "Additive" + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "au", + FadeDistances = { 1.5, 20.0 }, + FadeWidths = { 1.0, 30.0 } }, Tag = { "solarsystem_labels" }, GUI = { diff --git a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset index 43c6cac40c..93d166d2de 100644 --- a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset @@ -141,15 +141,56 @@ local innerMoons = { } } + +-- Generate labels for each moon +local moon_labels = {} + +for i, moon in ipairs(innerMoons) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 50.0, + Size = 5.2, + MinMaxSize = { 1, 20 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Mm", + FadeDistances = { 100, 800.0 }, + FadeWidths = { 100, 1200.0 }, + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Neptune/Moons", + Description = "Label for Neptune's moon " .. moonName .. " (inner group)" + } + } +end + + local nodes = proceduralGlobes.createGlobes(innerMoons) asset.onInitialize(function() for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moonlabel in ipairs(moon_labels) do + openspace.addSceneGraphNode(moonlabel) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset index 36f5767898..bc869449b7 100644 --- a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset @@ -72,15 +72,56 @@ local irregularProgradeMoons = { } } + +-- Generate labels for each moon +local moon_labels = {} + +for i, moon in ipairs(irregularProgradeMoons) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 7.4, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 1, 250.0 }, + FadeWidths = { 1, 250.0 }, + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Neptune/Moons", + Description = "Label for Neptune's moon " .. moonName .. " (Irregular prograde group)" + } + } +end + + local nodes = proceduralGlobes.createGlobes(irregularProgradeMoons) asset.onInitialize(function() for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moonlabel in ipairs(moon_labels) do + openspace.addSceneGraphNode(moonlabel) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset index 7787921565..3285c26633 100644 --- a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset @@ -71,15 +71,55 @@ local irregularRetrogradeMoons = { } } + +-- Generate labels for each moon +local moon_labels = {} + +for i, moon in ipairs(irregularRetrogradeMoons) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 7.4, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 1, 250.0 }, + FadeWidths = { 1, 250.0 }, + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Neptune/Moons", + Description = "Label for Neptune's moon " .. moonName .. " (Irregular retrograde group)" + } + } +end + local nodes = proceduralGlobes.createGlobes(irregularRetrogradeMoons) asset.onInitialize(function() for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moonlabel in ipairs(moon_labels) do + openspace.addSceneGraphNode(moonlabel) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset index 7923ea756b..917cbe7439 100644 --- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset +++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset @@ -39,10 +39,14 @@ local NeptuneLabel = { Type = "RenderableLabel", Text = "Neptune", FontSize = 70.0, - Size = 8.96, - MinMaxSize = { 1, 100 }, + Size = 9.0, + MinMaxSize = { 1, 80 }, OrientationOption = "Camera View Direction", - BlendMode = "Additive" + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "au", + FadeDistances = { 6.0, 120.0 }, + FadeWidths = { 2.0, 150.0 } }, Tag = { "solarsystem_labels" }, GUI = { diff --git a/data/assets/scene/solarsystem/planets/neptune/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton.asset index a50931e456..0f63edb6c8 100644 --- a/data/assets/scene/solarsystem/planets/neptune/triton.asset +++ b/data/assets/scene/solarsystem/planets/neptune/triton.asset @@ -22,15 +22,56 @@ local Triton = { Kernels = kernel } + +-- Generate labels for each moon +local moon_labels = {} + +for i, moon in ipairs({ Triton }) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 50.0, + Size = 7.0, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 1, 15.0 }, + FadeWidths = { 1, 15.0 }, + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Neptune/Moons", + Description = "Label for Neptune's moon " .. moonName + } + } +end + + local nodes = proceduralGlobes.createGlobes({ Triton }) asset.onInitialize(function() for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moonlabel in ipairs(moon_labels) do + openspace.addSceneGraphNode(moonlabel) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset index 4ae53e83bd..5a2baed2ee 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset @@ -49,11 +49,40 @@ local Dione = { } } + +local DioneLabel = { + Identifier = "DioneLabel", + Parent = Dione.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Dione", + FontSize = 70.0, + Size = 6.0, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 0.3, 10.0 }, + FadeWidths = { 0.15, 10.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = "Dione Label", + Path = "/Solar System/Planets/Saturn/Moons", + Description = "Label for Saturn's moon Dione" + } +} + + asset.onInitialize(function() openspace.addSceneGraphNode(Dione) + openspace.addSceneGraphNode(DioneLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(DioneLabel) openspace.removeSceneGraphNode(Dione) end) diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset index 305c42fcf4..4035fe53f5 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset @@ -51,11 +51,40 @@ local Enceladus = { } } + +local EnceladusLabel = { + Identifier = "EnceladusLabel", + Parent = Enceladus.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Enceladus", + FontSize = 70.0, + Size = 6.0, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 0.3, 10.0 }, + FadeWidths = { 0.15, 10.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = "Enceladus Label", + Path = "/Solar System/Planets/Saturn/Moons", + Description = "Label for Saturn's moon Enceladus" + } +} + + asset.onInitialize(function() openspace.addSceneGraphNode(Enceladus) + openspace.addSceneGraphNode(EnceladusLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(EnceladusLabel) openspace.removeSceneGraphNode(Enceladus) end) diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset index 71a141f4d6..9df51d793f 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset @@ -50,11 +50,40 @@ local Hyperion = { } } + +local HyperionLabel = { + Identifier = "HyperionLabel", + Parent = Hyperion.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Hyperion", + FontSize = 70.0, + Size = 6.2, + MinMaxSize = { 1, 35 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 0.5, 20.0 }, + FadeWidths = { 0.3, 20.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = "Hyperion Label", + Path = "/Solar System/Planets/Saturn/Moons", + Description = "Label for Saturn's moon Hyperion" + } +} + + asset.onInitialize(function() openspace.addSceneGraphNode(Hyperion) + openspace.addSceneGraphNode(HyperionLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(HyperionLabel) openspace.removeSceneGraphNode(Hyperion) end) diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset index 1a9de8c9d5..a841b2e21f 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset @@ -51,11 +51,39 @@ local Iapetus = { } } +local IapetusLabel = { + Identifier = "IapetusLabel", + Parent = Iapetus.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Iapetus", + FontSize = 70.0, + Size = 6.2, + MinMaxSize = { 1, 35 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 0.5, 20.0 }, + FadeWidths = { 0.3, 20.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = "Iapetus Label", + Path = "/Solar System/Planets/Saturn/Moons", + Description = "Label for Saturn's moon Iapetus" + } +} + + asset.onInitialize(function() openspace.addSceneGraphNode(Iapetus) + openspace.addSceneGraphNode(IapetusLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(IapetusLabel) openspace.removeSceneGraphNode(Iapetus) end) diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset index dab85a414e..1c63b5c0ef 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset @@ -51,11 +51,40 @@ local Mimas = { } } + +local MimasLabel = { + Identifier = "MimasLabel", + Parent = Mimas.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Mimas", + FontSize = 70.0, + Size = 6.0, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 0.3, 10.0 }, + FadeWidths = { 0.15, 10.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = "Mimas Label", + Path = "/Solar System/Planets/Saturn/Moons", + Description = "Label for Saturn's moon Mimas" + } +} + + asset.onInitialize(function() openspace.addSceneGraphNode(Mimas) + openspace.addSceneGraphNode(MimasLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(MimasLabel) openspace.removeSceneGraphNode(Mimas) end) diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset index 93e00706fb..4484d53c4a 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset @@ -86,15 +86,54 @@ local gallicGroup = { } } +-- Generate all moon labels +local moon_labels = {} + +for i, moon in ipairs(gallicGroup) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 7.1, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 1.25, 90.0 }, + FadeWidths = { 0.25, 90.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Saturn/Moons", + Description = "Label for Saturn's moon " .. moonName .. " (Gallic group)" + } + } +end + local nodes = proceduralGlobes.createGlobes(gallicGroup) asset.onInitialize(function() for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moon in ipairs(moon_labels) do + openspace.addSceneGraphNode(moon) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset index 3ef106ffca..56b7ed7418 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset @@ -103,15 +103,54 @@ local inuitGroup = { } } +-- Generate all moon labels +local moon_labels = {} + +for i, moon in ipairs(inuitGroup) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 7.1, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 1.25, 90.0 }, + FadeWidths = { 0.25, 90.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Saturn/Moons", + Description = "Label for Saturn's moon " .. moonName .. " (Inuit group)" + } + } +end + local nodes = proceduralGlobes.createGlobes(inuitGroup) asset.onInitialize(function() for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moon in ipairs(moon_labels) do + openspace.addSceneGraphNode(moon) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset index 8d8a19bcf4..afc11e0075 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset @@ -521,15 +521,54 @@ local norseGroup = { } } +-- Generate all moon labels +local moon_labels = {} + +for i, moon in ipairs(norseGroup) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 7.1, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 1.25, 90.0 }, + FadeWidths = { 0.25, 90.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Saturn/Moons", + Description = "Label for Saturn's moon " .. moonName .. " (Norse group)" + } + } +end + local nodes = proceduralGlobes.createGlobes(norseGroup) asset.onInitialize(function() for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moon in ipairs(moon_labels) do + openspace.addSceneGraphNode(moon) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset index e26228cffe..19d44eba00 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset @@ -156,15 +156,54 @@ local otherGroup = { } } +-- Generate all moon labels +local moon_labels = {} + +for i, moon in ipairs(otherGroup) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 5.5, + MinMaxSize = { 1, 20 }, + OrientationOption = "Camera View Direction", + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "Mm", + FadeDistances = { 250.0, 1500.0 }, + FadeWidths = { 100.0, 1500.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Saturn/Moons", + Description = "Label for Saturn's moon " .. moonName .. " (other group)" + } + } +end + local nodes = proceduralGlobes.createGlobes(otherGroup) asset.onInitialize(function() for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moon in ipairs(moon_labels) do + openspace.addSceneGraphNode(moon) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset index 1a87863197..df41cfe6ac 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor/shepherd_group.asset @@ -147,15 +147,54 @@ local shepherdGroup = { } } +-- Generate all moon labels +local moon_labels = {} + +for i, moon in ipairs(shepherdGroup) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 5.5, + MinMaxSize = { 1, 20 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Mm", + FadeDistances = { 75.0, 1000.0 }, + FadeWidths = { 25.0, 800.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Saturn/Moons", + Description = "Label for Saturn's moon " .. moonName .. " (Shepherd group)" + } + } +end + local nodes = proceduralGlobes.createGlobes(shepherdGroup) asset.onInitialize(function() for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moon in ipairs(moon_labels) do + openspace.addSceneGraphNode(moon) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset index 228d383dad..b1b441fa04 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset @@ -51,11 +51,40 @@ local Rhea = { } } + +local RheaLabel = { + Identifier = "RheaLabel", + Parent = Rhea.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Rhea", + FontSize = 70.0, + Size = 6.0, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 0.3, 10.0 }, + FadeWidths = { 0.15, 10.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = "Rhea Label", + Path = "/Solar System/Planets/Saturn/Moons", + Description = "Label for Saturn's moon Rhea" + } +} + + asset.onInitialize(function() openspace.addSceneGraphNode(Rhea) + openspace.addSceneGraphNode(RheaLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(RheaLabel) openspace.removeSceneGraphNode(Rhea) end) diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn.asset b/data/assets/scene/solarsystem/planets/saturn/saturn.asset index b3deadb06a..7c0d914a74 100644 --- a/data/assets/scene/solarsystem/planets/saturn/saturn.asset +++ b/data/assets/scene/solarsystem/planets/saturn/saturn.asset @@ -67,10 +67,14 @@ local SaturnLabel = { Type = "RenderableLabel", Text = "Saturn", FontSize = 70.0, - Size = 8.85, - MinMaxSize = { 1, 100 }, + Size = 8.9, + MinMaxSize = { 1, 60 }, BlendMode = "Additive", - OrientationOption = "Camera View Direction" + OrientationOption = "Camera View Direction", + EnableFading = true, + FadeUnit = "au", + FadeDistances = { 2.5, 80.0 }, + FadeWidths = { 1.0, 100.0 } }, Tag = { "solarsystem_labels" }, GUI = { diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset index 49cf57b96b..78f5825189 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset @@ -49,11 +49,40 @@ local Tethys = { } } + +local TethysLabel = { + Identifier = "TethysLabel", + Parent = Tethys.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Tethys", + FontSize = 70.0, + Size = 6.0, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 0.3, 10.0 }, + FadeWidths = { 0.15, 10.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = "Tethys Label", + Path = "/Solar System/Planets/Saturn/Moons", + Description = "Label for Saturn's moon Tethys" + } +} + + asset.onInitialize(function() openspace.addSceneGraphNode(Tethys) + openspace.addSceneGraphNode(TethysLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(TethysLabel) openspace.removeSceneGraphNode(Tethys) end) diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset index b28dda5c94..6cddd13b22 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset @@ -51,11 +51,40 @@ local Titan = { } } + +local TitanLabel = { + Identifier = "TitanLabel", + Parent = Titan.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = "Titan", + FontSize = 70.0, + Size = 6.2, + MinMaxSize = { 1, 35 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 0.5, 20.0 }, + FadeWidths = { 0.3, 20.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = "Titan Label", + Path = "/Solar System/Planets/Saturn/Moons", + Description = "Label for Saturn's moon Titan" + } +} + + asset.onInitialize(function() openspace.addSceneGraphNode(Titan) + openspace.addSceneGraphNode(TitanLabel) end) asset.onDeinitialize(function() + openspace.removeSceneGraphNode(TitanLabel) openspace.removeSceneGraphNode(Titan) end) diff --git a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset index 82d0a96fd3..80d1fad724 100644 --- a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset @@ -241,15 +241,54 @@ local innerMoons = { } } +-- Generate all moon labels +local moon_labels = {} + +for i, moon in ipairs(innerMoons) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 5.5, + MinMaxSize = { 1, 17 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Mm", + FadeDistances = { 100.0, 500.0 }, + FadeWidths = { 25.0, 500.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Uranus/Moons", + Description = "Label for Uranus' moon " .. moonName .. " (inner group)" + } + } +end + local nodes = proceduralGlobes.createGlobes(innerMoons) asset.onInitialize(function() for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moon in ipairs(moon_labels) do + openspace.addSceneGraphNode(moon) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset index 0d8ef7bade..ba6a20856f 100644 --- a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset @@ -35,15 +35,55 @@ local irregularMoons = { } } +--Generate all moon labels +local moon_labels = {} + +for i, moon in ipairs(irregularMoons) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 7.0, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 2.0, 80.0 }, + FadeWidths = { 1.0, 40.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Uranus/Moons", + Description = "Label for Uranus' moon " .. moonName .. " (Irregular prograde group)" + } + } +end + + local nodes = proceduralGlobes.createGlobes(irregularMoons) asset.onInitialize(function() for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moon in ipairs(moon_labels) do + openspace.addSceneGraphNode(moon) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset index 05cffeb539..c3a57042ce 100644 --- a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset @@ -154,15 +154,54 @@ local irregularMoons = { } } +-- Generate all moon labels +local moon_labels = {} + +for i, moon in ipairs(irregularMoons) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 7.0, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Gm", + FadeDistances = { 2.0, 80.0 }, + FadeWidths = { 1.0, 40.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Uranus/Moons", + Description = "Label for Uranus' moon " .. moonName .. " (Irregular retrograde group)" + } + } +end + local nodes = proceduralGlobes.createGlobes(irregularMoons) asset.onInitialize(function() for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moon in ipairs(moon_labels) do + openspace.addSceneGraphNode(moon) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset index 10119fa76f..cc39438f0a 100644 --- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset @@ -99,15 +99,54 @@ local majorMoons = { } } +-- Generate all moon labels +local moon_labels = {} + +for i, moon in ipairs(majorMoons) do + local moonName = moon.GUI.Name or moon.Identifier + moon_labels[i] = { + Identifier = moon.Identifier .. "Label", + Parent = moon.Identifier, + Renderable = { + Enabled = false, + Type = "RenderableLabel", + Text = moonName, + FontSize = 70.0, + Size = 5.9, + MinMaxSize = { 1, 25 }, + OrientationOption = "Camera View Direction", + BlendMode = "Normal", + EnableFading = true, + FadeUnit = "Mm", + FadeDistances = { 175.0, 4000.0 }, + FadeWidths = { 35.0, 2000.0 } + }, + Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" }, + GUI = { + Name = moonName .. " Label", + Path = "/Solar System/Planets/Uranus/Moons", + Description = "Label for Uranus' moon " .. moonName .. " (Major moon)" + } + } +end + local nodes = proceduralGlobes.createGlobes(majorMoons) asset.onInitialize(function() for _, node in ipairs(nodes) do openspace.addSceneGraphNode(node) end + + for _, moon in ipairs(moon_labels) do + openspace.addSceneGraphNode(moon) + end end) asset.onDeinitialize(function() + for i = #moon_labels, 1, -1 do + openspace.removeSceneGraphNode(moon_labels[i]) + end + for i = #nodes, 1, -1 do openspace.removeSceneGraphNode(nodes[i]) end diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset index 1256804acf..58370d57f2 100644 --- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset +++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset @@ -39,10 +39,14 @@ local UranusLabel = { Type = "RenderableLabel", Text = "Uranus", FontSize = 70.0, - Size = 8.86, - MinMaxSize = { 1, 100 }, + Size = 9.0, + MinMaxSize = { 1, 80 }, OrientationOption = "Camera View Direction", - BlendMode = "Additive" + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "au", + FadeDistances = { 2.5, 100.0 }, + FadeWidths = { 1.0, 120.0 } }, Tag = { "solarsystem_labels" }, GUI = { diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset index 285f6587f3..4ec5f82398 100644 --- a/data/assets/scene/solarsystem/planets/venus/venus.asset +++ b/data/assets/scene/solarsystem/planets/venus/venus.asset @@ -64,10 +64,14 @@ local VenusLabel = { Type = "RenderableLabel", Text = "Venus", FontSize = 70.0, - Size = 8.54, - MinMaxSize = { 1, 100 }, + Size = 8.5, + MinMaxSize = { 1, 40 }, OrientationOption = "Camera View Direction", - BlendMode = "Additive" + BlendMode = "Additive", + EnableFading = true, + FadeUnit = "au", + FadeDistances = { 1.5, 25.0 }, + FadeWidths = { 1.0, 35.0 } }, Tag = { "solarsystem_labels" }, GUI = { diff --git a/data/assets/util/joysticks/ps4.asset b/data/assets/util/joysticks/ps4.asset index 58441ee338..770f138fcd 100644 --- a/data/assets/util/joysticks/ps4.asset +++ b/data/assets/util/joysticks/ps4.asset @@ -182,7 +182,7 @@ asset.onInitialize(function() name, controller.Square, [[ - -- <-- Copy paste your custum script here + -- <-- Copy paste your custom script here ]], "" -- <-- Description of your custom script here (optional) ) @@ -192,7 +192,7 @@ asset.onInitialize(function() name, controller.Share, [[ - -- <-- Copy paste your custum script here + -- <-- Copy paste your custom script here ]], "" -- <-- Description of your custom script here (optional) ) @@ -202,7 +202,7 @@ asset.onInitialize(function() name, controller.LeftStickButton, [[ - -- <-- Copy paste your custum script here + -- <-- Copy paste your custom script here ]], "" -- <-- Description of your custom script here (optional) ) @@ -212,7 +212,7 @@ asset.onInitialize(function() name, controller.PS, [[ - -- <-- Copy paste your custum script here + -- <-- Copy paste your custom script here ]], "" -- <-- Description of your custom script here (optional) ) diff --git a/data/assets/util/joysticks/xbox-wireless.asset b/data/assets/util/joysticks/xbox-wireless.asset index c6d3a087df..0c98947505 100644 --- a/data/assets/util/joysticks/xbox-wireless.asset +++ b/data/assets/util/joysticks/xbox-wireless.asset @@ -180,7 +180,7 @@ asset.onInitialize(function() name, controller.X, [[ - -- <-- Copy paste your custum script here + -- <-- Copy paste your custom script here ]], "" -- <-- Description of your custom script here (optional) ) @@ -190,7 +190,7 @@ asset.onInitialize(function() name, controller.LeftStickButton, [[ - -- <-- Copy paste your custum script here + -- <-- Copy paste your custom script here ]], "" -- <-- Description of your custom script here (optional) ) diff --git a/data/assets/util/joysticks/xbox.asset b/data/assets/util/joysticks/xbox.asset index e1e93600fb..03685efbfe 100644 --- a/data/assets/util/joysticks/xbox.asset +++ b/data/assets/util/joysticks/xbox.asset @@ -180,7 +180,7 @@ asset.onInitialize(function() name, controller.X, [[ - -- <-- Copy paste your custum script here + -- <-- Copy paste your custom script here ]], "" -- <-- Description of your custom script here (optional) ) @@ -190,7 +190,7 @@ asset.onInitialize(function() name, controller.LeftStickButton, [[ - -- <-- Copy paste your custum script here + -- <-- Copy paste your custom script here ]], "" -- <-- Description of your custom script here (optional) ) diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset index 12626bcaa8..1a39190148 100644 --- a/data/assets/util/webgui.asset +++ b/data/assets/util/webgui.asset @@ -3,7 +3,7 @@ asset.require("./static_server") local guiCustomization = asset.require("customization/gui") -- Select which commit hashes to use for the frontend and backend -local frontendHash = "c87b94d6b44f44f049cf33c3b85cdcf38a8c3c9b" +local frontendHash = "97e50c5c6182bba2608868a54b4bc954115f238a" local dataProvider = "data.openspaceproject.com/files/webgui" local frontend = asset.syncedResource({ @@ -72,7 +72,7 @@ asset.onDeinitialize(function () end) function setCefRoute(route) - local port = 4680 + local port = openspace.getPropertyValue("Modules.WebGui.Port") -- As a developer, you can manually serve the webgui from port 4690 -- with the command `npm start` in the web gui repository if guiCustomization.webguiDevelopmentMode then @@ -90,7 +90,6 @@ asset.export("setCefRoute", setCefRoute) asset.meta = { Name = "WebGUI", Version = "0.1", - Description = "insert CEF rant", Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license" diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt index 3e17fac68d..b696061e25 100644 --- a/ext/CMakeLists.txt +++ b/ext/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of 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 8e8bfe3b9d..804a1d7612 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 8e8bfe3b9d2e6d9354e265efd01dd263a708ccf9 +Subproject commit 804a1d76128c61462cc22e6e325248ce9bca37db diff --git a/include/openspace/camera/camera.h b/include/openspace/camera/camera.h index 5e66fb54b7..460b260bbb 100644 --- a/include/openspace/camera/camera.h +++ b/include/openspace/camera/camera.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/camera/camerapose.h b/include/openspace/camera/camerapose.h index 590cab08f3..d17ae6c054 100644 --- a/include/openspace/camera/camerapose.h +++ b/include/openspace/camera/camerapose.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/core_registration.h b/include/openspace/documentation/core_registration.h index c2e6fa2130..d0ff377dd1 100644 --- a/include/openspace/documentation/core_registration.h +++ b/include/openspace/documentation/core_registration.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 c16bf21d57..65a7531cd0 100644 --- a/include/openspace/documentation/documentation.h +++ b/include/openspace/documentation/documentation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 89f14078fa..8e53e33eab 100644 --- a/include/openspace/documentation/documentationengine.h +++ b/include/openspace/documentation/documentationengine.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 b494077c7e..d4d53f0a39 100644 --- a/include/openspace/documentation/documentationgenerator.h +++ b/include/openspace/documentation/documentationgenerator.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 2c55fb2dc3..5e90b29ea2 100644 --- a/include/openspace/documentation/verifier.h +++ b/include/openspace/documentation/verifier.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -174,6 +174,8 @@ private: * refers to an existing file on disk. */ struct FileVerifier : public StringVerifier { + FileVerifier(); + TestResult operator()(const ghoul::Dictionary& dict, const std::string& key) const override; @@ -185,6 +187,8 @@ struct FileVerifier : public StringVerifier { * refers to an existing directory on disk. */ struct DirectoryVerifier : public StringVerifier { + DirectoryVerifier(); + TestResult operator()(const ghoul::Dictionary& dict, const std::string& key) const override; @@ -196,6 +200,8 @@ struct DirectoryVerifier : public StringVerifier { * a valid date time */ struct DateTimeVerifier : public StringVerifier { + DateTimeVerifier(); + TestResult operator()(const ghoul::Dictionary& dict, const std::string& key) const override; diff --git a/include/openspace/documentation/verifier.inl b/include/openspace/documentation/verifier.inl index 3bec9cbbf5..ff0a194f2b 100644 --- a/include/openspace/documentation/verifier.inl +++ b/include/openspace/documentation/verifier.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 0b7b10956e..0fca1bcb60 100644 --- a/include/openspace/engine/configuration.h +++ b/include/openspace/engine/configuration.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 a0e44887b1..1eda760dbc 100644 --- a/include/openspace/engine/downloadmanager.h +++ b/include/openspace/engine/downloadmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 918a0fba83..f6e294552b 100644 --- a/include/openspace/engine/globals.h +++ b/include/openspace/engine/globals.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 c6363785a8..a0f606b65c 100644 --- a/include/openspace/engine/globalscallbacks.h +++ b/include/openspace/engine/globalscallbacks.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 0d79e429c8..99f39d6f3e 100644 --- a/include/openspace/engine/logfactory.h +++ b/include/openspace/engine/logfactory.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 d297975f19..f25555f46b 100644 --- a/include/openspace/engine/moduleengine.h +++ b/include/openspace/engine/moduleengine.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 155746fd28..b699db55be 100644 --- a/include/openspace/engine/moduleengine.inl +++ b/include/openspace/engine/moduleengine.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 adef08025d..74a0607bb5 100644 --- a/include/openspace/engine/openspaceengine.h +++ b/include/openspace/engine/openspaceengine.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -64,7 +64,7 @@ struct ShutdownInformation { struct CommandlineArguments { std::string configurationName; - std::string configurationOverride; + std::vector configurationOverride; }; class OpenSpaceEngine : public properties::PropertyOwner { @@ -145,6 +145,7 @@ private: properties::BoolProperty _printEvents; properties::OptionProperty _visibility; properties::BoolProperty _showHiddenSceneGraphNodes; + properties::BoolProperty _disableAllMouseInputs; std::unique_ptr _scene; std::unique_ptr _assetManager; diff --git a/include/openspace/engine/syncengine.h b/include/openspace/engine/syncengine.h index a3dcad6330..ebad6bae0a 100644 --- a/include/openspace/engine/syncengine.h +++ b/include/openspace/engine/syncengine.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 5d707ed958..526e2e54f9 100644 --- a/include/openspace/engine/windowdelegate.h +++ b/include/openspace/engine/windowdelegate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/events/event.h b/include/openspace/events/event.h index dc89bcab1e..a7a3f2cd52 100644 --- a/include/openspace/events/event.h +++ b/include/openspace/events/event.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/events/eventengine.h b/include/openspace/events/eventengine.h index 6ee5e6a049..bb70e05b86 100644 --- a/include/openspace/events/eventengine.h +++ b/include/openspace/events/eventengine.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/events/eventengine.inl b/include/openspace/events/eventengine.inl index bfa07587c9..510bb75db8 100644 --- a/include/openspace/events/eventengine.inl +++ b/include/openspace/events/eventengine.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/action.h b/include/openspace/interaction/action.h index 72c35cd139..af46d8c787 100644 --- a/include/openspace/interaction/action.h +++ b/include/openspace/interaction/action.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -57,7 +57,7 @@ struct Action { /// This variable defines a subdivision of where this action is placed in a user /// interface. The individual path components are separated by '/' with a leading '/' /// for the root path - std::string guiPath; + std::string guiPath = "/"; /// If this value is set to `Yes`, the execution of this action is synchronized to /// other OpenSpace instances, for example other nodes in a cluster environment, or diff --git a/include/openspace/interaction/actionmanager.h b/include/openspace/interaction/actionmanager.h index b3a9849466..9054b3fc09 100644 --- a/include/openspace/interaction/actionmanager.h +++ b/include/openspace/interaction/actionmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 587263eb55..979899fb0f 100644 --- a/include/openspace/interaction/camerainteractionstates.h +++ b/include/openspace/interaction/camerainteractionstates.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 d6f19418c6..7f71c8f13b 100644 --- a/include/openspace/interaction/delayedvariable.h +++ b/include/openspace/interaction/delayedvariable.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 c5c799ea16..e626610442 100644 --- a/include/openspace/interaction/delayedvariable.inl +++ b/include/openspace/interaction/delayedvariable.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/interactionmonitor.h b/include/openspace/interaction/interactionmonitor.h index 7326a276f8..9cd80e210d 100644 --- a/include/openspace/interaction/interactionmonitor.h +++ b/include/openspace/interaction/interactionmonitor.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 fb7e942597..867b63ab66 100644 --- a/include/openspace/interaction/interpolator.h +++ b/include/openspace/interaction/interpolator.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 48877234db..5f9d3f45cc 100644 --- a/include/openspace/interaction/interpolator.inl +++ b/include/openspace/interaction/interpolator.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 2e61f4a666..214ef79007 100644 --- a/include/openspace/interaction/joystickcamerastates.h +++ b/include/openspace/interaction/joystickcamerastates.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 5acf4feb5d..eeb394b570 100644 --- a/include/openspace/interaction/joystickinputstate.h +++ b/include/openspace/interaction/joystickinputstate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 20190c5a6d..af131d4fb3 100644 --- a/include/openspace/interaction/keybindingmanager.h +++ b/include/openspace/interaction/keybindingmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/keyboardinputstate.h b/include/openspace/interaction/keyboardinputstate.h index 35d3616a83..0eb0fdf9ac 100644 --- a/include/openspace/interaction/keyboardinputstate.h +++ b/include/openspace/interaction/keyboardinputstate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 9217703e49..56f70f2085 100644 --- a/include/openspace/interaction/mousecamerastates.h +++ b/include/openspace/interaction/mousecamerastates.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/mouseinputstate.h b/include/openspace/interaction/mouseinputstate.h index 32eea582b5..67809b94b7 100644 --- a/include/openspace/interaction/mouseinputstate.h +++ b/include/openspace/interaction/mouseinputstate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/scriptcamerastates.h b/include/openspace/interaction/scriptcamerastates.h index 74e0ba4155..716e145670 100644 --- a/include/openspace/interaction/scriptcamerastates.h +++ b/include/openspace/interaction/scriptcamerastates.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 b7bf00fb52..fb69d6fba7 100644 --- a/include/openspace/interaction/sessionrecording.h +++ b/include/openspace/interaction/sessionrecording.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 d613598338..9a1ad5298a 100644 --- a/include/openspace/interaction/sessionrecording.inl +++ b/include/openspace/interaction/sessionrecording.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/tasks/convertrecfileversiontask.h b/include/openspace/interaction/tasks/convertrecfileversiontask.h index c5e108bedb..16ee58d6cb 100644 --- a/include/openspace/interaction/tasks/convertrecfileversiontask.h +++ b/include/openspace/interaction/tasks/convertrecfileversiontask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/tasks/convertrecformattask.h b/include/openspace/interaction/tasks/convertrecformattask.h index dbcf695bc2..538f8324a7 100644 --- a/include/openspace/interaction/tasks/convertrecformattask.h +++ b/include/openspace/interaction/tasks/convertrecformattask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 b2e9fb921b..f27b738332 100644 --- a/include/openspace/interaction/touchbar.h +++ b/include/openspace/interaction/touchbar.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/websocketcamerastates.h b/include/openspace/interaction/websocketcamerastates.h index 3fc129be5b..1ed1e933a8 100644 --- a/include/openspace/interaction/websocketcamerastates.h +++ b/include/openspace/interaction/websocketcamerastates.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/websocketinputstate.h b/include/openspace/interaction/websocketinputstate.h index db39cf1edb..f77fb62630 100644 --- a/include/openspace/interaction/websocketinputstate.h +++ b/include/openspace/interaction/websocketinputstate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 bb8ce73463..ff3a2a6458 100644 --- a/include/openspace/json.h +++ b/include/openspace/json.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 9ddb6d898d..cc91d05220 100644 --- a/include/openspace/mission/mission.h +++ b/include/openspace/mission/mission.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 8e31baa93d..a201e8e5b8 100644 --- a/include/openspace/mission/missionmanager.h +++ b/include/openspace/mission/missionmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/keyframenavigator.h b/include/openspace/navigation/keyframenavigator.h index 4c0cf75d0d..e38fba0bfb 100644 --- a/include/openspace/navigation/keyframenavigator.h +++ b/include/openspace/navigation/keyframenavigator.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/navigationhandler.h b/include/openspace/navigation/navigationhandler.h index 5899b7b9fb..4981274e08 100644 --- a/include/openspace/navigation/navigationhandler.h +++ b/include/openspace/navigation/navigationhandler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -91,6 +91,8 @@ public: void keyboardCallback(Key key, KeyModifier modifier, KeyAction action); bool disabledKeybindings() const; + bool disabledMouse() const; + bool disabledJoystick() const; void mouseButtonCallback(MouseButton button, MouseAction action); void mousePositionCallback(double x, double y); diff --git a/include/openspace/navigation/navigationstate.h b/include/openspace/navigation/navigationstate.h index 20e838b495..5418d322a6 100644 --- a/include/openspace/navigation/navigationstate.h +++ b/include/openspace/navigation/navigationstate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/orbitalnavigator.h b/include/openspace/navigation/orbitalnavigator.h index 1b2eeb346f..1fa4a95bfb 100644 --- a/include/openspace/navigation/orbitalnavigator.h +++ b/include/openspace/navigation/orbitalnavigator.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/path.h b/include/openspace/navigation/path.h index fc9fd79a0e..5ec915cae9 100644 --- a/include/openspace/navigation/path.h +++ b/include/openspace/navigation/path.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/pathcurve.h b/include/openspace/navigation/pathcurve.h index 9f9e99b42c..7e8e549e71 100644 --- a/include/openspace/navigation/pathcurve.h +++ b/include/openspace/navigation/pathcurve.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/pathcurves/avoidcollisioncurve.h b/include/openspace/navigation/pathcurves/avoidcollisioncurve.h index 38f6352eb3..e4af29a49e 100644 --- a/include/openspace/navigation/pathcurves/avoidcollisioncurve.h +++ b/include/openspace/navigation/pathcurves/avoidcollisioncurve.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/pathcurves/zoomoutoverviewcurve.h b/include/openspace/navigation/pathcurves/zoomoutoverviewcurve.h index 06ec18927c..b040da1d88 100644 --- a/include/openspace/navigation/pathcurves/zoomoutoverviewcurve.h +++ b/include/openspace/navigation/pathcurves/zoomoutoverviewcurve.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/pathnavigator.h b/include/openspace/navigation/pathnavigator.h index 8f3d8d1895..97a19ba703 100644 --- a/include/openspace/navigation/pathnavigator.h +++ b/include/openspace/navigation/pathnavigator.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/waypoint.h b/include/openspace/navigation/waypoint.h index 39624bfd74..918e66ec7d 100644 --- a/include/openspace/navigation/waypoint.h +++ b/include/openspace/navigation/waypoint.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 352e8e0093..909e7284bd 100644 --- a/include/openspace/network/messagestructures.h +++ b/include/openspace/network/messagestructures.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/messagestructureshelper.h b/include/openspace/network/messagestructureshelper.h index 1f3465e140..3c0c2678d2 100644 --- a/include/openspace/network/messagestructureshelper.h +++ b/include/openspace/network/messagestructureshelper.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 1bb61b0a14..d3468f7a4a 100644 --- a/include/openspace/network/parallelconnection.h +++ b/include/openspace/network/parallelconnection.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 fb0b70b104..9a0d3ab599 100644 --- a/include/openspace/network/parallelpeer.h +++ b/include/openspace/network/parallelpeer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/list/doublelistproperty.h b/include/openspace/properties/list/doublelistproperty.h index ca4f1d8b24..132ab472fc 100644 --- a/include/openspace/properties/list/doublelistproperty.h +++ b/include/openspace/properties/list/doublelistproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/list/intlistproperty.h b/include/openspace/properties/list/intlistproperty.h index 2e13e0a4ac..ce9c224744 100644 --- a/include/openspace/properties/list/intlistproperty.h +++ b/include/openspace/properties/list/intlistproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/list/stringlistproperty.h b/include/openspace/properties/list/stringlistproperty.h index 1b1cfca68d..80c82c6d46 100644 --- a/include/openspace/properties/list/stringlistproperty.h +++ b/include/openspace/properties/list/stringlistproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/listproperty.h b/include/openspace/properties/listproperty.h index f7628fe864..22576fe392 100644 --- a/include/openspace/properties/listproperty.h +++ b/include/openspace/properties/listproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/listproperty.inl b/include/openspace/properties/listproperty.inl index eebe7a3bc9..c817e934f7 100644 --- a/include/openspace/properties/listproperty.inl +++ b/include/openspace/properties/listproperty.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 8b3293b1aa..fa22d6d1a4 100644 --- a/include/openspace/properties/matrix/dmat2property.h +++ b/include/openspace/properties/matrix/dmat2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 58c5610c4a..8b8845142f 100644 --- a/include/openspace/properties/matrix/dmat3property.h +++ b/include/openspace/properties/matrix/dmat3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 f05988cad8..7e08312c69 100644 --- a/include/openspace/properties/matrix/dmat4property.h +++ b/include/openspace/properties/matrix/dmat4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 203f25ad2e..220d4a1cfe 100644 --- a/include/openspace/properties/matrix/mat2property.h +++ b/include/openspace/properties/matrix/mat2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 01c74a913d..35e990e191 100644 --- a/include/openspace/properties/matrix/mat3property.h +++ b/include/openspace/properties/matrix/mat3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 6a82647161..3383fdd6f7 100644 --- a/include/openspace/properties/matrix/mat4property.h +++ b/include/openspace/properties/matrix/mat4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 06f2f5d68c..2d2b1ceeec 100644 --- a/include/openspace/properties/numericalproperty.h +++ b/include/openspace/properties/numericalproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 02931e6eec..58336fbc91 100644 --- a/include/openspace/properties/numericalproperty.inl +++ b/include/openspace/properties/numericalproperty.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 a618bce27a..a1e826c4de 100644 --- a/include/openspace/properties/optionproperty.h +++ b/include/openspace/properties/optionproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 49fa955836..de58ff6559 100644 --- a/include/openspace/properties/property.h +++ b/include/openspace/properties/property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 9dd693fc69..bae97cfc22 100644 --- a/include/openspace/properties/propertyowner.h +++ b/include/openspace/properties/propertyowner.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 c100171f3b..2b844c9657 100644 --- a/include/openspace/properties/scalar/boolproperty.h +++ b/include/openspace/properties/scalar/boolproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 65b3c8f549..7941dbfca9 100644 --- a/include/openspace/properties/scalar/doubleproperty.h +++ b/include/openspace/properties/scalar/doubleproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 b52f9d7754..6da513e6f9 100644 --- a/include/openspace/properties/scalar/floatproperty.h +++ b/include/openspace/properties/scalar/floatproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 906dbddaf5..0b6e0d4a89 100644 --- a/include/openspace/properties/scalar/intproperty.h +++ b/include/openspace/properties/scalar/intproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 f8b7586347..c73c40acd7 100644 --- a/include/openspace/properties/scalar/longproperty.h +++ b/include/openspace/properties/scalar/longproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 b60cd2c721..e6989d82ec 100644 --- a/include/openspace/properties/scalar/shortproperty.h +++ b/include/openspace/properties/scalar/shortproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 9064f1a386..91b5390bf0 100644 --- a/include/openspace/properties/scalar/uintproperty.h +++ b/include/openspace/properties/scalar/uintproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 f5c7e3a31f..d5960d8373 100644 --- a/include/openspace/properties/scalar/ulongproperty.h +++ b/include/openspace/properties/scalar/ulongproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 12b69295e6..dc3ea06b72 100644 --- a/include/openspace/properties/scalar/ushortproperty.h +++ b/include/openspace/properties/scalar/ushortproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 21c44985a0..5f86acc30b 100644 --- a/include/openspace/properties/selectionproperty.h +++ b/include/openspace/properties/selectionproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 39f6b4433f..2c4881ca25 100644 --- a/include/openspace/properties/stringproperty.h +++ b/include/openspace/properties/stringproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 4bbb48e423..c70a0ebd77 100644 --- a/include/openspace/properties/templateproperty.h +++ b/include/openspace/properties/templateproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 014e690192..7ec9ea57dc 100644 --- a/include/openspace/properties/templateproperty.inl +++ b/include/openspace/properties/templateproperty.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 f3ec305720..b8af7fa393 100644 --- a/include/openspace/properties/triggerproperty.h +++ b/include/openspace/properties/triggerproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 1b634c18f1..f97430e286 100644 --- a/include/openspace/properties/vector/dvec2property.h +++ b/include/openspace/properties/vector/dvec2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 cd8d4cead6..6fe23b828f 100644 --- a/include/openspace/properties/vector/dvec3property.h +++ b/include/openspace/properties/vector/dvec3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 43f1259f36..0e505ec96f 100644 --- a/include/openspace/properties/vector/dvec4property.h +++ b/include/openspace/properties/vector/dvec4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 d8b20fa684..8929c1b04f 100644 --- a/include/openspace/properties/vector/ivec2property.h +++ b/include/openspace/properties/vector/ivec2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 573d8b80e7..070ec0528e 100644 --- a/include/openspace/properties/vector/ivec3property.h +++ b/include/openspace/properties/vector/ivec3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 841bb0404b..8cecdb6959 100644 --- a/include/openspace/properties/vector/ivec4property.h +++ b/include/openspace/properties/vector/ivec4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 5ca0850741..dd44d23f79 100644 --- a/include/openspace/properties/vector/uvec2property.h +++ b/include/openspace/properties/vector/uvec2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 1f24f3411b..9e35173c7a 100644 --- a/include/openspace/properties/vector/uvec3property.h +++ b/include/openspace/properties/vector/uvec3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 5391febdec..88f52d901e 100644 --- a/include/openspace/properties/vector/uvec4property.h +++ b/include/openspace/properties/vector/uvec4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 0af248451e..73806945c0 100644 --- a/include/openspace/properties/vector/vec2property.h +++ b/include/openspace/properties/vector/vec2property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 1f6392bf26..7482805d19 100644 --- a/include/openspace/properties/vector/vec3property.h +++ b/include/openspace/properties/vector/vec3property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 a29fc2280b..74405650f1 100644 --- a/include/openspace/properties/vector/vec4property.h +++ b/include/openspace/properties/vector/vec4property.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 9c3a84e932..37e31077d5 100644 --- a/include/openspace/query/query.h +++ b/include/openspace/query/query.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 a4662fd5e4..64603cc36d 100644 --- a/include/openspace/rendering/dashboard.h +++ b/include/openspace/rendering/dashboard.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 fd43519952..9658656269 100644 --- a/include/openspace/rendering/dashboarditem.h +++ b/include/openspace/rendering/dashboarditem.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/dashboardtextitem.h b/include/openspace/rendering/dashboardtextitem.h index e7ee97f2b4..bf5fa72011 100644 --- a/include/openspace/rendering/dashboardtextitem.h +++ b/include/openspace/rendering/dashboardtextitem.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 7c305b2e38..8d0b4f68a1 100644 --- a/include/openspace/rendering/deferredcaster.h +++ b/include/openspace/rendering/deferredcaster.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 16e662e2ad..4520801127 100644 --- a/include/openspace/rendering/deferredcasterlistener.h +++ b/include/openspace/rendering/deferredcasterlistener.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 67c0ec8f4a..6aeaa4ed37 100644 --- a/include/openspace/rendering/deferredcastermanager.h +++ b/include/openspace/rendering/deferredcastermanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 8f26e871df..77733f4750 100644 --- a/include/openspace/rendering/framebufferrenderer.h +++ b/include/openspace/rendering/framebufferrenderer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 4b700e326b..6631b7ccf8 100644 --- a/include/openspace/rendering/helper.h +++ b/include/openspace/rendering/helper.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 7aeb5649bf..0dec3d3986 100644 --- a/include/openspace/rendering/loadingscreen.h +++ b/include/openspace/rendering/loadingscreen.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 1f2de27602..88086bc3c0 100644 --- a/include/openspace/rendering/luaconsole.h +++ b/include/openspace/rendering/luaconsole.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 1b8d8e9504..678b9e13a3 100644 --- a/include/openspace/rendering/raycasterlistener.h +++ b/include/openspace/rendering/raycasterlistener.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 9028955ff0..915c7be07f 100644 --- a/include/openspace/rendering/raycastermanager.h +++ b/include/openspace/rendering/raycastermanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 401257047d..a445f759ca 100644 --- a/include/openspace/rendering/renderable.h +++ b/include/openspace/rendering/renderable.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 a33f47fcf8..14bd89361c 100644 --- a/include/openspace/rendering/renderengine.h +++ b/include/openspace/rendering/renderengine.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 03192c8f8f..5db751bd60 100644 --- a/include/openspace/rendering/screenspacerenderable.h +++ b/include/openspace/rendering/screenspacerenderable.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/texturecomponent.h b/include/openspace/rendering/texturecomponent.h index 2d41fd2073..f00292705a 100644 --- a/include/openspace/rendering/texturecomponent.h +++ b/include/openspace/rendering/texturecomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 53bb1fb172..c8e34382b8 100644 --- a/include/openspace/rendering/transferfunction.h +++ b/include/openspace/rendering/transferfunction.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 23e1bfa4ef..d1d63778da 100644 --- a/include/openspace/rendering/volume.h +++ b/include/openspace/rendering/volume.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 2e9abd0ed3..cd4163f18c 100644 --- a/include/openspace/rendering/volumeraycaster.h +++ b/include/openspace/rendering/volumeraycaster.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 819131eadb..fa3c830f55 100644 --- a/include/openspace/scene/asset.h +++ b/include/openspace/scene/asset.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 fb00b2e9a8..1063fc08c0 100644 --- a/include/openspace/scene/assetmanager.h +++ b/include/openspace/scene/assetmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 fbc3c103fd..bf9165f390 100644 --- a/include/openspace/scene/lightsource.h +++ b/include/openspace/scene/lightsource.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/profile.h b/include/openspace/scene/profile.h index bb73fa8ced..9579a726a5 100644 --- a/include/openspace/scene/profile.h +++ b/include/openspace/scene/profile.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 53cd74f9d8..6af8c299fc 100644 --- a/include/openspace/scene/rotation.h +++ b/include/openspace/scene/rotation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 68685943b8..cdfc79308a 100644 --- a/include/openspace/scene/scale.h +++ b/include/openspace/scene/scale.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 cbd3368a25..6eeb092db7 100644 --- a/include/openspace/scene/scene.h +++ b/include/openspace/scene/scene.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -84,12 +85,6 @@ public: Scene(std::unique_ptr initializer); virtual ~Scene() override; - /** - * Clear the scene graph, - * i.e. set the root node to nullptr and deallocate all scene graph nodes. - */ - void clear(); - /** * Attach node to the root */ @@ -182,12 +177,16 @@ public: * \param prop The property that should be called to update itself every frame until * \p durationSeconds seconds have passed * \param durationSeconds The number of seconds that the interpolation will run for + * \param postScript A Lua script that will be executed when the interpolation + * finishes + * \param easingFunction A function that determines who the interpolation occurs * * \pre \p prop must not be \c nullptr * \pre \p durationSeconds must be positive and not 0 * \post A new interpolation record exists for \p that is not expired */ void addPropertyInterpolation(properties::Property* prop, float durationSeconds, + std::string postScript = "", ghoul::EasingFunction easingFunction = ghoul::EasingFunction::Linear); /** @@ -259,6 +258,13 @@ public: std::vector propertiesMatchingRegex( std::string propertyString); + /** + * Returns a list of all unique tags that are used in the currently loaded scene. + * + * \return A list of all unique tags that are used in the currently loaded scene. + */ + std::vector allTags(); + private: /** * Accepts string version of a property value from a profile, converts it to the @@ -339,6 +345,8 @@ private: properties::Property* prop; std::chrono::time_point beginTime; float durationSeconds; + std::string postScript; + ghoul::EasingFunc easingFunction; bool isExpired = false; }; diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h index 31c4f97018..b933a27a75 100644 --- a/include/openspace/scene/scenegraphnode.h +++ b/include/openspace/scene/scenegraphnode.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 bf4b3acfe6..d88965c67c 100644 --- a/include/openspace/scene/sceneinitializer.h +++ b/include/openspace/scene/sceneinitializer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 46c8c85396..babd9101be 100644 --- a/include/openspace/scene/scenelicensewriter.h +++ b/include/openspace/scene/scenelicensewriter.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 c89f4f9bc2..28328d8977 100644 --- a/include/openspace/scene/timeframe.h +++ b/include/openspace/scene/timeframe.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 95e32101aa..306b321345 100644 --- a/include/openspace/scene/translation.h +++ b/include/openspace/scene/translation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 5e5f642d68..03e0b71ce4 100644 --- a/include/openspace/scripting/lualibrary.h +++ b/include/openspace/scripting/lualibrary.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 9267963c47..2b5d22f039 100644 --- a/include/openspace/scripting/scriptengine.h +++ b/include/openspace/scripting/scriptengine.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 2479bb0570..474d0e9478 100644 --- a/include/openspace/scripting/scriptscheduler.h +++ b/include/openspace/scripting/scriptscheduler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 eb7acd0812..4bcd78a62b 100644 --- a/include/openspace/scripting/systemcapabilitiesbinding.h +++ b/include/openspace/scripting/systemcapabilitiesbinding.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 985eca59df..8b5ce7ac2e 100644 --- a/include/openspace/util/blockplaneintersectiongeometry.h +++ b/include/openspace/util/blockplaneintersectiongeometry.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 a4ba659bf3..caf0003416 100644 --- a/include/openspace/util/boxgeometry.h +++ b/include/openspace/util/boxgeometry.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/collisionhelper.h b/include/openspace/util/collisionhelper.h index 514fe42f20..166c7767d5 100644 --- a/include/openspace/util/collisionhelper.h +++ b/include/openspace/util/collisionhelper.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 a0ab5b0bdc..32dacfa3cf 100644 --- a/include/openspace/util/concurrentjobmanager.h +++ b/include/openspace/util/concurrentjobmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 aa621debb3..73491966c0 100644 --- a/include/openspace/util/concurrentjobmanager.inl +++ b/include/openspace/util/concurrentjobmanager.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 46d8c97d8a..ded68bcc66 100644 --- a/include/openspace/util/concurrentqueue.h +++ b/include/openspace/util/concurrentqueue.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 6ca2b5b298..2a20e42f24 100644 --- a/include/openspace/util/concurrentqueue.inl +++ b/include/openspace/util/concurrentqueue.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/coordinateconversion.h b/include/openspace/util/coordinateconversion.h index 437d534611..56d50ddf4c 100644 --- a/include/openspace/util/coordinateconversion.h +++ b/include/openspace/util/coordinateconversion.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 f4e31aa7cb..d5ddc506b0 100644 --- a/include/openspace/util/distanceconstants.h +++ b/include/openspace/util/distanceconstants.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 3ce2565515..989951b229 100644 --- a/include/openspace/util/distanceconversion.h +++ b/include/openspace/util/distanceconversion.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 c085252382..3ed2ff9895 100644 --- a/include/openspace/util/factorymanager.h +++ b/include/openspace/util/factorymanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 841f5661a4..6f2765e70b 100644 --- a/include/openspace/util/factorymanager.inl +++ b/include/openspace/util/factorymanager.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 828be5609e..4ce1fb2c5f 100644 --- a/include/openspace/util/histogram.h +++ b/include/openspace/util/histogram.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 36a3483884..e23c5a37aa 100644 --- a/include/openspace/util/httprequest.h +++ b/include/openspace/util/httprequest.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 0a5f841eb1..ba7da7c906 100644 --- a/include/openspace/util/job.h +++ b/include/openspace/util/job.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/json_helper.h b/include/openspace/util/json_helper.h index ba31cd5879..390edcab52 100644 --- a/include/openspace/util/json_helper.h +++ b/include/openspace/util/json_helper.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/json_helper.inl b/include/openspace/util/json_helper.inl index d48cc4b699..e028b0a859 100644 --- a/include/openspace/util/json_helper.inl +++ b/include/openspace/util/json_helper.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 b37ef644e6..a3e7dcd4df 100644 --- a/include/openspace/util/keys.h +++ b/include/openspace/util/keys.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/memorymanager.h b/include/openspace/util/memorymanager.h index 290d76e553..a4cc780cc5 100644 --- a/include/openspace/util/memorymanager.h +++ b/include/openspace/util/memorymanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 05cdb413cf..f20fe5ab1e 100644 --- a/include/openspace/util/mouse.h +++ b/include/openspace/util/mouse.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 2c4f07dfbe..c3f2b8699c 100644 --- a/include/openspace/util/openspacemodule.h +++ b/include/openspace/util/openspacemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/planegeometry.h b/include/openspace/util/planegeometry.h index e4e1d82420..43af1e0ce1 100644 --- a/include/openspace/util/planegeometry.h +++ b/include/openspace/util/planegeometry.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 298722725d..61f9bcd08e 100644 --- a/include/openspace/util/progressbar.h +++ b/include/openspace/util/progressbar.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 50a0f46fad..ed0bce25eb 100644 --- a/include/openspace/util/resourcesynchronization.h +++ b/include/openspace/util/resourcesynchronization.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 aeb9fede35..d3d1e8977c 100644 --- a/include/openspace/util/screenlog.h +++ b/include/openspace/util/screenlog.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/sphere.h b/include/openspace/util/sphere.h index 28a92c04d6..b7b97b9b24 100644 --- a/include/openspace/util/sphere.h +++ b/include/openspace/util/sphere.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 6d0958243b..b7b4724de1 100644 --- a/include/openspace/util/spicemanager.h +++ b/include/openspace/util/spicemanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -557,6 +557,12 @@ public: ephemerisTime, format )); } + + if (outBuf[0] == '*') { + // The conversion failed and we need to use et2utc + constexpr int SecondsPrecision = 3; + et2utc_c(ephemerisTime, "C", SecondsPrecision, bufferSize, outBuf); + } } std::string dateFromEphemerisTime(double ephemerisTime, const char* format); diff --git a/include/openspace/util/syncable.h b/include/openspace/util/syncable.h index cda03ac0b4..c2738ecec9 100644 --- a/include/openspace/util/syncable.h +++ b/include/openspace/util/syncable.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 b6af66a048..22e6dfc2b9 100644 --- a/include/openspace/util/syncbuffer.h +++ b/include/openspace/util/syncbuffer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 84503a3392..b562be5749 100644 --- a/include/openspace/util/syncbuffer.inl +++ b/include/openspace/util/syncbuffer.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 97fc19cbcd..a51b7627cf 100644 --- a/include/openspace/util/syncdata.h +++ b/include/openspace/util/syncdata.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 739af979a8..0f18f30c33 100644 --- a/include/openspace/util/syncdata.inl +++ b/include/openspace/util/syncdata.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 0f268aac21..082d8b1797 100644 --- a/include/openspace/util/task.h +++ b/include/openspace/util/task.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 b79980742e..31b43633bd 100644 --- a/include/openspace/util/taskloader.h +++ b/include/openspace/util/taskloader.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 6c2287f258..3a388c7525 100644 --- a/include/openspace/util/threadpool.h +++ b/include/openspace/util/threadpool.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 02f22e3fda..bc68c3ccc3 100644 --- a/include/openspace/util/time.h +++ b/include/openspace/util/time.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 bf4caf076d..e4aaa8846e 100644 --- a/include/openspace/util/timeconversion.h +++ b/include/openspace/util/timeconversion.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 e2f1a2166e..d5747d9704 100644 --- a/include/openspace/util/timeline.h +++ b/include/openspace/util/timeline.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 a3c428d0df..9760c71add 100644 --- a/include/openspace/util/timeline.inl +++ b/include/openspace/util/timeline.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 a61d2d891d..d440041a22 100644 --- a/include/openspace/util/timemanager.h +++ b/include/openspace/util/timemanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 2415aba8ea..24541e3513 100644 --- a/include/openspace/util/timerange.h +++ b/include/openspace/util/timerange.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/touch.h b/include/openspace/util/touch.h index 73c83e93d3..0c200acd74 100644 --- a/include/openspace/util/touch.h +++ b/include/openspace/util/touch.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 a3a0bcc600..702cf3e5a7 100644 --- a/include/openspace/util/transformationmanager.h +++ b/include/openspace/util/transformationmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/tstring.h b/include/openspace/util/tstring.h index 48f7e73d54..59c2fca1b2 100644 --- a/include/openspace/util/tstring.h +++ b/include/openspace/util/tstring.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/universalhelpers.h b/include/openspace/util/universalhelpers.h index 9ba13edef6..b27dba6d15 100644 --- a/include/openspace/util/universalhelpers.h +++ b/include/openspace/util/universalhelpers.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 34b545479f..0373f263ed 100644 --- a/include/openspace/util/updatestructures.h +++ b/include/openspace/util/updatestructures.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/versionchecker.h b/include/openspace/util/versionchecker.h index 09573ce2c5..5a8b391fb6 100644 --- a/include/openspace/util/versionchecker.h +++ b/include/openspace/util/versionchecker.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 72609668f1..c3d48ba749 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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 2de690095b..7c0815ae26 100644 --- a/modules/atmosphere/CMakeLists.txt +++ b/modules/atmosphere/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/atmosphere/atmospheremodule.cpp index 2d7b08c8c6..57becfff04 100644 --- a/modules/atmosphere/atmospheremodule.cpp +++ b/modules/atmosphere/atmospheremodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 82bc925158..f3fdcfeb38 100644 --- a/modules/atmosphere/atmospheremodule.h +++ b/modules/atmosphere/atmospheremodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 59fc78af5c..78300e61b9 100644 --- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp +++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 0cd9c8faab..d6f58ed5df 100644 --- a/modules/atmosphere/rendering/atmospheredeferredcaster.h +++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 fa8216e935..ece56b8bfb 100644 --- a/modules/atmosphere/rendering/renderableatmosphere.cpp +++ b/modules/atmosphere/rendering/renderableatmosphere.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 6c2f1a1384..acee718216 100644 --- a/modules/atmosphere/rendering/renderableatmosphere.h +++ b/modules/atmosphere/rendering/renderableatmosphere.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 3eeb4dbde7..7823e3e9a3 100644 --- a/modules/atmosphere/shaders/atmosphere_common.glsl +++ b/modules/atmosphere/shaders/atmosphere_common.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 7299d215b3..f3f8eb96b5 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f0083115c3..c9e7b04f3f 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/calculation_gs.glsl b/modules/atmosphere/shaders/calculation_gs.glsl index 71bf7114fd..16304411cc 100644 --- a/modules/atmosphere/shaders/calculation_gs.glsl +++ b/modules/atmosphere/shaders/calculation_gs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/calculation_vs.glsl b/modules/atmosphere/shaders/calculation_vs.glsl index fafcbd8ef8..f8c989d905 100644 --- a/modules/atmosphere/shaders/calculation_vs.glsl +++ b/modules/atmosphere/shaders/calculation_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 76b102cac7..a5e90e204c 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 060513a98d..d58ac25efe 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b901766397..99c25429ca 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 9bd36370e2..8c7fecc422 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 71b042cb9e..afc37beb31 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 36da4e83b5..4ea9697d02 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 be54002347..49a51785b9 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a11d33f069..f99e10cac1 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 3e9c4f1aad..82e3f6faca 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cf43f9a371..ba0a415daf 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 bc5bb13686..220360e2a9 100644 --- a/modules/base/CMakeLists.txt +++ b/modules/base/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, to any person obtaining a copy of this # # software and associated documentation files (the "Software"), to deal in the Software # @@ -30,6 +30,7 @@ set(HEADER_FILES dashboard/dashboarditemdistance.h dashboard/dashboarditemelapsedtime.h dashboard/dashboarditemframerate.h + dashboard/dashboarditeminputstate.h dashboard/dashboarditemmission.h dashboard/dashboarditemparallelconnection.h dashboard/dashboarditempropertyvalue.h @@ -85,6 +86,7 @@ set(SOURCE_FILES dashboard/dashboarditemdistance.cpp dashboard/dashboarditemelapsedtime.cpp dashboard/dashboarditemframerate.cpp + dashboard/dashboarditeminputstate.cpp dashboard/dashboarditemmission.cpp dashboard/dashboarditemparallelconnection.cpp dashboard/dashboarditempropertyvalue.cpp diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp index a9d840a6d4..7b8ef29316 100644 --- a/modules/base/basemodule.cpp +++ b/modules/base/basemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -109,6 +110,7 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) { fDashboard->registerClass("DashboardItemDistance"); fDashboard->registerClass("DashboardItemElapsedTime"); fDashboard->registerClass("DashboardItemFramerate"); + fDashboard->registerClass("DashboardItemInputState"); fDashboard->registerClass("DashboardItemMission"); fDashboard->registerClass( "DashboardItemParallelConnection" diff --git a/modules/base/basemodule.h b/modules/base/basemodule.h index aecd76f637..669713c2ef 100644 --- a/modules/base/basemodule.h +++ b/modules/base/basemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 605cc4b1e0..79ee6fe1db 100644 --- a/modules/base/dashboard/dashboarditemangle.cpp +++ b/modules/base/dashboard/dashboarditemangle.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8e5b1b566d..6635680001 100644 --- a/modules/base/dashboard/dashboarditemangle.h +++ b/modules/base/dashboard/dashboarditemangle.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 d585e4156b..67be97a6e8 100644 --- a/modules/base/dashboard/dashboarditemdate.cpp +++ b/modules/base/dashboard/dashboarditemdate.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f1082d670a..3a948d17dd 100644 --- a/modules/base/dashboard/dashboarditemdate.h +++ b/modules/base/dashboard/dashboarditemdate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 fcb2ace1d4..733b528dcb 100644 --- a/modules/base/dashboard/dashboarditemdistance.cpp +++ b/modules/base/dashboard/dashboarditemdistance.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -354,7 +354,7 @@ void DashboardItemDistance::render(glm::vec2& penPosition) { else { const DistanceUnit unit = static_cast(_requestedUnit.value()); const double convertedD = convertMeters(d, unit); - dist = { convertedD, nameForDistanceUnit(unit, convertedD != 1.0) }; + dist = std::pair(convertedD, nameForDistanceUnit(unit, convertedD != 1.0)); } std::fill(_buffer.begin(), _buffer.end(), char(0)); @@ -385,7 +385,7 @@ glm::vec2 DashboardItemDistance::size() const { else { DistanceUnit unit = static_cast(_requestedUnit.value()); double convertedD = convertMeters(d, unit); - dist = { convertedD, nameForDistanceUnit(unit, convertedD != 1.0) }; + dist = std::pair(convertedD, nameForDistanceUnit(unit, convertedD != 1.0)); } return _font->boundingBox( diff --git a/modules/base/dashboard/dashboarditemdistance.h b/modules/base/dashboard/dashboarditemdistance.h index 8516b7e95d..86c6b1a58e 100644 --- a/modules/base/dashboard/dashboarditemdistance.h +++ b/modules/base/dashboard/dashboarditemdistance.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/dashboarditemelapsedtime.cpp b/modules/base/dashboard/dashboarditemelapsedtime.cpp index 07ed9e66eb..a9298ab610 100644 --- a/modules/base/dashboard/dashboarditemelapsedtime.cpp +++ b/modules/base/dashboard/dashboarditemelapsedtime.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/dashboarditemelapsedtime.h b/modules/base/dashboard/dashboarditemelapsedtime.h index 6f8238aa72..0ff4ac6646 100644 --- a/modules/base/dashboard/dashboarditemelapsedtime.h +++ b/modules/base/dashboard/dashboarditemelapsedtime.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e673f6b705..26ec6c0c21 100644 --- a/modules/base/dashboard/dashboarditemframerate.cpp +++ b/modules/base/dashboard/dashboarditemframerate.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 dce51ec495..69f86171d2 100644 --- a/modules/base/dashboard/dashboarditemframerate.h +++ b/modules/base/dashboard/dashboarditemframerate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/dashboarditeminputstate.cpp b/modules/base/dashboard/dashboarditeminputstate.cpp new file mode 100644 index 0000000000..956cbb5ea7 --- /dev/null +++ b/modules/base/dashboard/dashboarditeminputstate.cpp @@ -0,0 +1,223 @@ +/***************************************************************************************** + * * + * OpenSpace * + * * + * Copyright (c) 2014-2023 * + * * + * Permission is hereby 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 +#include + +namespace { + constexpr openspace::properties::Property::PropertyInfo ShowWhenEnabledInfo = { + "ShowWhenEnabled", + "Show when enabled", + "Show text when the input is enabled" + }; + + constexpr openspace::properties::Property::PropertyInfo ShowWhenDisabledInfo = { + "ShowWhenDisabled", + "Show when disabled", + "Show text when the input is disabled" + }; + + constexpr openspace::properties::Property::PropertyInfo ShowKeyboardInfo = { + "ShowKeyboard", + "Show Keyboard information", + "Display the state of the keyboard input" + }; + + constexpr openspace::properties::Property::PropertyInfo ShowMouseInfo = { + "ShowMouse", + "Show Mouse information", + "Display the state of the mouse input" + }; + + constexpr openspace::properties::Property::PropertyInfo ShowJoystickInfo = { + "ShowJoystick", + "Show Joystick information", + "Display the state of the joystick input" + }; + + struct [[codegen::Dictionary(DashboardItemPropertyValue)]] Parameters { + // [[codegen::verbatim(ShowWhenEnabledInfo.description)]] + std::optional showWhenEnabled; + + // [[codegen::verbatim(ShowWhenDisabledInfo.description)]] + std::optional showWhenDisabled; + + // [[codegen::verbatim(ShowKeyboardInfo.description)]] + std::optional showKeyboard; + + // [[codegen::verbatim(ShowMouseInfo.description)]] + std::optional showMouse; + + // [[codegen::verbatim(ShowJoystickInfo.description)]] + std::optional showJoystick; + }; +#include "dashboarditeminputstate_codegen.cpp" +} // namespace + +namespace openspace { + +documentation::Documentation DashboardItemInputState::Documentation() { + return codegen::doc( + "base_dashboarditem_inputstate", + DashboardTextItem::Documentation() + ); +} + +DashboardItemInputState::DashboardItemInputState(const ghoul::Dictionary& dictionary) + : DashboardTextItem(dictionary) + , _showWhenEnabled(ShowWhenEnabledInfo, true) + , _showWhenDisabled(ShowWhenDisabledInfo, true) + , _showKeyboard(ShowKeyboardInfo, true) + , _showMouse(ShowMouseInfo, true) + , _showJoystick(ShowJoystickInfo, true) +{ + const Parameters p = codegen::bake(dictionary); + + _showWhenEnabled = p.showWhenEnabled.value_or(_showWhenEnabled); + addProperty(_showWhenEnabled); + + _showWhenDisabled = p.showWhenDisabled.value_or(_showWhenDisabled); + addProperty(_showWhenDisabled); + + _showKeyboard = p.showKeyboard.value_or(_showKeyboard); + addProperty(_showKeyboard); + + _showMouse = p.showMouse.value_or(_showMouse); + addProperty(_showMouse); + + _showJoystick = p.showJoystick.value_or(_showJoystick); + addProperty(_showJoystick); +} + +void DashboardItemInputState::render(glm::vec2& penPosition) { + ZoneScoped + + std::vector text; + if (_showKeyboard) { + if (global::navigationHandler->disabledKeybindings()) { + if (_showWhenDisabled) { + text.push_back("Keyboard shortcuts disabled"); + } + } + else { + if (_showWhenEnabled) { + text.push_back("Keyboard shortcuts enabled"); + } + } + } + + if (_showMouse) { + if (global::navigationHandler->disabledMouse()) { + if (_showWhenDisabled) { + text.push_back("Mouse input disabled"); + } + } + else { + if (_showWhenEnabled) { + text.push_back("Mouse input enabled"); + } + } + } + + if (_showJoystick) { + if (global::navigationHandler->disabledJoystick()) { + if (_showWhenDisabled) { + text.push_back("Joystick input disabled"); + } + } + else { + if (_showWhenEnabled) { + text.push_back("Joystick input enabled"); + } + } + } + + if (!text.empty()) { + std::string t = ghoul::join(std::move(text), "\n"); + RenderFont(*_font, penPosition, t); + penPosition.y -= _font->height(); + } +} + +glm::vec2 DashboardItemInputState::size() const { + ZoneScoped + + std::vector text; + if (_showKeyboard) { + if (global::navigationHandler->disabledKeybindings()) { + if (_showWhenDisabled) { + text.push_back("Keyboard shortcuts disabled"); + } + } + else { + if (_showWhenEnabled) { + text.push_back("Keyboard shortcuts enabled"); + } + } + } + + if (_showMouse) { + if (global::navigationHandler->disabledMouse()) { + if (_showWhenDisabled) { + text.push_back("Mouse input disabled"); + } + } + else { + if (_showWhenEnabled) { + text.push_back("Mouse input disabled"); + } + } + } + + if (_showJoystick) { + if (global::navigationHandler->disabledJoystick()) { + if (_showWhenDisabled) { + text.push_back("Joystick input disabled"); + } + } + else { + if (_showWhenEnabled) { + text.push_back("Joystick input disabled"); + } + } + } + + if (!text.empty()) { + std::string t = ghoul::join(std::move(text), "\n"); + return _font->boundingBox(t); + } + else { + return glm::vec2(0.f, 0.f); + } +} + +} // namespace openspace diff --git a/modules/base/dashboard/dashboarditeminputstate.h b/modules/base/dashboard/dashboarditeminputstate.h new file mode 100644 index 0000000000..b49b21709e --- /dev/null +++ b/modules/base/dashboard/dashboarditeminputstate.h @@ -0,0 +1,59 @@ +/***************************************************************************************** + * * + * OpenSpace * + * * + * Copyright (c) 2014-2023 * + * * + * Permission is hereby 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___DASHBOARDITEMINPUTSTATE___H__ +#define __OPENSPACE_MODULE_BASE___DASHBOARDITEMINPUTSTATE___H__ + +#include + +#include + +namespace openspace { + +namespace properties { class Property; } +namespace documentation { struct Documentation; } + +class DashboardItemInputState : public DashboardTextItem { +public: + DashboardItemInputState(const ghoul::Dictionary& dictionary); + ~DashboardItemInputState() override = default; + + void render(glm::vec2& penPosition) override; + + glm::vec2 size() const override; + + static documentation::Documentation Documentation(); + +private: + properties::BoolProperty _showWhenEnabled; + properties::BoolProperty _showWhenDisabled; + + properties::BoolProperty _showKeyboard; + properties::BoolProperty _showMouse; + properties::BoolProperty _showJoystick; +}; + +} // namespace openspace + +#endif // __OPENSPACE_MODULE_BASE___DASHBOARDITEMINPUTSTATE___H__ diff --git a/modules/base/dashboard/dashboarditemmission.cpp b/modules/base/dashboard/dashboarditemmission.cpp index 0005051b90..6d0f9e3937 100644 --- a/modules/base/dashboard/dashboarditemmission.cpp +++ b/modules/base/dashboard/dashboarditemmission.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 333819d037..17ea778f97 100644 --- a/modules/base/dashboard/dashboarditemmission.h +++ b/modules/base/dashboard/dashboarditemmission.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c447a3087b..b437f2ac15 100644 --- a/modules/base/dashboard/dashboarditemparallelconnection.cpp +++ b/modules/base/dashboard/dashboarditemparallelconnection.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 aeb3f1f833..06f9ec4c7c 100644 --- a/modules/base/dashboard/dashboarditemparallelconnection.h +++ b/modules/base/dashboard/dashboarditemparallelconnection.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 69d781d0eb..54b4adce3b 100644 --- a/modules/base/dashboard/dashboarditempropertyvalue.cpp +++ b/modules/base/dashboard/dashboarditempropertyvalue.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 83296d940b..873b2bbf96 100644 --- a/modules/base/dashboard/dashboarditempropertyvalue.h +++ b/modules/base/dashboard/dashboarditempropertyvalue.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 6713b47ec9..d70db523b4 100644 --- a/modules/base/dashboard/dashboarditemsimulationincrement.cpp +++ b/modules/base/dashboard/dashboarditemsimulationincrement.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -167,17 +167,17 @@ void DashboardItemSimulationIncrement::render(glm::vec2& penPosition) { const TimeUnit unit = static_cast(_requestedUnit.value()); const double convTarget = convertTime(targetDt, TimeUnit::Second, unit); - targetDeltaTime = { + targetDeltaTime = std::pair( convTarget, std::string(nameForTimeUnit(unit, convTarget != 1.0)) - }; + ); if (targetDt != currentDt) { const double convCurrent = convertTime(currentDt, TimeUnit::Second, unit); - currentDeltaTime = { + currentDeltaTime = std::pair( convCurrent, std::string(nameForTimeUnit(unit, convCurrent != 1.0)) - }; + ); } } @@ -225,10 +225,10 @@ glm::vec2 DashboardItemSimulationIncrement::size() const { else { TimeUnit unit = static_cast(_requestedUnit.value()); double convertedT = convertTime(t, TimeUnit::Second, unit); - deltaTime = { + deltaTime = std::pair( convertedT, std::string(nameForTimeUnit(unit, convertedT != 1.0)) - }; + ); } return _font->boundingBox( diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.h b/modules/base/dashboard/dashboarditemsimulationincrement.h index 8348654422..3af34fda24 100644 --- a/modules/base/dashboard/dashboarditemsimulationincrement.h +++ b/modules/base/dashboard/dashboarditemsimulationincrement.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 7d5f5b2df7..75f9a4a346 100644 --- a/modules/base/dashboard/dashboarditemspacing.cpp +++ b/modules/base/dashboard/dashboarditemspacing.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 4a8aa24c3f..b93398db6a 100644 --- a/modules/base/dashboard/dashboarditemspacing.h +++ b/modules/base/dashboard/dashboarditemspacing.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/dashboarditemtext.cpp b/modules/base/dashboard/dashboarditemtext.cpp index 6a8ba5f22f..5cc7fd9f28 100644 --- a/modules/base/dashboard/dashboarditemtext.cpp +++ b/modules/base/dashboard/dashboarditemtext.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/dashboarditemtext.h b/modules/base/dashboard/dashboarditemtext.h index b12fd732da..4535034aad 100644 --- a/modules/base/dashboard/dashboarditemtext.h +++ b/modules/base/dashboard/dashboarditemtext.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 1c848baabd..c5e3e86168 100644 --- a/modules/base/dashboard/dashboarditemvelocity.cpp +++ b/modules/base/dashboard/dashboarditemvelocity.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -137,7 +137,7 @@ void DashboardItemVelocity::render(glm::vec2& penPosition) { else { const DistanceUnit unit = static_cast(_requestedUnit.value()); const double convertedD = convertMeters(speedPerSecond, unit); - dist = { convertedD, nameForDistanceUnit(unit, convertedD != 1.0) }; + dist = std::pair(convertedD, nameForDistanceUnit(unit, convertedD != 1.0)); } RenderFont( @@ -163,7 +163,7 @@ glm::vec2 DashboardItemVelocity::size() const { else { DistanceUnit unit = static_cast(_requestedUnit.value()); double convertedD = convertMeters(d, unit); - dist = { convertedD, nameForDistanceUnit(unit, convertedD != 1.0) }; + dist = std::pair(convertedD, nameForDistanceUnit(unit, convertedD != 1.0)); } return _font->boundingBox( diff --git a/modules/base/dashboard/dashboarditemvelocity.h b/modules/base/dashboard/dashboarditemvelocity.h index f1dcb7a053..0d2e412172 100644 --- a/modules/base/dashboard/dashboarditemvelocity.h +++ b/modules/base/dashboard/dashboarditemvelocity.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 67d00a861f..65e2a59531 100644 --- a/modules/base/lightsource/cameralightsource.cpp +++ b/modules/base/lightsource/cameralightsource.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 703886837c..dc9a4f9a99 100644 --- a/modules/base/lightsource/cameralightsource.h +++ b/modules/base/lightsource/cameralightsource.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 3365c2a4ee..61b35ffafe 100644 --- a/modules/base/lightsource/scenegraphlightsource.cpp +++ b/modules/base/lightsource/scenegraphlightsource.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 9e455e520e..c362893cb4 100644 --- a/modules/base/lightsource/scenegraphlightsource.h +++ b/modules/base/lightsource/scenegraphlightsource.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/grids/renderableboxgrid.cpp b/modules/base/rendering/grids/renderableboxgrid.cpp index 7496c00467..8934c3d7c4 100644 --- a/modules/base/rendering/grids/renderableboxgrid.cpp +++ b/modules/base/rendering/grids/renderableboxgrid.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/grids/renderableboxgrid.h b/modules/base/rendering/grids/renderableboxgrid.h index 96e43fb73c..cae5dc9f9b 100644 --- a/modules/base/rendering/grids/renderableboxgrid.h +++ b/modules/base/rendering/grids/renderableboxgrid.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp index 5cb75ed431..dc2370ee78 100644 --- a/modules/base/rendering/grids/renderablegrid.cpp +++ b/modules/base/rendering/grids/renderablegrid.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/grids/renderablegrid.h b/modules/base/rendering/grids/renderablegrid.h index 9b0eabc890..4c30ef6d12 100644 --- a/modules/base/rendering/grids/renderablegrid.h +++ b/modules/base/rendering/grids/renderablegrid.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/grids/renderableradialgrid.cpp b/modules/base/rendering/grids/renderableradialgrid.cpp index 1c42671fbc..fa4bb4060a 100644 --- a/modules/base/rendering/grids/renderableradialgrid.cpp +++ b/modules/base/rendering/grids/renderableradialgrid.cpp @@ -3,7 +3,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/grids/renderableradialgrid.h b/modules/base/rendering/grids/renderableradialgrid.h index 2a1545bb40..7f0c2288fd 100644 --- a/modules/base/rendering/grids/renderableradialgrid.h +++ b/modules/base/rendering/grids/renderableradialgrid.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp index e60c334bee..99bba9bd56 100644 --- a/modules/base/rendering/grids/renderablesphericalgrid.cpp +++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/grids/renderablesphericalgrid.h b/modules/base/rendering/grids/renderablesphericalgrid.h index cbb4ffea63..eddbfe97c7 100644 --- a/modules/base/rendering/grids/renderablesphericalgrid.h +++ b/modules/base/rendering/grids/renderablesphericalgrid.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 366258d727..9d0b53e7d6 100644 --- a/modules/base/rendering/renderablecartesianaxes.cpp +++ b/modules/base/rendering/renderablecartesianaxes.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e097a8dbc4..15738ebd24 100644 --- a/modules/base/rendering/renderablecartesianaxes.h +++ b/modules/base/rendering/renderablecartesianaxes.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderabledisc.cpp b/modules/base/rendering/renderabledisc.cpp index b6be5e657e..eeb947acbb 100644 --- a/modules/base/rendering/renderabledisc.cpp +++ b/modules/base/rendering/renderabledisc.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderabledisc.h b/modules/base/rendering/renderabledisc.h index a273e93e68..14537d6b54 100644 --- a/modules/base/rendering/renderabledisc.h +++ b/modules/base/rendering/renderabledisc.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderablelabel.cpp b/modules/base/rendering/renderablelabel.cpp index fb5338a13f..7c9ba8c967 100644 --- a/modules/base/rendering/renderablelabel.cpp +++ b/modules/base/rendering/renderablelabel.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderablelabel.h b/modules/base/rendering/renderablelabel.h index 312e93282e..f9b2b57d0c 100644 --- a/modules/base/rendering/renderablelabel.h +++ b/modules/base/rendering/renderablelabel.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 be274de216..1796b72e1f 100644 --- a/modules/base/rendering/renderablemodel.cpp +++ b/modules/base/rendering/renderablemodel.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -65,6 +65,7 @@ namespace { { "Color Adding", ColorAddingBlending } }; +<<<<<<< HEAD const GLenum ColorAttachmentArray[3] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, @@ -79,6 +80,10 @@ namespace { constexpr std::array UniformNames = { "nLightSources", "lightDirectionsViewSpace", "lightIntensities", +======= + constexpr std::array UniformNames = { + "opacity", "nLightSources", "lightDirectionsViewSpace", "lightIntensities", +>>>>>>> master "modelViewTransform", "normalTransform", "projectionTransform", "performShading", "ambientIntensity", "diffuseIntensity", "specularIntensity", "gBufferDepthTexture" @@ -89,6 +94,12 @@ namespace { "normalTexture" }; + constexpr openspace::properties::Property::PropertyInfo EnableAnimationInfo = { + "EnableAnimation", + "Enable Animation", + "Enable or disable the animation for the model if it has any" + }; + constexpr openspace::properties::Property::PropertyInfo AmbientIntensityInfo = { "AmbientIntensity", "Ambient Intensity", diff --git a/modules/base/rendering/renderablemodel.h b/modules/base/rendering/renderablemodel.h index e2bb8269ff..fd3fec6940 100644 --- a/modules/base/rendering/renderablemodel.h +++ b/modules/base/rendering/renderablemodel.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp index 24d140a670..4a86ec7d79 100644 --- a/modules/base/rendering/renderablenodeline.cpp +++ b/modules/base/rendering/renderablenodeline.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -42,15 +42,15 @@ namespace { constexpr openspace::properties::Property::PropertyInfo StartNodeInfo = { "StartNode", "Start Node", - "The identifier of the node the line starts from. " - "Defaults to 'Root' if not specified. " + "The identifier of the node the line starts from. Defaults to 'Root' if not " + "specified." }; constexpr openspace::properties::Property::PropertyInfo EndNodeInfo = { "EndNode", "End Node", - "The identifier of the node the line ends at. " - "Defaults to 'Root' if not specified. " + "The identifier of the node the line ends at. Defaults to 'Root' if not " + "specified." }; constexpr openspace::properties::Property::PropertyInfo LineColorInfo = { diff --git a/modules/base/rendering/renderablenodeline.h b/modules/base/rendering/renderablenodeline.h index 30a49b3ccd..f0fc7f524c 100644 --- a/modules/base/rendering/renderablenodeline.h +++ b/modules/base/rendering/renderablenodeline.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 67684d1298..9eff195a2e 100644 --- a/modules/base/rendering/renderableplane.cpp +++ b/modules/base/rendering/renderableplane.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -79,8 +79,8 @@ namespace { constexpr openspace::properties::Property::PropertyInfo MultiplyColorInfo = { "MultiplyColor", "Multiply Color", - "If set, the plane's texture is multiplied with this color. " - "Useful for applying a color grayscale images" + "If set, the plane's texture is multiplied with this color. Useful for applying " + "a color grayscale images" }; struct [[codegen::Dictionary(RenderablePlane)]] Parameters { diff --git a/modules/base/rendering/renderableplane.h b/modules/base/rendering/renderableplane.h index 2c56e0a688..8dbddf81a9 100644 --- a/modules/base/rendering/renderableplane.h +++ b/modules/base/rendering/renderableplane.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e7e696a378..17f9a9ad49 100644 --- a/modules/base/rendering/renderableplaneimagelocal.cpp +++ b/modules/base/rendering/renderableplaneimagelocal.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 87d6282acb..44be33db83 100644 --- a/modules/base/rendering/renderableplaneimagelocal.h +++ b/modules/base/rendering/renderableplaneimagelocal.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 638b79ffe0..812a7f1711 100644 --- a/modules/base/rendering/renderableplaneimageonline.cpp +++ b/modules/base/rendering/renderableplaneimageonline.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 09daf8cedf..6ef8676df2 100644 --- a/modules/base/rendering/renderableplaneimageonline.h +++ b/modules/base/rendering/renderableplaneimageonline.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderableplanetimevaryingimage.cpp b/modules/base/rendering/renderableplanetimevaryingimage.cpp index 97a86b3627..586797c2d0 100644 --- a/modules/base/rendering/renderableplanetimevaryingimage.cpp +++ b/modules/base/rendering/renderableplanetimevaryingimage.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderableplanetimevaryingimage.h b/modules/base/rendering/renderableplanetimevaryingimage.h index 040a755b39..48defbd122 100644 --- a/modules/base/rendering/renderableplanetimevaryingimage.h +++ b/modules/base/rendering/renderableplanetimevaryingimage.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderableprism.cpp b/modules/base/rendering/renderableprism.cpp index 21ae908099..4ec8fa306f 100644 --- a/modules/base/rendering/renderableprism.cpp +++ b/modules/base/rendering/renderableprism.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -49,9 +49,8 @@ namespace { constexpr openspace::properties::Property::PropertyInfo LinesInfo = { "NumLines", "Number of Lines", - "The number of lines connecting the two shapes of the prism. " - "They will be evenly distributed around the bounding circle that makes " - "up the shape of the prism" + "The number of lines connecting the two shapes of the prism. They will be evenly " + "distributed around the bounding circle that makes up the shape of the prism" }; constexpr openspace::properties::Property::PropertyInfo RadiusInfo = { @@ -63,8 +62,8 @@ namespace { constexpr openspace::properties::Property::PropertyInfo BaseRadiusInfo = { "BaseRadius", "Base Radius", - "The radius of the base of the prism's shape, in meters. By default it is " - "given the same radius as the outer shape" + "The radius of the base of the prism's shape, in meters. By default it is given " + "the same radius as the outer shape" }; constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { diff --git a/modules/base/rendering/renderableprism.h b/modules/base/rendering/renderableprism.h index 212e499a9e..eb01193fed 100644 --- a/modules/base/rendering/renderableprism.h +++ b/modules/base/rendering/renderableprism.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 1d881a8fe1..9ff2122535 100644 --- a/modules/base/rendering/renderablesphere.cpp +++ b/modules/base/rendering/renderablesphere.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 d06320de0c..c95c7a38fe 100644 --- a/modules/base/rendering/renderablesphere.h +++ b/modules/base/rendering/renderablesphere.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderabletimevaryingsphere.cpp b/modules/base/rendering/renderabletimevaryingsphere.cpp index 573a0e1146..0a0d488380 100644 --- a/modules/base/rendering/renderabletimevaryingsphere.cpp +++ b/modules/base/rendering/renderabletimevaryingsphere.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderabletimevaryingsphere.h b/modules/base/rendering/renderabletimevaryingsphere.h index e08f6e2937..36d411b5e9 100644 --- a/modules/base/rendering/renderabletimevaryingsphere.h +++ b/modules/base/rendering/renderabletimevaryingsphere.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 ba22961092..608709fb9c 100644 --- a/modules/base/rendering/renderabletrail.cpp +++ b/modules/base/rendering/renderabletrail.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -117,7 +117,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo RenderingModeInfo = { "Rendering", "Rendering Mode", - "Determines how the trail should be rendered to the screen.If 'Lines' is " + "Determines how the trail should be rendered to the screen. If 'Lines' is " "selected, only the line part is visible, if 'Points' is selected, only the " "corresponding points (and subpoints) are shown. 'Lines+Points' shows both parts" }; diff --git a/modules/base/rendering/renderabletrail.h b/modules/base/rendering/renderabletrail.h index 7379a3920e..b828c15f5a 100644 --- a/modules/base/rendering/renderabletrail.h +++ b/modules/base/rendering/renderabletrail.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 82774fe759..4444122868 100644 --- a/modules/base/rendering/renderabletrailorbit.cpp +++ b/modules/base/rendering/renderabletrailorbit.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 dbb0adfdc2..354b7e2b1e 100644 --- a/modules/base/rendering/renderabletrailorbit.h +++ b/modules/base/rendering/renderabletrailorbit.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e90809428f..8799a98c06 100644 --- a/modules/base/rendering/renderabletrailtrajectory.cpp +++ b/modules/base/rendering/renderabletrailtrajectory.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -240,9 +240,11 @@ void RenderableTrailTrajectory::update(const UpdateData& data) { // If we are inside the valid time, we additionally want to draw a line from the last // correct point to the current location of the object - if (data.time.j2000Seconds() >= _start && + if (data.time.j2000Seconds() > _start && data.time.j2000Seconds() <= _end && !_renderFullTrail) { + ghoul_assert(_primaryRenderInformation.count > 0, "No vertices available"); + // Copy the last valid location glm::dvec3 v0( _vertexArray[_primaryRenderInformation.count - 1].x, diff --git a/modules/base/rendering/renderabletrailtrajectory.h b/modules/base/rendering/renderabletrailtrajectory.h index f5f30437cb..d349e9e619 100644 --- a/modules/base/rendering/renderabletrailtrajectory.h +++ b/modules/base/rendering/renderabletrailtrajectory.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 6fa76d1a1d..35a5bdc657 100644 --- a/modules/base/rendering/screenspacedashboard.cpp +++ b/modules/base/rendering/screenspacedashboard.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -119,7 +119,7 @@ bool ScreenSpaceDashboard::isReady() const { void ScreenSpaceDashboard::update() { if (global::windowDelegate->windowHasResized()) { const glm::ivec2 size = global::windowDelegate->currentDrawBufferResolution(); - _size = { 0.f, 0.f, size.x, size.y }; + _size = glm::vec4(0.f, 0.f, size.x, size.y); createFramebuffer(); } } diff --git a/modules/base/rendering/screenspacedashboard.h b/modules/base/rendering/screenspacedashboard.h index 28b486f8bf..425adf9859 100644 --- a/modules/base/rendering/screenspacedashboard.h +++ b/modules/base/rendering/screenspacedashboard.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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_lua.inl b/modules/base/rendering/screenspacedashboard_lua.inl index 352d0c2d3b..34ce71d0e4 100644 --- a/modules/base/rendering/screenspacedashboard_lua.inl +++ b/modules/base/rendering/screenspacedashboard_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 1c18d4cbda..42da3e2383 100644 --- a/modules/base/rendering/screenspaceframebuffer.cpp +++ b/modules/base/rendering/screenspaceframebuffer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 5f2c863ae4..ad9d2d15d8 100644 --- a/modules/base/rendering/screenspaceframebuffer.h +++ b/modules/base/rendering/screenspaceframebuffer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 5d0c092840..7b302a9068 100644 --- a/modules/base/rendering/screenspaceimagelocal.cpp +++ b/modules/base/rendering/screenspaceimagelocal.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -124,6 +124,10 @@ void ScreenSpaceImageLocal::update() { // image is only RGB glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + if (texture->format() == ghoul::opengl::Texture::Format::Red) { + texture->setSwizzleMask({ GL_RED, GL_RED, GL_RED, GL_ONE }); + } + texture->uploadTexture(); texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap); texture->purgeFromRAM(); diff --git a/modules/base/rendering/screenspaceimagelocal.h b/modules/base/rendering/screenspaceimagelocal.h index c349c4a3ab..a00288c1d3 100644 --- a/modules/base/rendering/screenspaceimagelocal.h +++ b/modules/base/rendering/screenspaceimagelocal.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b4ee5cc725..c5cb15a5e1 100644 --- a/modules/base/rendering/screenspaceimageonline.cpp +++ b/modules/base/rendering/screenspaceimageonline.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -127,6 +127,10 @@ void ScreenSpaceImageOnline::update() { // image is only RGB glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + if (texture->format() == ghoul::opengl::Texture::Format::Red) { + texture->setSwizzleMask({ GL_RED, GL_RED, GL_RED, GL_ONE }); + } + texture->uploadTexture(); texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap); texture->purgeFromRAM(); diff --git a/modules/base/rendering/screenspaceimageonline.h b/modules/base/rendering/screenspaceimageonline.h index 2d75a41d29..9c9ecc2199 100644 --- a/modules/base/rendering/screenspaceimageonline.h +++ b/modules/base/rendering/screenspaceimageonline.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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.cpp b/modules/base/rotation/constantrotation.cpp index 2ff11a20a2..2b5481057d 100644 --- a/modules/base/rotation/constantrotation.cpp +++ b/modules/base/rotation/constantrotation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 656ab472d7..5cd4ac9b45 100644 --- a/modules/base/rotation/constantrotation.h +++ b/modules/base/rotation/constantrotation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 44a22b21ce..480c41816f 100644 --- a/modules/base/rotation/fixedrotation.cpp +++ b/modules/base/rotation/fixedrotation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -469,7 +469,7 @@ bool FixedRotation::initialize() { } // No need to hold on to the data - _constructorDictionary = {}; + _constructorDictionary = ghoul::Dictionary(); return res; } diff --git a/modules/base/rotation/fixedrotation.h b/modules/base/rotation/fixedrotation.h index 2b2fb8c9d1..b15e9be933 100644 --- a/modules/base/rotation/fixedrotation.h +++ b/modules/base/rotation/fixedrotation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 026d55c59d..c70474e81a 100644 --- a/modules/base/rotation/luarotation.cpp +++ b/modules/base/rotation/luarotation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 3270668dbd..be61bdd558 100644 --- a/modules/base/rotation/luarotation.h +++ b/modules/base/rotation/luarotation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a4f0b03f11..2822eff8ca 100644 --- a/modules/base/rotation/staticrotation.cpp +++ b/modules/base/rotation/staticrotation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 6d30ebe331..fcd95444ab 100644 --- a/modules/base/rotation/staticrotation.h +++ b/modules/base/rotation/staticrotation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/timelinerotation.cpp b/modules/base/rotation/timelinerotation.cpp index b58a7b0730..ac40c6e750 100644 --- a/modules/base/rotation/timelinerotation.cpp +++ b/modules/base/rotation/timelinerotation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/timelinerotation.h b/modules/base/rotation/timelinerotation.h index 1803f39e7a..9d1cb37337 100644 --- a/modules/base/rotation/timelinerotation.h +++ b/modules/base/rotation/timelinerotation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8557503f96..1346e7e5a6 100644 --- a/modules/base/scale/luascale.cpp +++ b/modules/base/scale/luascale.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f6ba7b1e8e..677f6734be 100644 --- a/modules/base/scale/luascale.h +++ b/modules/base/scale/luascale.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/nonuniformstaticscale.cpp b/modules/base/scale/nonuniformstaticscale.cpp index 8bd0618f31..5e393a0ba3 100644 --- a/modules/base/scale/nonuniformstaticscale.cpp +++ b/modules/base/scale/nonuniformstaticscale.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/nonuniformstaticscale.h b/modules/base/scale/nonuniformstaticscale.h index a21a46c2d6..194924887f 100644 --- a/modules/base/scale/nonuniformstaticscale.h +++ b/modules/base/scale/nonuniformstaticscale.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 655277831d..4880c32849 100644 --- a/modules/base/scale/staticscale.cpp +++ b/modules/base/scale/staticscale.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 53e936a548..5eec024e59 100644 --- a/modules/base/scale/staticscale.h +++ b/modules/base/scale/staticscale.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 840d8e2a89..02c6d4eae8 100644 --- a/modules/base/scale/timedependentscale.cpp +++ b/modules/base/scale/timedependentscale.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 32ab012000..a6b499798f 100644 --- a/modules/base/scale/timedependentscale.h +++ b/modules/base/scale/timedependentscale.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c22c54ba23..8ffd2f03e2 100644 --- a/modules/base/shaders/axes_fs.glsl +++ b/modules/base/shaders/axes_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 5085099908..c56505f64c 100644 --- a/modules/base/shaders/axes_vs.glsl +++ b/modules/base/shaders/axes_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/disc_fs.glsl b/modules/base/shaders/disc_fs.glsl index ec983d2bfd..9ee95a24e2 100644 --- a/modules/base/shaders/disc_fs.glsl +++ b/modules/base/shaders/disc_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/disc_vs.glsl b/modules/base/shaders/disc_vs.glsl index 4d9ff490c1..c2dbd4674f 100644 --- a/modules/base/shaders/disc_vs.glsl +++ b/modules/base/shaders/disc_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 0f6c7cbd1c..51f279ae27 100644 --- a/modules/base/shaders/grid_fs.glsl +++ b/modules/base/shaders/grid_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 027bc20032..87dc838550 100644 --- a/modules/base/shaders/grid_vs.glsl +++ b/modules/base/shaders/grid_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c1a805e228..5e970fd883 100644 --- a/modules/base/shaders/imageplane_fs.glsl +++ b/modules/base/shaders/imageplane_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 2a3afd32b3..4233ebe8c9 100644 --- a/modules/base/shaders/imageplane_vs.glsl +++ b/modules/base/shaders/imageplane_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/line_fs.glsl b/modules/base/shaders/line_fs.glsl index 69d483d2ce..68f69de4b0 100644 --- a/modules/base/shaders/line_fs.glsl +++ b/modules/base/shaders/line_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/line_vs.glsl b/modules/base/shaders/line_vs.glsl index c39cfc7305..372def6e0c 100644 --- a/modules/base/shaders/line_vs.glsl +++ b/modules/base/shaders/line_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 dc9e4fd21f..f333cebc09 100644 --- a/modules/base/shaders/model_fs.glsl +++ b/modules/base/shaders/model_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a5991e40a3..c809cf1827 100644 --- a/modules/base/shaders/model_vs.glsl +++ b/modules/base/shaders/model_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 463b9cb86e..d3491cd260 100644 --- a/modules/base/shaders/plane_fs.glsl +++ b/modules/base/shaders/plane_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 fad50e4dba..62ae4b1f82 100644 --- a/modules/base/shaders/plane_vs.glsl +++ b/modules/base/shaders/plane_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/prism_fs.glsl b/modules/base/shaders/prism_fs.glsl index e12937c71b..7bb84a2032 100644 --- a/modules/base/shaders/prism_fs.glsl +++ b/modules/base/shaders/prism_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/prism_vs.glsl b/modules/base/shaders/prism_vs.glsl index dfe75667e7..aa0db41102 100644 --- a/modules/base/shaders/prism_vs.glsl +++ b/modules/base/shaders/prism_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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_apple_fs.glsl b/modules/base/shaders/renderabletrail_apple_fs.glsl index 3c0c7fceb2..a0fe0af4a2 100644 --- a/modules/base/shaders/renderabletrail_apple_fs.glsl +++ b/modules/base/shaders/renderabletrail_apple_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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_apple_vs.glsl b/modules/base/shaders/renderabletrail_apple_vs.glsl index 7f3a80f3e7..93bd48220d 100644 --- a/modules/base/shaders/renderabletrail_apple_vs.glsl +++ b/modules/base/shaders/renderabletrail_apple_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 eda3e8d611..c68fab1acb 100644 --- a/modules/base/shaders/renderabletrail_fs.glsl +++ b/modules/base/shaders/renderabletrail_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e830f77164..387478cd55 100644 --- a/modules/base/shaders/renderabletrail_vs.glsl +++ b/modules/base/shaders/renderabletrail_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 1230e228d7..21af960401 100644 --- a/modules/base/shaders/screenspace_fs.glsl +++ b/modules/base/shaders/screenspace_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 7ac727f634..4d0a2c820b 100644 --- a/modules/base/shaders/screenspace_vs.glsl +++ b/modules/base/shaders/screenspace_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8e6bbae629..b0b6bf9a67 100644 --- a/modules/base/shaders/sphere_fs.glsl +++ b/modules/base/shaders/sphere_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cd859aad38..827e3233aa 100644 --- a/modules/base/shaders/sphere_vs.glsl +++ b/modules/base/shaders/sphere_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 17eb985dbb..204aee2d9b 100644 --- a/modules/base/timeframe/timeframeinterval.cpp +++ b/modules/base/timeframe/timeframeinterval.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 0d1a32ce39..b95ae1eac9 100644 --- a/modules/base/timeframe/timeframeinterval.h +++ b/modules/base/timeframe/timeframeinterval.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 7c8548f0e9..1e7c12b301 100644 --- a/modules/base/timeframe/timeframeunion.cpp +++ b/modules/base/timeframe/timeframeunion.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -34,9 +34,8 @@ namespace { constexpr openspace::properties::Property::PropertyInfo TimeFramesInfo = { "TimeFrames", "Time Frames", - "A vector of time frames to combine into one. " - "The time frame is active when any of the contained time frames are, " - "but not in gaps between contained time frames" + "A vector of time frames to combine into one. The time frame is active when any " + "of the contained time frames are, but not in gaps between contained time frames" }; struct [[codegen::Dictionary(TimeFrameUnion)]] Parameters { diff --git a/modules/base/timeframe/timeframeunion.h b/modules/base/timeframe/timeframeunion.h index 600d2e4ffa..d3970a653a 100644 --- a/modules/base/timeframe/timeframeunion.h +++ b/modules/base/timeframe/timeframeunion.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 07e195cf39..cbee1df5a8 100644 --- a/modules/base/translation/luatranslation.cpp +++ b/modules/base/translation/luatranslation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 4d7672673c..349a31b38d 100644 --- a/modules/base/translation/luatranslation.h +++ b/modules/base/translation/luatranslation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a7409eea11..4af551b424 100644 --- a/modules/base/translation/statictranslation.cpp +++ b/modules/base/translation/statictranslation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 22895bbbe9..e98af32313 100644 --- a/modules/base/translation/statictranslation.h +++ b/modules/base/translation/statictranslation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/timelinetranslation.cpp b/modules/base/translation/timelinetranslation.cpp index 325b6d034e..5347d60a3d 100644 --- a/modules/base/translation/timelinetranslation.cpp +++ b/modules/base/translation/timelinetranslation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/timelinetranslation.h b/modules/base/translation/timelinetranslation.h index 2041043db8..482c21bde2 100644 --- a/modules/base/translation/timelinetranslation.h +++ b/modules/base/translation/timelinetranslation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 d398c0926b..6b8cf42711 100644 --- a/modules/cefwebgui/CMakeLists.txt +++ b/modules/cefwebgui/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/cefwebgui/cefwebguimodule.cpp index 7eb3583839..17da14fa30 100644 --- a/modules/cefwebgui/cefwebguimodule.cpp +++ b/modules/cefwebgui/cefwebguimodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8c13339569..8dcef3b2e1 100644 --- a/modules/cefwebgui/cefwebguimodule.h +++ b/modules/cefwebgui/cefwebguimodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 aeae5c8306..cdc22f6d46 100644 --- a/modules/cefwebgui/include/guikeyboardhandler.h +++ b/modules/cefwebgui/include/guikeyboardhandler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 bd6ce4505b..e2dbab5441 100644 --- a/modules/cefwebgui/include/guirenderhandler.h +++ b/modules/cefwebgui/include/guirenderhandler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/gui_fs.glsl b/modules/cefwebgui/shaders/gui_fs.glsl index 3b5ca5611e..2d1201113f 100644 --- a/modules/cefwebgui/shaders/gui_fs.glsl +++ b/modules/cefwebgui/shaders/gui_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/gui_vs.glsl b/modules/cefwebgui/shaders/gui_vs.glsl index fb62c01e00..dc5cd631ab 100644 --- a/modules/cefwebgui/shaders/gui_vs.glsl +++ b/modules/cefwebgui/shaders/gui_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 7672649fdc..6e0d1e29bb 100644 --- a/modules/cefwebgui/src/guikeyboardhandler.cpp +++ b/modules/cefwebgui/src/guikeyboardhandler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 36b2456e87..6fb94f6668 100644 --- a/modules/cefwebgui/src/guirenderhandler.cpp +++ b/modules/cefwebgui/src/guirenderhandler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cfcc9c42df..2495cf69fa 100644 --- a/modules/debugging/CMakeLists.txt +++ b/modules/debugging/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/debugging/debuggingmodule.cpp index 15ec369cc4..2af7b4fdbb 100644 --- a/modules/debugging/debuggingmodule.cpp +++ b/modules/debugging/debuggingmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 afcde8053c..bffc843fcb 100644 --- a/modules/debugging/debuggingmodule.h +++ b/modules/debugging/debuggingmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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_lua.inl b/modules/debugging/debuggingmodule_lua.inl index 00762cac02..febff86860 100644 --- a/modules/debugging/debuggingmodule_lua.inl +++ b/modules/debugging/debuggingmodule_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -28,8 +28,8 @@ constexpr const char RenderedPathIdentifier[] = "CurrentCameraPath"; constexpr const char RenderedPointsIdentifier[] = "CurrentPathControlPoints"; constexpr const char DebuggingGuiPath[] = "/Debugging"; -constexpr glm::vec3 PathColor = { 1.0, 1.0, 0.0 }; -constexpr glm::vec3 OrientationLineColor = { 0.0, 1.0, 1.0 }; +constexpr glm::vec3 PathColor = glm::vec3(1.0, 1.0, 0.0); +constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0); // Conver the input string to a format that is valid as an identifier std::string makeIdentifier(std::string s) { diff --git a/modules/debugging/rendering/debugrenderer.cpp b/modules/debugging/rendering/debugrenderer.cpp index 95c22dc3d3..62bf000124 100644 --- a/modules/debugging/rendering/debugrenderer.cpp +++ b/modules/debugging/rendering/debugrenderer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 ad4ddedcb9..b0132ec3ce 100644 --- a/modules/debugging/rendering/debugrenderer.h +++ b/modules/debugging/rendering/debugrenderer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -68,7 +68,7 @@ public: * Render the vector of clipping space points in the specified mode and color. */ void renderVertices(const Vertices& clippingSpacePoints, GLenum mode, - const glm::vec4& color = { 1.f, 0.f, 0.f, 1.f }) const; + const glm::vec4& color = glm::vec4(1.f, 0.f, 0.f, 1.f)) const; /** * Takes a vector of exactly 8 vertices, i.e. corner points in a box. @@ -84,7 +84,7 @@ public: * */ void renderBoxFaces(const Vertices& clippingSpaceBoxCorners, - const glm::vec4& rgba = { 1.f, 0.f, 0.f, 1.f }) const; + const glm::vec4& rgba = glm::vec4(1.f, 0.f, 0.f, 1.f)) const; /** * Takes a vector of exactly 8 vertices, i.e. corner points in a box. @@ -100,7 +100,7 @@ public: * */ void renderBoxEdges(const Vertices& clippingSpaceBoxCorners, - const glm::vec4& rgba = { 1.f, 0.f, 0.f, 1.f }) const; + const glm::vec4& rgba = glm::vec4(1.f, 0.f, 0.f, 1.f)) const; /** * Takes a vector of exactly 8 vertices, i.e. corner points in a box. @@ -116,7 +116,7 @@ public: * */ void renderNiceBox(const Vertices& clippingSpaceBoxCorners, - const glm::vec4& rgba = { 1.f, 0.f, 0.f, 0.3f }) const; + const glm::vec4& rgba = glm::vec4(1.f, 0.f, 0.f, 0.3f)) const; /** * Input arguments: @@ -126,7 +126,7 @@ public: * 3. RGBA rgba Color to draw the view frustum with */ void renderCameraFrustum(const RenderData& data, const Camera& otherCamera, - const glm::vec4& rgba = { 1.f, 1.f, 1.f, 0.3f }) const; + const glm::vec4& rgba = glm::vec4(1.f, 1.f, 1.f, 0.3f)) const; protected: std::unique_ptr _programObject; diff --git a/modules/debugging/rendering/debugshader_fs.glsl b/modules/debugging/rendering/debugshader_fs.glsl index f3af295776..b18c187ebf 100644 --- a/modules/debugging/rendering/debugshader_fs.glsl +++ b/modules/debugging/rendering/debugshader_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 653e9bc2de..b57738e072 100644 --- a/modules/debugging/rendering/debugshader_vs.glsl +++ b/modules/debugging/rendering/debugshader_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e6e517709c..b57a2741b4 100644 --- a/modules/debugging/rendering/renderabledebugplane.cpp +++ b/modules/debugging/rendering/renderabledebugplane.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 dc39b40b16..7830e1ad05 100644 --- a/modules/debugging/rendering/renderabledebugplane.h +++ b/modules/debugging/rendering/renderabledebugplane.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a4c5a24932..aa2a475a0e 100644 --- a/modules/digitaluniverse/CMakeLists.txt +++ b/modules/digitaluniverse/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/digitaluniverse/digitaluniversemodule.cpp index 3a3ad8bd64..b77708080b 100644 --- a/modules/digitaluniverse/digitaluniversemodule.cpp +++ b/modules/digitaluniverse/digitaluniversemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 904a9b83f9..ab8da1415d 100644 --- a/modules/digitaluniverse/digitaluniversemodule.h +++ b/modules/digitaluniverse/digitaluniversemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b432c985ae..8918d2f34e 100644 --- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp +++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -135,15 +135,15 @@ namespace { constexpr openspace::properties::Property::PropertyInfo SizeOptionInfo = { "SizeOption", "Size Option Variable", - "This value determines which paramenter (datavar) is used for scaling " - "of the astronomical objects" + "This value determines which paramenter (datavar) is used for scaling of the " + "astronomical objects" }; constexpr openspace::properties::Property::PropertyInfo RenderOptionInfo = { "RenderOption", "Render Option", - "Option wether the billboards should face the camera or not. Used for " - "non-linear display envierments such as fisheye." + "Option wether the billboards should face the camera or not. Used for non-linear " + "display envierments such as fisheye." }; constexpr openspace::properties::Property::PropertyInfo FadeInDistancesInfo = { diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.h b/modules/digitaluniverse/rendering/renderablebillboardscloud.h index 5639d4c303..08974cf8db 100644 --- a/modules/digitaluniverse/rendering/renderablebillboardscloud.h +++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 367d2ac91b..ae243e0087 100644 --- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp +++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 afdf483479..472a413bd4 100644 --- a/modules/digitaluniverse/rendering/renderabledumeshes.h +++ b/modules/digitaluniverse/rendering/renderabledumeshes.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 82232f1773..4b2c015f49 100644 --- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp +++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 417caa81bb..a9f057a8c8 100644 --- a/modules/digitaluniverse/rendering/renderableplanescloud.h +++ b/modules/digitaluniverse/rendering/renderableplanescloud.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 07b6f6d742..14ffaf4663 100644 --- a/modules/digitaluniverse/rendering/renderablepoints.cpp +++ b/modules/digitaluniverse/rendering/renderablepoints.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8c374f0d1f..1fba9ebbff 100644 --- a/modules/digitaluniverse/rendering/renderablepoints.h +++ b/modules/digitaluniverse/rendering/renderablepoints.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cfad572d57..bbd3e78a87 100644 --- a/modules/digitaluniverse/shaders/billboard_fs.glsl +++ b/modules/digitaluniverse/shaders/billboard_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 6c08125ffb..c7884bd0f2 100644 --- a/modules/digitaluniverse/shaders/billboard_gs.glsl +++ b/modules/digitaluniverse/shaders/billboard_gs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 895017614c..b1f0510a4a 100644 --- a/modules/digitaluniverse/shaders/billboard_vs.glsl +++ b/modules/digitaluniverse/shaders/billboard_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 727b32a8c7..5a66e28eb3 100644 --- a/modules/digitaluniverse/shaders/billboardpolygon_fs.glsl +++ b/modules/digitaluniverse/shaders/billboardpolygon_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8bbedeb750..4155d8761a 100644 --- a/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl +++ b/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 050f7ee9e5..73f3cba430 100644 --- a/modules/digitaluniverse/shaders/billboardpolygon_vs.glsl +++ b/modules/digitaluniverse/shaders/billboardpolygon_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 243d5c66a5..9b405e6264 100644 --- a/modules/digitaluniverse/shaders/dumesh_fs.glsl +++ b/modules/digitaluniverse/shaders/dumesh_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e8611e67d3..1d092656c8 100644 --- a/modules/digitaluniverse/shaders/dumesh_vs.glsl +++ b/modules/digitaluniverse/shaders/dumesh_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 7d410338bf..29857c4613 100644 --- a/modules/digitaluniverse/shaders/plane_fs.glsl +++ b/modules/digitaluniverse/shaders/plane_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b0ba435fdd..e72964b33f 100644 --- a/modules/digitaluniverse/shaders/plane_vs.glsl +++ b/modules/digitaluniverse/shaders/plane_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 da91d4ed4c..fa56e68087 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 13fd4f1e9f..d27c7c35a9 100644 --- a/modules/digitaluniverse/shaders/points_vs.glsl +++ b/modules/digitaluniverse/shaders/points_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/exoplanets/CMakeLists.txt b/modules/exoplanets/CMakeLists.txt index 00c886e65d..6e82ca21a1 100644 --- a/modules/exoplanets/CMakeLists.txt +++ b/modules/exoplanets/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, to any person obtaining a copy of this # # software and associated documentation files (the "Software"), to deal in the Software # diff --git a/modules/exoplanets/exoplanetshelper.cpp b/modules/exoplanets/exoplanetshelper.cpp index 42715f1720..a9d196eba3 100644 --- a/modules/exoplanets/exoplanetshelper.cpp +++ b/modules/exoplanets/exoplanetshelper.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/exoplanets/exoplanetshelper.h b/modules/exoplanets/exoplanetshelper.h index 51bcc770c2..2075d68a92 100644 --- a/modules/exoplanets/exoplanetshelper.h +++ b/modules/exoplanets/exoplanetshelper.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp index 598d2f98c7..b98810431d 100644 --- a/modules/exoplanets/exoplanetsmodule.cpp +++ b/modules/exoplanets/exoplanetsmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -113,8 +113,8 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ShowHabitableZoneInfo = { "ShowHabitableZone", "Show Habitable Zone", - "If true, the habitable zone disc is enabled per default when an " - "exoplanet system is created" + "If true, the habitable zone disc is enabled per default when an exoplanet " + "system is created" }; constexpr openspace::properties::Property::PropertyInfo UseOptimisticZoneInfo = { diff --git a/modules/exoplanets/exoplanetsmodule.h b/modules/exoplanets/exoplanetsmodule.h index 7ab0941477..7943967ba7 100644 --- a/modules/exoplanets/exoplanetsmodule.h +++ b/modules/exoplanets/exoplanetsmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl index 61e9604eed..539210c10f 100644 --- a/modules/exoplanets/exoplanetsmodule_lua.inl +++ b/modules/exoplanets/exoplanetsmodule_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/exoplanets/rendering/renderableorbitdisc.cpp b/modules/exoplanets/rendering/renderableorbitdisc.cpp index 6325e93486..e26be37267 100644 --- a/modules/exoplanets/rendering/renderableorbitdisc.cpp +++ b/modules/exoplanets/rendering/renderableorbitdisc.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -77,8 +77,8 @@ namespace { constexpr openspace::properties::Property::PropertyInfo MultiplyColorInfo = { "MultiplyColor", "Multiply Color", - "If set, the disc's texture is multiplied with this color. " - "Useful for applying a color grayscale images" + "If set, the disc's texture is multiplied with this color. Useful for applying a " + "color grayscale images" }; struct [[codegen::Dictionary(RenderableOrbitDisc)]] Parameters { diff --git a/modules/exoplanets/rendering/renderableorbitdisc.h b/modules/exoplanets/rendering/renderableorbitdisc.h index 0320e8dc62..43f30b3ce8 100644 --- a/modules/exoplanets/rendering/renderableorbitdisc.h +++ b/modules/exoplanets/rendering/renderableorbitdisc.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/exoplanets/shaders/orbitdisc_fs.glsl b/modules/exoplanets/shaders/orbitdisc_fs.glsl index bf2a53ce46..1253debbde 100644 --- a/modules/exoplanets/shaders/orbitdisc_fs.glsl +++ b/modules/exoplanets/shaders/orbitdisc_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/exoplanets/shaders/orbitdisc_vs.glsl b/modules/exoplanets/shaders/orbitdisc_vs.glsl index b005f44c97..8fb4cf3f95 100644 --- a/modules/exoplanets/shaders/orbitdisc_vs.glsl +++ b/modules/exoplanets/shaders/orbitdisc_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp index 714d6f968d..edeaa2cf30 100644 --- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp +++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h index bae2cefc63..39bdd0ae65 100644 --- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h +++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a555429c9e..288a72eb15 100644 --- a/modules/fieldlines/CMakeLists.txt +++ b/modules/fieldlines/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/fieldlines/fieldlinesmodule.cpp index f72a1b3a92..9c6fe316a4 100644 --- a/modules/fieldlines/fieldlinesmodule.cpp +++ b/modules/fieldlines/fieldlinesmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 29ec6801d7..022e4ece08 100644 --- a/modules/fieldlines/fieldlinesmodule.h +++ b/modules/fieldlines/fieldlinesmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 4ad24caa3c..be47d6cc4a 100644 --- a/modules/fieldlines/rendering/renderablefieldlines.cpp +++ b/modules/fieldlines/rendering/renderablefieldlines.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 7178c13fd8..c7a715c2ad 100644 --- a/modules/fieldlines/rendering/renderablefieldlines.h +++ b/modules/fieldlines/rendering/renderablefieldlines.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 142f704d56..505f748f5c 100644 --- a/modules/fieldlines/shaders/fieldline_fs.glsl +++ b/modules/fieldlines/shaders/fieldline_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f078b1b8c7..101cc6aebd 100644 --- a/modules/fieldlines/shaders/fieldline_gs.glsl +++ b/modules/fieldlines/shaders/fieldline_gs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f0f3387192..b4afdb78a7 100644 --- a/modules/fieldlines/shaders/fieldline_vs.glsl +++ b/modules/fieldlines/shaders/fieldline_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 be85e17595..72ec2ca260 100644 --- a/modules/fieldlinessequence/CMakeLists.txt +++ b/modules/fieldlinessequence/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/fieldlinessequence/fieldlinessequencemodule.cpp index 0f3e8a7243..ae809d6cab 100644 --- a/modules/fieldlinessequence/fieldlinessequencemodule.cpp +++ b/modules/fieldlinessequence/fieldlinessequencemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 28e83c560a..5f31b5f1bd 100644 --- a/modules/fieldlinessequence/fieldlinessequencemodule.h +++ b/modules/fieldlinessequence/fieldlinessequencemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a1af7aed94..d98c314214 100644 --- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp +++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 6374ab9f24..64962b8077 100644 --- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h +++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 acf399415a..f5eecf5ef0 100644 --- a/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl +++ b/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8a7deca7be..e98c36c016 100644 --- a/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl +++ b/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 53ca91e045..a7706f87a8 100644 --- a/modules/fieldlinessequence/util/commons.cpp +++ b/modules/fieldlinessequence/util/commons.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 532d74780a..9b517a72b7 100644 --- a/modules/fieldlinessequence/util/commons.h +++ b/modules/fieldlinessequence/util/commons.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 d1e97dc51a..39263d007a 100644 --- a/modules/fieldlinessequence/util/fieldlinesstate.cpp +++ b/modules/fieldlinessequence/util/fieldlinesstate.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 72e65c1368..8d80782aab 100644 --- a/modules/fieldlinessequence/util/fieldlinesstate.h +++ b/modules/fieldlinessequence/util/fieldlinesstate.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 0811dba583..53e7a2cbb3 100644 --- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp +++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c849e46e85..af06f94365 100644 --- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.h +++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 d111d5b60a..f45670eeb9 100644 --- a/modules/fitsfilereader/CMakeLists.txt +++ b/modules/fitsfilereader/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/fitsfilereader/fitsfilereadermodule.cpp index c71ee84dc9..002c95e858 100644 --- a/modules/fitsfilereader/fitsfilereadermodule.cpp +++ b/modules/fitsfilereader/fitsfilereadermodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 9e456856ec..8fb66a3410 100644 --- a/modules/fitsfilereader/fitsfilereadermodule.h +++ b/modules/fitsfilereader/fitsfilereadermodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 3f26145798..6c07bc8a16 100644 --- a/modules/fitsfilereader/include/fitsfilereader.h +++ b/modules/fitsfilereader/include/fitsfilereader.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e4215175ed..1ac6ed09a8 100644 --- a/modules/fitsfilereader/src/fitsfilereader.cpp +++ b/modules/fitsfilereader/src/fitsfilereader.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -174,10 +174,10 @@ std::shared_ptr> FitsFileReader::readTable(const std::filesystem::p // Create TableData object of table contents. TableData loadedTable = { - std::move(contents), - static_cast(table.rows()), - table.getRowsize(), - table.name() + .contents = std::move(contents), + .readRows = static_cast(table.rows()), + .optimalRowsize = table.getRowsize(), + .name = table.name() }; return std::make_shared>(loadedTable); @@ -660,7 +660,11 @@ const std::shared_ptr> FitsFileReader::readImageInternal(ExtHDU& im try { std::valarray contents; image.read(contents); - ImageData im = { std::move(contents), image.axis(0), image.axis(1) }; + ImageData im = { + .contents = std::move(contents), + .width = image.axis(0), + .height = image.axis(1) + }; return std::make_shared>(im); } catch (const FitsException& e){ LERROR("Could not read FITS image EXTHDU. " + e.message()); @@ -673,7 +677,11 @@ const std::shared_ptr> FitsFileReader::readImageInternal(PHDU& imag try { std::valarray contents; image.read(contents); - ImageData im = { std::move(contents), image.axis(0), image.axis(1) }; + ImageData im = { + .contents = std::move(contents), + .width = image.axis(0), + .height = image.axis(1) + }; return std::make_shared>(im); } catch (const FitsException& e){ LERROR("Could not read FITS image PHDU. " + e.message()); diff --git a/modules/gaia/CMakeLists.txt b/modules/gaia/CMakeLists.txt index d8fc90b45d..a6ce4bab27 100644 --- a/modules/gaia/CMakeLists.txt +++ b/modules/gaia/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/gaia/gaiamodule.cpp index 132b1f4d76..6120886dae 100644 --- a/modules/gaia/gaiamodule.cpp +++ b/modules/gaia/gaiamodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -62,12 +62,12 @@ std::vector GaiaModule::documentations() const { } scripting::LuaLibrary GaiaModule::luaLibrary() const { - scripting::LuaLibrary res; - res.name = "gaia"; - res.scripts = { - absPath("${MODULE_GAIA}/scripts/filtering.lua") + return { + .name = "gaia", + .scripts = { + absPath("${MODULE_GAIA}/scripts/filtering.lua") + } }; - return res; } } // namespace openspace diff --git a/modules/gaia/gaiamodule.h b/modules/gaia/gaiamodule.h index f2ebb6017b..c07a30f470 100644 --- a/modules/gaia/gaiamodule.h +++ b/modules/gaia/gaiamodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 49e9a8878c..e4831a82a1 100644 --- a/modules/gaia/rendering/gaiaoptions.h +++ b/modules/gaia/rendering/gaiaoptions.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 76008dbdaf..e4c341c74c 100644 --- a/modules/gaia/rendering/octreeculler.cpp +++ b/modules/gaia/rendering/octreeculler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f4d65e3929..87dc6aee12 100644 --- a/modules/gaia/rendering/octreeculler.h +++ b/modules/gaia/rendering/octreeculler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e201cb0c7e..85441313a9 100644 --- a/modules/gaia/rendering/octreemanager.cpp +++ b/modules/gaia/rendering/octreemanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 58d36e81a7..df955fd4c2 100644 --- a/modules/gaia/rendering/octreemanager.h +++ b/modules/gaia/rendering/octreemanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 4533182253..ccea1a00bf 100644 --- a/modules/gaia/rendering/renderablegaiastars.cpp +++ b/modules/gaia/rendering/renderablegaiastars.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -116,9 +116,9 @@ namespace { constexpr openspace::properties::Property::PropertyInfo CutOffThresholdInfo = { "CutOffThreshold", "Cut Off Threshold", - "Set threshold for when to cut off star rendering. " - "Stars closer than this threshold are given full opacity. " - "Farther away, stars dim proportionally to the 4-logarithm of their distance" + "Set threshold for when to cut off star rendering. Stars closer than this " + "threshold are given full opacity. Farther away, stars dim proportionally to the " + "4-logarithm of their distance" }; constexpr openspace::properties::Property::PropertyInfo SharpnessInfo = { @@ -136,8 +136,8 @@ namespace { constexpr openspace::properties::Property::PropertyInfo CloseUpBoostDistInfo = { "CloseUpBoostDist", "Close-Up Boost Distance [pc]", - "Set the distance where stars starts to increase in size. Unit is Parsec" - "[Works only with billboards]" + "Set the distance where stars starts to increase in size. Unit is Parsec [Works " + "only with billboards]" }; constexpr openspace::properties::Property::PropertyInfo TmPointFilterSizeInfo = { @@ -182,8 +182,8 @@ namespace { constexpr openspace::properties::Property::PropertyInfo FirstRowInfo = { "FirstRow", "First Row to Read", - "Defines the first row that will be read from the specified FITS file" - "No need to define if data already has been processed. [Works only with " + "Defines the first row that will be read from the specified FITS file No need to " + "define if data already has been processed. [Works only with " "FileReaderOption::Fits]" }; @@ -198,9 +198,9 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ColumnNamesInfo = { "ColumnNames", "Column Names", - "A list of strings with the names of all the columns that are to be " - "read from the specified FITS file. No need to define if data already " - "has been processed. [Works only with FileReaderOption::Fits]" + "A list of strings with the names of all the columns that are to be read from " + "the specified FITS file. No need to define if data already has been processed. " + "[Works only with FileReaderOption::Fits]" }; constexpr openspace::properties::Property::PropertyInfo NumRenderedStarsInfo = { @@ -212,8 +212,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo CpuRamBudgetInfo = { "CpuRamBudget", "CPU RAM Budget", - "Current remaining budget (bytes) on the CPU RAM for loading more node data " - "files" + "Current remaining budget (bytes) on the CPU RAM for loading more node data files" }; constexpr openspace::properties::Property::PropertyInfo GpuStreamBudgetInfo = { @@ -246,51 +245,50 @@ namespace { constexpr openspace::properties::Property::PropertyInfo FilterPosXInfo = { "FilterPosX", "PosX Threshold", - "If defined then only stars with Position X values between [min, max] " - "will be rendered (if min is set to 0.0 it is read as -Inf, " - "if max is set to 0.0 it is read as +Inf). Measured in kiloParsec" + "If defined then only stars with Position X values between [min, max] will be " + "rendered (if min is set to 0.0 it is read as -Inf, if max is set to 0.0 it is " + "read as +Inf). Measured in kiloParsec" }; constexpr openspace::properties::Property::PropertyInfo FilterPosYInfo = { "FilterPosY", "PosY Threshold", - "If defined then only stars with Position Y values between [min, max] " - "will be rendered (if min is set to 0.0 it is read as -Inf, " - "if max is set to 0.0 it is read as +Inf). Measured in kiloParsec" + "If defined then only stars with Position Y values between [min, max] will be " + "rendered (if min is set to 0.0 it is read as -Inf, if max is set to 0.0 it is " + "read as +Inf). Measured in kiloParsec" }; constexpr openspace::properties::Property::PropertyInfo FilterPosZInfo = { "FilterPosZ", "PosZ Threshold", - "If defined then only stars with Position Z values between [min, max] " - "will be rendered (if min is set to 0.0 it is read as -Inf, " - "if max is set to 0.0 it is read as +Inf). Measured in kiloParsec" + "If defined then only stars with Position Z values between [min, max] will be " + "rendered (if min is set to 0.0 it is read as -Inf, if max is set to 0.0 it is " + "read as +Inf). Measured in kiloParsec" }; constexpr openspace::properties::Property::PropertyInfo FilterGMagInfo = { "FilterGMag", "GMag Threshold", - "If defined then only stars with G mean magnitude values between [min, max] " - "will be rendered (if min is set to 20.0 it is read as -Inf, " - "if max is set to 20.0 it is read as +Inf). If min = max then all values " - "equal min|max will be filtered away" + "If defined then only stars with G mean magnitude values between [min, max] will " + "be rendered (if min is set to 20.0 it is read as -Inf, if max is set to 20.0 it " + "is read as +Inf). If min = max then all values equal min|max will be filtered " + "away" }; constexpr openspace::properties::Property::PropertyInfo FilterBpRpInfo = { "FilterBpRp", "Bp-Rp Threshold", - "If defined then only stars with Bp-Rp color values between [min, max] " - "will be rendered (if min is set to 0.0 it is read as -Inf, " - "if max is set to 0.0 it is read as +Inf). If min = max then all values " - "equal min|max will be filtered away" + "If defined then only stars with Bp-Rp color values between [min, max] will be " + "rendered (if min is set to 0.0 it is read as -Inf, if max is set to 0.0 it is " + "read as +Inf). If min = max then all values equal min|max will be filtered away" }; constexpr openspace::properties::Property::PropertyInfo FilterDistInfo = { "FilterDist", "Dist Threshold", - "If defined then only stars with Distances values between [min, max] " - "will be rendered (if min is set to 0.0 it is read as -Inf, " - "if max is set to 0.0 it is read as +Inf). Measured in kParsec" + "If defined then only stars with Distances values between [min, max] will be " + "rendered (if min is set to 0.0 it is read as -Inf, if max is set to 0.0 it is " + "read as +Inf). Measured in kParsec" }; constexpr openspace::properties::Property::PropertyInfo ReportGlErrorsInfo = { diff --git a/modules/gaia/rendering/renderablegaiastars.h b/modules/gaia/rendering/renderablegaiastars.h index 125650516d..0476cb223a 100644 --- a/modules/gaia/rendering/renderablegaiastars.h +++ b/modules/gaia/rendering/renderablegaiastars.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e7b4ce6d0d..dcd4d84ab0 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 2b6783a685..833b6df677 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cbd4b0bd9e..7ff547f3ec 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e962a188e2..9e271f44f5 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 370f5f9890..c7cb52803a 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 1c5a6698e1..fc1d70048b 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c0c1237d22..720ed9911a 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 677dd6224a..ebca0af85c 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 43d8445bb2..04befdaa5c 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 fdeabf52cd..53a624ef2a 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-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 0a844af6ae..fde4f13505 100644 --- a/modules/gaia/tasks/constructoctreetask.cpp +++ b/modules/gaia/tasks/constructoctreetask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 6b076b201d..5035c3560a 100644 --- a/modules/gaia/tasks/constructoctreetask.h +++ b/modules/gaia/tasks/constructoctreetask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 3e1ea196ab..005f94523d 100644 --- a/modules/gaia/tasks/readfilejob.cpp +++ b/modules/gaia/tasks/readfilejob.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 3efcb6dd3b..7661ef6154 100644 --- a/modules/gaia/tasks/readfilejob.h +++ b/modules/gaia/tasks/readfilejob.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 20d99e18e0..19f855906c 100644 --- a/modules/gaia/tasks/readfitstask.cpp +++ b/modules/gaia/tasks/readfitstask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 afee65b3b6..a3d4838f38 100644 --- a/modules/gaia/tasks/readfitstask.h +++ b/modules/gaia/tasks/readfitstask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 25e5da822a..a7ded67789 100644 --- a/modules/gaia/tasks/readspecktask.cpp +++ b/modules/gaia/tasks/readspecktask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 287dbd18b1..005a73e971 100644 --- a/modules/gaia/tasks/readspecktask.h +++ b/modules/gaia/tasks/readspecktask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b195155d49..d730d45842 100644 --- a/modules/galaxy/CMakeLists.txt +++ b/modules/galaxy/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/galaxy/galaxymodule.cpp index 201cc2571f..1288ee92b3 100644 --- a/modules/galaxy/galaxymodule.cpp +++ b/modules/galaxy/galaxymodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8664ed84d7..7749ce30d9 100644 --- a/modules/galaxy/galaxymodule.h +++ b/modules/galaxy/galaxymodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c17b9bca8b..ffa564a6ec 100644 --- a/modules/galaxy/rendering/galaxyraycaster.cpp +++ b/modules/galaxy/rendering/galaxyraycaster.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 be3a7e060b..9be21a3f97 100644 --- a/modules/galaxy/rendering/galaxyraycaster.h +++ b/modules/galaxy/rendering/galaxyraycaster.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 35c6074153..a43ffc3f61 100644 --- a/modules/galaxy/rendering/renderablegalaxy.cpp +++ b/modules/galaxy/rendering/renderablegalaxy.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 10a04764e2..a6b9be02fc 100644 --- a/modules/galaxy/rendering/renderablegalaxy.h +++ b/modules/galaxy/rendering/renderablegalaxy.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/billboard_fs.glsl b/modules/galaxy/shaders/billboard_fs.glsl index 61f10323f9..f9382249b9 100644 --- a/modules/galaxy/shaders/billboard_fs.glsl +++ b/modules/galaxy/shaders/billboard_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/billboard_ge.glsl b/modules/galaxy/shaders/billboard_ge.glsl index 670566f0c6..1da0df9b7f 100644 --- a/modules/galaxy/shaders/billboard_ge.glsl +++ b/modules/galaxy/shaders/billboard_ge.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/billboard_vs.glsl b/modules/galaxy/shaders/billboard_vs.glsl index 9a03ff4bfe..1f8d1c3c46 100644 --- a/modules/galaxy/shaders/billboard_vs.glsl +++ b/modules/galaxy/shaders/billboard_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/points_fs.glsl b/modules/galaxy/shaders/points_fs.glsl index 74bad67aab..7a02e97691 100644 --- a/modules/galaxy/shaders/points_fs.glsl +++ b/modules/galaxy/shaders/points_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/points_vs.glsl b/modules/galaxy/shaders/points_vs.glsl index 945aaa9871..f9db99919d 100644 --- a/modules/galaxy/shaders/points_vs.glsl +++ b/modules/galaxy/shaders/points_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/raycasterbounds_fs.glsl b/modules/galaxy/shaders/raycasterbounds_fs.glsl index bd75fd9fe0..bee57cf5e7 100644 --- a/modules/galaxy/shaders/raycasterbounds_fs.glsl +++ b/modules/galaxy/shaders/raycasterbounds_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/raycasterbounds_vs.glsl b/modules/galaxy/shaders/raycasterbounds_vs.glsl index a85add2da1..b3933e4ae6 100644 --- a/modules/galaxy/shaders/raycasterbounds_vs.glsl +++ b/modules/galaxy/shaders/raycasterbounds_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 fe7753e4f0..c3ee9a37e4 100644 --- a/modules/galaxy/tasks/milkywayconversiontask.cpp +++ b/modules/galaxy/tasks/milkywayconversiontask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b5f6162138..77ad77d821 100644 --- a/modules/galaxy/tasks/milkywayconversiontask.h +++ b/modules/galaxy/tasks/milkywayconversiontask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 4166a81aa9..ac2b12bfcf 100644 --- a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp +++ b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 2ba64516a6..a9d866da23 100644 --- a/modules/galaxy/tasks/milkywaypointsconversiontask.h +++ b/modules/galaxy/tasks/milkywaypointsconversiontask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 72598ce00b..24e84d32d9 100644 --- a/modules/globebrowsing/CMakeLists.txt +++ b/modules/globebrowsing/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/globebrowsing/globebrowsingmodule.cpp index 2181b3ab1d..f353633f99 100644 --- a/modules/globebrowsing/globebrowsingmodule.cpp +++ b/modules/globebrowsing/globebrowsingmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -128,7 +128,6 @@ namespace { "The maximum size of the MemoryAwareTileCache, on the CPU and GPU" }; - openspace::GlobeBrowsingModule::Capabilities parseSubDatasets(char** subDatasets, int nSubdatasets) { @@ -393,7 +392,7 @@ glm::vec3 GlobeBrowsingModule::cartesianCoordinatesFromGeo( using namespace globebrowsing; const Geodetic3 pos = { - { glm::radians(latitude), glm::radians(longitude) }, + { .lat = glm::radians(latitude), .lon = glm::radians(longitude) }, altitude }; @@ -452,8 +451,8 @@ void GlobeBrowsingModule::goToChunk(const globebrowsing::RenderableGlobe& globe, positionOnPatch.lat *= uv.y; positionOnPatch.lon *= uv.x; const Geodetic2 pointPosition = { - corner.lat + positionOnPatch.lat, - corner.lon + positionOnPatch.lon + .lat = corner.lat + positionOnPatch.lat, + .lon = corner.lon + positionOnPatch.lon }; // Compute altitude @@ -689,29 +688,28 @@ uint64_t GlobeBrowsingModule::wmsCacheSize() const { } scripting::LuaLibrary GlobeBrowsingModule::luaLibrary() const { - scripting::LuaLibrary res; - res.name = "globebrowsing"; - res.functions = { - codegen::lua::AddLayer, - codegen::lua::DeleteLayer, - codegen::lua::GetLayers, - codegen::lua::MoveLayer, - codegen::lua::GoToChunk, - codegen::lua::GoToGeo, - // @TODO (2021-06-23, emmbr) Combine with the above function when the camera - // paths work really well close to surfaces - codegen::lua::FlyToGeo, - codegen::lua::GetLocalPositionFromGeo, - codegen::lua::GetGeoPositionForCamera, - codegen::lua::LoadWMSCapabilities, - codegen::lua::RemoveWMSServer, - codegen::lua::CapabilitiesWMS + return { + .name = "globebrowsing", + .functions = { + codegen::lua::AddLayer, + codegen::lua::DeleteLayer, + codegen::lua::GetLayers, + codegen::lua::MoveLayer, + codegen::lua::GoToChunk, + codegen::lua::GoToGeo, + // @TODO (2021-06-23, emmbr) Combine with the above function when the camera + // paths work really well close to surfaces + codegen::lua::FlyToGeo, + codegen::lua::GetLocalPositionFromGeo, + codegen::lua::GetGeoPositionForCamera, + codegen::lua::LoadWMSCapabilities, + codegen::lua::RemoveWMSServer, + codegen::lua::CapabilitiesWMS + }, + .scripts = { + absPath("${MODULE_GLOBEBROWSING}/scripts/layer_support.lua") + } }; - res.scripts = { - absPath("${MODULE_GLOBEBROWSING}/scripts/layer_support.lua") - }; - - return res; } } // namespace openspace diff --git a/modules/globebrowsing/globebrowsingmodule.h b/modules/globebrowsing/globebrowsingmodule.h index deff363f85..3539b6f077 100644 --- a/modules/globebrowsing/globebrowsingmodule.h +++ b/modules/globebrowsing/globebrowsingmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a043f53a0a..7320e0cf6d 100644 --- a/modules/globebrowsing/globebrowsingmodule_lua.inl +++ b/modules/globebrowsing/globebrowsingmodule_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -151,24 +151,26 @@ namespace { * Rearranges the order of a single layer on a globe. The first parameter is the * identifier of the globe, the second parameter specifies the name of the layer group, * the third parameter is the original position of the layer that should be moved and the - * last parameter is the new position in the list. The first position in the list has - * index 0, and the last position is given by the number of layers minus one. The new - * position may be -1 to place the layer at the top or any number bigger than the number - * of layers to place it at the bottom. + * last parameter is the new position in the list. The third and fourth parameters can + * also acccept names, in which case these refer to identifiers of the layer to be moved. + * If the last parameter is a name, the source layer is moved below that destination + * layer. The first position in the list has index 0, and the last position is given by + * the number of layers minus one. */ -[[codegen::luawrap]] void moveLayer(std::string globeIdentifier, std::string layer, - int oldPosition, int newPosition) +[[codegen::luawrap]] void moveLayer(std::string globeIdentifier, std::string layerGroup, + std::variant source, + std::variant destination) { using namespace openspace; using namespace globebrowsing; - if (oldPosition == newPosition) { + if (source == destination) { return; } SceneGraphNode* n = sceneGraphNode(globeIdentifier); if (!n) { - throw ghoul::lua::LuaError("Unknown globe name: " + globeIdentifier); + throw ghoul::lua::LuaError(fmt::format("Unknown globe: {}", globeIdentifier)); } RenderableGlobe* globe = dynamic_cast(n->renderable()); @@ -176,13 +178,62 @@ namespace { throw ghoul::lua::LuaError("Identifier must be a RenderableGlobe"); } - layers::Group::ID group = ghoul::from_string(layer); + layers::Group::ID group = ghoul::from_string(layerGroup); if (group == layers::Group::ID::Unknown) { - throw ghoul::lua::LuaError("Unknown layer groupd: " + layer); + throw ghoul::lua::LuaError(fmt::format("Unknown layer group: {}", layerGroup)); + } + + LayerGroup& lg = globe->layerManager().layerGroup(group); + if (std::holds_alternative(source) && std::holds_alternative(destination)) { + // Short circut here, no need to get the layers + lg.moveLayer(std::get(source), std::get(destination)); + return; } - LayerGroup& lg = globe->layerManager().layerGroup(group); - lg.moveLayer(oldPosition, newPosition); + std::vector layers = lg.layers(); + + int sourceIdx = 0; + if (std::holds_alternative(source)) { + sourceIdx = std::get(source); + } + else { + auto it = std::find_if( + layers.cbegin(), layers.cend(), + [s = std::get(source)](Layer* l) { + return l->identifier() == s; + } + ); + if (it == layers.cend()) { + throw ghoul::lua::LuaError(fmt::format( + "Could not find source layer '{}'", std::get(source) + )); + } + + sourceIdx = static_cast(std::distance(layers.cbegin(), it)); + } + + int destinationIdx = 0; + if (std::holds_alternative(destination)) { + destinationIdx = std::get(destination); + } + else { + auto it = std::find_if( + layers.cbegin(), layers.cend(), + [d = std::get(destination)](Layer* l) { + return l->identifier() == d; + } + ); + if (it == layers.cend()) { + throw ghoul::lua::LuaError(fmt::format( + "Could not find destination layer '{}'", std::get(source) + )); + } + + // +1 since we want to move the layer _below_ the specified layer + destinationIdx = static_cast(std::distance(layers.cbegin(), it)); + } + + lg.moveLayer(sourceIdx, destinationIdx); } /** diff --git a/modules/globebrowsing/shaders/advanced_rings_fs.glsl b/modules/globebrowsing/shaders/advanced_rings_fs.glsl index ea732f55fa..d428257405 100644 --- a/modules/globebrowsing/shaders/advanced_rings_fs.glsl +++ b/modules/globebrowsing/shaders/advanced_rings_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/advanced_rings_vs.glsl b/modules/globebrowsing/shaders/advanced_rings_vs.glsl index 958b9ef2ca..fbf5ebb754 100644 --- a/modules/globebrowsing/shaders/advanced_rings_vs.glsl +++ b/modules/globebrowsing/shaders/advanced_rings_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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.glsl b/modules/globebrowsing/shaders/blending.glsl index 1de630b255..ce4f3b60a6 100644 --- a/modules/globebrowsing/shaders/blending.glsl +++ b/modules/globebrowsing/shaders/blending.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 1a55d7aa92..e618324bc5 100644 --- a/modules/globebrowsing/shaders/globalrenderer_vs.glsl +++ b/modules/globebrowsing/shaders/globalrenderer_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/interpolate_fs.glsl b/modules/globebrowsing/shaders/interpolate_fs.glsl index ec2af69bdc..e1d1b89f1b 100644 --- a/modules/globebrowsing/shaders/interpolate_fs.glsl +++ b/modules/globebrowsing/shaders/interpolate_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/interpolate_vs.glsl b/modules/globebrowsing/shaders/interpolate_vs.glsl index 164eda38a8..519f245266 100644 --- a/modules/globebrowsing/shaders/interpolate_vs.glsl +++ b/modules/globebrowsing/shaders/interpolate_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 0809d84d7f..6586fc810a 100644 --- a/modules/globebrowsing/shaders/localrenderer_vs.glsl +++ b/modules/globebrowsing/shaders/localrenderer_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 083bd5dbc5..6914aa6a57 100644 --- a/modules/globebrowsing/shaders/renderer_fs.glsl +++ b/modules/globebrowsing/shaders/renderer_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/rings_fs.glsl b/modules/globebrowsing/shaders/rings_fs.glsl index 23a90a5eb6..64665803fd 100644 --- a/modules/globebrowsing/shaders/rings_fs.glsl +++ b/modules/globebrowsing/shaders/rings_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/rings_geom_fs.glsl b/modules/globebrowsing/shaders/rings_geom_fs.glsl index e29e24c843..3b6804204a 100644 --- a/modules/globebrowsing/shaders/rings_geom_fs.glsl +++ b/modules/globebrowsing/shaders/rings_geom_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/rings_geom_vs.glsl b/modules/globebrowsing/shaders/rings_geom_vs.glsl index eb1eea8a96..f9c17918e7 100644 --- a/modules/globebrowsing/shaders/rings_geom_vs.glsl +++ b/modules/globebrowsing/shaders/rings_geom_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/rings_vs.glsl b/modules/globebrowsing/shaders/rings_vs.glsl index 958b9ef2ca..fbf5ebb754 100644 --- a/modules/globebrowsing/shaders/rings_vs.glsl +++ b/modules/globebrowsing/shaders/rings_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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.glsl b/modules/globebrowsing/shaders/texturetilemapping.glsl index 7d36e067c2..eb7647d711 100644 --- a/modules/globebrowsing/shaders/texturetilemapping.glsl +++ b/modules/globebrowsing/shaders/texturetilemapping.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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.glsl b/modules/globebrowsing/shaders/tile.glsl index eb8e4b35d4..b525bc3852 100644 --- a/modules/globebrowsing/shaders/tile.glsl +++ b/modules/globebrowsing/shaders/tile.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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.glsl b/modules/globebrowsing/shaders/tileheight.glsl index 731c786ff0..b1973172b3 100644 --- a/modules/globebrowsing/shaders/tileheight.glsl +++ b/modules/globebrowsing/shaders/tileheight.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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.glsl b/modules/globebrowsing/shaders/tilevertexskirt.glsl index f5aacf790a..a4f81a3156 100644 --- a/modules/globebrowsing/shaders/tilevertexskirt.glsl +++ b/modules/globebrowsing/shaders/tilevertexskirt.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 07731ec592..3cfc087485 100644 --- a/modules/globebrowsing/src/asynctiledataprovider.cpp +++ b/modules/globebrowsing/src/asynctiledataprovider.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 34e4325c10..d984b5d05e 100644 --- a/modules/globebrowsing/src/asynctiledataprovider.h +++ b/modules/globebrowsing/src/asynctiledataprovider.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 0feec1945a..ff2bff646b 100644 --- a/modules/globebrowsing/src/basictypes.h +++ b/modules/globebrowsing/src/basictypes.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b195b8274e..fe0780c6c4 100644 --- a/modules/globebrowsing/src/dashboarditemglobelocation.cpp +++ b/modules/globebrowsing/src/dashboarditemglobelocation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -42,19 +42,6 @@ #include namespace { - constexpr openspace::properties::Property::PropertyInfo FontNameInfo = { - "FontName", - "Font Name", - "This value is the name of the font that is used. It can either refer to an " - "internal name registered previously, or it can refer to a path that is used" - }; - - constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = { - "FontSize", - "Font Size", - "This value determines the size of the font that is used to render the date" - }; - constexpr openspace::properties::Property::PropertyInfo DisplayFormatInfo = { "DisplayFormat", "Display Format", @@ -68,12 +55,6 @@ namespace { }; struct [[codegen::Dictionary(DashboardItemGlobeLocation)]] Parameters { - // [[codegen::verbatim(FontNameInfo.description)]] - std::optional fontName; - - // [[codegen::verbatim(FontSizeInfo.description)]] - std::optional fontSize; - enum class DisplayFormat { DecimalDegrees, DegreeMinuteSeconds @@ -91,32 +72,20 @@ namespace { namespace openspace { documentation::Documentation DashboardItemGlobeLocation::Documentation() { - return codegen::doc("globebrowsing_dashboarditem_globelocation"); + return codegen::doc( + "globebrowsing_dashboarditem_globelocation", + DashboardTextItem::Documentation() + ); } DashboardItemGlobeLocation::DashboardItemGlobeLocation( const ghoul::Dictionary& dictionary) - : DashboardItem(dictionary) - , _fontName(FontNameInfo, "Mono") - , _fontSize(FontSizeInfo, 10.f, 10.f, 144.f, 1.f) + : DashboardTextItem(dictionary) , _displayFormat(DisplayFormatInfo) , _significantDigits(SignificantDigitsInfo, 4, 1, 12) - , _font(global::fontManager->font("Mono", 10)) { const Parameters p = codegen::bake(dictionary); - _fontName = p.fontName.value_or(_fontName); - _fontName.onChange([this]() { - _font = global::fontManager->font(_fontName, _fontSize); - }); - addProperty(_fontName); - - _fontSize = p.fontSize.value_or(_fontSize); - _fontSize.onChange([this]() { - _font = global::fontManager->font(_fontName, _fontSize); - }); - addProperty(_fontSize); - auto updateFormatString = [this]() { switch (_displayFormat.value()) { case static_cast(DisplayFormat::DecimalDegrees): diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.h b/modules/globebrowsing/src/dashboarditemglobelocation.h index 466d3c1523..c73a7efe11 100644 --- a/modules/globebrowsing/src/dashboarditemglobelocation.h +++ b/modules/globebrowsing/src/dashboarditemglobelocation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -25,20 +25,18 @@ #ifndef __OPENSPACE_MODULE_GLOBEBROWSING___DASHBOARDITEMGLOBELOCATION___H__ #define __OPENSPACE_MODULE_GLOBEBROWSING___DASHBOARDITEMGLOBELOCATION___H__ -#include +#include #include #include #include #include -namespace ghoul::fontrendering { class Font; } - namespace openspace { namespace documentation { struct Documentation; } -class DashboardItemGlobeLocation : public DashboardItem { +class DashboardItemGlobeLocation : public DashboardTextItem { public: DashboardItemGlobeLocation(const ghoul::Dictionary& dictionary); ~DashboardItemGlobeLocation() override = default; @@ -55,13 +53,9 @@ private: DegreeMinuteSeconds }; - properties::StringProperty _fontName; - properties::FloatProperty _fontSize; - properties::OptionProperty _displayFormat; properties::IntProperty _significantDigits; - std::shared_ptr _font; std::string _formatString; std::vector _buffer; }; diff --git a/modules/globebrowsing/src/ellipsoid.cpp b/modules/globebrowsing/src/ellipsoid.cpp index ec5883795c..76ecc160dd 100644 --- a/modules/globebrowsing/src/ellipsoid.cpp +++ b/modules/globebrowsing/src/ellipsoid.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -133,8 +133,8 @@ double Ellipsoid::greatCircleDistance(const Geodetic2& p1, const Geodetic2& p2) ); const Geodetic2 pMid = { - (p1.lat + p2.lat) / 2.0, - (p1.lon + p2.lon) / 2.0 + .lat = (p1.lat + p2.lat) / 2.0, + .lon = (p1.lon + p2.lon) / 2.0 }; const glm::dvec3 centralNormal = cartesianSurfacePosition(pMid); diff --git a/modules/globebrowsing/src/ellipsoid.h b/modules/globebrowsing/src/ellipsoid.h index 6b4f14d2de..e7b8c6ec2a 100644 --- a/modules/globebrowsing/src/ellipsoid.h +++ b/modules/globebrowsing/src/ellipsoid.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 0abe41e8ab..664f2bd59a 100644 --- a/modules/globebrowsing/src/gdalwrapper.cpp +++ b/modules/globebrowsing/src/gdalwrapper.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8535e0f48d..219dd16661 100644 --- a/modules/globebrowsing/src/gdalwrapper.h +++ b/modules/globebrowsing/src/gdalwrapper.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 24c9d2530c..7d8167f8dd 100644 --- a/modules/globebrowsing/src/geodeticpatch.cpp +++ b/modules/globebrowsing/src/geodeticpatch.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -132,8 +132,8 @@ double GeodeticPatch::maxLon() const { bool GeodeticPatch::contains(const Geodetic2& p) const { const Geodetic2 diff = { - _center.lat - p.lat, - _center.lon - p.lon + .lat = _center.lat - p.lat, + .lon = _center.lon - p.lon }; return glm::abs(diff.lat) <= _halfSize.lat && glm::abs(diff.lon) <= _halfSize.lon; } @@ -166,8 +166,8 @@ Geodetic2 GeodeticPatch::clamp(const Geodetic2& p) const { Geodetic2 GeodeticPatch::closestCorner(const Geodetic2& p) const { // LatLon vector from patch center to the point const Geodetic2 centerToPoint = { - p.lat - _center.lat, - p.lon - _center.lon + .lat = p.lat - _center.lat, + .lon = p.lon - _center.lon }; // Normalize the difference angles to be centered around 0. diff --git a/modules/globebrowsing/src/geodeticpatch.h b/modules/globebrowsing/src/geodeticpatch.h index 729ba324f0..ad333be2f6 100644 --- a/modules/globebrowsing/src/geodeticpatch.h +++ b/modules/globebrowsing/src/geodeticpatch.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp index 6c53601a33..89745bb4a3 100644 --- a/modules/globebrowsing/src/globelabelscomponent.cpp +++ b/modules/globebrowsing/src/globelabelscomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/globelabelscomponent.h b/modules/globebrowsing/src/globelabelscomponent.h index fa400bbed2..841b65cdb2 100644 --- a/modules/globebrowsing/src/globelabelscomponent.h +++ b/modules/globebrowsing/src/globelabelscomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/globerotation.cpp b/modules/globebrowsing/src/globerotation.cpp index d393089ab8..be621a2642 100644 --- a/modules/globebrowsing/src/globerotation.cpp +++ b/modules/globebrowsing/src/globerotation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -232,11 +232,11 @@ glm::dmat3 GlobeRotation::matrix(const UpdateData&) const { zAxis = glm::normalize(zAxis); const glm::dvec3 xAxis = glm::normalize(glm::cross(yAxis, zAxis)); - const glm::dmat3 mat = { + const glm::dmat3 mat = glm::dmat3( xAxis.x, xAxis.y, xAxis.z, yAxis.x, yAxis.y, yAxis.z, zAxis.x, zAxis.y, zAxis.z - }; + ); const glm::dquat q = glm::angleAxis(glm::radians(_angle.value()), yAxis); _matrix = glm::toMat3(q) * mat; diff --git a/modules/globebrowsing/src/globerotation.h b/modules/globebrowsing/src/globerotation.h index 8466910020..4324950f5a 100644 --- a/modules/globebrowsing/src/globerotation.h +++ b/modules/globebrowsing/src/globerotation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 48436700c5..ded1ec46aa 100644 --- a/modules/globebrowsing/src/globetranslation.cpp +++ b/modules/globebrowsing/src/globetranslation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -61,10 +61,9 @@ namespace { constexpr openspace::properties::Property::PropertyInfo AltitudeInfo = { "Altitude", "Altitude", - "The altitude in meters. " - "If the 'UseHeightmap' property is 'true', this is an offset from the actual " - "surface of the globe. If not, this is an offset from the reference ellipsoid." - "The default value is 0.0" + "The altitude in meters. If the 'UseHeightmap' property is 'true', this is an " + "offset from the actual surface of the globe. If not, this is an offset from the " + "reference ellipsoid. The default value is 0.0" }; constexpr openspace::properties::Property::PropertyInfo UseHeightmapInfo = { diff --git a/modules/globebrowsing/src/globetranslation.h b/modules/globebrowsing/src/globetranslation.h index de613b1aa1..759f825696 100644 --- a/modules/globebrowsing/src/globetranslation.h +++ b/modules/globebrowsing/src/globetranslation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 7b74bc641b..da878cc7e9 100644 --- a/modules/globebrowsing/src/gpulayergroup.cpp +++ b/modules/globebrowsing/src/gpulayergroup.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 293c58d06a..e9af7b55c1 100644 --- a/modules/globebrowsing/src/gpulayergroup.h +++ b/modules/globebrowsing/src/gpulayergroup.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f21ca9f39f..9be2909914 100644 --- a/modules/globebrowsing/src/layer.cpp +++ b/modules/globebrowsing/src/layer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 416ee5ddf8..fccba0b56f 100644 --- a/modules/globebrowsing/src/layer.h +++ b/modules/globebrowsing/src/layer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 2a875f7117..d2f534f0bb 100644 --- a/modules/globebrowsing/src/layeradjustment.cpp +++ b/modules/globebrowsing/src/layeradjustment.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f57de66d95..e96e0aee18 100644 --- a/modules/globebrowsing/src/layeradjustment.h +++ b/modules/globebrowsing/src/layeradjustment.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 41aaaa7aac..d434bab58c 100644 --- a/modules/globebrowsing/src/layergroup.cpp +++ b/modules/globebrowsing/src/layergroup.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b04b1e4565..306c30c5dd 100644 --- a/modules/globebrowsing/src/layergroup.h +++ b/modules/globebrowsing/src/layergroup.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 ad07899f6d..419fae81a2 100644 --- a/modules/globebrowsing/src/layergroupid.cpp +++ b/modules/globebrowsing/src/layergroupid.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 7cd5c8922e..2feb9b1a2a 100644 --- a/modules/globebrowsing/src/layergroupid.h +++ b/modules/globebrowsing/src/layergroupid.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -47,11 +47,31 @@ struct Group { }; constexpr std::array Groups = { - Group{ Group::ID::HeightLayers, "HeightLayers", "Height Layers" }, - Group{ Group::ID::ColorLayers, "ColorLayers", "Color Layers" }, - Group{ Group::ID::Overlays, "Overlays", "Overlays" }, - Group{ Group::ID::NightLayers, "NightLayers", "Night Layers" }, - Group{ Group::ID::WaterMasks, "WaterMasks", "Water Masks" } + Group { + .id = Group::ID::HeightLayers, + .identifier = "HeightLayers", + .name = "Height Layers" + }, + Group { + .id = Group::ID::ColorLayers, + .identifier = "ColorLayers", + .name = "Color Layers" + }, + Group { + .id = Group::ID::Overlays, + .identifier = "Overlays", + .name = "Overlays" + }, + Group { + .id = Group::ID::NightLayers, + .identifier = "NightLayers", + .name = "Night Layers" + }, + Group { + .id = Group::ID::WaterMasks, + .identifier = "WaterMasks", + .name = "Water Masks" + } }; @@ -76,16 +96,46 @@ struct Layer { }; constexpr std::array Layers = { - Layer{ Layer::ID::DefaultTileLayer, "DefaultTileLayer" }, - Layer{ Layer::ID::SingleImageTileLayer, "SingleImageTileLayer" }, - Layer{ Layer::ID::ImageSequenceTileLayer, "ImageSequenceTileLayer" }, - Layer{ Layer::ID::SizeReferenceTileLayer, "SizeReferenceTileLayer" }, - Layer{ Layer::ID::TemporalTileLayer, "TemporalTileLayer" }, - Layer{ Layer::ID::TileIndexTileLayer, "TileIndexTileLayer" }, - Layer{ Layer::ID::ByIndexTileLayer, "ByIndexTileLayer" }, - Layer{ Layer::ID::ByLevelTileLayer, "ByLevelTileLayer" }, - Layer{ Layer::ID::SolidColor, "SolidColor" }, - Layer{ Layer::ID::SpoutImageTileLayer, "SpoutImageTileLayer" } + Layer { + .id = Layer::ID::DefaultTileLayer, + .identifier = "DefaultTileLayer" + }, + Layer { + .id = Layer::ID::SingleImageTileLayer, + .identifier = "SingleImageTileLayer" + }, + Layer { + .id = Layer::ID::ImageSequenceTileLayer, + .identifier = "ImageSequenceTileLayer" + }, + Layer { + .id = Layer::ID::SizeReferenceTileLayer, + .identifier = "SizeReferenceTileLayer" + }, + Layer { + .id = Layer::ID::TemporalTileLayer, + .identifier = "TemporalTileLayer" + }, + Layer { + .id = Layer::ID::TileIndexTileLayer, + .identifier = "TileIndexTileLayer" + }, + Layer { + .id = Layer::ID::ByIndexTileLayer, + .identifier = "ByIndexTileLayer" + }, + Layer { + .id = Layer::ID::ByLevelTileLayer, + .identifier = "ByLevelTileLayer" + }, + Layer { + .id = Layer::ID::SolidColor, + .identifier = "SolidColor" + }, + Layer { + .id = Layer::ID::SpoutImageTileLayer, + .identifier = "SpoutImageTileLayer" + } }; @@ -102,9 +152,18 @@ struct Adjustment { }; constexpr std::array Adjustments = { - Adjustment{ Adjustment::ID::None, "None" }, - Adjustment{ Adjustment::ID::ChromaKey, "ChromaKey" }, - Adjustment{ Adjustment::ID::TransferFunction, "TransferFunction" } + Adjustment { + .id = Adjustment::ID::None, + .identifier = "None" + }, + Adjustment { + .id = Adjustment::ID::ChromaKey, + .identifier = "ChromaKey" + }, + Adjustment { + .id = Adjustment::ID::TransferFunction, + .identifier = "TransferFunction" + } }; @@ -123,11 +182,11 @@ struct Blend { }; constexpr std::array Blends = { - Blend{ Blend::ID::Normal, "Normal" }, - Blend{ Blend::ID::Multiply, "Multiply" }, - Blend{ Blend::ID::Add, "Add" }, - Blend{ Blend::ID::Subtract, "Subtract" }, - Blend{ Blend::ID::Color, "Color" } + Blend { .id = Blend::ID::Normal, .identifier = "Normal" }, + Blend { .id = Blend::ID::Multiply, .identifier = "Multiply" }, + Blend { .id = Blend::ID::Add, .identifier = "Add" }, + Blend { .id = Blend::ID::Subtract, .identifier = "Subtract" }, + Blend { .id = Blend::ID::Color, .identifier = "Color" } }; } // namespace openspace::globebrowsing::layers diff --git a/modules/globebrowsing/src/layermanager.cpp b/modules/globebrowsing/src/layermanager.cpp index 5a8e55f3c8..d8afc32605 100644 --- a/modules/globebrowsing/src/layermanager.cpp +++ b/modules/globebrowsing/src/layermanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 2ac7409297..626edde330 100644 --- a/modules/globebrowsing/src/layermanager.h +++ b/modules/globebrowsing/src/layermanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f634b9b328..545023504c 100644 --- a/modules/globebrowsing/src/layerrendersettings.cpp +++ b/modules/globebrowsing/src/layerrendersettings.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 1a235a406b..1a417eb470 100644 --- a/modules/globebrowsing/src/layerrendersettings.h +++ b/modules/globebrowsing/src/layerrendersettings.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 022220c279..2a77647019 100644 --- a/modules/globebrowsing/src/lrucache.h +++ b/modules/globebrowsing/src/lrucache.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 2bd2eb824e..b03180b8d8 100644 --- a/modules/globebrowsing/src/lrucache.inl +++ b/modules/globebrowsing/src/lrucache.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 853ed71767..a29932bcae 100644 --- a/modules/globebrowsing/src/lruthreadpool.h +++ b/modules/globebrowsing/src/lruthreadpool.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 36643dfa2f..a0362e5723 100644 --- a/modules/globebrowsing/src/lruthreadpool.inl +++ b/modules/globebrowsing/src/lruthreadpool.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 65f77d8d0d..24d7872aee 100644 --- a/modules/globebrowsing/src/memoryawaretilecache.cpp +++ b/modules/globebrowsing/src/memoryawaretilecache.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 78a19549e0..10cf9f9115 100644 --- a/modules/globebrowsing/src/memoryawaretilecache.h +++ b/modules/globebrowsing/src/memoryawaretilecache.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 1b4dfd3be8..1a9379a7bc 100644 --- a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h +++ b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 6aaf619a0e..f788d5f070 100644 --- a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl +++ b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 25b9374319..8014ed0ca0 100644 --- a/modules/globebrowsing/src/rawtile.h +++ b/modules/globebrowsing/src/rawtile.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby 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 @@ struct RawTile { std::unique_ptr imageData; TileMetaData tileMetaData; std::optional textureInitData; - TileIndex tileIndex = { 0, 0, 0 }; + TileIndex tileIndex = TileIndex(0, 0, 0); ReadError error = ReadError::None; GLuint pbo = 0; }; diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp index f40934ded8..9f156b5e66 100644 --- a/modules/globebrowsing/src/rawtiledatareader.cpp +++ b/modules/globebrowsing/src/rawtiledatareader.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -69,51 +69,51 @@ struct MemoryLocation { // The memory locations are grouped to be mostly cache-aligned constexpr std::array NoDataAvailableData = { - MemoryLocation{ 296380, std::byte(205) }, - MemoryLocation{ 296381, std::byte(205) }, - MemoryLocation{ 296382, std::byte(205) }, - MemoryLocation{ 296383, std::byte(255) }, - MemoryLocation{ 296384, std::byte(224) }, - MemoryLocation{ 296385, std::byte(224) }, - MemoryLocation{ 296386, std::byte(224) }, - MemoryLocation{ 296387, std::byte(255) }, - MemoryLocation{ 296388, std::byte(244) }, - MemoryLocation{ 296389, std::byte(244) }, - MemoryLocation{ 296390, std::byte(244) }, - MemoryLocation{ 296391, std::byte(255) }, + MemoryLocation { .offset = 296380, .value = std::byte(205) }, + MemoryLocation { .offset = 296381, .value = std::byte(205) }, + MemoryLocation { .offset = 296382, .value = std::byte(205) }, + MemoryLocation { .offset = 296383, .value = std::byte(255) }, + MemoryLocation { .offset = 296384, .value = std::byte(224) }, + MemoryLocation { .offset = 296385, .value = std::byte(224) }, + MemoryLocation { .offset = 296386, .value = std::byte(224) }, + MemoryLocation { .offset = 296387, .value = std::byte(255) }, + MemoryLocation { .offset = 296388, .value = std::byte(244) }, + MemoryLocation { .offset = 296389, .value = std::byte(244) }, + MemoryLocation { .offset = 296390, .value = std::byte(244) }, + MemoryLocation { .offset = 296391, .value = std::byte(255) }, - MemoryLocation{ 269840, std::byte(209) }, - MemoryLocation{ 269841, std::byte(209) }, - MemoryLocation{ 269842, std::byte(209) }, - MemoryLocation{ 269844, std::byte(203) }, - MemoryLocation{ 269845, std::byte(203) }, - MemoryLocation{ 269846, std::byte(203) }, - MemoryLocation{ 269852, std::byte(221) }, - MemoryLocation{ 269853, std::byte(221) }, - MemoryLocation{ 269854, std::byte(221) }, - MemoryLocation{ 269856, std::byte(225) }, - MemoryLocation{ 269857, std::byte(225) }, - MemoryLocation{ 269858, std::byte(225) }, - MemoryLocation{ 269860, std::byte(218) }, - MemoryLocation{ 269861, std::byte(218) }, + MemoryLocation { .offset = 269840, .value = std::byte(209) }, + MemoryLocation { .offset = 269841, .value = std::byte(209) }, + MemoryLocation { .offset = 269842, .value = std::byte(209) }, + MemoryLocation { .offset = 269844, .value = std::byte(203) }, + MemoryLocation { .offset = 269845, .value = std::byte(203) }, + MemoryLocation { .offset = 269846, .value = std::byte(203) }, + MemoryLocation { .offset = 269852, .value = std::byte(221) }, + MemoryLocation { .offset = 269853, .value = std::byte(221) }, + MemoryLocation { .offset = 269854, .value = std::byte(221) }, + MemoryLocation { .offset = 269856, .value = std::byte(225) }, + MemoryLocation { .offset = 269857, .value = std::byte(225) }, + MemoryLocation { .offset = 269858, .value = std::byte(225) }, + MemoryLocation { .offset = 269860, .value = std::byte(218) }, + MemoryLocation { .offset = 269861, .value = std::byte(218) }, - MemoryLocation{ 240349, std::byte(203) }, - MemoryLocation{ 240350, std::byte(203) }, - MemoryLocation{ 240352, std::byte(205) }, - MemoryLocation{ 240353, std::byte(204) }, - MemoryLocation{ 240354, std::byte(205) }, + MemoryLocation { .offset = 240349, .value = std::byte(203) }, + MemoryLocation { .offset = 240350, .value = std::byte(203) }, + MemoryLocation { .offset = 240352, .value = std::byte(205) }, + MemoryLocation { .offset = 240353, .value = std::byte(204) }, + MemoryLocation { .offset = 240354, .value = std::byte(205) }, - MemoryLocation{ 0, std::byte(204) }, - MemoryLocation{ 7, std::byte(255) }, - MemoryLocation{ 520, std::byte(204) }, - MemoryLocation{ 880, std::byte(204) }, - MemoryLocation{ 883, std::byte(255) }, - MemoryLocation{ 91686, std::byte(204) }, - MemoryLocation{ 372486, std::byte(204) }, - MemoryLocation{ 670483, std::byte(255) }, - MemoryLocation{ 231684, std::byte(202) }, - MemoryLocation{ 232092, std::byte(202) }, - MemoryLocation{ 235921, std::byte(203) }, + MemoryLocation { .offset = 0, .value = std::byte(204) }, + MemoryLocation { .offset = 7, .value = std::byte(255) }, + MemoryLocation { .offset = 520, .value = std::byte(204) }, + MemoryLocation { .offset = 880, .value = std::byte(204) }, + MemoryLocation { .offset = 883, .value = std::byte(255) }, + MemoryLocation { .offset = 91686, .value = std::byte(204) }, + MemoryLocation { .offset = 372486, .value = std::byte(204) }, + MemoryLocation { .offset = 670483, .value = std::byte(255) }, + MemoryLocation { .offset = 231684, .value = std::byte(202) }, + MemoryLocation { .offset = 232092, .value = std::byte(202) }, + MemoryLocation { .offset = 235921, .value = std::byte(203) }, }; enum class Side { @@ -304,10 +304,10 @@ bool isInside(const PixelRegion& lhs, const PixelRegion& rhs) { } IODescription cutIODescription(IODescription& io, Side side, int pos) { - glm::dvec2 ratio = { + glm::dvec2 ratio = glm::dvec2( io.write.region.numPixels.x / static_cast(io.read.region.numPixels.x), io.write.region.numPixels.y / static_cast(io.read.region.numPixels.y) - }; + ); IODescription whatCameOff = io; whatCameOff.read.region = globalCut(io.read.region, side, pos); @@ -785,13 +785,14 @@ IODescription RawTileDataReader::ioDescription(const TileIndex& tileIndex) const io.write.region.numPixels = _initData.dimensions; io.read.overview = 0; - io.read.fullRegion.start = { 0, 0 }; - io.read.fullRegion.numPixels = { _rasterXSize, _rasterYSize }; + io.read.fullRegion.start = glm::ivec2(0, 0); + io.read.fullRegion.numPixels = glm::ivec2(_rasterXSize, _rasterYSize); // For correct sampling in dataset, we need to pad the texture tile - PixelRegion scaledPadding; - scaledPadding.start = _initData.tilePixelStartOffset; - scaledPadding.numPixels = _initData.tilePixelSizeDifference; + PixelRegion scaledPadding = { + .start = _initData.tilePixelStartOffset, + .numPixels = _initData.tilePixelSizeDifference + }; const double scale = static_cast(io.read.region.numPixels.x) / static_cast(io.write.region.numPixels.x); diff --git a/modules/globebrowsing/src/rawtiledatareader.h b/modules/globebrowsing/src/rawtiledatareader.h index f5d008dbb0..c58ea2da80 100644 --- a/modules/globebrowsing/src/rawtiledatareader.h +++ b/modules/globebrowsing/src/rawtiledatareader.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -98,7 +98,7 @@ private: const TileTextureInitData _initData; const PerformPreprocessing _preprocess; - TileDepthTransform _depthTransform = { 0.f, 0.f }; + TileDepthTransform _depthTransform = { .scale = 0.f, .offset = 0.f }; mutable std::mutex _datasetLock; }; diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp index f7647a7d5e..89c2b8c908 100644 --- a/modules/globebrowsing/src/renderableglobe.cpp +++ b/modules/globebrowsing/src/renderableglobe.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -190,15 +190,15 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ZFightingPercentageInfo = { "ZFightingPercentage", "Z-Fighting Percentage", - "The percentage of the correct distance to the surface being shadowed. " - "Possible values: [0.0, 1.0]" + "The percentage of the correct distance to the surface being shadowed. Possible " + "values: [0.0, 1.0]" }; constexpr openspace::properties::Property::PropertyInfo NumberShadowSamplesInfo = { "NumberShadowSamples", "Number of Shadow Samples", - "The number of samples used during shadow mapping calculation " - "(Percentage Closer Filtering)" + "The number of samples used during shadow mapping calculation (Percentage Closer " + "Filtering)" }; constexpr openspace::properties::Property::PropertyInfo TargetLodScaleFactorInfo = { @@ -1875,13 +1875,13 @@ float RenderableGlobe::getHeight(const glm::dvec3& position) const { const Geodetic2 southWest = patch.corner(Quad::SOUTH_WEST); const Geodetic2 geoDiffPatch = { - northEast.lat - southWest.lat, - northEast.lon - southWest.lon + .lat = northEast.lat - southWest.lat, + .lon = northEast.lon - southWest.lon }; const Geodetic2 geoDiffPoint = { - geodeticPosition.lat - southWest.lat, - geodeticPosition.lon - southWest.lon + .lat = geodeticPosition.lat - southWest.lat, + .lon = geodeticPosition.lon - southWest.lon }; const glm::vec2 patchUV = glm::vec2( geoDiffPoint.lon / geoDiffPatch.lon, diff --git a/modules/globebrowsing/src/renderableglobe.h b/modules/globebrowsing/src/renderableglobe.h index 409b9a7441..c51985de08 100644 --- a/modules/globebrowsing/src/renderableglobe.h +++ b/modules/globebrowsing/src/renderableglobe.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp index 8953889000..2e1083dfa6 100644 --- a/modules/globebrowsing/src/ringscomponent.cpp +++ b/modules/globebrowsing/src/ringscomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/ringscomponent.h b/modules/globebrowsing/src/ringscomponent.h index 5bfb305310..d8211dcda8 100644 --- a/modules/globebrowsing/src/ringscomponent.h +++ b/modules/globebrowsing/src/ringscomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shadowcomponent.cpp b/modules/globebrowsing/src/shadowcomponent.cpp index 6f3ba1871c..1cbfde7041 100644 --- a/modules/globebrowsing/src/shadowcomponent.cpp +++ b/modules/globebrowsing/src/shadowcomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shadowcomponent.h b/modules/globebrowsing/src/shadowcomponent.h index 5f39dc6d43..8293e0e82a 100644 --- a/modules/globebrowsing/src/shadowcomponent.h +++ b/modules/globebrowsing/src/shadowcomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 46447d0a61..7cdab3e253 100644 --- a/modules/globebrowsing/src/skirtedgrid.cpp +++ b/modules/globebrowsing/src/skirtedgrid.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 2af72f49d5..49ce527d53 100644 --- a/modules/globebrowsing/src/skirtedgrid.h +++ b/modules/globebrowsing/src/skirtedgrid.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 33e437cdca..2faf42f4df 100644 --- a/modules/globebrowsing/src/tileindex.cpp +++ b/modules/globebrowsing/src/tileindex.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f94c42666a..47d1b45058 100644 --- a/modules/globebrowsing/src/tileindex.h +++ b/modules/globebrowsing/src/tileindex.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 528ee72622..a5bb11669c 100644 --- a/modules/globebrowsing/src/tileloadjob.cpp +++ b/modules/globebrowsing/src/tileloadjob.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 4756f8b4d7..182961e09e 100644 --- a/modules/globebrowsing/src/tileloadjob.h +++ b/modules/globebrowsing/src/tileloadjob.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/defaulttileprovider.cpp b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp index 9d141512b6..61a190908f 100644 --- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -135,7 +135,10 @@ Tile DefaultTileProvider::tile(const TileIndex& tileIndex) { if (tileIndex.level > maxLevel()) { return Tile{ nullptr, std::nullopt, Tile::Status::OutOfRange }; } - const cache::ProviderTileKey key = { tileIndex, uniqueIdentifier }; + const cache::ProviderTileKey key = { + .tileIndex = tileIndex, + .providerID = uniqueIdentifier + }; cache::MemoryAwareTileCache* tileCache = global::moduleEngine->module()->tileCache(); Tile tile = tileCache->get(key); @@ -154,7 +157,10 @@ Tile::Status DefaultTileProvider::tileStatus(const TileIndex& index) { return Tile::Status::OutOfRange; } - const cache::ProviderTileKey key = { index, uniqueIdentifier }; + const cache::ProviderTileKey key = { + .tileIndex = index, + .providerID = uniqueIdentifier + }; cache::MemoryAwareTileCache* tileCache = global::moduleEngine->module()->tileCache(); return tileCache->get(key).status; @@ -171,7 +177,10 @@ void DefaultTileProvider::update() { std::optional tile = _asyncTextureDataProvider->popFinishedRawTile(); if (tile) { - const cache::ProviderTileKey key = { tile->tileIndex, uniqueIdentifier }; + const cache::ProviderTileKey key = { + .tileIndex = tile->tileIndex, + .providerID = uniqueIdentifier + }; cache::MemoryAwareTileCache* tileCache = global::moduleEngine->module()->tileCache(); ghoul_assert(!tileCache->exist(key), "Tile must not be existing in cache"); diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.h b/modules/globebrowsing/src/tileprovider/defaulttileprovider.h index 7b106eed56..60b96fe6bf 100644 --- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.h +++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/imagesequencetileprovider.cpp b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp index d227f2a31c..440cd2eacc 100644 --- a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/imagesequencetileprovider.h b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.h index af461f78de..c1dc16c5cc 100644 --- a/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.h +++ b/modules/globebrowsing/src/tileprovider/imagesequencetileprovider.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/singleimagetileprovider.cpp b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp index 7dca0a0fef..1edb321baf 100644 --- a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/singleimagetileprovider.h b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.h index 62d852f7b4..f58b38824a 100644 --- a/modules/globebrowsing/src/tileprovider/singleimagetileprovider.h +++ b/modules/globebrowsing/src/tileprovider/singleimagetileprovider.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/sizereferencetileprovider.cpp b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp index 7cc8577483..9d911b321c 100644 --- a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -94,12 +94,12 @@ Tile SizeReferenceTileProvider::tile(const TileIndex& tileIndex) { } std::string text = fmt::format(" {:.0f} {:s}", tileLongitudalLength, unit); - glm::vec2 textPosition = { + glm::vec2 textPosition = glm::vec2( 0.f, aboveEquator ? fontSize / 2.f : initData.dimensions.y - 3.f * fontSize / 2.f - }; + ); return TextTileProvider::renderTile(tileIndex, text, textPosition, glm::vec4(1.f)); } diff --git a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.h b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.h index 770eccd819..22c8c4abd2 100644 --- a/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.h +++ b/modules/globebrowsing/src/tileprovider/sizereferencetileprovider.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/spoutimageprovider.cpp b/modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp index 65297813b8..1aae72f3c8 100644 --- a/modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/spoutimageprovider.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/spoutimageprovider.h b/modules/globebrowsing/src/tileprovider/spoutimageprovider.h index 326fb24ad1..8f0cadc345 100644 --- a/modules/globebrowsing/src/tileprovider/spoutimageprovider.h +++ b/modules/globebrowsing/src/tileprovider/spoutimageprovider.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/temporaltileprovider.cpp b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp index 1f4a3e1a43..7020b42a45 100644 --- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/temporaltileprovider.h b/modules/globebrowsing/src/tileprovider/temporaltileprovider.h index 684e828a31..e8ece34d17 100644 --- a/modules/globebrowsing/src/tileprovider/temporaltileprovider.h +++ b/modules/globebrowsing/src/tileprovider/temporaltileprovider.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/texttileprovider.cpp b/modules/globebrowsing/src/tileprovider/texttileprovider.cpp index aab99b3b8a..8918543afe 100644 --- a/modules/globebrowsing/src/tileprovider/texttileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/texttileprovider.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/texttileprovider.h b/modules/globebrowsing/src/tileprovider/texttileprovider.h index 2e9101e87d..c7110a6e94 100644 --- a/modules/globebrowsing/src/tileprovider/texttileprovider.h +++ b/modules/globebrowsing/src/tileprovider/texttileprovider.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/tileindextileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp index f1073de43c..a2bf5c54ef 100644 --- a/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/tileindextileprovider.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/tileindextileprovider.h b/modules/globebrowsing/src/tileprovider/tileindextileprovider.h index 1f8fa84467..141674d97d 100644 --- a/modules/globebrowsing/src/tileprovider/tileindextileprovider.h +++ b/modules/globebrowsing/src/tileprovider/tileindextileprovider.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/tileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileprovider.cpp index 26070ed28e..abdb8c77b2 100644 --- a/modules/globebrowsing/src/tileprovider/tileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/tileprovider.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -169,7 +169,10 @@ ChunkTile TileProvider::chunkTile(TileIndex tileIndex, int parents, int maxParen ti.level--; }; - TileUvTransform uvTransform = { glm::vec2(0.f, 0.f), glm::vec2(1.f, 1.f) }; + TileUvTransform uvTransform = { + .uvOffset = glm::vec2(0.f, 0.f), + .uvScale = glm::vec2(1.f, 1.f) + }; // Step 1. Traverse 0 or more parents up the chunkTree as requested by the caller for (int i = 0; i < parents && tileIndex.level > 1; i++) { @@ -221,8 +224,8 @@ ChunkTilePile TileProvider::chunkTilePile(TileIndex tileIndex, int pileSize) { if (i == 0) { // First iteration chunkTilePile[i]->tile = DefaultTile; - chunkTilePile[i]->uvTransform.uvOffset = { 0.f, 0.f }; - chunkTilePile[i]->uvTransform.uvScale = { 1.f, 1.f }; + chunkTilePile[i]->uvTransform.uvOffset = glm::vec2(0.f, 0.f); + chunkTilePile[i]->uvTransform.uvScale = glm::vec2(1.f, 1.f); } else { // We are iterating through the array one-by-one, so we are guaranteed diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.h b/modules/globebrowsing/src/tileprovider/tileprovider.h index 8b3a661015..f9bc74def0 100644 --- a/modules/globebrowsing/src/tileprovider/tileprovider.h +++ b/modules/globebrowsing/src/tileprovider/tileprovider.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/tileproviderbyindex.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp index 0e3d0ce6fc..483a65840c 100644 --- a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp +++ b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/tileproviderbyindex.h b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.h index af3fad17ef..bf5f42a380 100644 --- a/modules/globebrowsing/src/tileprovider/tileproviderbyindex.h +++ b/modules/globebrowsing/src/tileprovider/tileproviderbyindex.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/tileproviderbylevel.cpp b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp index 2986ca215a..2444930378 100644 --- a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp +++ b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/tileproviderbylevel.h b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.h index 988b1eccb2..d0ae495ead 100644 --- a/modules/globebrowsing/src/tileprovider/tileproviderbylevel.h +++ b/modules/globebrowsing/src/tileprovider/tileproviderbylevel.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8323b9d7c5..3f5ff86783 100644 --- a/modules/globebrowsing/src/tiletextureinitdata.cpp +++ b/modules/globebrowsing/src/tiletextureinitdata.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 90d99b3bd6..e1ac44411f 100644 --- a/modules/globebrowsing/src/tiletextureinitdata.h +++ b/modules/globebrowsing/src/tiletextureinitdata.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 d9b9a36351..ba485293a9 100644 --- a/modules/globebrowsing/src/timequantizer.cpp +++ b/modules/globebrowsing/src/timequantizer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8ea0002f0c..0f788dde9d 100644 --- a/modules/globebrowsing/src/timequantizer.h +++ b/modules/globebrowsing/src/timequantizer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 40e40cb00f..29b5eb4487 100644 --- a/modules/imgui/CMakeLists.txt +++ b/modules/imgui/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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/ext/imgui/CMakeLists.txt b/modules/imgui/ext/imgui/CMakeLists.txt index 5bc167f51a..b5e6d70d94 100644 --- a/modules/imgui/ext/imgui/CMakeLists.txt +++ b/modules/imgui/ext/imgui/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/imgui/imguimodule.cpp index 621154902a..a7c178bf1a 100644 --- a/modules/imgui/imguimodule.cpp +++ b/modules/imgui/imguimodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -322,13 +322,13 @@ void ImGUIModule::internalInitializeGL() { ); ImGuiStyle& style = ImGui::GetStyle(); - style.WindowPadding = { 4.f, 4.f }; + style.WindowPadding = ImVec2(4.f, 4.f); style.WindowRounding = 0.f; - style.FramePadding = { 3.f, 3.f }; + style.FramePadding = ImVec2(3.f, 3.f); style.FrameRounding = 0.f; - style.ItemSpacing = { 3.f, 2.f }; - style.ItemInnerSpacing = { 3.f, 2.f }; - style.TouchExtraPadding = { 1.f, 1.f }; + style.ItemSpacing = ImVec2(3.f, 2.f); + style.ItemInnerSpacing = ImVec2(3.f, 2.f); + style.TouchExtraPadding = ImVec2(1.f, 1.f); style.IndentSpacing = 15.f; style.ScrollbarSize = 10.f; style.ScrollbarRounding = 0.f; @@ -713,7 +713,7 @@ bool ImGUIModule::touchDetectedCallback(TouchInput input) { return false; } if (_validTouchStates.empty()) { - io.MousePos = { windowPos.x, windowPos.y }; + io.MousePos = ImVec2(windowPos.x, windowPos.y); io.MouseClicked[0] = true; } _validTouchStates.push_back(input); diff --git a/modules/imgui/imguimodule.h b/modules/imgui/imguimodule.h index 89dfb427f7..4b9047fa6b 100644 --- a/modules/imgui/imguimodule.h +++ b/modules/imgui/imguimodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/guiactioncomponent.h b/modules/imgui/include/guiactioncomponent.h index 1ce7fabc5d..4fb747d24f 100644 --- a/modules/imgui/include/guiactioncomponent.h +++ b/modules/imgui/include/guiactioncomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e16b66ba1d..6e344dbb52 100644 --- a/modules/imgui/include/guicomponent.h +++ b/modules/imgui/include/guicomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 4022dabcdf..a53d17cc81 100644 --- a/modules/imgui/include/guifilepathcomponent.h +++ b/modules/imgui/include/guifilepathcomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/guigibscomponent.h b/modules/imgui/include/guigibscomponent.h index edf4fdca78..af2a161d7b 100644 --- a/modules/imgui/include/guigibscomponent.h +++ b/modules/imgui/include/guigibscomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cfe6e2731c..0accd727f1 100644 --- a/modules/imgui/include/guiglobebrowsingcomponent.h +++ b/modules/imgui/include/guiglobebrowsingcomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 92fccabb27..0e184b8e9e 100644 --- a/modules/imgui/include/guihelpcomponent.h +++ b/modules/imgui/include/guihelpcomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 7b274d4b2c..764a410d1e 100644 --- a/modules/imgui/include/guijoystickcomponent.h +++ b/modules/imgui/include/guijoystickcomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/guimemorycomponent.h b/modules/imgui/include/guimemorycomponent.h index a7153a4f42..33bb076acd 100644 --- a/modules/imgui/include/guimemorycomponent.h +++ b/modules/imgui/include/guimemorycomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e1f884d470..3b2bbb58a7 100644 --- a/modules/imgui/include/guimissioncomponent.h +++ b/modules/imgui/include/guimissioncomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 9a6bb4346b..6780c6a072 100644 --- a/modules/imgui/include/guiparallelcomponent.h +++ b/modules/imgui/include/guiparallelcomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 506110b00f..fb5a15b219 100644 --- a/modules/imgui/include/guipropertycomponent.h +++ b/modules/imgui/include/guipropertycomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/guiscenecomponent.h b/modules/imgui/include/guiscenecomponent.h index 18e828e8a3..706aba14aa 100644 --- a/modules/imgui/include/guiscenecomponent.h +++ b/modules/imgui/include/guiscenecomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 befdc04bd2..917c2ed465 100644 --- a/modules/imgui/include/guispacetimecomponent.h +++ b/modules/imgui/include/guispacetimecomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/imgui_include.h b/modules/imgui/include/imgui_include.h index 4caf3e979f..5bf7eb6b25 100644 --- a/modules/imgui/include/imgui_include.h +++ b/modules/imgui/include/imgui_include.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 473d61e214..6f2a75736c 100644 --- a/modules/imgui/include/renderproperties.h +++ b/modules/imgui/include/renderproperties.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e90b3109c8..bb09c30044 100644 --- a/modules/imgui/shaders/gui_fs.glsl +++ b/modules/imgui/shaders/gui_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 24d227b6ef..462606ef0f 100644 --- a/modules/imgui/shaders/gui_vs.glsl +++ b/modules/imgui/shaders/gui_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/guiactioncomponent.cpp b/modules/imgui/src/guiactioncomponent.cpp index d766e6abbd..7c47b3f088 100644 --- a/modules/imgui/src/guiactioncomponent.cpp +++ b/modules/imgui/src/guiactioncomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cfc03c1a9e..9e71cd01d2 100644 --- a/modules/imgui/src/guicomponent.cpp +++ b/modules/imgui/src/guicomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 5ef1253dbc..06fc32aaee 100644 --- a/modules/imgui/src/guifilepathcomponent.cpp +++ b/modules/imgui/src/guifilepathcomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/guigibscomponent.cpp b/modules/imgui/src/guigibscomponent.cpp index f8dea1b050..e544e01241 100644 --- a/modules/imgui/src/guigibscomponent.cpp +++ b/modules/imgui/src/guigibscomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 38066cb779..3e3848a830 100644 --- a/modules/imgui/src/guiglobebrowsingcomponent.cpp +++ b/modules/imgui/src/guiglobebrowsingcomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a632da9ada..4d330c3515 100644 --- a/modules/imgui/src/guihelpcomponent.cpp +++ b/modules/imgui/src/guihelpcomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8e06c3a7a6..7cb27ccbe1 100644 --- a/modules/imgui/src/guijoystickcomponent.cpp +++ b/modules/imgui/src/guijoystickcomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/guimemorycomponent.cpp b/modules/imgui/src/guimemorycomponent.cpp index 3d3af8492d..3e6d71aa0c 100644 --- a/modules/imgui/src/guimemorycomponent.cpp +++ b/modules/imgui/src/guimemorycomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c038626544..08585392e4 100644 --- a/modules/imgui/src/guimissioncomponent.cpp +++ b/modules/imgui/src/guimissioncomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/guiparallelcomponent.cpp b/modules/imgui/src/guiparallelcomponent.cpp index 07389f3e2d..9d489a9b85 100644 --- a/modules/imgui/src/guiparallelcomponent.cpp +++ b/modules/imgui/src/guiparallelcomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 10f4e3ab01..78ceae63b3 100644 --- a/modules/imgui/src/guipropertycomponent.cpp +++ b/modules/imgui/src/guipropertycomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/guiscenecomponent.cpp b/modules/imgui/src/guiscenecomponent.cpp index 62082ddd16..992b0bbe91 100644 --- a/modules/imgui/src/guiscenecomponent.cpp +++ b/modules/imgui/src/guiscenecomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8de8461198..eee574e502 100644 --- a/modules/imgui/src/guispacetimecomponent.cpp +++ b/modules/imgui/src/guispacetimecomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderproperties.cpp b/modules/imgui/src/renderproperties.cpp index bfe5c08b8d..2fa228cf55 100644 --- a/modules/imgui/src/renderproperties.cpp +++ b/modules/imgui/src/renderproperties.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -695,16 +695,16 @@ void renderDMat2Property(Property* prop, const std::string& ownerName, ImGui::Text("%s", name.c_str()); glm::mat2 value = glm::dmat2(*p); - glm::dvec2 minValues = { + glm::dvec2 minValues = glm::dvec2( glm::compMin(p->minValue()[0]), glm::compMin(p->minValue()[1]) - }; + ); float min = static_cast(glm::compMin(minValues)); - glm::dvec2 maxValues = { + glm::dvec2 maxValues = glm::dvec2( glm::compMax(p->maxValue()[0]), glm::compMax(p->maxValue()[1]) - }; + ); float max = static_cast(glm::compMax(maxValues)); bool changed = false; @@ -747,18 +747,18 @@ void renderDMat3Property(Property* prop, const std::string& ownerName, ImGui::Text("%s", name.c_str()); glm::mat3 value = glm::dmat3(*p); - glm::dvec3 minValues = { + glm::dvec3 minValues = glm::dvec3( glm::compMin(p->minValue()[0]), glm::compMin(p->minValue()[1]), glm::compMin(p->minValue()[2]) - }; + ); float min = static_cast(glm::compMin(minValues)); - glm::dvec3 maxValues = { + glm::dvec3 maxValues = glm::dvec3( glm::compMax(p->maxValue()[0]), glm::compMax(p->maxValue()[1]), glm::compMax(p->maxValue()[2]) - }; + ); float max = static_cast(glm::compMax(maxValues)); bool changed = false; @@ -809,20 +809,20 @@ void renderDMat4Property(Property* prop, const std::string& ownerName, ImGui::Text("%s", name.c_str()); glm::mat4 value = glm::dmat4(*p); - glm::dvec4 minValues = { + glm::dvec4 minValues = glm::dvec4( glm::compMin(p->minValue()[0]), glm::compMin(p->minValue()[1]), glm::compMin(p->minValue()[2]), glm::compMin(p->minValue()[3]) - }; + ); float min = static_cast(glm::compMin(minValues)); - glm::dvec4 maxValues = { + glm::dvec4 maxValues = glm::dvec4( glm::compMax(p->maxValue()[0]), glm::compMax(p->maxValue()[1]), glm::compMax(p->maxValue()[2]), glm::compMax(p->maxValue()[3]) - }; + ); float max = static_cast(glm::compMax(maxValues)); bool changed = false; diff --git a/modules/iswa/CMakeLists.txt b/modules/iswa/CMakeLists.txt index e547537a34..c580e3297a 100644 --- a/modules/iswa/CMakeLists.txt +++ b/modules/iswa/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/iswa/iswamodule.cpp index c99ecdaf6b..4024424b77 100644 --- a/modules/iswa/iswamodule.cpp +++ b/modules/iswa/iswamodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 5307685066..e3cc1db507 100644 --- a/modules/iswa/iswamodule.h +++ b/modules/iswa/iswamodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 3149470e5c..d645c0b665 100644 --- a/modules/iswa/rendering/datacygnet.cpp +++ b/modules/iswa/rendering/datacygnet.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -80,7 +80,6 @@ namespace { "Transfer Functions", "" // @TODO Missing documentation }; - } // namespace namespace openspace { diff --git a/modules/iswa/rendering/datacygnet.h b/modules/iswa/rendering/datacygnet.h index 84774ce65c..b0b8d5d502 100644 --- a/modules/iswa/rendering/datacygnet.h +++ b/modules/iswa/rendering/datacygnet.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 6f2120092c..08b6e4143f 100644 --- a/modules/iswa/rendering/dataplane.cpp +++ b/modules/iswa/rendering/dataplane.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 dd228c6af5..630ca66216 100644 --- a/modules/iswa/rendering/dataplane.h +++ b/modules/iswa/rendering/dataplane.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 82aa3a96cf..ca5b26b02c 100644 --- a/modules/iswa/rendering/datasphere.cpp +++ b/modules/iswa/rendering/datasphere.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e6dda37736..8bbe370496 100644 --- a/modules/iswa/rendering/datasphere.h +++ b/modules/iswa/rendering/datasphere.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 03e4e7a16e..7897a4edc7 100644 --- a/modules/iswa/rendering/iswabasegroup.cpp +++ b/modules/iswa/rendering/iswabasegroup.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -48,7 +48,6 @@ namespace { "Delete", "" // @TODO Missing documentation }; - } // namespace namespace openspace { diff --git a/modules/iswa/rendering/iswabasegroup.h b/modules/iswa/rendering/iswabasegroup.h index 154f86cae7..d9ee2136d1 100644 --- a/modules/iswa/rendering/iswabasegroup.h +++ b/modules/iswa/rendering/iswabasegroup.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 d8b11b8c53..738783a8cc 100644 --- a/modules/iswa/rendering/iswacygnet.cpp +++ b/modules/iswa/rendering/iswacygnet.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 dcd1dfa345..ff87d9bc03 100644 --- a/modules/iswa/rendering/iswacygnet.h +++ b/modules/iswa/rendering/iswacygnet.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 235c2d3525..3d87cf7f98 100644 --- a/modules/iswa/rendering/iswadatagroup.cpp +++ b/modules/iswa/rendering/iswadatagroup.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -79,7 +79,6 @@ namespace { "Data Options", "" // @TODO Missing documentation }; - } // namespace namespace openspace{ diff --git a/modules/iswa/rendering/iswadatagroup.h b/modules/iswa/rendering/iswadatagroup.h index fda78c03e4..0ffccac096 100644 --- a/modules/iswa/rendering/iswadatagroup.h +++ b/modules/iswa/rendering/iswadatagroup.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 aac3a8a611..3177a01e41 100644 --- a/modules/iswa/rendering/iswakameleongroup.cpp +++ b/modules/iswa/rendering/iswakameleongroup.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 59a2f6c081..635e3e8b2e 100644 --- a/modules/iswa/rendering/iswakameleongroup.h +++ b/modules/iswa/rendering/iswakameleongroup.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 183e7a2885..c98ed8febb 100644 --- a/modules/iswa/rendering/kameleonplane.cpp +++ b/modules/iswa/rendering/kameleonplane.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 45356c3fd4..547fe3204d 100644 --- a/modules/iswa/rendering/kameleonplane.h +++ b/modules/iswa/rendering/kameleonplane.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 7a5aa8fd3b..e0b7dcf613 100644 --- a/modules/iswa/rendering/screenspacecygnet.cpp +++ b/modules/iswa/rendering/screenspacecygnet.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e9d27efb4d..faae226c5f 100644 --- a/modules/iswa/rendering/screenspacecygnet.h +++ b/modules/iswa/rendering/screenspacecygnet.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e61cbc62b9..7262670140 100644 --- a/modules/iswa/rendering/texturecygnet.cpp +++ b/modules/iswa/rendering/texturecygnet.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 80871f7f61..6613390945 100644 --- a/modules/iswa/rendering/texturecygnet.h +++ b/modules/iswa/rendering/texturecygnet.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 1edba3b265..4b49e7803c 100644 --- a/modules/iswa/rendering/textureplane.cpp +++ b/modules/iswa/rendering/textureplane.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 7fd7e85968..ff4b3f7747 100644 --- a/modules/iswa/rendering/textureplane.h +++ b/modules/iswa/rendering/textureplane.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 566968ad1a..88b239f21c 100644 --- a/modules/iswa/shaders/dataplane_fs.glsl +++ b/modules/iswa/shaders/dataplane_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 76d9da9db6..396429bdfe 100644 --- a/modules/iswa/shaders/dataplane_vs.glsl +++ b/modules/iswa/shaders/dataplane_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/datasphere_fs.glsl b/modules/iswa/shaders/datasphere_fs.glsl index 6c5ec38996..c94f815909 100644 --- a/modules/iswa/shaders/datasphere_fs.glsl +++ b/modules/iswa/shaders/datasphere_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/datasphere_vs.glsl b/modules/iswa/shaders/datasphere_vs.glsl index bd13af07fc..fbd39a753c 100644 --- a/modules/iswa/shaders/datasphere_vs.glsl +++ b/modules/iswa/shaders/datasphere_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 74d4ff1fac..7d2adfef33 100644 --- a/modules/iswa/shaders/textureplane_fs.glsl +++ b/modules/iswa/shaders/textureplane_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 388fc68ff6..fc429dc3c5 100644 --- a/modules/iswa/shaders/textureplane_vs.glsl +++ b/modules/iswa/shaders/textureplane_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 541c0a25ff..7e1c755af0 100644 --- a/modules/iswa/util/dataprocessor.cpp +++ b/modules/iswa/util/dataprocessor.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 826593f918..1a54139f1b 100644 --- a/modules/iswa/util/dataprocessor.h +++ b/modules/iswa/util/dataprocessor.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 25d25b6597..0b2b170ed3 100644 --- a/modules/iswa/util/dataprocessorjson.cpp +++ b/modules/iswa/util/dataprocessorjson.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cedaf46936..bbdf1fe199 100644 --- a/modules/iswa/util/dataprocessorjson.h +++ b/modules/iswa/util/dataprocessorjson.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 37279dc641..758379f4df 100644 --- a/modules/iswa/util/dataprocessorkameleon.cpp +++ b/modules/iswa/util/dataprocessorkameleon.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 5fb1560476..6b7c524396 100644 --- a/modules/iswa/util/dataprocessorkameleon.h +++ b/modules/iswa/util/dataprocessorkameleon.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 24d6bf5b3a..0d84b5ae3b 100644 --- a/modules/iswa/util/dataprocessortext.cpp +++ b/modules/iswa/util/dataprocessortext.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 94588451f2..3e2e3611ae 100644 --- a/modules/iswa/util/dataprocessortext.h +++ b/modules/iswa/util/dataprocessortext.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 62a23c63ad..f5f8a720a1 100644 --- a/modules/iswa/util/iswamanager.cpp +++ b/modules/iswa/util/iswamanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 1f2514daeb..30367378c4 100644 --- a/modules/iswa/util/iswamanager.h +++ b/modules/iswa/util/iswamanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8c39e11b6e..ddb7e3a20b 100644 --- a/modules/iswa/util/iswamanager_lua.inl +++ b/modules/iswa/util/iswamanager_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 1eb778e449..eacbf68dea 100644 --- a/modules/kameleon/CMakeLists.txt +++ b/modules/kameleon/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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/kameleonhelper.h b/modules/kameleon/include/kameleonhelper.h index 0599869f1d..c76ed53bfc 100644 --- a/modules/kameleon/include/kameleonhelper.h +++ b/modules/kameleon/include/kameleonhelper.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 621b75b842..9293c7a84d 100644 --- a/modules/kameleon/include/kameleonwrapper.h +++ b/modules/kameleon/include/kameleonwrapper.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 fc3d91108f..105554f209 100644 --- a/modules/kameleon/kameleonmodule.cpp +++ b/modules/kameleon/kameleonmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 924b834394..c03091bdb7 100644 --- a/modules/kameleon/kameleonmodule.h +++ b/modules/kameleon/kameleonmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cba12da3b1..2975db56a9 100644 --- a/modules/kameleon/src/kameleonhelper.cpp +++ b/modules/kameleon/src/kameleonhelper.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 774d146136..d1515b89af 100644 --- a/modules/kameleon/src/kameleonwrapper.cpp +++ b/modules/kameleon/src/kameleonwrapper.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -136,29 +136,29 @@ bool KameleonWrapper::open(const std::string& filename) { LDEBUG(fmt::format("y: {}", _yCoordVar)); LDEBUG(fmt::format("z: {}", _zCoordVar)); - _min = { + _min = glm::vec3( _model->getVariableAttribute(_xCoordVar, "actual_min").getAttributeFloat(), _model->getVariableAttribute(_yCoordVar, "actual_min").getAttributeFloat(), _model->getVariableAttribute(_zCoordVar, "actual_min").getAttributeFloat() - }; + ); - _max = { + _max = glm::vec3( _model->getVariableAttribute(_xCoordVar, "actual_max").getAttributeFloat(), _model->getVariableAttribute(_yCoordVar, "actual_max").getAttributeFloat(), _model->getVariableAttribute(_zCoordVar, "actual_max").getAttributeFloat() - }; + ); - _validMin = { + _validMin = glm::vec3( _model->getVariableAttribute(_xCoordVar, "valid_min").getAttributeFloat(), _model->getVariableAttribute(_yCoordVar, "valid_min").getAttributeFloat(), _model->getVariableAttribute(_zCoordVar, "valid_min").getAttributeFloat() - }; + ); - _validMax = { + _validMax = glm::vec3( _model->getVariableAttribute(_xCoordVar, "valid_max").getAttributeFloat(), _model->getVariableAttribute(_yCoordVar, "valid_max").getAttributeFloat(), _model->getVariableAttribute(_zCoordVar, "valid_max").getAttributeFloat() - }; + ); return true; } @@ -700,11 +700,11 @@ glm::vec3 KameleonWrapper::modelBarycenterOffset() const { return glm::vec3(0.f); } - glm::vec3 offset = { + glm::vec3 offset = glm::vec3( _min.x + (std::abs(_min.x) + std::abs(_max.x)) / 2.f, _min.y + (std::abs(_min.y) + std::abs(_max.y)) / 2.f, _min.z + (std::abs(_min.z) + std::abs(_max.z)) / 2.f - }; + ); return offset; } @@ -725,11 +725,11 @@ glm::vec3 KameleonWrapper::modelScale() const { return glm::vec3(1.f); } - glm::vec3 scale = { + glm::vec3 scale = glm::vec3( _max.x - _min.x, _max.y - _min.y, _max.z - _min.z - }; + ); return scale; } @@ -907,57 +907,57 @@ KameleonWrapper::TraceLine KameleonWrapper::traceLorentzTrajectory( trajectory.push_back(pos); // Calculate new position with Lorentz force quation and Runge-Kutta 4th order - glm::vec3 B = { + glm::vec3 B = glm::vec3( _interpolator->interpolate(bxID, pos.x, pos.y, pos.z), _interpolator->interpolate(byID, pos.x, pos.y, pos.z), _interpolator->interpolate(bzID, pos.x, pos.y, pos.z) - }; + ); - glm::vec3 E = { + glm::vec3 E = glm::vec3( _interpolator->interpolate(jxID, pos.x, pos.y, pos.z), _interpolator->interpolate(jyID, pos.x, pos.y, pos.z), _interpolator->interpolate(jzID, pos.x, pos.y, pos.z) - }; + ); const glm::vec3 k1 = glm::normalize(eCharge * (E + glm::cross(v0, B))); const glm::vec3 k1Pos = pos + step / 2.f * v0 + step * step / 8.f * k1; - B = { + B = glm::vec3( _interpolator->interpolate(bxID, k1Pos.x, k1Pos.y, k1Pos.z), _interpolator->interpolate(byID, k1Pos.x, k1Pos.y, k1Pos.z), _interpolator->interpolate(bzID, k1Pos.x, k1Pos.y, k1Pos.z) - }; - E = { + ); + E = glm::vec3( _interpolator->interpolate(jxID, k1Pos.x, k1Pos.y, k1Pos.z), _interpolator->interpolate(jyID, k1Pos.x, k1Pos.y, k1Pos.z), _interpolator->interpolate(jzID, k1Pos.x, k1Pos.y, k1Pos.z) - }; + ); const glm::vec3 v1 = v0 + step / 2.f * k1; const glm::vec3 k2 = glm::normalize(eCharge * (E + glm::cross(v1, B))); - B = { + B = glm::vec3( _interpolator->interpolate(bxID, k1Pos.x, k1Pos.y, k1Pos.z), _interpolator->interpolate(byID, k1Pos.x, k1Pos.y, k1Pos.z), _interpolator->interpolate(bzID, k1Pos.x, k1Pos.y, k1Pos.z) - }; - E = { + ); + E = glm::vec3( _interpolator->interpolate(jxID, k1Pos.x, k1Pos.y, k1Pos.z), _interpolator->interpolate(jyID, k1Pos.x, k1Pos.y, k1Pos.z), _interpolator->interpolate(jzID, k1Pos.x, k1Pos.y, k1Pos.z) - }; + ); const glm::vec3 v2 = v0 + step / 2.f * k2; const glm::vec3 k3 = glm::normalize(eCharge * (E + glm::cross(v2, B))); const glm::vec3 k3Pos = pos + step * v0 + step * step / 2.f * k1; - B = { + B = glm::vec3( _interpolator->interpolate(bxID, k3Pos.x, k3Pos.y, k3Pos.z), _interpolator->interpolate(byID, k3Pos.x, k3Pos.y, k3Pos.z), _interpolator->interpolate(bzID, k3Pos.x, k3Pos.y, k3Pos.z) - }; - E = { + ); + E = glm::vec3( _interpolator->interpolate(jxID, k3Pos.x, k3Pos.y, k3Pos.z), _interpolator->interpolate(jyID, k3Pos.x, k3Pos.y, k3Pos.z), _interpolator->interpolate(jzID, k3Pos.x, k3Pos.y, k3Pos.z) - }; + ); const glm::vec3 v3 = v0 + step * k3; const glm::vec3 k4 = glm::normalize(eCharge * (E + glm::cross(v3, B))); diff --git a/modules/kameleonvolume/CMakeLists.txt b/modules/kameleonvolume/CMakeLists.txt index 60e0745c9c..b90b6cf4d2 100644 --- a/modules/kameleonvolume/CMakeLists.txt +++ b/modules/kameleonvolume/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/kameleonvolume/kameleonvolumemodule.cpp index 9606e08d0f..8ddd686d88 100644 --- a/modules/kameleonvolume/kameleonvolumemodule.cpp +++ b/modules/kameleonvolume/kameleonvolumemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b834bfe2cb..686024f859 100644 --- a/modules/kameleonvolume/kameleonvolumemodule.h +++ b/modules/kameleonvolume/kameleonvolumemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e3c0bb5530..5c40d6ea81 100644 --- a/modules/kameleonvolume/kameleonvolumereader.cpp +++ b/modules/kameleonvolume/kameleonvolumereader.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f82ef99dc1..7e027cec3f 100644 --- a/modules/kameleonvolume/kameleonvolumereader.h +++ b/modules/kameleonvolume/kameleonvolumereader.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e1b9b64b93..b740b82605 100644 --- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp +++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 bc99859662..80e0cce76f 100644 --- a/modules/kameleonvolume/rendering/renderablekameleonvolume.h +++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a2b480a262..9f3a5529fb 100644 --- a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp +++ b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 fa1b307104..b5012a56a3 100644 --- a/modules/kameleonvolume/tasks/kameleondocumentationtask.h +++ b/modules/kameleonvolume/tasks/kameleondocumentationtask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 603f9512e1..3075b4aea9 100644 --- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp +++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 37212d4bd1..6f9ca0d509 100644 --- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h +++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c82da3cfd6..fda337984b 100644 --- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp +++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 695b5a1988..1a3a82dc58 100644 --- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h +++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 66da0ef6d6..493d45d72c 100644 --- a/modules/multiresvolume/CMakeLists.txt +++ b/modules/multiresvolume/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/multiresvolume/multiresvolumemodule.cpp index 3622d70ad7..5f7a33f1f9 100644 --- a/modules/multiresvolume/multiresvolumemodule.cpp +++ b/modules/multiresvolume/multiresvolumemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 5c221d7137..abfb0a6867 100644 --- a/modules/multiresvolume/multiresvolumemodule.h +++ b/modules/multiresvolume/multiresvolumemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 90087c9de1..ee3257b5c6 100644 --- a/modules/multiresvolume/rendering/atlasmanager.cpp +++ b/modules/multiresvolume/rendering/atlasmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8391f4071f..18ced4894a 100644 --- a/modules/multiresvolume/rendering/atlasmanager.h +++ b/modules/multiresvolume/rendering/atlasmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 93358c91a5..871b93f7cf 100644 --- a/modules/multiresvolume/rendering/brickcover.cpp +++ b/modules/multiresvolume/rendering/brickcover.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cd3e170842..a0b7a3d418 100644 --- a/modules/multiresvolume/rendering/brickcover.h +++ b/modules/multiresvolume/rendering/brickcover.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 99a1a393d0..4178fc1a82 100644 --- a/modules/multiresvolume/rendering/brickmanager.cpp +++ b/modules/multiresvolume/rendering/brickmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 07d5ac3b9c..044bc0238a 100644 --- a/modules/multiresvolume/rendering/brickmanager.h +++ b/modules/multiresvolume/rendering/brickmanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b51b61dbad..ce3c88c1ec 100644 --- a/modules/multiresvolume/rendering/brickselection.cpp +++ b/modules/multiresvolume/rendering/brickselection.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 6d34dc7d23..1eeab40526 100644 --- a/modules/multiresvolume/rendering/brickselection.h +++ b/modules/multiresvolume/rendering/brickselection.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e1477904f6..d13b7f4344 100644 --- a/modules/multiresvolume/rendering/brickselector.h +++ b/modules/multiresvolume/rendering/brickselector.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 41ad7f41c6..804e23f34f 100644 --- a/modules/multiresvolume/rendering/errorhistogrammanager.cpp +++ b/modules/multiresvolume/rendering/errorhistogrammanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b4ac415bb2..3f8ad641d1 100644 --- a/modules/multiresvolume/rendering/errorhistogrammanager.h +++ b/modules/multiresvolume/rendering/errorhistogrammanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 651b2eb7d9..62cdeb997e 100644 --- a/modules/multiresvolume/rendering/histogrammanager.cpp +++ b/modules/multiresvolume/rendering/histogrammanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 40f3ff9838..c6dd0b67ce 100644 --- a/modules/multiresvolume/rendering/histogrammanager.h +++ b/modules/multiresvolume/rendering/histogrammanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 96c91529de..4b8d5716b6 100644 --- a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp +++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 1de06a2545..c3a2ee8bd1 100644 --- a/modules/multiresvolume/rendering/localerrorhistogrammanager.h +++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 7c6bcd9f10..7189c34b86 100644 --- a/modules/multiresvolume/rendering/localtfbrickselector.cpp +++ b/modules/multiresvolume/rendering/localtfbrickselector.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b91fcfb26e..5ec49714dc 100644 --- a/modules/multiresvolume/rendering/localtfbrickselector.h +++ b/modules/multiresvolume/rendering/localtfbrickselector.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 48e330e6fd..f6940e105d 100644 --- a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp +++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 5e890b8c1f..fc33b386ba 100644 --- a/modules/multiresvolume/rendering/multiresvolumeraycaster.h +++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 17267b3379..8ff37c2682 100644 --- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp +++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 0978a97c79..42baa927ba 100644 --- a/modules/multiresvolume/rendering/renderablemultiresvolume.h +++ b/modules/multiresvolume/rendering/renderablemultiresvolume.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 1bf3dfc0af..1caffa7863 100644 --- a/modules/multiresvolume/rendering/shenbrickselector.cpp +++ b/modules/multiresvolume/rendering/shenbrickselector.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 2c746137de..52e379ae99 100644 --- a/modules/multiresvolume/rendering/shenbrickselector.h +++ b/modules/multiresvolume/rendering/shenbrickselector.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a68f2632db..d72c91353b 100644 --- a/modules/multiresvolume/rendering/simpletfbrickselector.cpp +++ b/modules/multiresvolume/rendering/simpletfbrickselector.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 5f638cb910..d831b20585 100644 --- a/modules/multiresvolume/rendering/simpletfbrickselector.h +++ b/modules/multiresvolume/rendering/simpletfbrickselector.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a9f6583692..fb056a1963 100644 --- a/modules/multiresvolume/rendering/tfbrickselector.cpp +++ b/modules/multiresvolume/rendering/tfbrickselector.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 2e60c5c131..60cbb7226f 100644 --- a/modules/multiresvolume/rendering/tfbrickselector.h +++ b/modules/multiresvolume/rendering/tfbrickselector.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 dafbb21ce8..8ad3f5f8f5 100644 --- a/modules/multiresvolume/rendering/tsp.cpp +++ b/modules/multiresvolume/rendering/tsp.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 aeece08527..a38cef48b3 100644 --- a/modules/multiresvolume/rendering/tsp.h +++ b/modules/multiresvolume/rendering/tsp.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/bounds_fs.glsl b/modules/multiresvolume/shaders/bounds_fs.glsl index 1f37315098..92a623f4b6 100644 --- a/modules/multiresvolume/shaders/bounds_fs.glsl +++ b/modules/multiresvolume/shaders/bounds_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/bounds_vs.glsl b/modules/multiresvolume/shaders/bounds_vs.glsl index 493783d84f..3052fc615d 100644 --- a/modules/multiresvolume/shaders/bounds_vs.glsl +++ b/modules/multiresvolume/shaders/bounds_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/helper.glsl b/modules/multiresvolume/shaders/helper.glsl index 749aba5950..bf9a2abb8a 100644 --- a/modules/multiresvolume/shaders/helper.glsl +++ b/modules/multiresvolume/shaders/helper.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/raycast.glsl b/modules/multiresvolume/shaders/raycast.glsl index 44a6079839..ce54a9f79f 100644 --- a/modules/multiresvolume/shaders/raycast.glsl +++ b/modules/multiresvolume/shaders/raycast.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c7749c31d4..b0db73d896 100644 --- a/modules/server/CMakeLists.txt +++ b/modules/server/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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/connection.h b/modules/server/include/connection.h index ec5257f420..6efed2e5a5 100644 --- a/modules/server/include/connection.h +++ b/modules/server/include/connection.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 3f8fd9d093..72baba2262 100644 --- a/modules/server/include/connectionpool.h +++ b/modules/server/include/connectionpool.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e648d2ae27..7dded7f4d4 100644 --- a/modules/server/include/jsonconverters.h +++ b/modules/server/include/jsonconverters.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 9022569656..ae93ffc2a3 100644 --- a/modules/server/include/serverinterface.h +++ b/modules/server/include/serverinterface.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8669e0a48a..7c0303233d 100644 --- a/modules/server/include/topics/authorizationtopic.h +++ b/modules/server/include/topics/authorizationtopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b37170466e..5c7f19189e 100644 --- a/modules/server/include/topics/bouncetopic.h +++ b/modules/server/include/topics/bouncetopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/cameratopic.h b/modules/server/include/topics/cameratopic.h index 0a96378fb5..c6e396b9ef 100644 --- a/modules/server/include/topics/cameratopic.h +++ b/modules/server/include/topics/cameratopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/documentationtopic.h b/modules/server/include/topics/documentationtopic.h index cde72d4bb7..a1f7416d21 100644 --- a/modules/server/include/topics/documentationtopic.h +++ b/modules/server/include/topics/documentationtopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/enginemodetopic.h b/modules/server/include/topics/enginemodetopic.h index 72b03e9d7f..7beb7bd1cf 100644 --- a/modules/server/include/topics/enginemodetopic.h +++ b/modules/server/include/topics/enginemodetopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/flightcontrollertopic.h b/modules/server/include/topics/flightcontrollertopic.h index edac931f5a..ec839c624e 100644 --- a/modules/server/include/topics/flightcontrollertopic.h +++ b/modules/server/include/topics/flightcontrollertopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 33a87f93e4..95d3fc976e 100644 --- a/modules/server/include/topics/getpropertytopic.h +++ b/modules/server/include/topics/getpropertytopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 969fc1b68c..3a8db5f313 100644 --- a/modules/server/include/topics/luascripttopic.h +++ b/modules/server/include/topics/luascripttopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/sessionrecordingtopic.h b/modules/server/include/topics/sessionrecordingtopic.h index c6baef62f3..449071d2a3 100644 --- a/modules/server/include/topics/sessionrecordingtopic.h +++ b/modules/server/include/topics/sessionrecordingtopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 5168f4bca6..45ad797f68 100644 --- a/modules/server/include/topics/setpropertytopic.h +++ b/modules/server/include/topics/setpropertytopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f0f952e17a..bfcc9c1478 100644 --- a/modules/server/include/topics/shortcuttopic.h +++ b/modules/server/include/topics/shortcuttopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/skybrowsertopic.h b/modules/server/include/topics/skybrowsertopic.h index a69b8adfa9..312e68e70e 100644 --- a/modules/server/include/topics/skybrowsertopic.h +++ b/modules/server/include/topics/skybrowsertopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 62e7b8c493..2e958a1dc7 100644 --- a/modules/server/include/topics/subscriptiontopic.h +++ b/modules/server/include/topics/subscriptiontopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 3aea39e987..af01e72ed3 100644 --- a/modules/server/include/topics/timetopic.h +++ b/modules/server/include/topics/timetopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 12e79bd6cc..c9a4656318 100644 --- a/modules/server/include/topics/topic.h +++ b/modules/server/include/topics/topic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 5dd8ad2354..c7cffc770e 100644 --- a/modules/server/include/topics/triggerpropertytopic.h +++ b/modules/server/include/topics/triggerpropertytopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 ddc90c1176..b79bf5dcb0 100644 --- a/modules/server/include/topics/versiontopic.h +++ b/modules/server/include/topics/versiontopic.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 415adadd61..1ecde412c6 100644 --- a/modules/server/servermodule.cpp +++ b/modules/server/servermodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b074cf1270..af742f120f 100644 --- a/modules/server/servermodule.h +++ b/modules/server/servermodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b3cbed8516..5700ea12fa 100644 --- a/modules/server/src/connection.cpp +++ b/modules/server/src/connection.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 2bb6b060f2..e6fe55b18b 100644 --- a/modules/server/src/connectionpool.cpp +++ b/modules/server/src/connectionpool.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 17427313c6..0d6cab960c 100644 --- a/modules/server/src/jsonconverters.cpp +++ b/modules/server/src/jsonconverters.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 65c6fcb887..7e6db61faa 100644 --- a/modules/server/src/serverinterface.cpp +++ b/modules/server/src/serverinterface.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -64,20 +64,20 @@ namespace { constexpr openspace::properties::Property::PropertyInfo AllowAddressesInfo = { "AllowAddresses", "Allow Addresses", - "Ip addresses or domains that should always be allowed access to this interface" + "IP addresses or domains that should always be allowed access to this interface" }; constexpr openspace::properties::Property::PropertyInfo RequirePasswordAddressesInfo = { "RequirePasswordAddresses", "Require Password Addresses", - "Ip addresses or domains that should be allowed access if they provide a password" + "IP addresses or domains that should be allowed access if they provide a password" }; constexpr openspace::properties::Property::PropertyInfo DenyAddressesInfo = { "DenyAddresses", "Deny Addresses", - "Ip addresses or domains that should never be allowed access to this interface" + "IP addresses or domains that should never be allowed access to this interface" }; constexpr openspace::properties::Property::PropertyInfo PasswordInfo = { @@ -85,7 +85,7 @@ namespace { "Password", "Password for connecting to this interface" }; -} +} // namespace namespace openspace { diff --git a/modules/server/src/topics/authorizationtopic.cpp b/modules/server/src/topics/authorizationtopic.cpp index ea9feda0f7..faf63719bb 100644 --- a/modules/server/src/topics/authorizationtopic.cpp +++ b/modules/server/src/topics/authorizationtopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8cfd15abcf..d57207ce10 100644 --- a/modules/server/src/topics/bouncetopic.cpp +++ b/modules/server/src/topics/bouncetopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/cameratopic.cpp b/modules/server/src/topics/cameratopic.cpp index 86e45171cb..82c4950f69 100644 --- a/modules/server/src/topics/cameratopic.cpp +++ b/modules/server/src/topics/cameratopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/documentationtopic.cpp b/modules/server/src/topics/documentationtopic.cpp index 90ef85bb33..3cf8c74585 100644 --- a/modules/server/src/topics/documentationtopic.cpp +++ b/modules/server/src/topics/documentationtopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/enginemodetopic.cpp b/modules/server/src/topics/enginemodetopic.cpp index 4ba0bbd5cd..0cae8f820d 100644 --- a/modules/server/src/topics/enginemodetopic.cpp +++ b/modules/server/src/topics/enginemodetopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp index 48211d0699..65c9a42922 100644 --- a/modules/server/src/topics/flightcontrollertopic.cpp +++ b/modules/server/src/topics/flightcontrollertopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 68c4392301..4d475fcdb8 100644 --- a/modules/server/src/topics/getpropertytopic.cpp +++ b/modules/server/src/topics/getpropertytopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 bb2cd68917..26b2957abc 100644 --- a/modules/server/src/topics/luascripttopic.cpp +++ b/modules/server/src/topics/luascripttopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/sessionrecordingtopic.cpp b/modules/server/src/topics/sessionrecordingtopic.cpp index 9ede8ce9c4..3a84458eb5 100644 --- a/modules/server/src/topics/sessionrecordingtopic.cpp +++ b/modules/server/src/topics/sessionrecordingtopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cf2c5665ec..559adc6b6d 100644 --- a/modules/server/src/topics/setpropertytopic.cpp +++ b/modules/server/src/topics/setpropertytopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 07e631f337..e6dd498704 100644 --- a/modules/server/src/topics/shortcuttopic.cpp +++ b/modules/server/src/topics/shortcuttopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -39,7 +39,21 @@ bool ShortcutTopic::isDone() const { std::vector ShortcutTopic::shortcutsJson() const { std::vector json; - for (const interaction::Action& action : global::actionManager->actions()) { + std::vector actions = global::actionManager->actions(); + std::sort( + actions.begin(), + actions.end(), + [](const interaction::Action& lhs, const interaction::Action& rhs) { + if (!lhs.name.empty() && !rhs.name.empty()) { + return lhs.name < rhs.name; + } + else { + return lhs.identifier < rhs.identifier; + } + } + ); + + for (const interaction::Action& action : actions) { nlohmann::json shortcutJson = { { "identifier", action.identifier }, { "name", action.name }, diff --git a/modules/server/src/topics/skybrowsertopic.cpp b/modules/server/src/topics/skybrowsertopic.cpp index 1c45527b03..6fcbaff99c 100644 --- a/modules/server/src/topics/skybrowsertopic.cpp +++ b/modules/server/src/topics/skybrowsertopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 aa30b8e1b2..a28fdecfff 100644 --- a/modules/server/src/topics/subscriptiontopic.cpp +++ b/modules/server/src/topics/subscriptiontopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 40285c8270..98ecc5720a 100644 --- a/modules/server/src/topics/timetopic.cpp +++ b/modules/server/src/topics/timetopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cced85e1cc..04c39600e5 100644 --- a/modules/server/src/topics/topic.cpp +++ b/modules/server/src/topics/topic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 00ac1a110c..bb5f3ad143 100644 --- a/modules/server/src/topics/triggerpropertytopic.cpp +++ b/modules/server/src/topics/triggerpropertytopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 3d35cc7726..d900db3004 100644 --- a/modules/server/src/topics/versiontopic.cpp +++ b/modules/server/src/topics/versiontopic.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/skybrowser/CMakeLists.txt b/modules/skybrowser/CMakeLists.txt index af3b6c6045..7ea6ef0161 100644 --- a/modules/skybrowser/CMakeLists.txt +++ b/modules/skybrowser/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, to any person obtaining a copy of this # # software and associated documentation files (the "Software"), to deal in the Software # diff --git a/modules/skybrowser/include/browser.h b/modules/skybrowser/include/browser.h index b1fb89848c..297b71414b 100644 --- a/modules/skybrowser/include/browser.h +++ b/modules/skybrowser/include/browser.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -29,7 +29,7 @@ #include #include #include -#include +#include #ifdef _MSC_VER #pragma warning (push) @@ -74,17 +74,17 @@ public: void updateBrowserSize(); void reload(); - glm::vec2 browserPixelDimensions() const; + void setRatio(float ratio); float browserRatio() const; - void setCallbackDimensions(const std::function& function); protected: - properties::Vec2Property _browserDimensions; + properties::IVec2Property _browserDimensions; properties::StringProperty _url; properties::TriggerProperty _reload; std::unique_ptr _texture; + void updateBrowserDimensions(); void executeJavascript(const std::string& script) const; bool _isUrlDirty = false; diff --git a/modules/skybrowser/include/renderableskytarget.h b/modules/skybrowser/include/renderableskytarget.h index 5c43a68ea7..da1b8faf8c 100644 --- a/modules/skybrowser/include/renderableskytarget.h +++ b/modules/skybrowser/include/renderableskytarget.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/skybrowser/include/screenspaceskybrowser.h b/modules/skybrowser/include/screenspaceskybrowser.h index 721f9d0067..2c96e2574f 100644 --- a/modules/skybrowser/include/screenspaceskybrowser.h +++ b/modules/skybrowser/include/screenspaceskybrowser.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -52,7 +52,6 @@ public: double setVerticalFovWithScroll(float scroll); void setOpacity(float opacity); - void setRatio(float ratio); void setIdInBrowser() const; void setIsInitialized(bool isInitialized); @@ -77,13 +76,11 @@ private: // Flags bool _isSyncedWithWwt = false; - bool _textureDimensionsIsDirty = false; - bool _ratioIsDirty = false; - bool _radiusIsDirty = false; bool _isInitialized = false; + bool _radiusIsDirty = false; int _borderRadiusTimer = -1; - float _ratio = 1.f; + float _lastTextureQuality = 1.f; }; } // namespace openspace diff --git a/modules/skybrowser/include/targetbrowserpair.h b/modules/skybrowser/include/targetbrowserpair.h index cecc046544..5168567617 100644 --- a/modules/skybrowser/include/targetbrowserpair.h +++ b/modules/skybrowser/include/targetbrowserpair.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/skybrowser/include/utility.h b/modules/skybrowser/include/utility.h index 077ef13dba..ee69dbbc03 100644 --- a/modules/skybrowser/include/utility.h +++ b/modules/skybrowser/include/utility.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/skybrowser/include/wwtcommunicator.h b/modules/skybrowser/include/wwtcommunicator.h index c28dbb7c94..2ab394f598 100644 --- a/modules/skybrowser/include/wwtcommunicator.h +++ b/modules/skybrowser/include/wwtcommunicator.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/skybrowser/include/wwtdatahandler.h b/modules/skybrowser/include/wwtdatahandler.h index fe7d289879..206f0baf9f 100644 --- a/modules/skybrowser/include/wwtdatahandler.h +++ b/modules/skybrowser/include/wwtdatahandler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/skybrowser/shaders/target_fs.glsl b/modules/skybrowser/shaders/target_fs.glsl index 073c6513f2..60c7d8e26a 100644 --- a/modules/skybrowser/shaders/target_fs.glsl +++ b/modules/skybrowser/shaders/target_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/skybrowser/shaders/target_vs.glsl b/modules/skybrowser/shaders/target_vs.glsl index ed07986c26..a249d6af40 100644 --- a/modules/skybrowser/shaders/target_vs.glsl +++ b/modules/skybrowser/shaders/target_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/skybrowser/skybrowsermodule.cpp b/modules/skybrowser/skybrowsermodule.cpp index 7307a1d41e..273c8e54c6 100644 --- a/modules/skybrowser/skybrowsermodule.cpp +++ b/modules/skybrowser/skybrowsermodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/skybrowser/skybrowsermodule.h b/modules/skybrowser/skybrowsermodule.h index 04810aff33..d29f073136 100644 --- a/modules/skybrowser/skybrowsermodule.h +++ b/modules/skybrowser/skybrowsermodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl index 30bdf3d243..c72f16b93d 100644 --- a/modules/skybrowser/skybrowsermodule_lua.inl +++ b/modules/skybrowser/skybrowsermodule_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -466,6 +466,9 @@ namespace { glm::vec3 positionBrowser = glm::vec3(0.f, 0.f, -2.1f); glm::vec3 positionTarget = glm::vec3(0.9f, 0.4f, -2.1f); glm::dvec3 galacticTarget = skybrowser::localCameraToGalactic(positionTarget); + if (glm::any(glm::isnan(galacticTarget))) { + galacticTarget = glm::dvec3 (0.0, 0.0, skybrowser::CelestialSphereRadius); + } std::string guiPath = "/Sky Browser"; std::string url = "http://wwt.openspaceproject.com/1/openspace/"; double fov = 70.0; diff --git a/modules/skybrowser/src/browser.cpp b/modules/skybrowser/src/browser.cpp index 61dc893c80..206fcfeca7 100644 --- a/modules/skybrowser/src/browser.cpp +++ b/modules/skybrowser/src/browser.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -55,6 +55,9 @@ namespace { }; struct [[codegen::Dictionary(Browser)]] Parameters { + // [[codegen::verbatim(DimensionsInfo.description)]] + std::optional dimensions; + // [[codegen::verbatim(UrlInfo.description)]] std::optional url; @@ -78,7 +81,7 @@ void Browser::RenderHandler::setTexture(GLuint t) { Browser::Browser(const ghoul::Dictionary& dictionary) : _browserDimensions( DimensionsInfo, - global::windowDelegate->currentSubwindowSize(), + glm::vec2(1000.f), glm::vec2(10.f), glm::vec2(3000.f) ) @@ -90,7 +93,9 @@ Browser::Browser(const ghoul::Dictionary& dictionary) _url = p.url.value_or(_url); _url.onChange([this]() { _isUrlDirty = true; }); + _browserDimensions = p.dimensions.value_or(_browserDimensions); _browserDimensions.onChange([this]() { _isDimensionsDirty = true; }); + _reload.onChange([this]() { _shouldReload = true; }); // Create browser and render handler @@ -119,6 +124,9 @@ void Browser::initializeGL() { _browserInstance->initialize(); _browserInstance->loadUrl(_url); + // Update the dimensions upon initialization. Do this with flag as it affects + // derived classes as well + _isDimensionsDirty = true; } void Browser::deinitializeGL() { @@ -153,11 +161,7 @@ void Browser::update() { } if (_isDimensionsDirty) { - glm::vec2 dim = _browserDimensions; - if (dim.x > 0 && dim.y > 0) { - _browserInstance->reshape(dim); - _isDimensionsDirty = false; - } + updateBrowserDimensions(); } if (_shouldReload) { @@ -170,10 +174,6 @@ bool Browser::isReady() const { return _texture.get(); } -glm::vec2 Browser::browserPixelDimensions() const { - return _browserDimensions; -} - // Updates the browser size to match the size of the texture void Browser::updateBrowserSize() { _browserDimensions = _texture->dimensions(); @@ -183,15 +183,26 @@ void Browser::reload() { _reload.set(true); } +void Browser::setRatio(float ratio) { + float relativeRatio = ratio / browserRatio(); + float newX = static_cast(_browserDimensions.value().x) * relativeRatio; + glm::ivec2 newDims = { static_cast(floor(newX)), _browserDimensions.value().y }; + _browserDimensions = newDims; + _isDimensionsDirty = true; +} + float Browser::browserRatio() const { return static_cast(_texture->dimensions().x) / static_cast(_texture->dimensions().y); } -void Browser::setCallbackDimensions(const std::function& func) { - _browserDimensions.onChange([&]() { - func(_browserDimensions.value()); - }); +void Browser::updateBrowserDimensions() { + glm::ivec2 dim = _browserDimensions; + if (dim.x > 0 && dim.y > 0) { + _texture->setDimensions(glm::uvec3(_browserDimensions.value(), 1)); + _browserInstance->reshape(dim); + _isDimensionsDirty = false; + } } void Browser::executeJavascript(const std::string& script) const { diff --git a/modules/skybrowser/src/renderableskytarget.cpp b/modules/skybrowser/src/renderableskytarget.cpp index c7f77f612c..ffafd90740 100644 --- a/modules/skybrowser/src/renderableskytarget.cpp +++ b/modules/skybrowser/src/renderableskytarget.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -58,7 +58,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo RectangleThresholdInfo = { "RectangleThreshold", "Rectangle Threshold", - "When the field of view is larger than the rectangle threshold, a rectangle will" + "When the field of view is larger than the rectangle threshold, a rectangle will " "be rendered in the target" }; @@ -188,7 +188,7 @@ void RenderableSkyTarget::render(const RenderData& data, RendererTasks&) { ZoneScoped const bool showRectangle = _verticalFov > _showRectangleThreshold; - glm::vec4 color = { glm::vec3(_borderColor) / 255.f, 1.0 }; + glm::vec4 color = glm::vec4(glm::vec3(_borderColor) / 255.f, 1.0); _shader->activate(); _shader->setUniform("opacity", opacity()); diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp index df9d12b1df..7b76684f3e 100644 --- a/modules/skybrowser/src/screenspaceskybrowser.cpp +++ b/modules/skybrowser/src/screenspaceskybrowser.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -105,7 +105,7 @@ documentation::Documentation ScreenSpaceSkyBrowser::Documentation() { ScreenSpaceSkyBrowser::ScreenSpaceSkyBrowser(const ghoul::Dictionary& dictionary) : ScreenSpaceRenderable(dictionary) , WwtCommunicator(dictionary) - , _textureQuality(TextureQualityInfo, 0.5f, 0.25f, 1.f) + , _textureQuality(TextureQualityInfo, 1.f, 0.25f, 1.f) , _isHidden(IsHiddenInfo, true) { _identifier = makeUniqueIdentifier(_identifier); @@ -122,17 +122,12 @@ ScreenSpaceSkyBrowser::ScreenSpaceSkyBrowser(const ghoul::Dictionary& dictionary addProperty(_textureQuality); addProperty(_verticalFov); - _textureQuality.onChange([this]() { _textureDimensionsIsDirty = true; }); + _textureQuality.onChange([this]() { _isDimensionsDirty = true; }); if (global::windowDelegate->isMaster()) { _borderColor = randomBorderColor(); } - _scale.onChange([this]() { - updateTextureResolution(); - _borderRadiusTimer = 0; - }); - _useRadiusAzimuthElevation.onChange( [this]() { std::for_each( @@ -160,7 +155,6 @@ ScreenSpaceSkyBrowser::~ScreenSpaceSkyBrowser() { bool ScreenSpaceSkyBrowser::initializeGL() { WwtCommunicator::initializeGL(); ScreenSpaceRenderable::initializeGL(); - updateTextureResolution(); return true; } @@ -192,19 +186,18 @@ void ScreenSpaceSkyBrowser::setIsInitialized(bool isInitialized) { } void ScreenSpaceSkyBrowser::updateTextureResolution() { - // Scale texture depending on the height of the window - // Set texture size to the actual pixel size it covers - glm::vec2 pixels = glm::vec2(global::windowDelegate->currentSubwindowSize()); + // Check if texture quality has changed. If it has, adjust accordingly + if (abs(_textureQuality.value() - _lastTextureQuality) > glm::epsilon()) { + float diffTextureQuality = _textureQuality / _lastTextureQuality; + glm::vec2 newRes = glm::vec2(_browserDimensions.value()) * diffTextureQuality; + _browserDimensions = glm::ivec2(newRes); + _lastTextureQuality = _textureQuality.value(); + } + _objectSize = glm::ivec3(_browserDimensions.value(), 1); - // If the scale is 1, it covers half the window. Hence multiplication with 2 - float newResY = pixels.y * 2.f * _scale; - float newResX = newResY * _ratio; - glm::vec2 newSize = glm::vec2(newResX , newResY) * _textureQuality.value(); - - _browserDimensions = glm::ivec2(newSize); - _texture->setDimensions(glm::ivec3(newSize, 1)); - _objectSize = glm::ivec3(_texture->dimensions()); + // The radius has to be updated when the texture resolution has changed _radiusIsDirty = true; + _borderRadiusTimer = 0; } void ScreenSpaceSkyBrowser::addDisplayCopy(const glm::vec3& raePosition, int nCopies) { @@ -313,16 +306,9 @@ void ScreenSpaceSkyBrowser::render() { } void ScreenSpaceSkyBrowser::update() { - // Texture of window is 1x1 when minimized - bool isWindow = global::windowDelegate->currentSubwindowSize() != glm::ivec2(1); - bool isWindowResized = global::windowDelegate->windowHasResized(); - if ((isWindowResized && isWindow) || _textureDimensionsIsDirty) { + // Check for dirty flags + if (_isDimensionsDirty) { updateTextureResolution(); - _textureDimensionsIsDirty = false; - } - if (_ratioIsDirty) { - updateTextureResolution(); - _ratioIsDirty = false; } if (_shouldReload) { _isInitialized = false; @@ -369,11 +355,6 @@ void ScreenSpaceSkyBrowser::setOpacity(float opacity) { _opacity = opacity; } -void ScreenSpaceSkyBrowser::setRatio(float ratio) { - _ratio = ratio; - _ratioIsDirty = true; -} - float ScreenSpaceSkyBrowser::opacity() const { return _opacity; } diff --git a/modules/skybrowser/src/targetbrowserpair.cpp b/modules/skybrowser/src/targetbrowserpair.cpp index bb776c0671..f7bd7bd4ec 100644 --- a/modules/skybrowser/src/targetbrowserpair.cpp +++ b/modules/skybrowser/src/targetbrowserpair.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/skybrowser/src/utility.cpp b/modules/skybrowser/src/utility.cpp index f3722f3a41..53e3c1a1f5 100644 --- a/modules/skybrowser/src/utility.cpp +++ b/modules/skybrowser/src/utility.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/skybrowser/src/wwtcommunicator.cpp b/modules/skybrowser/src/wwtcommunicator.cpp index 08263b68e2..00b0d503c8 100644 --- a/modules/skybrowser/src/wwtcommunicator.cpp +++ b/modules/skybrowser/src/wwtcommunicator.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -29,6 +29,7 @@ #include #include #include +#include namespace { constexpr std::string_view _loggerCat = "WwtCommunicator"; @@ -292,14 +293,31 @@ glm::dvec2 WwtCommunicator::equatorialAim() const { void WwtCommunicator::setImageOrder(int i, int order) { // Find in selected images list auto current = findSelectedImage(i); - auto target = _selectedImages.begin() + order; + int currentIndex = std::distance(_selectedImages.begin(), current); + int difference = order - currentIndex; - // Make sure the image was found in the list - if (current != _selectedImages.end() && target != _selectedImages.end()) { - // Swap the two images - std::iter_swap(current, target); + std::deque> newDeque; + + for (int i = 0; i < static_cast(_selectedImages.size()); i++) { + if (i == currentIndex) { + continue; + } + else if (i == order) { + if (order < currentIndex) { + newDeque.push_back(*current); + newDeque.push_back(_selectedImages[i]); + } + else { + newDeque.push_back(_selectedImages[i]); + newDeque.push_back(*current); + } + } + else { + newDeque.push_back(_selectedImages[i]); + } } + _selectedImages = newDeque; int reverseOrder = static_cast(_selectedImages.size()) - order - 1; ghoul::Dictionary message = setLayerOrderMessage(std::to_string(i), reverseOrder); sendMessageToWwt(message); diff --git a/modules/skybrowser/src/wwtdatahandler.cpp b/modules/skybrowser/src/wwtdatahandler.cpp index 5416a1fa92..a4394f06ed 100644 --- a/modules/skybrowser/src/wwtdatahandler.cpp +++ b/modules/skybrowser/src/wwtdatahandler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 73673fffd0..46f8df42ed 100644 --- a/modules/space/CMakeLists.txt +++ b/modules/space/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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/horizonsfile.cpp b/modules/space/horizonsfile.cpp index 197a6a7ede..123028ca52 100644 --- a/modules/space/horizonsfile.cpp +++ b/modules/space/horizonsfile.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/horizonsfile.h b/modules/space/horizonsfile.h index d192038c10..83e822683a 100644 --- a/modules/space/horizonsfile.h +++ b/modules/space/horizonsfile.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/kepler.cpp b/modules/space/kepler.cpp index 2a84427c93..3f88c558e5 100644 --- a/modules/space/kepler.cpp +++ b/modules/space/kepler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -93,38 +93,38 @@ namespace { } }; - constexpr const LeapSecond LeapEpoch = { 2000, 1 }; + constexpr const LeapSecond LeapEpoch = { .year = 2000, .dayOfYear = 1 }; // List taken from: https://www.ietf.org/timezones/data/leap-seconds.list constexpr const std::array LeapSeconds = { - LeapSecond{ 1972, 1 }, - LeapSecond{ 1972, 183 }, - LeapSecond{ 1973, 1 }, - LeapSecond{ 1974, 1 }, - LeapSecond{ 1975, 1 }, - LeapSecond{ 1976, 1 }, - LeapSecond{ 1977, 1 }, - LeapSecond{ 1978, 1 }, - LeapSecond{ 1979, 1 }, - LeapSecond{ 1980, 1 }, - LeapSecond{ 1981, 182 }, - LeapSecond{ 1982, 182 }, - LeapSecond{ 1983, 182 }, - LeapSecond{ 1985, 182 }, - LeapSecond{ 1988, 1 }, - LeapSecond{ 1990, 1 }, - LeapSecond{ 1991, 1 }, - LeapSecond{ 1992, 183 }, - LeapSecond{ 1993, 182 }, - LeapSecond{ 1994, 182 }, - LeapSecond{ 1996, 1 }, - LeapSecond{ 1997, 182 }, - LeapSecond{ 1999, 1 }, - LeapSecond{ 2006, 1 }, - LeapSecond{ 2009, 1 }, - LeapSecond{ 2012, 183 }, - LeapSecond{ 2015, 182 }, - LeapSecond{ 2017, 1 } + LeapSecond { .year = 1972, .dayOfYear = 1 }, + LeapSecond { .year = 1972, .dayOfYear = 183 }, + LeapSecond { .year = 1973, .dayOfYear = 1 }, + LeapSecond { .year = 1974, .dayOfYear = 1 }, + LeapSecond { .year = 1975, .dayOfYear = 1 }, + LeapSecond { .year = 1976, .dayOfYear = 1 }, + LeapSecond { .year = 1977, .dayOfYear = 1 }, + LeapSecond { .year = 1978, .dayOfYear = 1 }, + LeapSecond { .year = 1979, .dayOfYear = 1 }, + LeapSecond { .year = 1980, .dayOfYear = 1 }, + LeapSecond { .year = 1981, .dayOfYear = 182 }, + LeapSecond { .year = 1982, .dayOfYear = 182 }, + LeapSecond { .year = 1983, .dayOfYear = 182 }, + LeapSecond { .year = 1985, .dayOfYear = 182 }, + LeapSecond { .year = 1988, .dayOfYear = 1 }, + LeapSecond { .year = 1990, .dayOfYear = 1 }, + LeapSecond { .year = 1991, .dayOfYear = 1 }, + LeapSecond { .year = 1992, .dayOfYear = 183 }, + LeapSecond { .year = 1993, .dayOfYear = 182 }, + LeapSecond { .year = 1994, .dayOfYear = 182 }, + LeapSecond { .year = 1996, .dayOfYear = 1 }, + LeapSecond { .year = 1997, .dayOfYear = 182 }, + LeapSecond { .year = 1999, .dayOfYear = 1 }, + LeapSecond { .year = 2006, .dayOfYear = 1 }, + LeapSecond { .year = 2009, .dayOfYear = 1 }, + LeapSecond { .year = 2012, .dayOfYear = 183 }, + LeapSecond { .year = 2015, .dayOfYear = 182 }, + LeapSecond { .year = 2017, .dayOfYear = 1 } }; // Get the position of the last leap second before the desired date LeapSecond date{ year, dayOfYear }; diff --git a/modules/space/kepler.h b/modules/space/kepler.h index 77b35bac78..b49073f47d 100644 --- a/modules/space/kepler.h +++ b/modules/space/kepler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/labelscomponent.cpp b/modules/space/labelscomponent.cpp index f6971f2ed8..973c575ba3 100644 --- a/modules/space/labelscomponent.cpp +++ b/modules/space/labelscomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -85,9 +85,8 @@ namespace { constexpr openspace::properties::Property::PropertyInfo FaceCameraInfo = { "FaceCamera", "Face Camera", - "If enabled, the labels will be rotated to face the camera. " - "For non-linear display rendering (for example fisheye) this should be set to " - "false." + "If enabled, the labels will be rotated to face the camera. For non-linear " + "display rendering (for example fisheye) this should be set to false." }; struct [[codegen::Dictionary(LabelsComponent)]] Parameters { diff --git a/modules/space/labelscomponent.h b/modules/space/labelscomponent.h index 88443b570c..6e9aad5a81 100644 --- a/modules/space/labelscomponent.h +++ b/modules/space/labelscomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e9e6890719..c6e6648e0c 100644 --- a/modules/space/rendering/renderableconstellationbounds.cpp +++ b/modules/space/rendering/renderableconstellationbounds.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f6486a50de..3f4d61241b 100644 --- a/modules/space/rendering/renderableconstellationbounds.h +++ b/modules/space/rendering/renderableconstellationbounds.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderableconstellationlines.cpp b/modules/space/rendering/renderableconstellationlines.cpp index 8ed5943dbf..2efe096ab1 100644 --- a/modules/space/rendering/renderableconstellationlines.cpp +++ b/modules/space/rendering/renderableconstellationlines.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -68,8 +68,8 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ColorsInfo = { "Colors", "Constellation Colors", - "The defined colors for the constellations to be rendered. " - "There can be several groups of constellaitons that can have distinct colors." + "The defined colors for the constellations to be rendered. There can be several " + "groups of constellaitons that can have distinct colors." }; struct [[codegen::Dictionary(RenderableConstellationLines)]] Parameters { diff --git a/modules/space/rendering/renderableconstellationlines.h b/modules/space/rendering/renderableconstellationlines.h index 8453fc5dc5..315d4de1b1 100644 --- a/modules/space/rendering/renderableconstellationlines.h +++ b/modules/space/rendering/renderableconstellationlines.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderableconstellationsbase.cpp b/modules/space/rendering/renderableconstellationsbase.cpp index 007a868b59..f782b8f3df 100644 --- a/modules/space/rendering/renderableconstellationsbase.cpp +++ b/modules/space/rendering/renderableconstellationsbase.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -63,8 +63,7 @@ namespace { "The constellations that are selected are displayed on the celestial sphere" }; - static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = - { + const static openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = { "Labels", "Labels", "The labels for the constellations" diff --git a/modules/space/rendering/renderableconstellationsbase.h b/modules/space/rendering/renderableconstellationsbase.h index 1987750db0..e7a4cc4302 100644 --- a/modules/space/rendering/renderableconstellationsbase.h +++ b/modules/space/rendering/renderableconstellationsbase.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderablefluxnodes.cpp b/modules/space/rendering/renderablefluxnodes.cpp index f6936610f3..e63f5c4dd4 100644 --- a/modules/space/rendering/renderablefluxnodes.cpp +++ b/modules/space/rendering/renderablefluxnodes.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -63,8 +63,8 @@ namespace { "GoesEnergy", "GOES Energy", "Select which energy bin you want to show. GOES = Geostationary Operational " - "Environmental Satellites. Emin01 is values > 10 MeV, " - "Default is Emin03 where values > 100 MeV" + "Environmental Satellites. Emin01 is values > 10 MeV, Default is Emin03 where " + "values > 100 MeV" }; constexpr openspace::properties::Property::PropertyInfo ColorModeInfo = { @@ -194,8 +194,8 @@ namespace { CameraPerspectiveEnabledInfo = { "CameraPerspectiveEnabled", "Use Camera perspective", - "Camera perspective changes the size of the nodes dependent on the " - "distance from camera" + "Camera perspective changes the size of the nodes dependent on the distance from " + "camera" }; constexpr openspace::properties::Property::PropertyInfo DrawingCirclesInfo = { @@ -214,15 +214,14 @@ namespace { "RenderingGaussianAlphaFilter", "Alpha by Gaussian", "Using fragment shader to draw nodes with Gaussian filter for alpha value" - }; constexpr openspace::properties::Property::PropertyInfo PerspectiveDistanceFactorInfo = { "PerspectiveDistanceFactor", "Perspective Distance factor", - "This value decides how far away the camera must be to start " - "impacting the node size" + "This value decides how far away the camera must be to start impacting the node " + "size" }; constexpr openspace::properties::Property::PropertyInfo MinMaxNodeSizeInfo = { diff --git a/modules/space/rendering/renderablefluxnodes.h b/modules/space/rendering/renderablefluxnodes.h index 56826dd5f5..922d3fe6a8 100644 --- a/modules/space/rendering/renderablefluxnodes.h +++ b/modules/space/rendering/renderablefluxnodes.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderablehabitablezone.cpp b/modules/space/rendering/renderablehabitablezone.cpp index 5176f092de..62f4e5046a 100644 --- a/modules/space/rendering/renderablehabitablezone.cpp +++ b/modules/space/rendering/renderablehabitablezone.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -68,7 +68,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo KopparapuTeffIntervalInfo = { "KopparapuTeffInterval", - "Kopparapu TEFF" , + "Kopparapu TEFF", "The effective temperature interval for which Kopparapu's formula is used for " "the habitable zone computation. For stars with temperatures outside the range, " "a simpler method by Tom E. Harris is used. This method only uses the star " diff --git a/modules/space/rendering/renderablehabitablezone.h b/modules/space/rendering/renderablehabitablezone.h index 94f6c0e89e..296cc0de53 100644 --- a/modules/space/rendering/renderablehabitablezone.h +++ b/modules/space/rendering/renderablehabitablezone.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp index 7f42f1eafa..6bde01ef0e 100644 --- a/modules/space/rendering/renderableorbitalkepler.cpp +++ b/modules/space/rendering/renderableorbitalkepler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -77,7 +77,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo TrailFadeInfo = { "TrailFade", "Trail Fade", - "This value determines how fast the trail fades and is an appearance property. " + "This value determines how fast the trail fades and is an appearance property." }; constexpr openspace::properties::Property::PropertyInfo StartRenderIdxInfo = { diff --git a/modules/space/rendering/renderableorbitalkepler.h b/modules/space/rendering/renderableorbitalkepler.h index b0e97beef7..f6d51752a1 100644 --- a/modules/space/rendering/renderableorbitalkepler.h +++ b/modules/space/rendering/renderableorbitalkepler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 bdf2ad1db9..1f5f445d3d 100644 --- a/modules/space/rendering/renderablerings.cpp +++ b/modules/space/rendering/renderablerings.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 4bf5c3ceda..d9dec3154b 100644 --- a/modules/space/rendering/renderablerings.h +++ b/modules/space/rendering/renderablerings.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 60fb29ead1..0c55c86114 100644 --- a/modules/space/rendering/renderablestars.cpp +++ b/modules/space/rendering/renderablestars.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -242,9 +242,9 @@ namespace { constexpr openspace::properties::Property::PropertyInfo MagnitudeExponentInfo = { "MagnitudeExponent", "Magnitude Exponent", - "Adjust star magnitude by 10^MagnitudeExponent. " - "Stars closer than this distance are given full opacity. " - "Farther away, stars dim proportionally to the logarithm of their distance" + "Adjust star magnitude by 10^MagnitudeExponent. Stars closer than this distance " + "are given full opacity. Farther away, stars dim proportionally to the " + "logarithm of their distance" }; constexpr openspace::properties::Property::PropertyInfo RenderMethodOptionInfo = { @@ -301,7 +301,7 @@ namespace { }; constexpr openspace::properties::Property::PropertyInfo BrightnessPercentInfo = { - "BrightnessPercen", + "BrightnessPercent", "App Brightness Contribution", "App Brightness Contribution" }; diff --git a/modules/space/rendering/renderablestars.h b/modules/space/rendering/renderablestars.h index d66c1e7658..eb7af56799 100644 --- a/modules/space/rendering/renderablestars.h +++ b/modules/space/rendering/renderablestars.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderabletravelspeed.cpp b/modules/space/rendering/renderabletravelspeed.cpp index dc024b29f1..8813c15a4d 100644 --- a/modules/space/rendering/renderabletravelspeed.cpp +++ b/modules/space/rendering/renderabletravelspeed.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -37,7 +37,7 @@ #include namespace { - constexpr std::array UniformNames = {"lineColor", "opacity"}; + constexpr std::array UniformNames = { "lineColor", "opacity" }; constexpr openspace::properties::Property::PropertyInfo SpeedInfo = { "TravelSpeed", @@ -90,10 +90,10 @@ namespace { std::optional lineWidth; // [[codegen::verbatim(IndicatorLengthInfo.description)]] - std::optional indicatorLength; + std::optional indicatorLength; // [[codegen::verbatim(FadeLengthInfo.description)]] - std::optional fadeLength; + std::optional fadeLength; }; #include "renderabletravelspeed_codegen.cpp" } // namespace @@ -113,8 +113,8 @@ RenderableTravelSpeed::RenderableTravelSpeed(const ghoul::Dictionary& dictionary 1.0, distanceconstants::LightSecond ) - , _indicatorLength(IndicatorLengthInfo, 1, 1, 360) - , _fadeLength(FadeLengthInfo, 1, 0, 360) + , _indicatorLength(IndicatorLengthInfo, 1.f, 0.f, 360.f) + , _fadeLength(FadeLengthInfo, 1.f, 0.f, 360.f) , _lineWidth(LineWidthInfo, 2.f, 1.f, 20.f) , _lineColor(LineColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f)) { diff --git a/modules/space/rendering/renderabletravelspeed.h b/modules/space/rendering/renderabletravelspeed.h index 5b2f9cb6e6..e2a62b0a54 100644 --- a/modules/space/rendering/renderabletravelspeed.h +++ b/modules/space/rendering/renderabletravelspeed.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -62,8 +63,8 @@ private: properties::StringProperty _targetName; SceneGraphNode* _targetNode = nullptr; properties::DoubleProperty _travelSpeed; - properties::IntProperty _indicatorLength; - properties::IntProperty _fadeLength; + properties::FloatProperty _indicatorLength; + properties::FloatProperty _fadeLength; properties::FloatProperty _lineWidth; properties::Vec3Property _lineColor; diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp index 7b2e335375..b755ff4b04 100644 --- a/modules/space/rotation/spicerotation.cpp +++ b/modules/space/rotation/spicerotation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a2f5e0c040..4a706bd135 100644 --- a/modules/space/rotation/spicerotation.h +++ b/modules/space/rotation/spicerotation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 ce1a490d4e..d037eae5f0 100644 --- a/modules/space/shaders/constellationbounds_fs.glsl +++ b/modules/space/shaders/constellationbounds_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 9ae2ecb49d..58b9cb02f1 100644 --- a/modules/space/shaders/constellationbounds_vs.glsl +++ b/modules/space/shaders/constellationbounds_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/constellationlines_fs.glsl b/modules/space/shaders/constellationlines_fs.glsl index 06311674c6..badb2842ca 100644 --- a/modules/space/shaders/constellationlines_fs.glsl +++ b/modules/space/shaders/constellationlines_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/constellationlines_vs.glsl b/modules/space/shaders/constellationlines_vs.glsl index 1fa6aa80fe..62770659c2 100644 --- a/modules/space/shaders/constellationlines_vs.glsl +++ b/modules/space/shaders/constellationlines_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/convolution_fs.glsl b/modules/space/shaders/convolution_fs.glsl index ae01ec07e2..53ba366fba 100644 --- a/modules/space/shaders/convolution_fs.glsl +++ b/modules/space/shaders/convolution_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/convolution_vs.glsl b/modules/space/shaders/convolution_vs.glsl index 73753303ef..0ba4e8ee85 100644 --- a/modules/space/shaders/convolution_vs.glsl +++ b/modules/space/shaders/convolution_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/debrisViz_fs.glsl b/modules/space/shaders/debrisViz_fs.glsl index c2801f6f74..e5b164f25c 100644 --- a/modules/space/shaders/debrisViz_fs.glsl +++ b/modules/space/shaders/debrisViz_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/debrisViz_vs.glsl b/modules/space/shaders/debrisViz_vs.glsl index 23ab2a4994..ff76079d97 100644 --- a/modules/space/shaders/debrisViz_vs.glsl +++ b/modules/space/shaders/debrisViz_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/fluxnodes_fs.glsl b/modules/space/shaders/fluxnodes_fs.glsl index c375b71646..e439b428c9 100644 --- a/modules/space/shaders/fluxnodes_fs.glsl +++ b/modules/space/shaders/fluxnodes_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/fluxnodes_vs.glsl b/modules/space/shaders/fluxnodes_vs.glsl index 59c005536a..60db0de0a3 100644 --- a/modules/space/shaders/fluxnodes_vs.glsl +++ b/modules/space/shaders/fluxnodes_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/habitablezone_fs.glsl b/modules/space/shaders/habitablezone_fs.glsl index 3fa0c435f2..3636ecbfd0 100644 --- a/modules/space/shaders/habitablezone_fs.glsl +++ b/modules/space/shaders/habitablezone_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/habitablezone_vs.glsl b/modules/space/shaders/habitablezone_vs.glsl index 4d9ff490c1..c2dbd4674f 100644 --- a/modules/space/shaders/habitablezone_vs.glsl +++ b/modules/space/shaders/habitablezone_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/psfToTexture_fs.glsl b/modules/space/shaders/psfToTexture_fs.glsl index b12b3b9491..75edb42d9d 100644 --- a/modules/space/shaders/psfToTexture_fs.glsl +++ b/modules/space/shaders/psfToTexture_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/psfToTexture_vs.glsl b/modules/space/shaders/psfToTexture_vs.glsl index 8b1bd3506f..5e6e7c0a8c 100644 --- a/modules/space/shaders/psfToTexture_vs.glsl +++ b/modules/space/shaders/psfToTexture_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 debf65b92a..e7c294c2df 100644 --- a/modules/space/shaders/rings_fs.glsl +++ b/modules/space/shaders/rings_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 64086c118e..264573395b 100644 --- a/modules/space/shaders/rings_vs.glsl +++ b/modules/space/shaders/rings_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b92e4b4b3e..a2864ac811 100644 --- a/modules/space/shaders/star_fs.glsl +++ b/modules/space/shaders/star_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c2ccb7ab3f..e8458747a9 100644 --- a/modules/space/shaders/star_ge.glsl +++ b/modules/space/shaders/star_ge.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b00618c89f..1f61fe2e5f 100644 --- a/modules/space/shaders/star_vs.glsl +++ b/modules/space/shaders/star_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/travelspeed_fs.glsl b/modules/space/shaders/travelspeed_fs.glsl index 85fadfe4ad..ccafe094ab 100644 --- a/modules/space/shaders/travelspeed_fs.glsl +++ b/modules/space/shaders/travelspeed_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/travelspeed_vs.glsl b/modules/space/shaders/travelspeed_vs.glsl index b59a7ebba5..3b881f76c8 100644 --- a/modules/space/shaders/travelspeed_vs.glsl +++ b/modules/space/shaders/travelspeed_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 72e479040d..b56af70f35 100644 --- a/modules/space/spacemodule.cpp +++ b/modules/space/spacemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 00861b543c..f5ca941780 100644 --- a/modules/space/spacemodule.h +++ b/modules/space/spacemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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_lua.inl b/modules/space/spacemodule_lua.inl index c7999a163d..952640fb42 100644 --- a/modules/space/spacemodule_lua.inl +++ b/modules/space/spacemodule_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/speckloader.cpp b/modules/space/speckloader.cpp index 889be4b38e..210322f8dc 100644 --- a/modules/space/speckloader.cpp +++ b/modules/space/speckloader.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/speckloader.h b/modules/space/speckloader.h index 8e48dbd764..f4d7dde11e 100644 --- a/modules/space/speckloader.h +++ b/modules/space/speckloader.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/tasks/generatedebrisvolumetask.cpp b/modules/space/tasks/generatedebrisvolumetask.cpp index 5cd7f0bfb7..1034274197 100644 --- a/modules/space/tasks/generatedebrisvolumetask.cpp +++ b/modules/space/tasks/generatedebrisvolumetask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/tasks/generatedebrisvolumetask.h b/modules/space/tasks/generatedebrisvolumetask.h index a02d60ce38..f36045c8a5 100644 --- a/modules/space/tasks/generatedebrisvolumetask.h +++ b/modules/space/tasks/generatedebrisvolumetask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/gptranslation.cpp b/modules/space/translation/gptranslation.cpp index 2ea8f79d8e..e6395f7a90 100644 --- a/modules/space/translation/gptranslation.cpp +++ b/modules/space/translation/gptranslation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/gptranslation.h b/modules/space/translation/gptranslation.h index 47c37cda60..b93ddee990 100644 --- a/modules/space/translation/gptranslation.h +++ b/modules/space/translation/gptranslation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 ef9f908cfd..133813a64b 100644 --- a/modules/space/translation/horizonstranslation.cpp +++ b/modules/space/translation/horizonstranslation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 fca4ccdfd6..76562a2643 100644 --- a/modules/space/translation/horizonstranslation.h +++ b/modules/space/translation/horizonstranslation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 5bf3538ec6..c6d7e1c94f 100644 --- a/modules/space/translation/keplertranslation.cpp +++ b/modules/space/translation/keplertranslation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -258,11 +258,11 @@ glm::dvec3 KeplerTranslation::position(const UpdateData& data) const { const double e = eccentricAnomaly(meanAnomaly); // Use the eccentric anomaly to compute the actual location - const glm::dvec3 p = { + const glm::dvec3 p = glm::dvec3( _semiMajorAxis * 1000.0 * (cos(e) - _eccentricity), _semiMajorAxis * 1000.0 * sin(e) * sqrt(1.0 - _eccentricity * _eccentricity), 0.0 - }; + ); return _orbitPlaneRotation * p; } @@ -278,9 +278,9 @@ void KeplerTranslation::computeOrbitPlane() const { // inclination // 3. Around the new z axis to place the closest approach to the correct location - const glm::vec3 ascendingNodeAxisRot = { 0.f, 0.f, 1.f }; - const glm::vec3 inclinationAxisRot = { 1.f, 0.f, 0.f }; - const glm::vec3 argPeriapsisAxisRot = { 0.f, 0.f, 1.f }; + const glm::vec3 ascendingNodeAxisRot = glm::vec3(0.f, 0.f, 1.f); + const glm::vec3 inclinationAxisRot = glm::vec3(1.f, 0.f, 0.f); + const glm::vec3 argPeriapsisAxisRot = glm::vec3(0.f, 0.f, 1.f); const double asc = glm::radians(_ascendingNode.value()); const double inc = glm::radians(_inclination.value()); diff --git a/modules/space/translation/keplertranslation.h b/modules/space/translation/keplertranslation.h index 9f1556c4a9..e68e0a67de 100644 --- a/modules/space/translation/keplertranslation.h +++ b/modules/space/translation/keplertranslation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cc4fed9291..b920300b9f 100644 --- a/modules/space/translation/spicetranslation.cpp +++ b/modules/space/translation/spicetranslation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 2916ecd3d4..a599b49066 100644 --- a/modules/space/translation/spicetranslation.h +++ b/modules/space/translation/spicetranslation.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 9e7ab871b8..fe1b84716a 100644 --- a/modules/spacecraftinstruments/CMakeLists.txt +++ b/modules/spacecraftinstruments/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp index ae6a0512e6..a2559daee9 100644 --- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp +++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -148,7 +148,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) { // If the remaining time is below 5 minutes, we switch over to seconds display if (remaining < 5 * 60) { - remainingConv = { remaining, "seconds" }; + remainingConv = std::pair(remaining, "seconds"); } const int Size = 25; diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h index dcd63341ba..0193d8d7ec 100644 --- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h +++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 16a55863b2..902847649e 100644 --- a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp +++ b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 731f467f94..c2a4457a84 100644 --- a/modules/spacecraftinstruments/rendering/renderablecrawlingline.h +++ b/modules/spacecraftinstruments/rendering/renderablecrawlingline.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 dde5b4692b..018846e1c0 100644 --- a/modules/spacecraftinstruments/rendering/renderablefov.cpp +++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -480,7 +480,10 @@ void RenderableFov::computeIntercepts(double time, const std::string& target, // Regardless of what happens next, the position of every second element is going // to be the same. Only the color attribute might change - first = { { 0.f, 0.f, 0.f }, RenderInformation::VertexColorTypeDefaultStart}; + first = { + .position = { 0.f, 0.f, 0.f }, + .color = RenderInformation::VertexColorTypeDefaultStart + }; if (!isInFov) { // If the target is not in the field of view, we don't need to perform any @@ -488,9 +491,8 @@ void RenderableFov::computeIntercepts(double time, const std::string& target, const glm::vec3 o = orthogonalProjection(bound, time, target); second = { - { o.x, o.y, o.z }, - // This had a different color (0.4) before ---abock - RenderInformation::VertexColorTypeDefaultEnd + .position = { o.x, o.y, o.z }, + .color = RenderInformation::VertexColorTypeDefaultEnd }; } else { @@ -531,16 +533,16 @@ void RenderableFov::computeIntercepts(double time, const std::string& target, srfVec *= _standOffDistance; second = { - { srfVec.x, srfVec.y, srfVec.z }, - RenderInformation::VertexColorTypeIntersectionEnd + .position = { srfVec.x, srfVec.y, srfVec.z }, + .color = RenderInformation::VertexColorTypeIntersectionEnd }; } else { // This point did not intersect the target though others did const glm::vec3 o = orthogonalProjection(bound, time, target); second = { - { o.x, o.y, o.z }, - RenderInformation::VertexColorTypeInFieldOfView + .position = { o.x, o.y, o.z }, + .color = RenderInformation::VertexColorTypeInFieldOfView }; } } @@ -626,15 +628,15 @@ void RenderableFov::computeIntercepts(double time, const std::string& target, if (intercepts(tBound)) { const glm::vec3 icpt = interceptVector(tBound); _orthogonalPlane.data[indexForBounds(i) + m] = { - { icpt.x, icpt.y, icpt.z }, - RenderInformation::VertexColorTypeSquare + .position = { icpt.x, icpt.y, icpt.z }, + .color = RenderInformation::VertexColorTypeSquare }; } else { const glm::vec3 o = orthogonalProjection(tBound, time, target); _orthogonalPlane.data[indexForBounds(i) + m] = { - { o.x, o.y, o.z }, - RenderInformation::VertexColorTypeSquare + .position = { o.x, o.y, o.z }, + .color = RenderInformation::VertexColorTypeSquare }; } } diff --git a/modules/spacecraftinstruments/rendering/renderablefov.h b/modules/spacecraftinstruments/rendering/renderablefov.h index d2c2641439..92a45ce93d 100644 --- a/modules/spacecraftinstruments/rendering/renderablefov.h +++ b/modules/spacecraftinstruments/rendering/renderablefov.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 132d3d491b..7c71dbf15e 100644 --- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a198986d98..9b6cca43d8 100644 --- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.h +++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b585b70fbf..bf6f4c41a0 100644 --- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 0bf56b9d3d..29151709e0 100644 --- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.h +++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c2e725a3f2..bd4730c157 100644 --- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -256,15 +256,6 @@ RenderablePlanetProjection::RenderablePlanetProjection(const ghoul::Dictionary& _meridianShift = p.meridianShift.value_or(_meridianShift); addProperty(_meridianShift); - // @TODO (abock, 2021-03-26) Poking into the Geometry dictionary is not really - // optimal as we don't have local control over how the dictionary is checked. We - // should instead ask the geometry whether it has a radius or not - double radius = std::pow(10.0, 9.0); - if (dict.hasValue(KeyRadius)) { - radius = dict.value(KeyRadius); - } - setBoundingSphere(radius); - addPropertySubOwner(_projectionComponent); _heightExaggeration.setExponent(3.f); @@ -291,6 +282,7 @@ RenderablePlanetProjection::RenderablePlanetProjection(const ghoul::Dictionary& else { _radius = std::get(p.radius); } + setBoundingSphere(glm::compMax(_radius.value())); _radius.onChange([&]() { createSphere(); }); addProperty(_radius); diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.h b/modules/spacecraftinstruments/rendering/renderableplanetprojection.h index 0f753e717a..2bddb411f7 100644 --- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.h +++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 85f402cb96..8e0fa9172e 100644 --- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp +++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a82d47f555..cbf213459c 100644 --- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h +++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 d9cd7f7533..817d704ff1 100644 --- a/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl +++ b/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 391cabce9a..eec19f6a6e 100644 --- a/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl +++ b/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/dilation_fs.glsl b/modules/spacecraftinstruments/shaders/dilation_fs.glsl index 14cb0df2d0..14fcf82072 100644 --- a/modules/spacecraftinstruments/shaders/dilation_fs.glsl +++ b/modules/spacecraftinstruments/shaders/dilation_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/dilation_vs.glsl b/modules/spacecraftinstruments/shaders/dilation_vs.glsl index 5b3d8eeabf..c4e6dd6d3e 100644 --- a/modules/spacecraftinstruments/shaders/dilation_vs.glsl +++ b/modules/spacecraftinstruments/shaders/dilation_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 4c47ff1f1e..b3c76b86e2 100644 --- a/modules/spacecraftinstruments/shaders/fov_fs.glsl +++ b/modules/spacecraftinstruments/shaders/fov_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 9b7e39d3a3..04d8a47d0d 100644 --- a/modules/spacecraftinstruments/shaders/fov_vs.glsl +++ b/modules/spacecraftinstruments/shaders/fov_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderableModelDepth_fs.glsl b/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl index 16ea6b2b51..a38705de61 100644 --- a/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl +++ b/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderableModelDepth_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl index be42008d77..9855e78f59 100644 --- a/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl +++ b/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c3906a826a..b4b25ae41f 100644 --- a/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl +++ b/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 caaede2268..80a91fac74 100644 --- a/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl +++ b/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 ac7bba04be..2a9fd56ccc 100644 --- a/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl +++ b/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 49ea0c1e7b..dcf4cf3b7a 100644 --- a/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl +++ b/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 6546722a47..f323bdffb0 100644 --- a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl +++ b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c951657ed3..58094ded29 100644 --- a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl +++ b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 0e18a52608..427fc76688 100644 --- a/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl +++ b/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 caa67dd1bb..d9322c8be7 100644 --- a/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl +++ b/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 3d065f0043..1d8c0cc01d 100644 --- a/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl +++ b/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f06681acaf..fc3f0b5af1 100644 --- a/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl +++ b/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 416ee90a51..d0fb479773 100644 --- a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp +++ b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 56a1671d1e..ee6ec081b5 100644 --- a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h +++ b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 839c25a00a..ffb1e5c502 100644 --- a/modules/spacecraftinstruments/util/decoder.cpp +++ b/modules/spacecraftinstruments/util/decoder.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f76d1b554c..025e2767b1 100644 --- a/modules/spacecraftinstruments/util/decoder.h +++ b/modules/spacecraftinstruments/util/decoder.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 4de6d289c0..f895523c67 100644 --- a/modules/spacecraftinstruments/util/hongkangparser.cpp +++ b/modules/spacecraftinstruments/util/hongkangparser.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -197,12 +197,12 @@ bool HongKangParser::create() { // fill image Image image = { - TimeRange(time, time + Exposure), - _defaultCaptureImage.string(), - std::move(cameraSpiceID), - cameraTarget, - true, - false + .timeRange = TimeRange(time, time + Exposure), + .path = _defaultCaptureImage.string(), + .activeInstruments = std::move(cameraSpiceID), + .target = cameraTarget, + .isPlaceholder = true, + .projected = false }; // IFF spacecraft has decided to switch target, store in target @@ -239,18 +239,18 @@ bool HongKangParser::create() { ); std::string scannerTarget = findPlaybookSpecifiedTarget(line); - TimeRange scanRange = { scanStart, scanStop }; + TimeRange scanRange = TimeRange(scanStart, scanStop); ghoul_assert(scanRange.isDefined(), "Invalid time range"); _instrumentTimes.emplace_back(it->first, scanRange); // store individual image Image image = { - scanRange, - _defaultCaptureImage.string(), - it->second->translations(), - cameraTarget, - true, - false + .timeRange = scanRange, + .path = _defaultCaptureImage.string(), + .activeInstruments = it->second->translations(), + .target = cameraTarget, + .isPlaceholder = true, + .projected = false }; _subsetMap[scannerTarget]._subset.push_back(std::move(image)); _subsetMap[scannerTarget]._range.include(scanStart); @@ -265,7 +265,7 @@ bool HongKangParser::create() { // we have reached the end of a scan or consecutive capture sequence if (captureStart != -1) { // end of capture sequence for camera, store end time of this sequence - TimeRange cameraRange = { captureStart, time }; + TimeRange cameraRange = TimeRange(captureStart, time); ghoul_assert(cameraRange.isDefined(), "Invalid time range"); _instrumentTimes.emplace_back(previousCamera, cameraRange); captureStart = -1; diff --git a/modules/spacecraftinstruments/util/hongkangparser.h b/modules/spacecraftinstruments/util/hongkangparser.h index 48c42b4cd1..b56819edb6 100644 --- a/modules/spacecraftinstruments/util/hongkangparser.h +++ b/modules/spacecraftinstruments/util/hongkangparser.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 256ae246d0..d672fc6909 100644 --- a/modules/spacecraftinstruments/util/image.h +++ b/modules/spacecraftinstruments/util/image.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 1c5cc6c91f..456bd89446 100644 --- a/modules/spacecraftinstruments/util/imagesequencer.cpp +++ b/modules/spacecraftinstruments/util/imagesequencer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 9883d18e23..e0711fff43 100644 --- a/modules/spacecraftinstruments/util/imagesequencer.h +++ b/modules/spacecraftinstruments/util/imagesequencer.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 d04cbd45c0..a06ab2fe11 100644 --- a/modules/spacecraftinstruments/util/instrumentdecoder.cpp +++ b/modules/spacecraftinstruments/util/instrumentdecoder.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 97ff2de93e..b35037b857 100644 --- a/modules/spacecraftinstruments/util/instrumentdecoder.h +++ b/modules/spacecraftinstruments/util/instrumentdecoder.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c3cef5b11a..eb3395aaa7 100644 --- a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp +++ b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -127,12 +127,12 @@ bool InstrumentTimesParser::create() { _captureProgression.push_back(tr.start); Image image = { - tr, - std::string(), - { instrumentID }, - _target, - true, - false + .timeRange = tr, + .path = std::string(), + .activeInstruments = { instrumentID }, + .target = _target, + .isPlaceholder = true, + .projected = false }; _subsetMap[_target]._subset.push_back(std::move(image)); } diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.h b/modules/spacecraftinstruments/util/instrumenttimesparser.h index c03748e2c5..91ba06bb75 100644 --- a/modules/spacecraftinstruments/util/instrumenttimesparser.h +++ b/modules/spacecraftinstruments/util/instrumenttimesparser.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 da81930710..68a0cbc75f 100644 --- a/modules/spacecraftinstruments/util/labelparser.cpp +++ b/modules/spacecraftinstruments/util/labelparser.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -58,13 +58,10 @@ LabelParser::LabelParser(std::string fileName, const ghoul::Dictionary& dictiona if (decoderStr == "Instrument") { // for each playbook call -> create a Decoder object for (std::string_view key : typeDict.keys()) { - std::string currentKey = fmt::format("{}.{}", decoderStr, key); - - if (!dictionary.hasValue(currentKey)) { + if (!typeDict.hasValue(key)) { continue; } - ghoul::Dictionary decoderDict = - dictionary.value(currentKey); + ghoul::Dictionary decoderDict = typeDict.value(key); std::unique_ptr decoder = Decoder::createFromDictionary( decoderDict, @@ -274,12 +271,12 @@ bool LabelParser::create() { spiceInstrument.push_back(_instrumentID); Image image = { - TimeRange(startTime, stopTime), - imagePath, - spiceInstrument, - _target, - false, - false + .timeRange = TimeRange(startTime, stopTime), + .path = imagePath, + .activeInstruments = spiceInstrument, + .target = _target, + .isPlaceholder = false, + .projected = false }; _subsetMap[image.target]._subset.push_back(image); diff --git a/modules/spacecraftinstruments/util/labelparser.h b/modules/spacecraftinstruments/util/labelparser.h index f03f7c06ff..11cdd89bbc 100644 --- a/modules/spacecraftinstruments/util/labelparser.h +++ b/modules/spacecraftinstruments/util/labelparser.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 0a7887312d..0ead926521 100644 --- a/modules/spacecraftinstruments/util/projectioncomponent.cpp +++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 75c279204b..84f49170f7 100644 --- a/modules/spacecraftinstruments/util/projectioncomponent.h +++ b/modules/spacecraftinstruments/util/projectioncomponent.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b3edf4bf35..16dc0e8b6a 100644 --- a/modules/spacecraftinstruments/util/scannerdecoder.cpp +++ b/modules/spacecraftinstruments/util/scannerdecoder.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 341f6084ca..ec646005ab 100644 --- a/modules/spacecraftinstruments/util/scannerdecoder.h +++ b/modules/spacecraftinstruments/util/scannerdecoder.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 ba8874fea9..42a3055b5d 100644 --- a/modules/spacecraftinstruments/util/sequenceparser.cpp +++ b/modules/spacecraftinstruments/util/sequenceparser.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 3f3c686122..4a33dda71a 100644 --- a/modules/spacecraftinstruments/util/sequenceparser.h +++ b/modules/spacecraftinstruments/util/sequenceparser.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c6a142e882..cd45b2d64b 100644 --- a/modules/spacecraftinstruments/util/targetdecoder.cpp +++ b/modules/spacecraftinstruments/util/targetdecoder.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 75b6ab301f..73d87f117b 100644 --- a/modules/spacecraftinstruments/util/targetdecoder.h +++ b/modules/spacecraftinstruments/util/targetdecoder.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e603a0fc57..8874b449a4 100644 --- a/modules/spout/CMakeLists.txt +++ b/modules/spout/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/spout/renderableplanespout.cpp index e823dd6070..0f747e2b46 100644 --- a/modules/spout/renderableplanespout.cpp +++ b/modules/spout/renderableplanespout.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 0c4e6d2ae9..aae38380d9 100644 --- a/modules/spout/renderableplanespout.h +++ b/modules/spout/renderableplanespout.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderablespherespout.cpp b/modules/spout/renderablespherespout.cpp index 827f3c1a16..b956c9428e 100644 --- a/modules/spout/renderablespherespout.cpp +++ b/modules/spout/renderablespherespout.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/renderablespherespout.h b/modules/spout/renderablespherespout.h index 18c16b2412..0b7f837172 100644 --- a/modules/spout/renderablespherespout.h +++ b/modules/spout/renderablespherespout.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 142adc157a..83f6993a1b 100644 --- a/modules/spout/screenspacespout.cpp +++ b/modules/spout/screenspacespout.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 967f667fc9..0c4fcd9c7a 100644 --- a/modules/spout/screenspacespout.h +++ b/modules/spout/screenspacespout.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 97e5c78153..a676969823 100644 --- a/modules/spout/spoutlibrary.h +++ b/modules/spout/spoutlibrary.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 55ece03384..2334b95412 100644 --- a/modules/spout/spoutmodule.cpp +++ b/modules/spout/spoutmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cf576f2347..38212ba270 100644 --- a/modules/spout/spoutmodule.h +++ b/modules/spout/spoutmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/spoutwrapper.cpp b/modules/spout/spoutwrapper.cpp index d4586cba73..e45a1efbf8 100644 --- a/modules/spout/spoutwrapper.cpp +++ b/modules/spout/spoutwrapper.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/spoutwrapper.h b/modules/spout/spoutwrapper.h index db315cccd3..d2e3611430 100644 --- a/modules/spout/spoutwrapper.h +++ b/modules/spout/spoutwrapper.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/statemachine/CMakeLists.txt b/modules/statemachine/CMakeLists.txt index 5af6de1297..36c3ea6b87 100644 --- a/modules/statemachine/CMakeLists.txt +++ b/modules/statemachine/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, to any person obtaining a copy of this # # software and associated documentation files (the "Software"), to deal in the Software # diff --git a/modules/statemachine/include/state.h b/modules/statemachine/include/state.h index b9feda7227..1d1e57501c 100644 --- a/modules/statemachine/include/state.h +++ b/modules/statemachine/include/state.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/statemachine/include/statemachine.h b/modules/statemachine/include/statemachine.h index fd6bbc1ab4..b78e36bf84 100644 --- a/modules/statemachine/include/statemachine.h +++ b/modules/statemachine/include/statemachine.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/statemachine/include/transition.h b/modules/statemachine/include/transition.h index 41bd34b587..36c77e324e 100644 --- a/modules/statemachine/include/transition.h +++ b/modules/statemachine/include/transition.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/statemachine/src/state.cpp b/modules/statemachine/src/state.cpp index 13a8c8db6c..019646f4cc 100644 --- a/modules/statemachine/src/state.cpp +++ b/modules/statemachine/src/state.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/statemachine/src/statemachine.cpp b/modules/statemachine/src/statemachine.cpp index e563d9a6c5..ce2f361d80 100644 --- a/modules/statemachine/src/statemachine.cpp +++ b/modules/statemachine/src/statemachine.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/statemachine/src/transition.cpp b/modules/statemachine/src/transition.cpp index ebd90f63c2..247529a6fe 100644 --- a/modules/statemachine/src/transition.cpp +++ b/modules/statemachine/src/transition.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/statemachine/statemachinemodule.cpp b/modules/statemachine/statemachinemodule.cpp index 898afbef23..dfda04c8ee 100644 --- a/modules/statemachine/statemachinemodule.cpp +++ b/modules/statemachine/statemachinemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/statemachine/statemachinemodule.h b/modules/statemachine/statemachinemodule.h index 5b726e1c8b..08b9359647 100644 --- a/modules/statemachine/statemachinemodule.h +++ b/modules/statemachine/statemachinemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/statemachine/statemachinemodule_lua.inl b/modules/statemachine/statemachinemodule_lua.inl index 555a47f237..a55d7e83bc 100644 --- a/modules/statemachine/statemachinemodule_lua.inl +++ b/modules/statemachine/statemachinemodule_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 97c204f6ea..c3341a2057 100644 --- a/modules/sync/CMakeLists.txt +++ b/modules/sync/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/sync/syncmodule.cpp index c943b7cc18..a787e7006c 100644 --- a/modules/sync/syncmodule.cpp +++ b/modules/sync/syncmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 d1e8be0bad..202a716276 100644 --- a/modules/sync/syncmodule.h +++ b/modules/sync/syncmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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_lua.inl b/modules/sync/syncmodule_lua.inl index 1fe260aad4..16eb23605e 100644 --- a/modules/sync/syncmodule_lua.inl +++ b/modules/sync/syncmodule_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8be62ba27d..49065125c1 100644 --- a/modules/sync/syncs/httpsynchronization.cpp +++ b/modules/sync/syncs/httpsynchronization.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -42,6 +43,16 @@ namespace { // The version of this resource that should be requested int version; + + // Determines whether .zip files that are downloaded should automatically be + // unzipped. If this value is not specified, no unzipping is performed + std::optional unzipFiles; + + // The destination for the unzipping. If this value is specified, all zip files + // contained in the synchronization will be unzipped into the same specified + // folder. If this value is specified, but 'unzipFiles' is false, no extaction + // will be performed + std::optional unzipFilesDestination; }; #include "httpsynchronization_codegen.cpp" } // namespace @@ -63,6 +74,10 @@ HttpSynchronization::HttpSynchronization(const ghoul::Dictionary& dict, _identifier = p.identifier; _version = p.version; + _unzipFiles = p.unzipFiles.value_or(_unzipFiles); + if (p.unzipFilesDestination.has_value()) { + _unzipFilesDestination = *p.unzipFilesDestination; + } } HttpSynchronization::~HttpSynchronization() { @@ -233,6 +248,33 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) { LERROR(fmt::format("Error renaming {} to {}", tempName, originalName)); failed = true; } + + if (_unzipFiles && originalName.extension() == ".zip") { + std::string source = originalName.string(); + std::string dest = + _unzipFilesDestination.has_value() ? + (originalName.parent_path() / *_unzipFilesDestination).string() : + originalName.replace_extension().string();; + + struct zip_t* z = zip_open(source.c_str(), 0, 'r'); + const bool is64 = zip_is64(z); + zip_close(z); + + if (is64) { + LERROR(fmt::format( + "Error while unzipping {}: Zip64 archives are not supported", source + )); + continue; + } + + int ret = zip_extract(source.c_str(), dest.c_str(), nullptr, nullptr); + if (ret != 0) { + LERROR(fmt::format("Error {} while unzipping {}", ret, source)); + continue; + } + + std::filesystem::remove(source); + } } if (failed) { for (const std::unique_ptr& d : downloads) { diff --git a/modules/sync/syncs/httpsynchronization.h b/modules/sync/syncs/httpsynchronization.h index 513868064a..75d10f8f2b 100644 --- a/modules/sync/syncs/httpsynchronization.h +++ b/modules/sync/syncs/httpsynchronization.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -28,6 +28,7 @@ #include #include +#include #include namespace openspace { @@ -101,6 +102,9 @@ private: /// The file version for the requested files int _version = -1; + bool _unzipFiles = false; + std::optional _unzipFilesDestination = std::nullopt; + // The list of all repositories that we'll try to sync from const std::vector _syncRepositories; diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp index 288d528273..d481d1ae2f 100644 --- a/modules/sync/syncs/urlsynchronization.cpp +++ b/modules/sync/syncs/urlsynchronization.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -146,7 +146,13 @@ void UrlSynchronization::start() { for (const std::string& url : _urls) { if (_filename.empty() || _urls.size() > 1) { - std::string name = std::filesystem::path(url).filename().string(); + std::filesystem::path fn = std::filesystem::path(url).filename(); + if (fn.empty() && url.back() == '/') { + // If the user provided a path that ends in / the `filename` will + // result in an empty path with causes the downloading to fail + fn = std::filesystem::path(url).parent_path().filename(); + } + std::string name = fn.string(); // We can not create filenames with question marks name.erase(std::remove(name.begin(), name.end(), '?'), name.end()); diff --git a/modules/sync/syncs/urlsynchronization.h b/modules/sync/syncs/urlsynchronization.h index f7be555d9a..183b7d6600 100644 --- a/modules/sync/syncs/urlsynchronization.h +++ b/modules/sync/syncs/urlsynchronization.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 d8c5f196c2..0c0d8dca37 100644 --- a/modules/touch/CMakeLists.txt +++ b/modules/touch/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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/ext/CMakeLists.txt b/modules/touch/ext/CMakeLists.txt index b6d3927102..4013ffb0c8 100644 --- a/modules/touch/ext/CMakeLists.txt +++ b/modules/touch/ext/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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/directinputsolver.h b/modules/touch/include/directinputsolver.h index 5c878147ee..062f2d9561 100644 --- a/modules/touch/include/directinputsolver.h +++ b/modules/touch/include/directinputsolver.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/touchinteraction.h b/modules/touch/include/touchinteraction.h index fafdb64a77..b492bbb5d6 100644 --- a/modules/touch/include/touchinteraction.h +++ b/modules/touch/include/touchinteraction.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -67,9 +68,16 @@ public: TouchInteraction(); // for interpretInteraction() - enum Type { ROT = 0, PINCH, PAN, ROLL, PICK, ZOOM_OUT }; + enum Type { + ROTATION = 0, + PINCH, + PAN, + ROLL, + PICK, + ZOOM_OUT + }; - // Stores the velocity in all 6DOF + // Stores the velocity in all 6 DOF struct VelocityStates { glm::dvec2 orbit = glm::dvec2(0.0); double zoom = 0.0; @@ -146,7 +154,7 @@ private: void decelerate(double dt); // Resets all properties that can be changed in the GUI to default - void resetToDefault(); + void resetPropertiesToDefault(); Camera* _camera = nullptr; @@ -156,7 +164,7 @@ private: properties::BoolProperty _touchActive; properties::BoolProperty _disableZoom; properties::BoolProperty _disableRoll; - properties::BoolProperty _reset; + properties::TriggerProperty _reset; properties::IntProperty _maxTapTime; properties::IntProperty _deceleratesPerSecond; properties::FloatProperty _touchScreenSize; @@ -194,7 +202,7 @@ private: int pinchConsecCt = 0; double pinchConsecZoomFactor = 0; - //int stepVelUpdate = 0; + int stepVelUpdate = 0; #endif std::array _pinchInputs; // Class variables diff --git a/modules/touch/include/touchmarker.h b/modules/touch/include/touchmarker.h index d8232c9370..3880e1300a 100644 --- a/modules/touch/include/touchmarker.h +++ b/modules/touch/include/touchmarker.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 aed2f9f663..55ec2d5b15 100644 --- a/modules/touch/include/tuioear.h +++ b/modules/touch/include/tuioear.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/win32_touch.h b/modules/touch/include/win32_touch.h index ff5e322381..1e85f2067b 100644 --- a/modules/touch/include/win32_touch.h +++ b/modules/touch/include/win32_touch.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a2472a4404..3815eb1b7d 100644 --- a/modules/touch/shaders/marker_fs.glsl +++ b/modules/touch/shaders/marker_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 724d5fc3cc..61af79aa0c 100644 --- a/modules/touch/shaders/marker_vs.glsl +++ b/modules/touch/shaders/marker_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/directinputsolver.cpp b/modules/touch/src/directinputsolver.cpp index decc50cbde..b0665ce5da 100644 --- a/modules/touch/src/directinputsolver.cpp +++ b/modules/touch/src/directinputsolver.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -229,12 +229,12 @@ bool DirectInputSolver::solve(const std::vector& list, } FunctionData fData = { - selectedPoints, - screenPoints, - _nDof, - &camera, - selectedBodies.at(0).node, - _lmstat + .selectedPoints = selectedPoints, + .screenPoints = screenPoints, + .nDOF = _nDof, + .camera = &camera, + .node = selectedBodies.at(0).node, + .stats = _lmstat }; void* dataPtr = reinterpret_cast(&fData); diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp index 4607618909..dcce4ae840 100644 --- a/modules/touch/src/touchinteraction.cpp +++ b/modules/touch/src/touchinteraction.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -77,7 +77,10 @@ namespace { constexpr openspace::properties::Property::PropertyInfo UnitTestInfo = { "UnitTest", "Take a unit test saving the LM data into file", - "" // @TODO Missing documentation + "LM - least-squares minimization using Levenberg-Marquardt algorithm." + "Used to find a new camera state from touch points when doing direct " + "manipulation", + openspace::properties::Property::Visibility::Developer }; constexpr openspace::properties::Property::PropertyInfo DisableZoomInfo = { @@ -243,7 +246,7 @@ namespace { "Zoom In Limit", "The minimum distance from the anchor that you are allowed to navigate to. " "Its purpose is to limit zooming in on a node. If this value is not set it " - "defaults to the surface of the current anchor. " + "defaults to the surface of the current anchor." }; // Compute coefficient of decay based on current frametime; if frametime has been @@ -268,16 +271,16 @@ TouchInteraction::TouchInteraction() , _touchActive(EventsInfo, false) , _disableZoom(DisableZoomInfo, false) , _disableRoll(DisableRollInfo, false) - , _reset(SetDefaultInfo, false) + , _reset(SetDefaultInfo) , _maxTapTime(MaxTapTimeInfo, 300, 10, 1000) , _deceleratesPerSecond(DecelatesPerSecondInfo, 240, 60, 300) , _touchScreenSize(TouchScreenSizeInfo, 55.0f, 5.5f, 150.0f) - , _tapZoomFactor(TapZoomFactorInfo, 0.2f, 0.f, 0.5f) + , _tapZoomFactor(TapZoomFactorInfo, 0.2f, 0.f, 0.5f, 0.01f) , _pinchZoomFactor(PinchZoomFactorInfo, 0.01f, 0.f, 0.2f) , _nodeRadiusThreshold(DirectManipulationInfo, 0.2f, 0.0f, 1.0f) - , _rollAngleThreshold(RollThresholdInfo, 0.025f, 0.f, 0.05f) - , _orbitSpeedThreshold(OrbitSpinningThreshold, 0.005f, 0.f, 0.01f) - , _spinSensitivity(SpinningSensitivityInfo, 0.25f, 0.f, 2.f) + , _rollAngleThreshold(RollThresholdInfo, 0.025f, 0.f, 0.05f, 0.001f) + , _orbitSpeedThreshold(OrbitSpinningThreshold, 0.005f, 0.f, 0.01f, 0.0001f) + , _spinSensitivity(SpinningSensitivityInfo, 0.25f, 0.f, 2.f, 0.01f) , _zoomSensitivityExponential(ZoomSensitivityExpInfo, 1.03f, 1.0f, 1.1f) , _zoomSensitivityProportionalDist(ZoomSensitivityPropInfo, 11.f, 5.f, 50.f) , _zoomSensitivityDistanceThreshold( @@ -286,7 +289,7 @@ TouchInteraction::TouchInteraction() 0.01f, 0.25f ) - , _zoomBoundarySphereMultiplier(ZoomBoundarySphereMultiplierInfo, 1.001f, 1.f, 1.01f) + , _zoomBoundarySphereMultiplier(ZoomBoundarySphereMultiplierInfo, 1.001f, 0.01f, 10000.0f) , _zoomInLimit(ZoomInLimitInfo, -1.0, 0.0, std::numeric_limits::max()) , _zoomOutLimit( ZoomOutLimitInfo, @@ -294,15 +297,15 @@ TouchInteraction::TouchInteraction() 1000.0, std::numeric_limits::max() ) - , _inputStillThreshold(InputSensitivityInfo, 0.0005f, 0.f, 0.001f) + , _inputStillThreshold(InputSensitivityInfo, 0.0005f, 0.f, 0.001f, 0.0001f) // used to void wrongly interpreted roll interactions - , _centroidStillThreshold(StationaryCentroidInfo, 0.0018f, 0.f, 0.01f) + , _centroidStillThreshold(StationaryCentroidInfo, 0.0018f, 0.f, 0.01f, 0.0001f) , _panEnabled(PanModeInfo, false) , _interpretPan(PanDeltaDistanceInfo, 0.015f, 0.f, 0.1f) , _slerpTime(SlerpTimeInfo, 3.f, 0.1f, 5.f) , _friction( FrictionInfo, - glm::vec4(0.025f, 0.025f, 0.02f, 0.02f), + glm::vec4(0.025f, 0.025f, 0.02f, 0.001f), glm::vec4(0.f), glm::vec4(0.2f) ) @@ -366,6 +369,10 @@ TouchInteraction::TouchInteraction() _time = std::chrono::duration_cast( std::chrono::high_resolution_clock::now().time_since_epoch() ); + + _reset.onChange([&]() { + resetPropertiesToDefault(); + }); } void TouchInteraction::updateStateFromInput(const std::vector& list, @@ -389,6 +396,7 @@ void TouchInteraction::updateStateFromInput(const std::vector& high_resolution_clock::now().time_since_epoch() ); if ((timestamp - _time).count() < _maxTapTime) { + LINFO("Double tap!"); _doubleTap = true; _tap = false; } @@ -466,7 +474,7 @@ void TouchInteraction::directControl(const std::vector& list) LINFO("DirectControl"); #endif - // finds best transform values for the new camera state and stores them in par + // Find best transform values for the new camera state and store them in par std::vector par(6, 0.0); par[0] = _lastVel.orbit.x; // use _lastVel for orbit par[1] = _lastVel.orbit.y; @@ -474,7 +482,7 @@ void TouchInteraction::directControl(const std::vector& list) int nDof = _solver.nDof(); if (_lmSuccess && !_unitTest) { - // if good values were found set new camera state + // If good values were found set new camera state _vel.orbit = glm::dvec2(par.at(0), par.at(1)); if (nDof > 2) { if (!_disableZoom) { @@ -499,15 +507,18 @@ void TouchInteraction::directControl(const std::vector& list) } else { // prevents touch to infinitely be active (due to windows bridge case where event - // doesnt get consumed sometimes when LMA fails to converge) + // doesn't get consumed sometimes when LMA fails to converge) resetAfterInput(); } } void TouchInteraction::findSelectedNode(const std::vector& list) { // trim list to only contain visible nodes that make sense - std::string selectables[30] = { - "Sun", "Mercury", "Venus", "Earth", "Mars", "Jupiter", "Saturn", "Uranus", + // @TODO (emmbr 2023-01-31) This hardcoded list should be removed and replaced by something + // else. Either a type of renderable that can always be directly manipulated, or a list + // that can be set in config/assets. Or both? + std::string selectables[31] = { + "Sun", "Mercury", "Venus", "Earth", "Mars", "Ceres", "Jupiter", "Saturn", "Uranus", "Neptune", "Pluto", "Moon", "Titan", "Rhea", "Mimas", "Iapetus", "Enceladus", "Dione", "Io", "Ganymede", "Europa", "Callisto", "NewHorizons", "Styx", "Nix", "Kerberos", "Hydra", "Charon", "Tethys", "OsirisRex", "Bennu" @@ -591,7 +602,7 @@ void TouchInteraction::findSelectedNode(const std::vector& lis const bool isVisibleX = (ndc.x >= -1.0 && ndc.x <= 1.0); const bool isVisibleY = (ndc.y >= -1.0 && ndc.y <= 1.0); if (isVisibleX && isVisibleY) { - glm::dvec2 cursor = { xCo, yCo }; + glm::dvec2 cursor = glm::dvec2(xCo, yCo); const double ndcDist = glm::length(ndc - cursor); // We either want to select the object if it's bounding sphere as been @@ -607,10 +618,10 @@ void TouchInteraction::findSelectedNode(const std::vector& lis "Picking candidate based on direct touch" ); #endif //#ifdef TOUCH_DEBUG_NODE_PICK_MESSAGES - currentlyPicked = { + currentlyPicked = std::pair( node, -std::numeric_limits::max() - }; + ); } else if (ndcDist <= _pickingRadiusMinimum) { // The node was considered due to minimum picking distance radius @@ -644,7 +655,7 @@ int TouchInteraction::interpretInteraction(const std::vector& const std::vector& lastProcessed) { glm::fvec2 lastCentroid = _centroid; - _centroid = { 0.f, 0.f }; + _centroid = glm::vec2(0.f, 0.f); for (const TouchInputHolder& inputHolder : list) { _centroid += glm::vec2( inputHolder.latestInput().x, @@ -672,7 +683,7 @@ int TouchInteraction::interpretInteraction(const std::vector& distInput = p; } // find the slowest moving finger - used in roll interpretation - double minDiff = 1000; + double minDiff = 1000.0; for (const TouchInputHolder& inputHolder : list) { const auto it = std::find_if( lastProcessed.cbegin(), @@ -707,12 +718,14 @@ int TouchInteraction::interpretInteraction(const std::vector& lastProcessed.end(), [&inputHolder](const TouchInput& input) { return inputHolder.holdsInput(input); - }); - double res = 0.0; + } + ); + double res = 0.0; float lastAngle = lastPoint.angleToPos(_centroid.x, _centroid.y); float currentAngle = inputHolder.latestInput().angleToPos(_centroid.x, _centroid.y); + if (lastAngle > currentAngle + 1.5 * glm::pi()) { res = currentAngle + (2.0 * glm::pi() - lastAngle); } @@ -722,6 +735,7 @@ int TouchInteraction::interpretInteraction(const std::vector& else { res = currentAngle - lastAngle; } + if (std::abs(res) < _rollAngleThreshold) { return 1000.0; } @@ -735,6 +749,7 @@ int TouchInteraction::interpretInteraction(const std::vector& _centroid, lastCentroid ) / list.size(); + #ifdef TOUCH_DEBUG_PROPERTIES _debugProperties.normalizedCentroidDistance = normalizedCentroidDistance; _debugProperties.rollOn = rollOn; @@ -748,7 +763,7 @@ int TouchInteraction::interpretInteraction(const std::vector& return PICK; } else if (list.size() == 1) { - return ROT; + return ROTATION; } else { float avgDistance = static_cast(std::abs(dist - lastDist)); @@ -787,13 +802,14 @@ void TouchInteraction::computeVelocities(const std::vector& li const int action = interpretInteraction(list, lastProcessed); const SceneGraphNode* anchor = global::navigationHandler->orbitalNavigator().anchorNode(); + if (!anchor) { return; } #ifdef TOUCH_DEBUG_PROPERTIES const std::map interactionNames = { - { ROT, "Rotation" }, + { ROTATION, "Rotation" }, { PINCH, "Pinch" }, { PAN, "Pan" }, { ROLL, "Roll" }, @@ -819,7 +835,7 @@ void TouchInteraction::computeVelocities(const std::vector& li const float aspectRatio = static_cast(windowSize.x) / static_cast(windowSize.y); switch (action) { - case ROT: { // add rotation velocity + case ROTATION: { // add rotation velocity _vel.orbit += glm::dvec2(inputHolder.speedX() * _sensitivity.orbit.x, inputHolder.speedY() * _sensitivity.orbit.y); @@ -1015,7 +1031,7 @@ void TouchInteraction::step(double dt, bool directTouch) { // rotations // To avoid problem with lookup in up direction const dmat4 lookAtMat = lookAt( - dvec3(0, 0, 0), + dvec3(0.0, 0.0, 0.0), directionToCenter, normalize(camDirection + lookUp) ); @@ -1034,7 +1050,7 @@ void TouchInteraction::step(double dt, bool directTouch) { } { // Panning (local rotation) - const dvec3 eulerAngles(_vel.pan.y * dt, _vel.pan.x * dt, 0); + const dvec3 eulerAngles(_vel.pan.y * dt, _vel.pan.x * dt, 0.0); const dquat rotationDiff = dquat(eulerAngles); localCamRot = localCamRot * rotationDiff; @@ -1046,7 +1062,7 @@ void TouchInteraction::step(double dt, bool directTouch) { } { // Orbit (global rotation) - const dvec3 eulerAngles(_vel.orbit.y * dt, _vel.orbit.x * dt, 0); + const dvec3 eulerAngles(_vel.orbit.y * dt, _vel.orbit.x * dt, 0.0); const dquat rotationDiffCamSpace = dquat(eulerAngles); const dquat rotationDiffWorldSpace = globalCamRot * rotationDiffCamSpace * @@ -1059,8 +1075,9 @@ void TouchInteraction::step(double dt, bool directTouch) { directionToCenter = normalize(-centerToCam); const dvec3 lookUpWhenFacingCenter = globalCamRot * dvec3(_camera->lookUpVectorCameraSpace()); + const dmat4 lookAtMatrix = lookAt( - dvec3(0, 0, 0), + dvec3(0.0, 0.0, 0.0), directionToCenter, lookUpWhenFacingCenter); globalCamRot = normalize(quat_cast(inverse(lookAtMatrix))); @@ -1105,7 +1122,7 @@ void TouchInteraction::step(double dt, bool directTouch) { } const double currentPosDistance = length(centerToCamera); - //Apply the velocity to update camera position + // Apply the velocity to update camera position double zoomVelocity = _vel.zoom; if (!directTouch) { const double distanceFromSurface = @@ -1168,6 +1185,9 @@ void TouchInteraction::step(double dt, bool directTouch) { _camera->setPositionVec3(camPos); _camera->setRotation(globalCamRot * localCamRot); + // Mark that a camera interaction happened + global::navigationHandler->orbitalNavigator().updateOnCameraInteraction(); + #ifdef TOUCH_DEBUG_PROPERTIES //Show velocity status every N frames if (++stepVelUpdate >= 60) { @@ -1183,9 +1203,6 @@ void TouchInteraction::step(double dt, bool directTouch) { _tap = false; _doubleTap = false; _zoomOutTap = false; - if (_reset) { - resetToDefault(); - } } } @@ -1252,11 +1269,10 @@ void TouchInteraction::resetAfterInput() { } // Reset all property values to default -void TouchInteraction::resetToDefault() { +void TouchInteraction::resetPropertiesToDefault() { _unitTest.set(false); _disableZoom.set(false); _disableRoll.set(false); - _reset.set(false); _maxTapTime.set(300); _deceleratesPerSecond.set(240); _touchScreenSize.set(55.0f); diff --git a/modules/touch/src/touchmarker.cpp b/modules/touch/src/touchmarker.cpp index 22fe8ff506..e6401232e2 100644 --- a/modules/touch/src/touchmarker.cpp +++ b/modules/touch/src/touchmarker.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -62,7 +62,6 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "MarkerColor", "Marker color", "" // @TODO Missing documentation }; - } // namespace namespace openspace { diff --git a/modules/touch/src/tuioear.cpp b/modules/touch/src/tuioear.cpp index 1dae964149..ca36440c1a 100644 --- a/modules/touch/src/tuioear.cpp +++ b/modules/touch/src/tuioear.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/win32_touch.cpp b/modules/touch/src/win32_touch.cpp index c833f614d0..fc476265a2 100644 --- a/modules/touch/src/win32_touch.cpp +++ b/modules/touch/src/win32_touch.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e1b8742671..dfa9ada612 100644 --- a/modules/touch/touchmodule.cpp +++ b/modules/touch/touchmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -37,133 +37,13 @@ using namespace TUIO; namespace { constexpr openspace::properties::Property::PropertyInfo TouchActiveInfo = { "TouchActive", - "True if we want to use touch input as 3d navigation", + "True if we want to use touch input as 3D navigation", "Use this if we want to turn on or off Touch input navigation. " - "Disabling this will reset all current touch inputs to the navigation. " + "Disabling this will reset all current touch inputs to the navigation." }; } namespace openspace { -bool TouchModule::processNewInput() { - // Get new input from listener - std::vector earInputs = _ear->takeInput(); - std::vector earRemovals = _ear->takeRemovals(); - - for(const TouchInput& input : earInputs) { - updateOrAddTouchInput(input); - } - for(const TouchInput& removal : earRemovals) { - removeTouchInput(removal); - } - - // Set touch property to active (to void mouse input, mainly for mtdev bridges) - _touch.touchActive(!_touchPoints.empty()); - - if (!_touchPoints.empty()) { - global::interactionMonitor->markInteraction(); - } - - // Erase old input id's that no longer exists - _lastTouchInputs.erase( - std::remove_if( - _lastTouchInputs.begin(), - _lastTouchInputs.end(), - [this](const TouchInput& input) { - return !std::any_of( - _touchPoints.cbegin(), - _touchPoints.cend(), - [&input](const TouchInputHolder& holder) { - return holder.holdsInput(input); - } - ); - } - ), - _lastTouchInputs.end() - ); - - if (_tap) { - _touch.tap(); - _tap = false; - return true; - } - - // Return true if we got new input - if (_touchPoints.size() == _lastTouchInputs.size() && - !_touchPoints.empty()) - { - bool newInput = true; - // go through list and check if the last registrered time is newer than the one in - // lastProcessed (last frame) - std::for_each( - _lastTouchInputs.begin(), - _lastTouchInputs.end(), - [this, &newInput](TouchInput& input) { - std::vector::iterator holder = std::find_if( - _touchPoints.begin(), - _touchPoints.end(), - [&input](const TouchInputHolder& inputHolder) { - return inputHolder.holdsInput(input); - } - ); - if (!holder->isMoving()) { - newInput = true; - } - }); - return newInput; - } - else { - return false; - } -} - -void TouchModule::clearInputs() { - for (const TouchInput& input : _deferredRemovals) { - for (TouchInputHolder& inputHolder : _touchPoints) { - if (inputHolder.holdsInput(input)) { - inputHolder = std::move(_touchPoints.back()); - _touchPoints.pop_back(); - break; - } - } - } - _deferredRemovals.clear(); -} - -void TouchModule::addTouchInput(TouchInput input) { - _touchPoints.emplace_back(input); -} - -void TouchModule::updateOrAddTouchInput(TouchInput input) { - for (TouchInputHolder& inputHolder : _touchPoints) { - if (inputHolder.holdsInput(input)){ - inputHolder.tryAddInput(input); - return; - } - } - _touchPoints.emplace_back(input); -} - -void TouchModule::removeTouchInput(TouchInput input) { - _deferredRemovals.emplace_back(input); - //Check for "tap" gesture: - for (TouchInputHolder& inputHolder : _touchPoints) { - if (inputHolder.holdsInput(input)) { - inputHolder.tryAddInput(input); - const double totalTime = inputHolder.gestureTime(); - const float totalDistance = inputHolder.gestureDistance(); - //Magic values taken from tuioear.cpp: - const bool isWithinTapTime = totalTime < 0.18; - const bool wasStationary = totalDistance < 0.0004f; - if (isWithinTapTime && wasStationary && _touchPoints.size() == 1 && - _deferredRemovals.size() == 1) - { - _tap = true; - } - return; - } - } -} - TouchModule::TouchModule() : OpenSpaceModule("Touch") , _touchActive(TouchActiveInfo, true) @@ -253,4 +133,124 @@ void TouchModule::internalInitialize(const ghoul::Dictionary& /*dictionary*/){ }); } +bool TouchModule::processNewInput() { + // Get new input from listener + std::vector earInputs = _ear->takeInput(); + std::vector earRemovals = _ear->takeRemovals(); + + for (const TouchInput& input : earInputs) { + updateOrAddTouchInput(input); + } + for (const TouchInput& removal : earRemovals) { + removeTouchInput(removal); + } + + // Set touch property to active (to void mouse input, mainly for mtdev bridges) + _touch.touchActive(!_touchPoints.empty()); + + if (!_touchPoints.empty()) { + global::interactionMonitor->markInteraction(); + } + + // Erase old input id's that no longer exists + _lastTouchInputs.erase( + std::remove_if( + _lastTouchInputs.begin(), + _lastTouchInputs.end(), + [this](const TouchInput& input) { + return !std::any_of( + _touchPoints.cbegin(), + _touchPoints.cend(), + [&input](const TouchInputHolder& holder) { + return holder.holdsInput(input); + } + ); + } + ), + _lastTouchInputs.end() + ); + + if (_tap) { + _touch.tap(); + _tap = false; + return true; + } + + // Return true if we got new input + if (_touchPoints.size() == _lastTouchInputs.size() && + !_touchPoints.empty()) + { + bool newInput = true; + // go through list and check if the last registrered time is newer than the one in + // lastProcessed (last frame) + std::for_each( + _lastTouchInputs.begin(), + _lastTouchInputs.end(), + [this, &newInput](TouchInput& input) { + std::vector::iterator holder = std::find_if( + _touchPoints.begin(), + _touchPoints.end(), + [&input](const TouchInputHolder& inputHolder) { + return inputHolder.holdsInput(input); + } + ); + if (!holder->isMoving()) { + newInput = true; + } + }); + return newInput; + } + else { + return false; + } +} + +void TouchModule::clearInputs() { + for (const TouchInput& input : _deferredRemovals) { + for (TouchInputHolder& inputHolder : _touchPoints) { + if (inputHolder.holdsInput(input)) { + inputHolder = std::move(_touchPoints.back()); + _touchPoints.pop_back(); + break; + } + } + } + _deferredRemovals.clear(); +} + +void TouchModule::addTouchInput(TouchInput input) { + _touchPoints.emplace_back(input); +} + +void TouchModule::updateOrAddTouchInput(TouchInput input) { + for (TouchInputHolder& inputHolder : _touchPoints) { + if (inputHolder.holdsInput(input)) { + inputHolder.tryAddInput(input); + return; + } + } + _touchPoints.emplace_back(input); +} + +void TouchModule::removeTouchInput(TouchInput input) { + _deferredRemovals.emplace_back(input); + // Check for "tap" gesture: + for (TouchInputHolder& inputHolder : _touchPoints) { + if (inputHolder.holdsInput(input)) { + inputHolder.tryAddInput(input); + const double totalTime = inputHolder.gestureTime(); + const float totalDistance = inputHolder.gestureDistance(); + // Magic values taken from tuioear.cpp: + const bool isWithinTapTime = totalTime < 0.18; + const bool wasStationary = totalDistance < 0.0004f; + if (isWithinTapTime && wasStationary && _touchPoints.size() == 1 && + _deferredRemovals.size() == 1) + { + _tap = true; + } + return; + } + } +} + } // namespace openspace diff --git a/modules/touch/touchmodule.h b/modules/touch/touchmodule.h index 0ab1e3762d..d217cd4972 100644 --- a/modules/touch/touchmodule.h +++ b/modules/touch/touchmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -33,7 +33,7 @@ namespace openspace { - class TuioEar; +class TuioEar; #ifdef WIN32 class Win32TouchHook; diff --git a/modules/toyvolume/CMakeLists.txt b/modules/toyvolume/CMakeLists.txt index ba6b92f8d4..b1ee1f7bde 100644 --- a/modules/toyvolume/CMakeLists.txt +++ b/modules/toyvolume/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/toyvolume/rendering/renderabletoyvolume.cpp index 1ca33e900c..f06fac4f6c 100644 --- a/modules/toyvolume/rendering/renderabletoyvolume.cpp +++ b/modules/toyvolume/rendering/renderabletoyvolume.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 afa4f0d3f3..5fc66e9da9 100644 --- a/modules/toyvolume/rendering/renderabletoyvolume.h +++ b/modules/toyvolume/rendering/renderabletoyvolume.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 7f23001aa8..edcf9a858c 100644 --- a/modules/toyvolume/rendering/toyvolumeraycaster.cpp +++ b/modules/toyvolume/rendering/toyvolumeraycaster.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 82f59d567e..303e759cbe 100644 --- a/modules/toyvolume/rendering/toyvolumeraycaster.h +++ b/modules/toyvolume/rendering/toyvolumeraycaster.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/bounds_fs.glsl b/modules/toyvolume/shaders/bounds_fs.glsl index eaa4f200ba..6bc1b8f58c 100644 --- a/modules/toyvolume/shaders/bounds_fs.glsl +++ b/modules/toyvolume/shaders/bounds_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/bounds_vs.glsl b/modules/toyvolume/shaders/bounds_vs.glsl index 71f504e7f8..3bb2aef19a 100644 --- a/modules/toyvolume/shaders/bounds_vs.glsl +++ b/modules/toyvolume/shaders/bounds_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/raycast.glsl b/modules/toyvolume/shaders/raycast.glsl index e5ccf3a5ef..c33c3c03fc 100644 --- a/modules/toyvolume/shaders/raycast.glsl +++ b/modules/toyvolume/shaders/raycast.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 44ab1dae8b..b77142eebe 100644 --- a/modules/toyvolume/toyvolumemodule.cpp +++ b/modules/toyvolume/toyvolumemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 9cabb00164..1e614a24be 100644 --- a/modules/toyvolume/toyvolumemodule.h +++ b/modules/toyvolume/toyvolumemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/vislab/CMakeLists.txt b/modules/vislab/CMakeLists.txt index 92a8c8cdda..dacf117beb 100644 --- a/modules/vislab/CMakeLists.txt +++ b/modules/vislab/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, to any person obtaining a copy of this # # software and associated documentation files (the "Software"), to deal in the Software # diff --git a/modules/vislab/rendering/renderabledistancelabel.cpp b/modules/vislab/rendering/renderabledistancelabel.cpp index 6b4a06a28c..071039b17d 100644 --- a/modules/vislab/rendering/renderabledistancelabel.cpp +++ b/modules/vislab/rendering/renderabledistancelabel.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -47,7 +47,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo DistanceUnitInfo = { "DistanceUnit", "Distance Unit", - "Property to define the unit in which the distance should be displayed" + "Property to define the unit in which the distance should be displayed. " "Defaults to 'km' if not specified" }; diff --git a/modules/vislab/rendering/renderabledistancelabel.h b/modules/vislab/rendering/renderabledistancelabel.h index b10fa9bff1..1617960a14 100644 --- a/modules/vislab/rendering/renderabledistancelabel.h +++ b/modules/vislab/rendering/renderabledistancelabel.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/vislab/vislabmodule.cpp b/modules/vislab/vislabmodule.cpp index 4cf2fdec4f..4d3bd66b82 100644 --- a/modules/vislab/vislabmodule.cpp +++ b/modules/vislab/vislabmodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/modules/vislab/vislabmodule.h b/modules/vislab/vislabmodule.h index 5e2b7a6079..05fbdbdba0 100644 --- a/modules/vislab/vislabmodule.h +++ b/modules/vislab/vislabmodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 11d543d6d5..2486bfcb83 100644 --- a/modules/volume/CMakeLists.txt +++ b/modules/volume/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/volume/envelope.cpp index d1f187d46e..63f8b8aaf0 100644 --- a/modules/volume/envelope.cpp +++ b/modules/volume/envelope.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 9004c4df6f..72d134b1c8 100644 --- a/modules/volume/envelope.h +++ b/modules/volume/envelope.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 42267c169c..099ed99227 100644 --- a/modules/volume/linearlrucache.h +++ b/modules/volume/linearlrucache.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8047e5c13c..130675eecf 100644 --- a/modules/volume/linearlrucache.inl +++ b/modules/volume/linearlrucache.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 dce0f51180..6114e10c03 100644 --- a/modules/volume/lrucache.h +++ b/modules/volume/lrucache.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cd3326d656..eea5cc0ec1 100644 --- a/modules/volume/lrucache.inl +++ b/modules/volume/lrucache.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 568306500b..f8ed2ea521 100644 --- a/modules/volume/rawvolume.h +++ b/modules/volume/rawvolume.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 6effbabfe4..8c65d3eca1 100644 --- a/modules/volume/rawvolume.inl +++ b/modules/volume/rawvolume.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f8944cb05f..ef396be506 100644 --- a/modules/volume/rawvolumemetadata.cpp +++ b/modules/volume/rawvolumemetadata.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c2f6e723dc..995f2705de 100644 --- a/modules/volume/rawvolumemetadata.h +++ b/modules/volume/rawvolumemetadata.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 33b0fed1f7..3e5c899814 100644 --- a/modules/volume/rawvolumereader.h +++ b/modules/volume/rawvolumereader.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 784adaa99f..ea534b112f 100644 --- a/modules/volume/rawvolumereader.inl +++ b/modules/volume/rawvolumereader.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 626c80972a..ddbf57a9b1 100644 --- a/modules/volume/rawvolumewriter.h +++ b/modules/volume/rawvolumewriter.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 0335ab3770..59320f6922 100644 --- a/modules/volume/rawvolumewriter.inl +++ b/modules/volume/rawvolumewriter.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 55415a423e..90c2ec5260 100644 --- a/modules/volume/rendering/basicvolumeraycaster.cpp +++ b/modules/volume/rendering/basicvolumeraycaster.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c447eb054d..ddea4ae227 100644 --- a/modules/volume/rendering/basicvolumeraycaster.h +++ b/modules/volume/rendering/basicvolumeraycaster.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 c3a161085c..00e5c9cffc 100644 --- a/modules/volume/rendering/renderabletimevaryingvolume.cpp +++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 34961057d5..d3f9bb1a9d 100644 --- a/modules/volume/rendering/renderabletimevaryingvolume.h +++ b/modules/volume/rendering/renderabletimevaryingvolume.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a06a0b08bf..06f8938433 100644 --- a/modules/volume/rendering/volumeclipplane.cpp +++ b/modules/volume/rendering/volumeclipplane.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 76a9b3ae7b..43213d7f57 100644 --- a/modules/volume/rendering/volumeclipplane.h +++ b/modules/volume/rendering/volumeclipplane.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 628390a9ed..94347e0706 100644 --- a/modules/volume/rendering/volumeclipplanes.cpp +++ b/modules/volume/rendering/volumeclipplanes.cpp @@ -3,7 +3,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 20b62ebc74..8add71a805 100644 --- a/modules/volume/rendering/volumeclipplanes.h +++ b/modules/volume/rendering/volumeclipplanes.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/bounds_fs.glsl b/modules/volume/shaders/bounds_fs.glsl index 0e6f43eb24..4617578763 100644 --- a/modules/volume/shaders/bounds_fs.glsl +++ b/modules/volume/shaders/bounds_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/bounds_vs.glsl b/modules/volume/shaders/bounds_vs.glsl index 90e47500f0..76fd110043 100644 --- a/modules/volume/shaders/bounds_vs.glsl +++ b/modules/volume/shaders/bounds_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/helper.glsl b/modules/volume/shaders/helper.glsl index e400b1b9fc..66801a2dae 100644 --- a/modules/volume/shaders/helper.glsl +++ b/modules/volume/shaders/helper.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/raycast.glsl b/modules/volume/shaders/raycast.glsl index 16d5962c1e..c96252294f 100644 --- a/modules/volume/shaders/raycast.glsl +++ b/modules/volume/shaders/raycast.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f0e3a7d74b..f64032acdd 100644 --- a/modules/volume/tasks/generaterawvolumetask.cpp +++ b/modules/volume/tasks/generaterawvolumetask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 7d302727a6..d99f2f2731 100644 --- a/modules/volume/tasks/generaterawvolumetask.h +++ b/modules/volume/tasks/generaterawvolumetask.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 61460b5b71..51a15c904f 100644 --- a/modules/volume/textureslicevolumereader.h +++ b/modules/volume/textureslicevolumereader.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a1c2c8596b..bb2452be49 100644 --- a/modules/volume/textureslicevolumereader.inl +++ b/modules/volume/textureslicevolumereader.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 a9a70b22bd..e18973917d 100644 --- a/modules/volume/transferfunction.cpp +++ b/modules/volume/transferfunction.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 dbbbf2cfd3..37000c25c1 100644 --- a/modules/volume/transferfunction.h +++ b/modules/volume/transferfunction.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 ee48184c14..0e39e9de22 100644 --- a/modules/volume/transferfunctionhandler.cpp +++ b/modules/volume/transferfunctionhandler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -58,7 +58,7 @@ namespace { "Save Transfer Function", "Save your transfer function" }; -} +} // namespace namespace openspace::volume { diff --git a/modules/volume/transferfunctionhandler.h b/modules/volume/transferfunctionhandler.h index 9d534052cb..946c2b1905 100644 --- a/modules/volume/transferfunctionhandler.h +++ b/modules/volume/transferfunctionhandler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 ee54b0ab64..a7fd72dc8c 100644 --- a/modules/volume/transferfunctionproperty.cpp +++ b/modules/volume/transferfunctionproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 642e2cf7e3..2fdc089c03 100644 --- a/modules/volume/transferfunctionproperty.h +++ b/modules/volume/transferfunctionproperty.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 3516fcfabe..3bfcf0cb2d 100644 --- a/modules/volume/volumegridtype.cpp +++ b/modules/volume/volumegridtype.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 eba7ba431b..cdf5059196 100644 --- a/modules/volume/volumegridtype.h +++ b/modules/volume/volumegridtype.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 ed5ff0ae2a..6b18b8e681 100644 --- a/modules/volume/volumemodule.cpp +++ b/modules/volume/volumemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cf850323ca..070c6d171e 100644 --- a/modules/volume/volumemodule.h +++ b/modules/volume/volumemodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 e1ca8e6b43..789b044167 100644 --- a/modules/volume/volumesampler.h +++ b/modules/volume/volumesampler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 343a4da686..c02bbd57a9 100644 --- a/modules/volume/volumesampler.inl +++ b/modules/volume/volumesampler.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 6357eec7fe..a98b898a01 100644 --- a/modules/volume/volumeutils.cpp +++ b/modules/volume/volumeutils.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 84097472fd..7aa8095631 100644 --- a/modules/volume/volumeutils.h +++ b/modules/volume/volumeutils.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 dfd808aed5..f165745009 100644 --- a/modules/webbrowser/CMakeLists.txt +++ b/modules/webbrowser/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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/cmake/cef_support.cmake b/modules/webbrowser/cmake/cef_support.cmake index 42111c3758..305bfc6485 100644 --- a/modules/webbrowser/cmake/cef_support.cmake +++ b/modules/webbrowser/cmake/cef_support.cmake @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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/cmake/webbrowser_helpers.cmake b/modules/webbrowser/cmake/webbrowser_helpers.cmake index a10bf9297b..0b606022dd 100644 --- a/modules/webbrowser/cmake/webbrowser_helpers.cmake +++ b/modules/webbrowser/cmake/webbrowser_helpers.cmake @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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/browserclient.h b/modules/webbrowser/include/browserclient.h index 396dd59dfa..d8ac4862f4 100644 --- a/modules/webbrowser/include/browserclient.h +++ b/modules/webbrowser/include/browserclient.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 058b6b8f1b..ab2c983409 100644 --- a/modules/webbrowser/include/browserinstance.h +++ b/modules/webbrowser/include/browserinstance.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 4cf411853e..01927abd4a 100644 --- a/modules/webbrowser/include/cefhost.h +++ b/modules/webbrowser/include/cefhost.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 86704ab033..af67ce27b2 100644 --- a/modules/webbrowser/include/defaultbrowserlauncher.h +++ b/modules/webbrowser/include/defaultbrowserlauncher.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 8c2198ed1c..683a60fbc9 100644 --- a/modules/webbrowser/include/eventhandler.h +++ b/modules/webbrowser/include/eventhandler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 3e4e488396..cf765cbd09 100644 --- a/modules/webbrowser/include/screenspacebrowser.h +++ b/modules/webbrowser/include/screenspacebrowser.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f058415838..fca008cb68 100644 --- a/modules/webbrowser/include/webbrowserapp.h +++ b/modules/webbrowser/include/webbrowserapp.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 bd2e5e8943..c72a5f408b 100644 --- a/modules/webbrowser/include/webkeyboardhandler.h +++ b/modules/webbrowser/include/webkeyboardhandler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 25175c555a..a53ace70ab 100644 --- a/modules/webbrowser/include/webrenderhandler.h +++ b/modules/webbrowser/include/webrenderhandler.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/screenspace_fs.glsl b/modules/webbrowser/shaders/screenspace_fs.glsl index 4c5148d30e..6f6f0686cf 100644 --- a/modules/webbrowser/shaders/screenspace_fs.glsl +++ b/modules/webbrowser/shaders/screenspace_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/shaders/screenspace_vs.glsl b/modules/webbrowser/shaders/screenspace_vs.glsl index d4bd97d510..c39e263268 100644 --- a/modules/webbrowser/shaders/screenspace_vs.glsl +++ b/modules/webbrowser/shaders/screenspace_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 478b86a097..ffec9624b7 100644 --- a/modules/webbrowser/src/browserclient.cpp +++ b/modules/webbrowser/src/browserclient.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 cbeb030b92..81e7e249ab 100644 --- a/modules/webbrowser/src/browserinstance.cpp +++ b/modules/webbrowser/src/browserinstance.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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/cefhost.cpp b/modules/webbrowser/src/cefhost.cpp index 6a0b6137dc..3e7cd9fa51 100644 --- a/modules/webbrowser/src/cefhost.cpp +++ b/modules/webbrowser/src/cefhost.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 30c290f818..5761a85b5c 100644 --- a/modules/webbrowser/src/defaultbrowserlauncher.cpp +++ b/modules/webbrowser/src/defaultbrowserlauncher.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 b8f963a939..5d81cb3295 100644 --- a/modules/webbrowser/src/eventhandler.cpp +++ b/modules/webbrowser/src/eventhandler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -230,11 +230,11 @@ void EventHandler::initialize() { BrowserInstance::SingleClick ); #endif - _validTouchStates.emplace_back(input); - } - else { - _validTouchStates.emplace_back(input); } + + _validTouchStates.emplace_back(input); + + global::interactionMonitor->markInteraction(); return true; } ); @@ -269,6 +269,7 @@ void EventHandler::initialize() { _leftButton.down = true; _browserInstance->sendMouseMoveEvent(mouseEvent()); #endif // WIN32 + global::interactionMonitor->markInteraction(); return true; } else if (it != _validTouchStates.cend()) { diff --git a/modules/webbrowser/src/processhelperlinux.cpp b/modules/webbrowser/src/processhelperlinux.cpp index e5b5d34cdf..69c5502dcd 100644 --- a/modules/webbrowser/src/processhelperlinux.cpp +++ b/modules/webbrowser/src/processhelperlinux.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 602e2c9321..405606549d 100644 --- a/modules/webbrowser/src/processhelpermac.cpp +++ b/modules/webbrowser/src/processhelpermac.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 545f5220a6..1f9870487c 100644 --- a/modules/webbrowser/src/processhelperwindows.cpp +++ b/modules/webbrowser/src/processhelperwindows.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 f23b4ae457..420947a95d 100644 --- a/modules/webbrowser/src/screenspacebrowser.cpp +++ b/modules/webbrowser/src/screenspacebrowser.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 43236bfb25..902305e61b 100644 --- a/modules/webbrowser/src/webbrowserapp.cpp +++ b/modules/webbrowser/src/webbrowserapp.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 2971a38c5c..fb290c451c 100644 --- a/modules/webbrowser/src/webkeyboardhandler.cpp +++ b/modules/webbrowser/src/webkeyboardhandler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 434b325f6c..aec3354436 100644 --- a/modules/webbrowser/src/webrenderhandler.cpp +++ b/modules/webbrowser/src/webrenderhandler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 0ba48cd738..0c62a50c46 100644 --- a/modules/webbrowser/webbrowsermodule.cpp +++ b/modules/webbrowser/webbrowsermodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 05e336d0e0..2287f52a1a 100644 --- a/modules/webbrowser/webbrowsermodule.h +++ b/modules/webbrowser/webbrowsermodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, 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 6ee8f77798..efe6fce462 100644 --- a/modules/webgui/CMakeLists.txt +++ b/modules/webgui/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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/cmake/nodejs_support.cmake b/modules/webgui/cmake/nodejs_support.cmake index d33c9fa6d5..bb1a3d6c5d 100644 --- a/modules/webgui/cmake/nodejs_support.cmake +++ b/modules/webgui/cmake/nodejs_support.cmake @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of charge, 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.cpp b/modules/webgui/webguimodule.cpp index 402dbefe32..737a0dd8ae 100644 --- a/modules/webgui/webguimodule.cpp +++ b/modules/webgui/webguimodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -98,10 +98,10 @@ namespace { struct [[codegen::Dictionary(WebGuiModule)]] Parameters { // [[codegen::verbatim(PortInfo.description)]] - std::optional port; + std::optional port [[codegen::key("HttpPort")]]; // [[codegen::verbatim(AddressInfo.description)]] - std::optional address; + std::string address; // [[codegen::verbatim(WebSocketInterfaceInfo.description)]] std::optional webSocketInterface; @@ -163,12 +163,7 @@ void WebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) { const Parameters p = codegen::bake(configuration); _port = p.port.value_or(_port); - if (p.address.has_value()) { - _address = p.address.value(); - } - else { - _address = "192.168.1.8"; //global::windowDelegate - } + _address = p.address; _webSocketInterface = p.webSocketInterface.value_or(_webSocketInterface); auto startOrStop = [this]() { diff --git a/modules/webgui/webguimodule.h b/modules/webgui/webguimodule.h index f50083ba6f..41c89f3ef8 100644 --- a/modules/webgui/webguimodule.h +++ b/modules/webgui/webguimodule.h @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/scripts/configuration_helper.lua b/scripts/configuration_helper.lua index b18e7f158b..85bc348f70 100644 --- a/scripts/configuration_helper.lua +++ b/scripts/configuration_helper.lua @@ -1,8 +1,8 @@ -- Helper functions that are useful to customize the openspace.cfg loading --- ####################################################################################### +-- ####################################################################################### -- ## Public functions ## --- ####################################################################################### +-- ####################################################################################### -- SGCT related functions sgct = {} @@ -79,9 +79,9 @@ sgctconfiginitializeString = "" --[[ -########################################################################################## +########################################################################################## Internal helper functions -########################################################################################## +########################################################################################## ]]-- function generateSingleViewportFOV(down, up, left, right, tracked) @@ -89,7 +89,7 @@ function generateSingleViewportFOV(down, up, left, right, tracked) table.insert(result, [[ {]]) - if tracked then + if tracked ~= nil then table.insert(result, [[ "tracked": ]] .. tostring(tracked) .. [[,]]) end @@ -114,7 +114,7 @@ function generateFisheyeViewport(fov, quality, tilt, background, crop, offset, t table.insert(result, [[ {]]) - if tracked then + if tracked ~= nil then table.insert(result, [[ "tracked": ]] .. tostring(tracked) .. [[,]]) end @@ -162,7 +162,7 @@ function generateWindow(result, fullScreen, msaa, border, monitor, tags, stereo, size, res, viewport) table.insert(result, [[ "name": "OpenSpace",]]) - if fullScreen then + if fullScreen ~= nil then table.insert(result, [[ "fullscreen": ]] .. tostring(fullScreen) .. [[,]]) end @@ -170,7 +170,7 @@ function generateWindow(result, fullScreen, msaa, border, monitor, tags, stereo, table.insert(result, [[ "msaa": ]] .. msaa .. [[,]]) end - if border then + if border ~= nil then table.insert(result, [[ "border": ]] .. tostring(border) .. [[,]]) end @@ -253,7 +253,7 @@ end function generateSettings(result, refreshRate, vsync) table.insert(result, [[ "display": {]]) - if (refreshRate) then + if refreshRate then table.insert(result, [[ "refreshrate": ]] .. refreshRate .. [[,]]) end @@ -275,7 +275,7 @@ function generateCluster(arg, viewport) table.insert(result, [[ "version": 1,]]) table.insert(result, [[ "masteraddress": "127.0.0.1",]]) - if arg["sgctDebug"] then + if arg["sgctDebug"] ~= nil then table.insert(result, [[ "debug": ]] .. tostring(arg["sgctdebug"]) .. [[,]]) end @@ -321,7 +321,7 @@ function check(type_str, arg, param, subparam_type) type(v) == subparam_type, param .. "[" .. k .. "] must be a " .. subparam_type ) - end + end end end @@ -347,8 +347,8 @@ function generateSingleWindowConfig(arg, viewport) check("table", arg["scene"], "orientation", "number") check("number", arg["scene"], "scale") end - - if arg["shared"] then + + if arg["shared"] ~= nil then local t = arg["tags"] t[#t + 1] = "Spout" end @@ -420,9 +420,9 @@ function sgct.config.single(arg) arg["tracked"] = arg["tracked"] or true - local viewport = generateSingleViewportFOV(arg["fov"]["down"], arg["fov"]["up"], + local viewport = generateSingleViewportFOV(arg["fov"]["down"], arg["fov"]["up"], arg["fov"]["left"], arg["fov"]["right"], arg["tracked"]) - + return sgct.makeConfig(generateSingleWindowConfig(arg, viewport)) end @@ -445,7 +445,7 @@ function sgct.config.fisheye(arg) -- OpenSpace code prior to loading this file local scale_factor = 2.0/3.0; - arg["size"] = { ScreenResolution.x * scale_factor, ScreenResolution.y * scale_factor } + arg["size"] = { ScreenResolution.x * scale_factor, ScreenResolution.y * scale_factor } end check("number", arg, "fov") diff --git a/shaders/PowerScaling/powerScalingMath.hglsl b/shaders/PowerScaling/powerScalingMath.hglsl index dcd3bfd9fb..8eb3c63b05 100644 --- a/shaders/PowerScaling/powerScalingMath.hglsl +++ b/shaders/PowerScaling/powerScalingMath.hglsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/PowerScaling/powerScaling_fs.hglsl b/shaders/PowerScaling/powerScaling_fs.hglsl index bb684f8a6c..5579299b4d 100644 --- a/shaders/PowerScaling/powerScaling_fs.hglsl +++ b/shaders/PowerScaling/powerScaling_fs.hglsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/PowerScaling/powerScaling_vs.hglsl b/shaders/PowerScaling/powerScaling_vs.hglsl index 53104a1dcc..6918e3d320 100644 --- a/shaders/PowerScaling/powerScaling_vs.hglsl +++ b/shaders/PowerScaling/powerScaling_vs.hglsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/blending.glsl b/shaders/blending.glsl index 908621061f..d658c1dd6c 100644 --- a/shaders/blending.glsl +++ b/shaders/blending.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/core/xyzuvrgba_fs.glsl b/shaders/core/xyzuvrgba_fs.glsl index 91d18ba067..4347c6a354 100644 --- a/shaders/core/xyzuvrgba_fs.glsl +++ b/shaders/core/xyzuvrgba_fs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/core/xyzuvrgba_vs.glsl b/shaders/core/xyzuvrgba_vs.glsl index 469c4832ba..d28938f9ab 100644 --- a/shaders/core/xyzuvrgba_vs.glsl +++ b/shaders/core/xyzuvrgba_vs.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/floatoperations.glsl b/shaders/floatoperations.glsl index 5ba2e4a324..1f25c1c8cf 100644 --- a/shaders/floatoperations.glsl +++ b/shaders/floatoperations.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/fragment.glsl b/shaders/fragment.glsl index 5b84545b95..5a645658f6 100644 --- a/shaders/fragment.glsl +++ b/shaders/fragment.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/framebuffer/exitframebuffer.frag b/shaders/framebuffer/exitframebuffer.frag index 3641a8fbc9..5d9189c5ab 100644 --- a/shaders/framebuffer/exitframebuffer.frag +++ b/shaders/framebuffer/exitframebuffer.frag @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/framebuffer/fxaa.frag b/shaders/framebuffer/fxaa.frag index 0fa45d1fc0..66a7130086 100644 --- a/shaders/framebuffer/fxaa.frag +++ b/shaders/framebuffer/fxaa.frag @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/framebuffer/fxaa.vert b/shaders/framebuffer/fxaa.vert index 2bbe244d6b..07d09a5c7c 100644 --- a/shaders/framebuffer/fxaa.vert +++ b/shaders/framebuffer/fxaa.vert @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/framebuffer/hdrAndFiltering.frag b/shaders/framebuffer/hdrAndFiltering.frag index 6e0b494352..93b7bd9347 100644 --- a/shaders/framebuffer/hdrAndFiltering.frag +++ b/shaders/framebuffer/hdrAndFiltering.frag @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/framebuffer/hdrAndFiltering.vert b/shaders/framebuffer/hdrAndFiltering.vert index 2bbe244d6b..07d09a5c7c 100644 --- a/shaders/framebuffer/hdrAndFiltering.vert +++ b/shaders/framebuffer/hdrAndFiltering.vert @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/framebuffer/inside.glsl b/shaders/framebuffer/inside.glsl index 547f3b7e9e..4737ad6e0c 100644 --- a/shaders/framebuffer/inside.glsl +++ b/shaders/framebuffer/inside.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/framebuffer/mergeDownscaledVolume.frag b/shaders/framebuffer/mergeDownscaledVolume.frag index b2ef8310ec..6ae80a3910 100644 --- a/shaders/framebuffer/mergeDownscaledVolume.frag +++ b/shaders/framebuffer/mergeDownscaledVolume.frag @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/framebuffer/mergeDownscaledVolume.vert b/shaders/framebuffer/mergeDownscaledVolume.vert index 2bbe244d6b..07d09a5c7c 100644 --- a/shaders/framebuffer/mergeDownscaledVolume.vert +++ b/shaders/framebuffer/mergeDownscaledVolume.vert @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/framebuffer/nOneStripMSAA.frag b/shaders/framebuffer/nOneStripMSAA.frag index ece0070918..a71de476f0 100644 --- a/shaders/framebuffer/nOneStripMSAA.frag +++ b/shaders/framebuffer/nOneStripMSAA.frag @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/framebuffer/nOneStripMSAA.vert b/shaders/framebuffer/nOneStripMSAA.vert index 04f445e0a1..4eceddb098 100644 --- a/shaders/framebuffer/nOneStripMSAA.vert +++ b/shaders/framebuffer/nOneStripMSAA.vert @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/framebuffer/outside.glsl b/shaders/framebuffer/outside.glsl index 002b15cc89..ba6a73916e 100644 --- a/shaders/framebuffer/outside.glsl +++ b/shaders/framebuffer/outside.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/framebuffer/raycastframebuffer.frag b/shaders/framebuffer/raycastframebuffer.frag index be51b0f142..64a240b97b 100644 --- a/shaders/framebuffer/raycastframebuffer.frag +++ b/shaders/framebuffer/raycastframebuffer.frag @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/framebuffer/renderframebuffer.frag b/shaders/framebuffer/renderframebuffer.frag index 437a39ab46..6b62ec8eeb 100644 --- a/shaders/framebuffer/renderframebuffer.frag +++ b/shaders/framebuffer/renderframebuffer.frag @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/framebuffer/resolveframebuffer.vert b/shaders/framebuffer/resolveframebuffer.vert index acc9b86986..e886074f95 100644 --- a/shaders/framebuffer/resolveframebuffer.vert +++ b/shaders/framebuffer/resolveframebuffer.vert @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/hdr.glsl b/shaders/hdr.glsl index 38e69e1079..6c158891bc 100644 --- a/shaders/hdr.glsl +++ b/shaders/hdr.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * diff --git a/shaders/rand.glsl b/shaders/rand.glsl index 417eb6d7d2..bdf2980e74 100644 --- a/shaders/rand.glsl +++ b/shaders/rand.glsl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 af3748c61d..a459b29ed0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of 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/camera/camera.cpp b/src/camera/camera.cpp index d9120431e4..4303b83e77 100644 --- a/src/camera/camera.cpp +++ b/src/camera/camera.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/core_registration.cpp b/src/documentation/core_registration.cpp index fa6cdf5f4c..eb974bcb36 100644 --- a/src/documentation/core_registration.cpp +++ b/src/documentation/core_registration.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 9e45d4872e..6048deed89 100644 --- a/src/documentation/documentation.cpp +++ b/src/documentation/documentation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 4fefac041b..02f41a9043 100644 --- a/src/documentation/documentationengine.cpp +++ b/src/documentation/documentationengine.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 2993bc9003..ece31d9b2b 100644 --- a/src/documentation/documentationgenerator.cpp +++ b/src/documentation/documentationgenerator.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 f806a74547..dc52dcfbac 100644 --- a/src/documentation/verifier.cpp +++ b/src/documentation/verifier.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -231,6 +231,8 @@ std::string StringVerifier::type() const { return "String"; } +FileVerifier::FileVerifier() : StringVerifier(true) {} + TestResult FileVerifier::operator()(const ghoul::Dictionary& dict, const std::string& key) const { @@ -255,6 +257,8 @@ std::string FileVerifier::type() const { return "File"; } +DirectoryVerifier::DirectoryVerifier() : StringVerifier(true) {} + TestResult DirectoryVerifier::operator()(const ghoul::Dictionary& dict, const std::string& key) const { @@ -279,6 +283,8 @@ std::string DirectoryVerifier::type() const { return "Directory"; } +DateTimeVerifier::DateTimeVerifier() : StringVerifier(true) {} + TestResult DateTimeVerifier::operator()(const ghoul::Dictionary& dict, const std::string& key) const { @@ -303,26 +309,6 @@ TestResult DateTimeVerifier::operator()(const ghoul::Dictionary& dict, off.explanation = "Not a valid format, should be: YYYY MM DD hh:mm:ss"; res.offenses.push_back(off); } - // then check if valid date - else { - // normalize e.g. 29/02/2013 would become 01/03/2013 - std::tm t_copy(t); - time_t when = mktime(&t_copy); - std::tm* norm = localtime(&when); - - // validate (is the normalized date still the same?): - if (norm->tm_mday != t.tm_mday && - norm->tm_mon != t.tm_mon && - norm->tm_year != t.tm_year) - { - res.success = false; - TestResult::Offense off; - off.offender = key; - off.reason = TestResult::Offense::Reason::Verification; - off.explanation = "Not a valid date"; - res.offenses.push_back(off); - } - } return res; } @@ -432,10 +418,10 @@ TestResult TemplateVerifier::operator()(const ghoul::Dictionary& dic if (dict.hasValue(key)) { glm::dvec2 value = dict.value(key); glm::dvec2 intPart; - glm::bvec2 isInt = { + glm::bvec2 isInt = glm::bvec2( modf(value.x, &intPart.x) == 0.0, modf(value.y, &intPart.y) == 0.0 - }; + ); if (isInt.x && isInt.y) { TestResult res; res.success = true; @@ -487,11 +473,11 @@ TestResult TemplateVerifier::operator()(const ghoul::Dictionary& dic if (dict.hasValue(key)) { glm::dvec3 value = dict.value(key); glm::dvec3 intPart; - glm::bvec3 isInt = { + glm::bvec3 isInt = glm::bvec3( modf(value.x, &intPart.x) == 0.0, modf(value.y, &intPart.y) == 0.0, modf(value.z, &intPart.z) == 0.0 - }; + ); if (isInt.x && isInt.y && isInt.z) { TestResult res; res.success = true; @@ -543,12 +529,12 @@ TestResult TemplateVerifier::operator()(const ghoul::Dictionary& dic if (dict.hasValue(key)) { glm::dvec4 value = dict.value(key); glm::dvec4 intPart; - glm::bvec4 isInt = { + glm::bvec4 isInt = glm::bvec4( modf(value.x, &intPart.x) == 0.0, modf(value.y, &intPart.y) == 0.0, modf(value.z, &intPart.z) == 0.0, modf(value.w, &intPart.w) == 0.0 - }; + ); if (isInt.x && isInt.y && isInt.z && isInt.w) { TestResult res; res.success = true; diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp index 041d1db653..9f610d37e1 100644 --- a/src/engine/configuration.cpp +++ b/src/engine/configuration.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 c37e260277..7c05e3cb07 100644 --- a/src/engine/downloadmanager.cpp +++ b/src/engine/downloadmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -172,9 +172,9 @@ std::shared_ptr DownloadManager::downloadFile( } ProgressInformation p = { - future, - std::chrono::system_clock::now(), - &progressCb + .future = future, + .startTime = std::chrono::system_clock::now(), + .callback = &progressCb }; #if LIBCURL_VERSION_NUM >= 0x072000 // xferinfo was introduced in 7.32.0, if a lower curl version is used the diff --git a/src/engine/globals.cpp b/src/engine/globals.cpp index 8f897cafe6..6c10a99b75 100644 --- a/src/engine/globals.cpp +++ b/src/engine/globals.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 819ec6e4a8..df482d18d1 100644 --- a/src/engine/globalscallbacks.cpp +++ b/src/engine/globalscallbacks.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 23bf57b1d2..529241527f 100644 --- a/src/engine/logfactory.cpp +++ b/src/engine/logfactory.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 4c9da424d5..7e559ec041 100644 --- a/src/engine/moduleengine.cpp +++ b/src/engine/moduleengine.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -171,7 +171,7 @@ std::vector ModuleEngine::modules() const { } ghoul::systemcapabilities::Version ModuleEngine::requiredOpenGLVersion() const { - ghoul::systemcapabilities::Version version = { 0, 0, 0 }; + ghoul::systemcapabilities::Version version = { .major = 0, .minor = 0, .release = 0 }; for (const std::unique_ptr& m : _modules) { version = std::max(version, m->requiredOpenGLVersion()); diff --git a/src/engine/moduleengine_lua.inl b/src/engine/moduleengine_lua.inl index 6af0b5515c..196c8116b3 100644 --- a/src/engine/moduleengine_lua.inl +++ b/src/engine/moduleengine_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 9a12a4d31e..4570dea0a1 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -133,6 +133,13 @@ namespace { "Show Hidden Scene Graph Nodes", "If checked, hidden scene graph nodes are visible in the UI" }; + + constexpr openspace::properties::Property::PropertyInfo DisableMouseInputInfo = { + "DisableMouseInputs", + "Disable All Mouse Inputs", + "Disables all mouse inputs. Useful when using touch interaction, to prevent " + "double inputs on touch (from both touch input and inserted mouse inputs)" + }; } // namespace namespace openspace { @@ -144,6 +151,7 @@ OpenSpaceEngine::OpenSpaceEngine() , _printEvents(PrintEventsInfo, false) , _visibility(VisibilityInfo) , _showHiddenSceneGraphNodes(ShowHiddenSceneInfo, false) + , _disableAllMouseInputs(DisableMouseInputInfo, false) { FactoryManager::initialize(); SpiceManager::initialize(); @@ -152,6 +160,7 @@ OpenSpaceEngine::OpenSpaceEngine() addProperty(_printEvents); addProperty(_visibility); addProperty(_showHiddenSceneGraphNodes); + addProperty(_disableAllMouseInputs); using Visibility = openspace::properties::Property::Visibility; _visibility.addOptions({ @@ -477,7 +486,11 @@ void OpenSpaceEngine::initializeGL() { bool debugActive = global::configuration->openGLDebugContext.isActive; // Debug output is not available before 4.3 - const ghoul::systemcapabilities::Version minVersion = { 4, 3, 0 }; + const ghoul::systemcapabilities::Version minVersion = { + .major = 4, + .minor = 3, + .release = 0 + }; if (debugActive && OpenGLCap.openGLVersion() < minVersion) { LINFO("OpenGL Debug context requested, but insufficient version available"); debugActive = false; @@ -676,20 +689,6 @@ void OpenSpaceEngine::loadAssets() { global::windowDelegate->setBarrier(true); }; - if (_scene) { - ZoneScopedN("Reset scene") - - global::syncEngine->removeSyncables(global::timeManager->syncables()); - if (_scene && _scene->camera()) { - global::syncEngine->removeSyncables(_scene->camera()->syncables()); - } - global::renderEngine->setScene(nullptr); - global::renderEngine->setCamera(nullptr); - global::navigationHandler->setCamera(nullptr); - _scene->clear(); - global::rootPropertyOwner->removePropertySubOwner(_scene.get()); - } - std::unique_ptr sceneInitializer; if (global::configuration->useMultithreadedInitialization) { unsigned int nAvailableThreads = std::min( @@ -1363,6 +1362,17 @@ void OpenSpaceEngine::keyboardCallback(Key key, KeyModifier mod, KeyAction actio return; } + // We need to do this check before the callback functions as we would otherwise + // immediately cancel a shutdown if someone pressed the ESC key. Similar argument for + // only checking for the Press action. Since the 'Press' of ESC will trigger the + // shutdown, the 'Release' in some frame later would cancel it immediately again + if (action == KeyAction::Press && _shutdown.inShutdown) { + _shutdown.inShutdown = false; + global::eventEngine->publishEvent( + events::EventApplicationShutdown::State::Aborted + ); + } + using F = global::callback::KeyboardCallback; for (const F& func : *global::callback::keyboard) { const bool isConsumed = func(key, mod, action, isGuiWindow); @@ -1402,6 +1412,13 @@ void OpenSpaceEngine::charCallback(unsigned int codepoint, KeyModifier modifier, global::luaConsole->charCallback(codepoint, modifier); global::interactionMonitor->markInteraction(); + + if (_shutdown.inShutdown) { + _shutdown.inShutdown = false; + global::eventEngine->publishEvent( + events::EventApplicationShutdown::State::Aborted + ); + } } void OpenSpaceEngine::mouseButtonCallback(MouseButton button, MouseAction action, @@ -1409,6 +1426,10 @@ void OpenSpaceEngine::mouseButtonCallback(MouseButton button, MouseAction action { ZoneScoped + if (_disableAllMouseInputs) { + return; + } + using F = global::callback::MouseButtonCallback; for (const F& func : *global::callback::mouseButton) { bool isConsumed = func(button, action, mods, isGuiWindow); @@ -1438,11 +1459,22 @@ void OpenSpaceEngine::mouseButtonCallback(MouseButton button, MouseAction action global::navigationHandler->mouseButtonCallback(button, action); global::interactionMonitor->markInteraction(); + + if (_shutdown.inShutdown) { + _shutdown.inShutdown = false; + global::eventEngine->publishEvent( + events::EventApplicationShutdown::State::Aborted + ); + } } void OpenSpaceEngine::mousePositionCallback(double x, double y, IsGuiWindow isGuiWindow) { ZoneScoped + if (_disableAllMouseInputs) { + return; + } + using F = global::callback::MousePositionCallback; for (const F& func : *global::callback::mousePosition) { func(x, y, isGuiWindow); @@ -1459,6 +1491,10 @@ void OpenSpaceEngine::mouseScrollWheelCallback(double posX, double posY, { ZoneScoped + if (_disableAllMouseInputs) { + return; + } + using F = global::callback::MouseScrollWheelCallback; for (const F& func : *global::callback::mouseScrollWheel) { bool isConsumed = func(posX, posY, isGuiWindow); diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl index 008d9eded7..738cb4c3da 100644 --- a/src/engine/openspaceengine_lua.inl +++ b/src/engine/openspaceengine_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 0793704a79..bd5b77e34e 100644 --- a/src/engine/syncengine.cpp +++ b/src/engine/syncengine.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/events/event.cpp b/src/events/event.cpp index 2ae47c6b9a..f16eae5759 100644 --- a/src/events/event.cpp +++ b/src/events/event.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/events/eventengine.cpp b/src/events/eventengine.cpp index 0e680b117c..01b41f1e52 100644 --- a/src/events/eventengine.cpp +++ b/src/events/eventengine.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/events/eventengine_lua.inl b/src/events/eventengine_lua.inl index ca90c84bf3..9dfd2f68e9 100644 --- a/src/events/eventengine_lua.inl +++ b/src/events/eventengine_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/actionmanager.cpp b/src/interaction/actionmanager.cpp index 4443410a8f..f00c5fb4bd 100644 --- a/src/interaction/actionmanager.cpp +++ b/src/interaction/actionmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/actionmanager_lua.inl b/src/interaction/actionmanager_lua.inl index a23da24250..4a10d51ae9 100644 --- a/src/interaction/actionmanager_lua.inl +++ b/src/interaction/actionmanager_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#include + namespace { // Checks if the passed identifier corresponds to an action. @@ -69,6 +71,27 @@ namespace { global::actionManager->removeAction(identifier); } +struct [[codegen::Dictionary(Action)]] Action { + // The identifier under which the action is registered + std::string identifier; + + // The Lua script that is to be executed when the action is triggered + std::string command; + + // The user-facing name of the action + std::optional name; + + // A documentation that explains what the action does + std::optional documentation; + + // The path in the GUI under which the action is shown to the user. If the value is + // not provided, the default value is / + std::optional guiPath; + + // Determines whether the provided command will be executed locally or will be sent to + // connected computers in a cluster or parallel connection environment + std::optional isLocal; +}; /** * Registers a new action. The first argument is the identifier which cannot have been * used to register a previous action before, the second argument is the Lua command that @@ -78,47 +101,26 @@ namespace { * whether the action should be executed locally (= false) or remotely (= true, the * default). */ -[[codegen::luawrap]] void registerAction(ghoul::Dictionary action) { +[[codegen::luawrap]] void registerAction(Action action) { using namespace openspace; - if (!action.hasValue("Identifier")) { - throw ghoul::lua::LuaError("Identifier must to provided to register action"); - } - std::string identifier = action.value("Identifier"); - if (global::actionManager->hasAction(identifier)) { - throw ghoul::lua::LuaError( - fmt::format("Action for identifier '{}' already existed", identifier) - ); - } - if (global::actionManager->hasAction(identifier)) { - throw ghoul::lua::LuaError( - fmt::format("Identifier '{}' for action already registered", identifier) - ); - } - - if (!action.hasValue("Command")) { - throw ghoul::lua::LuaError( - fmt::format( - "Identifier '{}' does not provide a Lua command to execute", identifier - ) - ); + if (global::actionManager->hasAction(action.identifier)) { + throw ghoul::lua::LuaError(fmt::format( + "Identifier '{}' for action already registered", action.identifier + )); } interaction::Action a; - a.identifier = std::move(identifier); - a.command = action.value("Command"); - if (action.hasValue("Name")) { - a.name = action.value("Name"); + a.identifier = std::move(action.identifier); + a.command = std::move(action.command); + a.name = action.name.value_or(a.name); + a.documentation = action.documentation.value_or(a.documentation); + a.guiPath = action.guiPath.value_or(a.guiPath); + if (!a.guiPath.starts_with('/')) { + throw ghoul::RuntimeError("Action's GuiPath must start with /"); } - if (action.hasValue("Documentation")) { - a.documentation = action.value("Documentation"); - } - if (action.hasValue("GuiPath")) { - a.guiPath = action.value("GuiPath"); - } - if (action.hasValue("IsLocal")) { - bool value = action.value("IsLocal"); - a.synchronization = interaction::Action::IsSynchronized(value); + if (action.isLocal.has_value()) { + a.synchronization = interaction::Action::IsSynchronized(*action.isLocal); } global::actionManager->registerAction(std::move(a)); } diff --git a/src/interaction/camerainteractionstates.cpp b/src/interaction/camerainteractionstates.cpp index 29b06143bd..b50e139ed8 100644 --- a/src/interaction/camerainteractionstates.cpp +++ b/src/interaction/camerainteractionstates.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/interactionmonitor.cpp b/src/interaction/interactionmonitor.cpp index f51e23953d..0e92ad4860 100644 --- a/src/interaction/interactionmonitor.cpp +++ b/src/interaction/interactionmonitor.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 f978a1fcd1..8970fe73f3 100644 --- a/src/interaction/joystickcamerastates.cpp +++ b/src/interaction/joystickcamerastates.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -54,11 +54,11 @@ void JoystickCameraStates::updateStateFromInput( return; } - std::pair globalRotation = { false, glm::dvec2(0.0) }; - std::pair zoom = { false, 0.0 }; - std::pair localRoll = { false, glm::dvec2(0.0) }; - std::pair globalRoll = { false, glm::dvec2(0.0) }; - std::pair localRotation = { false, glm::dvec2(0.0) }; + std::pair globalRotation = std::pair(false, glm::dvec2(0.0)); + std::pair zoom = std::pair(false, 0.0); + std::pair localRoll = std::pair(false, glm::dvec2(0.0)); + std::pair globalRoll = std::pair(false, glm::dvec2(0.0)); + std::pair localRotation = std::pair(false, glm::dvec2(0.0)); for (const JoystickInputState& joystickInputState : joystickInputStates) { if (joystickInputState.name.empty()) { diff --git a/src/interaction/joystickinputstate.cpp b/src/interaction/joystickinputstate.cpp index 7e3ad29088..2aa1c44f33 100644 --- a/src/interaction/joystickinputstate.cpp +++ b/src/interaction/joystickinputstate.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 91c9594c95..8e7dcb1e83 100644 --- a/src/interaction/keybindingmanager.cpp +++ b/src/interaction/keybindingmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 e6a1221945..054482e090 100644 --- a/src/interaction/keybindingmanager_lua.inl +++ b/src/interaction/keybindingmanager_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/keyboardinputstate.cpp b/src/interaction/keyboardinputstate.cpp index dde5ef037e..b9fdb7b11e 100644 --- a/src/interaction/keyboardinputstate.cpp +++ b/src/interaction/keyboardinputstate.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 64d502a268..3a722cde79 100644 --- a/src/interaction/mousecamerastates.cpp +++ b/src/interaction/mousecamerastates.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/mouseinputstate.cpp b/src/interaction/mouseinputstate.cpp index 56ed8f7a52..9f4c25d07d 100644 --- a/src/interaction/mouseinputstate.cpp +++ b/src/interaction/mouseinputstate.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/scriptcamerastates.cpp b/src/interaction/scriptcamerastates.cpp index 3ae3612d14..e27a18b9f9 100644 --- a/src/interaction/scriptcamerastates.cpp +++ b/src/interaction/scriptcamerastates.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 e6a665b1eb..f43eca5b69 100644 --- a/src/interaction/sessionrecording.cpp +++ b/src/interaction/sessionrecording.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -66,8 +66,8 @@ namespace { constexpr openspace::properties::Property::PropertyInfo RenderPlaybackInfo = { "RenderInfo", "Render Playback Information", - "If enabled, information about a currently played back session " - "recording is rendering to screen" + "If enabled, information about a currently played back session recording is " + "rendering to screen" }; constexpr openspace::properties::Property::PropertyInfo IgnoreRecordedScaleInfo = { @@ -231,9 +231,9 @@ bool SessionRecording::startRecording(const std::string& filename) { // Record the current delta time as the first property to save in the file. // This needs to be saved as a baseline whether or not it changes during recording _timestamps3RecordStarted = { - _timestampRecordStarted, - 0.0, - global::timeManager->time().j2000Seconds() + .timeOs = _timestampRecordStarted, + .timeRec = 0.0, + .timeSim = global::timeManager->time().j2000Seconds() }; recordCurrentTimePauseState(); diff --git a/src/interaction/sessionrecording_lua.inl b/src/interaction/sessionrecording_lua.inl index 28f33a62ed..72cdd87266 100644 --- a/src/interaction/sessionrecording_lua.inl +++ b/src/interaction/sessionrecording_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/tasks/convertrecfileversiontask.cpp b/src/interaction/tasks/convertrecfileversiontask.cpp index 61f3e31c61..6f700fc6dd 100644 --- a/src/interaction/tasks/convertrecfileversiontask.cpp +++ b/src/interaction/tasks/convertrecfileversiontask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp index e615993b6a..52bc0bda3a 100644 --- a/src/interaction/tasks/convertrecformattask.cpp +++ b/src/interaction/tasks/convertrecformattask.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/touchbar.mm b/src/interaction/touchbar.mm index 77fb5f0f77..e0c193d772 100644 --- a/src/interaction/touchbar.mm +++ b/src/interaction/touchbar.mm @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/websocketcamerastates.cpp b/src/interaction/websocketcamerastates.cpp index 2222d52e17..5315b104da 100644 --- a/src/interaction/websocketcamerastates.cpp +++ b/src/interaction/websocketcamerastates.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -42,11 +42,11 @@ void WebsocketCameraStates::updateStateFromInput( const WebsocketInputStates& websocketInputStates, double deltaTime) { - std::pair globalRotation = { false, glm::dvec2(0.0) }; - std::pair zoom = { false, 0.0 }; - std::pair localRoll = { false, glm::dvec2(0.0) }; - std::pair globalRoll = { false, glm::dvec2(0.0) }; - std::pair localRotation = { false, glm::dvec2(0.0) }; + std::pair globalRotation = std::pair(false, glm::dvec2(0.0)); + std::pair zoom = std::pair(false, 0.0); + std::pair localRoll = std::pair(false, glm::dvec2(0.0)); + std::pair globalRoll = std::pair(false, glm::dvec2(0.0)); + std::pair localRotation = std::pair(false, glm::dvec2(0.0)); if (!websocketInputStates.empty()) { for (int i = 0; i < WebsocketInputState::MaxAxes; ++i) { diff --git a/src/interaction/websocketinputstate.cpp b/src/interaction/websocketinputstate.cpp index 51f2b60534..58e1670457 100644 --- a/src/interaction/websocketinputstate.cpp +++ b/src/interaction/websocketinputstate.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 e9e11a4763..154908db07 100644 --- a/src/mission/mission.cpp +++ b/src/mission/mission.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 08ff5909b1..216c2634d3 100644 --- a/src/mission/missionmanager.cpp +++ b/src/mission/missionmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 d8a5bdf6a3..5c4c8eec3e 100644 --- a/src/mission/missionmanager_lua.inl +++ b/src/mission/missionmanager_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/keyframenavigator.cpp b/src/navigation/keyframenavigator.cpp index 188ead7c77..d6234a2708 100644 --- a/src/navigation/keyframenavigator.cpp +++ b/src/navigation/keyframenavigator.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp index adccd599a4..d99b34f0c3 100644 --- a/src/navigation/navigationhandler.cpp +++ b/src/navigation/navigationhandler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -380,6 +380,14 @@ bool NavigationHandler::disabledKeybindings() const { return _disableKeybindings; } +bool NavigationHandler::disabledMouse() const { + return _disableMouseInputs; +} + +bool NavigationHandler::disabledJoystick() const { + return _disableJoystickInputs; +} + NavigationState NavigationHandler::navigationState() const { const SceneGraphNode* referenceFrame = _orbitalNavigator.followingAnchorRotation() ? _orbitalNavigator.anchorNode() : @@ -631,7 +639,10 @@ scripting::LuaLibrary NavigationHandler::luaLibrary() { codegen::lua::TriggerIdleBehavior, codegen::lua::ListAllJoysticks, codegen::lua::TargetNextInterestingAnchor, - codegen::lua::TargetPreviousInterestingAnchor + codegen::lua::TargetPreviousInterestingAnchor, + codegen::lua::DistanceToFocus, + codegen::lua::DistanceToFocusBoundingSphere, + codegen::lua::DistanceToFocusInteractionSphere } }; } diff --git a/src/navigation/navigationhandler_lua.inl b/src/navigation/navigationhandler_lua.inl index 9e838cebab..e9fa215803 100644 --- a/src/navigation/navigationhandler_lua.inl +++ b/src/navigation/navigationhandler_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -70,17 +70,6 @@ namespace { [[codegen::luawrap]] void setNavigationState(ghoul::Dictionary navigationState) { using namespace openspace; - documentation::TestResult r = documentation::testSpecification( - interaction::NavigationState::Documentation(), - navigationState - ); - - if (!r.success) { - throw ghoul::lua::LuaError( - fmt::format("Could not set camera state: {}", ghoul::to_string(r)) - ); - } - global::navigationHandler->setNavigationStateNextFrame( interaction::NavigationState(navigationState) ); @@ -406,6 +395,46 @@ joystickAxis(std::string joystickName, int axis) return global::navigationHandler->listAllJoysticks(); } +/** + * Returns the distance in meters to the current focus node + */ +[[codegen::luawrap]] double distanceToFocus() { + using namespace openspace; + + const SceneGraphNode * focus = global::navigationHandler->anchorNode(); + Camera * camera = global::navigationHandler->camera(); + + return glm::distance(camera->positionVec3(), focus->worldPosition()); +} + +/** + * Returns the distance in meters to the current focus node's bounding sphere + */ +[[codegen::luawrap]] double distanceToFocusBoundingSphere() { + using namespace openspace; + + const SceneGraphNode* focus = global::navigationHandler->anchorNode(); + Camera* camera = global::navigationHandler->camera(); + + double distance = glm::distance(camera->positionVec3(), focus->worldPosition()); + + return distance - focus->boundingSphere(); +} + +/** + * Returns the distance in meters to the current focus node's interaction sphere + */ +[[codegen::luawrap]] double distanceToFocusInteractionSphere() { + using namespace openspace; + + const SceneGraphNode* focus = global::navigationHandler->anchorNode(); + Camera* camera = global::navigationHandler->camera(); + + double distance = glm::distance(camera->positionVec3(), focus->worldPosition()); + + return distance - focus->interactionSphere(); +} + #include "navigationhandler_lua_codegen.cpp" } // namespace diff --git a/src/navigation/navigationstate.cpp b/src/navigation/navigationstate.cpp index 09fca66482..81c23ab927 100644 --- a/src/navigation/navigationstate.cpp +++ b/src/navigation/navigationstate.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/orbitalnavigator.cpp b/src/navigation/orbitalnavigator.cpp index 1470287697..276f02c0a4 100644 --- a/src/navigation/orbitalnavigator.cpp +++ b/src/navigation/orbitalnavigator.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby 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,16 +50,15 @@ namespace { "Anchor", "Anchor", "The name of the scene graph node that is the origin of the camera interaction. " - "The camera follows, orbits and dollies towards this node. " - "Any scene graph node can be the anchor node" + "The camera follows, orbits and dollies towards this node. Any scene graph node " + "can be the anchor node" }; constexpr openspace::properties::Property::PropertyInfo AimInfo = { "Aim", "Aim", - "The name of the scene graph node that is the aim of the camera. " - "The camera direction is relative to the vector from the camera position " - "to this node" + "The name of the scene graph node that is the aim of the camera. The camera " + "direction is relative to the vector from the camera position to this node" }; constexpr openspace::properties::Property::PropertyInfo RetargetAnchorInfo = { @@ -158,8 +157,8 @@ namespace { { "StereoInterpolationTime", "Stereo Interpolation Time", - "The time to interpolate to a new stereoscopic depth " - "when the anchor node is changed, in seconds" + "The time to interpolate to a new stereoscopic depth when the anchor node is " + "changed, in seconds" }; constexpr openspace::properties::Property::PropertyInfo @@ -167,8 +166,8 @@ namespace { { "RetargetAnchorInterpolationTime", "Retarget Interpolation Time", - "The time to interpolate the camera rotation " - "when the anchor or aim node is changed, in seconds" + "The time to interpolate the camera rotation when the anchor or aim node is " + "changed, in seconds" }; constexpr openspace::properties::Property::PropertyInfo FollowRotationInterpTimeInfo = @@ -201,8 +200,8 @@ namespace { { "StaticViewScaleExponent", "Static View Scale Exponent", - "Statically scale the world by 10^StaticViewScaleExponent. " - "Only used if UseAdaptiveStereoscopicDepthInfo is set to false" + "Statically scale the world by 10^StaticViewScaleExponent. Only used if " + "UseAdaptiveStereoscopicDepthInfo is set to false" }; constexpr openspace::properties::Property::PropertyInfo @@ -210,9 +209,9 @@ namespace { { "StereoscopicDepthOfFocusSurface", "Stereoscopic Depth of the Surface in Focus", - "Set the stereoscopically perceived distance (in meters) to the closest " - "point out of the surface of the anchor and the center of the aim node. " - "Only used if UseAdaptiveStereoscopicDepthInfo is set to true" + "Set the stereoscopically perceived distance (in meters) to the closest point " + "out of the surface of the anchor and the center of the aim node. Only used if " + "UseAdaptiveStereoscopicDepthInfo is set to true" }; constexpr openspace::properties::Property::PropertyInfo ApplyIdleBehaviorInfo = { @@ -234,8 +233,8 @@ namespace { { "ShouldTriggerWhenIdle", "Should Trigger When Idle", - "If true, the chosen idle behavior will trigger automatically after " - "a certain time (see 'IdleWaitTime' property)" + "If true, the chosen idle behavior will trigger automatically after a certain " + "time (see 'IdleWaitTime' property)" }; constexpr openspace::properties::Property::PropertyInfo IdleWaitTimeInfo = { @@ -590,8 +589,8 @@ void OrbitalNavigator::updateCameraStateFromStates(double deltaTime) { glm::dvec3(0.0); CameraPose pose = { - _camera->positionVec3() + anchorDisplacement, - _camera->rotationQuaternion() + .position = _camera->positionVec3() + anchorDisplacement, + .rotation = _camera->rotationQuaternion() }; const bool hasPreviousPositions = @@ -603,10 +602,10 @@ void OrbitalNavigator::updateCameraStateFromStates(double deltaTime) { const glm::dvec3 cameraToAnchor = *_previousAnchorNodePosition - prevCameraPosition; - Displacement anchorToAim = { + Displacement anchorToAim = Displacement( *_previousAimNodePosition - *_previousAnchorNodePosition, aimPos - anchorPos - }; + ); anchorToAim = interpolateRetargetAim( deltaTime, diff --git a/src/navigation/path.cpp b/src/navigation/path.cpp index 46a32982e7..ecadff6d0d 100644 --- a/src/navigation/path.cpp +++ b/src/navigation/path.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/pathcurve.cpp b/src/navigation/pathcurve.cpp index 8c9b0fda87..de03d8e27b 100644 --- a/src/navigation/pathcurve.cpp +++ b/src/navigation/pathcurve.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/pathcurves/avoidcollisioncurve.cpp b/src/navigation/pathcurves/avoidcollisioncurve.cpp index ec546e7e33..60b240259b 100644 --- a/src/navigation/pathcurves/avoidcollisioncurve.cpp +++ b/src/navigation/pathcurves/avoidcollisioncurve.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/pathcurves/zoomoutoverviewcurve.cpp b/src/navigation/pathcurves/zoomoutoverviewcurve.cpp index 9f062c62de..11905b990e 100644 --- a/src/navigation/pathcurves/zoomoutoverviewcurve.cpp +++ b/src/navigation/pathcurves/zoomoutoverviewcurve.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/pathnavigator.cpp b/src/navigation/pathnavigator.cpp index b2b81cb92d..0753b6fb47 100644 --- a/src/navigation/pathnavigator.cpp +++ b/src/navigation/pathnavigator.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/navigation/pathnavigator_lua.inl b/src/navigation/pathnavigator_lua.inl index a2ade6c473..e58816f612 100644 --- a/src/navigation/pathnavigator_lua.inl +++ b/src/navigation/pathnavigator_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -27,8 +27,7 @@ namespace { // Returns true if a camera path is currently running, and false otherwise. [[codegen::luawrap]] bool isFlying() { using namespace openspace; - bool hasFinished = global::navigationHandler->pathNavigator().hasFinished(); - return !hasFinished; + return global::openSpaceEngine->currentMode() == OpenSpaceEngine::Mode::CameraPath; } // Continue playing a paused camera path. diff --git a/src/navigation/waypoint.cpp b/src/navigation/waypoint.cpp index 9337b8aa7b..2a4c81235a 100644 --- a/src/navigation/waypoint.cpp +++ b/src/navigation/waypoint.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -42,7 +42,7 @@ namespace openspace::interaction { Waypoint::Waypoint(const glm::dvec3& pos, const glm::dquat& rot, const std::string& ref) : _nodeIdentifier(ref) { - _pose = { pos, rot }; + _pose = { .position = pos, .rotation = rot }; const SceneGraphNode* node = sceneGraphNode(_nodeIdentifier); if (!node) { diff --git a/src/network/messagestructureshelper.cpp b/src/network/messagestructureshelper.cpp index dde96baa00..42666b2f13 100644 --- a/src/network/messagestructureshelper.cpp +++ b/src/network/messagestructureshelper.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 276ec3b486..731bdf34cc 100644 --- a/src/network/parallelconnection.cpp +++ b/src/network/parallelconnection.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 7e56d805bb..5221421dbc 100644 --- a/src/network/parallelpeer.cpp +++ b/src/network/parallelpeer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 ea77f89ff1..a081507b40 100644 --- a/src/network/parallelpeer_lua.inl +++ b/src/network/parallelpeer_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 1d7fc5366a..3340b0c90c 100644 --- a/src/openspace.cpp +++ b/src/openspace.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -29,7 +29,7 @@ namespace openspace { std::string licenseText() { return "OpenSpace\n\ \n\ -Copyright (c) 2014-2022\n\ +Copyright (c) 2014-2023\n\ \n\ Permission is hereby granted, free of charge, to any person obtaining a copy of this\n\ software and associated documentation files (the \"Software\"), to deal in the Software\n\ diff --git a/src/properties/list/doublelistproperty.cpp b/src/properties/list/doublelistproperty.cpp index 9e3c69a704..6d737e693e 100644 --- a/src/properties/list/doublelistproperty.cpp +++ b/src/properties/list/doublelistproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/list/intlistproperty.cpp b/src/properties/list/intlistproperty.cpp index ff65d8ff5f..3a2161cae6 100644 --- a/src/properties/list/intlistproperty.cpp +++ b/src/properties/list/intlistproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/list/stringlistproperty.cpp b/src/properties/list/stringlistproperty.cpp index 86ebb1b8ca..094a64b953 100644 --- a/src/properties/list/stringlistproperty.cpp +++ b/src/properties/list/stringlistproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 01d2596072..bf85fb0af9 100644 --- a/src/properties/matrix/dmat2property.cpp +++ b/src/properties/matrix/dmat2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 845a7bc8b9..b81f3ddda9 100644 --- a/src/properties/matrix/dmat3property.cpp +++ b/src/properties/matrix/dmat3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 ad4de4acdc..6ceda69248 100644 --- a/src/properties/matrix/dmat4property.cpp +++ b/src/properties/matrix/dmat4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 76b96d4a78..8da1b032f4 100644 --- a/src/properties/matrix/mat2property.cpp +++ b/src/properties/matrix/mat2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 178a3ec8fa..68bdfe9f05 100644 --- a/src/properties/matrix/mat3property.cpp +++ b/src/properties/matrix/mat3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 ac4e8bbbc0..9affdad963 100644 --- a/src/properties/matrix/mat4property.cpp +++ b/src/properties/matrix/mat4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 e4e539b653..ba0a38e95b 100644 --- a/src/properties/optionproperty.cpp +++ b/src/properties/optionproperty.cpp @@ -3,7 +3,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -59,7 +59,7 @@ const std::vector& OptionProperty::options() const { } void OptionProperty::addOption(int value, std::string desc) { - Option option = { std::move(value), std::move(desc) }; + Option option = { .value = std::move(value), .description = std::move(desc) }; for (const Option& o : _options) { if (o.value == option.value) { diff --git a/src/properties/property.cpp b/src/properties/property.cpp index f6012e4f4f..7ca893f124 100644 --- a/src/properties/property.cpp +++ b/src/properties/property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 1aad950591..3b4e780f42 100644 --- a/src/properties/propertyowner.cpp +++ b/src/properties/propertyowner.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -377,15 +377,9 @@ void PropertyOwner::removePropertySubOwner(openspace::properties::PropertyOwner& } void PropertyOwner::setIdentifier(std::string identifier) { - ghoul_precondition( - _identifier.find_first_of("\t\n ") == std::string::npos, - "Identifier must not contain any whitespaces" - ); - ghoul_precondition( - _identifier.find_first_of('.') == std::string::npos, - "Identifier must not contain any dots" - ); - + if (identifier.find_first_of(". \t\n") != std::string::npos) { + throw ghoul::RuntimeError("Identifier must not contain any dots or whitespaces"); + } _identifier = std::move(identifier); } diff --git a/src/properties/scalar/boolproperty.cpp b/src/properties/scalar/boolproperty.cpp index 9709498368..471e899301 100644 --- a/src/properties/scalar/boolproperty.cpp +++ b/src/properties/scalar/boolproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 96adca4909..3dffa7eda9 100644 --- a/src/properties/scalar/doubleproperty.cpp +++ b/src/properties/scalar/doubleproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 8b6f05edc4..cd3a43e707 100644 --- a/src/properties/scalar/floatproperty.cpp +++ b/src/properties/scalar/floatproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 758dff8f2f..85e009e705 100644 --- a/src/properties/scalar/intproperty.cpp +++ b/src/properties/scalar/intproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 4d7a8cc73d..16267e34d1 100644 --- a/src/properties/scalar/longproperty.cpp +++ b/src/properties/scalar/longproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 88339a9c53..6791b96b6e 100644 --- a/src/properties/scalar/shortproperty.cpp +++ b/src/properties/scalar/shortproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 62ad26d27d..2d32b72d84 100644 --- a/src/properties/scalar/uintproperty.cpp +++ b/src/properties/scalar/uintproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 84fae8d7ff..ce0c43831e 100644 --- a/src/properties/scalar/ulongproperty.cpp +++ b/src/properties/scalar/ulongproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 d6be61dad8..27b9c2baa3 100644 --- a/src/properties/scalar/ushortproperty.cpp +++ b/src/properties/scalar/ushortproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 3d65d8d1ff..94e1d1acff 100644 --- a/src/properties/selectionproperty.cpp +++ b/src/properties/selectionproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 2302ef8e1e..544f54f134 100644 --- a/src/properties/stringproperty.cpp +++ b/src/properties/stringproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 312f148fe1..e98d3886b4 100644 --- a/src/properties/triggerproperty.cpp +++ b/src/properties/triggerproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 88aefa1d78..8fa8dc4358 100644 --- a/src/properties/vector/dvec2property.cpp +++ b/src/properties/vector/dvec2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 00667d8050..9b6a922e99 100644 --- a/src/properties/vector/dvec3property.cpp +++ b/src/properties/vector/dvec3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 5a07cb11e9..ec48b32402 100644 --- a/src/properties/vector/dvec4property.cpp +++ b/src/properties/vector/dvec4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 4937ecdc3f..71a4918b53 100644 --- a/src/properties/vector/ivec2property.cpp +++ b/src/properties/vector/ivec2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 341f6b510f..2304dc34fb 100644 --- a/src/properties/vector/ivec3property.cpp +++ b/src/properties/vector/ivec3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 aa105756a1..d9a7106fe1 100644 --- a/src/properties/vector/ivec4property.cpp +++ b/src/properties/vector/ivec4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 8c44a9855a..3892c3d6ac 100644 --- a/src/properties/vector/uvec2property.cpp +++ b/src/properties/vector/uvec2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 194ec25279..93239cb8ac 100644 --- a/src/properties/vector/uvec3property.cpp +++ b/src/properties/vector/uvec3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 e07940fc24..28a6121c58 100644 --- a/src/properties/vector/uvec4property.cpp +++ b/src/properties/vector/uvec4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 0c69336a1f..222f5f7f8f 100644 --- a/src/properties/vector/vec2property.cpp +++ b/src/properties/vector/vec2property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 8ee408d3c0..14ab57e185 100644 --- a/src/properties/vector/vec3property.cpp +++ b/src/properties/vector/vec3property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 fce95037e3..a188424a3e 100644 --- a/src/properties/vector/vec4property.cpp +++ b/src/properties/vector/vec4property.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 8599ceb10d..f563993e22 100644 --- a/src/query/query.cpp +++ b/src/query/query.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 702be74828..a1db949730 100644 --- a/src/rendering/dashboard.cpp +++ b/src/rendering/dashboard.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 725f93585e..ef148fbb58 100644 --- a/src/rendering/dashboard_lua.inl +++ b/src/rendering/dashboard_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 6b87bc634c..801e045516 100644 --- a/src/rendering/dashboarditem.cpp +++ b/src/rendering/dashboarditem.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -40,25 +40,11 @@ namespace { "If this value is set to 'true' this dashboard item is shown in the dashboard" }; - constexpr openspace::properties::Property::PropertyInfo IdentifierInfo = { - "Identifier", - "Identifier", - "" - }; - - constexpr openspace::properties::Property::PropertyInfo GuiNameInfo = { - "GuiName", - "Gui Name", - "" - }; - struct [[codegen::Dictionary(DashboardItem)]] Parameters { std::string type; - // [[codegen::verbatim(IdentifierInfo.description)]] std::string identifier; - // [[codegen::verbatim(GuiNameInfo.description)]] std::optional guiName; }; #include "dashboarditem_codegen.cpp" diff --git a/src/rendering/dashboardtextitem.cpp b/src/rendering/dashboardtextitem.cpp index 30d4420c53..47d4bfa478 100644 --- a/src/rendering/dashboardtextitem.cpp +++ b/src/rendering/dashboardtextitem.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 69c91aeca3..70d57f7d36 100644 --- a/src/rendering/deferredcastermanager.cpp +++ b/src/rendering/deferredcastermanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 c17a83f50d..2897d3699c 100644 --- a/src/rendering/framebufferrenderer.cpp +++ b/src/rendering/framebufferrenderer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -51,7 +51,7 @@ namespace { constexpr std::string_view _loggerCat = "FramebufferRenderer"; - constexpr glm::vec4 PosBufferClearVal = { 1e32, 1e32, 1e32, 1.f }; + constexpr glm::vec4 PosBufferClearVal = glm::vec4(1e32, 1e32, 1e32, 1.f); constexpr std::array HDRUniformNames = { "hdrFeedingTexture", "blackoutFactor", "hdrExposure", "gamma", @@ -960,7 +960,7 @@ void FramebufferRenderer::updateRaycastData() { for (VolumeRaycaster* raycaster : raycasters) { ZoneScopedN("raycaster") - RaycastData data = { nextId++, "Helper" }; + RaycastData data = { .id = nextId++, .namespaceName = "Helper" }; const std::string& vsPath = raycaster->boundsVertexShaderPath(); std::string fsPath = raycaster->boundsFragmentShaderPath(); @@ -1029,7 +1029,7 @@ void FramebufferRenderer::updateDeferredcastData() { global::deferredcasterManager->deferredcasters(); int nextId = 0; for (Deferredcaster* caster : deferredcasters) { - DeferredcastData data = { nextId++, "HELPER" }; + DeferredcastData data = { .id = nextId++, .namespaceName = "HELPER" }; std::filesystem::path vsPath = caster->deferredcastVSPath(); std::filesystem::path fsPath = caster->deferredcastFSPath(); @@ -1129,10 +1129,9 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac Time time = global::timeManager->time(); RenderData data = { - *camera, - std::move(time), - 0, - {} + .camera = *camera, + .time = std::move(time), + .renderBinMask = 0 }; RendererTasks tasks; diff --git a/src/rendering/helper.cpp b/src/rendering/helper.cpp index 57e067c3a7..b6f1c9c105 100644 --- a/src/rendering/helper.cpp +++ b/src/rendering/helper.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 1be8d567d6..3b081b05da 100644 --- a/src/rendering/loadingscreen.cpp +++ b/src/rendering/loadingscreen.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -174,10 +174,10 @@ void LoadingScreen::render() { ghoul::fontrendering::FontRenderer::defaultRenderer().setFramebufferSize(res); - const glm::vec2 size = { + const glm::vec2 size = glm::vec2( LogoSize.x, LogoSize.y * textureAspectRatio * screenAspectRatio - }; + ); // // Clear background @@ -204,10 +204,10 @@ void LoadingScreen::render() { // // Render progress bar // - const glm::vec2 progressbarSize = { + const glm::vec2 progressbarSize = glm::vec2( ProgressbarSize.x, ProgressbarSize.y * screenAspectRatio - }; + ); if (_showProgressbar) { const float progress = _nItems != 0 ? @@ -300,17 +300,17 @@ void LoadingScreen::render() { std::chrono::system_clock::time_point now = std::chrono::system_clock::now(); - const glm::vec2 logoLl = { LogoCenter.x - size.x, LogoCenter.y - size.y }; - const glm::vec2 logoUr = { LogoCenter.x + size.x, LogoCenter.y + size.y }; + const glm::vec2 logoLl = glm::vec2(LogoCenter.x - size.x, LogoCenter.y - size.y); + const glm::vec2 logoUr = glm::vec2(LogoCenter.x + size.x, LogoCenter.y + size.y); - const glm::vec2 progressbarLl = { + const glm::vec2 progressbarLl = glm::vec2( ProgressbarCenter.x - progressbarSize.x, ProgressbarCenter.y - progressbarSize.y - }; - const glm::vec2 progressbarUr = { + ); + const glm::vec2 progressbarUr = glm::vec2( ProgressbarCenter.x + progressbarSize.x , ProgressbarCenter.y + progressbarSize.y - }; + ); for (Item& item : _items) { if (!item.hasLocation) { @@ -333,7 +333,7 @@ void LoadingScreen::render() { static_cast(res.y - b.y - 15) ); - ll = { distX(_randomEngine), distY(_randomEngine) }; + ll = glm::vec2(distX(_randomEngine), distY(_randomEngine)); ur = ll + b; // Test against logo and text @@ -553,17 +553,12 @@ void LoadingScreen::updateItem(const std::string& itemIdentifier, // We are not computing the location in here since doing it this way might stall // the main thread while trying to find a position for the new item Item item = { - itemIdentifier, - itemName, - ItemStatus::Started, - std::move(progressInfo), - false, -#ifdef LOADINGSCREEN_DEBUGGING - false, -#endif // LOADINGSCREEN_DEBUGGING - {}, - {}, - std::chrono::system_clock::from_time_t(0) + .identifier = itemIdentifier, + .name = itemName, + .status = ItemStatus::Started, + .progress = std::move(progressInfo), + .hasLocation = false, + .finishedTime = std::chrono::system_clock::from_time_t(0) }; if (newStatus == ItemStatus::Finished) { diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp index b31c0ea85c..307c28dba3 100644 --- a/src/rendering/luaconsole.cpp +++ b/src/rendering/luaconsole.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -528,7 +528,11 @@ bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction actio // We only want to remove the autocomplete info if we just // entered the 'default' openspace namespace if (command.substr(0, pos + 1) == "openspace.") { - _autoCompleteInfo = { NoAutoComplete, false, "" }; + _autoCompleteInfo = { + .lastIndex = NoAutoComplete, + .hasInitialValue = false, + .initialValue = "" + }; } } } @@ -542,7 +546,11 @@ bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction actio // If any other key is pressed, we want to remove our previous findings // The special case for Shift is necessary as we want to allow Shift+TAB if (!modifierShift) { - _autoCompleteInfo = { NoAutoComplete, false, "" }; + _autoCompleteInfo = { + .lastIndex = NoAutoComplete, + .hasInitialValue = false, + .initialValue = "" + }; } } diff --git a/src/rendering/raycastermanager.cpp b/src/rendering/raycastermanager.cpp index 2a5c2caa61..738679b951 100644 --- a/src/rendering/raycastermanager.cpp +++ b/src/rendering/raycastermanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 a5deb4060b..6f063a4a4f 100644 --- a/src/rendering/renderable.cpp +++ b/src/rendering/renderable.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 7a5777575a..b1c82a168c 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -111,7 +111,7 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ShowCameraInfo = { "ShowCamera", "Shows information about the current camera state, such as friction", - "This value determines whether the information about the current camrea state is " + "This value determines whether the information about the current camera state is " "shown on the screen" }; @@ -174,31 +174,31 @@ namespace { constexpr openspace::properties::Property::PropertyInfo ScreenSpaceRotationInfo = { "ScreenSpaceRotation", "Screen Space Rotation", - "Applies a rotation to all screen space renderables. " - "Defined using pitch, yaw, roll in radians" + "Applies a rotation to all screen space renderables. Defined using pitch, yaw, " + "roll in radians" }; constexpr openspace::properties::Property::PropertyInfo MasterRotationInfo = { "MasterRotation", "Master Rotation", - "Applies a view rotation for only the master node, defined using " - "pitch, yaw, roll in radians. This can be used to compensate the master view " - "direction for tilted display systems in clustered immersive environments" + "Applies a view rotation for only the master node, defined using pitch, yaw, " + "roll in radians.This can be used to compensate the master view direction for " + "tilted display systems in clustered immersive environments" }; constexpr openspace::properties::Property::PropertyInfo DisableHDRPipelineInfo = { "DisableHDRPipeline", "Disable HDR Rendering", - "If this value is enabled, the rendering will disable the HDR color handling " - "and the LDR color pipeline will be used. Be aware of possible over exposure " - "in the final colors" + "If this value is enabled, the rendering will disable the HDR color handling and " + "the LDR color pipeline will be used. Be aware of possible over exposure in the " + "final colors" }; constexpr openspace::properties::Property::PropertyInfo HDRExposureInfo = { "HDRExposure", "HDR Exposure", - "This value determines the amount of light per unit area reaching the " - "equivalent of an electronic image sensor" + "This value determines the amount of light per unit area reaching the equivalent " + "of an electronic image sensor" }; constexpr openspace::properties::Property::PropertyInfo GammaInfo = { @@ -1148,12 +1148,12 @@ void RenderEngine::renderCameraInformation() { using FR = ghoul::fontrendering::FontRenderer; - _cameraButtonLocations.rotation = { + _cameraButtonLocations.rotation = glm::ivec4( fontResolution().x - rotationBox.x - XSeparation, fontResolution().y - penPosY, rotationBox.x, rotationBox.y - }; + ); FR::defaultRenderer().render( *_fontCameraInfo, glm::vec2(fontResolution().x - rotationBox.x - XSeparation, penPosY), @@ -1164,12 +1164,12 @@ void RenderEngine::renderCameraInformation() { const glm::vec2 zoomBox = _fontCameraInfo->boundingBox("Zoom"); - _cameraButtonLocations.zoom = { + _cameraButtonLocations.zoom = glm::ivec4( fontResolution().x - zoomBox.x - XSeparation, fontResolution().y - penPosY, zoomBox.x, zoomBox.y - }; + ); FR::defaultRenderer().render( *_fontCameraInfo, glm::vec2(fontResolution().x - zoomBox.x - XSeparation, penPosY), @@ -1180,12 +1180,12 @@ void RenderEngine::renderCameraInformation() { const glm::vec2 rollBox = _fontCameraInfo->boundingBox("Roll"); - _cameraButtonLocations.roll = { + _cameraButtonLocations.roll = glm::ivec4( fontResolution().x - rollBox.x - XSeparation, fontResolution().y - penPosY, rollBox.x, rollBox.y - }; + ); FR::defaultRenderer().render( *_fontCameraInfo, glm::vec2(fontResolution().x - rollBox.x - XSeparation, penPosY), diff --git a/src/rendering/renderengine_lua.inl b/src/rendering/renderengine_lua.inl index b37e6ad993..7a8460b7d9 100644 --- a/src/rendering/renderengine_lua.inl +++ b/src/rendering/renderengine_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 2b0650e919..d6607c9857 100644 --- a/src/rendering/screenspacerenderable.cpp +++ b/src/rendering/screenspacerenderable.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -105,8 +105,8 @@ namespace { constexpr openspace::properties::Property::PropertyInfo MultiplyColorInfo = { "MultiplyColor", "Multiply Color", - "If set, the plane's texture is multiplied with this color. " - "Useful for applying a color grayscale images" + "If set, the plane's texture is multiplied with this color. Useful for applying " + "a color grayscale images" }; constexpr openspace::properties::Property::PropertyInfo BackgroundColorInfo = { diff --git a/src/rendering/texturecomponent.cpp b/src/rendering/texturecomponent.cpp index 3371f10019..ae5b7ea948 100644 --- a/src/rendering/texturecomponent.cpp +++ b/src/rendering/texturecomponent.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 5f9f628448..47ce67062f 100644 --- a/src/rendering/transferfunction.cpp +++ b/src/rendering/transferfunction.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 43136ed76f..b84695586e 100644 --- a/src/rendering/volumeraycaster.cpp +++ b/src/rendering/volumeraycaster.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 51136bb1ec..d2977ce879 100644 --- a/src/scene/asset.cpp +++ b/src/scene/asset.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 ef2e2b8452..98b27c19d1 100644 --- a/src/scene/assetmanager.cpp +++ b/src/scene/assetmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 6e044102ce..6a56192b38 100644 --- a/src/scene/assetmanager_lua.inl +++ b/src/scene/assetmanager_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 2920cfd62c..bf36b3cbda 100644 --- a/src/scene/lightsource.cpp +++ b/src/scene/lightsource.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/profile.cpp b/src/scene/profile.cpp index c09c9ecfb6..62d226c5cd 100644 --- a/src/scene/profile.cpp +++ b/src/scene/profile.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/profile_lua.inl b/src/scene/profile_lua.inl index 3f47ff25f7..44880efc03 100644 --- a/src/scene/profile_lua.inl +++ b/src/scene/profile_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 9a3cdf3acb..0f2c55f619 100644 --- a/src/scene/rotation.cpp +++ b/src/scene/rotation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 16286f82cd..cbc5af3bb1 100644 --- a/src/scene/scale.cpp +++ b/src/scene/scale.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 f5cdcc7793..54ec1639ac 100644 --- a/src/scene/scene.cpp +++ b/src/scene/scene.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -111,7 +111,18 @@ Scene::Scene(std::unique_ptr initializer) } Scene::~Scene() { - clear(); + LINFO("Clearing current scene graph"); + for (SceneGraphNode* node : _topologicallySortedNodes) { + if (node->identifier() == "Root") { + continue; + } + // There might still be scene graph nodes around that weren't removed by the asset + // manager as they would have been added manually by the user. This also serves as + // a backstop for assets that forgot to implement the onDeinitialize functions + node->deinitializeGL(); + node->deinitialize(); + } + _rootDummy.clearChildren(); _rootDummy.setScene(nullptr); } @@ -312,11 +323,6 @@ void Scene::render(const RenderData& data, RendererTasks& tasks) { } } -void Scene::clear() { - LINFO("Clearing current scene graph"); - _rootDummy.clearChildren(); -} - const std::unordered_map& Scene::nodesByIdentifier() const { return _nodesByIdentifier; } @@ -436,6 +442,7 @@ std::chrono::steady_clock::time_point Scene::currentTimeForInterpolation() { } void Scene::addPropertyInterpolation(properties::Property* prop, float durationSeconds, + std::string postScript, ghoul::EasingFunction easingFunction) { ghoul_precondition(prop != nullptr, "prop must not be nullptr"); @@ -462,6 +469,7 @@ void Scene::addPropertyInterpolation(properties::Property* prop, float durationS if (info.prop == prop) { info.beginTime = now; info.durationSeconds = durationSeconds; + info.postScript = std::move(postScript), info.easingFunction = func; // If we found it, we can break since we make sure that each property is only // represented once in this @@ -470,12 +478,12 @@ void Scene::addPropertyInterpolation(properties::Property* prop, float durationS } PropertyInterpolationInfo i = { - prop, - now, - durationSeconds, - func + .prop = prop, + .beginTime = now, + .durationSeconds = durationSeconds, + .postScript = std::move(postScript), + .easingFunction = func }; - _propertyInterpolationInfos.push_back(std::move(i)); } @@ -510,13 +518,12 @@ void Scene::updateInterpolations() { steady_clock::time_point now = currentTimeForInterpolation(); // First, let's update the properties for (PropertyInterpolationInfo& i : _propertyInterpolationInfos) { - long long usPassed = duration_cast( - now - i.beginTime - ).count(); + long long us = + duration_cast(now - i.beginTime).count(); const float t = glm::clamp( static_cast( - static_cast(usPassed) / + static_cast(us) / static_cast(i.durationSeconds * 1000000) ), 0.f, @@ -534,6 +541,13 @@ void Scene::updateInterpolations() { i.isExpired = (t == 1.f); if (i.isExpired) { + if (!i.postScript.empty()) { + global::scriptEngine->queueScript( + std::move(i.postScript), + scripting::ScriptEngine::RemoteScripting::No + ); + } + global::eventEngine->publishEvent(i.prop); } } @@ -581,7 +595,8 @@ void Scene::setPropertiesFromProfile(const Profile& p) { allProperties(), 0.0, groupName, - ghoul::EasingFunction::Linear + ghoul::EasingFunction::Linear, + "" ); // Clear lua state stack lua_settop(L, 0); @@ -751,13 +766,23 @@ std::vector Scene::propertiesMatchingRegex( return findMatchesInAllProperties(propertyString, allProperties(), ""); } +std::vector Scene::allTags() { + std::set result; + for (SceneGraphNode* node : _topologicallySortedNodes) { + const std::vector& tags = node->tags(); + result.insert(tags.begin(), tags.end()); + } + + return std::vector(result.begin(), result.end()); +} + scripting::LuaLibrary Scene::luaLibrary() { return { "", { { "setPropertyValue", - &luascriptfunctions::propertySetValue, + &luascriptfunctions::propertySetValue, {}, "", "Sets all property(s) identified by the URI (with potential wildcards) " @@ -769,20 +794,16 @@ scripting::LuaLibrary Scene::luaLibrary() { "function if a 'duration' has been specified. If 'duration' is 0, this " "parameter value is ignored. Otherwise, it can be one of many supported " "easing functions. See easing.h for available functions. The fifth " - "argument must be either empty, 'regex', or 'single'. If the fifth" - "argument is empty (the default), the URI is interpreted using a " - "wildcard in which '*' is expanded to '(.*)' and bracketed components " - "'{ }' are interpreted as group tag names. Then, the passed value will " - "be set on all properties that fit the regex + group name combination. " - "If the fifth argument is 'regex' neither the '*' expansion, nor the " - "group tag expansion is performed and the first argument is used as an " - "ECMAScript style regular expression that matches against the fully " - "qualified IDs of properties. If the fifth argument is 'single' no " - "substitutions are performed and exactly 0 or 1 properties are changed" + "argument is another Lua script that will be executed when the " + "interpolation provided in parameter 3 finishes.\n" + "The URI is interpreted using a wildcard in which '*' is expanded to " + "'(.*)' and bracketed components '{ }' are interpreted as group tag " + "names. Then, the passed value will be set on all properties that fit " + "the regex + group name combination." }, { "setPropertyValueSingle", - &luascriptfunctions::propertySetValueSingle, + &luascriptfunctions::propertySetValue, {}, "", "Sets the property identified by the URI in the first argument. The " @@ -794,7 +815,9 @@ scripting::LuaLibrary Scene::luaLibrary() { "specified. If 'duration' is 0, this parameter value is ignored. " "Otherwise, it has to be 'linear', 'easein', 'easeout', or 'easeinout'. " "This is the same as calling the setValue method and passing 'single' as " - "the fourth argument to setPropertyValue" + "the fourth argument to setPropertyValue. The fifth argument is another " + "Lua script that will be executed when the interpolation provided in " + "parameter 3 finishes." }, { "getPropertyValue", diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl index 8dd56fff13..0b3701aeb9 100644 --- a/src/scene/scene_lua.inl +++ b/src/scene/scene_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -196,7 +196,8 @@ void applyRegularExpression(lua_State* L, const std::string& regex, const std::vector& properties, double interpolationDuration, const std::string& groupName, - ghoul::EasingFunction easingFunction) + ghoul::EasingFunction easingFunction, + std::string postScript) { using namespace openspace; using ghoul::lua::errorLocation; @@ -244,6 +245,7 @@ void applyRegularExpression(lua_State* L, const std::string& regex, global::renderEngine->scene()->addPropertyInterpolation( prop, static_cast(interpolationDuration), + std::move(postScript), easingFunction ); } @@ -283,7 +285,7 @@ namespace openspace::luascriptfunctions { int setPropertyCallSingle(properties::Property& prop, const std::string& uri, lua_State* L, double duration, - ghoul::EasingFunction easingFunction) + ghoul::EasingFunction easingFunction, std::string postScript) { using ghoul::lua::errorLocation; using ghoul::lua::luaTypeToString; @@ -313,6 +315,7 @@ int setPropertyCallSingle(properties::Property& prop, const std::string& uri, global::renderEngine->scene()->addPropertyInterpolation( &prop, static_cast(duration), + std::move(postScript), easingFunction ); } @@ -320,50 +323,69 @@ int setPropertyCallSingle(properties::Property& prop, const std::string& uri, return 0; } +template int propertySetValue(lua_State* L) { - ghoul::lua::checkArgumentsAndThrow(L, { 2, 5 }, "lua::property_setValue"); + int nParameters = ghoul::lua::checkArgumentsAndThrow( + L, + { 2, 6 }, + "lua::property_setValue" + ); defer { lua_settop(L, 0); }; std::string uriOrRegex = ghoul::lua::value(L, 1, ghoul::lua::PopValue::No); - std::string optimization; double interpolationDuration = 0.0; std::string easingMethodName; ghoul::EasingFunction easingMethod = ghoul::EasingFunction::Linear; + std::string postScript; + + // Extracting the parameters. These are the options that we have: + // 1. + // 2. + // 3. + // 4. + + if (nParameters >= 3) { + // Later functions expect the value to be at the last position on the stack + lua_pushvalue(L, 2); - if (lua_gettop(L) >= 3) { if (ghoul::lua::hasValue(L, 3)) { interpolationDuration = ghoul::lua::value(L, 3, ghoul::lua::PopValue::No); } else { - optimization = ghoul::lua::value(L, 3, ghoul::lua::PopValue::No); + std::string msg = fmt::format( + "Unexpected type {} in argument 3", + ghoul::lua::luaTypeToString(lua_type(L, 3)) + ); + return ghoul::lua::luaError(L, msg); } - - if (lua_gettop(L) >= 4) { - if (ghoul::lua::hasValue(L, 4)) { - interpolationDuration = - ghoul::lua::value(L, 4, ghoul::lua::PopValue::No); - } - else { - easingMethodName = - ghoul::lua::value(L, 4, ghoul::lua::PopValue::No); - } - } - - if (lua_gettop(L) == 5) { - optimization = ghoul::lua::value(L, 5, ghoul::lua::PopValue::No); - } - - // Later functions expect the value to be at the last position on the stack - lua_pushvalue(L, 2); } - - if ((interpolationDuration == 0.0) && !easingMethodName.empty()) { - LWARNINGC( - "property_setValue", - "Easing method specified while interpolation duration is equal to 0" - ); + if (nParameters >= 4) { + if (ghoul::lua::hasValue(L, 4)) { + easingMethodName = + ghoul::lua::value(L, 4, ghoul::lua::PopValue::No); + } + else { + std::string msg = fmt::format( + "Unexpected type {} in argument 4", + ghoul::lua::luaTypeToString(lua_type(L, 4)) + ); + return ghoul::lua::luaError(L, msg); + } + } + if (nParameters == 5) { + if (ghoul::lua::hasValue(L, 5)) { + postScript = + ghoul::lua::value(L, 5, ghoul::lua::PopValue::No); + } + else { + std::string msg = fmt::format( + "Unexpected type {} in argument 5", + ghoul::lua::luaTypeToString(lua_type(L, 5)) + ); + return ghoul::lua::luaError(L, msg); + } } if (!easingMethodName.empty()) { @@ -379,34 +401,7 @@ int propertySetValue(lua_State* L) { } } - if (optimization.empty()) { - std::string groupName; - if (doesUriContainGroupTag(uriOrRegex, groupName)) { - // Remove group name from start of regex and replace with '*' - uriOrRegex = removeGroupNameFromUri(uriOrRegex); - } - - applyRegularExpression( - L, - uriOrRegex, - allProperties(), - interpolationDuration, - groupName, - easingMethod - ); - return 0; - } - else if (optimization == "regex") { - applyRegularExpression( - L, - uriOrRegex, - allProperties(), - interpolationDuration, - "", - easingMethod - ); - } - else if (optimization == "single") { + if (optimization) { properties::Property* prop = property(uriOrRegex); if (!prop) { LERRORC( @@ -423,34 +418,30 @@ int propertySetValue(lua_State* L) { uriOrRegex, L, interpolationDuration, - easingMethod + easingMethod, + std::move(postScript) ); } else { - LERRORC( - "lua::propertySetValue", - fmt::format( - "{}: Unexpected optimization '{}'", - ghoul::lua::errorLocation(L), optimization - ) + std::string groupName; + if (doesUriContainGroupTag(uriOrRegex, groupName)) { + // Remove group name from start of regex and replace with '*' + uriOrRegex = removeGroupNameFromUri(uriOrRegex); + } + + applyRegularExpression( + L, + uriOrRegex, + allProperties(), + interpolationDuration, + groupName, + easingMethod, + std::move(postScript) ); } return 0; } -int propertySetValueSingle(lua_State* L) { - const int n = lua_gettop(L); - if (n == 3) { - // If we pass three arguments, the third one is the interpolation factor and the - // user did not specify an easing factor, so we have to add that manually before - // adding the single optimization - ghoul::lua::push(L, ghoul::nameForEasingFunction(ghoul::EasingFunction::Linear)); - } - - ghoul::lua::push(L, "single"); - return propertySetValue(L); -} - int propertyGetValue(lua_State* L) { ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::propertyGetValue"); const std::string uri = ghoul::lua::value(L); @@ -961,7 +952,7 @@ void createCustomProperty(openspace::properties::Property::PropertyInfo info, std::optional onChange) { T* p = new T(info); - if (onChange.has_value()) { + if (onChange.has_value() && !onChange->empty()) { p->onChange( [p, script = *onChange]() { using namespace ghoul::lua; @@ -976,12 +967,63 @@ void createCustomProperty(openspace::properties::Property::PropertyInfo info, openspace::global::userPropertyOwner->addProperty(p); } -[[codegen::luawrap]] void addCustomProperty(std::string identifier, std::string type, +enum class [[codegen::enum]] CustomPropertyType { + DMat2Property, + DMat3Property, + DMat4Property, + Mat2Property, + Mat3Property, + Mat4Property, + BoolProperty, + DoubleProperty, + FloatProperty, + IntProperty, + StringProperty, + StringListProperty, + LongProperty, + ShortProperty, + UShortProperty, + UIntProperty, + ULongProperty, + DVec2Property, + DVec3Property, + DVec4Property, + IVec2Property, + IVec3Property, + IVec4Property, + UVec2Property, + UVec3Property, + UVec4Property, + Vec2Property, + Vec3Property, + Vec4Property +}; + +/** + * Creates a new property that lives in the `UserProperty` group. + * + * \param identifier The identifier that is going to be used for the new property + * \param type The type of the property, has to be one of "DMat2Property", + * "DMat3Property", "DMat4Property", "Mat2Property", "Mat3Property", + * "Mat4Property", "BoolProperty", "DoubleProperty", "FloatProperty", + * "IntProperty", "StringProperty", "StringListProperty", "LongProperty", + * "ShortProperty", "UIntProperty", "ULongProperty", "DVec2Property", + * "DVec3Property", "DVec4Property", "IVec2Property", "IVec3Property", + * "IVec4Property", "UVec2Property", "UVec3Property", "UVec4Property", + * "Vec2Property", "Vec3Property", "Vec4Property" + * \param guiName The name that the property uses in the user interface. If this value is + * not provided, the `identifier` is used instead + * \param description A description what the property is used for + * \param onChange A Lua script that will be executed whenever the property changes + */ +[[codegen::luawrap]] void addCustomProperty(std::string identifier, + CustomPropertyType type, std::optional guiName, std::optional description, std::optional onChange) { using namespace openspace; + using namespace openspace::properties; if (identifier.empty()) { throw ghoul::lua::LuaError("Identifier must not empty"); @@ -1005,92 +1047,101 @@ void createCustomProperty(openspace::properties::Property::PropertyInfo info, guiName->c_str() : identifier.c_str(); - properties::Property::PropertyInfo info = { + Property::PropertyInfo info = { identifier.c_str(), gui, description.has_value() ? description->c_str() : "" }; - if (type == "DMat2Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "DMat3Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "DMat4Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "Mat2Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "Mat3Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "Mat4Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "BoolProperty") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "DoubleProperty") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "FloatProperty") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "IntProperty") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "LongProperty") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "ShortProperty") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "UIntProperty") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "ULongProperty") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "UShortProperty") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "DVec2Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "DVec3Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "DVec4Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "IVec2Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "IVec3Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "IVec4Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "UVec2Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "UVec3Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "UVec4Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "Vec2Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "Vec3Property") { - createCustomProperty(info, std::move(onChange)); - } - else if (type == "Vec4Property") { - createCustomProperty(info, std::move(onChange)); + switch (type) { + case CustomPropertyType::DMat2Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::DMat3Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::DMat4Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::Mat2Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::Mat3Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::Mat4Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::BoolProperty: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::DoubleProperty: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::FloatProperty: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::IntProperty: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::StringProperty: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::StringListProperty: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::LongProperty: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::ShortProperty: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::UIntProperty: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::ULongProperty: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::UShortProperty: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::DVec2Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::DVec3Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::DVec4Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::IVec2Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::IVec3Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::IVec4Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::UVec2Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::UVec3Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::UVec4Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::Vec2Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::Vec3Property: + createCustomProperty(info, std::move(onChange)); + return; + case CustomPropertyType::Vec4Property: + createCustomProperty(info, std::move(onChange)); + return; } + throw std::runtime_error("Missing case label"); } [[codegen::luawrap]] void removeCustomProperty(std::string identifier) { diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp index 4737edf136..30e09f426b 100644 --- a/src/scene/scenegraphnode.cpp +++ b/src/scene/scenegraphnode.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -81,8 +81,8 @@ namespace { constexpr openspace::properties::Property::PropertyInfo VisibilityDistanceInfo = { "VisibilityDistance", "VisibilityDistance", - "The distace in world coordinates between node and camera " - "at which the screenspace object will become visible", + "The distace in world coordinates between node and camera at which the " + "screenspace object will become visible", openspace::properties::Property::Visibility::Hidden }; @@ -101,10 +101,9 @@ namespace { "InteractionSphere", "Interaction Sphere", "The minimum radius that the camera is allowed to get close to this scene graph " - "node. This value is " - "only used as an override to the bounding sphere calculated by the Renderable, " - "if present. If this value is -1, the Renderable's computed interaction sphere " - "is used", + "node. This value is only used as an override to the bounding sphere calculated " + "by the Renderable, if present. If this value is -1, the Renderable's computed " + "interaction sphere is used", openspace::properties::Property::Visibility::Developer }; @@ -125,32 +124,31 @@ namespace { constexpr openspace::properties::Property::PropertyInfo GuiPathInfo = { "GuiPath", "Gui Path", - "This is the path for the scene graph node in the gui " - "example: /Solar System/Planets/Earth", + "This is the path for the scene graph node in the gui example: " + "/Solar System/Planets/Earth", openspace::properties::Property::Visibility::Hidden }; constexpr openspace::properties::Property::PropertyInfo GuiNameInfo = { "GuiName", "Gui Name", - "This is the name for the scene graph node in the gui " - "example: Earth", + "This is the name for the scene graph node in the gui. Example: Earth", openspace::properties::Property::Visibility::Hidden }; constexpr openspace::properties::Property::PropertyInfo GuiDescriptionInfo = { "GuiDescription", "Gui Description", - "This is the description for the scene graph node to be shown in the gui " - "example: Earth is a special place", + "This is the description for the scene graph node to be shown in the gui. " + "Example: Earth is a special place", openspace::properties::Property::Visibility::Hidden }; constexpr openspace::properties::Property::PropertyInfo GuiHiddenInfo = { "GuiHidden", "Gui Hidden", - "This represents if the scene graph node should be shown in the gui " - "example: false", + "This represents if the scene graph node should be shown in the gui. " + "Example: false", openspace::properties::Property::Visibility::Hidden }; @@ -303,28 +301,32 @@ ghoul::mm_unique_ptr SceneGraphNode::createFromDictionary( if (p.gui->name.has_value()) { result->setGuiName(*p.gui->name); result->_guiDisplayName = result->guiName(); - result->addProperty(result->_guiDisplayName); } + result->addProperty(result->_guiDisplayName); if (p.gui->description.has_value()) { result->setDescription(*p.gui->description); result->_guiDescription = result->description(); - result->addProperty(result->_guiDescription); } + result->addProperty(result->_guiDescription); if (p.gui->hidden.has_value()) { result->_guiHidden = *p.gui->hidden; - result->addProperty(result->_guiHidden); } + result->addProperty(result->_guiHidden); if (p.gui->path.has_value()) { + if (!p.gui->path->starts_with('/')) { + throw ghoul::RuntimeError("GuiPath must start with /"); + } result->_guiPath = *p.gui->path; - result->addProperty(result->_guiPath); } + result->addProperty(result->_guiPath); } - result->_overrideBoundingSphere = p.boundingSphere; - result->_overrideInteractionSphere = p.interactionSphere; + result->_boundingSphere = p.boundingSphere.value_or(result->_boundingSphere); + result->_interactionSphere = p.interactionSphere.value_or(result->_interactionSphere); + result->_approachFactor = p.approachFactor.value_or(result->_approachFactor); result->_reachFactor = p.reachFactor.value_or(result->_reachFactor); @@ -486,7 +488,7 @@ ghoul::opengl::ProgramObject* SceneGraphNode::_debugSphereProgram = nullptr; SceneGraphNode::SceneGraphNode() : properties::PropertyOwner({ "" }) , _guiHidden(GuiHiddenInfo) - , _guiPath(GuiPathInfo) + , _guiPath(GuiPathInfo, "/") , _guiDisplayName(GuiNameInfo) , _guiDescription(GuiDescriptionInfo) , _transform { @@ -728,10 +730,14 @@ void SceneGraphNode::render(const RenderData& data, RendererTasks& tasks) { TracyGpuZone("Render") RenderData newData = { - data.camera, - data.time, - data.renderBinMask, - { _worldPositionCached, _worldRotationCached, _worldScaleCached } + .camera = data.camera, + .time = data.time, + .renderBinMask = data.renderBinMask, + .modelTransform = { + .translation = _worldPositionCached, + .rotation = _worldRotationCached, + .scale = _worldScaleCached + } }; _renderable->render(newData, tasks); @@ -1009,7 +1015,12 @@ SurfacePositionHandle SceneGraphNode::calculateSurfacePositionHandle( return _renderable->calculateSurfacePositionHandle(targetModelSpace); } else { - return { glm::dvec3(0.0), glm::normalize(targetModelSpace), 0.0 }; + const glm::dvec3 directionFromCenterToTarget = glm::normalize(targetModelSpace); + return { + directionFromCenterToTarget * interactionSphere(), + directionFromCenterToTarget, + 0.0 + }; } } diff --git a/src/scene/sceneinitializer.cpp b/src/scene/sceneinitializer.cpp index 5e18a523ed..6728338be7 100644 --- a/src/scene/sceneinitializer.cpp +++ b/src/scene/sceneinitializer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 f7305daa12..7a096423d3 100644 --- a/src/scene/scenelicensewriter.cpp +++ b/src/scene/scenelicensewriter.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 031694ba6c..00f8b0cb07 100644 --- a/src/scene/timeframe.cpp +++ b/src/scene/timeframe.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 5c092594cf..d977b8cddf 100644 --- a/src/scene/translation.cpp +++ b/src/scene/translation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 143eaddd04..d22c25b0ea 100644 --- a/src/scripting/lualibrary.cpp +++ b/src/scripting/lualibrary.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 917d42ac63..03fae5f5ab 100644 --- a/src/scripting/scriptengine.cpp +++ b/src/scripting/scriptengine.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -673,8 +673,8 @@ void ScriptEngine::addBaseLibrary() { ZoneScoped LuaLibrary lib = { - "", - { + .name = "", + .functions = { { "printTrace", &luascriptfunctions::printTrace, diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl index 1ec9ad551c..dbe600ac8c 100644 --- a/src/scripting/scriptengine_lua.inl +++ b/src/scripting/scriptengine_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 f1d6d5f91d..39a0d1ff7e 100644 --- a/src/scripting/scriptscheduler.cpp +++ b/src/scripting/scriptscheduler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 14c60a89d0..cc05280c0b 100644 --- a/src/scripting/scriptscheduler_lua.inl +++ b/src/scripting/scriptscheduler_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 cdc62c142e..e8f32cc3f0 100644 --- a/src/scripting/systemcapabilitiesbinding.cpp +++ b/src/scripting/systemcapabilitiesbinding.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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_lua.inl b/src/scripting/systemcapabilitiesbinding_lua.inl index 27e493d2a4..128c21f698 100644 --- a/src/scripting/systemcapabilitiesbinding_lua.inl +++ b/src/scripting/systemcapabilitiesbinding_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 13e26b16a7..ea08f71eea 100644 --- a/src/util/blockplaneintersectiongeometry.cpp +++ b/src/util/blockplaneintersectiongeometry.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 5d39116390..45f393d57c 100644 --- a/src/util/boxgeometry.cpp +++ b/src/util/boxgeometry.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/collisionhelper.cpp b/src/util/collisionhelper.cpp index 4ba8748024..873b8bcc37 100644 --- a/src/util/collisionhelper.cpp +++ b/src/util/collisionhelper.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/coordinateconversion.cpp b/src/util/coordinateconversion.cpp index 63e1021e9d..27f58c359a 100644 --- a/src/util/coordinateconversion.cpp +++ b/src/util/coordinateconversion.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 0f93dc35ae..a56ac03e39 100644 --- a/src/util/distanceconversion.cpp +++ b/src/util/distanceconversion.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 4fa1b09841..fc9c86f7fb 100644 --- a/src/util/factorymanager.cpp +++ b/src/util/factorymanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 e0db8a7837..480799d7ac 100644 --- a/src/util/histogram.cpp +++ b/src/util/histogram.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 72f2b0d462..e5552bdfea 100644 --- a/src/util/httprequest.cpp +++ b/src/util/httprequest.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/json_helper.cpp b/src/util/json_helper.cpp index d7c75609a6..1625e27da3 100644 --- a/src/util/json_helper.cpp +++ b/src/util/json_helper.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 8a8fe8aa6d..6533d59360 100644 --- a/src/util/keys.cpp +++ b/src/util/keys.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -36,6 +36,11 @@ namespace openspace { KeyWithModifier stringToKey(std::string str) { std::vector tokens = ghoul::tokenizeString(str, '+'); + // "Keypad +" will tokenize into "Keypad " + "" + if (tokens.size() == 2 && tokens[0] == "Keypad " && tokens[1].empty()) { + tokens = { std::string("Keypad +") }; + } + std::vector originalTokens = tokens; for (std::string& t : tokens) { std::transform( diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp index a7a96751e5..f10caa8351 100644 --- a/src/util/openspacemodule.cpp +++ b/src/util/openspacemodule.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/planegeometry.cpp b/src/util/planegeometry.cpp index 448e6b5595..cec681b5c7 100644 --- a/src/util/planegeometry.cpp +++ b/src/util/planegeometry.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 e57b8ec7bd..62d9a9dff1 100644 --- a/src/util/progressbar.cpp +++ b/src/util/progressbar.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 c8f1b868b5..cf0d841c07 100644 --- a/src/util/resourcesynchronization.cpp +++ b/src/util/resourcesynchronization.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 cb638fb0fd..b9d8881959 100644 --- a/src/util/screenlog.cpp +++ b/src/util/screenlog.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/sphere.cpp b/src/util/sphere.cpp index 8c26253c5b..bd76c78cef 100644 --- a/src/util/sphere.cpp +++ b/src/util/sphere.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 6fb8d302d5..f07d1cbb0c 100644 --- a/src/util/spicemanager.cpp +++ b/src/util/spicemanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -588,16 +588,23 @@ double SpiceManager::ephemerisTimeFromDate(const char* timeString) const { std::string SpiceManager::dateFromEphemerisTime(double ephemerisTime, const char* format) { - char Buffer[128]; - std::memset(Buffer, char(0), 128); + constexpr int BufferSize = 128; + char Buffer[BufferSize]; + std::memset(Buffer, char(0), BufferSize); - timout_c(ephemerisTime, format, 128, Buffer); + timout_c(ephemerisTime, format, BufferSize, Buffer); if (failed_c()) { throwSpiceError(fmt::format( "Error converting ephemeris time '{}' to date with format '{}'", ephemerisTime, format )); } + if (Buffer[0] == '*') { + // The conversion failed and we need to use et2utc + constexpr int SecondsPrecision = 3; + et2utc_c(ephemerisTime, "C", SecondsPrecision, BufferSize, Buffer); + } + return std::string(Buffer); } diff --git a/src/util/spicemanager_lua.inl b/src/util/spicemanager_lua.inl index bd138ef335..c45a7fefbf 100644 --- a/src/util/spicemanager_lua.inl +++ b/src/util/spicemanager_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 011dc56bbb..147cd5a378 100644 --- a/src/util/syncbuffer.cpp +++ b/src/util/syncbuffer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 713ba28ae8..40e1c0fa60 100644 --- a/src/util/task.cpp +++ b/src/util/task.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 dd1b679eb5..651a541d30 100644 --- a/src/util/taskloader.cpp +++ b/src/util/taskloader.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 ab77e0939c..0ea8527f0a 100644 --- a/src/util/threadpool.cpp +++ b/src/util/threadpool.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 1d4a2a9c7f..925e23ac8b 100644 --- a/src/util/time.cpp +++ b/src/util/time.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -167,7 +167,8 @@ scripting::LuaLibrary Time::luaLibrary() { codegen::lua::CurrentTimeSpice, codegen::lua::CurrentWallTime, codegen::lua::CurrentApplicationTime, - codegen::lua::AdvancedTime + codegen::lua::AdvancedTime, + codegen::lua::ConvertTime, } }; } diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl index 857dead156..4a3343ee49 100644 --- a/src/util/time_lua.inl +++ b/src/util/time_lua.inl @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -397,6 +397,31 @@ namespace { } } +/** + * Converts the given time to either a J2000 seconds number or a ISO 8601 timestamp, + * depending on the type of the given time. + * + * If the given time is a timestamp: the function returns a double precision value + * representing the ephemeris version of that time; that is the number of TDB seconds past + * the J2000 epoch. + * + * If the given time is a J2000 seconds value: the function returns a ISO 8601 timestamp. + */ +[[codegen::luawrap]] std::variant convertTime( + std::variant time) +{ + using namespace openspace; + + // Convert from timestamp to J2000 seconds + if (std::holds_alternative(time)) { + return Time::convertTime(std::get(time)); + } + // Convert from J2000 seconds to ISO 8601 timestamp + else { + return std::string(Time(std::get(time)).ISO8601()); + } +} + #include "time_lua_codegen.cpp" } // namespace diff --git a/src/util/timeconversion.cpp b/src/util/timeconversion.cpp index 1f803b4038..18fdcf03df 100644 --- a/src/util/timeconversion.cpp +++ b/src/util/timeconversion.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 61cb9e9feb..da698d3323 100644 --- a/src/util/timeline.cpp +++ b/src/util/timeline.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 1b748b57b9..1aafa8977d 100644 --- a/src/util/timemanager.cpp +++ b/src/util/timemanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -125,8 +125,18 @@ void TimeManager::interpolateTime(double targetTime, double durationSeconds) { const double now = currentApplicationTimeForInterpolation(); const bool pause = isPaused(); - const TimeKeyframeData current = { time(), deltaTime(), false, false }; - const TimeKeyframeData next = { Time(targetTime), targetDeltaTime(), pause, false }; + const TimeKeyframeData current = { + .time = time(), + .delta = deltaTime(), + .pause = false, + .jump = false + }; + const TimeKeyframeData next = { + .time = Time(targetTime), + .delta = targetDeltaTime(), + .pause = pause, + .jump = false + }; clearKeyframes(); addKeyframe(now, current); @@ -748,8 +758,18 @@ void TimeManager::interpolateDeltaTime(double newDeltaTime, double interpolation time().j2000Seconds() + (_deltaTime + newDeltaTime) * 0.5 * interpolationDuration ); - TimeKeyframeData currentKeyframe = { time(), _deltaTime, false, false }; - TimeKeyframeData futureKeyframe = { newTime, newDeltaTime, false, false }; + TimeKeyframeData currentKeyframe = { + .time = time(), + .delta = _deltaTime, + .pause = false, + .jump = false + }; + TimeKeyframeData futureKeyframe = { + .time = newTime, + .delta = newDeltaTime, + .pause = false, + .jump = false + }; _targetDeltaTime = newDeltaTime; @@ -854,8 +874,18 @@ void TimeManager::interpolatePause(bool pause, double interpolationDuration) { time().j2000Seconds() + (_deltaTime + targetDelta) * 0.5 * interpolationDuration ); - TimeKeyframeData currentKeyframe = { time(), _deltaTime, false, false }; - TimeKeyframeData futureKeyframe = { newTime, _targetDeltaTime, pause, false }; + TimeKeyframeData currentKeyframe = { + .time = time(), + .delta = _deltaTime, + .pause = false, + .jump = false + }; + TimeKeyframeData futureKeyframe = { + .time = newTime, + .delta = _targetDeltaTime, + .pause = pause, + .jump = false + }; _timePaused = pause; double now = isPlayingBackSessionRecording() ? diff --git a/src/util/timerange.cpp b/src/util/timerange.cpp index cd3262f268..db25034be8 100644 --- a/src/util/timerange.cpp +++ b/src/util/timerange.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/touch.cpp b/src/util/touch.cpp index 0cf2e15511..6b95bc5a2c 100644 --- a/src/util/touch.cpp +++ b/src/util/touch.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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 f0f47b5477..549c51262d 100644 --- a/src/util/transformationmanager.cpp +++ b/src/util/transformationmanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -93,9 +93,9 @@ glm::dmat3 TransformationManager::kameleonTransformationMatrix( [[maybe_unused]] double ephemerisTime) const { #ifdef OPENSPACE_MODULE_KAMELEON_ENABLED - ccmc::Position in0 = {1.f, 0.f, 0.f}; - ccmc::Position in1 = {0.f, 1.f, 0.f}; - ccmc::Position in2 = {0.f, 0.f, 1.f}; + ccmc::Position in0 = ccmc::Position(1.f, 0.f, 0.f); + ccmc::Position in1 = ccmc::Position(0.f, 1.f, 0.f); + ccmc::Position in2 = ccmc::Position(0.f, 0.f, 1.f); ccmc::Position out0; ccmc::Position out1; diff --git a/src/util/tstring.cpp b/src/util/tstring.cpp index 729721b02f..e56479f6a0 100644 --- a/src/util/tstring.cpp +++ b/src/util/tstring.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/universalhelpers.cpp b/src/util/universalhelpers.cpp index 9beca8052b..fe3530c936 100644 --- a/src/util/universalhelpers.cpp +++ b/src/util/universalhelpers.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/versionchecker.cpp b/src/util/versionchecker.cpp index 4b1b9b3f09..de72a3af4f 100644 --- a/src/util/versionchecker.cpp +++ b/src/util/versionchecker.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/application_definition.cmake b/support/cmake/application_definition.cmake index 6705639450..effda193ce 100644 --- a/support/cmake/application_definition.cmake +++ b/support/cmake/application_definition.cmake @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of 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/global_variables.cmake b/support/cmake/global_variables.cmake index 1a061ecd8c..e6dfa7e593 100644 --- a/support/cmake/global_variables.cmake +++ b/support/cmake/global_variables.cmake @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of 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_common.cmake b/support/cmake/module_common.cmake index c15a730d44..ee77dc1227 100644 --- a/support/cmake/module_common.cmake +++ b/support/cmake/module_common.cmake @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of 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 96cbeb1934..6f295822bc 100644 --- a/support/cmake/module_definition.cmake +++ b/support/cmake/module_definition.cmake @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of 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/openspace_header.template b/support/cmake/openspace_header.template index 120c9a86be..3ec58e41ef 100644 --- a/support/cmake/openspace_header.template +++ b/support/cmake/openspace_header.template @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/packaging.cmake b/support/cmake/packaging.cmake index da507c0527..0d190f2cbc 100644 --- a/support/cmake/packaging.cmake +++ b/support/cmake/packaging.cmake @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of 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/set_openspace_compile_settings.cmake b/support/cmake/set_openspace_compile_settings.cmake index 668107cf1b..d7a3a301b0 100644 --- a/support/cmake/set_openspace_compile_settings.cmake +++ b/support/cmake/set_openspace_compile_settings.cmake @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of 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/coding/check_style_guide.py b/support/coding/check_style_guide.py index 02beca004a..ecd1dfe52b 100644 --- a/support/coding/check_style_guide.py +++ b/support/coding/check_style_guide.py @@ -3,7 +3,7 @@ """ OpenSpace -Copyright (c) 2014-2022 +Copyright (c) 2014-2023 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software @@ -27,7 +27,7 @@ This script traverses the file tree of OpenSpace and will check all files' inclu guards for correctness. At the moment this includes: * Correctness (file has a #ifndef. #define, and #endif lines) * Equality (using the same name for the #ifdef and #define) - * Styling + * Styling * no empty line between #ifndef and #define lines * Empty lines before and after #ifndef #define block * Files end with an empty line @@ -59,7 +59,7 @@ import os import re import sys -current_year = '2022' +current_year = '2023' is_strict_mode = False is_silent_mode = False diff --git a/support/coding/codegen b/support/coding/codegen index 93fb390f1b..be55036b25 160000 --- a/support/coding/codegen +++ b/support/coding/codegen @@ -1 +1 @@ -Subproject commit 93fb390f1b239f737346a42e06dcf7815fdaa77c +Subproject commit be55036b25c537b3c2e306465d450e6df6625df3 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 916e8bede9..6361a26c61 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -2,7 +2,7 @@ # # # OpenSpace # # # -# Copyright (c) 2014-2022 # +# Copyright (c) 2014-2023 # # # # Permission is hereby granted, free of 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/main.cpp b/tests/main.cpp index cec8ba5bad..844cead108 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/property/test_property_listproperties.cpp b/tests/property/test_property_listproperties.cpp index e1f9241fb8..19d55f8997 100644 --- a/tests/property/test_property_listproperties.cpp +++ b/tests/property/test_property_listproperties.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/property/test_property_optionproperty.cpp b/tests/property/test_property_optionproperty.cpp index f340a6f623..19b469d5fd 100644 --- a/tests/property/test_property_optionproperty.cpp +++ b/tests/property/test_property_optionproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/property/test_property_selectionproperty.cpp b/tests/property/test_property_selectionproperty.cpp index f6c634a233..96e882896e 100644 --- a/tests/property/test_property_selectionproperty.cpp +++ b/tests/property/test_property_selectionproperty.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -208,7 +208,7 @@ TEST_CASE("SelectionProperty: Value From Copying Variable", "[selectionproperty] openspace::properties::SelectionProperty p({ "id", "gui", "desc" }); p.setOptions({ "a", "b", "c" }); - p = { "a", "b" }; + p = std::set{ "a", "b" }; CHECK(p.value() == std::set{ "a", "b" }); } @@ -217,10 +217,10 @@ TEST_CASE("SelectionProperty: Re-set Options After Selection", "[selectionproper openspace::properties::SelectionProperty p({ "id", "gui", "desc" }); p.setOptions({ "a", "b", "c" }); - p = { "a", "b" }; + p = std::set{ "a", "b" }; - p.setOptions({ "a", "c", "d" }); // b no longer included - // => should be removed from selection + p.setOptions(std::vector{ "a", "c", "d" }); // b no longer included + // => should be removed CHECK(p.value() == std::set{ "a" }); } diff --git a/tests/regression/517.cpp b/tests/regression/517.cpp index 8d7c691b5c..8a2ca7be12 100644 --- a/tests/regression/517.cpp +++ b/tests/regression/517.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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.cpp b/tests/test_assetloader.cpp index 7fa2ed5a8b..845b8fced4 100644 --- a/tests/test_assetloader.cpp +++ b/tests/test_assetloader.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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.cpp b/tests/test_concurrentqueue.cpp index 9311665639..4b85000f2a 100644 --- a/tests/test_concurrentqueue.cpp +++ b/tests/test_concurrentqueue.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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_configuration.cpp b/tests/test_configuration.cpp index ff4b670f4d..dfb198778f 100644 --- a/tests/test_configuration.cpp +++ b/tests/test_configuration.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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_distanceconversion.cpp b/tests/test_distanceconversion.cpp index a3c1902d33..ef38e7c824 100644 --- a/tests/test_distanceconversion.cpp +++ b/tests/test_distanceconversion.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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.cpp b/tests/test_documentation.cpp index 3b1cc99f92..b012fc5603 100644 --- a/tests/test_documentation.cpp +++ b/tests/test_documentation.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of charge, to any person obtaining a copy of this * * software and associated documentation files (the "Software"), to deal in the Software * @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -56,6 +57,21 @@ TEST_CASE("Documentation: Constructor", "[documentation]") { new StringVerifier, Optional::No ); + doc.entries.emplace_back( + "FileVerifier", + new FileVerifier, + Optional::No + ); + doc.entries.emplace_back( + "DirectoryVerifier", + new DirectoryVerifier, + Optional::No + ); + doc.entries.emplace_back( + "DateTimeVerifier", + new DateTimeVerifier, + Optional::No + ); doc.entries.emplace_back( "TableVerifier", new TableVerifier, @@ -263,6 +279,9 @@ TEST_CASE("Documentation: Initializer Constructor", "[documentation]") { {"DoubleVerifier", new DoubleVerifier, Optional::No }, {"IntVerifier", new IntVerifier, Optional::No }, {"StringVerifier", new StringVerifier, Optional::No }, + {"FileVerifier", new FileVerifier, Optional::No }, + {"DirectoryVerifier", new DirectoryVerifier, Optional::No }, + {"DateTimeVerifier", new DateTimeVerifier, Optional::No }, {"TableVerifier", new TableVerifier, Optional::No }, // Operator Verifiers @@ -330,10 +349,9 @@ TEST_CASE("Documentation: BoolVerifier", "[documentation]") { CHECK(positiveRes.success); CHECK(positiveRes.offenses.empty()); - ghoul::Dictionary negative; - negative.setValue("Bool", 0); - - TestResult negativeRes = testSpecification(doc, negative); + ghoul::Dictionary negativeType; + negativeType.setValue("Bool", 0); + TestResult negativeRes = testSpecification(doc, negativeType); CHECK_FALSE(negativeRes.success); REQUIRE(negativeRes.offenses.size() == 1); CHECK(negativeRes.offenses[0].offender == "Bool"); @@ -363,10 +381,9 @@ TEST_CASE("Documentation: DoubleVerifier", "[documentation]") { CHECK(positiveRes.success); CHECK(positiveRes.offenses.empty()); - ghoul::Dictionary negative; - negative.setValue("Double", 0); - - TestResult negativeRes = testSpecification(doc, negative); + ghoul::Dictionary negativeType; + negativeType.setValue("Double", 0); + TestResult negativeRes = testSpecification(doc, negativeType); CHECK_FALSE(negativeRes.success); REQUIRE(negativeRes.offenses.size() == 1); CHECK(negativeRes.offenses[0].offender == "Double"); @@ -400,10 +417,9 @@ TEST_CASE("Documentation: IntVerifier", "[documentation]") { CHECK(positiveRes.success); CHECK(positiveRes.offenses.empty()); - ghoul::Dictionary negative; - negative.setValue("Int", 0.1); - - TestResult negativeRes = testSpecification(doc, negative); + ghoul::Dictionary negativeType; + negativeType.setValue("Int", 0.1); + TestResult negativeRes = testSpecification(doc, negativeType); CHECK_FALSE(negativeRes.success); REQUIRE(negativeRes.offenses.size() == 1); CHECK(negativeRes.offenses[0].offender == "Int"); @@ -432,9 +448,9 @@ TEST_CASE("Documentation: StringVerifier", "[documentation]") { CHECK(positiveRes.success); CHECK(positiveRes.offenses.empty()); - ghoul::Dictionary negative; - negative.setValue("String", 0); - TestResult negativeRes = testSpecification(doc, negative); + ghoul::Dictionary negativeType; + negativeType.setValue("String", 0); + TestResult negativeRes = testSpecification(doc, negativeType); CHECK_FALSE(negativeRes.success); REQUIRE(negativeRes.offenses.size() == 1); CHECK(negativeRes.offenses[0].offender == "String"); @@ -449,6 +465,123 @@ TEST_CASE("Documentation: StringVerifier", "[documentation]") { CHECK(negativeRes.offenses[0].reason == TestResult::Offense::Reason::MissingKey); } +TEST_CASE("Documentation: FileVerifier", "[documentation]") { + using namespace openspace::documentation; + using namespace std::string_literals; + + Documentation doc { + {{ "File", new FileVerifier, Optional::No }} + }; + + ghoul::Dictionary positive; + positive.setValue("File", absPath("${TESTDIR}/verifier/dummyfile.txt").string()); + TestResult positiveRes = testSpecification(doc, positive); + CHECK(positiveRes.success); + CHECK(positiveRes.offenses.empty()); + + ghoul::Dictionary negative404; + negative404.setValue("File", absPath("${TESTDIR}/verifier/404.txt").string()); + TestResult negativeRes = testSpecification(doc, negative404); + CHECK(!negativeRes.success); + REQUIRE(negativeRes.offenses.size() == 1); + CHECK(negativeRes.offenses[0].offender == "File"); + CHECK(negativeRes.offenses[0].reason == TestResult::Offense::Reason::Verification); + + ghoul::Dictionary negativeType; + negativeType.setValue("File", 0); + negativeRes = testSpecification(doc, negativeType); + CHECK_FALSE(negativeRes.success); + REQUIRE(negativeRes.offenses.size() == 1); + CHECK(negativeRes.offenses[0].offender == "File"); + CHECK(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType); + + ghoul::Dictionary negativeExist; + negativeExist.setValue("File2", ""s); + negativeRes = testSpecification(doc, negativeExist); + CHECK_FALSE(negativeRes.success); + REQUIRE(negativeRes.offenses.size() == 1); + CHECK(negativeRes.offenses[0].offender == "File"); + CHECK(negativeRes.offenses[0].reason == TestResult::Offense::Reason::MissingKey); +} + +TEST_CASE("Documentation: DirectoryVerifier", "[documentation]") { + using namespace openspace::documentation; + using namespace std::string_literals; + + Documentation doc{ + {{ "Dir", new DirectoryVerifier, Optional::No }} + }; + + ghoul::Dictionary positive; + positive.setValue("Dir", absPath("${TESTDIR}/verifier").string()); + TestResult positiveRes = testSpecification(doc, positive); + CHECK(positiveRes.success); + CHECK(positiveRes.offenses.empty()); + + ghoul::Dictionary negative404; + negative404.setValue("Dir", absPath("${TESTDIR}/verifier404").string()); + TestResult negativeRes = testSpecification(doc, negative404); + CHECK(!negativeRes.success); + REQUIRE(negativeRes.offenses.size() == 1); + CHECK(negativeRes.offenses[0].offender == "Dir"); + CHECK(negativeRes.offenses[0].reason == TestResult::Offense::Reason::Verification); + + ghoul::Dictionary negativeType; + negativeType.setValue("Dir", 0); + negativeRes = testSpecification(doc, negativeType); + CHECK_FALSE(negativeRes.success); + REQUIRE(negativeRes.offenses.size() == 1); + CHECK(negativeRes.offenses[0].offender == "Dir"); + CHECK(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType); + + ghoul::Dictionary negativeExist; + negativeExist.setValue("Dir2", ""s); + negativeRes = testSpecification(doc, negativeExist); + CHECK_FALSE(negativeRes.success); + REQUIRE(negativeRes.offenses.size() == 1); + CHECK(negativeRes.offenses[0].offender == "Dir"); + CHECK(negativeRes.offenses[0].reason == TestResult::Offense::Reason::MissingKey); +} + +TEST_CASE("Documentation: DateTimeVerifier", "[documentation]") { + using namespace openspace::documentation; + using namespace std::string_literals; + + Documentation doc{ + {{ "DateTime", new DateTimeVerifier, Optional::No }} + }; + + ghoul::Dictionary positive; + positive.setValue("DateTime", "1969 07 20 20:17:00"s); + TestResult positiveRes = testSpecification(doc, positive); + CHECK(positiveRes.success); + CHECK(positiveRes.offenses.empty()); + + ghoul::Dictionary negative404; + negative404.setValue("DateTime", "abc"s); + TestResult negativeRes = testSpecification(doc, negative404); + CHECK(!negativeRes.success); + REQUIRE(negativeRes.offenses.size() == 1); + CHECK(negativeRes.offenses[0].offender == "DateTime"); + CHECK(negativeRes.offenses[0].reason == TestResult::Offense::Reason::Verification); + + ghoul::Dictionary negativeType; + negativeType.setValue("DateTime", 0); + negativeRes = testSpecification(doc, negativeType); + CHECK_FALSE(negativeRes.success); + REQUIRE(negativeRes.offenses.size() == 1); + CHECK(negativeRes.offenses[0].offender == "DateTime"); + CHECK(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType); + + ghoul::Dictionary negativeExist; + negativeExist.setValue("DateTime2", ""s); + negativeRes = testSpecification(doc, negativeExist); + CHECK_FALSE(negativeRes.success); + REQUIRE(negativeRes.offenses.size() == 1); + CHECK(negativeRes.offenses[0].offender == "DateTime"); + CHECK(negativeRes.offenses[0].reason == TestResult::Offense::Reason::MissingKey); +} + TEST_CASE("Documentation: TableVerifierType", "[documentation]") { using namespace openspace::documentation; @@ -462,9 +595,9 @@ TEST_CASE("Documentation: TableVerifierType", "[documentation]") { CHECK(positiveRes.success); CHECK(positiveRes.offenses.empty()); - ghoul::Dictionary negative; - negative.setValue("Table", 0); - TestResult negativeRes = testSpecification(doc, negative); + ghoul::Dictionary negativeType; + negativeType.setValue("Table", 0); + TestResult negativeRes = testSpecification(doc, negativeType); CHECK_FALSE(negativeRes.success); REQUIRE(negativeRes.offenses.size() == 1); CHECK(negativeRes.offenses[0].offender == "Table"); @@ -499,9 +632,9 @@ TEST_CASE("Documentation: StringListVerifierType", "[documentation]") { CHECK(positiveRes.success); CHECK(positiveRes.offenses.empty()); - ghoul::Dictionary negative; - negative.setValue("StringList", 0); - TestResult negativeRes = testSpecification(doc, negative); + ghoul::Dictionary negativeType; + negativeType.setValue("StringList", 0); + TestResult negativeRes = testSpecification(doc, negativeType); CHECK_FALSE(negativeRes.success); REQUIRE(negativeRes.offenses.size() == 1); CHECK(negativeRes.offenses[0].offender == "StringList"); @@ -551,9 +684,9 @@ TEST_CASE("Documentation: IntListVerifierType", "[documentation]") { CHECK(positiveRes.success); CHECK(positiveRes.offenses.empty()); - ghoul::Dictionary negative; - negative.setValue("IntList", 0); - TestResult negativeRes = testSpecification(doc, negative); + ghoul::Dictionary negativeType; + negativeType.setValue("IntList", 0); + TestResult negativeRes = testSpecification(doc, negativeType); CHECK_FALSE(negativeRes.success); REQUIRE(negativeRes.offenses.size() == 1); CHECK(negativeRes.offenses[0].offender == "IntList"); @@ -606,25 +739,25 @@ TEST_CASE("Documentation: MixedVerifiers", "[documentation]") { CHECK(positiveRes.success); CHECK(positiveRes.offenses.empty()); - ghoul::Dictionary negative1; - negative1.setValue("Bool", true); - negative1.setValue("Double", 1); - negative1.setValue("Int", 0); - negative1.setValue("String", ""s); - negative1.setValue("Table", ghoul::Dictionary()); - TestResult negativeRes = testSpecification(doc, negative1); + ghoul::Dictionary negativeType1; + negativeType1.setValue("Bool", true); + negativeType1.setValue("Double", 1); + negativeType1.setValue("Int", 0); + negativeType1.setValue("String", ""s); + negativeType1.setValue("Table", ghoul::Dictionary()); + TestResult negativeRes = testSpecification(doc, negativeType1); CHECK_FALSE(negativeRes.success); REQUIRE(negativeRes.offenses.size() == 1); CHECK(negativeRes.offenses[0].offender == "Double"); CHECK(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType); - ghoul::Dictionary negative2; - negative2.setValue("Bool", true); - negative2.setValue("Double", 0.0); - negative2.setValue("Int", ""s); - negative2.setValue("String", 1); - negative2.setValue("Table", ghoul::Dictionary()); - negativeRes = testSpecification(doc, negative2); + ghoul::Dictionary negativeType2; + negativeType2.setValue("Bool", true); + negativeType2.setValue("Double", 0.0); + negativeType2.setValue("Int", ""s); + negativeType2.setValue("String", 1); + negativeType2.setValue("Table", ghoul::Dictionary()); + negativeRes = testSpecification(doc, negativeType2); CHECK_FALSE(negativeRes.success); REQUIRE(negativeRes.offenses.size() == 2); CHECK(negativeRes.offenses[0].offender == "Int"); diff --git a/tests/test_horizons.cpp b/tests/test_horizons.cpp index 7275a8cf04..c5a70ee113 100644 --- a/tests/test_horizons.cpp +++ b/tests/test_horizons.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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.cpp b/tests/test_iswamanager.cpp index e364660f67..cec926f432 100644 --- a/tests/test_iswamanager.cpp +++ b/tests/test_iswamanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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_jsonformatting.cpp b/tests/test_jsonformatting.cpp index 7b2b5f9f47..3caca0b87a 100644 --- a/tests/test_jsonformatting.cpp +++ b/tests/test_jsonformatting.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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.cpp b/tests/test_latlonpatch.cpp index a8f89675b2..185585d4ee 100644 --- a/tests/test_latlonpatch.cpp +++ b/tests/test_latlonpatch.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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.cpp b/tests/test_lrucache.cpp index b5448cceeb..235444c587 100644 --- a/tests/test_lrucache.cpp +++ b/tests/test_lrucache.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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_lua_createsinglecolorimage.cpp b/tests/test_lua_createsinglecolorimage.cpp index 3bd82c94b8..ed4b943dc0 100644 --- a/tests/test_lua_createsinglecolorimage.cpp +++ b/tests/test_lua_createsinglecolorimage.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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_profile.cpp b/tests/test_profile.cpp index 6f8a59750b..53f800df41 100644 --- a/tests/test_profile.cpp +++ b/tests/test_profile.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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.cpp b/tests/test_rawvolumeio.cpp index 96a34eb3a2..e3134f780b 100644 --- a/tests/test_rawvolumeio.cpp +++ b/tests/test_rawvolumeio.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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.cpp b/tests/test_scriptscheduler.cpp index d602ac6860..f5f17146c9 100644 --- a/tests/test_scriptscheduler.cpp +++ b/tests/test_scriptscheduler.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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.cpp b/tests/test_spicemanager.cpp index 045b1ab278..180d1da253 100644 --- a/tests/test_spicemanager.cpp +++ b/tests/test_spicemanager.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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_timeconversion.cpp b/tests/test_timeconversion.cpp index 77f02be295..b892c1926c 100644 --- a/tests/test_timeconversion.cpp +++ b/tests/test_timeconversion.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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.cpp b/tests/test_timeline.cpp index d228c5fa00..492be167e4 100644 --- a/tests/test_timeline.cpp +++ b/tests/test_timeline.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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_timequantizer.cpp b/tests/test_timequantizer.cpp index b24ea9e4d7..b4868e585f 100644 --- a/tests/test_timequantizer.cpp +++ b/tests/test_timequantizer.cpp @@ -2,7 +2,7 @@ * * * OpenSpace * * * - * Copyright (c) 2014-2022 * + * Copyright (c) 2014-2023 * * * * Permission is hereby granted, free of 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/verifier/dummyfile.txt b/tests/verifier/dummyfile.txt new file mode 100644 index 0000000000..e69de29bb2