Commit Graph

10861 Commits

Author SHA1 Message Date
Ylva Selling
d267bc0dad Remove documentation generator 2023-04-25 16:44:10 -04:00
Ylva Selling
948fdd024b Remove generateJson function from the DocumentationGenerator and move sortJson function to json_helper 2023-04-25 16:32:04 -04:00
Ylva Selling
b8b2867a20 Remove handlebars and refactor 2023-04-21 15:48:09 -04:00
Ylva Selling
88fcf3ff78 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2023-04-21 12:40:28 -04:00
Ylva Selling
fe9058c523 Give a better error message when an action GuiPath doesn't start with a '/' 2023-04-21 12:40:19 -04:00
Emma Broman
c1821f3e6f Update GUI hash 2023-04-21 15:48:04 +02:00
Emma Broman
d58a52df2c Fix broken ImGui time picker unit dropdown (closes #2639) 2023-04-21 09:26:29 +02:00
Ylva Selling
fdc238c3bc Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2023-04-20 12:12:15 -04:00
Ylva Selling
92f50c25a2 Add missing comma to mars mission file 2023-04-20 12:12:09 -04:00
Ylva Selling
e1be28d527 Make trails fade when they toggle in artemis profile 2023-04-20 12:11:31 -04:00
Alexander Bock
a0460e204d Update Juice kernels 2023-04-19 10:12:24 +02:00
Ylva Selling
63fbff0fa8 Add / to beginning of GuiPath for assets for solarstorm 2012 2023-04-18 10:20:52 -04:00
Ylva Selling
303d625c81 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2023-04-17 14:43:04 -04:00
Ylva Selling
a15d2702c6 Fix bugs 2023-04-17 14:42:55 -04:00
Micah Acinapura
a89396deea update guihash for feedback link 2023-04-17 14:24:47 -04:00
Ylva Selling
08faa96f9d Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2023-04-17 12:46:54 -04:00
Ylva Selling
012905fbaa Update GUI hash to fix for worldwide telescope resizing 2023-04-17 12:46:41 -04:00
GPayne
4d8dd1447a Quit deploy script early if CMake fails 2023-04-17 10:07:36 -06:00
Alexander Bock
535c4e2ef4 Adding deploy script for Windows 2023-04-16 23:33:17 +02:00
Alexander Bock
10903926d7 Update Launcher images 2023-04-16 23:33:05 +02:00
Micah Acinapura
5a9bb529f3 Feature/night sky items (#2613)
* added night sky items and camera event
---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2023-04-16 17:29:48 -04:00
Alexander Bock
8a62752434 Jenkins fix for LibMPV on Ubuntu (#2621)
* Correctly add non-Windows dependencies
* Make libraries depend on the correct OpenSpace module
* Add missing destructor
2023-04-16 23:15:57 +02:00
Micah Acinapura
9be88fdea8 added more scale objects and helper file (#2605)
* added more scale objects and helper file

* Update file identifiers

* reworked scale models with node support script

* using url sync for models that need to be updated

---------

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
2023-04-15 17:26:38 -04:00
Micah Acinapura
83b6782176 added first amnh layers (#2612)
* added first amnh layers

* pr updates

* added the rest of the AMNH layers

* removed not working mola

* fixing server urls
2023-04-15 17:25:06 -04:00
Alexander Bock
db002d4cf7 Fix CMake issues when disabling unit tests, Add new CMake flag OPENSPACE_ENABLE_ALL_MODULES to change default behavior of module inclusion 2023-04-15 22:39:35 +02:00
Alexander Bock
27ba567af8 Add the ability to set the default property visibility in the openspace.cfg file, which can be overridden with the OPENSPACE_LEVEL environment variable 2023-04-15 18:22:21 +02:00
Alexander Bock
4bbb4a4805 Tiny whitespace fix 2023-04-15 12:28:37 +02:00
Alexander Bock
0655d3328c Move video examples 2023-04-15 11:47:54 +02:00
Emma Broman
c714a7f57d Feature/geojson (#2595)
Add the option to add geojson components to globes, from geojson files. One geojson file creates one GeoJsonComponent, which in turn may contain multiple GlobeGeometryFeatures

Geojson is a format that supports points, lines, and polygons. In addition to the basic functionality, extra features have been added that will long-term allow rendering the geometry needed to represent KML files (another format for geospatial geometry data). Here are links to references for both formats:

    Geojson: https://geojson.org/
    KML: https://developers.google.com/kml/documentation/kmlreference

data/assets/examples/geojson includes some example files that I have used for testing. Any geojson file can also be added through drag-n-drop. Note however that you might need to change the AltitudeMode or HeightOffset properties for the feature to be visible.
2023-04-15 11:35:28 +02:00
Alexander Bock
adbe0a93f2 Add editor schema to the gitignore file 2023-04-15 10:21:55 +02:00
Alexander Bock
8c7beea8a4 Reprivatize the registerUpdateRenderBinFromOpacity function 2023-04-15 10:20:39 +02:00
Alexander Bock
ffdcbd871d Reintroduce old-style generateJson function 2023-04-15 10:11:13 +02:00
Alexander Bock
ca916877b2 Adapt the visibility settings for all properties 2023-04-15 09:33:31 +02:00
Alexander Bock
1ef6cb0c02 Update SGCT repository 2023-04-15 09:27:55 +02:00
Gene Payne
cec6e05ff1 Allow Window Config GUI to Edit Files (#2574)
* Added pboettch/json-schema-validator submodule

* Added initial code for selecting window config to edit

* Use updated sgct submodule with json-validate

* Bump sgct submodule version reference

* Bump sgct submodule version reference

* Version checking of sgct window config in progress

* Json schema validator submodule is now in sgct

* Added support for read-only window configs, and additional changes

* More changes with opening config in window edit, plus schema files added

* Update sgct schema version with more defs to work with sgctedit schema

* Fixes to get sgct edit schema working with dialog for error messages

* Improvements in exception handling

* Improved handling of multiple sgct & json exception types

* Minor improvements in exception messages

* Extra spaces in error message output

* Fixing importing of json config data from launcher to sgctedit

* Fixed window size & position update

* Changes for preserving settings in edit vs new mode

* Changes to import settings from config file

* More changes for importing testing of config file based on file tests

* Fixed window placement dims in monitor, and some code refactoring

* Move json validation before initial read

* Add CMake copy of sgct schema file to OpenSpace post-build

* Bump sgct submodule reference

* Modify calls for json schema validation and bump to latest sgct

* Bump to new sgct repo with unit testing and updated schema

* Added first test for window config editor schema

* Finished tests for sgcteditor validation

* Code cleanup pass

* Fix of sgctedit test for remove description

* CMake and include config changes to fix build after merge

* Bump sgct submodule version

* Improve paths in sgctedit test

* Bump sgct reference for test path fix

* Check for imported monitor number being in valid range

* Make sgct config 'monitor' key/value optional

* Have 'save' or 'save as' buttons depending on edit or new modes

* Code review feedback changes

* Fix to include the last file in the user config dir list

* Addressing some PR request

* Change to pass-by-reference in editRefusalDialog

* Separating errors into summary and detailed messages in error dialog

* Disable edit button with hover text if config read shows invalid format

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2023-04-14 18:28:31 -06:00
Micah Acinapura
a421d0fbe6 added triton voyager2 layer (#2611)
* added triton voyager2 layer

* renamed triton layers for newyork
2023-04-14 19:46:57 -04:00
Ylva Selling
54cf02055d Move function in renderable.h to protected that was being used in renderablevideosphere 2023-04-14 18:57:21 -04:00
Ylva Selling
6e2729b24b Update GUI hash 2023-04-14 18:56:52 -04:00
Ylva Selling
668cba8788 Merge pull request #2604 from OpenSpace/feature/documentation-overhaul
Feature/documentation overhaul
2023-04-14 18:42:44 -04:00
Ylva Selling
3cbf937fd6 Update documentation to latest commit 2023-04-14 18:42:10 -04:00
Ylva Selling
7fef92802d Merge pull request #2608 from OpenSpace/feature/video-module
Video module
2023-04-14 18:28:35 -04:00
Ylva Selling
f797d7db64 Set version number in new asset to 1.0 2023-04-14 18:08:56 -04:00
Ylva Selling
0c2bb7d5aa Add example asset for stretching video 2023-04-14 18:05:08 -04:00
Ylva Selling
9e20326c25 Fix bugs that appeared when addressing comments in PR 2023-04-14 17:53:30 -04:00
Ylva Selling
89b0fadf16 Add some example assets and fix issue in videoplayer.cpp 2023-04-14 16:47:27 -04:00
Ylva Selling
5789d86dab Address comments on PR 2023-04-14 16:29:42 -04:00
Ylva Selling
e969a2654b Add missing comma in Rosetta mission asset file 2023-04-14 15:26:41 -04:00
Ylva Selling
b4ad158ee5 Merge pull request #2603 from OpenSpace/feature/missions
Feature/missions
2023-04-14 15:19:37 -04:00
Ylva Selling
d05c7a00de Update descriptions on the Rosetta mission.asset file 2023-04-14 15:13:28 -04:00
Ylva Selling
24b828b4eb Address comments on PR 2023-04-14 14:20:38 -04:00