diff options
author | Ivan Perevala <ivpe> | 2020-11-13 10:24:52 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2020-11-13 10:26:27 +0300 |
commit | 4efd87d56b65e4fb5c10de399ab15ef59a9c305f (patch) | |
tree | 7c75d20c4a88502484e7b1322495e617864a1700 /source/blender/draw/intern | |
parent | b35b8c884909307bff2f71ce766621144fbc85a1 (diff) |
UI: Adaptive HDRI preview resolution
HDRI preview should have resolution dependent on dpi, viewport scale and HDRI gizmo size.
This patch uses a LOD to render a more round sphere.
Reviewed By: Jeroen Bakker
Differential Revision: https://developer.blender.org/D9382
Diffstat (limited to 'source/blender/draw/intern')
-rw-r--r-- | source/blender/draw/intern/draw_cache.c | 45 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache.h | 12 |
2 files changed, 49 insertions, 8 deletions
diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c index dd2617342e1..921164c73a7 100644 --- a/source/blender/draw/intern/draw_cache.c +++ b/source/blender/draw/intern/draw_cache.c @@ -66,6 +66,17 @@ #define VCLASS_EMPTY_AXES_SHADOW (1 << 13) #define VCLASS_EMPTY_SIZE (1 << 14) +/* Sphere shape resolution */ +/* Low */ +#define DRW_SPHERE_SHAPE_LATITUDE_LOW 32 +#define DRW_SPHERE_SHAPE_LONGITUDE_LOW 24 +/* Medium */ +#define DRW_SPHERE_SHAPE_LATITUDE_MEDIUM 64 +#define DRW_SPHERE_SHAPE_LONGITUDE_MEDIUM 48 +/* High */ +#define DRW_SPHERE_SHAPE_LATITUDE_HIGH 80 +#define DRW_SPHERE_SHAPE_LONGITUDE_HIGH 60 + typedef struct Vert { float pos[3]; int class; @@ -88,7 +99,6 @@ static struct DRWShapeCache { GPUBatch *drw_quad; GPUBatch *drw_quad_wires; GPUBatch *drw_grid; - GPUBatch *drw_sphere; GPUBatch *drw_plain_axes; GPUBatch *drw_single_arrow; GPUBatch *drw_cube; @@ -140,6 +150,7 @@ static struct DRWShapeCache { GPUBatch *drw_particle_circle; GPUBatch *drw_particle_axis; GPUBatch *drw_gpencil_dummy_quad; + GPUBatch *drw_sphere_lod[DRW_LOD_MAX]; } SHC = {NULL}; void DRW_shape_cache_free(void) @@ -473,11 +484,30 @@ static void sphere_lat_lon_vert(GPUVertBuf *vbo, int *v_ofs, float lat, float lo (*v_ofs)++; } -GPUBatch *DRW_cache_sphere_get(void) +GPUBatch *DRW_cache_sphere_get(const eDRWLevelOfDetail level_of_detail) { - if (!SHC.drw_sphere) { - const int lat_res = 32; - const int lon_res = 24; + BLI_assert(level_of_detail >= DRW_LOD_LOW && level_of_detail < DRW_LOD_MAX); + + if (!SHC.drw_sphere_lod[level_of_detail]) { + int lat_res; + int lon_res; + + switch (level_of_detail) { + case DRW_LOD_LOW: + lat_res = DRW_SPHERE_SHAPE_LATITUDE_LOW; + lon_res = DRW_SPHERE_SHAPE_LONGITUDE_LOW; + break; + case DRW_LOD_MEDIUM: + lat_res = DRW_SPHERE_SHAPE_LATITUDE_MEDIUM; + lon_res = DRW_SPHERE_SHAPE_LONGITUDE_MEDIUM; + break; + case DRW_LOD_HIGH: + lat_res = DRW_SPHERE_SHAPE_LATITUDE_HIGH; + lon_res = DRW_SPHERE_SHAPE_LONGITUDE_HIGH; + break; + default: + return NULL; + } GPUVertFormat format = extra_vert_format(); GPU_vertformat_attr_add(&format, "nor", GPU_COMP_F32, 3, GPU_FETCH_FLOAT); @@ -508,9 +538,10 @@ GPUBatch *DRW_cache_sphere_get(void) } } - SHC.drw_sphere = GPU_batch_create_ex(GPU_PRIM_TRIS, vbo, NULL, GPU_BATCH_OWNS_VBO); + SHC.drw_sphere_lod[level_of_detail] = GPU_batch_create_ex( + GPU_PRIM_TRIS, vbo, NULL, GPU_BATCH_OWNS_VBO); } - return SHC.drw_sphere; + return SHC.drw_sphere_lod[level_of_detail]; } /** \} */ diff --git a/source/blender/draw/intern/draw_cache.h b/source/blender/draw/intern/draw_cache.h index 5da9f4b7964..afbf9903dbc 100644 --- a/source/blender/draw/intern/draw_cache.h +++ b/source/blender/draw/intern/draw_cache.h @@ -32,6 +32,15 @@ struct Volume; struct VolumeGrid; struct bGPDstroke; +/* Shape resolution level of detail */ +typedef enum eDRWLevelOfDetail { + DRW_LOD_LOW = 0, + DRW_LOD_MEDIUM = 1, + DRW_LOD_HIGH = 2, + + DRW_LOD_MAX, /* Max number of level of detail */ +} eDRWLevelOfDetail; + void DRW_shape_cache_free(void); /* 3D cursor */ @@ -44,9 +53,10 @@ struct GPUBatch *DRW_cache_fullscreen_quad_get(void); struct GPUBatch *DRW_cache_quad_get(void); struct GPUBatch *DRW_cache_quad_wires_get(void); struct GPUBatch *DRW_cache_cube_get(void); -struct GPUBatch *DRW_cache_sphere_get(void); struct GPUBatch *DRW_cache_normal_arrow_get(void); +struct GPUBatch *DRW_cache_sphere_get(const eDRWLevelOfDetail level_of_detail); + /* Dummy VBOs */ struct GPUBatch *DRW_gpencil_dummy_buffer_get(void); |