Commit Graph

2296 Commits

Author SHA1 Message Date
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
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 8c7beea8a4 Reprivatize the registerUpdateRenderBinFromOpacity function 2023-04-15 10:20:39 +02:00
Alexander Bock ca916877b2 Adapt the visibility settings for all properties 2023-04-15 09:33:31 +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
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 668cba8788 Merge pull request #2604 from OpenSpace/feature/documentation-overhaul
Feature/documentation overhaul
2023-04-14 18:42:44 -04:00
Ylva Selling b4ad158ee5 Merge pull request #2603 from OpenSpace/feature/missions
Feature/missions
2023-04-14 15:19:37 -04:00
Malin E d500c93c8e Merge pull request #2550 from OpenSpace/feature/model-opacity
Feature/model opacity
2023-04-13 17:26:22 +02:00
Ylva Selling 3a5015e182 Fix comments on PR 2023-04-13 11:25:23 -04:00
Malin E 4bda27dcdf Start to address PR comments 2023-04-13 13:30:16 +02:00
Malin E e0a33a257a Merge branch 'master' into feature/min-max-distance 2023-04-13 12:43:35 +02:00
Malin E 6d8f7b2fbd Handle override RenderBins from asset files 2023-04-13 10:59:23 +02:00
Ylva Selling 3ff6169771 Merge remote-tracking branch 'origin/master' into feature/documentation-overhaul
# Conflicts:
#	src/scripting/scriptengine.cpp
2023-04-12 17:37:28 -04:00
Alexander Bock 19642e8120 Jenkins compile fix 2023-04-12 22:26:19 +02:00
Ylva Selling 51a48d2112 Merge remote-tracking branch 'origin/master' into feature/missions 2023-04-12 16:09:42 -04:00
Malin E dccd439dde Merge branch 'master' into feature/model-opacity
* Solve conflicts in renderablemodel.cpp and renderabletrail.cpp
2023-04-12 17:03:40 +02:00
Ylva Selling bb7079a845 Rename important date to milestone 2023-04-11 15:58:24 -04:00
Ylva Selling 5a1caf31dc Add link to mission 2023-04-11 15:24:48 -04:00
Ylva Selling 24e1fe2baf Add image & description to mission topic 2023-04-10 16:18:28 -04:00
Alexander Bock 9022aad479 Adding static Settings to Renderable (#2578)
* Add settings to Renderable to control whether the renderbin is updated based on Opacity
* Remove duplicate RenderBin specification for RenderableSphere
* Remove unnecessary RenderBin specifications of Lagrange points
* Don't automatically update the renderbin for RenderableLabel and RenderablePlane
* Remove extra `setRenderBinFromOpacity` from RenderableSpheres
* Move information about whether a renderable should be updated when disabled
* Some cleanup of Renderable class
* Don't update the renderbin automatically if the user specified the renderbin manually
2023-04-10 20:49:01 +02:00
Ylva Selling 15ec4aa41a Add important dates to misson 2023-04-10 09:43:01 -04:00
Malin E bb3c9f013e Merge branch 'master' into feature/model-opacity
* Resolve conflicts in shaders for models and modelprojections
2023-04-06 13:43:23 +02:00
Emma Broman 554373eb3e Fading of propertyowners through GUI, and more owners with fade property (#2557)
* Add property in OpenSpaceEngine for fading duration when enabling / disabling

* Add interface for fadeable components and apply to renderable

* Make layers a fadeable component

* Make globelabels a fadeable component

* Make labelscomponent a fadeable, and give it an enabled property

* Make screenspace renderables fadeable components

* Introduce concept of parent fadeables, to fade out subowners with parent

* Make rings fadeable as well

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2023-04-06 12:49:49 +02:00
Emma Broman 4de3713107 Add a central function to create an identifier from string, and also expose it through Lua 2023-04-03 11:40:19 +02:00
Alexander Bock 0e2d5e245d Add the ability to configure the Console key through the openspace.cfg (closes #2573) 2023-04-03 10:53:09 +02:00
Alexander Bock 1057b369c9 Harmonize the handling of the IsLocal vs Synchronized state of actions (closes #2566) 2023-04-03 10:29:20 +02:00
Ylva Selling 33f1b97c0f Merge remote-tracking branch 'origin/master' into feature/missions 2023-03-28 16:52:20 -04:00
Ylva Selling c1245fc9c5 Add actions to missions topic 2023-03-28 13:51:57 -04:00
Malin E 96f7ac1d69 Some small clean up 2023-03-28 10:17:04 +02:00
Malin E 99d52ce144 Merge branch 'master' into feature/min-max-distance
* Solve conflicts
2023-03-27 15:43:22 +02:00
Alexander Bock 31c0b4a623 Send the origin and the destination scene graph nodes along with the events signalling the beginning or the end of a camera path (closes #1834) 2023-03-23 23:35:42 +01:00
Malin E be2e9d5caf Address PR comments 2023-03-22 13:37:30 +01:00
Ylva Selling 99edcfc4e7 Merge remote-tracking branch 'origin/master' into feature/missions
# Conflicts:
#	data/assets/scene/solarsystem/missions/newhorizons/newhorizons.asset
#	data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset
#	data/assets/scene/solarsystem/missions/osirisrex/osirisrex.mission
#	data/assets/scene/solarsystem/missions/perseverance/perseverance.asset
#	include/openspace/mission/missionmanager.h
#	modules/server/src/connection.cpp
#	src/mission/missionmanager.cpp
#	src/mission/missionmanager_lua.inl
2023-03-21 12:03:10 -04:00
Gene Payne 00c8543306 Switch to std::list for adding & removing assets in deterministic order (#2543) 2023-03-17 16:07:17 -06:00
Ylva Selling 29b37d3462 Add keybindings 2023-03-17 16:59:39 -04:00
Ylva Selling bd5f1380c5 Add specific type to propertyowners 2023-03-16 10:32:37 -04:00
Malin E ee4eb081a0 Merge branch 'master' into feature/model-opacity
* Solve conflict in framebufferrenderer.cpp
2023-03-14 13:59:37 +01:00
Alexander Bock ddcbe85b51 Add events when paths are started or finished (closes #1834) 2023-03-11 17:20:20 +01:00
Alexander Bock 3df65ae899 Simplify property handling; Fix unit tests 2023-03-11 15:58:40 +01:00
Alexander Bock 23ee2ee5da Add new verifier to handle identifiers and update codegen to be able to use them (closes #2522) 2023-03-11 13:18:12 +01:00
Alexander Bock 6fa589c880 Adding option for constant velocity flight (closes #2150)
Using adapted code from James H
2023-03-11 00:16:54 +01:00
Alexander Bock d40c60dd0a Fix property extraction from Lua for IntProperty 2023-03-10 13:10:14 +01:00
Emma Broman 4a50c4cbc0 Double renderbins for renderables (#2520) 2023-03-08 10:59:32 +01:00
Alexander Bock 60d842ab3f Another property fix 2023-03-07 13:01:48 +01:00
Alexander Bock 4d9c448764 Reintroduce Lua conversions to BoolProperty as it doesn't derive from NumericalProperty 2023-03-07 12:57:53 +01:00
Alexander Bock 0831b00a77 Centralize the extraction of Lua values and fix bug when trying to extract the first parameter of a Lua parameter pack 2023-03-07 01:56:17 +01:00
Alexander Bock 1aef976911 Show error message when trying to save navigation state to an invalid file path (closes #2508) 2023-03-07 00:05:31 +01:00
Alexander Bock a711591c09 Update Doxygen (#2537)
* Modernizing Doxygen
* Remove warnings for Doxygen
2023-03-06 23:41:24 +01:00
Alexander Bock 8c7c932c78 Update codegen, make use of source location information 2023-03-06 15:50:31 +01:00