mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-01 09:10:18 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,947 Commits 99 Branches 46 Tags
12d37d92a6280b111bd7d0f546dbbcc19124cfa9
Commit Graph

221 Commits

Author SHA1 Message Date
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
Alexander Bock
ca916877b2 Adapt the visibility settings for all properties 2023-04-15 09:33: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
6c56630217 Set model boundingsphere in initialize instead of update 2023-04-03 11:31:49 +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
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
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
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
Malin E
06db9b3ce9 Add model scale and debug invisible feature to model projection 2023-02-23 11:05:44 +01:00
Malin E
f6eac4f0c7 Take back manual depth test for the two pass model rendering 2023-02-21 18:08:38 +01:00
Malin E
a877324c95 Make sure model rendering works with an odd number of atmospheres 2023-02-21 11:46:16 +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
Malin E
7d2f781603 Only render with a two pass solution if the model is not opague 2023-02-08 14:14:59 +01:00
Alexander Bock
79ad5776cc CMake cleanup (#2489) 
* CMake Cleanup
* Warning suppression with CEF
* Use SGCT tinyxml in skybrowser for now
* Disable warnings about missing field initializers
 2023-02-05 23:24:12 +01:00
Malin E
14edda9e61 Remove problematic manual depth test code 2023-02-01 16:25:19 +01:00
Malin E
00e80139a2 Solve one more conflict 2023-02-01 16:07:42 +01:00
Malin E
4d9983a867 Solve 1 more conflict 2023-02-01 14:57:31 +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
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
ee35aee5bb Remove PointsAndLines blend mode for models 
* Duplicate of deafult blend mode
 2022-12-05 11:20:03 +01:00
Malin E
87ed8c69c8 Simplyfy model opacity rendering 2022-12-05 11:19:22 +01:00
Malin E
bf25e4562a Invert the disable properties culling and depth test in models 
* disableFaceCulling -> enableFaceCulling

* disableDepthTest -> enableDepthTest
 2022-11-25 10:01:46 +01:00
Malin E
005ff102e7 Decouple property for culling and transparecny 2 pass for models 2022-11-23 11:43:15 +01:00
Malin E
ec625c1c41 Detect transparent models 2022-11-16 16:41:16 +01:00
Malin E
a0423daf30 Render front anv back faces seperatly to fix transparency 2022-11-15 16:24:49 +01:00
Malin E
04f0b1281a Remove EnableOpacityBlending property for models (unused) 2022-11-15 16:06:05 +01:00
Malin E
2cd09de2fa Fix support for transparent models 2022-11-14 10:27:20 +01:00
Malin E
8dbdba1174 Fix opacity blending 2022-11-03 13:14:08 +01:00
Malin E
6c223cd8ae Some clean up 2022-11-03 11:15:21 +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
a77e227430 Re-use textures in the FramebufferRenderer for model opacity rendering 2022-10-28 10:12:56 +02:00
Malin E
93a8b3af8a Small clean up 2022-10-10 09:31:35 +02:00