Commit Graph

285 Commits

Author SHA1 Message Date
benpm
47fe9d4d7d fix error on disable "perform shading" property on saturn 2025-09-09 01:44:23 -06:00
Alexander Bock
eaa9e6fb39 Fix some coding style questions 2025-08-27 13:19:59 +02:00
benpm
792d65c941 shadow of globe onto rings now uses simple ray/ellipsoid intersection
fixes #3776
2025-08-25 12:23:25 -06:00
Benjamin Mastripolito
ddb275fc2b Update modules/globebrowsing/shaders/advanced_rings_fs.glsl
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2025-07-24 14:41:15 -06:00
benpm
eb36590d98 fixed openGL api errors and warnings, removed unused shadow mapping code from globe renderer 2025-07-17 16:53:54 -06:00
benpm
e623e38638 applying more suggestions from code review 2025-07-17 12:33:40 -06:00
Benjamin Mastripolito
c7bbca9a81 Apply suggestions from code review
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2025-07-14 20:10:54 -06:00
benpm
f653706480 fixed the ring transparency being used incorrectly, minor visual improvements 2025-07-11 03:21:21 -06:00
benpm
a7f67d10cc minor cleanup to ring shadow shader setup code 2025-07-11 01:55:52 -06:00
benpm
5416b45bd0 improving shadow visual quality by applying additional factor based on angle to light source
see issue #3656
2025-07-10 18:02:51 -06:00
benpm
8cfce2a0f1 shadow looking pretty good! code needs cleanup and stuff tho 2025-07-09 16:32:14 -06:00
benpm
ca8bdf86a6 WIP: getting a more or less correct ring texture coordinate! 2025-07-09 15:01:21 -06:00
benpm
92d42925b4 wip 2025-07-08 13:27:10 -06:00
benpm
7f563d5125 fixed shader ready check for globe rings component 2025-07-01 01:49:07 -06:00
benpm
fd5c126e15 first attempt. doesn't build :P 2025-06-24 19:33:51 -06:00
Benjamin Mastripolito
300e1089a4 Update modules/globebrowsing/shaders/rings_geom_fs.glsl
Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
2025-05-19 22:31:29 -06:00
benpm
c8243d75c1 (#3596) fixed normals in rings_geom_fs.glsl 2025-05-01 11:10:16 -06:00
benpm
94dfb26ee0 (#3596) added discard if ring normal is near perpendicular with light direction 2025-04-28 15:01:07 -06:00
benpm
0aa1edcfde (#3596) added vertex normals to ring quad vertex attribs 2025-04-25 16:10:33 -06:00
Alexander Bock
820e90eab4 Happy new year 2025-01-14 16:21:08 +01:00
Alexander Bock
981a13a855 Add new TileProvider to select tile providers based on the date and apply to VIIRS Joint Polar Satellite System (#3350) 2024-07-18 11:18:57 +02:00
Alexander Bock
fff6f8a627 General pass for code cleanup 2024-03-08 00:36:54 +01:00
Alexander Bock
6e29d898cf Update copyright header 2024-02-06 15:53:24 +01:00
Emma Broman
9d97028c3a Fix issue with overflowing color values for layers (closes #2880) 2024-01-25 13:50:36 +01:00
Joakim Kilby
f179f20c96 Remove tile-padding to reduce stair-stepping issues (#2842)
* account for availability of next level in desired level

solves #2834

* remove tile-padding option & functionality

* remove (no longer needed) recursive read function

since we no longer padd tiles we cannot sample outside of a read region
anymore.

* change default tilesize for heightlayers to avoid discontinuities

* make frustum culling control a debug property

* Small style guide fix

* clarify if-statement with comment

* add variable for default height-tile resolution, update comment

---------

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
2023-08-14 13:38:20 +02:00
Emma Broman
8b923f3a4b Fix compiler error in geojson shaders
Cuases problems with GeoJson on some graphics cards
2023-08-07 09:08:40 +02:00
Alexander Bock
1593ab50aa Rename TileLayer to TileProvider classes (closes #2767).
Breaking change in assets that load Layers:
 - DefaultTileLayer -> DefaultTileProvider
 - SingleImageTileLayer -> SingleImageProvider
 - ImageSequenceTileLayer -> ImageSequenceTileProvider
 - SpoutImageTileLayer -> SpoutImageProvider
 - TemporalTileLayer -> TemporalTileProvider
 - TileIndexTileLayer -> TileIndexTileProvider
 - SizeReferenceTileLayer -> SizeReferenceTileProvider
 - ByLevelTileLayer -> TileProviderByLevel
 - ByIndexTileLayer -> TileProviderByIndex
2023-08-03 21:50:25 +02:00
Alexander Bock
14c02a85ce Add the ability to provide a random background image to TileIndexTileProviders 2023-06-06 15:33:13 +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
Ylva Selling
7fef92802d Merge pull request #2608 from OpenSpace/feature/video-module
Video module
2023-04-14 18:28:35 -04: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
Ylva Selling
70fd239418 Merge remote-tracking branch 'origin/master' into feature/video-on-globe
# Conflicts:
#	modules/globebrowsing/src/layergroupid.h
#	modules/globebrowsing/src/tileprovider/tileprovider.cpp
2023-02-09 12:55:08 -05:00
Ylva Selling
d75b63686b Rename FfmpegTileProvider to VideoTileProvider 2023-01-19 11:19:05 -05:00
Alexander Bock
4f4764209f Happy new year 2023-01-02 11:19:33 +01:00
Malin E
2f07d5d3f9 Merge branch 'master' into feature/video-on-globe 2022-11-28 13:09:38 +01:00
Alexander Bock
12bb47c71e Recalculate chunk bounding boxes when the settings of a heightlayer change (closes #2096)
* Correctly calculate Offset when negative numbers are involved
* Adds tile index layer for the Moon
* Remove empty spaces
2022-11-07 15:45:54 +01:00
Ylva Selling
f876f05202 Merge remote-tracking branch 'origin/master' into feature/video-on-globe 2022-10-04 12:08:51 -04:00
Ylva Selling
fa30188e44 Fix bug with rendering video layer 2022-10-04 12:06:08 -04:00
Malin E
866b37fac3 Expose ambient intensity value for globes as a property 2022-09-28 12:03:41 +02:00
Alexander Bock
c1252902c7 More Code Cleanup (#2192)
* Harmonizing ( and ) in function calls
* static const -> constexpr
* Fix compile issue
* Unify shader tab size
* Add _fs and _vs to shaders
* Harmonize spacing
2022-07-26 11:22:41 +02:00
Alexander Bock
6a708b1f18 Implement new Spout input methods to Tileproviders and new Renderables (#1901)
* Implement new Spout input methods to Tileproviders and new Renderables

Co-authored-by: Marco Silva <marco@elumenati.com>
2022-03-03 23:47:09 +01:00
Alexander Bock
cdac4942b6 Merge branch 'master' into feature/tileproviders
# Conflicts:
#	ext/ghoul
#	modules/globebrowsing/src/tileprovider.cpp
#	modules/globebrowsing/src/tileprovider.h
2022-01-01 12:34:42 +01:00
Alexander Bock
d7d279ea16 Happy new year 2022-01-01 12:32:55 +01:00
Alexander Bock
7e62f7af1d Turn the color map into a 1D texture 2021-12-31 18:02:53 +01:00
Alexander Bock
7cf5c37474 Image sequence tileprovider (#1798)
* Fix for rendering DoublePropertys in ImGui
* Adding an ImageSequenceTileProvider that loads a folder of images and makes them available through a user-selectable index
2021-12-27 18:58:05 +01:00
eriksunden
24ce66aad4 Feature/tileinterpolation (#1769)
* Interpolation of tiles added to tileprovider, with additional new shaders to make this work.
 * Asset file for testing interpolation

Co-authored-by: tobiasp93 <tobias.pettersson@liu.se>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2021-11-01 09:24:40 +01:00
Alexander Bock
227a6607cc Extend the skirts in local rendering again as cracks started to appear in globes (#closes 1647) 2021-06-18 14:50:23 +02:00
Alexander Bock
c3ba532bdb Feature/cleanup (#1608)
* Revert screenlog back to showing Info and above messages
 * Various code cleanup
2021-05-25 14:08:33 +02:00
Alexander Bock
b00fcb78df Enable setting of opacity for RenderableGlobe (closes #1449) 2021-04-16 17:31:55 +02:00