Commit Graph

1608 Commits

Author SHA1 Message Date
Emma Broman
091697c5b7 Make geojson file extension parsing more flexible in lua function (closes #2797)
Now allows geojson files with caps in the extension, as well as files with the .json extension.

Note that .json files will not be handled by drag-n-drop  (we might want to use that extension for something else)
2023-08-03 09:46:55 +02:00
Emma Broman
c424783b50 Offset sample coordinate by 0.5 when estimating height values (#2769)
* Offset sample coordinate by 0.5 when estimating height values
2023-06-22 11:08:52 +02:00
Emma Broman
23b01aba12 Add a trigger property to delete a geojson component 2023-06-15 18:40:51 +02:00
Emma Broman
bf38d9a415 provide some more info in GEOS errors on geojson load 2023-06-15 16:35:06 +02:00
Alexander Bock
5c8ff9eec5 Revert "Merge pull request #2721 from OpenSpace/issue/2682"
This reverts commit b4337e8188, reversing
changes made to 384f1e5530.
2023-06-15 00:52:39 +02:00
Alexander Bock
475f3c63c2 Update TilePixelSizes to temporarily address #2472 2023-06-14 20:04:08 +02:00
Ylva Selling
69b00898d9 Merge pull request #2753 from OpenSpace/issue/2679
Don't call update function unless layer has been initialized
2023-06-13 10:53:17 -04:00
Alexander Bock
7ada216620 Change linear interpolation back to anisotropic interpolation (closes #2752) 2023-06-13 11:12:56 +02:00
Emma Broman
ee9c917acf Fix some faulty indentation and remove a bunch of extra lines 2023-06-13 09:29:44 +02:00
Emma Broman
76402e0525 Consistent spelling of "tessellation" 2023-06-12 14:11:45 +02:00
Emma Broman
e5e5a22786 Read performshading from geojson file 2023-06-12 11:07:43 +02:00
Ylva Selling
ad58c695bf Set initialize to true after initialization 2023-06-09 10:31:57 -04:00
Ylva Selling
7a0472fa35 Don't call update function unless layer has been initialized 2023-06-08 14:28:29 -04:00
Emma Broman
b211df72a6 Fix: allow loading multiple features with same name in geojson file 2023-06-08 13:58:37 +02:00
Alexander Bock
c78b41c645 Use the drawing resolution in the case of non-linear projections correctly (closes #2745) 2023-06-06 17:17:17 +02:00
Alexander Bock
04871e5a06 Change MipMapping of tiles to Linear interpolation 2023-06-06 15:33:28 +02:00
Alexander Bock
14c02a85ce Add the ability to provide a random background image to TileIndexTileProviders 2023-06-06 15:33:13 +02:00
Adam Rohdin
8b044f823f Tile with only "noDataValue" no longer reports as status Failure
Due to this change Tiles with only "noDataValue" won't get re-added into the job queue forever.
Solves issue where height data did not display for underlaying heightmaps.
2023-05-29 16:24:11 +02:00
Alexander Bock
1d7b6d2d8c Correctly reset the OpenGL state after rendering text in a tile to prevent flickering when tiles update 2023-05-26 23:23:05 +02:00
Alexander Bock
842f991f8b Remove the explicit check for No Data Available tiles as the new ESRI server won't return those anymore (closes #2593) 2023-05-26 00:00:38 +02:00
Alexander Bock
fd5d453913 Add the option to not wait for tile loading for cases when the WMS server is misbehaving 2023-05-25 23:17:29 +02:00
Alexander Bock
bde840ad03 Remove a bunch of compiler warnings
* Remove compile warnings
* Coding style fix
2023-05-16 11:59:28 +02:00
Joakim Kilby
f8d7d5386a terminate ZoneScoped calls (required after Tracy update) 2023-05-16 11:07:01 +02:00
Alexander Bock
8b5b9432b6 Add new property to IndexSequenceTileProvider that shows the number of available images (closes #2688) 2023-05-15 22:16:15 +02:00
Micah Acinapura
4731e8e0a8 MacOS build fixes (#2622)
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
Co-authored-by: Joakim Kilby <jockekilby@gmail.com>
2023-05-12 09:35:59 +02:00
Joakim Kilby
2268802978 remove flickering during tileindex loading
by restoring framebuffer, shader & viewport state/bindings after
rendering text.
2023-05-11 12:36:46 +02:00
Alexander Bock
9447a351b4 Increase the TilePixelSize for heightmaps loaded from info files 2023-05-10 23:13:27 +02:00
Alexander Bock
6dfd0cd3a8 Remove warnings on MSVC 2023-04-26 23:51:16 +02:00
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
Alexander Bock
d0d65e4234 Update CMake folders 2023-04-23 12:33:11 +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
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
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
7fef92802d Merge pull request #2608 from OpenSpace/feature/video-module
Video module
2023-04-14 18:28:35 -04:00
Ylva Selling
5789d86dab Address comments on PR 2023-04-14 16:29:42 -04:00
Alexander Bock
eb08968bc6 Compile fix for merge conflict 2023-04-13 23:29:12 +02:00
Emma Broman
1d240aa1f5 Fix opacity not being settable from asset for some fadeables 2023-04-13 20:56:55 +02:00
Alexander Bock
7565a91196 Cleanup lambda expressions and directly address Fadeable properties when adding properties 2023-04-12 23:20:53 +02:00
Joakim Kilby
b219638e29 Add ability to cache globe data using MRFs (#2565)
Enables globe-browsing data to be cached using caching mrf's as it is loaded from the original dataset. Subsequent reads of tiles that have been cached do not query the original dataset but picks it up from the mrf data.
Supports anything that can be used a dataset for a gdal raster but raw images such as JPGs are explicitly disallowed as they lack necessary geotransform data.

Activated on a global scale by setting the following keys in openspace.cfg (ModuleConfigurations/GlobeBrowsing)
MRFCacheEnabled = true,
MRFCacheLocation = "<somepath>",
Settings can be overriden on a per-layer basis by adding the following entries to the layer entity of an asset
CacheSettings = { Enabled = true, Compression = "LERC", BlockSize = 512, Quality=25 },

The following per-layer settings are available and override the global module settings:
Enabled : enable/disable caching for this layer.
Compression: The compression algorithm to use for tile cache storage. (JPEG, PNG, or LERC)
BlockSize: Size of tiles in cache, should be a multiple of 2 although this is not required.
Quality: The quality setting of the JPEG compression (when used)

Note that heightlayers must use LERC compresison and this is the default unless overridden by a layer.
2023-04-11 08:46:25 +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
80e2aaf564 Remove whitespaces at the end of files, ' and - characters 2023-04-05 16:58:45 +02:00
Alexander Bock
8eec0e84b9 Fix an issue with being able to add a GIBS layer via addGibsLayer 2023-03-26 20:24:55 +02:00
Malin E
f62d0bb677 Make sure openGL state is reset after rendering globes 2023-03-21 13:53:05 +01:00
Ylva Selling
103d1a11fc Merge remote-tracking branch 'origin/master' into feature/video-module
# Conflicts:
#	modules/globebrowsing/src/tileprovider/tileprovider.cpp
2023-03-20 10:44:45 -04: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
Emma Broman
4a50c4cbc0 Double renderbins for renderables (#2520) 2023-03-08 10:59:32 +01:00