Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
/*
|
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "BLI_array.hh"
|
2021-06-20 18:42:02 -05:00
|
|
|
#include "BLI_index_range.hh"
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
#include "BLI_listbase.h"
|
2021-05-19 13:22:09 -04:00
|
|
|
#include "BLI_map.hh"
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
#include "BLI_span.hh"
|
2021-05-19 13:22:09 -04:00
|
|
|
#include "BLI_string_ref.hh"
|
2021-06-20 18:42:02 -05:00
|
|
|
#include "BLI_task.hh"
|
|
|
|
|
#include "BLI_vector.hh"
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
|
|
|
|
|
#include "DNA_curve_types.h"
|
|
|
|
|
|
2021-09-09 12:54:20 +02:00
|
|
|
#include "BKE_anonymous_attribute.hh"
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
#include "BKE_curve.h"
|
|
|
|
|
#include "BKE_spline.hh"
|
|
|
|
|
|
2021-05-15 17:44:33 -05:00
|
|
|
using blender::Array;
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
using blender::float3;
|
|
|
|
|
using blender::float4x4;
|
2021-06-20 18:42:02 -05:00
|
|
|
using blender::IndexRange;
|
2021-05-19 13:22:09 -04:00
|
|
|
using blender::Map;
|
2021-06-20 18:42:02 -05:00
|
|
|
using blender::MutableSpan;
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
using blender::Span;
|
2021-05-19 13:22:09 -04:00
|
|
|
using blender::StringRefNull;
|
2021-06-20 18:42:02 -05:00
|
|
|
using blender::Vector;
|
2021-09-09 12:54:20 +02:00
|
|
|
using blender::bke::AttributeIDRef;
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
|
2021-05-12 11:46:13 -05:00
|
|
|
blender::Span<SplinePtr> CurveEval::splines() const
|
|
|
|
|
{
|
|
|
|
|
return splines_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
blender::MutableSpan<SplinePtr> CurveEval::splines()
|
|
|
|
|
{
|
|
|
|
|
return splines_;
|
|
|
|
|
}
|
|
|
|
|
|
2021-07-22 17:20:04 -04:00
|
|
|
bool CurveEval::has_spline_with_type(const Spline::Type type) const
|
|
|
|
|
{
|
|
|
|
|
for (const SplinePtr &spline : this->splines()) {
|
|
|
|
|
if (spline->type() == type) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2021-06-15 16:24:11 -05:00
|
|
|
void CurveEval::resize(const int size)
|
|
|
|
|
{
|
|
|
|
|
splines_.resize(size);
|
|
|
|
|
attributes.reallocate(size);
|
|
|
|
|
}
|
|
|
|
|
|
2021-05-12 11:46:13 -05:00
|
|
|
void CurveEval::add_spline(SplinePtr spline)
|
|
|
|
|
{
|
|
|
|
|
splines_.append(std::move(spline));
|
|
|
|
|
}
|
|
|
|
|
|
Geometry Nodes: support instance attributes when realizing instances
This patch refactors the instance-realization code and adds new functionality.
* Named and anonymous attributes are propagated from instances to the
realized geometry. If the same attribute exists on the geometry and on an
instance, the attribute on the geometry has precedence.
* The id attribute has special handling to avoid creating the same id on many
output points. This is necessary to make e.g. the Random Value node work
as expected afterwards.
Realizing instance attributes has an effect on existing files, especially due to the
id attribute. To avoid breaking existing files, the Realize Instances node now has
a legacy option that is enabled for all already existing Realize Instances nodes.
Removing this legacy behavior does affect some existing files (although not many).
We can decide whether it's worth to remove the old behavior as a separate step.
This refactor also improves performance when realizing instances. That is mainly
due to multi-threading. See D13446 to get the file used for benchmarking. The
curve code is not as optimized as it could be yet. That's mainly because the storage
for these attributes might change soonish and it wasn't worth optimizing for the
current storage format right now.
```
1,000,000 x mesh vertex: 530 ms -> 130 ms
1,000,000 x simple cube: 1290 ms -> 190 ms
1,000,000 x point: 1000 ms -> 150 ms
1,000,000 x curve spiral: 1740 ms -> 330 ms
1,000,000 x curve line: 1110 ms -> 210 ms
10,000 x subdivided cylinder: 170 ms -> 40 ms
10 x subdivided spiral: 180 ms -> 180 ms
```
Differential Revision: https://developer.blender.org/D13446
2021-12-14 15:57:58 +01:00
|
|
|
void CurveEval::add_splines(MutableSpan<SplinePtr> splines)
|
|
|
|
|
{
|
|
|
|
|
for (SplinePtr &spline : splines) {
|
|
|
|
|
this->add_spline(std::move(spline));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-05-12 11:46:13 -05:00
|
|
|
void CurveEval::remove_splines(blender::IndexMask mask)
|
|
|
|
|
{
|
|
|
|
|
for (int i = mask.size() - 1; i >= 0; i--) {
|
|
|
|
|
splines_.remove_and_reorder(mask.indices()[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
void CurveEval::translate(const float3 &translation)
|
|
|
|
|
{
|
2021-05-12 11:46:13 -05:00
|
|
|
for (SplinePtr &spline : this->splines()) {
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
spline->translate(translation);
|
|
|
|
|
spline->mark_cache_invalid();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void CurveEval::transform(const float4x4 &matrix)
|
|
|
|
|
{
|
2021-05-12 11:46:13 -05:00
|
|
|
for (SplinePtr &spline : this->splines()) {
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
spline->transform(matrix);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-12-29 12:27:24 -03:00
|
|
|
bool CurveEval::bounds_min_max(float3 &min, float3 &max, const bool use_evaluated) const
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
{
|
2021-12-29 12:27:24 -03:00
|
|
|
bool have_minmax = false;
|
2021-05-12 11:46:13 -05:00
|
|
|
for (const SplinePtr &spline : this->splines()) {
|
2021-12-29 12:27:24 -03:00
|
|
|
if (spline->size()) {
|
|
|
|
|
spline->bounds_min_max(min, max, use_evaluated);
|
|
|
|
|
have_minmax = true;
|
|
|
|
|
}
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
}
|
2021-12-29 12:27:24 -03:00
|
|
|
|
|
|
|
|
return have_minmax;
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
}
|
|
|
|
|
|
2021-11-22 12:07:59 -06:00
|
|
|
float CurveEval::total_length() const
|
|
|
|
|
{
|
|
|
|
|
float length = 0.0f;
|
|
|
|
|
for (const SplinePtr &spline : this->splines()) {
|
|
|
|
|
length += spline->length();
|
|
|
|
|
}
|
|
|
|
|
return length;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int CurveEval::total_control_point_size() const
|
|
|
|
|
{
|
|
|
|
|
int count = 0;
|
|
|
|
|
for (const SplinePtr &spline : this->splines()) {
|
|
|
|
|
count += spline->size();
|
|
|
|
|
}
|
|
|
|
|
return count;
|
|
|
|
|
}
|
|
|
|
|
|
2021-05-15 17:44:33 -05:00
|
|
|
blender::Array<int> CurveEval::control_point_offsets() const
|
|
|
|
|
{
|
|
|
|
|
Array<int> offsets(splines_.size() + 1);
|
|
|
|
|
int offset = 0;
|
|
|
|
|
for (const int i : splines_.index_range()) {
|
|
|
|
|
offsets[i] = offset;
|
|
|
|
|
offset += splines_[i]->size();
|
|
|
|
|
}
|
|
|
|
|
offsets.last() = offset;
|
|
|
|
|
return offsets;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
blender::Array<int> CurveEval::evaluated_point_offsets() const
|
|
|
|
|
{
|
|
|
|
|
Array<int> offsets(splines_.size() + 1);
|
|
|
|
|
int offset = 0;
|
|
|
|
|
for (const int i : splines_.index_range()) {
|
|
|
|
|
offsets[i] = offset;
|
|
|
|
|
offset += splines_[i]->evaluated_points_size();
|
|
|
|
|
}
|
|
|
|
|
offsets.last() = offset;
|
|
|
|
|
return offsets;
|
|
|
|
|
}
|
|
|
|
|
|
2021-09-20 20:23:26 -05:00
|
|
|
blender::Array<float> CurveEval::accumulated_spline_lengths() const
|
|
|
|
|
{
|
|
|
|
|
Array<float> spline_lengths(splines_.size() + 1);
|
|
|
|
|
float spline_length = 0.0f;
|
|
|
|
|
for (const int i : splines_.index_range()) {
|
|
|
|
|
spline_lengths[i] = spline_length;
|
|
|
|
|
spline_length += splines_[i]->length();
|
|
|
|
|
}
|
|
|
|
|
spline_lengths.last() = spline_length;
|
|
|
|
|
return spline_lengths;
|
|
|
|
|
}
|
|
|
|
|
|
2021-10-29 09:28:31 +02:00
|
|
|
void CurveEval::mark_cache_invalid()
|
|
|
|
|
{
|
|
|
|
|
for (SplinePtr &spline : splines_) {
|
|
|
|
|
spline->mark_cache_invalid();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
static BezierSpline::HandleType handle_type_from_dna_bezt(const eBezTriple_Handle dna_handle_type)
|
|
|
|
|
{
|
|
|
|
|
switch (dna_handle_type) {
|
|
|
|
|
case HD_FREE:
|
|
|
|
|
return BezierSpline::HandleType::Free;
|
|
|
|
|
case HD_AUTO:
|
|
|
|
|
return BezierSpline::HandleType::Auto;
|
|
|
|
|
case HD_VECT:
|
|
|
|
|
return BezierSpline::HandleType::Vector;
|
|
|
|
|
case HD_ALIGN:
|
|
|
|
|
return BezierSpline::HandleType::Align;
|
|
|
|
|
case HD_AUTO_ANIM:
|
|
|
|
|
return BezierSpline::HandleType::Auto;
|
|
|
|
|
case HD_ALIGN_DOUBLESIDE:
|
|
|
|
|
return BezierSpline::HandleType::Align;
|
|
|
|
|
}
|
|
|
|
|
BLI_assert_unreachable();
|
|
|
|
|
return BezierSpline::HandleType::Auto;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static Spline::NormalCalculationMode normal_mode_from_dna_curve(const int twist_mode)
|
|
|
|
|
{
|
|
|
|
|
switch (twist_mode) {
|
|
|
|
|
case CU_TWIST_Z_UP:
|
|
|
|
|
return Spline::NormalCalculationMode::ZUp;
|
|
|
|
|
case CU_TWIST_MINIMUM:
|
|
|
|
|
return Spline::NormalCalculationMode::Minimum;
|
|
|
|
|
case CU_TWIST_TANGENT:
|
|
|
|
|
return Spline::NormalCalculationMode::Tangent;
|
|
|
|
|
}
|
|
|
|
|
BLI_assert_unreachable();
|
|
|
|
|
return Spline::NormalCalculationMode::Minimum;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static NURBSpline::KnotsMode knots_mode_from_dna_nurb(const short flag)
|
|
|
|
|
{
|
|
|
|
|
switch (flag & (CU_NURB_ENDPOINT | CU_NURB_BEZIER)) {
|
|
|
|
|
case CU_NURB_ENDPOINT:
|
|
|
|
|
return NURBSpline::KnotsMode::EndPoint;
|
|
|
|
|
case CU_NURB_BEZIER:
|
|
|
|
|
return NURBSpline::KnotsMode::Bezier;
|
|
|
|
|
default:
|
|
|
|
|
return NURBSpline::KnotsMode::Normal;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BLI_assert_unreachable();
|
|
|
|
|
return NURBSpline::KnotsMode::Normal;
|
|
|
|
|
}
|
|
|
|
|
|
2021-06-20 18:42:02 -05:00
|
|
|
static SplinePtr spline_from_dna_bezier(const Nurb &nurb)
|
|
|
|
|
{
|
|
|
|
|
std::unique_ptr<BezierSpline> spline = std::make_unique<BezierSpline>();
|
|
|
|
|
spline->set_resolution(nurb.resolu);
|
|
|
|
|
spline->set_cyclic(nurb.flagu & CU_NURB_CYCLIC);
|
|
|
|
|
|
|
|
|
|
Span<const BezTriple> src_points{nurb.bezt, nurb.pntsu};
|
|
|
|
|
spline->resize(src_points.size());
|
|
|
|
|
MutableSpan<float3> positions = spline->positions();
|
2021-11-11 09:25:10 -06:00
|
|
|
MutableSpan<float3> handle_positions_left = spline->handle_positions_left(true);
|
|
|
|
|
MutableSpan<float3> handle_positions_right = spline->handle_positions_right(true);
|
2021-06-20 18:42:02 -05:00
|
|
|
MutableSpan<BezierSpline::HandleType> handle_types_left = spline->handle_types_left();
|
|
|
|
|
MutableSpan<BezierSpline::HandleType> handle_types_right = spline->handle_types_right();
|
|
|
|
|
MutableSpan<float> radii = spline->radii();
|
|
|
|
|
MutableSpan<float> tilts = spline->tilts();
|
|
|
|
|
|
|
|
|
|
blender::threading::parallel_for(src_points.index_range(), 2048, [&](IndexRange range) {
|
|
|
|
|
for (const int i : range) {
|
|
|
|
|
const BezTriple &bezt = src_points[i];
|
|
|
|
|
positions[i] = bezt.vec[1];
|
|
|
|
|
handle_positions_left[i] = bezt.vec[0];
|
|
|
|
|
handle_types_left[i] = handle_type_from_dna_bezt((eBezTriple_Handle)bezt.h1);
|
|
|
|
|
handle_positions_right[i] = bezt.vec[2];
|
|
|
|
|
handle_types_right[i] = handle_type_from_dna_bezt((eBezTriple_Handle)bezt.h2);
|
|
|
|
|
radii[i] = bezt.radius;
|
|
|
|
|
tilts[i] = bezt.tilt;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
return spline;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static SplinePtr spline_from_dna_nurbs(const Nurb &nurb)
|
|
|
|
|
{
|
|
|
|
|
std::unique_ptr<NURBSpline> spline = std::make_unique<NURBSpline>();
|
|
|
|
|
spline->set_resolution(nurb.resolu);
|
|
|
|
|
spline->set_cyclic(nurb.flagu & CU_NURB_CYCLIC);
|
|
|
|
|
spline->set_order(nurb.orderu);
|
|
|
|
|
spline->knots_mode = knots_mode_from_dna_nurb(nurb.flagu);
|
|
|
|
|
|
|
|
|
|
Span<const BPoint> src_points{nurb.bp, nurb.pntsu};
|
|
|
|
|
spline->resize(src_points.size());
|
|
|
|
|
MutableSpan<float3> positions = spline->positions();
|
|
|
|
|
MutableSpan<float> weights = spline->weights();
|
|
|
|
|
MutableSpan<float> radii = spline->radii();
|
|
|
|
|
MutableSpan<float> tilts = spline->tilts();
|
|
|
|
|
|
|
|
|
|
blender::threading::parallel_for(src_points.index_range(), 2048, [&](IndexRange range) {
|
|
|
|
|
for (const int i : range) {
|
|
|
|
|
const BPoint &bp = src_points[i];
|
|
|
|
|
positions[i] = bp.vec;
|
|
|
|
|
weights[i] = bp.vec[3];
|
|
|
|
|
radii[i] = bp.radius;
|
|
|
|
|
tilts[i] = bp.tilt;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
return spline;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static SplinePtr spline_from_dna_poly(const Nurb &nurb)
|
|
|
|
|
{
|
|
|
|
|
std::unique_ptr<PolySpline> spline = std::make_unique<PolySpline>();
|
|
|
|
|
spline->set_cyclic(nurb.flagu & CU_NURB_CYCLIC);
|
|
|
|
|
|
|
|
|
|
Span<const BPoint> src_points{nurb.bp, nurb.pntsu};
|
|
|
|
|
spline->resize(src_points.size());
|
|
|
|
|
MutableSpan<float3> positions = spline->positions();
|
|
|
|
|
MutableSpan<float> radii = spline->radii();
|
|
|
|
|
MutableSpan<float> tilts = spline->tilts();
|
|
|
|
|
|
|
|
|
|
blender::threading::parallel_for(src_points.index_range(), 2048, [&](IndexRange range) {
|
|
|
|
|
for (const int i : range) {
|
|
|
|
|
const BPoint &bp = src_points[i];
|
|
|
|
|
positions[i] = bp.vec;
|
|
|
|
|
radii[i] = bp.radius;
|
|
|
|
|
tilts[i] = bp.tilt;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
return spline;
|
|
|
|
|
}
|
|
|
|
|
|
2021-06-28 14:28:52 -05:00
|
|
|
std::unique_ptr<CurveEval> curve_eval_from_dna_curve(const Curve &dna_curve,
|
|
|
|
|
const ListBase &nurbs_list)
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
{
|
2021-06-28 14:28:52 -05:00
|
|
|
Vector<const Nurb *> nurbs(nurbs_list);
|
2021-06-20 18:42:02 -05:00
|
|
|
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
std::unique_ptr<CurveEval> curve = std::make_unique<CurveEval>();
|
2021-06-20 18:42:02 -05:00
|
|
|
curve->resize(nurbs.size());
|
|
|
|
|
MutableSpan<SplinePtr> splines = curve->splines();
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
|
2021-06-20 18:42:02 -05:00
|
|
|
blender::threading::parallel_for(nurbs.index_range(), 256, [&](IndexRange range) {
|
|
|
|
|
for (const int i : range) {
|
|
|
|
|
switch (nurbs[i]->type) {
|
|
|
|
|
case CU_BEZIER:
|
|
|
|
|
splines[i] = spline_from_dna_bezier(*nurbs[i]);
|
|
|
|
|
break;
|
|
|
|
|
case CU_NURBS:
|
|
|
|
|
splines[i] = spline_from_dna_nurbs(*nurbs[i]);
|
|
|
|
|
break;
|
|
|
|
|
case CU_POLY:
|
|
|
|
|
splines[i] = spline_from_dna_poly(*nurbs[i]);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
BLI_assert_unreachable();
|
|
|
|
|
break;
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
}
|
|
|
|
|
}
|
2021-06-20 18:42:02 -05:00
|
|
|
});
|
2021-05-19 13:22:09 -04:00
|
|
|
|
2021-06-20 18:42:02 -05:00
|
|
|
/* Normal mode is stored separately in each spline to facilitate combining
|
|
|
|
|
* splines from multiple curve objects, where the value may be different. */
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
const Spline::NormalCalculationMode normal_mode = normal_mode_from_dna_curve(
|
|
|
|
|
dna_curve.twist_mode);
|
2021-05-12 11:46:13 -05:00
|
|
|
for (SplinePtr &spline : curve->splines()) {
|
Geometry Nodes: Initial basic curve data support
This patch adds initial curve support to geometry nodes. Currently
there is only one node available, the "Curve to Mesh" node, T87428.
However, the aim of the changes here is larger than just supporting
curve data in nodes-- it also uses the opportunity to add better spline
data structures, intended to replace the existing curve evaluation code.
The curve code in Blender is quite old, and it's generally regarded as
some of the messiest, hardest-to-understand code as well. The classes
in `BKE_spline.hh` aim to be faster, more extensible, and much more
easily understandable. Further explanation can be found in comments in
that file.
Initial builtin spline attributes are supported-- reading and writing
from the `cyclic` and `resolution` attributes works with any of the
attribute nodes. Also, only Z-up normal calculation is implemented
at the moment, and tilts do not apply yet.
**Limitations**
- For now, you must bring curves into the node tree with an "Object
Info" node. Changes to the curve modifier stack will come later.
- Converting to a mesh is necessary to visualize the curve data.
Further progress can be tracked in: T87245
Higher level design document: https://wiki.blender.org/wiki/Modules/Physics_Nodes/Projects/EverythingNodes/CurveNodes
Differential Revision: https://developer.blender.org/D11091
2021-05-03 12:29:17 -05:00
|
|
|
spline->normal_mode = normal_mode;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return curve;
|
|
|
|
|
}
|
2021-05-19 13:22:09 -04:00
|
|
|
|
2021-06-28 14:28:52 -05:00
|
|
|
std::unique_ptr<CurveEval> curve_eval_from_dna_curve(const Curve &dna_curve)
|
|
|
|
|
{
|
|
|
|
|
return curve_eval_from_dna_curve(dna_curve, *BKE_curve_nurbs_get_for_read(&dna_curve));
|
|
|
|
|
}
|
|
|
|
|
|
2021-05-19 13:22:09 -04:00
|
|
|
void CurveEval::assert_valid_point_attributes() const
|
|
|
|
|
{
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
if (splines_.size() == 0) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
const int layer_len = splines_.first()->attributes.data.totlayer;
|
2021-11-02 15:22:16 -05:00
|
|
|
|
|
|
|
|
Array<AttributeIDRef> ids_in_order(layer_len);
|
|
|
|
|
Array<AttributeMetaData> meta_data_in_order(layer_len);
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
int i = 0;
|
|
|
|
|
splines_.first()->attributes.foreach_attribute(
|
|
|
|
|
[&](const AttributeIDRef &attribute_id, const AttributeMetaData &meta_data) {
|
|
|
|
|
ids_in_order[i] = attribute_id;
|
|
|
|
|
meta_data_in_order[i] = meta_data;
|
|
|
|
|
i++;
|
|
|
|
|
return true;
|
|
|
|
|
},
|
|
|
|
|
ATTR_DOMAIN_POINT);
|
|
|
|
|
}
|
|
|
|
|
|
2021-05-19 13:22:09 -04:00
|
|
|
for (const SplinePtr &spline : splines_) {
|
2021-11-02 15:22:16 -05:00
|
|
|
/* All splines should have the same number of attributes. */
|
2021-05-19 13:22:09 -04:00
|
|
|
BLI_assert(spline->attributes.data.totlayer == layer_len);
|
2021-11-02 15:22:16 -05:00
|
|
|
|
|
|
|
|
int i = 0;
|
2021-05-19 13:22:09 -04:00
|
|
|
spline->attributes.foreach_attribute(
|
2021-09-09 12:54:20 +02:00
|
|
|
[&](const AttributeIDRef &attribute_id, const AttributeMetaData &meta_data) {
|
2021-11-02 15:22:16 -05:00
|
|
|
/* Attribute names and IDs should have the same order and exist on all splines. */
|
|
|
|
|
BLI_assert(attribute_id == ids_in_order[i]);
|
|
|
|
|
|
|
|
|
|
/* Attributes with the same ID different splines should all have the same type. */
|
|
|
|
|
BLI_assert(meta_data == meta_data_in_order[i]);
|
|
|
|
|
|
|
|
|
|
i++;
|
2021-05-19 13:22:09 -04:00
|
|
|
return true;
|
|
|
|
|
},
|
|
|
|
|
ATTR_DOMAIN_POINT);
|
|
|
|
|
}
|
2021-11-02 15:22:16 -05:00
|
|
|
|
2021-05-19 13:22:09 -04:00
|
|
|
#endif
|
2021-07-15 17:53:26 +10:00
|
|
|
}
|