Commit Graph

1089 Commits

Author SHA1 Message Date
Emma Broman
9f9c7f3b03 Remove some redundant code that has been updated on master 2024-07-16 11:36:30 +02:00
Emma Broman
c802655743 Merge branch 'master' into project/exoplanet-explorer
# Conflicts:
#	config/equirectangular_gui.json
#	config/fullscreen1080.json
#	config/single_fisheye.json
#	config/single_fisheye_gui.json
#	config/single_sbs_stereo.json
#	config/spherical_mirror.json
#	config/spherical_mirror_gui.json
#	config/spout_output_cubemap.json
#	config/spout_output_equirectangular.json
#	config/spout_output_fisheye.json
#	config/spout_output_flat.json
#	config/two_nodes.json
#	data/assets/examples/nodeline.asset
#	data/profiles/juice.profile
#	data/profiles/jwst.profile
#	data/profiles/osirisrex.profile
#	data/profiles/voyager.profile
#	include/openspace/rendering/renderable.h
#	modules/base/CMakeLists.txt
#	modules/base/basemodule.cpp
#	modules/base/shaders/arrow_fs.glsl
#	modules/base/shaders/arrow_vs.glsl
#	modules/exoplanets/exoplanetsmodule_lua.inl
#	src/rendering/renderable.cpp
2024-07-15 13:27:07 +02:00
Alexander Bock
0707829c7b Reducing compiler warnings (#3341) 2024-06-28 14:16:06 +02:00
Alexander Bock
f04c088a4b Add the ability to specify dashboarditems for ScreenSpaceDashboard at construction time. Improve error messages and export DashboardItem documentation 2024-06-22 13:05:33 +02:00
Alexander Bock
02cc28f192 Generate the framebuffer for screenspace rendering without mipmapping as it handles transparency poorly 2024-06-22 09:13:13 +02:00
Emma Broman
6cb4a7efef Fix issue with texture not updating on property change for RenderablePointCloud
Fix issue with texture not being rendered when the texture file path is set during runtime
2024-06-18 13:47:35 +02:00
Alexander Bock
01fa2898db FixedRotation rerequests a missing attached node or target node every frame to prevent incorrect initialization order 2024-06-15 18:07:39 +02:00
Alexander Bock
43645ce7a4 Fix existing assets; Make the goToGeo function without altitude in the profile work 2024-06-14 23:55:55 +02:00
Emma Broman
62b2a8c8c1 Fix renderable sphere example and add one for using local image (#3306)
* Fix renderable sphere example and add one for using local image
2024-06-13 10:43:54 +02:00
Alexander Bock
866aad2187 Global pass over the coding style 2024-06-12 14:51:25 +02:00
Alexander Bock
f82dc0371b Add example to TimelineRotation. Also fix bug where a non-interpolating timelinerotation would disappear before the first keyframe (#3310)
* Add example to TimelineRotation. Also fix bug where a non-interpolating timelinerotation would disappear before the first keyframe

---------

Co-authored-by: Emma Broman <emma.broman@liu.se>
2024-06-11 22:16:16 +02:00
Alexander Bock
6a1a22b485 Improve documentation and add examples for the StaticRotation (#3309)
* Improve documentation and add examples for the StaticRotation

---------

Co-authored-by: Emma Broman <emma.broman@liu.se>
2024-06-11 22:06:33 +02:00
Alexander Bock
6edea5cae7 Apply the hue, value, saturation, and gamma values from the renderengine to screenspace renderables. Change the screenspace's own gamma value into an offset (#3293)
* Apply the hue, value, saturation, and gamma values from the renderengine to screenspace renderables.  Change the screenspace's own gamma value into an offset

* Make it clearer that the gamma correction is now an offset
2024-06-04 16:28:52 +02:00
Alexander Bock
62a01ea317 Add example and fixes for the LuaTranslation (#3284) 2024-06-03 09:57:26 +02:00
Alexander Bock
2ab09b50e5 Add example for the LuaRotation class and fix it at the same time (#3285)
* Add example for LuaRotation class and make it work again
2024-06-03 09:57:15 +02:00
Alexander Bock
aa0255bccb Add example for the LuaScale class and fix it at the same time (#3271)
* Change the LuaScale to request a single table as a return value to be consistent with the other Lua transformation types
2024-05-31 22:26:24 +02:00
Emma Broman
eb1cfec7bd Renderable property info walkthrough/cleanup (#3226)
A passover of all the Parameters descriptions and PropertyInfo descriptions of the renderables in the code base to make then more consistently and concisely formatted. Also fixed some small issues and added or updated descriptions.

* Start rephrasing propertyinfos for more consistency

* Update eclipse cone propertyinfos

* Update `RenderableFov` property infos and group colors in UI

* `RenderableGalaxy` and `RenderableGlobe`

* Update more descriptions

* Moore descriptions

* Update docs for `RenderableShadowCylinder` and add properties

* `RenderableSkyTarget`, and spheres (`ImageOnline` and `ImageLocal`)

* `RnederableSphericalGrid`, and update line width info of other types, for consistency

* `RenderableStars` and `RenderableTimeVaryingSphere`

* Update more propertyinfos

* Fix inconsistent mentioning of true/false

* change some phrasings for increased consistency

* Update Renderbin description to include Sticker bin and remove extra property

* Rename `OutlineWeight` -> `OutlineWidth`

* Extend description about enable depth test for models

* Clarify what relative values mean for `RenderableNodeArrow`

* Elaborate on `RenderableLabel` size property

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
Co-authored-by: Malin E <malin.ejdbo@gmail.com>
2024-05-20 09:24:40 +02:00
Emma Broman
542f35e4de Update ScreenSpaceRenderable documentation (#3227)
* Update screen space documentation

* Fix inconsistent "screen space" phrasing

* Rephrase according to code review

---------

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
Co-authored-by: Malin E <malin.ejdbo@gmail.com>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-05-17 15:38:48 +02:00
Emma Broman
e745c40152 Update examples for RenderableNodeArrow and RenderablePlaneImageOnline (#3215)
* Update examples for `RenderableNodeArrow` and `RenderablePlaneImageOnline`


Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-05-14 11:28:58 +02:00
Andreas Engberg
c2ea21b43c add listener on file texture changes 2024-05-13 15:55:02 +02:00
Malin E
09da94cf6b Add documentation and example for RenderableSphereImageOnline (#3185)
* Add a simple online sphere image example

* Add documentation for RenderableSphereImageOnline

* Address pull request comments

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-05-13 15:28:27 +02:00
Emma Broman
075f6c8f65 Properly fix useCaching for point cloud colormaps
Forgot the update function in 1092948518, oops
2024-05-02 13:56:48 +02:00
Emma Broman
436eb0d195 Update outdated renderable description 2024-05-02 11:14:45 +02:00
Emma Broman
1092948518 Make useCaching for point cloud also affect color map
Makes it so that changes can be done to the color map file without having to delete the cache, and decreases confusion about that one file is cached when the other isn't
2024-05-02 11:08:59 +02:00
Ylva Selling
7757ec7976 Merge pull request #3212 from OpenSpace/issue/2996
Issue/2996 - documentation engine rewrite
2024-04-30 16:11:13 +02:00
Alexander Bock
203cff04cc Make use of the new uniform cache method that uses the variable names as uniform names (#3217) 2024-04-30 08:12:33 +02:00
Alexander Bock
5c4c5b1f10 Correctly advance dashboarditem pen position before rendering instead of afterwards (closes #3067) 2024-04-24 19:56:25 +02:00
Alexander Bock
78b3b4fb2e Adding periods to the description texts 2024-04-23 22:33:17 +02:00
Alexander Bock
f23505db90 Add documentation and examples for NonUniformStaticScale. Remove the no-argument constructor and make the dictionary constructor explicit (#3182)
* Add documentation and examples for NonUniformStaticScale.  Remove the no-argument constructor and make the dictionary constructor explicit
2024-04-23 08:53:24 +02:00
Alexander Bock
c87a0901a2 Add example and documentation for the StaticScale. Extract the static scale as a double value instead of a float (#3181)
* Add example and documentation for the StaticScale.  Extract the static scale as a double value instead of a float
2024-04-23 08:49:52 +02:00
Alexander Bock
28845a5df6 Add examples and documentation for TimeDependentScale. Add more strict verifiers (#3180)
* Add examples and documentation for TimeDependentScale. Add more strict verifiers
* Update verifier to accept Spice-like YYYY MMM DD hh:mm::ss dates
2024-04-23 08:48:50 +02:00
Alexander Bock
048dfdfde1 Add example for TimeFrameUnion and properly use the parameters struct (#3179) 2024-04-23 08:45:54 +02:00
Emma Broman
f5d68cbd5e Issue/3070 - Outline/border to textured points (#3191)
* Add option for outline styles (round, square, bottom)
* Apply color map to point borders
2024-04-19 17:48:28 +02:00
Adam Rohdin
392a521423 Fix for a lot of trail related stuff (#3193)
Fixes following issues: #625 , #1067 , #1212 , #1472 , #2072 , #2235, #2964
- Trails in `renderableTrailTrajectory` now goes through the spacecraft when using `AccurateTrailPositions`.
- Trail fading controls have been improved for classes using the `renderableTrail` class.
-  `renderableOrbitalKepler` (asteroids/satellites) can now be rendered as both trails and points (or both at once). Solution implements similar functionality/controls as `renderablePointCloud`.
- Default setting for SweepChunking has been changed from `true` to `false` (iterative calculations of `renderableTrailTrajectory`).
- Some fixes related to missing points or off-by-one errors related to trail rendering
2024-04-19 16:51:17 +02:00
Ylva Selling
9db86c79d4 Make abstract classes RenderablePlane and RenderableSphere, as well as VideoPlayer, not appear in the documentation. Add them to the derived classes instead 2024-04-19 11:13:19 +02:00
Emma Broman
82ddbc57f8 Include orientation data in new point cloud and remove RenderablePlanesCloud (#3168)
* WIP start including rotation data

* Fix option to use orientation data or not

* Renames to reflect that points are no longer billboarded (at least not always)

* Increase max value for scale factor

* Fix correct scaling for tully and deep sky objects

* Remove the old RenderablePlanesCloud, we don't need it anymore

* Add unit handling for size scaling from data values

* Clarify some documentation about the points being rendered as planes

* Update datasets to the new ones on the server

* Use quaternions for orientation instead of vectors (simplifies interpolation and requires less data)

* Make interpolation of orientation work

* Fix size for deep sky objects being too small due to data being radius rather than diameter

* Add IsRadius flag for deepsky

* Update asset versions (major number update, due to breaking changes)

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-04-18 14:06:55 +02:00
Alexander Bock
ca5d02cc02 Fix logging and documentation for LuaTranslation and LuaRotation (closes #3176) 2024-04-11 20:09:24 +02:00
Ylva Selling
5fdc3bf45f Remove todo link (as the documentation will link to asset) 2024-04-08 14:10:37 +02:00
Ylva Selling
22c00f2437 Clean up typos and duplicates in documentation 2024-04-08 13:45:01 +02:00
Emma Broman
731b6a5407 Fix broken interpolated points
Broke from moving dataset loading to initialise in 3f8bff5a62, and resulted in a crash..
2024-04-08 10:07:23 +02:00
Alexander Bock
3d62571c44 Remove warning on Jenkins 2024-04-07 01:53:16 +02:00
Alexander Bock
4328476d26 Use more filesystem::path where applicable 2024-04-06 23:55:59 +02:00
Emma Broman
2af06fb641 Add asset setting to skip first data point in RenderablePointCloud (#3161)
* Add asset setting to skip first data point

To hide our galaxy in the Tully datasets

* Apply suggestions from code review

Co-authored-by: Alexander Bock <alexander.bock@liu.se>

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2024-04-05 14:20:11 +02:00
Emma Broman
c26f903e47 Correctly reset face culling state after RenderableSphere rendering (closes #1128) 2024-04-05 14:19:31 +02:00
Emma Broman
d48f77fd9e Adress a couple of warnings 2024-04-03 09:23:32 +02:00
Emma Broman
046aea0776 Fix an oopsie in point cloud shader 2024-04-02 14:19:54 +02:00
Emma Broman
3f8bff5a62 General performance improvements (#3142)
* Adding some Tracy zones
* Move point cloud dataset loading to initialize function to speed up startup 
* Switch order of operations in memoryaware tile cache to speed up startup
* Move point cloud dataset loading to initialize function
* Add more Zone Scoped and rearrange SDSS loading
* More speed up

---------

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
2024-03-28 01:10:07 +01:00
Alexander Bock
49fc538c17 Rename fmt.h to format.h and enable audio module on default 2024-03-25 23:19:52 +01:00
Alexander Bock
3ba346a227 Remove fmt::format and replace with std::format 2024-03-24 20:19:14 +01:00
Alexander Bock
e0ab7ae1d6 Coding style fixes 2024-03-19 14:49:44 +01:00