Commit Graph

218 Commits

Author SHA1 Message Date
Malin E 71caf31f02 Small clean up 2023-04-13 11:27:11 +02:00
Malin E 6d8f7b2fbd Handle override RenderBins from asset files 2023-04-13 10:59:23 +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
Alexander Bock 80e2aaf564 Remove whitespaces at the end of files, ' and - characters 2023-04-05 16:58:45 +02:00
Malin E be2e9d5caf Address PR comments 2023-03-22 13:37:30 +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 a3b5300684 Update model shader example shaders 2023-03-08 10:24:26 +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
Malin E 896ca0f108 Make debug texture prettier 2023-03-01 17:33:26 +01:00
Malin E bae8bbef3a Clean up some shader code 2023-02-22 14:50:55 +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 7d2f781603 Only render with a two pass solution if the model is not opague 2023-02-08 14:14:59 +01:00
Malin E 14edda9e61 Remove problematic manual depth test code 2023-02-01 16:25:19 +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 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 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 eeebfdb2c6 Some small clean up 2022-10-06 13:48:16 +02:00
Malin E 115d4f4f81 Fix issue with starts dissapearing 2022-09-27 15:08:53 +02:00
Malin E 5c3838f335 WIP Model is visible
* Opacity issues

* "Clearing" issues
2022-09-27 14:45:22 +02:00
Malin E 77beb4c3af WIP First attempt at a solution 2022-09-14 14:36:33 +02:00
Malin E 75fd08246c Switch from floats to doubles for the grids
* Avoids jittering problems when close to SSB
2022-09-08 09:41:00 +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
Ylva Selling a78c4f7d28 Move the limit of gamma to not be zero from shader to lower property bound 2022-06-22 02:51:37 -04:00
Ylva Selling d23969b8d3 Add gamma correction to screen space renderable (SSR) shader, property for SSR and default value gamma = 2.2 for sky browser display copies 2022-06-21 10:47:44 -04:00
Alexander Bock 0e49606706 Feature/Science on the Sphere (#1863)
Add all available Science-on-a-Sphere datasets from their public FTP as assets.  Many of the datasets include large files that are downloaded the first time the asset is loaded
2022-02-10 13:53:30 +01:00
Alexander Bock d7d279ea16 Happy new year 2022-01-01 12:32:55 +01:00
ElonOlsson 423d854615 Merge branch 'master' into thesis/2020/radiation 2021-09-13 18:23:33 -04:00
ElonOlsson 505215964a more pr comments fixed 2021-09-10 17:11:44 -04:00
Alexander Bock b649509bf0 Feature/model shader (#1723)
* Add support for RenderableModel to take custom shader code
 * Added example to highlight usage
2021-08-24 10:45:19 +02:00
ElonOlsson 743e2452f8 merge master to thesis branch 2021-08-16 15:23:49 -04:00
Alexander Bock 309bce2e30 Fix DebugAxis helper; Increase the sensitivity to prevent loss of color in debug axis (closes #1560) 2021-07-28 14:49:29 +02:00
ElonOlsson 7689cf1f65 master merge 2021-06-16 18:22:57 -04:00
Malin Ejdbo 9f7b8aa32b Merge branch 'master' into feature/jwst
* Resolve conflict
2021-05-31 15:45:10 +02:00
Malin Ejdbo 31b834dbb2 Address PR comments 2021-05-31 15:34:54 +02:00
Alexander Bock 744ba0dc9b Feature/side by side (#1613)
* Make atmosphere, raycasting, and trails work with side_by_side stereo
2021-05-28 23:31:10 +02:00
ElonOlsson d96f12396f merge + codegen doc return 2021-05-26 11:00:50 -04:00
Malin Ejdbo 4202b21ebc Merge branch 'master' into feature/jwst
* Resolve conflicts
2021-05-26 14:21:10 +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
ElonOlsson fcc690fa09 master merge + seed point files from directory fix 2021-05-18 12:00:53 -04:00
ElonOlsson 9d1ece1163 finish merge + manual time offset property 2021-05-12 15:37:22 -04:00
Malin Ejdbo 0ae8849adf Merge branch 'master' into feature/jwst 2021-05-12 09:34:52 +02:00
Alexander Bock 09e28ff49e Enable Screenspace renderable to have a multiplicative color; Add new asset to show a target marker (closes #85); Fix bug with wrong documentation shown in RenderablePlane 2021-05-08 18:08:56 +02:00
Malin Ejdbo 19c845b422 Add initial version of RenderablePrism 2021-05-07 16:53:13 +02:00
ElonOlsson 4f67a649b9 mirror backside parameter of renderableplane, renamed renderabletimevaryingplaneimagelocal to renderableplanetimevaryingimage. mm. 2021-03-12 12:27:01 -05:00
Malin Ejdbo 775d9751dd Apply mesh transform in shader including normals and tangents
* Update Ghoul

* Loading several models have not yet been updated and will not work with
this commit
2021-03-09 11:26:37 +01:00