[Bf-blender-cvs] [2aec6f88f0f] temp-collection-assets: Cleanup: Improve function names
Julian Eisel
noreply at git.blender.org
Tue Jan 18 14:42:34 CET 2022
Commit: 2aec6f88f0fe34579fe6dc7ebf0428822c0f630d
Author: Julian Eisel
Date: Tue Jan 18 14:42:19 2022 +0100
Branches: temp-collection-assets
https://developer.blender.org/rB2aec6f88f0fe34579fe6dc7ebf0428822c0f630d
Cleanup: Improve function names
===================================================================
M source/blender/blenkernel/BKE_collection.h
M source/blender/blenkernel/intern/collection.c
M source/blender/editors/space_view3d/space_view3d.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h
index 33e5705bcbc..54ceaf8b0d3 100644
--- a/source/blender/blenkernel/BKE_collection.h
+++ b/source/blender/blenkernel/BKE_collection.h
@@ -236,12 +236,12 @@ struct Base *BKE_collection_or_layer_objects(const struct ViewLayer *view_layer,
* it doesn't consider particle instances or grease pencil stroke width.
* Take it as approximation, e.g. for visual feedback.
*
- * \param object_visibility: Sets what object visibility is required (e.g. decide between viewport
+ * \param object_visibility: Define the required object visibility is (e.g. decide between viewport
* vs. render visibility).
*/
-void BKE_collection_boundbox_calc(const struct Collection *collection,
- CollectionObjectVisibility object_visibility,
- struct BoundBox *r_boundbox);
+void BKE_collection_boundbox_hint_calc(const struct Collection *collection,
+ CollectionObjectVisibility object_visibility,
+ struct BoundBox *r_boundbox);
/**
* Calculate axis-aligned dimensions of all objects in this collection, excluding empties (but
* including lamps, cameras, curves, etc.). Nested collections and collection instances are
@@ -251,12 +251,12 @@ void BKE_collection_boundbox_calc(const struct Collection *collection,
* it doesn't consider particle instances or grease pencil stroke width.
* Take it as approximation, e.g. for visual feedback.
*
- * \param object_visibility: Sets what object visibility is required (e.g. decide between viewport
+ * \param object_visibility: Define the required object visibility is (e.g. decide between viewport
* vs. render visibility).
*/
-void BKE_collection_dimensions_calc(const struct Collection *collection,
- CollectionObjectVisibility object_visibility,
- float r_vec[3]);
+void BKE_collection_dimensions_hint_calc(const struct Collection *collection,
+ CollectionObjectVisibility object_visibility,
+ float r_vec[3]);
/* Editing. */
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 619d6d55515..abea3400b02 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -372,7 +372,7 @@ static IDProperty *collection_asset_dimensions_property(Collection *collection)
{
float dimensions[3];
/* Use the bounding-box for what the user sees, i.e. use viewport visibility. */
- BKE_collection_dimensions_calc(collection, COLLECTION_VISIBILITY_VIEWPORT, dimensions);
+ BKE_collection_dimensions_hint_calc(collection, COLLECTION_VISIBILITY_VIEWPORT, dimensions);
if (is_zero_v3(dimensions)) {
return NULL;
}
@@ -899,13 +899,12 @@ Base *BKE_collection_or_layer_objects(const ViewLayer *view_layer, Collection *c
* \param instance_mat: The transform matrix of the object instancing this collection. Pass the
* unit matrix if the collection is not an instance.
*/
-static void collection_geometry_boundbox_calc_recursive(
- const Collection *parent_collection,
- const CollectionObjectVisibility object_visibility,
- const bool with_empties,
- float parent_instance_mat[4][4],
- float r_min[3],
- float r_max[3])
+static void collection_minmax_calc_recursive(const Collection *parent_collection,
+ const CollectionObjectVisibility object_visibility,
+ const bool with_empties,
+ float parent_instance_mat[4][4],
+ float r_min[3],
+ float r_max[3])
{
LISTBASE_FOREACH (const CollectionObject *, cob, &parent_collection->gobject) {
Object *ob = cob->ob;
@@ -916,12 +915,12 @@ static void collection_geometry_boundbox_calc_recursive(
sub_v3_v3(child_collection_mat[3], ob->instance_collection->instance_offset);
mul_m4_m4m4(child_collection_mat, ob->obmat, parent_instance_mat);
- collection_geometry_boundbox_calc_recursive(ob->instance_collection,
- object_visibility,
- with_empties,
- child_collection_mat,
- r_min,
- r_max);
+ collection_minmax_calc_recursive(ob->instance_collection,
+ object_visibility,
+ with_empties,
+ child_collection_mat,
+ r_min,
+ r_max);
}
if ((object_visibility == COLLECTION_VISIBILITY_RENDER) &&
@@ -950,15 +949,15 @@ static void collection_geometry_boundbox_calc_recursive(
}
LISTBASE_FOREACH (CollectionChild *, child, &parent_collection->children) {
- collection_geometry_boundbox_calc_recursive(
+ collection_minmax_calc_recursive(
child->collection, object_visibility, with_empties, parent_instance_mat, r_min, r_max);
}
}
-static void collection_boundbox_min_max(const Collection *collection,
- const CollectionObjectVisibility object_visibility,
- float r_min[3],
- float r_max[3])
+static void collection_minmax(const Collection *collection,
+ const CollectionObjectVisibility object_visibility,
+ float r_min[3],
+ float r_max[3])
{
INIT_MINMAX(r_min, r_max);
@@ -966,25 +965,25 @@ static void collection_boundbox_min_max(const Collection *collection,
float instance_collection_mat[4][4];
unit_m4(instance_collection_mat);
- collection_geometry_boundbox_calc_recursive(
+ collection_minmax_calc_recursive(
collection, object_visibility, false, instance_collection_mat, r_min, r_max);
}
-void BKE_collection_boundbox_calc(const Collection *collection,
+void BKE_collection_boundbox_hint_calc(const Collection *collection,
const CollectionObjectVisibility object_visibility,
BoundBox *r_boundbox)
{
float min[3], max[3];
- collection_boundbox_min_max(collection, object_visibility, min, max);
+ collection_minmax(collection, object_visibility, min, max);
BKE_boundbox_init_from_minmax(r_boundbox, min, max);
}
-void BKE_collection_dimensions_calc(const Collection *collection,
+void BKE_collection_dimensions_hint_calc(const Collection *collection,
const CollectionObjectVisibility object_visibility,
float r_vec[3])
{
float min[3], max[3];
- collection_boundbox_min_max(collection, object_visibility, min, max);
+ collection_minmax(collection, object_visibility, min, max);
sub_v3_v3v3(r_vec, max, min);
}
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 89cc7560044..ec3cf2b1e6c 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -562,7 +562,7 @@ static void view3d_boundbox_drop_draw_activate_collection(struct wmDropBox *drop
float dimensions[3] = {0.0f};
if (drag->type == WM_DRAG_ID) {
Collection *collection = (Collection *)WM_drag_get_local_ID(drag, ID_GR);
- BKE_collection_dimensions_calc(collection, COLLECTION_VISIBILITY_VIEWPORT, dimensions);
+ BKE_collection_dimensions_hint_calc(collection, COLLECTION_VISIBILITY_VIEWPORT, dimensions);
}
else {
struct AssetMetaData *meta_data = WM_drag_get_asset_meta_data(drag, drag_id_type);
@@ -839,7 +839,7 @@ static void view3d_collection_drop_matrix_get(const Collection *collection,
BoundBox boundbox;
/* Use the bounding-box for what the user will see, i.e. use viewport visibility. */
const CollectionObjectVisibility visibility = COLLECTION_VISIBILITY_VIEWPORT;
- BKE_collection_boundbox_calc(collection, visibility, &boundbox);
+ BKE_collection_boundbox_hint_calc(collection, visibility, &boundbox);
view3d_drop_matrix_from_snap(snap_state, &boundbox, unit_mat, r_mat_final);
}
More information about the Bf-blender-cvs
mailing list