dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: Make format

Browse Source
This commit is contained in:
Hans Goudey
2023-12-20 14:54:38 -05:00
parent 13208038da
commit 19b46e0816
21 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blender/blenkernel/BKE_geometry_fields.hh
+1 -1
View File
@@ -438,6 +438,6 @@ bool try_capture_field_on_geometry(GeometryComponent &component,
* which domain is correct, none is returned.
*/
std::optional<AttrDomain> try_detect_field_domain(const GeometryComponent &component,
const fn::GField &field);
const fn::GField &field);
} // namespace blender::bke
source/blender/blenkernel/intern/attribute.cc
-1
View File
@@ -26,7 +26,6 @@
#include "BLT_translation.h"
#include "BKE_attribute.hh"
#include "BKE_attribute.hh"
#include "BKE_curves.hh"
#include "BKE_customdata.hh"
source/blender/blenkernel/intern/curve_to_mesh_convert.cc
+1 -1
View File
@@ -335,7 +335,7 @@ static ResultOffsets calculate_result_offsets(const CurvesInfo &info, const bool
}
static AttrDomain get_attribute_domain_for_mesh(const AttributeAccessor &mesh_attributes,
const AttributeIDRef &attribute_id)
const AttributeIDRef &attribute_id)
{
/* Only use a different domain if it is builtin and must only exist on one domain. */
if (!mesh_attributes.is_builtin(attribute_id)) {
source/blender/blenkernel/intern/data_transfer.cc
-1
View File
@@ -18,7 +18,6 @@
#include "BLI_math_matrix.h"
#include "BLI_utildefines.h"
#include "BKE_attribute.hh"
#include "BKE_attribute.hh"
#include "BKE_customdata.hh"
#include "BKE_data_transfer.h"
source/blender/blenkernel/intern/geometry_fields.cc
+1 -1
View File
@@ -800,7 +800,7 @@ bool try_capture_field_on_geometry(GeometryComponent &component,
}
std::optional<AttrDomain> try_detect_field_domain(const GeometryComponent &component,
const fn::GField &field)
const fn::GField &field)
{
const GeometryComponent::Type component_type = component.type();
if (component_type == GeometryComponent::Type::PointCloud) {
source/blender/blenkernel/intern/mesh_remesh_voxel.cc
-1
View File
@@ -26,7 +26,6 @@
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "BKE_attribute.hh"
#include "BKE_attribute.hh"
#include "BKE_attribute_math.hh"
#include "BKE_bvhutils.hh"
source/blender/blenkernel/intern/paint.cc
-1
View File
@@ -37,7 +37,6 @@
#include "BLT_translation.h"
#include "BKE_attribute.hh"
#include "BKE_attribute.hh"
#include "BKE_brush.hh"
#include "BKE_ccg.h"
source/blender/editors/mesh/mesh_data.cc
-1
View File
@@ -17,7 +17,6 @@
#include "BLI_array.hh"
#include "BLI_utildefines.h"
#include "BKE_attribute.hh"
#include "BKE_attribute.hh"
#include "BKE_context.hh"
#include "BKE_customdata.hh"
source/blender/editors/sculpt_paint/paint_vertex.cc
-1
View File
@@ -35,7 +35,6 @@
#include "RNA_access.hh"
#include "RNA_define.hh"
#include "BKE_attribute.hh"
#include "BKE_attribute.hh"
#include "BKE_brush.hh"
#include "BKE_colortools.h"
source/blender/editors/sculpt_paint/paint_weight.cc
-1
View File
@@ -31,7 +31,6 @@
#include "RNA_access.hh"
#include "BKE_attribute.hh"
#include "BKE_attribute.hh"
#include "BKE_brush.hh"
#include "BKE_colortools.h"
source/blender/editors/sculpt_paint/sculpt.cc
-1
View File
@@ -37,7 +37,6 @@
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "BKE_attribute.hh"
#include "BKE_attribute.hh"
#include "BKE_brush.hh"
#include "BKE_ccg.h"
source/blender/io/alembic/exporter/abc_writer_mesh.cc
-1
View File
@@ -14,7 +14,6 @@
#include "BLI_assert.h"
#include "BLI_math_vector.h"
#include "BKE_attribute.hh"
#include "BKE_attribute.hh"
#include "BKE_customdata.hh"
#include "BKE_lib_id.h"
source/blender/io/ply/importer/ply_import_mesh.cc
-1
View File
@@ -6,7 +6,6 @@
* \ingroup ply
*/
#include "BKE_attribute.hh"
#include "BKE_attribute.hh"
#include "BKE_customdata.hh"
#include "BKE_lib_id.h"
source/blender/io/usd/hydra/mesh.cc
+2 -1
View File
@@ -377,7 +377,8 @@ void MeshData::write_submeshes(const Mesh *mesh)
const bke::AttributeAccessor attributes = mesh->attributes();
const StringRef active_uv = CustomData_get_active_layer_name(&mesh->corner_data, CD_PROP_FLOAT2);
const VArraySpan uv_map = *attributes.lookup<float2>(active_uv, bke::AttrDomain::Corner);
const VArraySpan material_indices = *attributes.lookup<int>("material_index", bke::AttrDomain::Face);
const VArraySpan material_indices = *attributes.lookup<int>("material_index",
bke::AttrDomain::Face);
if (material_indices.is_empty()) {
copy_submesh(*mesh,
source/blender/io/usd/intern/usd_writer_mesh.cc
+2 -1
View File
@@ -642,7 +642,8 @@ static void get_loops_polys(const Mesh *mesh, USDMeshData &usd_mesh_data)
static void get_edge_creases(const Mesh *mesh, USDMeshData &usd_mesh_data)
{
const bke::AttributeAccessor attributes = mesh->attributes();
const bke::AttributeReader attribute = attributes.lookup<float>("crease_edge", bke::AttrDomain::Edge);
const bke::AttributeReader attribute = attributes.lookup<float>("crease_edge",
bke::AttrDomain::Edge);
if (!attribute) {
return;
}
source/blender/nodes/NOD_geometry_exec.hh
+1 -1
View File
@@ -27,11 +27,11 @@ using bke::AnonymousAttributeFieldInput;
using bke::AnonymousAttributeID;
using bke::AnonymousAttributeIDPtr;
using bke::AnonymousAttributePropagationInfo;
using bke::AttrDomain;
using bke::AttributeAccessor;
using bke::AttributeFieldInput;
using bke::AttributeIDRef;
using bke::AttributeKind;
using bke::AttrDomain;
using bke::AttributeMetaData;
using bke::AttributeReader;
using bke::AttributeWriter;
source/blender/nodes/geometry/node_geometry_util.cc
+12 -10
View File
@@ -73,22 +73,24 @@ const EnumPropertyItem *domain_experimental_grease_pencil_version3_fn(bContext *
bool *r_free)
{
*r_free = true;
return enum_items_filter(
rna_enum_attribute_domain_items, [](const EnumPropertyItem &item) -> bool {
return (bke::AttrDomain(item.value) == bke::AttrDomain::Layer) ? U.experimental.use_grease_pencil_version3 :
true;
});
return enum_items_filter(rna_enum_attribute_domain_items,
[](const EnumPropertyItem &item) -> bool {
return (bke::AttrDomain(item.value) == bke::AttrDomain::Layer) ?
U.experimental.use_grease_pencil_version3 :
true;
});
}
const EnumPropertyItem *domain_without_corner_experimental_grease_pencil_version3_fn(
bContext * /*C*/, PointerRNA * /*ptr*/, PropertyRNA * /*prop*/, bool *r_free)
{
*r_free = true;
return enum_items_filter(
rna_enum_attribute_domain_without_corner_items, [](const EnumPropertyItem &item) -> bool {
return (bke::AttrDomain(item.value) == bke::AttrDomain::Layer) ? U.experimental.use_grease_pencil_version3 :
true;
});
return enum_items_filter(rna_enum_attribute_domain_without_corner_items,
[](const EnumPropertyItem &item) -> bool {
return (bke::AttrDomain(item.value) == bke::AttrDomain::Layer) ?
U.experimental.use_grease_pencil_version3 :
true;
});
}
} // namespace enums
source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc
+1 -2
View File
@@ -447,8 +447,7 @@ class BlurAttributeFieldInput final : public bke::GeometryFieldInput {
std::optional<AttrDomain> preferred_domain(const GeometryComponent &component) const override
{
const std::optional<AttrDomain> domain = bke::try_detect_field_domain(component,
value_field_);
const std::optional<AttrDomain> domain = bke::try_detect_field_domain(component, value_field_);
if (domain.has_value() && *domain == AttrDomain::Corner) {
return AttrDomain::Point;
}
source/blender/nodes/geometry/nodes/node_geo_set_id.cc
+2 -2
View File
@@ -19,8 +19,8 @@ static void set_id_in_component(GeometryComponent &component,
const Field<int> &id_field)
{
const AttrDomain domain = (component.type() == GeometryComponent::Type::Instance) ?
AttrDomain::Instance :
AttrDomain::Point;
AttrDomain::Instance :
AttrDomain::Point;
const int domain_size = component.attribute_domain_size(domain);
if (domain_size == 0) {
return;
source/blender/nodes/geometry/nodes/node_geo_set_position.cc
+2 -2
View File
@@ -152,8 +152,8 @@ static void set_position_in_component(GeometrySet &geometry,
{
const GeometryComponent &component = *geometry.get_component(component_type);
const AttrDomain domain = component.type() == GeometryComponent::Type::Instance ?
AttrDomain::Instance :
AttrDomain::Point;
AttrDomain::Instance :
AttrDomain::Point;
const int domain_size = component.attribute_domain_size(domain);
if (domain_size == 0) {
return;
source/blender/nodes/intern/geometry_nodes_lazy_function.cc
+2 -2
View File
@@ -819,8 +819,8 @@ class LazyFunctionForViewerNode : public LazyFunction {
GeometryComponent &component = geometry.get_component_for_write(type);
AttrDomain used_domain = domain;
if (used_domain == AttrDomain::Auto) {
if (const std::optional<AttrDomain> detected_domain =
bke::try_detect_field_domain(component, field))
if (const std::optional<AttrDomain> detected_domain = bke::try_detect_field_domain(
component, field))
{
used_domain = *detected_domain;
}