diff options
| -rw-r--r-- | source/blender/draw/intern/draw_cache_extract.h | 4 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_cache_extract_mesh.c | 74 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 8 |
3 files changed, 43 insertions, 43 deletions
diff --git a/source/blender/draw/intern/draw_cache_extract.h b/source/blender/draw/intern/draw_cache_extract.h index a0679ba6442..c929fe7dfd3 100644 --- a/source/blender/draw/intern/draw_cache_extract.h +++ b/source/blender/draw/intern/draw_cache_extract.h @@ -109,8 +109,8 @@ typedef struct MeshBufferCache { /* Only for edit mode. */ GPUVertBuf *edit_data; /* extend */ GPUVertBuf *edituv_data; - GPUVertBuf *stretch_area; - GPUVertBuf *stretch_angle; + GPUVertBuf *edituv_stretch_area; + GPUVertBuf *edituv_stretch_angle; GPUVertBuf *mesh_analysis; GPUVertBuf *fdots_pos; GPUVertBuf *fdots_nor; diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.c b/source/blender/draw/intern/draw_cache_extract_mesh.c index c1087918840..f167ea3d540 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh.c +++ b/source/blender/draw/intern/draw_cache_extract_mesh.c @@ -3849,9 +3849,9 @@ static const MeshExtract extract_edituv_data = { /** \name Extract Edit UV area stretch * \{ */ -static void *extract_stretch_area_init(const MeshRenderData *mr, - struct MeshBatchCache *UNUSED(cache), - void *buf) +static void *extract_edituv_stretch_area_init(const MeshRenderData *mr, + struct MeshBatchCache *UNUSED(cache), + void *buf) { static GPUVertFormat format = {0}; if (format.attr_len == 0) { @@ -3880,10 +3880,10 @@ BLI_INLINE float area_ratio_to_stretch(float ratio, float tot_ratio, float inv_t return (ratio > 1.0f) ? (1.0f / ratio) : ratio; } -static void mesh_stretch_area_finish(const MeshRenderData *mr, - struct MeshBatchCache *cache, - void *buf, - void *UNUSED(data)) +static void mesh_edituv_stretch_area_finish(const MeshRenderData *mr, + struct MeshBatchCache *cache, + void *buf, + void *UNUSED(data)) { float tot_area = 0.0f, tot_uv_area = 0.0f; float *area_ratio = MEM_mallocN(sizeof(float) * mr->poly_len, __func__); @@ -3952,9 +3952,9 @@ static void mesh_stretch_area_finish(const MeshRenderData *mr, MEM_freeN(area_ratio); } -static const MeshExtract extract_stretch_area = { - .init = extract_stretch_area_init, - .finish = mesh_stretch_area_finish, +static const MeshExtract extract_edituv_stretch_area = { + .init = extract_edituv_stretch_area_init, + .finish = mesh_edituv_stretch_area_finish, .data_flag = 0, .use_threading = false, }; @@ -4001,9 +4001,9 @@ static short v2_to_short_angle(const float v[2]) return atan2f(v[1], v[0]) * (float)M_1_PI * SHRT_MAX; } -static void edituv_get_stretch_angle(float auv[2][2], - const float av[2][3], - UVStretchAngle *r_stretch) +static void edituv_get_edituv_stretch_angle(float auv[2][2], + const float av[2][3], + UVStretchAngle *r_stretch) { /* Send UV's to the shader and let it compute the aspect corrected angle. */ r_stretch->uv_angles[0] = v2_to_short_angle(auv[0]); @@ -4019,9 +4019,9 @@ static void edituv_get_stretch_angle(float auv[2][2], #endif } -static void *extract_stretch_angle_init(const MeshRenderData *mr, - struct MeshBatchCache *UNUSED(cache), - void *buf) +static void *extract_edituv_stretch_angle_init(const MeshRenderData *mr, + struct MeshBatchCache *UNUSED(cache), + void *buf) { static GPUVertFormat format = {0}; if (format.attr_len == 0) { @@ -4048,9 +4048,9 @@ static void *extract_stretch_angle_init(const MeshRenderData *mr, return data; } -static void extract_stretch_angle_iter_poly_bm(const MeshRenderData *mr, - const ExtractPolyBMesh_Params *params, - void *_data) +static void extract_edituv_stretch_angle_iter_poly_bm(const MeshRenderData *mr, + const ExtractPolyBMesh_Params *params, + void *_data) { MeshExtract_StretchAngle_Data *data = _data; float(*auv)[2] = data->auv, *last_auv = data->last_auv; @@ -4090,14 +4090,14 @@ static void extract_stretch_angle_iter_poly_bm(const MeshRenderData *mr, compute_normalize_edge_vectors( auv, av, luv->uv, luv_next->uv, bm_vert_co_get(mr, l->v), bm_vert_co_get(mr, l_next->v)); } - edituv_get_stretch_angle(auv, av, &data->vbo_data[l_index]); + edituv_get_edituv_stretch_angle(auv, av, &data->vbo_data[l_index]); } EXTRACT_POLY_AND_LOOP_FOREACH_BM_END(l); } -static void extract_stretch_angle_iter_poly_mesh(const MeshRenderData *mr, - const ExtractPolyMesh_Params *params, - void *_data) +static void extract_edituv_stretch_angle_iter_poly_mesh(const MeshRenderData *mr, + const ExtractPolyMesh_Params *params, + void *_data) { MeshExtract_StretchAngle_Data *data = _data; @@ -4134,24 +4134,24 @@ static void extract_stretch_angle_iter_poly_mesh(const MeshRenderData *mr, compute_normalize_edge_vectors( auv, av, data->luv[ml_index].uv, data->luv[l_next].uv, v->co, v_next->co); } - edituv_get_stretch_angle(auv, av, &data->vbo_data[ml_index]); + edituv_get_edituv_stretch_angle(auv, av, &data->vbo_data[ml_index]); } EXTRACT_POLY_AND_LOOP_FOREACH_MESH_END; } -static void extract_stretch_angle_finish(const MeshRenderData *UNUSED(mr), - struct MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), - void *data) +static void extract_edituv_stretch_angle_finish(const MeshRenderData *UNUSED(mr), + struct MeshBatchCache *UNUSED(cache), + void *UNUSED(buf), + void *data) { MEM_freeN(data); } -static const MeshExtract extract_stretch_angle = { - .init = extract_stretch_angle_init, - .iter_poly_bm = extract_stretch_angle_iter_poly_bm, - .iter_poly_mesh = extract_stretch_angle_iter_poly_mesh, - .finish = extract_stretch_angle_finish, +static const MeshExtract extract_edituv_stretch_angle = { + .init = extract_edituv_stretch_angle_init, + .iter_poly_bm = extract_edituv_stretch_angle_iter_poly_bm, + .iter_poly_mesh = extract_edituv_stretch_angle_iter_poly_mesh, + .finish = extract_edituv_stretch_angle_finish, .data_flag = 0, .use_threading = false, }; @@ -5976,8 +5976,8 @@ void mesh_buffer_cache_create_requested(struct TaskGraph *task_graph, TEST_ASSIGN(VBO, vbo, weights); TEST_ASSIGN(VBO, vbo, edit_data); TEST_ASSIGN(VBO, vbo, edituv_data); - TEST_ASSIGN(VBO, vbo, stretch_area); - TEST_ASSIGN(VBO, vbo, stretch_angle); + TEST_ASSIGN(VBO, vbo, edituv_stretch_area); + TEST_ASSIGN(VBO, vbo, edituv_stretch_angle); TEST_ASSIGN(VBO, vbo, mesh_analysis); TEST_ASSIGN(VBO, vbo, fdots_pos); TEST_ASSIGN(VBO, vbo, fdots_nor); @@ -6070,8 +6070,8 @@ void mesh_buffer_cache_create_requested(struct TaskGraph *task_graph, EXTRACT(vbo, weights); EXTRACT(vbo, edit_data); EXTRACT(vbo, edituv_data); - EXTRACT(vbo, stretch_area); - EXTRACT(vbo, stretch_angle); + EXTRACT(vbo, edituv_stretch_area); + EXTRACT(vbo, edituv_stretch_angle); EXTRACT(vbo, mesh_analysis); EXTRACT(vbo, fdots_pos); EXTRACT(vbo, fdots_nor); diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 79fce24076e..04bfb667d24 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -570,8 +570,8 @@ static void mesh_batch_cache_discard_shaded_tri(MeshBatchCache *cache) static void mesh_batch_cache_discard_uvedit(MeshBatchCache *cache) { FOREACH_MESH_BUFFER_CACHE (cache, mbufcache) { - GPU_VERTBUF_DISCARD_SAFE(mbufcache->vbo.stretch_angle); - GPU_VERTBUF_DISCARD_SAFE(mbufcache->vbo.stretch_area); + GPU_VERTBUF_DISCARD_SAFE(mbufcache->vbo.edituv_stretch_angle); + GPU_VERTBUF_DISCARD_SAFE(mbufcache->vbo.edituv_stretch_area); GPU_VERTBUF_DISCARD_SAFE(mbufcache->vbo.uv); GPU_VERTBUF_DISCARD_SAFE(mbufcache->vbo.edituv_data); GPU_VERTBUF_DISCARD_SAFE(mbufcache->vbo.fdots_uv); @@ -1497,13 +1497,13 @@ void DRW_mesh_batch_cache_create_requested(struct TaskGraph *task_graph, DRW_ibo_request(cache->batch.edituv_faces_stretch_area, &mbufcache->ibo.edituv_tris); DRW_vbo_request(cache->batch.edituv_faces_stretch_area, &mbufcache->vbo.uv); DRW_vbo_request(cache->batch.edituv_faces_stretch_area, &mbufcache->vbo.edituv_data); - DRW_vbo_request(cache->batch.edituv_faces_stretch_area, &mbufcache->vbo.stretch_area); + DRW_vbo_request(cache->batch.edituv_faces_stretch_area, &mbufcache->vbo.edituv_stretch_area); } if (DRW_batch_requested(cache->batch.edituv_faces_stretch_angle, GPU_PRIM_TRIS)) { DRW_ibo_request(cache->batch.edituv_faces_stretch_angle, &mbufcache->ibo.edituv_tris); DRW_vbo_request(cache->batch.edituv_faces_stretch_angle, &mbufcache->vbo.uv); DRW_vbo_request(cache->batch.edituv_faces_stretch_angle, &mbufcache->vbo.edituv_data); - DRW_vbo_request(cache->batch.edituv_faces_stretch_angle, &mbufcache->vbo.stretch_angle); + DRW_vbo_request(cache->batch.edituv_faces_stretch_angle, &mbufcache->vbo.edituv_stretch_angle); } if (DRW_batch_requested(cache->batch.edituv_edges, GPU_PRIM_LINES)) { DRW_ibo_request(cache->batch.edituv_edges, &mbufcache->ibo.edituv_lines); |