blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Cleanup: format

This commit is contained in:
Campbell Barton 2022-11-10 11:08:55 +11:00
parent 7c1ab77fa6
commit 81ca6308d1
11 changed files with 102 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/device/cuda/device_impl.cpp
View File

@ -232,7 +232,7 @@ string CUDADevice::compile_kernel_get_common_cflags(const uint kernel_features)
return cflags;
}
string CUDADevice::compile_kernel(const string& common_cflags,
string CUDADevice::compile_kernel(const string &common_cflags,
const char *name,
const char *base,
bool force_ptx)

2
intern/cycles/device/cuda/device_impl.h
View File

@ -79,7 +79,7 @@ class CUDADevice : public Device {
string compile_kernel_get_common_cflags(const uint kernel_features);
string compile_kernel(const string& cflags,
string compile_kernel(const string &cflags,
const char *name,
const char *base = "cuda",
bool force_ptx = false);

174
source/blender/geometry/intern/trim_curves.cc
View File

@ -768,100 +768,98 @@ void compute_curve_trim_parameters(const bke::CurvesGeometry &curves,
const VArray<int8_t> curve_types = curves.curve_types();
/* Compute. */
threading::parallel_for(
selection.index_range(), 128, [&](const IndexRange selection_range) {
for (const int64_t curve_i : selection.slice(selection_range)) {
CurveType curve_type = CurveType(curve_types[curve_i]);
threading::parallel_for(selection.index_range(), 128, [&](const IndexRange selection_range) {
for (const int64_t curve_i : selection.slice(selection_range)) {
CurveType curve_type = CurveType(curve_types[curve_i]);
int point_count;
if (curve_type == CURVE_TYPE_NURBS) {
dst_curve_types[curve_i] = CURVE_TYPE_POLY;
point_count = curves.evaluated_points_for_curve(curve_i).size();
}
else {
dst_curve_types[curve_i] = curve_type;
point_count = curves.points_num_for_curve(curve_i);
}
if (point_count == 1) {
/* Single point. */
dst_curve_size[curve_i] = 1;
src_ranges[curve_i] = bke::curves::IndexRangeCyclic(0, 0, 1, 1);
start_points[curve_i] = {0, 0, 0.0f};
end_points[curve_i] = {0, 0, 0.0f};
continue;
}
int point_count;
if (curve_type == CURVE_TYPE_NURBS) {
dst_curve_types[curve_i] = CURVE_TYPE_POLY;
point_count = curves.evaluated_points_for_curve(curve_i).size();
}
else {
dst_curve_types[curve_i] = curve_type;
point_count = curves.points_num_for_curve(curve_i);
}
if (point_count == 1) {
/* Single point. */
dst_curve_size[curve_i] = 1;
src_ranges[curve_i] = bke::curves::IndexRangeCyclic(0, 0, 1, 1);
start_points[curve_i] = {0, 0, 0.0f};
end_points[curve_i] = {0, 0, 0.0f};
continue;
}
const bool cyclic = src_cyclic[curve_i];
const Span<float> lengths = curves.evaluated_lengths_for_curve(curve_i, cyclic);
BLI_assert(lengths.size() > 0);
const bool cyclic = src_cyclic[curve_i];
const Span<float> lengths = curves.evaluated_lengths_for_curve(curve_i, cyclic);
BLI_assert(lengths.size() > 0);
const float start_length = trim_sample_length(lengths, starts[curve_i], mode);
float end_length;
const float start_length = trim_sample_length(lengths, starts[curve_i], mode);
float end_length;
bool equal_sample_point;
if (cyclic) {
end_length = trim_sample_length(lengths, ends[curve_i], mode);
const float cyclic_start = start_length == lengths.last() ? 0.0f : start_length;
const float cyclic_end = end_length == lengths.last() ? 0.0f : end_length;
equal_sample_point = cyclic_start == cyclic_end;
}
else {
end_length = ends[curve_i] <= starts[curve_i] ?
start_length :
trim_sample_length(lengths, ends[curve_i], mode);
equal_sample_point = start_length == end_length;
}
bool equal_sample_point;
if (cyclic) {
end_length = trim_sample_length(lengths, ends[curve_i], mode);
const float cyclic_start = start_length == lengths.last() ? 0.0f : start_length;
const float cyclic_end = end_length == lengths.last() ? 0.0f : end_length;
equal_sample_point = cyclic_start == cyclic_end;
}
else {
end_length = ends[curve_i] <= starts[curve_i] ?
start_length :
trim_sample_length(lengths, ends[curve_i], mode);
equal_sample_point = start_length == end_length;
}
start_points[curve_i] = lookup_curve_point(curves,
curve_type,
curve_i,
lengths,
start_length,
cyclic,
resolution[curve_i],
point_count);
if (equal_sample_point) {
end_points[curve_i] = start_points[curve_i];
if (end_length <= start_length) {
/* Single point. */
dst_curve_size[curve_i] = 1;
src_ranges[curve_i] = bke::curves::IndexRangeCyclic::get_range_from_size(
start_points[curve_i].index,
start_points[curve_i].is_controlpoint(), /* Only iterate if control point. */
point_count);
}
else {
/* Split. */
src_ranges[curve_i] = bke::curves::IndexRangeCyclic::get_range_between_endpoints(
start_points[curve_i], end_points[curve_i], point_count)
.push_loop();
const int count = 1 + !start_points[curve_i].is_controlpoint() + point_count;
BLI_assert(count > 1);
dst_curve_size[curve_i] = count;
}
}
else {
/* General case. */
end_points[curve_i] = lookup_curve_point(curves,
curve_type,
curve_i,
lengths,
end_length,
cyclic,
resolution[curve_i],
point_count);
src_ranges[curve_i] = bke::curves::IndexRangeCyclic::get_range_between_endpoints(
start_points[curve_i], end_points[curve_i], point_count);
const int count = src_ranges[curve_i].size() +
!start_points[curve_i].is_controlpoint() +
!end_points[curve_i].is_controlpoint();
BLI_assert(count > 1);
dst_curve_size[curve_i] = count;
}
BLI_assert(dst_curve_size[curve_i] > 0);
start_points[curve_i] = lookup_curve_point(curves,
curve_type,
curve_i,
lengths,
start_length,
cyclic,
resolution[curve_i],
point_count);
if (equal_sample_point) {
end_points[curve_i] = start_points[curve_i];
if (end_length <= start_length) {
/* Single point. */
dst_curve_size[curve_i] = 1;
src_ranges[curve_i] = bke::curves::IndexRangeCyclic::get_range_from_size(
start_points[curve_i].index,
start_points[curve_i].is_controlpoint(), /* Only iterate if control point. */
point_count);
}
});
else {
/* Split. */
src_ranges[curve_i] = bke::curves::IndexRangeCyclic::get_range_between_endpoints(
start_points[curve_i], end_points[curve_i], point_count)
.push_loop();
const int count = 1 + !start_points[curve_i].is_controlpoint() + point_count;
BLI_assert(count > 1);
dst_curve_size[curve_i] = count;
}
}
else {
/* General case. */
end_points[curve_i] = lookup_curve_point(curves,
curve_type,
curve_i,
lengths,
end_length,
cyclic,
resolution[curve_i],
point_count);
src_ranges[curve_i] = bke::curves::IndexRangeCyclic::get_range_between_endpoints(
start_points[curve_i], end_points[curve_i], point_count);
const int count = src_ranges[curve_i].size() + !start_points[curve_i].is_controlpoint() +
!end_points[curve_i].is_controlpoint();
BLI_assert(count > 1);
dst_curve_size[curve_i] = count;
}
BLI_assert(dst_curve_size[curve_i] > 0);
}
});
}
/** \} */

2
source/blender/nodes/geometry/nodes/node_geo_curve_topology_curve_of_point.cc
View File

@ -49,7 +49,7 @@ class CurveOfPointInput final : public bke::CurvesFieldInput {
return false;
}
std::optional<eAttrDomain> preferred_domain(const bke::CurvesGeometry & /*curves*/)const final
std::optional<eAttrDomain> preferred_domain(const bke::CurvesGeometry & /*curves*/) const final
{
return ATTR_DOMAIN_POINT;
}

4
source/blender/nodes/geometry/nodes/node_geo_curve_topology_points_of_curve.cc
View File

@ -114,7 +114,7 @@ class PointsOfCurveInput final : public bke::CurvesFieldInput {
return false;
}
std::optional<eAttrDomain> preferred_domain(const bke::CurvesGeometry & /*curves*/)const final
std::optional<eAttrDomain> preferred_domain(const bke::CurvesGeometry & /*curves*/) const final
{
return ATTR_DOMAIN_CURVE;
}
@ -152,7 +152,7 @@ class CurvePointCountInput final : public bke::CurvesFieldInput {
return false;
}
std::optional<eAttrDomain> preferred_domain(const bke::CurvesGeometry & /*curves*/)const final
std::optional<eAttrDomain> preferred_domain(const bke::CurvesGeometry & /*curves*/) const final
{
return ATTR_DOMAIN_CURVE;
}

4
source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_face.cc
View File

@ -118,7 +118,7 @@ class CornersOfFaceInput final : public bke::MeshFieldInput {
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/) const final
{
return ATTR_DOMAIN_FACE;
}
@ -159,7 +159,7 @@ class CornersOfFaceCountInput final : public bke::MeshFieldInput {
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/) const final
{
return ATTR_DOMAIN_FACE;
}

4
source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc
View File

@ -139,7 +139,7 @@ class CornersOfVertInput final : public bke::MeshFieldInput {
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/) const final
{
return ATTR_DOMAIN_POINT;
}
@ -180,7 +180,7 @@ class CornersOfVertCountInput final : public bke::MeshFieldInput {
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/) const final
{
return ATTR_DOMAIN_POINT;
}

4
source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc
View File

@ -60,7 +60,7 @@ class CornerNextEdgeFieldInput final : public bke::MeshFieldInput {
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/) const final
{
return ATTR_DOMAIN_CORNER;
}
@ -106,7 +106,7 @@ class CornerPreviousEdgeFieldInput final : public bke::MeshFieldInput {
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/) const final
{
return ATTR_DOMAIN_CORNER;
}

4
source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_vertex.cc
View File

@ -139,7 +139,7 @@ class EdgesOfVertInput final : public bke::MeshFieldInput {
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/) const final
{
return ATTR_DOMAIN_POINT;
}
@ -181,7 +181,7 @@ class EdgesOfVertCountInput final : public bke::MeshFieldInput {
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/) const final
{
return ATTR_DOMAIN_POINT;
}

2
source/blender/nodes/geometry/nodes/node_geo_mesh_topology_offset_corner_in_face.cc
View File

@ -87,7 +87,7 @@ class OffsetCornerInFaceFieldInput final : public bke::MeshFieldInput {
return false;
}
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/)const final
std::optional<eAttrDomain> preferred_domain(const Mesh & /*mesh*/) const final
{
return ATTR_DOMAIN_CORNER;
}

4
source/blender/sequencer/intern/effects.c
View File

@ -709,8 +709,8 @@ static void do_gammacross_effect_float(
rt[2] = gammaCorrect(mfac * invGammaCorrect(rt1[2]) + fac * invGammaCorrect(rt2[2]));
rt[3] = gammaCorrect(mfac * invGammaCorrect(rt1[3]) + fac * invGammaCorrect(rt2[3]));
rt1 += 4;
rt2+=4;
rt+=4;
rt2 += 4;
rt += 4;
}
}
}