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

Cleanup: GPv3: Remove unused editor function

Browse Source
This commit is contained in:
Falk David
2024-01-17 16:53:56 +01:00
parent f566f51f29
commit 4a77cdf745
2 changed files with 0 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc
View File

@@ -181,61 +181,6 @@ void DrawingPlacement::project(const Span<float2> src, MutableSpan<float3> dst)
});
}
static float3 drawing_origin(const Scene *scene, const Object *object, char align_flag)
{
BLI_assert(object != nullptr && object->type == OB_GREASE_PENCIL);
if (align_flag & GP_PROJECT_VIEWSPACE) {
if (align_flag & GP_PROJECT_CURSOR) {
return float3(scene->cursor.location);
}
/* Use the object location. */
return float3(object->object_to_world[3]);
}
return float3(scene->cursor.location);
}
static float3 screen_space_to_3d(
const Scene *scene, const ARegion *region, const View3D *v3d, const Object *object, float2 co)
{
float3 origin = drawing_origin(scene, object, scene->toolsettings->gpencil_v3d_align);
float3 r_co;
ED_view3d_win_to_3d(v3d, region, origin, co, r_co);
return r_co;
}
float brush_radius_world_space(bContext &C, int x, int y)
{
ARegion *region = CTX_wm_region(&C);
View3D *v3d = CTX_wm_view3d(&C);
Scene *scene = CTX_data_scene(&C);
Object *object = CTX_data_active_object(&C);
Brush *brush = scene->toolsettings->gp_paint->paint.brush;
/* Default radius. */
float radius = 2.0f;
if (brush == nullptr || object->type != OB_GREASE_PENCIL) {
return radius;
}
/* Use an (arbitrary) screen space offset in the x direction to measure the size. */
const int x_offest = 64;
const float brush_size = float(BKE_brush_size_get(scene, brush));
/* Get two 3d coordinates to measure the distance from. */
const float2 screen1(x, y);
const float2 screen2(x + x_offest, y);
const float3 pos1 = screen_space_to_3d(scene, region, v3d, object, screen1);
const float3 pos2 = screen_space_to_3d(scene, region, v3d, object, screen2);
/* Clip extreme zoom level (and avoid division by zero). */
const float distance = math::max(math::distance(pos1, pos2), 0.001f);
/* Calculate the radius of the brush in world space. */
radius = (1.0f / distance) * (brush_size / 64.0f);
return radius;
}
static Array<int> get_frame_numbers_for_layer(const bke::greasepencil::Layer &layer,
const int current_frame,
const bool use_multi_frame_editing)

2
source/blender/editors/include/ED_grease_pencil.hh
View File

@@ -152,8 +152,6 @@ bool has_any_frame_selected(const bke::greasepencil::Layer &layer);
void create_keyframe_edit_data_selected_frames_list(KeyframeEditData *ked,
const bke::greasepencil::Layer &layer);
float brush_radius_world_space(bContext &C, int x, int y);
bool active_grease_pencil_poll(bContext *C);
bool editable_grease_pencil_poll(bContext *C);
bool editable_grease_pencil_point_selection_poll(bContext *C);