Commit Graph

769 Commits

Author SHA1 Message Date
Adam Rohdin
8629ee6330 Added extra spacing
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2023-06-08 09:00:53 +02:00
Adam Rohdin
7bf6b1d00f Merged two if-statements 2023-06-07 17:14:08 +02:00
Adam Rohdin
f1d838da77 Fixes bugs when some variables equals 0 2023-06-07 16:59:39 +02:00
Adam Rohdin
959efddc51 Fixes #2540 by correctly showing all points, including the proper end point 2023-06-07 16:20:19 +02:00
Alexander Bock
25292cef76 Disable too agressive culling of renderabletrails for now (closes #2653) 2023-06-03 13:42:13 +02:00
Alexander Bock
9d5e50d930 Ensure that the geometry has the animation enabled (closes #2731) 2023-06-03 02:50:39 +02:00
Adam Rohdin
781b114d29 Moved bounding sphere calculations for better performance 2023-05-31 15:45:00 +02:00
Malin E
ff805d334f Fix issue with atmosphere rendering on top of spheres 2023-05-26 16:34:38 +02:00
Malin E
6f8245d9cb Fix issue with atmosphere rendered on top of video plane
* Issue still persists with video sphere and regular sphere
2023-05-26 11:23:09 +02:00
Malin E
6054a817d8 Move model loading code to initialiseGL, fixes #1838 2023-05-24 16:40:17 +02:00
Malin E
4d9d4717d3 Set clear color for transparent models, fixes #2683 2023-05-23 11:25:48 +02:00
Malin E
9081a4db66 Make the numeric value of the model scale a property in the gui 2023-05-22 17:46:31 +02:00
Emma Broman
12d37d92a6 Fix faulty type for RenderableModel ModelTransform property input
from asset dictionary
2023-05-22 17:07:28 +02:00
Malin E
0490e94350 Fix modelshader example in Debug mode 2023-05-22 11:37:28 +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
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
Alexander Bock
6dfd0cd3a8 Remove warnings on MSVC 2023-04-26 23:51:16 +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
Malin E
f77a028153 Add property to RenderablePlanes to rescale depending on content 2023-04-13 19:01:31 +02: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
c2457e5c41 Address PR comments 2023-04-13 14:54:49 +02:00
Malin E
a017006ec6 Add todo comment from discussion in PR 2023-04-13 12:35:51 +02:00
Malin E
6d8f7b2fbd Handle override RenderBins from asset files 2023-04-13 10:59:23 +02:00
Alexander Bock
7565a91196 Cleanup lambda expressions and directly address Fadeable properties when adding properties 2023-04-12 23:20:53 +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
Malin E
94e8f90d1a Take into account the scale in the gui when calculating distance culling 2023-04-12 16:50:08 +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
1d92383317 Make sure RenderBin is set before render function is called 2023-04-06 14:53:05 +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
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
Malin E
6c56630217 Set model boundingsphere in initialize instead of update 2023-04-03 11:31:49 +02:00
Malin E
6ce5a170c0 Make RenderablePlane able to be rectangular 2023-03-28 11:53:09 +02:00
Malin E
f636b76469 Address more PR comments 2023-03-27 11:26:43 +02:00
Malin E
be2e9d5caf Address PR comments 2023-03-22 13:37:30 +01: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
Malin E
3cd2cfac93 Fix issue with side by side stereo rendering 2023-03-09 11:59:44 +01:00
Malin E
184a8b59ac Fix hole cutting or side by side stereo
* And disable face culling for Orion model that is a one sided plane
2023-03-08 11:49:55 +01:00
Emma Broman
5e7b67e077 Fix RenderableSphere overriding DisableFade property from asset
And always add the properties, as well as make the behavior a bit more clear through documentation
2023-03-08 10:24:54 +01:00
Adam Rohdin
88d6366901 Merge pull request #2525 from OpenSpace/RenderableTrailTrajectory-Optimization
Optimizations for RenderableTrailTrajectory
2023-03-07 16:24:36 +01:00
Adam Rohdin
f0f278a9a2 Updated comments in order to adhere to the repo line length standard 2023-03-07 16:19:33 +01:00
Alexander Bock
a711591c09 Update Doxygen (#2537)
* Modernizing Doxygen
* Remove warnings for Doxygen
2023-03-06 23:41:24 +01:00
Malin E
98836e5393 Fix manual depth test hole cutting 2023-03-03 08:44:13 +01:00
Malin E
fedbf9a31e Remove unused textures 2023-03-02 15:31:10 +01:00
Adam Rohdin
25a6b287e7 Fixed overflow bug and enabled sweepChunkSize to be set in assets 2023-03-02 14:55:26 +01:00
Alexander Bock
375e5c6561 Tracy Update (#2534)
* Update the Tracy repository
* Update submodules
2023-03-01 11:48:21 -07:00
Malin E
5a6ac848f9 Make possible to disable manual depth test in opacity mode 2023-03-01 17:31:48 +01:00
Adam Rohdin
89cf05eb5f Changes based on PR feedback 2023-02-27 10:50:24 +01:00