4d9983a867
Solve 1 more conflict
2023-02-01 14:57:31 +01:00
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
2fcf4617c9
Correctly swizzle the textures for ScreenSpaceImage types to allow for 8 bit grayscale images ( closes #2330 )
2023-01-27 21:29:12 +01:00
eba9d000e6
Don't render RenderableTrailTrajectory if the time is _exactly_ the start time ( closes #2314 )
2023-01-27 21:02:27 +01:00
d52c5dd0d9
Cleanup code with designated initializer lists
2023-01-22 23:01:32 +01:00
a2a1554c9a
Small cleanup of property documentation
2023-01-09 00:11:58 +01:00
4f4764209f
Happy new year
2023-01-02 11:19:33 +01:00
560c58e499
Add manual depth test between models
2022-12-07 14:19:12 +01:00
ee35aee5bb
Remove PointsAndLines blend mode for models
...
* Duplicate of deafult blend mode
2022-12-05 11:20:03 +01:00
87ed8c69c8
Simplyfy model opacity rendering
2022-12-05 11:19:22 +01:00
574b789338
Merge branch 'master' into feature/model-opacity
...
* Solve conflicts in nebula and asset_helper assets
2022-12-01 10:20:05 +01:00
ccfe61cbef
Fix type in documentation for RenderableTimeVaryingSphere
2022-11-29 11:46:44 +01:00
bf25e4562a
Invert the disable properties culling and depth test in models
...
* disableFaceCulling -> enableFaceCulling
* disableDepthTest -> enableDepthTest
2022-11-25 10:01:46 +01:00
005ff102e7
Decouple property for culling and transparecny 2 pass for models
2022-11-23 11:43:15 +01:00
ec625c1c41
Detect transparent models
2022-11-16 16:41:16 +01:00
a0423daf30
Render front anv back faces seperatly to fix transparency
2022-11-15 16:24:49 +01:00
04f0b1281a
Remove EnableOpacityBlending property for models (unused)
2022-11-15 16:06:05 +01:00
2cd09de2fa
Fix support for transparent models
2022-11-14 10:27:20 +01:00
8dbdba1174
Fix opacity blending
2022-11-03 13:14:08 +01:00
6c223cd8ae
Some clean up
2022-11-03 11:15:21 +01:00
e749be21a5
Move Overlay RenderBin to before postDeffredTransparent
2022-11-02 17:46:20 +01:00
8e2f5450f4
Add documentation for texture access functions
2022-11-02 17:34:00 +01:00
2fe78e949d
Merge branch 'master' into feature/model-opacity
2022-11-02 13:51:22 +01:00
6249fa6d89
Collection of a number of changes ( #2286 )
...
* Cleanup Property code
* Remove NOLINT statements
* Return Property class types as string_view
* Remove getStringValue function
* Simplify string value retrieval
* Ensure that image paths in the ImageSequenceTileProvider are sorted (closes #2205 )
* Some cleanup of OpenSpaceEngine
* Cleanup documentation
* Some more cleanup of engine classes
* Some more cleanup
* Update SGCT repository
* Use new Jenkins node identifiers as the old method broke with update
2022-10-30 12:54:14 +01:00
a77e227430
Re-use textures in the FramebufferRenderer for model opacity rendering
2022-10-28 10:12:56 +02:00
9f9f2e1558
Merge branch 'master' into feature/model-opacity
2022-10-12 16:30:33 +02:00
93a8b3af8a
Small clean up
2022-10-10 09:31:35 +02:00
eeebfdb2c6
Some small clean up
2022-10-06 13:48:16 +02:00
4adaea5b76
Resize textures when window resizes
2022-10-06 12:04:22 +02:00
202cf4b5b6
Fix opacity issue with model vs trails + small clean up
2022-10-06 11:41:15 +02:00
11981138f8
Move Model to render bin Post deffered if transparent
2022-10-06 09:53:25 +02:00
c5f6f72b77
Fix depth issues
2022-10-04 14:34:36 +02:00
5c3838f335
WIP Model is visible
...
* Opacity issues
* "Clearing" issues
2022-09-27 14:45:22 +02:00
ac79e4dc07
Start addressing PR comments
2022-09-22 12:01:01 +02:00
34aa515f16
Fix issue with grid for different x and y values
...
* Also adjust grid example asset to showcase the highlight feature
2022-09-19 14:37:42 +02:00
e215e9f2a7
Add labels to the other grid classes too
2022-09-19 12:07:59 +02:00
3b5c3c51d6
Fix OpenGL error for model opacity shader program
2022-09-14 16:52:58 +02:00
77beb4c3af
WIP First attempt at a solution
2022-09-14 14:36:33 +02:00
533b1965c7
Enable depth test for the grids
2022-09-14 11:18:39 +02:00
9667db22c9
Small fixes
2022-09-09 10:27:17 +02:00
4415e840a8
Use new label class for the new grids
2022-09-08 14:54:15 +02:00
40e7d0a9bd
Merge branch 'master' into feature/grid-labels
...
* Solve conflict in renderablegrid.h
2022-09-08 11:31:35 +02:00
91eb006d4e
Add labels to RenderableGrid class
2022-09-08 11:28:12 +02:00
75fd08246c
Switch from floats to doubles for the grids
...
* Avoids jittering problems when close to SSB
2022-09-08 09:41:00 +02:00
611bce55cd
Fix capital letters in module define
2022-09-01 14:26:31 +02:00
14347cfaba
Rename RenderableLabels to RenderableLabel
...
* Since it only creates one label and not several
2022-08-31 17:02:35 +02:00
bb638faf10
Move the scaling into the size parameter of the grids
2022-08-31 13:58:08 +02:00
0ce7874b90
Address more PR comments
2022-08-31 09:10:18 +02:00
f247b500c0
Address some more PR comments
2022-08-30 18:03:47 +02:00
3e142e5f2f
Change default to not use highlight in grids
2022-08-29 13:57:40 +02:00
Malin E