archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Normal Overlay: Hide Normals Of Generated Loops

Browse Source 
The loop normals were always drawn. We used to only draw the normals if
it was mapped to an original loop of the mesh. Due to recent changes we
can not find the correct loop and decide if we need to draw them.

Note still need to check the face dots normals. This is more complicated
as facedot normals needs to be encoded in a different way
This commit is contained in:
Jeroen Bakker
2020-03-30 14:03:28 +02:00
parent a6a9a12e8f
commit 57d8bde088
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/blender/draw/intern/draw_cache_extract_mesh.c
View File

@@ -1635,24 +1635,27 @@ static void extract_lnor_hq_loop_bmesh(const MeshRenderData *mr, int l, BMLoop *
static void extract_lnor_hq_loop_mesh(
const MeshRenderData *mr, int l, const MLoop *mloop, int p, const MPoly *mpoly, void *data)
{
gpuHQNor *lnor_data = &((gpuHQNor *)data)[l];
if (mr->loop_normals) {
normal_float_to_short_v3(&((gpuHQNor *)data)[l].x, mr->loop_normals[l]);
normal_float_to_short_v3(&lnor_data->x, mr->loop_normals[l]);
}
else if (mpoly->flag & ME_SMOOTH) {
copy_v3_v3_short(&((gpuHQNor *)data)[l].x, mr->mvert[mloop->v].no);
copy_v3_v3_short(&lnor_data->x, mr->mvert[mloop->v].no);
}
else {
normal_float_to_short_v3(&((gpuHQNor *)data)[l].x, mr->poly_normals[p]);
normal_float_to_short_v3(&lnor_data->x, mr->poly_normals[p]);
}
/* Flag for paint mode overlay. */
if (mpoly->flag & ME_HIDE) {
((gpuHQNor *)data)[l].w = -1;
if (mpoly->flag & ME_HIDE ||
(mr->extract_type == MR_EXTRACT_MAPPED && mr->v_origindex[mloop->v] == ORIGINDEX_NONE)) {
lnor_data->w = -1;
}
else if (mpoly->flag & ME_FACE_SEL) {
((gpuHQNor *)data)[l].w = 1;
lnor_data->w = 1;
}
else {
((gpuHQNor *)data)[l].w = 0;
lnor_data->w = 0;
}
}
@@ -1708,24 +1711,27 @@ static void extract_lnor_loop_bmesh(const MeshRenderData *mr, int l, BMLoop *loo
static void extract_lnor_loop_mesh(
const MeshRenderData *mr, int l, const MLoop *mloop, int p, const MPoly *mpoly, void *data)
{
GPUPackedNormal *lnor_data = &((GPUPackedNormal *)data)[l];
if (mr->loop_normals) {
((GPUPackedNormal *)data)[l] = GPU_normal_convert_i10_v3(mr->loop_normals[l]);
*lnor_data = GPU_normal_convert_i10_v3(mr->loop_normals[l]);
}
else if (mpoly->flag & ME_SMOOTH) {
((GPUPackedNormal *)data)[l] = GPU_normal_convert_i10_s3(mr->mvert[mloop->v].no);
*lnor_data = GPU_normal_convert_i10_s3(mr->mvert[mloop->v].no);
}
else {
((GPUPackedNormal *)data)[l] = GPU_normal_convert_i10_v3(mr->poly_normals[p]);
*lnor_data = GPU_normal_convert_i10_v3(mr->poly_normals[p]);
}
/* Flag for paint mode overlay. */
if (mpoly->flag & ME_HIDE) {
((GPUPackedNormal *)data)[l].w = -1;
if (mpoly->flag & ME_HIDE ||
(mr->extract_type == MR_EXTRACT_MAPPED && mr->v_origindex[mloop->v] == ORIGINDEX_NONE)) {
lnor_data->w = -1;
}
else if (mpoly->flag & ME_FACE_SEL) {
((GPUPackedNormal *)data)[l].w = 1;
lnor_data->w = 1;
}
else {
((GPUPackedNormal *)data)[l].w = 0;
lnor_data->w = 0;
}
}