Commit Graph

1387 Commits

Author SHA1 Message Date
Emma Broman 1762bec1c2 Make the Enabled properties advanced, show in GUI, and change name
Update GUI hash to show enabled property
2023-04-25 11:29:41 +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 ca916877b2 Adapt the visibility settings for all properties 2023-04-15 09:33:31 +02:00
Ylva Selling 668cba8788 Merge pull request #2604 from OpenSpace/feature/documentation-overhaul
Feature/documentation overhaul
2023-04-14 18:42:44 -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
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 7565a91196 Cleanup lambda expressions and directly address Fadeable properties when adding properties 2023-04-12 23:20:53 +02:00
Alexander Bock 19642e8120 Jenkins compile fix 2023-04-12 22:26:19 +02: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
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
Malin E a3948e2830 Merge branch 'master' into feature/model-opacity 2023-04-06 13:51:07 +02: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 1a4c9bcbfc Remove forgotten comment 2023-04-06 13:31:27 +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
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
Malin E be2e9d5caf Address PR comments 2023-03-22 13:37:30 +01: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 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 21cb90b7f8 Add a message that we are running a debug build to the version information (closes #2523) 2023-03-11 01:14:10 +01:00
Emma Broman 4a50c4cbc0 Double renderbins for renderables (#2520) 2023-03-08 10:59:32 +01:00
Adam Rohdin 88972fc27b New function that resets screenshot index to 0. Usefull when capturing png sequence for video 2023-03-02 14:36:03 +01:00
Alexander Bock 375e5c6561 Tracy Update (#2534)
* Update the Tracy repository
* Update submodules
2023-03-01 11:48:21 -07:00
Malin E f6eac4f0c7 Take back manual depth test for the two pass model rendering 2023-02-21 18:08:38 +01:00
Alexander Bock 561e9d7f22 Provide GUI names for Property Owners 2023-02-21 13:00:11 +01:00
Malin E 05252b8258 Merge branch 'master' into feature/model-opacity
* Solve conflict in iss.asset
2023-02-16 12:07:12 +01:00
Emma Broman 352c9dd5ec Touch module code cleanup (#2465)
* Remove unused feature that allowed us to "pick" nodes using touch (it didn't really work and had some nasty hardcoded and costly implementation). Fixes Touch interaction picking refactor #1041

* General refactoring of code and removing redundant code

* Make touch markers prettier (change default color and smoothen edges)

* Add module property to control which renderable types are "directly touchable"

* Add SGN property to control which individual nodes are "directly touchable" ("SupportsDirectInteraction")

* Fix stuttering when zooming in closer than the orbitalnavigator allows
2023-02-14 13:55:24 +01:00
Adam Rohdin 756ade4e7d DashboardItem now listens to paramter 'enabled' in constructor 2023-02-13 16:09:07 +01:00
Malin E 14edda9e61 Remove problematic manual depth test code 2023-02-01 16:25:19 +01:00
Malin E f490fccee6 Merge branch 'master' into feature/model-opacity
* Solve conflicts in ghoul, renderablemodel.cpp and iss.asset
2023-02-01 14:52:33 +01:00
Alexander Bock d52c5dd0d9 Cleanup code with designated initializer lists 2023-01-22 23:01:32 +01:00
Alexander Bock a2a1554c9a Small cleanup of property documentation 2023-01-09 00:11:58 +01:00
Alexander Bock 4f4764209f Happy new year 2023-01-02 11:19:33 +01:00
Malin E 560c58e499 Add manual depth test between models 2022-12-07 14:19:12 +01:00
Malin E 574b789338 Merge branch 'master' into feature/model-opacity
* Solve conflicts in nebula and asset_helper assets
2022-12-01 10:20:05 +01:00
Alexander Bock 44e5b17ec9 Global pass over the code to remove trailing spaces 2022-11-22 21:06:52 +01:00
Malin E 433c2cd3a9 Remove unused hdr framebuffer and texture 2022-11-15 15:57:25 +01:00
Malin E 6c223cd8ae Some clean up 2022-11-03 11:15:21 +01:00
Malin E 0bb6d25e2e Add a new bin in the end of the pipeline 2022-11-03 10:29:53 +01:00
Malin E e749be21a5 Move Overlay RenderBin to before postDeffredTransparent 2022-11-02 17:46:20 +01:00
Malin E 8e2f5450f4 Add documentation for texture access functions 2022-11-02 17:34:00 +01:00
Malin E 2fe78e949d Merge branch 'master' into feature/model-opacity 2022-11-02 13:51:22 +01:00
Alexander Bock 6249fa6d89 Collection of a number of changes (#2286)
* Cleanup Property code
* Remove NOLINT statements
* Return Property class types as string_view
* Remove getStringValue function
* Simplify string value retrieval
* Ensure that image paths in the ImageSequenceTileProvider are sorted (closes #2205)
* Some cleanup of OpenSpaceEngine
* Cleanup documentation
* Some more cleanup of engine classes
* Some more cleanup
* Update SGCT repository
* Use new Jenkins node identifiers as the old method broke with update
2022-10-30 12:54:14 +01:00
Malin E 3cca0fb229 Add function in RenderEngine that gives access to FramebufferRenderer 2022-10-28 10:14:35 +02:00
Malin E a77e227430 Re-use textures in the FramebufferRenderer for model opacity rendering 2022-10-28 10:12:56 +02:00
Malin E 4b88c5d308 Merge branch 'master' into feature/grids-update 2022-08-29 13:22:57 +02:00
Alexander Bock 664eb60f4f Increase the compile times by including more precompiled headers (#2217)
* Define WIN32_LEAN_AND_MEAN and VC_EXTRALEAN globally
* Use forked version of TUIO, some more work on precompiled headers
* Improvements for the Kameleon module
2022-08-26 16:32:21 +02:00
Malin E 767f6aa547 Use highlight feature on large grids 2022-08-26 13:46:33 +02:00
Alexander Bock 979a5e3378 SkyBrowser Hash Handling (#2201)
* Add the loading of a hash for wwt image files and automatically force a redownload of the files if the hash has changed
* Move the wwtdataimages location into the sync folder
* Some general code cleanup
2022-08-22 15:16:07 +02:00