diff options
Diffstat (limited to 'source/blender/draw/engines/overlay')
10 files changed, 56 insertions, 86 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_antialiasing.c b/source/blender/draw/engines/overlay/overlay_antialiasing.c index a07fd559f4f..27ee479cf36 100644 --- a/source/blender/draw/engines/overlay/overlay_antialiasing.c +++ b/source/blender/draw/engines/overlay/overlay_antialiasing.c @@ -63,7 +63,7 @@ void OVERLAY_antialiasing_init(OVERLAY_Data *vedata) return; } - bool need_wire_expansion = (G_draw.block.sizePixel > 1.0f); + bool need_wire_expansion = (G_draw.block.size_pixel > 1.0f); pd->antialiasing.enabled = need_wire_expansion || ((U.gpu_flag & USER_GPU_FLAG_OVERLAY_SMOOTH_WIRE) != 0); diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c index a2f9ad0d369..473fadab5ed 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.c +++ b/source/blender/draw/engines/overlay/overlay_armature.c @@ -784,28 +784,28 @@ static void drw_shgroup_bone_relationship_lines(ArmatureDrawContext *ctx, const float start[3], const float end[3]) { - drw_shgroup_bone_relationship_lines_ex(ctx, start, end, G_draw.block.colorWire); + drw_shgroup_bone_relationship_lines_ex(ctx, start, end, G_draw.block.color_wire); } static void drw_shgroup_bone_ik_lines(ArmatureDrawContext *ctx, const float start[3], const float end[3]) { - drw_shgroup_bone_relationship_lines_ex(ctx, start, end, G_draw.block.colorBoneIKLine); + drw_shgroup_bone_relationship_lines_ex(ctx, start, end, G_draw.block.color_bone_ik_line); } static void drw_shgroup_bone_ik_no_target_lines(ArmatureDrawContext *ctx, const float start[3], const float end[3]) { - drw_shgroup_bone_relationship_lines_ex(ctx, start, end, G_draw.block.colorBoneIKLineNoTarget); + drw_shgroup_bone_relationship_lines_ex(ctx, start, end, G_draw.block.color_bone_ik_line_no_target); } static void drw_shgroup_bone_ik_spline_lines(ArmatureDrawContext *ctx, const float start[3], const float end[3]) { - drw_shgroup_bone_relationship_lines_ex(ctx, start, end, G_draw.block.colorBoneIKLineSpline); + drw_shgroup_bone_relationship_lines_ex(ctx, start, end, G_draw.block.color_bone_ik_line_spline); } /** \} */ @@ -918,16 +918,16 @@ static bool set_pchan_color(const ArmatureDrawContext *ctx, } else { if ((boneflag & BONE_DRAW_ACTIVE) && (boneflag & BONE_SELECTED)) { - copy_v4_v4(fcolor, G_draw.block.colorBonePoseActive); + copy_v4_v4(fcolor, G_draw.block.color_bone_pose_active); } else if (boneflag & BONE_DRAW_ACTIVE) { - copy_v4_v4(fcolor, G_draw.block.colorBonePoseActiveUnsel); + copy_v4_v4(fcolor, G_draw.block.color_bone_pose_active_unsel); } else if (boneflag & BONE_SELECTED) { - copy_v4_v4(fcolor, G_draw.block.colorBonePose); + copy_v4_v4(fcolor, G_draw.block.color_bone_pose); } else { - copy_v4_v4(fcolor, G_draw.block.colorWire); + copy_v4_v4(fcolor, G_draw.block.color_wire); } } return true; @@ -940,23 +940,23 @@ static bool set_pchan_color(const ArmatureDrawContext *ctx, srgb_to_linearrgb_v4(fcolor, fcolor); } else { - copy_v4_v4(fcolor, G_draw.block.colorBoneSolid); + copy_v4_v4(fcolor, G_draw.block.color_bone_solid); } return true; } case PCHAN_COLOR_CONSTS: { if ((bcolor == NULL) || (bcolor->flag & TH_WIRECOLOR_CONSTCOLS)) { if (constflag & PCHAN_HAS_TARGET) { - copy_v4_v4(fcolor, G_draw.block.colorBonePoseTarget); + copy_v4_v4(fcolor, G_draw.block.color_bone_pose_target); } else if (constflag & PCHAN_HAS_IK) { - copy_v4_v4(fcolor, G_draw.block.colorBonePoseIK); + copy_v4_v4(fcolor, G_draw.block.color_bone_pose_ik); } else if (constflag & PCHAN_HAS_SPLINEIK) { - copy_v4_v4(fcolor, G_draw.block.colorBonePoseSplineIK); + copy_v4_v4(fcolor, G_draw.block.color_bone_pose_spline_ik); } else if (constflag & PCHAN_HAS_CONST) { - copy_v4_v4(fcolor, G_draw.block.colorBonePoseConstraint); + copy_v4_v4(fcolor, G_draw.block.color_bone_pose_constraint); } else { return false; @@ -978,7 +978,7 @@ static bool set_pchan_color(const ArmatureDrawContext *ctx, static void bone_locked_color_shade(float color[4]) { - float *locked_color = G_draw.block.colorBoneLocked; + float *locked_color = G_draw.block.color_bone_locked; interp_v3_v3v3(color, color, locked_color, locked_color[3]); } @@ -991,7 +991,7 @@ static const float *get_bone_solid_color(const ArmatureDrawContext *ctx, const short constflag) { if (ctx->const_color) { - return G_draw.block.colorBoneSolid; + return G_draw.block.color_bone_solid; } if (arm->flag & ARM_POSEMODE) { @@ -1006,7 +1006,7 @@ static const float *get_bone_solid_color(const ArmatureDrawContext *ctx, return disp_color; } - return G_draw.block.colorBoneSolid; + return G_draw.block.color_bone_solid; } static const float *get_bone_solid_with_consts_color(const ArmatureDrawContext *ctx, @@ -1017,7 +1017,7 @@ static const float *get_bone_solid_with_consts_color(const ArmatureDrawContext * const short constflag) { if (ctx->const_color) { - return G_draw.block.colorBoneSolid; + return G_draw.block.color_bone_solid; } const float *col = get_bone_solid_color(ctx, eBone, pchan, arm, boneflag, constflag); @@ -1060,18 +1060,18 @@ static const float *get_bone_wire_color(const ArmatureDrawContext *ctx, else if (eBone) { if (boneflag & BONE_SELECTED) { if (boneflag & BONE_DRAW_ACTIVE) { - copy_v3_v3(disp_color, G_draw.block.colorBoneActive); + copy_v3_v3(disp_color, G_draw.block.color_bone_active); } else { - copy_v3_v3(disp_color, G_draw.block.colorBoneSelect); + copy_v3_v3(disp_color, G_draw.block.color_bone_select); } } else { if (boneflag & BONE_DRAW_ACTIVE) { - copy_v3_v3(disp_color, G_draw.block.colorBoneActiveUnsel); + copy_v3_v3(disp_color, G_draw.block.color_bone_active_unsel); } else { - copy_v3_v3(disp_color, G_draw.block.colorWireEdit); + copy_v3_v3(disp_color, G_draw.block.color_wire_edit); } } } @@ -1084,7 +1084,7 @@ static const float *get_bone_wire_color(const ArmatureDrawContext *ctx, } } else { - copy_v3_v3(disp_color, G_draw.block.colorVertex); + copy_v3_v3(disp_color, G_draw.block.color_vertex); } disp_color[3] = get_bone_wire_thickness(ctx, boneflag); @@ -1111,7 +1111,7 @@ static const float *get_bone_hint_color(const ArmatureDrawContext *ctx, static float hint_color[4] = {0.0f, 0.0f, 0.0f, 1.0f}; if (ctx->const_color) { - bone_hint_color_shade(hint_color, G_draw.block.colorBoneSolid); + bone_hint_color_shade(hint_color, G_draw.block.color_bone_solid); } else { const float *wire_color = get_bone_wire_color(ctx, eBone, pchan, arm, boneflag, constflag); @@ -1408,8 +1408,8 @@ static void draw_axes(ArmatureDrawContext *ctx, { float final_col[4]; const float *col = (ctx->const_color) ? ctx->const_color : - (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? G_draw.block.colorTextHi : - G_draw.block.colorText; + (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? G_draw.block.color_text_hi : + G_draw.block.color_text; copy_v4_v4(final_col, col); /* Mix with axes color. */ final_col[3] = (ctx->const_color) ? 1.0 : (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? 0.1 : 0.65; @@ -1444,10 +1444,10 @@ static void draw_points(ArmatureDrawContext *ctx, float col_solid_root[4], col_solid_tail[4], col_wire_root[4], col_wire_tail[4]; float col_hint_root[4], col_hint_tail[4]; - copy_v4_v4(col_solid_root, G_draw.block.colorBoneSolid); - copy_v4_v4(col_solid_tail, G_draw.block.colorBoneSolid); - copy_v4_v4(col_wire_root, (ctx->const_color) ? ctx->const_color : G_draw.block.colorVertex); - copy_v4_v4(col_wire_tail, (ctx->const_color) ? ctx->const_color : G_draw.block.colorVertex); + copy_v4_v4(col_solid_root, G_draw.block.color_bone_solid); + copy_v4_v4(col_solid_tail, G_draw.block.color_bone_solid); + copy_v4_v4(col_wire_root, (ctx->const_color) ? ctx->const_color : G_draw.block.color_vertex); + copy_v4_v4(col_wire_tail, (ctx->const_color) ? ctx->const_color : G_draw.block.color_vertex); const bool is_envelope_draw = (arm->drawtype == ARM_ENVELOPE); const float envelope_ignore = -1.0f; @@ -1457,10 +1457,10 @@ static void draw_points(ArmatureDrawContext *ctx, /* Edit bone points can be selected */ if (eBone) { if (eBone->flag & BONE_ROOTSEL) { - copy_v3_v3(col_wire_root, G_draw.block.colorVertexSelect); + copy_v3_v3(col_wire_root, G_draw.block.color_vertex_select); } if (eBone->flag & BONE_TIPSEL) { - copy_v3_v3(col_wire_tail, G_draw.block.colorVertexSelect); + copy_v3_v3(col_wire_tail, G_draw.block.color_vertex_select); } } else if (arm->flag & ARM_POSEMODE) { @@ -1648,12 +1648,12 @@ static void draw_bone_line(ArmatureDrawContext *ctx, else { if (eBone) { if (eBone->flag & BONE_TIPSEL) { - col_tail = G_draw.block.colorVertexSelect; + col_tail = G_draw.block.color_vertex_select; } if (boneflag & BONE_SELECTED) { - col_bone = G_draw.block.colorBoneActive; + col_bone = G_draw.block.color_bone_active; } - col_wire = G_draw.block.colorWire; + col_wire = G_draw.block.color_wire; } /* Draw root point if we are not connected to our parent. */ @@ -1661,7 +1661,7 @@ static void draw_bone_line(ArmatureDrawContext *ctx, (pchan->bone->parent && (boneflag & BONE_CONNECTED)))) { if (eBone) { - col_head = (eBone->flag & BONE_ROOTSEL) ? G_draw.block.colorVertexSelect : col_bone; + col_head = (eBone->flag & BONE_ROOTSEL) ? G_draw.block.color_vertex_select : col_bone; } else { col_head = col_bone; diff --git a/source/blender/draw/engines/overlay/overlay_background.c b/source/blender/draw/engines/overlay/overlay_background.c index 74fed530ed7..6a87658b57c 100644 --- a/source/blender/draw/engines/overlay/overlay_background.c +++ b/source/blender/draw/engines/overlay/overlay_background.c @@ -96,7 +96,7 @@ void OVERLAY_background_cache_init(OVERLAY_Data *vedata) GPUShader *sh = OVERLAY_shader_clipbound(); DRWShadingGroup *grp = DRW_shgroup_create(sh, psl->clipping_frustum_ps); - DRW_shgroup_uniform_vec4_copy(grp, "color", G_draw.block.colorClippingBorder); + DRW_shgroup_uniform_vec4_copy(grp, "color", G_draw.block.color_clipping_border); DRW_shgroup_uniform_vec3(grp, "boundbox", &bb->vec[0][0], 8); struct GPUBatch *cube = DRW_cache_cube_get(); diff --git a/source/blender/draw/engines/overlay/overlay_edit_text.c b/source/blender/draw/engines/overlay/overlay_edit_text.c index 40c905c6db9..dfef5b3c241 100644 --- a/source/blender/draw/engines/overlay/overlay_edit_text.c +++ b/source/blender/draw/engines/overlay/overlay_edit_text.c @@ -35,7 +35,7 @@ void OVERLAY_edit_text_cache_init(OVERLAY_Data *vedata) sh = OVERLAY_shader_uniform_color(); pd->edit_text_wire_grp[i] = grp = DRW_shgroup_create(sh, psl->edit_text_wire_ps[i]); - DRW_shgroup_uniform_vec4_copy(grp, "color", G_draw.block.colorWire); + DRW_shgroup_uniform_vec4_copy(grp, "color", G_draw.block.color_wire); } { state = DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND_ALPHA; @@ -139,7 +139,7 @@ static void edit_text_cache_populate_boxes(OVERLAY_Data *vedata, Object *ob) for (int i = 0; i < cu->totbox; i++) { TextBox *tb = &cu->tb[i]; const bool is_active = (i == (cu->actbox - 1)); - float *color = is_active ? G_draw.block.colorActive : G_draw.block.colorWire; + float *color = is_active ? G_draw.block.color_active : G_draw.block.color_wire; if ((tb->w != 0.0f) || (tb->h != 0.0f)) { float vecs[4][3]; diff --git a/source/blender/draw/engines/overlay/overlay_extra.c b/source/blender/draw/engines/overlay/overlay_extra.c index 4f0bf0b8048..73450db8eea 100644 --- a/source/blender/draw/engines/overlay/overlay_extra.c +++ b/source/blender/draw/engines/overlay/overlay_extra.c @@ -194,23 +194,23 @@ void OVERLAY_extra_cache_init(OVERLAY_Data *vedata) DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo); grp_sub = DRW_shgroup_create_sub(grp); - DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.colorActive); + DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.color_active); cb->center_active = BUF_POINT(grp_sub, format); grp_sub = DRW_shgroup_create_sub(grp); - DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.colorSelect); + DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.color_select); cb->center_selected = BUF_POINT(grp_sub, format); grp_sub = DRW_shgroup_create_sub(grp); - DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.colorDeselect); + DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.color_deselect); cb->center_deselected = BUF_POINT(grp_sub, format); grp_sub = DRW_shgroup_create_sub(grp); - DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.colorLibrarySelect); + DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.color_library_select); cb->center_selected_lib = BUF_POINT(grp_sub, format); grp_sub = DRW_shgroup_create_sub(grp); - DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.colorLibrary); + DRW_shgroup_uniform_vec4_copy(grp_sub, "color", G_draw.block.color_library); cb->center_deselected_lib = BUF_POINT(grp_sub, format); } } @@ -861,8 +861,8 @@ static void camera_view3d_reconstruction( int track_index = 1; float bundle_color_custom[3]; - float *bundle_color_solid = G_draw.block.colorBundleSolid; - float *bundle_color_unselected = G_draw.block.colorWire; + float *bundle_color_solid = G_draw.block.color_bundle_solid; + float *bundle_color_unselected = G_draw.block.color_wire; uchar text_color_selected[4], text_color_unselected[4]; /* Color Management: Exception here as texts are drawn in sRGB space directly. */ UI_GetThemeColor4ubv(TH_SELECT, text_color_selected); @@ -1034,7 +1034,7 @@ static void camera_stereoscopy_extra(OVERLAY_ExtraCallBuffers *cb, DRW_buffer_add_entry_struct(cb->camera_frame, &stereodata); /* Connecting line between cameras. */ - OVERLAY_extra_line_dashed(cb, stereodata.pos, instdata->pos, G_draw.block.colorWire); + OVERLAY_extra_line_dashed(cb, stereodata.pos, instdata->pos, G_draw.block.color_wire); } if (is_stereo3d_volume && !is_select) { @@ -1248,8 +1248,8 @@ static void OVERLAY_relationship_lines(OVERLAY_ExtraCallBuffers *cb, Scene *scene, Object *ob) { - float *relation_color = G_draw.block.colorWire; - float *constraint_color = G_draw.block.colorGridAxisZ; /* ? */ + float *relation_color = G_draw.block.color_wire; + float *constraint_color = G_draw.block.color_grid_axis_z; /* ? */ if (ob->parent && (DRW_object_visibility_in_active_context(ob->parent) & OB_VISIBLE_SELF)) { float *parent_pos = ob->runtime.parent_display_origin; diff --git a/source/blender/draw/engines/overlay/overlay_gpencil.c b/source/blender/draw/engines/overlay/overlay_gpencil.c index 79d0e62c25c..5c5226bfe65 100644 --- a/source/blender/draw/engines/overlay/overlay_gpencil.c +++ b/source/blender/draw/engines/overlay/overlay_gpencil.c @@ -174,7 +174,7 @@ void OVERLAY_edit_gpencil_cache_init(OVERLAY_Data *vedata) bGPDcontrolpoint *cp = &gpd->runtime.cp_points[i]; grp = DRW_shgroup_create_sub(grp); DRW_shgroup_uniform_vec3_copy(grp, "pPosition", &cp->x); - DRW_shgroup_uniform_float_copy(grp, "pSize", cp->size * 0.8f * G_draw.block.sizePixel); + DRW_shgroup_uniform_float_copy(grp, "pSize", cp->size * 0.8f * G_draw.block.size_pixel); DRW_shgroup_uniform_vec4_copy(grp, "pColor", cp->color); DRW_shgroup_call_procedural_points(grp, NULL, 1); } @@ -196,7 +196,7 @@ void OVERLAY_edit_gpencil_cache_init(OVERLAY_Data *vedata) DRW_shgroup_uniform_vec3_copy(grp, "pPosition", scene->cursor.location); } DRW_shgroup_uniform_vec4_copy(grp, "pColor", color); - DRW_shgroup_uniform_float_copy(grp, "pSize", 8.0f * G_draw.block.sizePixel); + DRW_shgroup_uniform_float_copy(grp, "pSize", 8.0f * G_draw.block.size_pixel); DRW_shgroup_call_procedural_points(grp, NULL, 1); } } diff --git a/source/blender/draw/engines/overlay/overlay_grid.c b/source/blender/draw/engines/overlay/overlay_grid.c index 475af24d004..20403f156a1 100644 --- a/source/blender/draw/engines/overlay/overlay_grid.c +++ b/source/blender/draw/engines/overlay/overlay_grid.c @@ -224,7 +224,7 @@ void OVERLAY_grid_cache_init(OVERLAY_Data *vedata) sh = OVERLAY_shader_grid_background(); grp = DRW_shgroup_create(sh, psl->grid_ps); float color_back[4]; - interp_v4_v4v4(color_back, G_draw.block.colorBackground, G_draw.block.colorGrid, 0.5); + interp_v4_v4v4(color_back, G_draw.block.color_background, G_draw.block.color_grid, 0.5); DRW_shgroup_uniform_vec4_copy(grp, "color", color_back); DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &dtxl->depth); unit_m4(mat); diff --git a/source/blender/draw/engines/overlay/overlay_metaball.c b/source/blender/draw/engines/overlay/overlay_metaball.c index 7805b63993e..f024f5dfac8 100644 --- a/source/blender/draw/engines/overlay/overlay_metaball.c +++ b/source/blender/draw/engines/overlay/overlay_metaball.c @@ -60,10 +60,10 @@ void OVERLAY_edit_metaball_cache_populate(OVERLAY_Data *vedata, Object *ob) MetaBall *mb = ob->data; const float *color; - const float *col_radius = G_draw.block.colorMballRadius; - const float *col_radius_select = G_draw.block.colorMballRadiusSelect; - const float *col_stiffness = G_draw.block.colorMballStiffness; - const float *col_stiffness_select = G_draw.block.colorMballStiffnessSelect; + const float *col_radius = G_draw.block.color_mball_radius; + const float *col_radius_select = G_draw.block.color_mball_radius_select; + const float *col_stiffness = G_draw.block.color_mball_stiffness; + const float *col_stiffness_select = G_draw.block.color_mball_stiffness_select; int select_id = 0; if (is_select) { diff --git a/source/blender/draw/engines/overlay/shaders/edit_mesh_facefill_frag.glsl b/source/blender/draw/engines/overlay/shaders/edit_mesh_facefill_frag.glsl deleted file mode 100644 index a8371958ec2..00000000000 --- a/source/blender/draw/engines/overlay/shaders/edit_mesh_facefill_frag.glsl +++ /dev/null @@ -1,7 +0,0 @@ -flat in vec4 faceColor; -out vec4 FragColor; - -void main() -{ - FragColor = faceColor; -} diff --git a/source/blender/draw/engines/overlay/shaders/edit_mesh_facefill_vert.glsl b/source/blender/draw/engines/overlay/shaders/edit_mesh_facefill_vert.glsl deleted file mode 100644 index df37c6fb0bc..00000000000 --- a/source/blender/draw/engines/overlay/shaders/edit_mesh_facefill_vert.glsl +++ /dev/null @@ -1,23 +0,0 @@ - -uniform ivec4 dataMask = ivec4(0xFF); - -in vec3 pos; -in ivec4 data; - -flat out vec4 faceColor; - -void main() -{ - GPU_INTEL_VERTEX_SHADER_WORKAROUND - - vec3 world_pos = point_object_to_world(pos); - gl_Position = point_world_to_ndc(world_pos); - - ivec4 data_m = data & dataMask; - - faceColor = EDIT_MESH_face_color(data_m.x); - -#ifdef USE_WORLD_CLIP_PLANES - world_clip_planes_calc_clip_distance(world_pos); -#endif -} |