griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Overlay-Next: Make armature method parameter consistent

Browse Source
This commit is contained in:
Clément Foucault
2024-11-23 11:10:28 +01:00
parent 531ed68061
commit 79b7bce125
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/draw/engines/overlay/overlay_next_armature.hh
View File

@@ -127,9 +127,11 @@ class Armatures {
BoneBuffers transparent_ = {selection_type_};
bool enabled_ = false;
const ShapeCache &shapes_;
public:
Armatures(const SelectionType selection_type) : selection_type_(selection_type){};
Armatures(const SelectionType selection_type, const ShapeCache &shapes)
: selection_type_(selection_type), shapes_(shapes){};
void begin_sync(Resources &res, const State &state)
{
@@ -506,7 +508,6 @@ class Armatures {
DrawContext create_draw_context(const ObjectRef &ob_ref,
Resources &res,
const ShapeCache &shapes,
const State &state,
eArmatureDrawMode draw_mode)
{
@@ -516,7 +517,7 @@ class Armatures {
ctx.ob = ob_ref.object;
ctx.ob_ref = &ob_ref;
ctx.res = &res;
ctx.shapes = &shapes;
ctx.shapes = &shapes_;
ctx.draw_mode = draw_mode;
ctx.drawtype = eArmature_Drawtype(arm->drawtype);
@@ -539,23 +540,23 @@ class Armatures {
return ctx;
}
void edit_object_sync(const ObjectRef &ob_ref,
Resources &res,
ShapeCache &shapes,
const State &state)
void edit_object_sync(Manager & /*manager*/,
const ObjectRef &ob_ref,
const State &state,
Resources &res)
{
if (!enabled_) {
return;
}
DrawContext ctx = create_draw_context(ob_ref, res, shapes, state, ARM_DRAW_MODE_EDIT);
DrawContext ctx = create_draw_context(ob_ref, res, state, ARM_DRAW_MODE_EDIT);
draw_armature_edit(&ctx);
}
void object_sync(const ObjectRef &ob_ref,
Resources &res,
const ShapeCache &shapes,
const State &state)
void object_sync(Manager & /*manager*/,
const ObjectRef &ob_ref,
const State &state,
Resources &res)
{
if (!enabled_ || ob_ref.object->dt == OB_BOUNDBOX) {
return;
@@ -564,7 +565,7 @@ class Armatures {
eArmatureDrawMode draw_mode = is_pose_mode(ob_ref.object, state) ? ARM_DRAW_MODE_POSE :
ARM_DRAW_MODE_OBJECT;
DrawContext ctx = create_draw_context(ob_ref, res, shapes, state, draw_mode);
DrawContext ctx = create_draw_context(ob_ref, res, state, draw_mode);
draw_armature_pose(&ctx);
}

4
source/blender/draw/engines/overlay/overlay_next_instance.cc
View File

@@ -224,7 +224,7 @@ void Instance::object_sync(ObjectRef &ob_ref, Manager &manager)
layer.mesh_uvs.edit_object_sync(manager, ob_ref, state);
break;
case OB_ARMATURE:
layer.armatures.edit_object_sync(ob_ref, resources, shapes, state);
layer.armatures.edit_object_sync(manager, ob_ref, state, resources);
break;
case OB_SURF:
case OB_CURVES_LEGACY:
@@ -262,7 +262,7 @@ void Instance::object_sync(ObjectRef &ob_ref, Manager &manager)
break;
case OB_ARMATURE:
if (!in_edit_mode) {
layer.armatures.object_sync(ob_ref, resources, shapes, state);
layer.armatures.object_sync(manager, ob_ref, state, resources);
}
break;
case OB_LATTICE:

5
source/blender/draw/engines/overlay/overlay_next_instance.hh
View File

@@ -76,8 +76,9 @@ class Instance {
struct OverlayLayer {
const SelectionType selection_type_;
ShapeCache &shapes;
Armatures armatures = {selection_type_};
Armatures armatures = {selection_type_, shapes};
AttributeViewer attribute_viewer;
Axes axes = {selection_type_};
Bounds bounds = {selection_type_};
@@ -105,7 +106,7 @@ class Instance {
Sculpts sculpts;
Speakers speakers = {selection_type_};
Wireframe wireframe;
} regular{selection_type_}, infront{selection_type_};
} regular{selection_type_, shapes}, infront{selection_type_, shapes};
Grid grid;